From xen-changelog-bounces@lists.xen.org Tue Sep 02 23:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Sep 2014 23:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XOxEA-0003fW-5I; Tue, 02 Sep 2014 23:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XOxE9-0003fO-5A for xen-changelog@lists.xensource.com; Tue, 02 Sep 2014 23:11:05 +0000 Received: from [85.158.143.35:28160] by server-2.bemta-4.messagelabs.com id DE/13-04525-88E46045; Tue, 02 Sep 2014 23:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1409699462!13238685!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14115 invoked from network); 2 Sep 2014 23:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Sep 2014 23:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XOxE6-0004iX-FT for xen-changelog@lists.xensource.com; Tue, 02 Sep 2014 23:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XOxE6-0005UY-Bl for xen-changelog@lists.xensource.com; Tue, 02 Sep 2014 23:11:02 +0000 Date: Tue, 02 Sep 2014 23:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d5a7ed88d86f840c0cc26ebc48987101669b5bf7 Author: Jan Beulich AuthorDate: Tue Sep 2 08:20:19 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 2 08:20:19 2014 +0200 update Xen version to 4.4.1 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b78eb16..c44853f 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.1-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.1 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.1-rc2 +QEMU_TAG ?= xen-4.4.1 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index 738893a..134a8bd 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .1-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 02 23:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Sep 2014 23:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XOxEA-0003fW-5I; Tue, 02 Sep 2014 23:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XOxE9-0003fO-5A for xen-changelog@lists.xensource.com; Tue, 02 Sep 2014 23:11:05 +0000 Received: from [85.158.143.35:28160] by server-2.bemta-4.messagelabs.com id DE/13-04525-88E46045; Tue, 02 Sep 2014 23:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1409699462!13238685!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14115 invoked from network); 2 Sep 2014 23:11:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 2 Sep 2014 23:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XOxE6-0004iX-FT for xen-changelog@lists.xensource.com; Tue, 02 Sep 2014 23:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XOxE6-0005UY-Bl for xen-changelog@lists.xensource.com; Tue, 02 Sep 2014 23:11:02 +0000 Date: Tue, 02 Sep 2014 23:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.1 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d5a7ed88d86f840c0cc26ebc48987101669b5bf7 Author: Jan Beulich AuthorDate: Tue Sep 2 08:20:19 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 2 08:20:19 2014 +0200 update Xen version to 4.4.1 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index b78eb16..c44853f 100644 --- a/Config.mk +++ b/Config.mk @@ -234,7 +234,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.4-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.1-rc1 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.4.1 SEABIOS_UPSTREAM_TAG ?= rel-1.7.3.1 # Fri Aug 2 14:12:09 2013 -0400 # Fix bug in CBFS file walking with compressed files. @@ -246,7 +246,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.4.1-rc2 +QEMU_TAG ?= xen-4.4.1 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index 738893a..134a8bd 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .1-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 03 10:22:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Sep 2014 10:22: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 1XP7he-00089Z-Tl; Wed, 03 Sep 2014 10:22:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XP7hb-00089K-O4 for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 10:22:13 +0000 Received: from [85.158.139.211:4695] by server-5.bemta-5.messagelabs.com id D1/59-11546-2DBE6045; Wed, 03 Sep 2014 10:22:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1409739725!12188801!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11489 invoked from network); 3 Sep 2014 10:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Sep 2014 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 1XP7hT-0002uF-1q for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 10:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XP7hS-0001dU-Pj for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 10:22:02 +0000 Date: Wed, 03 Sep 2014 10:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bcdeb9c2dc9902f08f8455288151153a411802a Author: Jan Beulich AuthorDate: Tue Sep 2 08:22:57 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 2 08:22:57 2014 +0200 update Xen version to 4.2.5 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 9e3e688..cdd7c40 100644 --- a/Config.mk +++ b/Config.mk @@ -203,7 +203,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.2-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.4 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.5 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 @@ -215,7 +215,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.4 +QEMU_TAG ?= xen-4.2.5 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy diff --git a/xen/Makefile b/xen/Makefile index a529cd1..9138007 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .5-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 03 10:22:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Sep 2014 10:22: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 1XP7he-00089Z-Tl; Wed, 03 Sep 2014 10:22:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XP7hb-00089K-O4 for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 10:22:13 +0000 Received: from [85.158.139.211:4695] by server-5.bemta-5.messagelabs.com id D1/59-11546-2DBE6045; Wed, 03 Sep 2014 10:22:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1409739725!12188801!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11489 invoked from network); 3 Sep 2014 10:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Sep 2014 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 1XP7hT-0002uF-1q for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 10:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XP7hS-0001dU-Pj for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 10:22:02 +0000 Date: Wed, 03 Sep 2014 10:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] update Xen version to 4.2.5 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bcdeb9c2dc9902f08f8455288151153a411802a Author: Jan Beulich AuthorDate: Tue Sep 2 08:22:57 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 2 08:22:57 2014 +0200 update Xen version to 4.2.5 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 9e3e688..cdd7c40 100644 --- a/Config.mk +++ b/Config.mk @@ -203,7 +203,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.2-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.4 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.2.5 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2 # Sun Mar 11 09:27:07 2012 -0400 # Update version to 1.6.3.2 @@ -215,7 +215,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.2.4 +QEMU_TAG ?= xen-4.2.5 # Wed Dec 18 15:25:14 2013 +0000 # qemu-traditional: Fix build warnings on Wheezy diff --git a/xen/Makefile b/xen/Makefile index a529cd1..9138007 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 2 -export XEN_EXTRAVERSION ?= .5-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .5$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.2 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 03 13:11:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Sep 2014 13:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPAL4-0004jP-JJ; Wed, 03 Sep 2014 13:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPAL3-0004iw-IE for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 13:11:05 +0000 Received: from [85.158.143.35:33173] by server-3.bemta-4.messagelabs.com id 86/4B-06192-86317045; Wed, 03 Sep 2014 13:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1409749862!13353786!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18776 invoked from network); 3 Sep 2014 13:11:03 -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; 3 Sep 2014 13:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPAL0-0004ml-AF for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 13:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPAL0-0007RR-05 for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 13:11:02 +0000 Date: Wed, 03 Sep 2014 13:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.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 a153d8a97af7484269683955a9ce78dbd187a8d8 Author: Jan Beulich AuthorDate: Tue Sep 2 08:21:51 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 2 08:21:51 2014 +0200 update Xen version to 4.3.3 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 583ceef..0ff1eb7 100644 --- a/Config.mk +++ b/Config.mk @@ -212,7 +212,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.3 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.3-rc2 +QEMU_TAG ?= xen-4.3.3 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index ae41813..116aed2 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 ?= .3-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(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 Wed Sep 03 13:11:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Sep 2014 13:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPAL4-0004jP-JJ; Wed, 03 Sep 2014 13:11:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPAL3-0004iw-IE for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 13:11:05 +0000 Received: from [85.158.143.35:33173] by server-3.bemta-4.messagelabs.com id 86/4B-06192-86317045; Wed, 03 Sep 2014 13:11:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1409749862!13353786!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18776 invoked from network); 3 Sep 2014 13:11:03 -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; 3 Sep 2014 13:11:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPAL0-0004ml-AF for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 13:11:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPAL0-0007RR-05 for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 13:11:02 +0000 Date: Wed, 03 Sep 2014 13:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] update Xen version to 4.3.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 a153d8a97af7484269683955a9ce78dbd187a8d8 Author: Jan Beulich AuthorDate: Tue Sep 2 08:21:51 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 2 08:21:51 2014 +0200 update Xen version to 4.3.3 --- Config.mk | 4 ++-- xen/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 583ceef..0ff1eb7 100644 --- a/Config.mk +++ b/Config.mk @@ -212,7 +212,7 @@ QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.3-testing.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= b0855f925c6e2e0b21fbb03fab4b5fb5b6876871 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.3.3 SEABIOS_UPSTREAM_TAG ?= 3a28511b46f0c2af5fae1b6ed2b0c19d7913cee3 # Wed Jun 26 16:30:45 2013 +0100 # xen: Don't perform SMP setup. @@ -224,7 +224,7 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= xen-4.3.3-rc2 +QEMU_TAG ?= xen-4.3.3 # Tue Apr 8 16:50:06 2014 +0000 # qemu-xen-trad: free all the pirqs for msi/msix when driver unloads diff --git a/xen/Makefile b/xen/Makefile index ae41813..116aed2 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 ?= .3-rc2$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(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 Wed Sep 03 15:22:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Sep 2014 15:22: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 1XPCNw-0004NZ-0b; Wed, 03 Sep 2014 15:22:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPCNt-0004NM-Uc for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 15:22:10 +0000 Content-Length: 5140 Received: from [85.158.143.35:34760] by server-1.bemta-4.messagelabs.com id DD/A6-05872-12237045; Wed, 03 Sep 2014 15:22:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409757725!13414999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22099 invoked from network); 3 Sep 2014 15:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Sep 2014 15:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPCNm-0006Iv-Sg for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 15:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPCNm-0003ye-PY for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 15:22:02 +0000 Date: Wed, 03 Sep 2014 15:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] serial: poll the serial console with G_IO_HUP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0906145881116438515==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0906145881116438515== Content-Length: 4803 Content-Transfer-Encoding: quoted-printable commit ea772ca487e219e5d5b82d50da460c4145238038 Author: Roger Pau Monne AuthorDate: Fri May 23 17:57:49 2014 +0200 Commit: Stefano Stabellini CommitDate: Tue Sep 2 21:41:25 2014 +0000 serial: poll the serial console with G_IO_HUP On FreeBSD polling a master pty while the other end is not connected with G_IO_OUT only results in an endless wait. This is different from the Linux behaviour, that returns immediately. In order to demonstrate this, I have the following example code: http://xenbits.xen.org/people/royger/test_poll.c When executed on Linux: $ ./test_poll In callback On FreeBSD instead, the callback never gets called: $ ./test_poll So, in order to workaround this, poll the source with G_IO_HUP (which makes the code behave the same way on both Linux and FreeBSD). upstream-commit-id: e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3 Signed-off-by: Roger Pau Monn=C3=A9 Cc: Peter Crosthwaite Cc: Michael Tokarev Cc: "Andreas F=C3=A4rber" Cc: Paolo Bonzini Cc: xen-devel@lists.xenproject.org [Add hw/char/cadence_uart.c too. - Paolo] Signed-off-by: Paolo Bonzini Signed-off-by: Stefano Stabellini --- hw/char/cadence_uart.c | 3 ++- hw/char/serial.c | 2 +- hw/char/virtio-console.c | 3 ++- hw/usb/redirect.c | 2 +- monitor.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 1012f1a..1f3d162 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -306,7 +306,8 @@ static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond, memmove(s->tx_fifo, s->tx_fifo + ret, s->tx_count); if (s->tx_count) { - int r =3D qemu_chr_fe_add_watch(s->chr, G_IO_OUT, cadence_uart_xmit, s); + int r =3D qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, + cadence_uart_xmit, s); assert(r); } diff --git a/hw/char/serial.c b/hw/char/serial.c index f4d167f..2a2c9e5 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -246,7 +246,7 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) serial_receive1(s, &s->tsr, 1); } else if (qemu_chr_fe_write(s->chr, &s->tsr, 1) !=3D 1) { if (s->tsr_retry >=3D 0 && s->tsr_retry < MAX_XMIT_RETRY && - qemu_chr_fe_add_watch(s->chr, G_IO_OUT, serial_xmit, s) > 0) { + qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, serial_xmit, s) > 0) { s->tsr_retry++; return FALSE; } diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 6c8be0f..38e290a 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -69,7 +69,8 @@ static ssize_t flush_buf(VirtIOSerialPort *port, if (!k->is_console) { virtio_serial_throttle_port(port, true); if (!vcon->watch) { - vcon->watch =3D qemu_chr_fe_add_watch(vcon->chr, G_IO_OUT, + vcon->watch =3D qemu_chr_fe_add_watch(vcon->chr, + G_IO_OUT|G_IO_HUP, chr_write_unblocked, vcon); } } diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 287a505..06e757d 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -284,7 +284,7 @@ static int usbredir_write(void *priv, uint8_t *data, int count) r =3D qemu_chr_fe_write(dev->cs, data, count); if (r < count) { if (!dev->watch) { - dev->watch =3D qemu_chr_fe_add_watch(dev->cs, G_IO_OUT, + dev->watch =3D qemu_chr_fe_add_watch(dev->cs, G_IO_OUT|G_IO_HUP, usbredir_write_unblocked, dev); } if (r < 0) { diff --git a/monitor.c b/monitor.c index 342e83b..0cbc378 100644 --- a/monitor.c +++ b/monitor.c @@ -303,7 +303,7 @@ void monitor_flush(Monitor *mon) mon->outbuf =3D tmp; } if (mon->watch =3D=3D 0) { - mon->watch =3D qemu_chr_fe_add_watch(mon->chr, G_IO_OUT, + mon->watch =3D qemu_chr_fe_add_watch(mon->chr, G_IO_OUT|G_IO_HUP, monitor_unblocked, mon); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============0906145881116438515== 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 --===============0906145881116438515==-- From xen-changelog-bounces@lists.xen.org Wed Sep 03 15:22:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Sep 2014 15:22: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 1XPCNw-0004NZ-0b; Wed, 03 Sep 2014 15:22:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPCNt-0004NM-Uc for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 15:22:10 +0000 Content-Length: 5140 Received: from [85.158.143.35:34760] by server-1.bemta-4.messagelabs.com id DD/A6-05872-12237045; Wed, 03 Sep 2014 15:22:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409757725!13414999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22099 invoked from network); 3 Sep 2014 15:22:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Sep 2014 15:22:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPCNm-0006Iv-Sg for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 15:22:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPCNm-0003ye-PY for xen-changelog@lists.xensource.com; Wed, 03 Sep 2014 15:22:02 +0000 Date: Wed, 03 Sep 2014 15:22:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] serial: poll the serial console with G_IO_HUP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0906145881116438515==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0906145881116438515== Content-Length: 4803 Content-Transfer-Encoding: quoted-printable commit ea772ca487e219e5d5b82d50da460c4145238038 Author: Roger Pau Monne AuthorDate: Fri May 23 17:57:49 2014 +0200 Commit: Stefano Stabellini CommitDate: Tue Sep 2 21:41:25 2014 +0000 serial: poll the serial console with G_IO_HUP On FreeBSD polling a master pty while the other end is not connected with G_IO_OUT only results in an endless wait. This is different from the Linux behaviour, that returns immediately. In order to demonstrate this, I have the following example code: http://xenbits.xen.org/people/royger/test_poll.c When executed on Linux: $ ./test_poll In callback On FreeBSD instead, the callback never gets called: $ ./test_poll So, in order to workaround this, poll the source with G_IO_HUP (which makes the code behave the same way on both Linux and FreeBSD). upstream-commit-id: e02bc6de30c44fd668dc0d6e1cd1804f2eed3ed3 Signed-off-by: Roger Pau Monn=C3=A9 Cc: Peter Crosthwaite Cc: Michael Tokarev Cc: "Andreas F=C3=A4rber" Cc: Paolo Bonzini Cc: xen-devel@lists.xenproject.org [Add hw/char/cadence_uart.c too. - Paolo] Signed-off-by: Paolo Bonzini Signed-off-by: Stefano Stabellini --- hw/char/cadence_uart.c | 3 ++- hw/char/serial.c | 2 +- hw/char/virtio-console.c | 3 ++- hw/usb/redirect.c | 2 +- monitor.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c index 1012f1a..1f3d162 100644 --- a/hw/char/cadence_uart.c +++ b/hw/char/cadence_uart.c @@ -306,7 +306,8 @@ static gboolean cadence_uart_xmit(GIOChannel *chan, GIOCondition cond, memmove(s->tx_fifo, s->tx_fifo + ret, s->tx_count); if (s->tx_count) { - int r =3D qemu_chr_fe_add_watch(s->chr, G_IO_OUT, cadence_uart_xmit, s); + int r =3D qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, + cadence_uart_xmit, s); assert(r); } diff --git a/hw/char/serial.c b/hw/char/serial.c index f4d167f..2a2c9e5 100644 --- a/hw/char/serial.c +++ b/hw/char/serial.c @@ -246,7 +246,7 @@ static gboolean serial_xmit(GIOChannel *chan, GIOCondition cond, void *opaque) serial_receive1(s, &s->tsr, 1); } else if (qemu_chr_fe_write(s->chr, &s->tsr, 1) !=3D 1) { if (s->tsr_retry >=3D 0 && s->tsr_retry < MAX_XMIT_RETRY && - qemu_chr_fe_add_watch(s->chr, G_IO_OUT, serial_xmit, s) > 0) { + qemu_chr_fe_add_watch(s->chr, G_IO_OUT|G_IO_HUP, serial_xmit, s) > 0) { s->tsr_retry++; return FALSE; } diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c index 6c8be0f..38e290a 100644 --- a/hw/char/virtio-console.c +++ b/hw/char/virtio-console.c @@ -69,7 +69,8 @@ static ssize_t flush_buf(VirtIOSerialPort *port, if (!k->is_console) { virtio_serial_throttle_port(port, true); if (!vcon->watch) { - vcon->watch =3D qemu_chr_fe_add_watch(vcon->chr, G_IO_OUT, + vcon->watch =3D qemu_chr_fe_add_watch(vcon->chr, + G_IO_OUT|G_IO_HUP, chr_write_unblocked, vcon); } } diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 287a505..06e757d 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -284,7 +284,7 @@ static int usbredir_write(void *priv, uint8_t *data, int count) r =3D qemu_chr_fe_write(dev->cs, data, count); if (r < count) { if (!dev->watch) { - dev->watch =3D qemu_chr_fe_add_watch(dev->cs, G_IO_OUT, + dev->watch =3D qemu_chr_fe_add_watch(dev->cs, G_IO_OUT|G_IO_HUP, usbredir_write_unblocked, dev); } if (r < 0) { diff --git a/monitor.c b/monitor.c index 342e83b..0cbc378 100644 --- a/monitor.c +++ b/monitor.c @@ -303,7 +303,7 @@ void monitor_flush(Monitor *mon) mon->outbuf =3D tmp; } if (mon->watch =3D=3D 0) { - mon->watch =3D qemu_chr_fe_add_watch(mon->chr, G_IO_OUT, + mon->watch =3D qemu_chr_fe_add_watch(mon->chr, G_IO_OUT|G_IO_HUP, monitor_unblocked, mon); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git --===============0906145881116438515== 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 --===============0906145881116438515==-- From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44: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 1XPRiC-000396-U4; Thu, 04 Sep 2014 07:44:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiB-00038x-W8 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:08 +0000 Received: from [85.158.143.35:22144] by server-2.bemta-4.messagelabs.com id E7/00-04525-64818045; Thu, 04 Sep 2014 07:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1409816644!13483994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15717 invoked from network); 4 Sep 2014 07:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRi8-0007nq-GF for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRi7-0003Gq-TR for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:04 +0000 Date: Thu, 04 Sep 2014 07:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce sizes.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9facdec620735bbbe677fcdf693b7ff7dcb23cab Author: Vijaya Kumar K AuthorDate: Wed Jul 23 19:11:47 2014 +0530 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:36 2014 +0100 xen/arm: Introduce sizes.h Add sizes.h file similar to include/linux/sizes.h of kernel code. These size macros helps in porting kernel drivers to Xen Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/include/xen/sizes.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/xen/include/xen/sizes.h b/xen/include/xen/sizes.h new file mode 100644 index 0000000..f7b728d --- /dev/null +++ b/xen/include/xen/sizes.h @@ -0,0 +1,48 @@ +#ifndef __XEN_SIZES_H__ +#define __XEN_SIZES_H__ + +/* + * Taken from kernel code include/linux/size.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#define SZ_1 0x00000001 +#define SZ_2 0x00000002 +#define SZ_4 0x00000004 +#define SZ_8 0x00000008 +#define SZ_16 0x00000010 +#define SZ_32 0x00000020 +#define SZ_64 0x00000040 +#define SZ_128 0x00000080 +#define SZ_256 0x00000100 +#define SZ_512 0x00000200 + +#define SZ_1K 0x00000400 +#define SZ_2K 0x00000800 +#define SZ_4K 0x00001000 +#define SZ_8K 0x00002000 +#define SZ_16K 0x00004000 +#define SZ_32K 0x00008000 +#define SZ_64K 0x00010000 +#define SZ_128K 0x00020000 +#define SZ_256K 0x00040000 +#define SZ_512K 0x00080000 + +#define SZ_1M 0x00100000 +#define SZ_2M 0x00200000 +#define SZ_4M 0x00400000 +#define SZ_8M 0x00800000 +#define SZ_16M 0x01000000 +#define SZ_32M 0x02000000 +#define SZ_64M 0x04000000 +#define SZ_128M 0x08000000 +#define SZ_256M 0x10000000 +#define SZ_512M 0x20000000 + +#define SZ_1G 0x40000000 +#define SZ_2G 0x80000000 + +#endif /* __XEN_SIZES_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44: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 1XPRiC-000396-U4; Thu, 04 Sep 2014 07:44:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiB-00038x-W8 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:08 +0000 Received: from [85.158.143.35:22144] by server-2.bemta-4.messagelabs.com id E7/00-04525-64818045; Thu, 04 Sep 2014 07:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1409816644!13483994!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15717 invoked from network); 4 Sep 2014 07:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRi8-0007nq-GF for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRi7-0003Gq-TR for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:04 +0000 Date: Thu, 04 Sep 2014 07:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Introduce sizes.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9facdec620735bbbe677fcdf693b7ff7dcb23cab Author: Vijaya Kumar K AuthorDate: Wed Jul 23 19:11:47 2014 +0530 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:36 2014 +0100 xen/arm: Introduce sizes.h Add sizes.h file similar to include/linux/sizes.h of kernel code. These size macros helps in porting kernel drivers to Xen Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/include/xen/sizes.h | 48 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/xen/include/xen/sizes.h b/xen/include/xen/sizes.h new file mode 100644 index 0000000..f7b728d --- /dev/null +++ b/xen/include/xen/sizes.h @@ -0,0 +1,48 @@ +#ifndef __XEN_SIZES_H__ +#define __XEN_SIZES_H__ + +/* + * Taken from kernel code include/linux/size.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#define SZ_1 0x00000001 +#define SZ_2 0x00000002 +#define SZ_4 0x00000004 +#define SZ_8 0x00000008 +#define SZ_16 0x00000010 +#define SZ_32 0x00000020 +#define SZ_64 0x00000040 +#define SZ_128 0x00000080 +#define SZ_256 0x00000100 +#define SZ_512 0x00000200 + +#define SZ_1K 0x00000400 +#define SZ_2K 0x00000800 +#define SZ_4K 0x00001000 +#define SZ_8K 0x00002000 +#define SZ_16K 0x00004000 +#define SZ_32K 0x00008000 +#define SZ_64K 0x00010000 +#define SZ_128K 0x00020000 +#define SZ_256K 0x00040000 +#define SZ_512K 0x00080000 + +#define SZ_1M 0x00100000 +#define SZ_2M 0x00200000 +#define SZ_4M 0x00400000 +#define SZ_8M 0x00800000 +#define SZ_16M 0x01000000 +#define SZ_32M 0x02000000 +#define SZ_64M 0x04000000 +#define SZ_128M 0x08000000 +#define SZ_256M 0x10000000 +#define SZ_512M 0x20000000 + +#define SZ_1G 0x40000000 +#define SZ_2G 0x80000000 + +#endif /* __XEN_SIZES_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiN-00039j-0Q; Thu, 04 Sep 2014 07:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiL-00039I-K9 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:17 +0000 Received: from [85.158.137.68:8075] by server-15.bemta-3.messagelabs.com id AD/1C-01573-05818045; Thu, 04 Sep 2014 07:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1409816654!12440269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23633 invoked from network); 4 Sep 2014 07:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiI-0007nx-L7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRiI-0003HJ-Jd for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:14 +0000 Date: Thu, 04 Sep 2014 07:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Stringify the register name in sysreg read write macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d725669833a72eadf30bc500c6ede18a52bb057 Author: Vijaya Kumar K AuthorDate: Wed Jul 23 19:11:48 2014 +0530 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:36 2014 +0100 xen/arm: Stringify the register name in sysreg read write macros The register name parameter in {READ,WRITE}_SYSREG{32,64} macros is replaced as register name in mrs and msr assembly instruction. If this register name is macro indirection, the register name is not replaced with designated macro. So replace the register name with __stringify macro, which replaces register name if it is macro Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/arm64/processor.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/arm64/processor.h b/xen/include/asm-arm/arm64/processor.h index 5bf0867..3a9c0cd 100644 --- a/xen/include/asm-arm/arm64/processor.h +++ b/xen/include/asm-arm/arm64/processor.h @@ -1,6 +1,8 @@ #ifndef __ASM_ARM_ARM64_PROCESSOR_H #define __ASM_ARM_ARM64_PROCESSOR_H +#include + #ifndef __ASSEMBLY__ /* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */ @@ -85,20 +87,20 @@ struct cpu_user_regs #define READ_SYSREG32(name) ({ \ uint32_t _r; \ - asm volatile("mrs %0, "#name : "=r" (_r)); \ + asm volatile("mrs %0, "__stringify(name) : "=r" (_r)); \ _r; }) #define WRITE_SYSREG32(v, name) do { \ uint32_t _r = v; \ - asm volatile("msr "#name", %0" : : "r" (_r)); \ + asm volatile("msr "__stringify(name)", %0" : : "r" (_r)); \ } while (0) #define WRITE_SYSREG64(v, name) do { \ uint64_t _r = v; \ - asm volatile("msr "#name", %0" : : "r" (_r)); \ + asm volatile("msr "__stringify(name)", %0" : : "r" (_r)); \ } while (0) #define READ_SYSREG64(name) ({ \ uint64_t _r; \ - asm volatile("mrs %0, "#name : "=r" (_r)); \ + asm volatile("mrs %0, "__stringify(name) : "=r" (_r)); \ _r; }) #define READ_SYSREG(name) READ_SYSREG64(name) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiN-00039j-0Q; Thu, 04 Sep 2014 07:44:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiL-00039I-K9 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:17 +0000 Received: from [85.158.137.68:8075] by server-15.bemta-3.messagelabs.com id AD/1C-01573-05818045; Thu, 04 Sep 2014 07:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1409816654!12440269!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23633 invoked from network); 4 Sep 2014 07:44:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiI-0007nx-L7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRiI-0003HJ-Jd for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:14 +0000 Date: Thu, 04 Sep 2014 07:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Stringify the register name in sysreg read write macros X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d725669833a72eadf30bc500c6ede18a52bb057 Author: Vijaya Kumar K AuthorDate: Wed Jul 23 19:11:48 2014 +0530 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:36 2014 +0100 xen/arm: Stringify the register name in sysreg read write macros The register name parameter in {READ,WRITE}_SYSREG{32,64} macros is replaced as register name in mrs and msr assembly instruction. If this register name is macro indirection, the register name is not replaced with designated macro. So replace the register name with __stringify macro, which replaces register name if it is macro Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/include/asm-arm/arm64/processor.h | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/include/asm-arm/arm64/processor.h b/xen/include/asm-arm/arm64/processor.h index 5bf0867..3a9c0cd 100644 --- a/xen/include/asm-arm/arm64/processor.h +++ b/xen/include/asm-arm/arm64/processor.h @@ -1,6 +1,8 @@ #ifndef __ASM_ARM_ARM64_PROCESSOR_H #define __ASM_ARM_ARM64_PROCESSOR_H +#include + #ifndef __ASSEMBLY__ /* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */ @@ -85,20 +87,20 @@ struct cpu_user_regs #define READ_SYSREG32(name) ({ \ uint32_t _r; \ - asm volatile("mrs %0, "#name : "=r" (_r)); \ + asm volatile("mrs %0, "__stringify(name) : "=r" (_r)); \ _r; }) #define WRITE_SYSREG32(v, name) do { \ uint32_t _r = v; \ - asm volatile("msr "#name", %0" : : "r" (_r)); \ + asm volatile("msr "__stringify(name)", %0" : : "r" (_r)); \ } while (0) #define WRITE_SYSREG64(v, name) do { \ uint64_t _r = v; \ - asm volatile("msr "#name", %0" : : "r" (_r)); \ + asm volatile("msr "__stringify(name)", %0" : : "r" (_r)); \ } while (0) #define READ_SYSREG64(name) ({ \ uint64_t _r; \ - asm volatile("mrs %0, "#name : "=r" (_r)); \ + asm volatile("mrs %0, "__stringify(name) : "=r" (_r)); \ _r; }) #define READ_SYSREG(name) READ_SYSREG64(name) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiX-0003B1-37; Thu, 04 Sep 2014 07:44:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiV-0003As-Da for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:27 +0000 Received: from [85.158.139.211:30547] by server-15.bemta-5.messagelabs.com id 29/0B-12002-A5818045; Thu, 04 Sep 2014 07:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1409816665!12400009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9261 invoked from network); 4 Sep 2014 07:44:26 -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; 4 Sep 2014 07:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiS-0007oJ-Qf for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRiS-0003Hi-Oy for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:24 +0000 Date: Thu, 04 Sep 2014 07:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: add consistency check to REMOVE p2m changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2add6eaf5b66f558d711d28c9cb5761eae2d1368 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:36 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/arm: add consistency check to REMOVE p2m changes Currently, the REMOVE case of the switch in apply_p2m_changes() does not perform any consistency check on the mapping to be removed. More in detail, the code does not check if the guest address to be unmapped is actually mapped to the machine address given as a parameter. This commit adds the above-described consistency check to the REMOVE path of apply_p2m_changes() and lets a warning be emitted when trying to remove a non-existent mapping. This is instrumental to one of the following commits, which implements the possibility to trigger the removal of p2m ranges via the memory_mapping DOMCTL for ARM. Signed-off-by: Arianna Avanzini Acked-by: Stefano Stabellini Reviewed-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Ian Campbell Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 143199b..8f83d17 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -601,6 +601,7 @@ static int apply_one_level(struct domain *d, { /* Progress up to next boundary */ *addr = (*addr + level_size) & level_mask; + *maddr = (*maddr + level_size) & level_mask; return P2M_ONE_PROGRESS_NOP; } @@ -632,12 +633,29 @@ static int apply_one_level(struct domain *d, } } + /* + * Ensure that the guest address addr currently being + * handled (that is in the range given as argument to + * this function) is actually mapped to the corresponding + * machine address in the specified range. maddr here is + * the machine address given to the function, while + * orig_pte.p2m.base is the machine frame number actually + * mapped to the guest address: check if the two correspond. + */ + if ( op == REMOVE && + pfn_to_paddr(orig_pte.p2m.base) != *maddr ) + printk(XENLOG_G_WARNING + "p2m_remove dom%d: mapping at %"PRIpaddr" is of maddr %"PRIpaddr" not %"PRIpaddr" as expected\n", + d->domain_id, *addr, pfn_to_paddr(orig_pte.p2m.base), + *maddr); + *flush = true; memset(&pte, 0x00, sizeof(pte)); p2m_write_pte(entry, pte, flush_cache); *addr += level_size; + *maddr += level_size; p2m->stats.mappings[level]--; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiX-0003B1-37; Thu, 04 Sep 2014 07:44:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiV-0003As-Da for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:27 +0000 Received: from [85.158.139.211:30547] by server-15.bemta-5.messagelabs.com id 29/0B-12002-A5818045; Thu, 04 Sep 2014 07:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1409816665!12400009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9261 invoked from network); 4 Sep 2014 07:44:26 -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; 4 Sep 2014 07:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiS-0007oJ-Qf for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRiS-0003Hi-Oy for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:24 +0000 Date: Thu, 04 Sep 2014 07:44:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: add consistency check to REMOVE p2m changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2add6eaf5b66f558d711d28c9cb5761eae2d1368 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:36 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/arm: add consistency check to REMOVE p2m changes Currently, the REMOVE case of the switch in apply_p2m_changes() does not perform any consistency check on the mapping to be removed. More in detail, the code does not check if the guest address to be unmapped is actually mapped to the machine address given as a parameter. This commit adds the above-described consistency check to the REMOVE path of apply_p2m_changes() and lets a warning be emitted when trying to remove a non-existent mapping. This is instrumental to one of the following commits, which implements the possibility to trigger the removal of p2m ranges via the memory_mapping DOMCTL for ARM. Signed-off-by: Arianna Avanzini Acked-by: Stefano Stabellini Reviewed-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Ian Campbell Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 143199b..8f83d17 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -601,6 +601,7 @@ static int apply_one_level(struct domain *d, { /* Progress up to next boundary */ *addr = (*addr + level_size) & level_mask; + *maddr = (*maddr + level_size) & level_mask; return P2M_ONE_PROGRESS_NOP; } @@ -632,12 +633,29 @@ static int apply_one_level(struct domain *d, } } + /* + * Ensure that the guest address addr currently being + * handled (that is in the range given as argument to + * this function) is actually mapped to the corresponding + * machine address in the specified range. maddr here is + * the machine address given to the function, while + * orig_pte.p2m.base is the machine frame number actually + * mapped to the guest address: check if the two correspond. + */ + if ( op == REMOVE && + pfn_to_paddr(orig_pte.p2m.base) != *maddr ) + printk(XENLOG_G_WARNING + "p2m_remove dom%d: mapping at %"PRIpaddr" is of maddr %"PRIpaddr" not %"PRIpaddr" as expected\n", + d->domain_id, *addr, pfn_to_paddr(orig_pte.p2m.base), + *maddr); + *flush = true; memset(&pte, 0x00, sizeof(pte)); p2m_write_pte(entry, pte, flush_cache); *addr += level_size; + *maddr += level_size; p2m->stats.mappings[level]--; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRih-0003CZ-60; Thu, 04 Sep 2014 07:44:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRif-0003CD-Jt for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:37 +0000 Received: from [85.158.137.68:15938] by server-15.bemta-3.messagelabs.com id 74/9C-01573-46818045; Thu, 04 Sep 2014 07:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1409816675!12390532!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27317 invoked from network); 4 Sep 2014 07:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRic-0007oR-Vn for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRic-0003I9-UE for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:34 +0000 Date: Thu, 04 Sep 2014 07:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: unmap partially-mapped memory regions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b25423aee137f33f136f539af2d85c7df2b7566 Author: Arianna Avanzini AuthorDate: Tue Sep 2 01:47:34 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/arm: unmap partially-mapped memory regions This commit modifies the function apply_p2m_changes() so that it destroys changes performed while mapping a memory region, if errors are seen during the operation. The implemented behaviour includes destroying only mappings created during the latest invocation of apply_p2m_changes(). This is useful to avoid that memory areas remain partially accessible to guests. Signed-off-by: Arianna Avanzini Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8f83d17..ede839d 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -440,6 +440,14 @@ static bool_t is_mapping_aligned(const paddr_t start_gpaddr, #define P2M_ONE_PROGRESS_NOP 0x1 #define P2M_ONE_PROGRESS 0x10 +/* Helpers to lookup the properties of each level */ +static const paddr_t level_sizes[] = + { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; +static const paddr_t level_masks[] = + { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; +static const paddr_t level_shifts[] = + { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; + /* * 0 == (P2M_ONE_DESCEND) continue to descend the tree * +ve == (P2M_ONE_PROGRESS_*) handled at this level, continue, flush, @@ -460,13 +468,6 @@ static int apply_one_level(struct domain *d, int mattr, p2m_type_t t) { - /* Helpers to lookup the properties of each level */ - const paddr_t level_sizes[] = - { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; - const paddr_t level_masks[] = - { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; - const paddr_t level_shifts[] = - { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; const paddr_t level_size = level_sizes[level]; const paddr_t level_mask = level_masks[level]; const paddr_t level_shift = level_shifts[level]; @@ -713,7 +714,8 @@ static int apply_p2m_changes(struct domain *d, int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; lpae_t *first = NULL, *second = NULL, *third = NULL; - paddr_t addr; + paddr_t addr, orig_maddr = maddr; + unsigned int level = 0; unsigned long cur_first_page = ~0, cur_first_offset = ~0, cur_second_offset = ~0; @@ -769,8 +771,9 @@ static int apply_p2m_changes(struct domain *d, * current hardware doesn't support super page mappings at * level 0 anyway */ + level = 1; ret = apply_one_level(d, &first[first_table_offset(addr)], - 1, flush_pt, op, + level, flush_pt, op, start_gpaddr, end_gpaddr, &addr, &maddr, &flush, mattr, t); @@ -790,8 +793,9 @@ static int apply_p2m_changes(struct domain *d, } /* else: second already valid */ + level = 2; ret = apply_one_level(d,&second[second_table_offset(addr)], - 2, flush_pt, op, + level, flush_pt, op, start_gpaddr, end_gpaddr, &addr, &maddr, &flush, mattr, t); @@ -809,8 +813,9 @@ static int apply_p2m_changes(struct domain *d, cur_second_offset = second_table_offset(addr); } + level = 3; ret = apply_one_level(d, &third[third_table_offset(addr)], - 3, flush_pt, op, + level, flush_pt, op, start_gpaddr, end_gpaddr, &addr, &maddr, &flush, mattr, t); @@ -844,6 +849,20 @@ out: if (third) unmap_domain_page(third); if (second) unmap_domain_page(second); if (first) unmap_domain_page(first); + if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && + addr != start_gpaddr ) + { + BUG_ON(addr == end_gpaddr); + /* + * addr keeps the address of the last successfully-inserted mapping, + * while apply_p2m_changes() considers an address range which is + * exclusive of end_gpaddr: add level_size to addr to obtain the + * right end of the range + */ + apply_p2m_changes(d, REMOVE, + start_gpaddr, addr + level_sizes[level], orig_maddr, + mattr, p2m_invalid); + } spin_unlock(&p2m->lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRih-0003CZ-60; Thu, 04 Sep 2014 07:44:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRif-0003CD-Jt for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:37 +0000 Received: from [85.158.137.68:15938] by server-15.bemta-3.messagelabs.com id 74/9C-01573-46818045; Thu, 04 Sep 2014 07:44:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1409816675!12390532!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27317 invoked from network); 4 Sep 2014 07:44:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRic-0007oR-Vn for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRic-0003I9-UE for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:34 +0000 Date: Thu, 04 Sep 2014 07:44:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/arm: unmap partially-mapped memory regions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b25423aee137f33f136f539af2d85c7df2b7566 Author: Arianna Avanzini AuthorDate: Tue Sep 2 01:47:34 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/arm: unmap partially-mapped memory regions This commit modifies the function apply_p2m_changes() so that it destroys changes performed while mapping a memory region, if errors are seen during the operation. The implemented behaviour includes destroying only mappings created during the latest invocation of apply_p2m_changes(). This is useful to avoid that memory areas remain partially accessible to guests. Signed-off-by: Arianna Avanzini Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 41 ++++++++++++++++++++++++++++++----------- 1 files changed, 30 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8f83d17..ede839d 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -440,6 +440,14 @@ static bool_t is_mapping_aligned(const paddr_t start_gpaddr, #define P2M_ONE_PROGRESS_NOP 0x1 #define P2M_ONE_PROGRESS 0x10 +/* Helpers to lookup the properties of each level */ +static const paddr_t level_sizes[] = + { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; +static const paddr_t level_masks[] = + { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; +static const paddr_t level_shifts[] = + { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; + /* * 0 == (P2M_ONE_DESCEND) continue to descend the tree * +ve == (P2M_ONE_PROGRESS_*) handled at this level, continue, flush, @@ -460,13 +468,6 @@ static int apply_one_level(struct domain *d, int mattr, p2m_type_t t) { - /* Helpers to lookup the properties of each level */ - const paddr_t level_sizes[] = - { ZEROETH_SIZE, FIRST_SIZE, SECOND_SIZE, THIRD_SIZE }; - const paddr_t level_masks[] = - { ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK }; - const paddr_t level_shifts[] = - { ZEROETH_SHIFT, FIRST_SHIFT, SECOND_SHIFT, THIRD_SHIFT }; const paddr_t level_size = level_sizes[level]; const paddr_t level_mask = level_masks[level]; const paddr_t level_shift = level_shifts[level]; @@ -713,7 +714,8 @@ static int apply_p2m_changes(struct domain *d, int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; lpae_t *first = NULL, *second = NULL, *third = NULL; - paddr_t addr; + paddr_t addr, orig_maddr = maddr; + unsigned int level = 0; unsigned long cur_first_page = ~0, cur_first_offset = ~0, cur_second_offset = ~0; @@ -769,8 +771,9 @@ static int apply_p2m_changes(struct domain *d, * current hardware doesn't support super page mappings at * level 0 anyway */ + level = 1; ret = apply_one_level(d, &first[first_table_offset(addr)], - 1, flush_pt, op, + level, flush_pt, op, start_gpaddr, end_gpaddr, &addr, &maddr, &flush, mattr, t); @@ -790,8 +793,9 @@ static int apply_p2m_changes(struct domain *d, } /* else: second already valid */ + level = 2; ret = apply_one_level(d,&second[second_table_offset(addr)], - 2, flush_pt, op, + level, flush_pt, op, start_gpaddr, end_gpaddr, &addr, &maddr, &flush, mattr, t); @@ -809,8 +813,9 @@ static int apply_p2m_changes(struct domain *d, cur_second_offset = second_table_offset(addr); } + level = 3; ret = apply_one_level(d, &third[third_table_offset(addr)], - 3, flush_pt, op, + level, flush_pt, op, start_gpaddr, end_gpaddr, &addr, &maddr, &flush, mattr, t); @@ -844,6 +849,20 @@ out: if (third) unmap_domain_page(third); if (second) unmap_domain_page(second); if (first) unmap_domain_page(first); + if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && + addr != start_gpaddr ) + { + BUG_ON(addr == end_gpaddr); + /* + * addr keeps the address of the last successfully-inserted mapping, + * while apply_p2m_changes() considers an address range which is + * exclusive of end_gpaddr: add level_size to addr to obtain the + * right end of the range + */ + apply_p2m_changes(d, REMOVE, + start_gpaddr, addr + level_sizes[level], orig_maddr, + mattr, p2m_invalid); + } spin_unlock(&p2m->lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiq-0003Ei-No; Thu, 04 Sep 2014 07:44:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRip-0003EU-Rl for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:48 +0000 Received: from [85.158.137.68:3013] by server-16.bemta-3.messagelabs.com id 53/C7-01431-F6818045; Thu, 04 Sep 2014 07:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1409816685!8671934!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8161 invoked from network); 4 Sep 2014 07:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRin-0007oY-5X for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRin-0003Ic-3e for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:45 +0000 Date: Thu, 04 Sep 2014 07:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/x86: warn if to-be-removed mapping does not exist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28b5f84209dfef73efeaff23871cd081c383c6b4 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:38 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/x86: warn if to-be-removed mapping does not exist Currently, when a memory mapping is removed with the memory_mapping DOMCTL, no check is performed on the existence of such a mapping. This commit adds such a consistency check to the code performing the unmap, emitting a warning message if the check fails. Signed-off-by: Arianna Avanzini Reviewed-by: Jan Beulich Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/x86/domctl.c | 4 ++-- xen/arch/x86/mm/p2m.c | 12 ++++++++---- xen/common/memory.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d1517c4..1ead690 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -679,7 +679,7 @@ long arch_do_domctl( "memory_map:fail: dom%d gfn=%lx mfn=%lx ret:%ld\n", d->domain_id, gfn + i, mfn + i, ret); while ( i-- ) - clear_mmio_p2m_entry(d, gfn + i); + clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); if ( iomem_deny_access(d, mfn, mfn + nr_mfns - 1) && is_hardware_domain(current->domain) ) printk(XENLOG_ERR @@ -699,7 +699,7 @@ long arch_do_domctl( if ( paging_mode_translate(d) ) for ( i = 0; i < nr_mfns; i++ ) { - ret = clear_mmio_p2m_entry(d, gfn + i); + ret = clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); if ( ret ) tmp_rc = ret; } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index c2e89e1..2586a3c 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -859,10 +859,10 @@ int set_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) } /* Returns: 0 for success, -errno for failure */ -int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn) +int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) { int rc = -EINVAL; - mfn_t mfn; + mfn_t actual_mfn; p2m_access_t a; p2m_type_t t; struct p2m_domain *p2m = p2m_get_hostp2m(d); @@ -871,15 +871,19 @@ int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn) return -EIO; gfn_lock(p2m, gfn, 0); - mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); + actual_mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); /* Do not use mfn_valid() here as it will usually fail for MMIO pages. */ - if ( (INVALID_MFN == mfn_x(mfn)) || (t != p2m_mmio_direct) ) + if ( (INVALID_MFN == mfn_x(actual_mfn)) || (t != p2m_mmio_direct) ) { gdprintk(XENLOG_ERR, "gfn_to_mfn failed! gfn=%08lx type:%d\n", gfn, t); goto out; } + if ( mfn_x(mfn) != mfn_x(actual_mfn) ) + gdprintk(XENLOG_WARNING, + "no mapping between mfn %08lx and gfn %08lx\n", + mfn_x(mfn), gfn); rc = p2m_set_entry(p2m, gfn, _mfn(INVALID_MFN), PAGE_ORDER_4K, p2m_invalid, p2m->default_access); diff --git a/xen/common/memory.c b/xen/common/memory.c index c2dd31b..2433111 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -206,7 +206,7 @@ int guest_remove_page(struct domain *d, unsigned long gmfn) } if ( p2mt == p2m_mmio_direct ) { - clear_mmio_p2m_entry(d, gmfn); + clear_mmio_p2m_entry(d, gmfn, _mfn(mfn)); put_gfn(d, gmfn); return 1; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 3975e32..d19f50c 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -534,7 +534,7 @@ int p2m_is_logdirty_range(struct p2m_domain *, unsigned long start, /* Set mmio addresses in the p2m table (for pass-through) */ int set_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); -int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn); +int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); /* Add foreign mapping to the guest's p2m table. */ int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRiq-0003Ei-No; Thu, 04 Sep 2014 07:44:48 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRip-0003EU-Rl for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:48 +0000 Received: from [85.158.137.68:3013] by server-16.bemta-3.messagelabs.com id 53/C7-01431-F6818045; Thu, 04 Sep 2014 07:44:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1409816685!8671934!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8161 invoked from network); 4 Sep 2014 07:44:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRin-0007oY-5X for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRin-0003Ic-3e for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:45 +0000 Date: Thu, 04 Sep 2014 07:44:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/x86: warn if to-be-removed mapping does not exist X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28b5f84209dfef73efeaff23871cd081c383c6b4 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:38 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/x86: warn if to-be-removed mapping does not exist Currently, when a memory mapping is removed with the memory_mapping DOMCTL, no check is performed on the existence of such a mapping. This commit adds such a consistency check to the code performing the unmap, emitting a warning message if the check fails. Signed-off-by: Arianna Avanzini Reviewed-by: Jan Beulich Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/x86/domctl.c | 4 ++-- xen/arch/x86/mm/p2m.c | 12 ++++++++---- xen/common/memory.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index d1517c4..1ead690 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -679,7 +679,7 @@ long arch_do_domctl( "memory_map:fail: dom%d gfn=%lx mfn=%lx ret:%ld\n", d->domain_id, gfn + i, mfn + i, ret); while ( i-- ) - clear_mmio_p2m_entry(d, gfn + i); + clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); if ( iomem_deny_access(d, mfn, mfn + nr_mfns - 1) && is_hardware_domain(current->domain) ) printk(XENLOG_ERR @@ -699,7 +699,7 @@ long arch_do_domctl( if ( paging_mode_translate(d) ) for ( i = 0; i < nr_mfns; i++ ) { - ret = clear_mmio_p2m_entry(d, gfn + i); + ret = clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); if ( ret ) tmp_rc = ret; } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index c2e89e1..2586a3c 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -859,10 +859,10 @@ int set_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) } /* Returns: 0 for success, -errno for failure */ -int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn) +int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn) { int rc = -EINVAL; - mfn_t mfn; + mfn_t actual_mfn; p2m_access_t a; p2m_type_t t; struct p2m_domain *p2m = p2m_get_hostp2m(d); @@ -871,15 +871,19 @@ int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn) return -EIO; gfn_lock(p2m, gfn, 0); - mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); + actual_mfn = p2m->get_entry(p2m, gfn, &t, &a, 0, NULL); /* Do not use mfn_valid() here as it will usually fail for MMIO pages. */ - if ( (INVALID_MFN == mfn_x(mfn)) || (t != p2m_mmio_direct) ) + if ( (INVALID_MFN == mfn_x(actual_mfn)) || (t != p2m_mmio_direct) ) { gdprintk(XENLOG_ERR, "gfn_to_mfn failed! gfn=%08lx type:%d\n", gfn, t); goto out; } + if ( mfn_x(mfn) != mfn_x(actual_mfn) ) + gdprintk(XENLOG_WARNING, + "no mapping between mfn %08lx and gfn %08lx\n", + mfn_x(mfn), gfn); rc = p2m_set_entry(p2m, gfn, _mfn(INVALID_MFN), PAGE_ORDER_4K, p2m_invalid, p2m->default_access); diff --git a/xen/common/memory.c b/xen/common/memory.c index c2dd31b..2433111 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -206,7 +206,7 @@ int guest_remove_page(struct domain *d, unsigned long gmfn) } if ( p2mt == p2m_mmio_direct ) { - clear_mmio_p2m_entry(d, gmfn); + clear_mmio_p2m_entry(d, gmfn, _mfn(mfn)); put_gfn(d, gmfn); return 1; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 3975e32..d19f50c 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -534,7 +534,7 @@ int p2m_is_logdirty_range(struct p2m_domain *, unsigned long start, /* Set mmio addresses in the p2m table (for pass-through) */ int set_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); -int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn); +int clear_mmio_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); /* Add foreign mapping to the guest's p2m table. */ int p2m_add_foreign(struct domain *tdom, unsigned long fgfn, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRj0-0003HC-QX; Thu, 04 Sep 2014 07:44:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRj0-0003Gw-2P for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:58 +0000 Received: from [85.158.137.68:23970] by server-6.bemta-3.messagelabs.com id 9C/67-29521-97818045; Thu, 04 Sep 2014 07:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1409816695!12397349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21808 invoked from network); 4 Sep 2014 07:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRix-0007oh-AY for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRix-0003JA-8z for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:55 +0000 Date: Thu, 04 Sep 2014 07:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/x86: cleanup memory_mapping DOMCTL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ff449cea90cc837b983becb328250bcafd0641f Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:39 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/x86: cleanup memory_mapping DOMCTL This commit lets the end mfn be computed only once while handling a XEN_DOMCTL_memory_mapping hypercall. Also, the name of the tmp_rc local variable is changed to rc. Signed-off-by: Arianna Avanzini Acked-by: Jan Beulich Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/x86/domctl.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 1ead690..9cdbc3d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -646,19 +646,20 @@ long arch_do_domctl( unsigned long gfn = domctl->u.memory_mapping.first_gfn; unsigned long mfn = domctl->u.memory_mapping.first_mfn; unsigned long nr_mfns = domctl->u.memory_mapping.nr_mfns; + unsigned long mfn_end = mfn + nr_mfns - 1; int add = domctl->u.memory_mapping.add_mapping; ret = -EINVAL; - if ( (mfn + nr_mfns - 1) < mfn || /* wrap? */ - ((mfn | (mfn + nr_mfns - 1)) >> (paddr_bits - PAGE_SHIFT)) || + if ( mfn_end < mfn || /* wrap? */ + ((mfn | mfn_end) >> (paddr_bits - PAGE_SHIFT)) || (gfn + nr_mfns - 1) < gfn ) /* wrap? */ break; ret = -EPERM; - if ( !iomem_access_permitted(current->domain, mfn, mfn + nr_mfns - 1) ) + if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) break; - ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn + nr_mfns - 1, add); + ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); if ( ret ) break; @@ -668,7 +669,7 @@ long arch_do_domctl( "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - ret = iomem_permit_access(d, mfn, mfn + nr_mfns - 1); + ret = iomem_permit_access(d, mfn, mfn_end); if ( !ret && paging_mode_translate(d) ) { for ( i = 0; !ret && i < nr_mfns; i++ ) @@ -680,17 +681,17 @@ long arch_do_domctl( d->domain_id, gfn + i, mfn + i, ret); while ( i-- ) clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); - if ( iomem_deny_access(d, mfn, mfn + nr_mfns - 1) && + if ( iomem_deny_access(d, mfn, mfn_end) && is_hardware_domain(current->domain) ) printk(XENLOG_ERR "memory_map: failed to deny dom%d access to [%lx,%lx]\n", - d->domain_id, mfn, mfn + nr_mfns - 1); + d->domain_id, mfn, mfn_end); } } } else { - int tmp_rc = 0; + int rc = 0; printk(XENLOG_G_INFO "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", @@ -701,16 +702,16 @@ long arch_do_domctl( { ret = clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); if ( ret ) - tmp_rc = ret; + rc = ret; } - ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1); + ret = iomem_deny_access(d, mfn, mfn_end); if ( !ret ) - ret = tmp_rc; + ret = rc; if ( ret && is_hardware_domain(current->domain) ) printk(XENLOG_ERR "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", - ret, tmp_rc ? "removing" : "denying", d->domain_id, - mfn, mfn + nr_mfns - 1); + ret, rc ? "removing" : "denying", d->domain_id, + mfn, mfn_end); } /* Do this unconditionally to cover errors on above failure paths. */ memory_type_changed(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:44:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRj0-0003HC-QX; Thu, 04 Sep 2014 07:44:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRj0-0003Gw-2P for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:58 +0000 Received: from [85.158.137.68:23970] by server-6.bemta-3.messagelabs.com id 9C/67-29521-97818045; Thu, 04 Sep 2014 07:44:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1409816695!12397349!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21808 invoked from network); 4 Sep 2014 07:44:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:44:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRix-0007oh-AY for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRix-0003JA-8z for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:44:55 +0000 Date: Thu, 04 Sep 2014 07:44:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arch/x86: cleanup memory_mapping DOMCTL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ff449cea90cc837b983becb328250bcafd0641f Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:39 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 arch/x86: cleanup memory_mapping DOMCTL This commit lets the end mfn be computed only once while handling a XEN_DOMCTL_memory_mapping hypercall. Also, the name of the tmp_rc local variable is changed to rc. Signed-off-by: Arianna Avanzini Acked-by: Jan Beulich Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/x86/domctl.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 1ead690..9cdbc3d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -646,19 +646,20 @@ long arch_do_domctl( unsigned long gfn = domctl->u.memory_mapping.first_gfn; unsigned long mfn = domctl->u.memory_mapping.first_mfn; unsigned long nr_mfns = domctl->u.memory_mapping.nr_mfns; + unsigned long mfn_end = mfn + nr_mfns - 1; int add = domctl->u.memory_mapping.add_mapping; ret = -EINVAL; - if ( (mfn + nr_mfns - 1) < mfn || /* wrap? */ - ((mfn | (mfn + nr_mfns - 1)) >> (paddr_bits - PAGE_SHIFT)) || + if ( mfn_end < mfn || /* wrap? */ + ((mfn | mfn_end) >> (paddr_bits - PAGE_SHIFT)) || (gfn + nr_mfns - 1) < gfn ) /* wrap? */ break; ret = -EPERM; - if ( !iomem_access_permitted(current->domain, mfn, mfn + nr_mfns - 1) ) + if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) break; - ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn + nr_mfns - 1, add); + ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); if ( ret ) break; @@ -668,7 +669,7 @@ long arch_do_domctl( "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - ret = iomem_permit_access(d, mfn, mfn + nr_mfns - 1); + ret = iomem_permit_access(d, mfn, mfn_end); if ( !ret && paging_mode_translate(d) ) { for ( i = 0; !ret && i < nr_mfns; i++ ) @@ -680,17 +681,17 @@ long arch_do_domctl( d->domain_id, gfn + i, mfn + i, ret); while ( i-- ) clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); - if ( iomem_deny_access(d, mfn, mfn + nr_mfns - 1) && + if ( iomem_deny_access(d, mfn, mfn_end) && is_hardware_domain(current->domain) ) printk(XENLOG_ERR "memory_map: failed to deny dom%d access to [%lx,%lx]\n", - d->domain_id, mfn, mfn + nr_mfns - 1); + d->domain_id, mfn, mfn_end); } } } else { - int tmp_rc = 0; + int rc = 0; printk(XENLOG_G_INFO "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", @@ -701,16 +702,16 @@ long arch_do_domctl( { ret = clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); if ( ret ) - tmp_rc = ret; + rc = ret; } - ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1); + ret = iomem_deny_access(d, mfn, mfn_end); if ( !ret ) - ret = tmp_rc; + ret = rc; if ( ret && is_hardware_domain(current->domain) ) printk(XENLOG_ERR "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", - ret, tmp_rc ? "removing" : "denying", d->domain_id, - mfn, mfn + nr_mfns - 1); + ret, rc ? "removing" : "denying", d->domain_id, + mfn, mfn_end); } /* Do this unconditionally to cover errors on above failure paths. */ memory_type_changed(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRjG-0003JT-TT; Thu, 04 Sep 2014 07:45:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjF-0003J9-HF for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:13 +0000 Received: from [85.158.143.35:31358] by server-3.bemta-4.messagelabs.com id 55/B2-06192-88818045; Thu, 04 Sep 2014 07:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1409816711!10049999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21215 invoked from network); 4 Sep 2014 07:45:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjC-0007ph-QZ for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjC-0003Ko-FM for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:10 +0000 Date: Thu, 04 Sep 2014 07:45:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/common: add ARM stub for the function memory_type_changed() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f744670a31880be376f883c72a4f272f8942c5c Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:40 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 xen/common: add ARM stub for the function memory_type_changed() MTRR-related code is not available for the ARM architecture. Given that the memory_type_changed() function would be called also from common code, its invocation is currently ifdef'd out to be only compiled in on an x86 machine. This commit adds an empty stub for ARM. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/arm/p2m.c | 4 ++++ xen/common/domctl.c | 2 -- xen/include/asm-arm/p2m.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ede839d..05d83b1 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -47,6 +47,10 @@ void p2m_dump_info(struct domain *d) spin_unlock(&p2m->lock); } +void memory_type_changed(struct domain *d) +{ +} + void dump_p2m_lookup(struct domain *d, paddr_t addr) { struct p2m_domain *p2m = &d->arch.p2m; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index c326aba..24102c0 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -897,10 +897,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = iomem_permit_access(d, mfn, mfn + nr_mfns - 1); else ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1); -#ifdef CONFIG_X86 if ( !ret ) memory_type_changed(d); -#endif } break; diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 06c93a0..13fea36 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -5,6 +5,8 @@ struct domain; +extern void memory_type_changed(struct domain *); + /* Per-p2m-table state */ struct p2m_domain { /* Lock that protects updates to the p2m */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRjG-0003JT-TT; Thu, 04 Sep 2014 07:45:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjF-0003J9-HF for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:13 +0000 Received: from [85.158.143.35:31358] by server-3.bemta-4.messagelabs.com id 55/B2-06192-88818045; Thu, 04 Sep 2014 07:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1409816711!10049999!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21215 invoked from network); 4 Sep 2014 07:45:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjC-0007ph-QZ for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjC-0003Ko-FM for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:10 +0000 Date: Thu, 04 Sep 2014 07:45:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/common: add ARM stub for the function memory_type_changed() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4f744670a31880be376f883c72a4f272f8942c5c Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:40 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 xen/common: add ARM stub for the function memory_type_changed() MTRR-related code is not available for the ARM architecture. Given that the memory_type_changed() function would be called also from common code, its invocation is currently ifdef'd out to be only compiled in on an x86 machine. This commit adds an empty stub for ARM. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/arm/p2m.c | 4 ++++ xen/common/domctl.c | 2 -- xen/include/asm-arm/p2m.h | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ede839d..05d83b1 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -47,6 +47,10 @@ void p2m_dump_info(struct domain *d) spin_unlock(&p2m->lock); } +void memory_type_changed(struct domain *d) +{ +} + void dump_p2m_lookup(struct domain *d, paddr_t addr) { struct p2m_domain *p2m = &d->arch.p2m; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index c326aba..24102c0 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -897,10 +897,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) ret = iomem_permit_access(d, mfn, mfn + nr_mfns - 1); else ret = iomem_deny_access(d, mfn, mfn + nr_mfns - 1); -#ifdef CONFIG_X86 if ( !ret ) memory_type_changed(d); -#endif } break; diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 06c93a0..13fea36 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -5,6 +5,8 @@ struct domain; +extern void memory_type_changed(struct domain *); + /* Per-p2m-table state */ struct p2m_domain { /* Lock that protects updates to the p2m */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRjQ-0003LT-W7; Thu, 04 Sep 2014 07:45:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjP-0003L6-JF for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:23 +0000 Received: from [85.158.143.35:39585] by server-1.bemta-4.messagelabs.com id E8/E3-05872-29818045; Thu, 04 Sep 2014 07:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1409816721!13518800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32433 invoked from network); 4 Sep 2014 07:45:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjN-0007pn-1u for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjM-0003LH-Vf for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:21 +0000 Date: Thu, 04 Sep 2014 07:45:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/x86: factor out map and unmap from the memory_mapping DOMCTL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 276a9b6ea17644ebe6bf111ed365d8c3b765f10a Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:41 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 xen/x86: factor out map and unmap from the memory_mapping DOMCTL This commit factors out from the XEN_DOMCTL_memory_mapping hypercall implementation, currently available only for x86, the operations related to memory ranges map and unmap. The code is factored out into two {map|unmap}_mmio_regions() functions for x86, that will match the corresponding pair of ARM functions when the DOMCTL will be moved to common code in the following commit. This commit also adds an unmap_mmio_regions() function for ARM so that the following transition to common code is cleaner. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/arm/p2m.c | 12 ++++++++++++ xen/arch/x86/domctl.c | 19 +++++-------------- xen/arch/x86/mm/p2m.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/p2m.h | 4 ++++ xen/include/asm-x86/p2m.h | 12 ++++++++++++ 5 files changed, 78 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 05d83b1..c016450 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -893,6 +893,18 @@ int map_mmio_regions(struct domain *d, MATTR_DEV, p2m_mmio_direct); } +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr_mfns, + unsigned long mfn) +{ + return apply_p2m_changes(d, REMOVE, + pfn_to_paddr(start_gfn), + pfn_to_paddr(start_gfn + nr_mfns), + pfn_to_paddr(mfn), + MATTR_DEV, p2m_invalid); +} + int guest_physmap_add_entry(struct domain *d, unsigned long gpfn, unsigned long mfn, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9cdbc3d..caa3be6 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -670,17 +670,14 @@ long arch_do_domctl( d->domain_id, gfn, mfn, nr_mfns); ret = iomem_permit_access(d, mfn, mfn_end); - if ( !ret && paging_mode_translate(d) ) + if ( !ret ) { - for ( i = 0; !ret && i < nr_mfns; i++ ) - ret = set_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); + ret = map_mmio_regions(d, gfn, nr_mfns, mfn); if ( ret ) { printk(XENLOG_G_WARNING - "memory_map:fail: dom%d gfn=%lx mfn=%lx ret:%ld\n", - d->domain_id, gfn + i, mfn + i, ret); - while ( i-- ) - clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); + "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", + d->domain_id, gfn, mfn, nr_mfns, ret); if ( iomem_deny_access(d, mfn, mfn_end) && is_hardware_domain(current->domain) ) printk(XENLOG_ERR @@ -697,13 +694,7 @@ long arch_do_domctl( "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - if ( paging_mode_translate(d) ) - for ( i = 0; i < nr_mfns; i++ ) - { - ret = clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); - if ( ret ) - rc = ret; - } + rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); ret = iomem_deny_access(d, mfn, mfn_end); if ( !ret ) ret = rc; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 2586a3c..32776c3 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1725,6 +1725,51 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, return hostmode->gva_to_gfn(v, hostp2m, va, pfec); } +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn) +{ + int ret = 0; + unsigned long i; + + if ( !paging_mode_translate(d) ) + return 0; + + for ( i = 0; !ret && i < nr; i++ ) + { + ret = set_mmio_p2m_entry(d, start_gfn + i, _mfn(mfn + i)); + if ( ret ) + { + unmap_mmio_regions(d, start_gfn, i, mfn); + break; + } + } + + return ret; +} + +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn) +{ + int err = 0; + unsigned long i; + + if ( !paging_mode_translate(d) ) + return 0; + + for ( i = 0; i < nr; i++ ) + { + int ret = clear_mmio_p2m_entry(d, start_gfn + i, _mfn(mfn + i)); + if ( ret ) + err = ret; + } + + return err; +} + /*** Audit ***/ #if P2M_AUDIT diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 13fea36..648144f 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -108,6 +108,10 @@ int map_mmio_regions(struct domain *d, unsigned long start_gfn, unsigned long nr_mfns, unsigned long mfn); +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr_mfns, + unsigned long mfn); int guest_physmap_add_entry(struct domain *d, unsigned long gfn, diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index d19f50c..2a128ed 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -32,6 +32,18 @@ #include #include /* for pagetable_t */ +/* Map MMIO regions in the p2m: start_gfn and nr describe the range in + * the guest physical address space to map, starting from the machine + * frame number mfn. */ +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); + extern bool_t opt_hap_1gb, opt_hap_2mb; /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRjQ-0003LT-W7; Thu, 04 Sep 2014 07:45:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjP-0003L6-JF for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:23 +0000 Received: from [85.158.143.35:39585] by server-1.bemta-4.messagelabs.com id E8/E3-05872-29818045; Thu, 04 Sep 2014 07:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1409816721!13518800!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32433 invoked from network); 4 Sep 2014 07:45:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:22 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjN-0007pn-1u for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjM-0003LH-Vf for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:21 +0000 Date: Thu, 04 Sep 2014 07:45:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/x86: factor out map and unmap from the memory_mapping DOMCTL X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 276a9b6ea17644ebe6bf111ed365d8c3b765f10a Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:41 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 xen/x86: factor out map and unmap from the memory_mapping DOMCTL This commit factors out from the XEN_DOMCTL_memory_mapping hypercall implementation, currently available only for x86, the operations related to memory ranges map and unmap. The code is factored out into two {map|unmap}_mmio_regions() functions for x86, that will match the corresponding pair of ARM functions when the DOMCTL will be moved to common code in the following commit. This commit also adds an unmap_mmio_regions() function for ARM so that the following transition to common code is cleaner. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Jan Beulich Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/arm/p2m.c | 12 ++++++++++++ xen/arch/x86/domctl.c | 19 +++++-------------- xen/arch/x86/mm/p2m.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/p2m.h | 4 ++++ xen/include/asm-x86/p2m.h | 12 ++++++++++++ 5 files changed, 78 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 05d83b1..c016450 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -893,6 +893,18 @@ int map_mmio_regions(struct domain *d, MATTR_DEV, p2m_mmio_direct); } +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr_mfns, + unsigned long mfn) +{ + return apply_p2m_changes(d, REMOVE, + pfn_to_paddr(start_gfn), + pfn_to_paddr(start_gfn + nr_mfns), + pfn_to_paddr(mfn), + MATTR_DEV, p2m_invalid); +} + int guest_physmap_add_entry(struct domain *d, unsigned long gpfn, unsigned long mfn, diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 9cdbc3d..caa3be6 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -670,17 +670,14 @@ long arch_do_domctl( d->domain_id, gfn, mfn, nr_mfns); ret = iomem_permit_access(d, mfn, mfn_end); - if ( !ret && paging_mode_translate(d) ) + if ( !ret ) { - for ( i = 0; !ret && i < nr_mfns; i++ ) - ret = set_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); + ret = map_mmio_regions(d, gfn, nr_mfns, mfn); if ( ret ) { printk(XENLOG_G_WARNING - "memory_map:fail: dom%d gfn=%lx mfn=%lx ret:%ld\n", - d->domain_id, gfn + i, mfn + i, ret); - while ( i-- ) - clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); + "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", + d->domain_id, gfn, mfn, nr_mfns, ret); if ( iomem_deny_access(d, mfn, mfn_end) && is_hardware_domain(current->domain) ) printk(XENLOG_ERR @@ -697,13 +694,7 @@ long arch_do_domctl( "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - if ( paging_mode_translate(d) ) - for ( i = 0; i < nr_mfns; i++ ) - { - ret = clear_mmio_p2m_entry(d, gfn + i, _mfn(mfn + i)); - if ( ret ) - rc = ret; - } + rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); ret = iomem_deny_access(d, mfn, mfn_end); if ( !ret ) ret = rc; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 2586a3c..32776c3 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1725,6 +1725,51 @@ unsigned long paging_gva_to_gfn(struct vcpu *v, return hostmode->gva_to_gfn(v, hostp2m, va, pfec); } +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn) +{ + int ret = 0; + unsigned long i; + + if ( !paging_mode_translate(d) ) + return 0; + + for ( i = 0; !ret && i < nr; i++ ) + { + ret = set_mmio_p2m_entry(d, start_gfn + i, _mfn(mfn + i)); + if ( ret ) + { + unmap_mmio_regions(d, start_gfn, i, mfn); + break; + } + } + + return ret; +} + +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn) +{ + int err = 0; + unsigned long i; + + if ( !paging_mode_translate(d) ) + return 0; + + for ( i = 0; i < nr; i++ ) + { + int ret = clear_mmio_p2m_entry(d, start_gfn + i, _mfn(mfn + i)); + if ( ret ) + err = ret; + } + + return err; +} + /*** Audit ***/ #if P2M_AUDIT diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 13fea36..648144f 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -108,6 +108,10 @@ int map_mmio_regions(struct domain *d, unsigned long start_gfn, unsigned long nr_mfns, unsigned long mfn); +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr_mfns, + unsigned long mfn); int guest_physmap_add_entry(struct domain *d, unsigned long gfn, diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index d19f50c..2a128ed 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -32,6 +32,18 @@ #include #include /* for pagetable_t */ +/* Map MMIO regions in the p2m: start_gfn and nr describe the range in + * the guest physical address space to map, starting from the machine + * frame number mfn. */ +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); + extern bool_t opt_hap_1gb, opt_hap_2mb; /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRje-0003NK-46; Thu, 04 Sep 2014 07:45:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjc-0003Mx-Hi for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:36 +0000 Received: from [85.158.137.68:44408] by server-1.bemta-3.messagelabs.com id C5/9A-30185-F9818045; Thu, 04 Sep 2014 07:45:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1409816731!12404697!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31491 invoked from network); 4 Sep 2014 07:45:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjX-0007pv-84 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjX-0003Le-6b for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:31 +0000 Date: Thu, 04 Sep 2014 07:45:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/common: move the memory_mapping DOMCTL hypercall to common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 812f0d9fba35b6025b940fac512e959d9931a329 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:42 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 xen/common: move the memory_mapping DOMCTL hypercall to common code This commit moves to common code the implementation of the memory_mapping DOMCTL, currently available only for the x86 architecture. It also adds a definition for the PADDR_BITS constant for ARM, that is to be used in common code and currently not available for the ARM architecture. Signed-off-by: Arianna Avanzini Acked-by: Jan Beulich Acked-by: Julien Grall Tested-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Ian Campbell Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/arm/p2m.c | 8 ++-- xen/arch/x86/domctl.c | 68 ------------------------------------------ xen/common/domctl.c | 68 ++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/p2m.h | 15 ++------- xen/include/asm-x86/p2m.h | 13 +------- xen/include/xen/p2m-common.h | 16 ++++++++++ 6 files changed, 93 insertions(+), 95 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index c016450..fc8c0dd 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -883,24 +883,24 @@ int p2m_populate_ram(struct domain *d, int map_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long nr_mfns, + unsigned long nr, unsigned long mfn) { return apply_p2m_changes(d, INSERT, pfn_to_paddr(start_gfn), - pfn_to_paddr(start_gfn + nr_mfns), + pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_DEV, p2m_mmio_direct); } int unmap_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long nr_mfns, + unsigned long nr, unsigned long mfn) { return apply_p2m_changes(d, REMOVE, pfn_to_paddr(start_gfn), - pfn_to_paddr(start_gfn + nr_mfns), + pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_DEV, p2m_invalid); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index caa3be6..7a5de43 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -641,74 +641,6 @@ long arch_do_domctl( } break; - case XEN_DOMCTL_memory_mapping: - { - unsigned long gfn = domctl->u.memory_mapping.first_gfn; - unsigned long mfn = domctl->u.memory_mapping.first_mfn; - unsigned long nr_mfns = domctl->u.memory_mapping.nr_mfns; - unsigned long mfn_end = mfn + nr_mfns - 1; - int add = domctl->u.memory_mapping.add_mapping; - - ret = -EINVAL; - if ( mfn_end < mfn || /* wrap? */ - ((mfn | mfn_end) >> (paddr_bits - PAGE_SHIFT)) || - (gfn + nr_mfns - 1) < gfn ) /* wrap? */ - break; - - ret = -EPERM; - if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) - break; - - ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); - if ( ret ) - break; - - if ( add ) - { - printk(XENLOG_G_INFO - "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", - d->domain_id, gfn, mfn, nr_mfns); - - ret = iomem_permit_access(d, mfn, mfn_end); - if ( !ret ) - { - ret = map_mmio_regions(d, gfn, nr_mfns, mfn); - if ( ret ) - { - printk(XENLOG_G_WARNING - "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", - d->domain_id, gfn, mfn, nr_mfns, ret); - if ( iomem_deny_access(d, mfn, mfn_end) && - is_hardware_domain(current->domain) ) - printk(XENLOG_ERR - "memory_map: failed to deny dom%d access to [%lx,%lx]\n", - d->domain_id, mfn, mfn_end); - } - } - } - else - { - int rc = 0; - - printk(XENLOG_G_INFO - "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", - d->domain_id, gfn, mfn, nr_mfns); - - rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); - ret = iomem_deny_access(d, mfn, mfn_end); - if ( !ret ) - ret = rc; - if ( ret && is_hardware_domain(current->domain) ) - printk(XENLOG_ERR - "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", - ret, rc ? "removing" : "denying", d->domain_id, - mfn, mfn_end); - } - /* Do this unconditionally to cover errors on above failure paths. */ - memory_type_changed(d); - } - break; - case XEN_DOMCTL_ioport_mapping: { struct hvm_iommu *hd; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 24102c0..80b7800 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -902,6 +902,74 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } break; + case XEN_DOMCTL_memory_mapping: + { + unsigned long gfn = op->u.memory_mapping.first_gfn; + unsigned long mfn = op->u.memory_mapping.first_mfn; + unsigned long nr_mfns = op->u.memory_mapping.nr_mfns; + unsigned long mfn_end = mfn + nr_mfns - 1; + int add = op->u.memory_mapping.add_mapping; + + ret = -EINVAL; + if ( mfn_end < mfn || /* wrap? */ + ((mfn | mfn_end) >> (paddr_bits - PAGE_SHIFT)) || + (gfn + nr_mfns - 1) < gfn ) /* wrap? */ + break; + + ret = -EPERM; + if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) + break; + + ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); + if ( ret ) + break; + + if ( add ) + { + printk(XENLOG_G_INFO + "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", + d->domain_id, gfn, mfn, nr_mfns); + + ret = iomem_permit_access(d, mfn, mfn_end); + if ( !ret ) + { + ret = map_mmio_regions(d, gfn, nr_mfns, mfn); + if ( ret ) + { + printk(XENLOG_G_WARNING + "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", + d->domain_id, gfn, mfn, nr_mfns, ret); + if ( iomem_deny_access(d, mfn, mfn_end) && + is_hardware_domain(current->domain) ) + printk(XENLOG_ERR + "memory_map: failed to deny dom%d access to [%lx,%lx]\n", + d->domain_id, mfn, mfn_end); + } + } + } + else + { + int rc = 0; + + printk(XENLOG_G_INFO + "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", + d->domain_id, gfn, mfn, nr_mfns); + + rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); + ret = iomem_deny_access(d, mfn, mfn_end); + if ( !ret ) + ret = rc; + if ( ret && is_hardware_domain(current->domain) ) + printk(XENLOG_ERR + "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", + ret, rc ? "removing" : "denying", d->domain_id, + mfn, mfn_end); + } + /* Do this unconditionally to cover errors on above failure paths. */ + memory_type_changed(d); + } + break; + case XEN_DOMCTL_settimeoffset: { domain_set_time_offset(d, op->u.settimeoffset.time_offset_seconds); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 648144f..08ce07b 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -3,6 +3,10 @@ #include +#include + +#define paddr_bits PADDR_BITS + struct domain; extern void memory_type_changed(struct domain *); @@ -101,17 +105,6 @@ int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); -/* Map MMIO regions in the p2m: start_gfn and nr_mfns describe the range - * in the guest physical address space to map, starting from the machine - * frame number mfn. */ -int map_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr_mfns, - unsigned long mfn); -int unmap_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr_mfns, - unsigned long mfn); int guest_physmap_add_entry(struct domain *d, unsigned long gfn, diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 2a128ed..39f235d 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -29,21 +29,10 @@ #include #include +#include #include #include /* for pagetable_t */ -/* Map MMIO regions in the p2m: start_gfn and nr describe the range in - * the guest physical address space to map, starting from the machine - * frame number mfn. */ -int map_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr, - unsigned long mfn); -int unmap_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr, - unsigned long mfn); - extern bool_t opt_hap_1gb, opt_hap_2mb; /* diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h new file mode 100644 index 0000000..9f1b771 --- /dev/null +++ b/xen/include/xen/p2m-common.h @@ -0,0 +1,16 @@ +#ifndef _XEN_P2M_COMMON_H +#define _XEN_P2M_COMMON_H + +/* Map MMIO regions in the p2m: start_gfn and nr describe the range in + * * the guest physical address space to map, starting from the machine + * * frame number mfn. */ +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); + +#endif /* _XEN_P2M_COMMON_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRje-0003NK-46; Thu, 04 Sep 2014 07:45:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjc-0003Mx-Hi for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:36 +0000 Received: from [85.158.137.68:44408] by server-1.bemta-3.messagelabs.com id C5/9A-30185-F9818045; Thu, 04 Sep 2014 07:45:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1409816731!12404697!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31491 invoked from network); 4 Sep 2014 07:45:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:32 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjX-0007pv-84 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjX-0003Le-6b for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:31 +0000 Date: Thu, 04 Sep 2014 07:45:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/common: move the memory_mapping DOMCTL hypercall to common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 812f0d9fba35b6025b940fac512e959d9931a329 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:42 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 xen/common: move the memory_mapping DOMCTL hypercall to common code This commit moves to common code the implementation of the memory_mapping DOMCTL, currently available only for the x86 architecture. It also adds a definition for the PADDR_BITS constant for ARM, that is to be used in common code and currently not available for the ARM architecture. Signed-off-by: Arianna Avanzini Acked-by: Jan Beulich Acked-by: Julien Grall Tested-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Ian Campbell Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/arch/arm/p2m.c | 8 ++-- xen/arch/x86/domctl.c | 68 ------------------------------------------ xen/common/domctl.c | 68 ++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/p2m.h | 15 ++------- xen/include/asm-x86/p2m.h | 13 +------- xen/include/xen/p2m-common.h | 16 ++++++++++ 6 files changed, 93 insertions(+), 95 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index c016450..fc8c0dd 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -883,24 +883,24 @@ int p2m_populate_ram(struct domain *d, int map_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long nr_mfns, + unsigned long nr, unsigned long mfn) { return apply_p2m_changes(d, INSERT, pfn_to_paddr(start_gfn), - pfn_to_paddr(start_gfn + nr_mfns), + pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_DEV, p2m_mmio_direct); } int unmap_mmio_regions(struct domain *d, unsigned long start_gfn, - unsigned long nr_mfns, + unsigned long nr, unsigned long mfn) { return apply_p2m_changes(d, REMOVE, pfn_to_paddr(start_gfn), - pfn_to_paddr(start_gfn + nr_mfns), + pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_DEV, p2m_invalid); } diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index caa3be6..7a5de43 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -641,74 +641,6 @@ long arch_do_domctl( } break; - case XEN_DOMCTL_memory_mapping: - { - unsigned long gfn = domctl->u.memory_mapping.first_gfn; - unsigned long mfn = domctl->u.memory_mapping.first_mfn; - unsigned long nr_mfns = domctl->u.memory_mapping.nr_mfns; - unsigned long mfn_end = mfn + nr_mfns - 1; - int add = domctl->u.memory_mapping.add_mapping; - - ret = -EINVAL; - if ( mfn_end < mfn || /* wrap? */ - ((mfn | mfn_end) >> (paddr_bits - PAGE_SHIFT)) || - (gfn + nr_mfns - 1) < gfn ) /* wrap? */ - break; - - ret = -EPERM; - if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) - break; - - ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); - if ( ret ) - break; - - if ( add ) - { - printk(XENLOG_G_INFO - "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", - d->domain_id, gfn, mfn, nr_mfns); - - ret = iomem_permit_access(d, mfn, mfn_end); - if ( !ret ) - { - ret = map_mmio_regions(d, gfn, nr_mfns, mfn); - if ( ret ) - { - printk(XENLOG_G_WARNING - "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", - d->domain_id, gfn, mfn, nr_mfns, ret); - if ( iomem_deny_access(d, mfn, mfn_end) && - is_hardware_domain(current->domain) ) - printk(XENLOG_ERR - "memory_map: failed to deny dom%d access to [%lx,%lx]\n", - d->domain_id, mfn, mfn_end); - } - } - } - else - { - int rc = 0; - - printk(XENLOG_G_INFO - "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", - d->domain_id, gfn, mfn, nr_mfns); - - rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); - ret = iomem_deny_access(d, mfn, mfn_end); - if ( !ret ) - ret = rc; - if ( ret && is_hardware_domain(current->domain) ) - printk(XENLOG_ERR - "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", - ret, rc ? "removing" : "denying", d->domain_id, - mfn, mfn_end); - } - /* Do this unconditionally to cover errors on above failure paths. */ - memory_type_changed(d); - } - break; - case XEN_DOMCTL_ioport_mapping: { struct hvm_iommu *hd; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 24102c0..80b7800 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -902,6 +902,74 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } break; + case XEN_DOMCTL_memory_mapping: + { + unsigned long gfn = op->u.memory_mapping.first_gfn; + unsigned long mfn = op->u.memory_mapping.first_mfn; + unsigned long nr_mfns = op->u.memory_mapping.nr_mfns; + unsigned long mfn_end = mfn + nr_mfns - 1; + int add = op->u.memory_mapping.add_mapping; + + ret = -EINVAL; + if ( mfn_end < mfn || /* wrap? */ + ((mfn | mfn_end) >> (paddr_bits - PAGE_SHIFT)) || + (gfn + nr_mfns - 1) < gfn ) /* wrap? */ + break; + + ret = -EPERM; + if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) + break; + + ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); + if ( ret ) + break; + + if ( add ) + { + printk(XENLOG_G_INFO + "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", + d->domain_id, gfn, mfn, nr_mfns); + + ret = iomem_permit_access(d, mfn, mfn_end); + if ( !ret ) + { + ret = map_mmio_regions(d, gfn, nr_mfns, mfn); + if ( ret ) + { + printk(XENLOG_G_WARNING + "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", + d->domain_id, gfn, mfn, nr_mfns, ret); + if ( iomem_deny_access(d, mfn, mfn_end) && + is_hardware_domain(current->domain) ) + printk(XENLOG_ERR + "memory_map: failed to deny dom%d access to [%lx,%lx]\n", + d->domain_id, mfn, mfn_end); + } + } + } + else + { + int rc = 0; + + printk(XENLOG_G_INFO + "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", + d->domain_id, gfn, mfn, nr_mfns); + + rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); + ret = iomem_deny_access(d, mfn, mfn_end); + if ( !ret ) + ret = rc; + if ( ret && is_hardware_domain(current->domain) ) + printk(XENLOG_ERR + "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", + ret, rc ? "removing" : "denying", d->domain_id, + mfn, mfn_end); + } + /* Do this unconditionally to cover errors on above failure paths. */ + memory_type_changed(d); + } + break; + case XEN_DOMCTL_settimeoffset: { domain_set_time_offset(d, op->u.settimeoffset.time_offset_seconds); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 648144f..08ce07b 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -3,6 +3,10 @@ #include +#include + +#define paddr_bits PADDR_BITS + struct domain; extern void memory_type_changed(struct domain *); @@ -101,17 +105,6 @@ int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); -/* Map MMIO regions in the p2m: start_gfn and nr_mfns describe the range - * in the guest physical address space to map, starting from the machine - * frame number mfn. */ -int map_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr_mfns, - unsigned long mfn); -int unmap_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr_mfns, - unsigned long mfn); int guest_physmap_add_entry(struct domain *d, unsigned long gfn, diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 2a128ed..39f235d 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -29,21 +29,10 @@ #include #include +#include #include #include /* for pagetable_t */ -/* Map MMIO regions in the p2m: start_gfn and nr describe the range in - * the guest physical address space to map, starting from the machine - * frame number mfn. */ -int map_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr, - unsigned long mfn); -int unmap_mmio_regions(struct domain *d, - unsigned long start_gfn, - unsigned long nr, - unsigned long mfn); - extern bool_t opt_hap_1gb, opt_hap_2mb; /* diff --git a/xen/include/xen/p2m-common.h b/xen/include/xen/p2m-common.h new file mode 100644 index 0000000..9f1b771 --- /dev/null +++ b/xen/include/xen/p2m-common.h @@ -0,0 +1,16 @@ +#ifndef _XEN_P2M_COMMON_H +#define _XEN_P2M_COMMON_H + +/* Map MMIO regions in the p2m: start_gfn and nr describe the range in + * * the guest physical address space to map, starting from the machine + * * frame number mfn. */ +int map_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); +int unmap_mmio_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn); + +#endif /* _XEN_P2M_COMMON_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRjl-0003Oy-8p; Thu, 04 Sep 2014 07:45:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjj-0003OY-TO for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:44 +0000 Received: from [85.158.143.35:45648] by server-3.bemta-4.messagelabs.com id 12/C3-06192-7A818045; Thu, 04 Sep 2014 07:45:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409816741!13495766!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18962 invoked from network); 4 Sep 2014 07:45:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjh-0007q1-Eo for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjh-0003M3-Ci for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:41 +0000 Date: Thu, 04 Sep 2014 07:45:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: parse optional start gfn from the iomem config option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcccaf806a92eabb95929a67c344ac1e9ead6257 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:43 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 tools/libxl: parse optional start gfn from the iomem config option Currently, the "iomem" domU config option allows to specify a machine address range to be mapped to the domU. However, there is no way to specify the guest address range used for the mapping. This commit extends the iomem option handling code to parse an additional, optional parameter: this parameter, if given, specifies the start guest address used for the mapping; if no start guest address is given, a 1:1 mapping is performed as default. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- docs/man/xl.cfg.pod.5 | 18 +++++++++++++----- tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_create.c | 8 ++++++-- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_types.idl | 4 ++++ tools/libxl/xl_cmdimpl.c | 17 ++++++++++------- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index f1fc906..517ae2f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -670,12 +670,20 @@ is given in hexadecimal and may either a span e.g. C<2f8-2ff> It is recommended to use this option only for trusted VMs under administrator control. -=item B +=item B -Allow guest to access specific hardware I/O memory pages. B -is a physical page number. B is the number -of pages beginning with B to allow access. Both values -must be given in hexadecimal. +Allow auto-translated domains to access specific hardware I/O memory pages. + +B is a physical page number. B is the number of pages +beginning with B to allow access. B specifies the guest frame +number where the mapping will start in the domU's address space. If B is +not given, the mapping will be performed using B as a start in the +domU's address space, therefore performing an 1:1 mapping as default. +All of these values must be given in hexadecimal. + +Note that the IOMMU won't be updated with the mappings specified with this +option. This option therefore should not be used to passthrough any +IOMMU-protected device. It is recommended to use this option only for trusted VMs under administrator control. diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index ded4ce5..460207b 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -128,6 +128,16 @@ #define LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE 1 /* + * LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN indicates that it is possible + * to specify the start guest frame number used to map a range of I/O + * memory machine frame numbers via the 'gfn' field (of type uint64) + * of the 'iomem' structure. An array of iomem structures is embedded + * in libxl_domain_build_info and used to map the indicated memory + * ranges during domain build. + */ +#define LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index fc332ef..bc44ef5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -102,6 +102,8 @@ static int sched_params_valid(libxl__gc *gc, int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_domain_build_info *b_info) { + int i; + if (b_info->type != LIBXL_DOMAIN_TYPE_HVM && b_info->type != LIBXL_DOMAIN_TYPE_PV) return ERROR_INVAL; @@ -189,8 +191,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, /* In libxl internals, we want to deal with vcpu_hard_affinity only! */ if (b_info->cpumap.size && !b_info->num_vcpu_hard_affinity) { - int i; - b_info->vcpu_hard_affinity = libxl__calloc(gc, b_info->max_vcpus, sizeof(libxl_bitmap)); for (i = 0; i < b_info->max_vcpus; i++) { @@ -215,6 +215,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->disable_migrate, false); + for (i = 0 ; i < b_info->num_iomem; i++) + if (b_info->iomem[i].gfn == LIBXL_INVALID_GFN) + b_info->iomem[i].gfn = b_info->iomem[i].start; + if (!b_info->event_channels) b_info->event_channels = 1023; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index beb052e..04c9378 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -91,6 +91,7 @@ #define LIBXL_PV_EXTRA_MEMORY 1024 #define LIBXL_HVM_EXTRA_MEMORY 2048 #define LIBXL_MIN_DOM0_MEM (128*1024) +#define LIBXL_INVALID_GFN (~(uint64_t)0) /* use 0 as the domid of the toolstack domain for now */ #define LIBXL_TOOLSTACK_DOMID 0 #define QEMU_SIGNATURE "DeviceModelRecord0002" diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 08a7927..931c9e9 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -185,8 +185,12 @@ libxl_ioport_range = Struct("ioport_range", [ ]) libxl_iomem_range = Struct("iomem_range", [ + # start host frame number to be mapped to the guest ("start", uint64), + # number of frames to be mapped ("number", uint64), + # guest frame number used as a start for the mapping + ("gfn", uint64, {'init_val': "LIBXL_INVALID_GFN"}), ]) libxl_vga_interface_info = Struct("vga_interface_info", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 409a795..e6b9615 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1199,6 +1199,7 @@ static void parse_config_data(const char *config_source, } if (!xlu_cfg_get_list(config, "iomem", &iomem, &num_iomem, 0)) { + int ret; b_info->num_iomem = num_iomem; b_info->iomem = calloc(num_iomem, sizeof(*b_info->iomem)); if (b_info->iomem == NULL) { @@ -1212,13 +1213,15 @@ static void parse_config_data(const char *config_source, "xl: Unable to get element %d in iomem list\n", i); exit(1); } - if(sscanf(buf, "%" SCNx64",%" SCNx64, - &b_info->iomem[i].start, - &b_info->iomem[i].number) - != 2) { - fprintf(stderr, - "xl: Invalid argument parsing iomem: %s\n", buf); - exit(1); + libxl_iomem_range_init(&b_info->iomem[i]); + ret = sscanf(buf, "%" SCNx64",%" SCNx64"@%" SCNx64, + &b_info->iomem[i].start, + &b_info->iomem[i].number, + &b_info->iomem[i].gfn); + if (ret < 2) { + fprintf(stderr, + "xl: Invalid argument parsing iomem: %s\n", buf); + exit(1); } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45: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 1XPRjl-0003Oy-8p; Thu, 04 Sep 2014 07:45:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjj-0003OY-TO for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:44 +0000 Received: from [85.158.143.35:45648] by server-3.bemta-4.messagelabs.com id 12/C3-06192-7A818045; Thu, 04 Sep 2014 07:45:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409816741!13495766!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18962 invoked from network); 4 Sep 2014 07:45:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:42 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjh-0007q1-Eo for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjh-0003M3-Ci for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:41 +0000 Date: Thu, 04 Sep 2014 07:45:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: parse optional start gfn from the iomem config option X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcccaf806a92eabb95929a67c344ac1e9ead6257 Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:43 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:37 2014 +0100 tools/libxl: parse optional start gfn from the iomem config option Currently, the "iomem" domU config option allows to specify a machine address range to be mapped to the domU. However, there is no way to specify the guest address range used for the mapping. This commit extends the iomem option handling code to parse an additional, optional parameter: this parameter, if given, specifies the start guest address used for the mapping; if no start guest address is given, a 1:1 mapping is performed as default. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- docs/man/xl.cfg.pod.5 | 18 +++++++++++++----- tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_create.c | 8 ++++++-- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_types.idl | 4 ++++ tools/libxl/xl_cmdimpl.c | 17 ++++++++++------- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index f1fc906..517ae2f 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -670,12 +670,20 @@ is given in hexadecimal and may either a span e.g. C<2f8-2ff> It is recommended to use this option only for trusted VMs under administrator control. -=item B +=item B -Allow guest to access specific hardware I/O memory pages. B -is a physical page number. B is the number -of pages beginning with B to allow access. Both values -must be given in hexadecimal. +Allow auto-translated domains to access specific hardware I/O memory pages. + +B is a physical page number. B is the number of pages +beginning with B to allow access. B specifies the guest frame +number where the mapping will start in the domU's address space. If B is +not given, the mapping will be performed using B as a start in the +domU's address space, therefore performing an 1:1 mapping as default. +All of these values must be given in hexadecimal. + +Note that the IOMMU won't be updated with the mappings specified with this +option. This option therefore should not be used to passthrough any +IOMMU-protected device. It is recommended to use this option only for trusted VMs under administrator control. diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index ded4ce5..460207b 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -128,6 +128,16 @@ #define LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE 1 /* + * LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN indicates that it is possible + * to specify the start guest frame number used to map a range of I/O + * memory machine frame numbers via the 'gfn' field (of type uint64) + * of the 'iomem' structure. An array of iomem structures is embedded + * in libxl_domain_build_info and used to map the indicated memory + * ranges during domain build. + */ +#define LIBXL_HAVE_BUILDINFO_IOMEM_START_GFN 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index fc332ef..bc44ef5 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -102,6 +102,8 @@ static int sched_params_valid(libxl__gc *gc, int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_domain_build_info *b_info) { + int i; + if (b_info->type != LIBXL_DOMAIN_TYPE_HVM && b_info->type != LIBXL_DOMAIN_TYPE_PV) return ERROR_INVAL; @@ -189,8 +191,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, /* In libxl internals, we want to deal with vcpu_hard_affinity only! */ if (b_info->cpumap.size && !b_info->num_vcpu_hard_affinity) { - int i; - b_info->vcpu_hard_affinity = libxl__calloc(gc, b_info->max_vcpus, sizeof(libxl_bitmap)); for (i = 0; i < b_info->max_vcpus; i++) { @@ -215,6 +215,10 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, libxl_defbool_setdefault(&b_info->disable_migrate, false); + for (i = 0 ; i < b_info->num_iomem; i++) + if (b_info->iomem[i].gfn == LIBXL_INVALID_GFN) + b_info->iomem[i].gfn = b_info->iomem[i].start; + if (!b_info->event_channels) b_info->event_channels = 1023; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index beb052e..04c9378 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -91,6 +91,7 @@ #define LIBXL_PV_EXTRA_MEMORY 1024 #define LIBXL_HVM_EXTRA_MEMORY 2048 #define LIBXL_MIN_DOM0_MEM (128*1024) +#define LIBXL_INVALID_GFN (~(uint64_t)0) /* use 0 as the domid of the toolstack domain for now */ #define LIBXL_TOOLSTACK_DOMID 0 #define QEMU_SIGNATURE "DeviceModelRecord0002" diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 08a7927..931c9e9 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -185,8 +185,12 @@ libxl_ioport_range = Struct("ioport_range", [ ]) libxl_iomem_range = Struct("iomem_range", [ + # start host frame number to be mapped to the guest ("start", uint64), + # number of frames to be mapped ("number", uint64), + # guest frame number used as a start for the mapping + ("gfn", uint64, {'init_val': "LIBXL_INVALID_GFN"}), ]) libxl_vga_interface_info = Struct("vga_interface_info", [ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 409a795..e6b9615 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -1199,6 +1199,7 @@ static void parse_config_data(const char *config_source, } if (!xlu_cfg_get_list(config, "iomem", &iomem, &num_iomem, 0)) { + int ret; b_info->num_iomem = num_iomem; b_info->iomem = calloc(num_iomem, sizeof(*b_info->iomem)); if (b_info->iomem == NULL) { @@ -1212,13 +1213,15 @@ static void parse_config_data(const char *config_source, "xl: Unable to get element %d in iomem list\n", i); exit(1); } - if(sscanf(buf, "%" SCNx64",%" SCNx64, - &b_info->iomem[i].start, - &b_info->iomem[i].number) - != 2) { - fprintf(stderr, - "xl: Invalid argument parsing iomem: %s\n", buf); - exit(1); + libxl_iomem_range_init(&b_info->iomem[i]); + ret = sscanf(buf, "%" SCNx64",%" SCNx64"@%" SCNx64, + &b_info->iomem[i].start, + &b_info->iomem[i].number, + &b_info->iomem[i].gfn); + if (ret < 2) { + fprintf(stderr, + "xl: Invalid argument parsing iomem: %s\n", buf); + exit(1); } } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjv-0003Qr-Bf; Thu, 04 Sep 2014 07:45:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjt-0003Qd-R7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:53 +0000 Received: from [85.158.143.35:50736] by server-1.bemta-4.messagelabs.com id E3/15-05872-1B818045; Thu, 04 Sep 2014 07:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409816751!5466031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32233 invoked from network); 4 Sep 2014 07:45:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjr-0007q7-Kw for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjr-0003MP-JK for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:51 +0000 Date: Thu, 04 Sep 2014 07:45:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: handle the iomem parameter with the memory_mapping hcall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c428c9f162895cb3473fab26d23ffbf41a6f293d Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:44 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:38 2014 +0100 tools/libxl: handle the iomem parameter with the memory_mapping hcall Currently, the configuration-parsing code concerning the handling of the iomem parameter only invokes the XEN_DOMCTL_iomem_permission hypercall. This commit lets the XEN_DOMCTL_memory_mapping hypercall be invoked after XEN_DOMCTL_iomem_permission when the iomem parameter is parsed from a domU configuration file, so that the address range can be mapped to the address space of the domU. The hypercall is invoked only in case of domains using an auto-translated physmap. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- tools/libxc/xc_domain.c | 10 ++++++++++ tools/libxl/libxl_create.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index c67ac9a..1eba393 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1960,6 +1960,16 @@ int xc_domain_memory_mapping( uint32_t add_mapping) { DECLARE_DOMCTL; + xc_dominfo_t info; + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + PERROR("Could not get info for domain"); + return -EINVAL; + } + if ( !xc_core_arch_auto_translated_physmap(&info) ) + return 0; domctl.cmd = XEN_DOMCTL_memory_mapping; domctl.domain = domid; diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index bc44ef5..ee328e9 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1180,6 +1180,17 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; + continue; + } + ret = xc_domain_memory_mapping(CTX->xch, domid, + io->gfn, io->start, + io->number, 1); + if (ret < 0) { + LOGE(ERROR, + "failed to map to dom%d iomem range %"PRIx64"-%"PRIx64 + " to guest address %"PRIx64, + domid, io->start, io->start + io->number - 1, io->gfn); + ret = ERROR_FAIL; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:45:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:45:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjv-0003Qr-Bf; Thu, 04 Sep 2014 07:45:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjt-0003Qd-R7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:53 +0000 Received: from [85.158.143.35:50736] by server-1.bemta-4.messagelabs.com id E3/15-05872-1B818045; Thu, 04 Sep 2014 07:45:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1409816751!5466031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32233 invoked from network); 4 Sep 2014 07:45:52 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:45:52 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRjr-0007q7-Kw for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRjr-0003MP-JK for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:45:51 +0000 Date: Thu, 04 Sep 2014 07:45:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: handle the iomem parameter with the memory_mapping hcall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c428c9f162895cb3473fab26d23ffbf41a6f293d Author: Arianna Avanzini AuthorDate: Sat Aug 30 18:29:44 2014 +0200 Commit: Ian Campbell CommitDate: Wed Sep 3 12:49:38 2014 +0100 tools/libxl: handle the iomem parameter with the memory_mapping hcall Currently, the configuration-parsing code concerning the handling of the iomem parameter only invokes the XEN_DOMCTL_iomem_permission hypercall. This commit lets the XEN_DOMCTL_memory_mapping hypercall be invoked after XEN_DOMCTL_iomem_permission when the iomem parameter is parsed from a domU configuration file, so that the address range can be mapped to the address space of the domU. The hypercall is invoked only in case of domains using an auto-translated physmap. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Acked-by: Julien Grall Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- tools/libxc/xc_domain.c | 10 ++++++++++ tools/libxl/libxl_create.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index c67ac9a..1eba393 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -1960,6 +1960,16 @@ int xc_domain_memory_mapping( uint32_t add_mapping) { DECLARE_DOMCTL; + xc_dominfo_t info; + + if ( xc_domain_getinfo(xch, domid, 1, &info) != 1 || + info.domid != domid ) + { + PERROR("Could not get info for domain"); + return -EINVAL; + } + if ( !xc_core_arch_auto_translated_physmap(&info) ) + return 0; domctl.cmd = XEN_DOMCTL_memory_mapping; domctl.domain = domid; diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index bc44ef5..ee328e9 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1180,6 +1180,17 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, "failed give dom%d access to iomem range %"PRIx64"-%"PRIx64, domid, io->start, io->start + io->number - 1); ret = ERROR_FAIL; + continue; + } + ret = xc_domain_memory_mapping(CTX->xch, domid, + io->gfn, io->start, + io->number, 1); + if (ret < 0) { + LOGE(ERROR, + "failed to map to dom%d iomem range %"PRIx64"-%"PRIx64 + " to guest address %"PRIx64, + domid, io->start, io->start + io->number - 1, io->gfn); + ret = ERROR_FAIL; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRk5-0003Sg-FN; Thu, 04 Sep 2014 07:46:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRk4-0003SS-A0 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:04 +0000 Received: from [193.109.254.147:31259] by server-11.bemta-14.messagelabs.com id C8/5F-14213-BB818045; Thu, 04 Sep 2014 07:46:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1409816762!13410286!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1164 invoked from network); 4 Sep 2014 07:46:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRk1-0007qj-Rm for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRk1-0003Ne-O8 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:01 +0000 Date: Thu, 04 Sep 2014 07:46:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl error code is signed integer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46561d20c0f764bd6b3a587fe6ed7c070d22f8a0 Author: Wei Liu AuthorDate: Wed Jul 30 19:23:42 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 14:32:49 2014 +0100 libxl: libxl error code is signed integer Fix two occurences of "unsigned int rc". Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a1e0b5e..2ae5fca 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1884,7 +1884,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_t *front; flexarray_t *back; libxl__device *device; - unsigned int rc; + int rc; rc = libxl__device_vtpm_setdefault(gc, vtpm); if (rc) goto out; @@ -2989,7 +2989,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_t *front; flexarray_t *back; libxl__device *device; - unsigned int rc; + int rc; rc = libxl__device_nic_setdefault(gc, nic, domid); 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 Thu Sep 04 07:46:05 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRk5-0003Sg-FN; Thu, 04 Sep 2014 07:46:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRk4-0003SS-A0 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:04 +0000 Received: from [193.109.254.147:31259] by server-11.bemta-14.messagelabs.com id C8/5F-14213-BB818045; Thu, 04 Sep 2014 07:46:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1409816762!13410286!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1164 invoked from network); 4 Sep 2014 07:46:03 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:03 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRk1-0007qj-Rm for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRk1-0003Ne-O8 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:01 +0000 Date: Thu, 04 Sep 2014 07:46:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl error code is signed integer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46561d20c0f764bd6b3a587fe6ed7c070d22f8a0 Author: Wei Liu AuthorDate: Wed Jul 30 19:23:42 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 14:32:49 2014 +0100 libxl: libxl error code is signed integer Fix two occurences of "unsigned int rc". Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a1e0b5e..2ae5fca 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1884,7 +1884,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_t *front; flexarray_t *back; libxl__device *device; - unsigned int rc; + int rc; rc = libxl__device_vtpm_setdefault(gc, vtpm); if (rc) goto out; @@ -2989,7 +2989,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_t *front; flexarray_t *back; libxl__device *device; - unsigned int rc; + int rc; rc = libxl__device_nic_setdefault(gc, nic, domid); 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 Thu Sep 04 07:46:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRkF-0003Ux-Hy; Thu, 04 Sep 2014 07:46:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkE-0003Uc-E2 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:14 +0000 Received: from [85.158.143.35:42237] by server-1.bemta-4.messagelabs.com id 5A/B5-05872-5C818045; Thu, 04 Sep 2014 07:46:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1409816772!13500393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2398 invoked from network); 4 Sep 2014 07:46:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkC-0007qp-BA for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkC-0003OZ-9a for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:12 +0000 Date: Thu, 04 Sep 2014 07:46:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix operator precedence bug introduced by 3d4d4f9336 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24857896a30105b7947e2cd36d63768054538bbc Author: Andrew Cooper AuthorDate: Wed Sep 3 15:06:06 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:06:06 2014 +0200 x86/hvm: fix operator precedence bug introduced by 3d4d4f9336 Bitwise or has greater precedence than the ternary operator, making the result of the expression a constant P2M_UNSHARE. Coverity-ID: 1234633 Signed-off-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Don Slutz --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 83e6fae..8d905d3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2796,7 +2796,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, p2m = p2m_get_hostp2m(v->domain); mfn = get_gfn_type_access(p2m, gfn, &p2mt, &p2ma, - P2M_ALLOC | npfec.write_access ? P2M_UNSHARE : 0, + P2M_ALLOC | (npfec.write_access ? P2M_UNSHARE : 0), NULL); /* Check access permissions first, then handle faults */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRkF-0003Ux-Hy; Thu, 04 Sep 2014 07:46:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkE-0003Uc-E2 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:14 +0000 Received: from [85.158.143.35:42237] by server-1.bemta-4.messagelabs.com id 5A/B5-05872-5C818045; Thu, 04 Sep 2014 07:46:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1409816772!13500393!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2398 invoked from network); 4 Sep 2014 07:46:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:13 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkC-0007qp-BA for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkC-0003OZ-9a for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:12 +0000 Date: Thu, 04 Sep 2014 07:46:12 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: fix operator precedence bug introduced by 3d4d4f9336 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 24857896a30105b7947e2cd36d63768054538bbc Author: Andrew Cooper AuthorDate: Wed Sep 3 15:06:06 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:06:06 2014 +0200 x86/hvm: fix operator precedence bug introduced by 3d4d4f9336 Bitwise or has greater precedence than the ternary operator, making the result of the expression a constant P2M_UNSHARE. Coverity-ID: 1234633 Signed-off-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Don Slutz --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 83e6fae..8d905d3 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2796,7 +2796,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, p2m = p2m_get_hostp2m(v->domain); mfn = get_gfn_type_access(p2m, gfn, &p2mt, &p2ma, - P2M_ALLOC | npfec.write_access ? P2M_UNSHARE : 0, + P2M_ALLOC | (npfec.write_access ? P2M_UNSHARE : 0), NULL); /* Check access permissions first, then handle faults */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46: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 1XPRkQ-0003X1-Lg; Thu, 04 Sep 2014 07:46:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkP-0003Wk-3r for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:25 +0000 Received: from [85.158.137.68:61331] by server-6.bemta-3.messagelabs.com id 03/D9-29521-0D818045; Thu, 04 Sep 2014 07:46:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1409816782!7941448!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14765 invoked from network); 4 Sep 2014 07:46:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkM-0007qv-I7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkM-0003Ow-GY for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:22 +0000 Date: Thu, 04 Sep 2014 07:46:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: remove redundant trapnr parameter from fatal_trap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1b0c9b3c57944ae83898ed291fbebbd44cd1b0cb Author: Andrew Cooper AuthorDate: Wed Sep 3 15:07:49 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:07:49 2014 +0200 x86/traps: remove redundant trapnr parameter from fatal_trap() It is always available via regs->entry_vector. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.c | 2 +- xen/arch/x86/nmi.c | 2 +- xen/arch/x86/traps.c | 13 +++++++------ xen/arch/x86/x86_64/entry.S | 3 +-- xen/include/asm-x86/processor.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 812daf6..05a86fb 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -74,7 +74,7 @@ static void unexpected_machine_check(const struct cpu_user_regs *regs) { console_force_unlock(); printk("Unexpected Machine Check Exception\n"); - fatal_trap(TRAP_machine_check, regs); + fatal_trap(regs); } diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 7d15d5b..055f4ef 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -472,7 +472,7 @@ bool_t nmi_watchdog_tick(const struct cpu_user_regs *regs) console_force_unlock(); printk("Watchdog timer detects that CPU%d is stuck!\n", smp_processor_id()); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } } else diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 7f5306f..10fc2ca 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -394,9 +394,10 @@ static const char *trapstr(unsigned int trapnr) * are disabled). In such situations we can't do much that is safe. We try to * print out some tracing and then we just spin. */ -void fatal_trap(int trapnr, const struct cpu_user_regs *regs) +void fatal_trap(const struct cpu_user_regs *regs) { static DEFINE_PER_CPU(char, depth); + unsigned int trapnr = regs->entry_vector; /* Set AC to reduce chance of further SMAP faults */ stac(); @@ -1427,7 +1428,7 @@ void do_page_fault(struct cpu_user_regs *regs) { console_start_sync(); printk("Xen SM%cP violation\n", (pf_type == smep_fault) ? 'E' : 'A'); - fatal_trap(TRAP_page_fault, regs); + fatal_trap(regs); } if ( pf_type != real_fault ) @@ -1498,7 +1499,7 @@ void __init do_early_page_fault(struct cpu_user_regs *regs) console_start_sync(); printk("Early fatal page fault at %04x:%p (cr2=%p, ec=%04x)\n", regs->cs, _p(regs->eip), _p(cr2), regs->error_code); - fatal_trap(TRAP_page_fault, regs); + fatal_trap(regs); } } @@ -3256,7 +3257,7 @@ static void pci_serr_error(const struct cpu_user_regs *regs) default: /* 'fatal' */ console_force_unlock(); printk("\n\nNMI - PCI system error (SERR)\n"); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } } @@ -3271,7 +3272,7 @@ static void io_check_error(const struct cpu_user_regs *regs) default: /* 'fatal' */ console_force_unlock(); printk("\n\nNMI - I/O ERROR\n"); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } outb((inb(0x61) & 0x0f) | 0x08, 0x61); /* clear-and-disable IOCK */ @@ -3291,7 +3292,7 @@ static void unknown_nmi_error(const struct cpu_user_regs *regs, unsigned char re console_force_unlock(); printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); printk("Do you have a strange power saving mode enabled?\n"); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } } diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index a3ed216..42835d0 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -536,8 +536,7 @@ exception_with_ints_disabled: /* No special register assumptions. */ FATAL_exception_with_ints_disabled: - movzbl UREGS_entry_vector(%rsp),%edi - movq %rsp,%rsi + movq %rsp,%rdi call fatal_trap ud2 diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index a156e01..9e1f210 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -481,7 +481,7 @@ void show_registers(const struct cpu_user_regs *regs); void show_execution_state(const struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); -void noreturn fatal_trap(int trapnr, const struct cpu_user_regs *regs); +void noreturn fatal_trap(const struct cpu_user_regs *regs); void compat_show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs, int lines); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46: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 1XPRkQ-0003X1-Lg; Thu, 04 Sep 2014 07:46:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkP-0003Wk-3r for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:25 +0000 Received: from [85.158.137.68:61331] by server-6.bemta-3.messagelabs.com id 03/D9-29521-0D818045; Thu, 04 Sep 2014 07:46:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1409816782!7941448!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14765 invoked from network); 4 Sep 2014 07:46:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkM-0007qv-I7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkM-0003Ow-GY for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:22 +0000 Date: Thu, 04 Sep 2014 07:46:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/traps: remove redundant trapnr parameter from fatal_trap() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1b0c9b3c57944ae83898ed291fbebbd44cd1b0cb Author: Andrew Cooper AuthorDate: Wed Sep 3 15:07:49 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:07:49 2014 +0200 x86/traps: remove redundant trapnr parameter from fatal_trap() It is always available via regs->entry_vector. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/mcheck/mce.c | 2 +- xen/arch/x86/nmi.c | 2 +- xen/arch/x86/traps.c | 13 +++++++------ xen/arch/x86/x86_64/entry.S | 3 +-- xen/include/asm-x86/processor.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 812daf6..05a86fb 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -74,7 +74,7 @@ static void unexpected_machine_check(const struct cpu_user_regs *regs) { console_force_unlock(); printk("Unexpected Machine Check Exception\n"); - fatal_trap(TRAP_machine_check, regs); + fatal_trap(regs); } diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 7d15d5b..055f4ef 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -472,7 +472,7 @@ bool_t nmi_watchdog_tick(const struct cpu_user_regs *regs) console_force_unlock(); printk("Watchdog timer detects that CPU%d is stuck!\n", smp_processor_id()); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } } else diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 7f5306f..10fc2ca 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -394,9 +394,10 @@ static const char *trapstr(unsigned int trapnr) * are disabled). In such situations we can't do much that is safe. We try to * print out some tracing and then we just spin. */ -void fatal_trap(int trapnr, const struct cpu_user_regs *regs) +void fatal_trap(const struct cpu_user_regs *regs) { static DEFINE_PER_CPU(char, depth); + unsigned int trapnr = regs->entry_vector; /* Set AC to reduce chance of further SMAP faults */ stac(); @@ -1427,7 +1428,7 @@ void do_page_fault(struct cpu_user_regs *regs) { console_start_sync(); printk("Xen SM%cP violation\n", (pf_type == smep_fault) ? 'E' : 'A'); - fatal_trap(TRAP_page_fault, regs); + fatal_trap(regs); } if ( pf_type != real_fault ) @@ -1498,7 +1499,7 @@ void __init do_early_page_fault(struct cpu_user_regs *regs) console_start_sync(); printk("Early fatal page fault at %04x:%p (cr2=%p, ec=%04x)\n", regs->cs, _p(regs->eip), _p(cr2), regs->error_code); - fatal_trap(TRAP_page_fault, regs); + fatal_trap(regs); } } @@ -3256,7 +3257,7 @@ static void pci_serr_error(const struct cpu_user_regs *regs) default: /* 'fatal' */ console_force_unlock(); printk("\n\nNMI - PCI system error (SERR)\n"); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } } @@ -3271,7 +3272,7 @@ static void io_check_error(const struct cpu_user_regs *regs) default: /* 'fatal' */ console_force_unlock(); printk("\n\nNMI - I/O ERROR\n"); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } outb((inb(0x61) & 0x0f) | 0x08, 0x61); /* clear-and-disable IOCK */ @@ -3291,7 +3292,7 @@ static void unknown_nmi_error(const struct cpu_user_regs *regs, unsigned char re console_force_unlock(); printk("Uhhuh. NMI received for unknown reason %02x.\n", reason); printk("Do you have a strange power saving mode enabled?\n"); - fatal_trap(TRAP_nmi, regs); + fatal_trap(regs); } } diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index a3ed216..42835d0 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -536,8 +536,7 @@ exception_with_ints_disabled: /* No special register assumptions. */ FATAL_exception_with_ints_disabled: - movzbl UREGS_entry_vector(%rsp),%edi - movq %rsp,%rsi + movq %rsp,%rdi call fatal_trap ud2 diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index a156e01..9e1f210 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -481,7 +481,7 @@ void show_registers(const struct cpu_user_regs *regs); void show_execution_state(const struct cpu_user_regs *regs); #define dump_execution_state() run_in_exception_handler(show_execution_state) void show_page_walk(unsigned long addr); -void noreturn fatal_trap(int trapnr, const struct cpu_user_regs *regs); +void noreturn fatal_trap(const struct cpu_user_regs *regs); void compat_show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs, int lines); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRka-0003YZ-OP; Thu, 04 Sep 2014 07:46:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkZ-0003YF-1R for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:35 +0000 Received: from [85.158.139.211:12211] by server-3.bemta-5.messagelabs.com id C6/B7-13873-AD818045; Thu, 04 Sep 2014 07:46:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1409816792!12408822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30166 invoked from network); 4 Sep 2014 07:46:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkW-0007r3-Nu for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkW-0003PJ-MA for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:32 +0000 Date: Thu, 04 Sep 2014 07:46:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/current: provide additional information to optimise get_cpu_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df0ae94fd56d5f9c64089364efecb1793442360b Author: Andrew Cooper AuthorDate: Wed Sep 3 15:09:06 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:09:06 2014 +0200 x86/current: provide additional information to optimise get_cpu_info() Exactly as with c/s d55c5eefe "x86: use compiler visible "add" instead of inline assembly "or" in get_cpu_info()", this is achieved by providing more information to the compiler. This causes a net drop of almost 4K of .text Signed-off-by: Andrew Cooper --- xen/include/asm-x86/current.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 2081015..b95fd79 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -25,9 +25,9 @@ struct cpu_info { static inline struct cpu_info *get_cpu_info(void) { - unsigned long tos; - __asm__ ( "and %%rsp,%0" : "=r" (tos) : "0" (~(STACK_SIZE-1)) ); - return (struct cpu_info *)(tos + STACK_SIZE) - 1; + register unsigned long sp asm("rsp"); + + return (struct cpu_info *)((sp & ~(STACK_SIZE-1)) + STACK_SIZE) - 1; } #define get_current() (get_cpu_info()->current_vcpu) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRka-0003YZ-OP; Thu, 04 Sep 2014 07:46:36 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkZ-0003YF-1R for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:35 +0000 Received: from [85.158.139.211:12211] by server-3.bemta-5.messagelabs.com id C6/B7-13873-AD818045; Thu, 04 Sep 2014 07:46:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1409816792!12408822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30166 invoked from network); 4 Sep 2014 07:46:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:33 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkW-0007r3-Nu for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkW-0003PJ-MA for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:32 +0000 Date: Thu, 04 Sep 2014 07:46:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/current: provide additional information to optimise get_cpu_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df0ae94fd56d5f9c64089364efecb1793442360b Author: Andrew Cooper AuthorDate: Wed Sep 3 15:09:06 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:09:06 2014 +0200 x86/current: provide additional information to optimise get_cpu_info() Exactly as with c/s d55c5eefe "x86: use compiler visible "add" instead of inline assembly "or" in get_cpu_info()", this is achieved by providing more information to the compiler. This causes a net drop of almost 4K of .text Signed-off-by: Andrew Cooper --- xen/include/asm-x86/current.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 2081015..b95fd79 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -25,9 +25,9 @@ struct cpu_info { static inline struct cpu_info *get_cpu_info(void) { - unsigned long tos; - __asm__ ( "and %%rsp,%0" : "=r" (tos) : "0" (~(STACK_SIZE-1)) ); - return (struct cpu_info *)(tos + STACK_SIZE) - 1; + register unsigned long sp asm("rsp"); + + return (struct cpu_info *)((sp & ~(STACK_SIZE-1)) + STACK_SIZE) - 1; } #define get_current() (get_cpu_info()->current_vcpu) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkk-0003ad-TG; Thu, 04 Sep 2014 07:46:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkj-0003aN-JD for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:45 +0000 Received: from [85.158.143.35:47688] by server-3.bemta-4.messagelabs.com id 5B/85-06192-4E818045; Thu, 04 Sep 2014 07:46:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1409816803!13494604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3265 invoked from network); 4 Sep 2014 07:46:43 -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; 4 Sep 2014 07:46:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkg-0007r9-S3 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkg-0003Pi-Qz for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:42 +0000 Date: Thu, 04 Sep 2014 07:46:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NMI: allow passing just "watchdog" again X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd553ae5f0f57baa63d033bedee84f607de57d33 Author: Jan Beulich AuthorDate: Wed Sep 3 15:09:59 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:09:59 2014 +0200 x86/NMI: allow passing just "watchdog" again This capability got inadvertently lost in commit 3ea2ba980a ("x86/NMI: allow processing unknown NMIs when watchdog is enabled") due to an oversight of mine. Reported-by: Ross Lagerwall Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/nmi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 055f4ef..f8f5e4a 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -49,6 +49,12 @@ bool_t watchdog_force = 0; static void __init parse_watchdog(char *s) { + if ( !*s ) + { + opt_watchdog = 1; + return; + } + switch ( parse_bool(s) ) { case 0: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkk-0003ad-TG; Thu, 04 Sep 2014 07:46:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkj-0003aN-JD for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:45 +0000 Received: from [85.158.143.35:47688] by server-3.bemta-4.messagelabs.com id 5B/85-06192-4E818045; Thu, 04 Sep 2014 07:46:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1409816803!13494604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3265 invoked from network); 4 Sep 2014 07:46:43 -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; 4 Sep 2014 07:46:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkg-0007r9-S3 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkg-0003Pi-Qz for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:42 +0000 Date: Thu, 04 Sep 2014 07:46:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/NMI: allow passing just "watchdog" again X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd553ae5f0f57baa63d033bedee84f607de57d33 Author: Jan Beulich AuthorDate: Wed Sep 3 15:09:59 2014 +0200 Commit: Jan Beulich CommitDate: Wed Sep 3 15:09:59 2014 +0200 x86/NMI: allow passing just "watchdog" again This capability got inadvertently lost in commit 3ea2ba980a ("x86/NMI: allow processing unknown NMIs when watchdog is enabled") due to an oversight of mine. Reported-by: Ross Lagerwall Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/nmi.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 055f4ef..f8f5e4a 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -49,6 +49,12 @@ bool_t watchdog_force = 0; static void __init parse_watchdog(char *s) { + if ( !*s ) + { + opt_watchdog = 1; + return; + } + switch ( parse_bool(s) ) { case 0: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkt-0003cR-W6; Thu, 04 Sep 2014 07:46:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkt-0003cE-Ca for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:55 +0000 Received: from [85.158.139.211:2189] by server-11.bemta-5.messagelabs.com id A4/8A-11011-EE818045; Thu, 04 Sep 2014 07:46:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1409816813!4820976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6078 invoked from network); 4 Sep 2014 07:46:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkr-0007rI-1b for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkr-0003Q4-0Y for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:53 +0000 Date: Thu, 04 Sep 2014 07:46:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e5d02979c81962c69dc9ffeb58546d977f8f9443 Merge: 46561d20c0f764bd6b3a587fe6ed7c070d22f8a0 fd553ae5f0f57baa63d033bedee84f607de57d33 Author: Ian Campbell AuthorDate: Wed Sep 3 15:12:28 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:12:28 2014 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/cpu/mcheck/mce.c | 2 +- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/nmi.c | 8 +++++++- xen/arch/x86/traps.c | 13 +++++++------ xen/arch/x86/x86_64/entry.S | 3 +-- xen/include/asm-x86/current.h | 6 +++--- xen/include/asm-x86/processor.h | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:46:56 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:46:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkt-0003cR-W6; Thu, 04 Sep 2014 07:46:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkt-0003cE-Ca for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:55 +0000 Received: from [85.158.139.211:2189] by server-11.bemta-5.messagelabs.com id A4/8A-11011-EE818045; Thu, 04 Sep 2014 07:46:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1409816813!4820976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6078 invoked from network); 4 Sep 2014 07:46:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:46:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRkr-0007rI-1b for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRkr-0003Q4-0Y for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:46:53 +0000 Date: Thu, 04 Sep 2014 07:46:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e5d02979c81962c69dc9ffeb58546d977f8f9443 Merge: 46561d20c0f764bd6b3a587fe6ed7c070d22f8a0 fd553ae5f0f57baa63d033bedee84f607de57d33 Author: Ian Campbell AuthorDate: Wed Sep 3 15:12:28 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:12:28 2014 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/cpu/mcheck/mce.c | 2 +- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/nmi.c | 8 +++++++- xen/arch/x86/traps.c | 13 +++++++------ xen/arch/x86/x86_64/entry.S | 3 +-- xen/include/asm-x86/current.h | 6 +++--- xen/include/asm-x86/processor.h | 2 +- 7 files changed, 21 insertions(+), 15 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:47:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRl6-0003eF-2a; Thu, 04 Sep 2014 07:47:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRl5-0003e4-LX for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:07 +0000 Received: from [85.158.143.35:52264] by server-3.bemta-4.messagelabs.com id 36/46-06192-BF818045; Thu, 04 Sep 2014 07:47:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1409816825!13442822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4731 invoked from network); 4 Sep 2014 07:47:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRl1-0007rr-6R for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRl1-0003R6-56 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:03 +0000 Date: Thu, 04 Sep 2014 07:47:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: observe itargets setting in vgic_enable_irqs and vgic_disable_irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b3a817ea33b891caf7d7d788da9ce6deffa82a1 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:35 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: observe itargets setting in vgic_enable_irqs and vgic_disable_irqs vgic_enable_irqs should enable irq delivery to the vcpu specified by GICD_ITARGETSR, rather than the vcpu that wrote to GICD_ISENABLER. Similarly vgic_disable_irqs should use the target vcpu specified by itarget to disable irqs. itargets can be set to a mask but vgic_get_target_vcpu always returns the lower vcpu in the mask. Correctly initialize itargets for SPIs. Ignore bits in GICD_ITARGETSR corresponding to invalid vcpus. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 42 ++++++++++++++++++++++++++++++++++++++---- xen/arch/arm/vgic.c | 43 ++++++++++++++++++++++++++++++++++--------- xen/include/asm-arm/vgic.h | 5 +++++ 3 files changed, 77 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 2102e43..63d4f65 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -298,12 +298,12 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable |= *r; - vgic_unlock_rank(v, rank); /* The virtual irq is derived from register offset. * The register difference is word difference. So divide by 2(DABT_WORD) * to get Virtual irq number */ vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> DABT_WORD); + vgic_unlock_rank(v, rank); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -313,12 +313,12 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable &= ~*r; - vgic_unlock_rank(v, rank); /* The virtual irq is derived from register offset. * The register difference is word difference. So divide by 2(DABT_WORD) * to get Virtual irq number */ vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> DABT_WORD); + vgic_unlock_rank(v, rank); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: @@ -359,13 +359,29 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto write_ignore; + /* 8-bit vcpu mask for this domain */ + BUG_ON(v->domain->max_vcpus > 8); + tr = (1 << v->domain->max_vcpus) - 1; + if ( dabt.size == 2 ) + tr = tr | (tr << 8) | (tr << 16) | (tr << 24); + else + tr = (tr << (8 * (gicd_reg & 0x3))); + tr &= *r; + /* ignore zero writes */ + if ( !tr ) + goto write_ignore; + /* For word reads ignore writes where any single byte is zero */ + if ( dabt.size == 2 && + !((tr & 0xff) && (tr & (0xff << 8)) && + (tr & (0xff << 16)) && (tr & (0xff << 24)))) + goto write_ignore; vgic_lock_rank(v, rank); if ( dabt.size == DABT_WORD ) rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = *r; + DABT_WORD)] = tr; else vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, - gicd_reg - GICD_ITARGETSR, DABT_WORD)], *r, gicd_reg); + gicd_reg - GICD_ITARGETSR, DABT_WORD)], tr, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -460,6 +476,23 @@ static const struct mmio_handler_ops vgic_v2_distr_mmio_handler = { .write_handler = vgic_v2_distr_mmio_write, }; +static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) +{ + unsigned long target; + struct vcpu *v_target; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + ASSERT(spin_is_locked(&rank->lock)); + + target = vgic_byte_read(rank->itargets[(irq%32)/4], 0, irq % 4); + /* 1-N SPI should be delivered as pending to all the vcpus in the + * mask, but here we just return the first vcpu for simplicity and + * because it would be too slow to do otherwise. */ + target = find_first_bit(&target, 8); + ASSERT(target >= 0 && target < v->domain->max_vcpus); + v_target = v->domain->vcpu[target]; + return v_target; +} + static int vgic_v2_vcpu_init(struct vcpu *v) { int i; @@ -487,6 +520,7 @@ static int vgic_v2_domain_init(struct domain *d) static const struct vgic_ops vgic_v2_ops = { .vcpu_init = vgic_v2_vcpu_init, .domain_init = vgic_v2_domain_init, + .get_target_vcpu = vgic_v2_get_target_vcpu, }; int vgic_v2_init(struct domain *d) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 1948316..ebfec83 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -48,7 +48,7 @@ struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, return NULL; } -static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) +struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { return vgic_rank_offset(v, 8, irq, DABT_WORD); } @@ -96,7 +96,13 @@ int domain_vgic_init(struct domain *d) INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); } for (i=0; iarch.vgic.shared_irqs[i].lock); + /* By default deliver to CPU0 */ + memset(d->arch.vgic.shared_irqs[i].itargets, + 0x1, + sizeof(d->arch.vgic.shared_irqs[i].itargets)); + } d->arch.vgic.handler->domain_init(d); @@ -146,19 +152,35 @@ int vcpu_vgic_free(struct vcpu *v) return 0; } +/* takes the rank lock */ +struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq) +{ + struct domain *d = v->domain; + struct vcpu *v_target; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + + vgic_lock_rank(v, rank); + v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); + vgic_unlock_rank(v, rank); + return v_target; +} + void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { + struct domain *d = v->domain; const unsigned long mask = r; struct pending_irq *p; unsigned int irq; unsigned long flags; int i = 0; + struct vcpu *v_target; while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); - p = irq_to_pending(v, irq); + v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); + p = irq_to_pending(v_target, irq); clear_bit(GIC_IRQ_GUEST_ENABLED, &p->status); - gic_remove_from_queues(v, irq); + gic_remove_from_queues(v_target, irq); if ( p->desc != NULL ) { spin_lock_irqsave(&p->desc->lock, flags); @@ -171,29 +193,32 @@ void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) { + struct domain *d = v->domain; const unsigned long mask = r; struct pending_irq *p; unsigned int irq; unsigned long flags; int i = 0; + struct vcpu *v_target; while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); - p = irq_to_pending(v, irq); + v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); + p = irq_to_pending(v_target, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); /* We need to force the first injection of evtchn_irq because * evtchn_upcall_pending is already set by common code on vcpu * creation. */ - if ( irq == v->domain->arch.evtchn_irq && + if ( irq == v_target->domain->arch.evtchn_irq && vcpu_info(current, evtchn_upcall_pending) && list_empty(&p->inflight) ) - vgic_vcpu_inject_irq(v, irq); + vgic_vcpu_inject_irq(v_target, irq); else { unsigned long flags; - spin_lock_irqsave(&v->arch.vgic.lock, flags); + spin_lock_irqsave(&v_target->arch.vgic.lock, flags); if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) - gic_raise_guest_irq(v, irq, p->priority); - spin_unlock_irqrestore(&v->arch.vgic.lock, flags); + gic_raise_guest_irq(v_target, irq, p->priority); + spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); } if ( p->desc != NULL ) { diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 19eed7e..81a3eef 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -91,6 +91,9 @@ struct vgic_ops { int (*vcpu_init)(struct vcpu *v); /* Domain specific initialization of vGIC */ int (*domain_init)(struct domain *d); + /* Get the target vcpu for a given virq. The rank lock is already taken + * when calling this. */ + struct vcpu *(*get_target_vcpu)(struct vcpu *v, unsigned int irq); }; /* Number of ranks of interrupt registers for a domain */ @@ -151,10 +154,12 @@ enum gic_sgi_mode; extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); +extern struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); +extern struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq); extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:47:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRl6-0003eF-2a; Thu, 04 Sep 2014 07:47:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRl5-0003e4-LX for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:07 +0000 Received: from [85.158.143.35:52264] by server-3.bemta-4.messagelabs.com id 36/46-06192-BF818045; Thu, 04 Sep 2014 07:47:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1409816825!13442822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4731 invoked from network); 4 Sep 2014 07:47:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRl1-0007rr-6R for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRl1-0003R6-56 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:03 +0000 Date: Thu, 04 Sep 2014 07:47:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: observe itargets setting in vgic_enable_irqs and vgic_disable_irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5b3a817ea33b891caf7d7d788da9ce6deffa82a1 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:35 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: observe itargets setting in vgic_enable_irqs and vgic_disable_irqs vgic_enable_irqs should enable irq delivery to the vcpu specified by GICD_ITARGETSR, rather than the vcpu that wrote to GICD_ISENABLER. Similarly vgic_disable_irqs should use the target vcpu specified by itarget to disable irqs. itargets can be set to a mask but vgic_get_target_vcpu always returns the lower vcpu in the mask. Correctly initialize itargets for SPIs. Ignore bits in GICD_ITARGETSR corresponding to invalid vcpus. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic-v2.c | 42 ++++++++++++++++++++++++++++++++++++++---- xen/arch/arm/vgic.c | 43 ++++++++++++++++++++++++++++++++++--------- xen/include/asm-arm/vgic.h | 5 +++++ 3 files changed, 77 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 2102e43..63d4f65 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -298,12 +298,12 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable |= *r; - vgic_unlock_rank(v, rank); /* The virtual irq is derived from register offset. * The register difference is word difference. So divide by 2(DABT_WORD) * to get Virtual irq number */ vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> DABT_WORD); + vgic_unlock_rank(v, rank); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -313,12 +313,12 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) vgic_lock_rank(v, rank); tr = rank->ienable; rank->ienable &= ~*r; - vgic_unlock_rank(v, rank); /* The virtual irq is derived from register offset. * The register difference is word difference. So divide by 2(DABT_WORD) * to get Virtual irq number */ vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> DABT_WORD); + vgic_unlock_rank(v, rank); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: @@ -359,13 +359,29 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto write_ignore; + /* 8-bit vcpu mask for this domain */ + BUG_ON(v->domain->max_vcpus > 8); + tr = (1 << v->domain->max_vcpus) - 1; + if ( dabt.size == 2 ) + tr = tr | (tr << 8) | (tr << 16) | (tr << 24); + else + tr = (tr << (8 * (gicd_reg & 0x3))); + tr &= *r; + /* ignore zero writes */ + if ( !tr ) + goto write_ignore; + /* For word reads ignore writes where any single byte is zero */ + if ( dabt.size == 2 && + !((tr & 0xff) && (tr & (0xff << 8)) && + (tr & (0xff << 16)) && (tr & (0xff << 24)))) + goto write_ignore; vgic_lock_rank(v, rank); if ( dabt.size == DABT_WORD ) rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = *r; + DABT_WORD)] = tr; else vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, - gicd_reg - GICD_ITARGETSR, DABT_WORD)], *r, gicd_reg); + gicd_reg - GICD_ITARGETSR, DABT_WORD)], tr, gicd_reg); vgic_unlock_rank(v, rank); return 1; @@ -460,6 +476,23 @@ static const struct mmio_handler_ops vgic_v2_distr_mmio_handler = { .write_handler = vgic_v2_distr_mmio_write, }; +static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) +{ + unsigned long target; + struct vcpu *v_target; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + ASSERT(spin_is_locked(&rank->lock)); + + target = vgic_byte_read(rank->itargets[(irq%32)/4], 0, irq % 4); + /* 1-N SPI should be delivered as pending to all the vcpus in the + * mask, but here we just return the first vcpu for simplicity and + * because it would be too slow to do otherwise. */ + target = find_first_bit(&target, 8); + ASSERT(target >= 0 && target < v->domain->max_vcpus); + v_target = v->domain->vcpu[target]; + return v_target; +} + static int vgic_v2_vcpu_init(struct vcpu *v) { int i; @@ -487,6 +520,7 @@ static int vgic_v2_domain_init(struct domain *d) static const struct vgic_ops vgic_v2_ops = { .vcpu_init = vgic_v2_vcpu_init, .domain_init = vgic_v2_domain_init, + .get_target_vcpu = vgic_v2_get_target_vcpu, }; int vgic_v2_init(struct domain *d) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 1948316..ebfec83 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -48,7 +48,7 @@ struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, return NULL; } -static struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) +struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { return vgic_rank_offset(v, 8, irq, DABT_WORD); } @@ -96,7 +96,13 @@ int domain_vgic_init(struct domain *d) INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); } for (i=0; iarch.vgic.shared_irqs[i].lock); + /* By default deliver to CPU0 */ + memset(d->arch.vgic.shared_irqs[i].itargets, + 0x1, + sizeof(d->arch.vgic.shared_irqs[i].itargets)); + } d->arch.vgic.handler->domain_init(d); @@ -146,19 +152,35 @@ int vcpu_vgic_free(struct vcpu *v) return 0; } +/* takes the rank lock */ +struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq) +{ + struct domain *d = v->domain; + struct vcpu *v_target; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + + vgic_lock_rank(v, rank); + v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); + vgic_unlock_rank(v, rank); + return v_target; +} + void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { + struct domain *d = v->domain; const unsigned long mask = r; struct pending_irq *p; unsigned int irq; unsigned long flags; int i = 0; + struct vcpu *v_target; while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); - p = irq_to_pending(v, irq); + v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); + p = irq_to_pending(v_target, irq); clear_bit(GIC_IRQ_GUEST_ENABLED, &p->status); - gic_remove_from_queues(v, irq); + gic_remove_from_queues(v_target, irq); if ( p->desc != NULL ) { spin_lock_irqsave(&p->desc->lock, flags); @@ -171,29 +193,32 @@ void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) { + struct domain *d = v->domain; const unsigned long mask = r; struct pending_irq *p; unsigned int irq; unsigned long flags; int i = 0; + struct vcpu *v_target; while ( (i = find_next_bit(&mask, 32, i)) < 32 ) { irq = i + (32 * n); - p = irq_to_pending(v, irq); + v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); + p = irq_to_pending(v_target, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); /* We need to force the first injection of evtchn_irq because * evtchn_upcall_pending is already set by common code on vcpu * creation. */ - if ( irq == v->domain->arch.evtchn_irq && + if ( irq == v_target->domain->arch.evtchn_irq && vcpu_info(current, evtchn_upcall_pending) && list_empty(&p->inflight) ) - vgic_vcpu_inject_irq(v, irq); + vgic_vcpu_inject_irq(v_target, irq); else { unsigned long flags; - spin_lock_irqsave(&v->arch.vgic.lock, flags); + spin_lock_irqsave(&v_target->arch.vgic.lock, flags); if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) - gic_raise_guest_irq(v, irq, p->priority); - spin_unlock_irqrestore(&v->arch.vgic.lock, flags); + gic_raise_guest_irq(v_target, irq, p->priority); + spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); } if ( p->desc != NULL ) { diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 19eed7e..81a3eef 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -91,6 +91,9 @@ struct vgic_ops { int (*vcpu_init)(struct vcpu *v); /* Domain specific initialization of vGIC */ int (*domain_init)(struct domain *d); + /* Get the target vcpu for a given virq. The rank lock is already taken + * when calling this. */ + struct vcpu *(*get_target_vcpu)(struct vcpu *v, unsigned int irq); }; /* Number of ranks of interrupt registers for a domain */ @@ -151,10 +154,12 @@ enum gic_sgi_mode; extern int domain_vgic_init(struct domain *d); extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); +extern struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); +extern struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq); extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRlG-0003fz-5K; Thu, 04 Sep 2014 07:47:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlF-0003fh-Bz for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:17 +0000 Received: from [85.158.143.35:8322] by server-2.bemta-4.messagelabs.com id F0/95-04525-40918045; Thu, 04 Sep 2014 07:47:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1409816835!10050629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8105 invoked from network); 4 Sep 2014 07:47:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlD-0007rx-92 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlD-0003RU-76 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:15 +0000 Date: Thu, 04 Sep 2014 07:47:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move setting GIC_IRQ_GUEST_QUEUED earlier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c9bb3c25a4bd63b58f5f0017a054110494a697f Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:36 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: move setting GIC_IRQ_GUEST_QUEUED earlier It makes the code cleaner, especially with the following patches. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index ebfec83..9947e8c 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -321,13 +321,6 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) spin_lock_irqsave(&v->arch.vgic.lock, flags); - if ( !list_empty(&n->inflight) ) - { - set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); - gic_raise_inflight_irq(v, irq); - goto out; - } - /* vcpu offline */ if ( test_bit(_VPF_down, &v->pause_flags) ) { @@ -335,10 +328,17 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } + set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); + + if ( !list_empty(&n->inflight) ) + { + gic_raise_inflight_irq(v, irq); + goto out; + } + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); n->irq = irq; - set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); n->priority = priority; /* the irq is 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 Thu Sep 04 07:47:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRlG-0003fz-5K; Thu, 04 Sep 2014 07:47:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlF-0003fh-Bz for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:17 +0000 Received: from [85.158.143.35:8322] by server-2.bemta-4.messagelabs.com id F0/95-04525-40918045; Thu, 04 Sep 2014 07:47:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1409816835!10050629!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8105 invoked from network); 4 Sep 2014 07:47:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlD-0007rx-92 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlD-0003RU-76 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:15 +0000 Date: Thu, 04 Sep 2014 07:47:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move setting GIC_IRQ_GUEST_QUEUED earlier X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c9bb3c25a4bd63b58f5f0017a054110494a697f Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:36 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: move setting GIC_IRQ_GUEST_QUEUED earlier It makes the code cleaner, especially with the following patches. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index ebfec83..9947e8c 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -321,13 +321,6 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) spin_lock_irqsave(&v->arch.vgic.lock, flags); - if ( !list_empty(&n->inflight) ) - { - set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); - gic_raise_inflight_irq(v, irq); - goto out; - } - /* vcpu offline */ if ( test_bit(_VPF_down, &v->pause_flags) ) { @@ -335,10 +328,17 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) return; } + set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); + + if ( !list_empty(&n->inflight) ) + { + gic_raise_inflight_irq(v, irq); + goto out; + } + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); n->irq = irq; - set_bit(GIC_IRQ_GUEST_QUEUED, &n->status); n->priority = priority; /* the irq is 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 Thu Sep 04 07:47:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:47: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 1XPRlR-0003hk-81; Thu, 04 Sep 2014 07:47:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlQ-0003hZ-88 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:28 +0000 Received: from [193.109.254.147:55890] by server-5.bemta-14.messagelabs.com id 57/0E-28255-F0918045; Thu, 04 Sep 2014 07:47:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1409816845!13373633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8580 invoked from network); 4 Sep 2014 07:47:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlN-0007s3-GY for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlN-0003Rq-Cl for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:25 +0000 Date: Thu, 04 Sep 2014 07:47:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: inflight irqs during migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e42345c5c0618e3006b15ee921513675732d96d Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:37 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: inflight irqs during migration We need to take special care when migrating irqs that are already inflight from one vcpu to another. See "The effect of changes to an GICD_ITARGETSR", part of chapter 4.3.12 of the ARM Generic Interrupt Controller Architecture Specification, IHI 0048B. The main issue from the Xen point of view is that the lr_pending and inflight lists are per-vcpu. The lock we take to protect them is also per-vcpu. In order to avoid issues, if the irq is still lr_pending, we can immediately move it to the new vcpu for injection. Otherwise if it is in a GICH_LR register, set a new flag GIC_IRQ_GUEST_MIGRATING. If GIC_IRQ_GUEST_MIGRATING is set we'll change the affinity of the physical irq when clearing the LR (in a following commit). Therefore if the irq is inflight in an LR when the guest writes to itarget, we wait until the LR is cleared before changing physical irq affinity. This guarantees that the old vcpu is going to be interrupted and clear the LR, either because it has been descheduled after EOIing the interrupt or because it is interrupted by the second physical irq coming. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/gic.c | 8 ++++++-- xen/arch/arm/vgic-v2.c | 44 +++++++++++++++++++++++++++++++++++--------- xen/arch/arm/vgic.c | 38 ++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/vgic.h | 6 ++++++ 4 files changed, 85 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 256d9cf..3e75fc5 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -33,6 +33,7 @@ #include #include #include +#include static void gic_restore_pending_irqs(struct vcpu *v); @@ -375,10 +376,13 @@ static void gic_update_one_lr(struct vcpu *v, int i) clear_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); p->lr = GIC_INVALID_LR; if ( test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) && - test_bit(GIC_IRQ_GUEST_QUEUED, &p->status) ) + test_bit(GIC_IRQ_GUEST_QUEUED, &p->status) && + !test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) gic_raise_guest_irq(v, irq, p->priority); - else + else { list_del_init(&p->inflight); + clear_bit(GIC_IRQ_GUEST_MIGRATING, &p->status); + } } } diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 63d4f65..39d8272 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -356,34 +356,60 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: + { + /* unsigned long needed for find_next_bit */ + unsigned long target; + int i; if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto write_ignore; /* 8-bit vcpu mask for this domain */ BUG_ON(v->domain->max_vcpus > 8); - tr = (1 << v->domain->max_vcpus) - 1; + target = (1 << v->domain->max_vcpus) - 1; if ( dabt.size == 2 ) - tr = tr | (tr << 8) | (tr << 16) | (tr << 24); + target = target | (target << 8) | (target << 16) | (target << 24); else - tr = (tr << (8 * (gicd_reg & 0x3))); - tr &= *r; + target = (target << (8 * (gicd_reg & 0x3))); + target &= *r; /* ignore zero writes */ - if ( !tr ) + if ( !target ) goto write_ignore; /* For word reads ignore writes where any single byte is zero */ if ( dabt.size == 2 && - !((tr & 0xff) && (tr & (0xff << 8)) && - (tr & (0xff << 16)) && (tr & (0xff << 24)))) + !((target & 0xff) && (target & (0xff << 8)) && + (target & (0xff << 16)) && (target & (0xff << 24)))) goto write_ignore; vgic_lock_rank(v, rank); + i = 0; + while ( (i = find_next_bit(&target, 32, i)) < 32 ) + { + unsigned int irq, new_target, old_target; + unsigned long old_target_mask; + struct vcpu *v_target, *v_old; + + new_target = i % 8; + old_target_mask = vgic_byte_read(rank->itargets[REG_RANK_INDEX(8, + gicd_reg - GICD_ITARGETSR, DABT_WORD)], 0, i/8); + old_target = find_first_bit(&old_target_mask, 8); + + if ( new_target != old_target ) + { + irq = gicd_reg - GICD_ITARGETSR + (i / 8); + v_target = v->domain->vcpu[new_target]; + v_old = v->domain->vcpu[old_target]; + vgic_migrate_irq(v_old, v_target, irq); + } + i += 8 - new_target; + } if ( dabt.size == DABT_WORD ) rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = tr; + DABT_WORD)] = target; else vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, - gicd_reg - GICD_ITARGETSR, DABT_WORD)], tr, gicd_reg); + gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); vgic_unlock_rank(v, rank); return 1; + } case GICD_IPRIORITYR ... GICD_IPRIORITYRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 9947e8c..e0dcaf6 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -165,6 +165,44 @@ struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq) return v_target; } +void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) +{ + unsigned long flags; + struct pending_irq *p = irq_to_pending(old, irq); + + /* nothing to do for virtual interrupts */ + if ( p->desc == NULL ) + return; + + /* migration already in progress, no need to do anything */ + if ( test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) + return; + + spin_lock_irqsave(&old->arch.vgic.lock, flags); + + if ( list_empty(&p->inflight) ) + { + spin_unlock_irqrestore(&old->arch.vgic.lock, flags); + return; + } + /* If the IRQ is still lr_pending, re-inject it to the new vcpu */ + if ( !list_empty(&p->lr_queue) ) + { + clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); + list_del_init(&p->lr_queue); + list_del_init(&p->inflight); + spin_unlock_irqrestore(&old->arch.vgic.lock, flags); + vgic_vcpu_inject_irq(new, irq); + return; + } + /* if the IRQ is in a GICH_LR register, set GIC_IRQ_GUEST_MIGRATING + * and wait for the EOI */ + if ( !list_empty(&p->inflight) ) + set_bit(GIC_IRQ_GUEST_MIGRATING, &p->status); + + spin_unlock_irqrestore(&old->arch.vgic.lock, flags); +} + void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { struct domain *d = v->domain; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 81a3eef..434a625 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -55,11 +55,16 @@ struct pending_irq * GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD * level (GICD_ICENABLER/GICD_ISENABLER). * + * GIC_IRQ_GUEST_MIGRATING: the irq is being migrated to a different + * vcpu while it is still inflight and on an GICH_LR register on the + * old vcpu. + * */ #define GIC_IRQ_GUEST_QUEUED 0 #define GIC_IRQ_GUEST_ACTIVE 1 #define GIC_IRQ_GUEST_VISIBLE 2 #define GIC_IRQ_GUEST_ENABLED 3 +#define GIC_IRQ_GUEST_MIGRATING 4 unsigned long status; struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ int irq; @@ -169,6 +174,7 @@ extern int vcpu_vgic_free(struct vcpu *v); extern int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, unsigned long vcpu_mask); +extern void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq); #endif /* __ASM_ARM_VGIC_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:47: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 1XPRlR-0003hk-81; Thu, 04 Sep 2014 07:47:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlQ-0003hZ-88 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:28 +0000 Received: from [193.109.254.147:55890] by server-5.bemta-14.messagelabs.com id 57/0E-28255-F0918045; Thu, 04 Sep 2014 07:47:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1409816845!13373633!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8580 invoked from network); 4 Sep 2014 07:47:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlN-0007s3-GY for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlN-0003Rq-Cl for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:25 +0000 Date: Thu, 04 Sep 2014 07:47:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: inflight irqs during migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e42345c5c0618e3006b15ee921513675732d96d Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:37 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: inflight irqs during migration We need to take special care when migrating irqs that are already inflight from one vcpu to another. See "The effect of changes to an GICD_ITARGETSR", part of chapter 4.3.12 of the ARM Generic Interrupt Controller Architecture Specification, IHI 0048B. The main issue from the Xen point of view is that the lr_pending and inflight lists are per-vcpu. The lock we take to protect them is also per-vcpu. In order to avoid issues, if the irq is still lr_pending, we can immediately move it to the new vcpu for injection. Otherwise if it is in a GICH_LR register, set a new flag GIC_IRQ_GUEST_MIGRATING. If GIC_IRQ_GUEST_MIGRATING is set we'll change the affinity of the physical irq when clearing the LR (in a following commit). Therefore if the irq is inflight in an LR when the guest writes to itarget, we wait until the LR is cleared before changing physical irq affinity. This guarantees that the old vcpu is going to be interrupted and clear the LR, either because it has been descheduled after EOIing the interrupt or because it is interrupted by the second physical irq coming. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/gic.c | 8 ++++++-- xen/arch/arm/vgic-v2.c | 44 +++++++++++++++++++++++++++++++++++--------- xen/arch/arm/vgic.c | 38 ++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/vgic.h | 6 ++++++ 4 files changed, 85 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 256d9cf..3e75fc5 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -33,6 +33,7 @@ #include #include #include +#include static void gic_restore_pending_irqs(struct vcpu *v); @@ -375,10 +376,13 @@ static void gic_update_one_lr(struct vcpu *v, int i) clear_bit(GIC_IRQ_GUEST_ACTIVE, &p->status); p->lr = GIC_INVALID_LR; if ( test_bit(GIC_IRQ_GUEST_ENABLED, &p->status) && - test_bit(GIC_IRQ_GUEST_QUEUED, &p->status) ) + test_bit(GIC_IRQ_GUEST_QUEUED, &p->status) && + !test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) gic_raise_guest_irq(v, irq, p->priority); - else + else { list_del_init(&p->inflight); + clear_bit(GIC_IRQ_GUEST_MIGRATING, &p->status); + } } } diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 63d4f65..39d8272 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -356,34 +356,60 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) goto write_ignore; case GICD_ITARGETSR + 8 ... GICD_ITARGETSRN: + { + /* unsigned long needed for find_next_bit */ + unsigned long target; + int i; if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto write_ignore; /* 8-bit vcpu mask for this domain */ BUG_ON(v->domain->max_vcpus > 8); - tr = (1 << v->domain->max_vcpus) - 1; + target = (1 << v->domain->max_vcpus) - 1; if ( dabt.size == 2 ) - tr = tr | (tr << 8) | (tr << 16) | (tr << 24); + target = target | (target << 8) | (target << 16) | (target << 24); else - tr = (tr << (8 * (gicd_reg & 0x3))); - tr &= *r; + target = (target << (8 * (gicd_reg & 0x3))); + target &= *r; /* ignore zero writes */ - if ( !tr ) + if ( !target ) goto write_ignore; /* For word reads ignore writes where any single byte is zero */ if ( dabt.size == 2 && - !((tr & 0xff) && (tr & (0xff << 8)) && - (tr & (0xff << 16)) && (tr & (0xff << 24)))) + !((target & 0xff) && (target & (0xff << 8)) && + (target & (0xff << 16)) && (target & (0xff << 24)))) goto write_ignore; vgic_lock_rank(v, rank); + i = 0; + while ( (i = find_next_bit(&target, 32, i)) < 32 ) + { + unsigned int irq, new_target, old_target; + unsigned long old_target_mask; + struct vcpu *v_target, *v_old; + + new_target = i % 8; + old_target_mask = vgic_byte_read(rank->itargets[REG_RANK_INDEX(8, + gicd_reg - GICD_ITARGETSR, DABT_WORD)], 0, i/8); + old_target = find_first_bit(&old_target_mask, 8); + + if ( new_target != old_target ) + { + irq = gicd_reg - GICD_ITARGETSR + (i / 8); + v_target = v->domain->vcpu[new_target]; + v_old = v->domain->vcpu[old_target]; + vgic_migrate_irq(v_old, v_target, irq); + } + i += 8 - new_target; + } if ( dabt.size == DABT_WORD ) rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = tr; + DABT_WORD)] = target; else vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, - gicd_reg - GICD_ITARGETSR, DABT_WORD)], tr, gicd_reg); + gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); vgic_unlock_rank(v, rank); return 1; + } case GICD_IPRIORITYR ... GICD_IPRIORITYRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 9947e8c..e0dcaf6 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -165,6 +165,44 @@ struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq) return v_target; } +void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) +{ + unsigned long flags; + struct pending_irq *p = irq_to_pending(old, irq); + + /* nothing to do for virtual interrupts */ + if ( p->desc == NULL ) + return; + + /* migration already in progress, no need to do anything */ + if ( test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) + return; + + spin_lock_irqsave(&old->arch.vgic.lock, flags); + + if ( list_empty(&p->inflight) ) + { + spin_unlock_irqrestore(&old->arch.vgic.lock, flags); + return; + } + /* If the IRQ is still lr_pending, re-inject it to the new vcpu */ + if ( !list_empty(&p->lr_queue) ) + { + clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); + list_del_init(&p->lr_queue); + list_del_init(&p->inflight); + spin_unlock_irqrestore(&old->arch.vgic.lock, flags); + vgic_vcpu_inject_irq(new, irq); + return; + } + /* if the IRQ is in a GICH_LR register, set GIC_IRQ_GUEST_MIGRATING + * and wait for the EOI */ + if ( !list_empty(&p->inflight) ) + set_bit(GIC_IRQ_GUEST_MIGRATING, &p->status); + + spin_unlock_irqrestore(&old->arch.vgic.lock, flags); +} + void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { struct domain *d = v->domain; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 81a3eef..434a625 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -55,11 +55,16 @@ struct pending_irq * GIC_IRQ_GUEST_ENABLED: the guest IRQ is enabled at the VGICD * level (GICD_ICENABLER/GICD_ISENABLER). * + * GIC_IRQ_GUEST_MIGRATING: the irq is being migrated to a different + * vcpu while it is still inflight and on an GICH_LR register on the + * old vcpu. + * */ #define GIC_IRQ_GUEST_QUEUED 0 #define GIC_IRQ_GUEST_ACTIVE 1 #define GIC_IRQ_GUEST_VISIBLE 2 #define GIC_IRQ_GUEST_ENABLED 3 +#define GIC_IRQ_GUEST_MIGRATING 4 unsigned long status; struct irq_desc *desc; /* only set it the irq corresponds to a physical irq */ int irq; @@ -169,6 +174,7 @@ extern int vcpu_vgic_free(struct vcpu *v); extern int vgic_to_sgi(struct vcpu *v, register_t sgir, enum gic_sgi_mode irqmode, int virq, unsigned long vcpu_mask); +extern void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq); #endif /* __ASM_ARM_VGIC_H__ */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRla-0003ja-CP; Thu, 04 Sep 2014 07: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 1XPRlZ-0003jP-TV for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:38 +0000 Received: from [85.158.143.35:57659] by server-1.bemta-4.messagelabs.com id 07/58-05872-91918045; Thu, 04 Sep 2014 07:47:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1409816855!13529263!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26113 invoked from network); 4 Sep 2014 07: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; 4 Sep 2014 07:47:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlX-0007sB-Lp for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlX-0003SG-Kl for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:35 +0000 Date: Thu, 04 Sep 2014 07:47:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: support irq delivery to vcpu > 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 489abfd46a568b4fca578f80ba66e3b4de6f2298 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:38 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: support irq delivery to vcpu > 0 Use vgic_get_target_vcpu to retrieve the target vcpu from do_IRQ. Remove in-code comments about missing implementation of SGI delivery to vcpus other than 0. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 3 ++- xen/arch/arm/irq.c | 5 +++-- xen/arch/arm/vgic.c | 11 +++++++++++ xen/include/asm-arm/vgic.h | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 3e75fc5..f5c7c91 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -137,7 +137,8 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, gic_set_irq_properties(desc, cpumask_of(smp_processor_id()), GIC_PRI_IRQ); - /* TODO: do not assume delivery to vcpu0 */ + /* Use vcpu0 to retrieve the pending_irq struct. Given that we only + * route SPIs to guests, it doesn't make any difference. */ p = irq_to_pending(d->vcpu[0], desc->irq); p->desc = desc; } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 3a8acbf..49ca467 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -198,8 +198,9 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) desc->status |= IRQ_INPROGRESS; desc->arch.eoi_cpu = smp_processor_id(); - /* XXX: inject irq into all guest vcpus */ - vgic_vcpu_inject_irq(d->vcpu[0], irq); + /* the irq cannot be a PPI, we only support delivery of SPIs to + * guests */ + vgic_vcpu_inject_spi(d, irq); goto out_no_end; } diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index e0dcaf6..ed7108e 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -401,6 +401,17 @@ out: smp_send_event_check_mask(cpumask_of(v->processor)); } +void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq) +{ + struct vcpu *v; + + /* the IRQ needs to be an SPI */ + ASSERT(irq >= 32 && irq <= gic_number_lines()); + + v = vgic_get_target_vcpu(d->vcpu[0], irq); + vgic_vcpu_inject_irq(v, irq); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 434a625..9b1db04 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -161,6 +161,7 @@ extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); extern struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); +extern void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRla-0003ja-CP; Thu, 04 Sep 2014 07: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 1XPRlZ-0003jP-TV for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:38 +0000 Received: from [85.158.143.35:57659] by server-1.bemta-4.messagelabs.com id 07/58-05872-91918045; Thu, 04 Sep 2014 07:47:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1409816855!13529263!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26113 invoked from network); 4 Sep 2014 07: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; 4 Sep 2014 07:47:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlX-0007sB-Lp for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlX-0003SG-Kl for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:35 +0000 Date: Thu, 04 Sep 2014 07:47:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: support irq delivery to vcpu > 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 489abfd46a568b4fca578f80ba66e3b4de6f2298 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:38 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: support irq delivery to vcpu > 0 Use vgic_get_target_vcpu to retrieve the target vcpu from do_IRQ. Remove in-code comments about missing implementation of SGI delivery to vcpus other than 0. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/gic.c | 3 ++- xen/arch/arm/irq.c | 5 +++-- xen/arch/arm/vgic.c | 11 +++++++++++ xen/include/asm-arm/vgic.h | 1 + 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 3e75fc5..f5c7c91 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -137,7 +137,8 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, gic_set_irq_properties(desc, cpumask_of(smp_processor_id()), GIC_PRI_IRQ); - /* TODO: do not assume delivery to vcpu0 */ + /* Use vcpu0 to retrieve the pending_irq struct. Given that we only + * route SPIs to guests, it doesn't make any difference. */ p = irq_to_pending(d->vcpu[0], desc->irq); p->desc = desc; } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 3a8acbf..49ca467 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -198,8 +198,9 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) desc->status |= IRQ_INPROGRESS; desc->arch.eoi_cpu = smp_processor_id(); - /* XXX: inject irq into all guest vcpus */ - vgic_vcpu_inject_irq(d->vcpu[0], irq); + /* the irq cannot be a PPI, we only support delivery of SPIs to + * guests */ + vgic_vcpu_inject_spi(d, irq); goto out_no_end; } diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index e0dcaf6..ed7108e 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -401,6 +401,17 @@ out: smp_send_event_check_mask(cpumask_of(v->processor)); } +void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq) +{ + struct vcpu *v; + + /* the IRQ needs to be an SPI */ + ASSERT(irq >= 32 && irq <= gic_number_lines()); + + v = vgic_get_target_vcpu(d->vcpu[0], irq); + vgic_vcpu_inject_irq(v, irq); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 434a625..9b1db04 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -161,6 +161,7 @@ extern void domain_vgic_free(struct domain *d); extern int vcpu_vgic_init(struct vcpu *v); extern struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq); extern void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq); +extern void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq); extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRll-0003lC-F4; Thu, 04 Sep 2014 07: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 1XPRlk-0003l1-OU for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:48 +0000 Received: from [85.158.139.211:23476] by server-1.bemta-5.messagelabs.com id 6A/7B-17892-42918045; Thu, 04 Sep 2014 07:47:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1409816866!12409135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6535 invoked from network); 4 Sep 2014 07:47:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlh-0007sH-Qq for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlh-0003Sc-Po for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:45 +0000 Date: Thu, 04 Sep 2014 07:47:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: physical irq follow virtual irq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bd62a757b9e39abc62dcb2a8c0cd2ab429c7c4c Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:39 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: physical irq follow virtual irq Migrate physical irqs to the same physical cpu that is running the vcpu expected to receive the irqs. That is done when enabling irqs, when the guest writes to GICD_ITARGETSR and when Xen migrates a vcpu to a different pcpu. In case of virq migration, if the virq is inflight and in a GICH_LR register already, delay migrating the corresponding physical irq until the virq is EOIed by the guest and the MIGRATING flag has been cleared. This way we make sure that the pcpu running the old vcpu gets interrupted with a new irq of the same kind, clearing the GICH_LR sooner. Introduce a new arch specific function, arch_move_irqs, that is empty on x86 and implements the vgic irq migration code on ARM. arch_move_irqs is going to be called by from sched.c. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 15 +++++++++++++-- xen/arch/arm/gic.c | 6 +++++- xen/arch/arm/irq.c | 6 ++++++ xen/arch/arm/vgic.c | 21 +++++++++++++++++++++ xen/include/asm-arm/irq.h | 3 +++ xen/include/asm-x86/irq.h | 2 ++ 6 files changed, 50 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 1305542..da60a41 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -569,9 +569,20 @@ static void gicv2_guest_irq_end(struct irq_desc *desc) /* Deactivation happens in maintenance interrupt / via GICV */ } -static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) +static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) { - BUG(); + unsigned int mask; + + ASSERT(!cpumask_empty(cpu_mask)); + + spin_lock(&gicv2.lock); + + mask = gicv2_cpu_mask(cpu_mask); + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_gicd(mask, GICD_ITARGETSR + desc->irq); + + spin_unlock(&gicv2.lock); } /* XXX different for level vs edge */ diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index f5c7c91..2aa9500 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -382,7 +382,11 @@ static void gic_update_one_lr(struct vcpu *v, int i) gic_raise_guest_irq(v, irq, p->priority); else { list_del_init(&p->inflight); - clear_bit(GIC_IRQ_GUEST_MIGRATING, &p->status); + if ( test_and_clear_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) + { + struct vcpu *v_target = vgic_get_target_vcpu(v, irq); + irq_set_affinity(p->desc, cpumask_of(v_target->processor)); + } } } } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 49ca467..7150c7a 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -134,6 +134,12 @@ static inline struct domain *irq_get_domain(struct irq_desc *desc) return desc->action->dev_id; } +void irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) +{ + if ( desc != NULL ) + desc->handler->set_affinity(desc, cpu_mask); +} + int request_irq(unsigned int irq, unsigned int irqflags, void (*handler)(int, void *, struct cpu_user_regs *), const char *devname, void *dev_id) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index ed7108e..2319d71 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -182,6 +182,7 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) if ( list_empty(&p->inflight) ) { + irq_set_affinity(p->desc, cpumask_of(new->processor)); spin_unlock_irqrestore(&old->arch.vgic.lock, flags); return; } @@ -191,6 +192,7 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); list_del_init(&p->lr_queue); list_del_init(&p->inflight); + irq_set_affinity(p->desc, cpumask_of(new->processor)); spin_unlock_irqrestore(&old->arch.vgic.lock, flags); vgic_vcpu_inject_irq(new, irq); return; @@ -203,6 +205,24 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) spin_unlock_irqrestore(&old->arch.vgic.lock, flags); } +void arch_move_irqs(struct vcpu *v) +{ + const cpumask_t *cpu_mask = cpumask_of(v->processor); + struct domain *d = v->domain; + struct pending_irq *p; + struct vcpu *v_target; + int i; + + for ( i = 32; i < (d->arch.vgic.nr_lines + 32); i++ ) + { + v_target = vgic_get_target_vcpu(v, i); + p = irq_to_pending(v_target, i); + + if ( v_target == v && !test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) + irq_set_affinity(p->desc, cpu_mask); + } +} + void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { struct domain *d = v->domain; @@ -260,6 +280,7 @@ void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) } if ( p->desc != NULL ) { + irq_set_affinity(p->desc, cpumask_of(v_target->processor)); spin_lock_irqsave(&p->desc->lock, flags); p->desc->handler->enable(p->desc); spin_unlock_irqrestore(&p->desc->lock, flags); diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index e567f71..e877334 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -42,12 +42,15 @@ void init_secondary_IRQ(void); int route_irq_to_guest(struct domain *d, unsigned int irq, const char *devname); +void arch_move_irqs(struct vcpu *v); /* Set IRQ type for an SPI */ int irq_set_spi_type(unsigned int spi, unsigned int type); int platform_get_irq(const struct dt_device_node *device, int index); +void irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask); + #endif /* _ASM_HW_IRQ_H */ /* * Local variables: diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index 9066d38..d3c55f3 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -197,4 +197,6 @@ void cleanup_domain_irq_mapping(struct domain *); bool_t cpu_has_pending_apic_eoi(void); +static inline void arch_move_irqs(struct vcpu *v) { } + #endif /* _ASM_HW_IRQ_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07: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 1XPRll-0003lC-F4; Thu, 04 Sep 2014 07: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 1XPRlk-0003l1-OU for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:48 +0000 Received: from [85.158.139.211:23476] by server-1.bemta-5.messagelabs.com id 6A/7B-17892-42918045; Thu, 04 Sep 2014 07:47:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1409816866!12409135!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6535 invoked from network); 4 Sep 2014 07:47:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:47:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlh-0007sH-Qq for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlh-0003Sc-Po for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:45 +0000 Date: Thu, 04 Sep 2014 07:47:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: physical irq follow virtual irq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5bd62a757b9e39abc62dcb2a8c0cd2ab429c7c4c Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:39 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:25 2014 +0100 xen/arm: physical irq follow virtual irq Migrate physical irqs to the same physical cpu that is running the vcpu expected to receive the irqs. That is done when enabling irqs, when the guest writes to GICD_ITARGETSR and when Xen migrates a vcpu to a different pcpu. In case of virq migration, if the virq is inflight and in a GICH_LR register already, delay migrating the corresponding physical irq until the virq is EOIed by the guest and the MIGRATING flag has been cleared. This way we make sure that the pcpu running the old vcpu gets interrupted with a new irq of the same kind, clearing the GICH_LR sooner. Introduce a new arch specific function, arch_move_irqs, that is empty on x86 and implements the vgic irq migration code on ARM. arch_move_irqs is going to be called by from sched.c. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 15 +++++++++++++-- xen/arch/arm/gic.c | 6 +++++- xen/arch/arm/irq.c | 6 ++++++ xen/arch/arm/vgic.c | 21 +++++++++++++++++++++ xen/include/asm-arm/irq.h | 3 +++ xen/include/asm-x86/irq.h | 2 ++ 6 files changed, 50 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 1305542..da60a41 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -569,9 +569,20 @@ static void gicv2_guest_irq_end(struct irq_desc *desc) /* Deactivation happens in maintenance interrupt / via GICV */ } -static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) +static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) { - BUG(); + unsigned int mask; + + ASSERT(!cpumask_empty(cpu_mask)); + + spin_lock(&gicv2.lock); + + mask = gicv2_cpu_mask(cpu_mask); + + /* Set target CPU mask (RAZ/WI on uniprocessor) */ + writeb_gicd(mask, GICD_ITARGETSR + desc->irq); + + spin_unlock(&gicv2.lock); } /* XXX different for level vs edge */ diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index f5c7c91..2aa9500 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -382,7 +382,11 @@ static void gic_update_one_lr(struct vcpu *v, int i) gic_raise_guest_irq(v, irq, p->priority); else { list_del_init(&p->inflight); - clear_bit(GIC_IRQ_GUEST_MIGRATING, &p->status); + if ( test_and_clear_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) + { + struct vcpu *v_target = vgic_get_target_vcpu(v, irq); + irq_set_affinity(p->desc, cpumask_of(v_target->processor)); + } } } } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 49ca467..7150c7a 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -134,6 +134,12 @@ static inline struct domain *irq_get_domain(struct irq_desc *desc) return desc->action->dev_id; } +void irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask) +{ + if ( desc != NULL ) + desc->handler->set_affinity(desc, cpu_mask); +} + int request_irq(unsigned int irq, unsigned int irqflags, void (*handler)(int, void *, struct cpu_user_regs *), const char *devname, void *dev_id) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index ed7108e..2319d71 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -182,6 +182,7 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) if ( list_empty(&p->inflight) ) { + irq_set_affinity(p->desc, cpumask_of(new->processor)); spin_unlock_irqrestore(&old->arch.vgic.lock, flags); return; } @@ -191,6 +192,7 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) clear_bit(GIC_IRQ_GUEST_QUEUED, &p->status); list_del_init(&p->lr_queue); list_del_init(&p->inflight); + irq_set_affinity(p->desc, cpumask_of(new->processor)); spin_unlock_irqrestore(&old->arch.vgic.lock, flags); vgic_vcpu_inject_irq(new, irq); return; @@ -203,6 +205,24 @@ void vgic_migrate_irq(struct vcpu *old, struct vcpu *new, unsigned int irq) spin_unlock_irqrestore(&old->arch.vgic.lock, flags); } +void arch_move_irqs(struct vcpu *v) +{ + const cpumask_t *cpu_mask = cpumask_of(v->processor); + struct domain *d = v->domain; + struct pending_irq *p; + struct vcpu *v_target; + int i; + + for ( i = 32; i < (d->arch.vgic.nr_lines + 32); i++ ) + { + v_target = vgic_get_target_vcpu(v, i); + p = irq_to_pending(v_target, i); + + if ( v_target == v && !test_bit(GIC_IRQ_GUEST_MIGRATING, &p->status) ) + irq_set_affinity(p->desc, cpu_mask); + } +} + void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n) { struct domain *d = v->domain; @@ -260,6 +280,7 @@ void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) } if ( p->desc != NULL ) { + irq_set_affinity(p->desc, cpumask_of(v_target->processor)); spin_lock_irqsave(&p->desc->lock, flags); p->desc->handler->enable(p->desc); spin_unlock_irqrestore(&p->desc->lock, flags); diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index e567f71..e877334 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -42,12 +42,15 @@ void init_secondary_IRQ(void); int route_irq_to_guest(struct domain *d, unsigned int irq, const char *devname); +void arch_move_irqs(struct vcpu *v); /* Set IRQ type for an SPI */ int irq_set_spi_type(unsigned int spi, unsigned int type); int platform_get_irq(const struct dt_device_node *device, int index); +void irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask); + #endif /* _ASM_HW_IRQ_H */ /* * Local variables: diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index 9066d38..d3c55f3 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -197,4 +197,6 @@ void cleanup_domain_irq_mapping(struct domain *); bool_t cpu_has_pending_apic_eoi(void); +static inline void arch_move_irqs(struct vcpu *v) { } + #endif /* _ASM_HW_IRQ_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:47:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlv-0003mq-Hq; Thu, 04 Sep 2014 07:47:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlu-0003md-Pc for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:58 +0000 Received: from [85.158.143.35:59953] by server-2.bemta-4.messagelabs.com id 7F/C6-04525-E2918045; Thu, 04 Sep 2014 07:47:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1409816876!13494926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14241 invoked from network); 4 Sep 2014 07:47:57 -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; 4 Sep 2014 07:47:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlr-0007sQ-V7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlr-0003Sy-U7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:55 +0000 Date: Thu, 04 Sep 2014 07:47:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: introduce sched_move_irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 14f7e3b8a70799bd3908bb8ad396e8ae1efd9634 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:40 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen: introduce sched_move_irqs Introduce sched_move_irqs: it calls arch_move_irqs and evtchn_move_pirqs. Replace calls to evtchn_move_pirqs with calls to sched_move_irqs. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: George Dunlap Acked-by: Ian Campbell CC: jbeulich@suse.com CC: tim@xen.org CC: keir.xen@gmail.com --- xen/common/schedule.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 55503e0..73cc2ea 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -226,6 +226,12 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) return 0; } +static void sched_move_irqs(struct vcpu *v) +{ + arch_move_irqs(v); + evtchn_move_pirqs(v); +} + int sched_move_domain(struct domain *d, struct cpupool *c) { struct vcpu *v; @@ -301,7 +307,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) v->sched_priv = vcpu_priv[v->vcpu_id]; if ( !d->is_dying ) - evtchn_move_pirqs(v); + sched_move_irqs(v); new_p = cpumask_cycle(new_p, c->cpu_valid); @@ -526,7 +532,7 @@ static void vcpu_migrate(struct vcpu *v) spin_unlock_irqrestore(old_lock, flags); if ( old_cpu != new_cpu ) - evtchn_move_pirqs(v); + sched_move_irqs(v); /* Wake on new CPU. */ vcpu_wake(v); @@ -1249,7 +1255,7 @@ static void schedule(void) stop_timer(&prev->periodic_timer); if ( next_slice.migrated ) - evtchn_move_pirqs(next); + sched_move_irqs(next); vcpu_periodic_timer_work(next); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:47:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:47:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlv-0003mq-Hq; Thu, 04 Sep 2014 07:47:59 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlu-0003md-Pc for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:58 +0000 Received: from [85.158.143.35:59953] by server-2.bemta-4.messagelabs.com id 7F/C6-04525-E2918045; Thu, 04 Sep 2014 07:47:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1409816876!13494926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14241 invoked from network); 4 Sep 2014 07:47:57 -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; 4 Sep 2014 07:47:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRlr-0007sQ-V7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRlr-0003Sy-U7 for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:47:55 +0000 Date: Thu, 04 Sep 2014 07:47:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: introduce sched_move_irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 14f7e3b8a70799bd3908bb8ad396e8ae1efd9634 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:40 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen: introduce sched_move_irqs Introduce sched_move_irqs: it calls arch_move_irqs and evtchn_move_pirqs. Replace calls to evtchn_move_pirqs with calls to sched_move_irqs. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: George Dunlap Acked-by: Ian Campbell CC: jbeulich@suse.com CC: tim@xen.org CC: keir.xen@gmail.com --- xen/common/schedule.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 55503e0..73cc2ea 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -226,6 +226,12 @@ int sched_init_vcpu(struct vcpu *v, unsigned int processor) return 0; } +static void sched_move_irqs(struct vcpu *v) +{ + arch_move_irqs(v); + evtchn_move_pirqs(v); +} + int sched_move_domain(struct domain *d, struct cpupool *c) { struct vcpu *v; @@ -301,7 +307,7 @@ int sched_move_domain(struct domain *d, struct cpupool *c) v->sched_priv = vcpu_priv[v->vcpu_id]; if ( !d->is_dying ) - evtchn_move_pirqs(v); + sched_move_irqs(v); new_p = cpumask_cycle(new_p, c->cpu_valid); @@ -526,7 +532,7 @@ static void vcpu_migrate(struct vcpu *v) spin_unlock_irqrestore(old_lock, flags); if ( old_cpu != new_cpu ) - evtchn_move_pirqs(v); + sched_move_irqs(v); /* Wake on new CPU. */ vcpu_wake(v); @@ -1249,7 +1255,7 @@ static void schedule(void) stop_timer(&prev->periodic_timer); if ( next_slice.migrated ) - evtchn_move_pirqs(next); + sched_move_irqs(next); vcpu_periodic_timer_work(next); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48: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 1XPRm5-0003oK-Kb; Thu, 04 Sep 2014 07:48:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRm4-0003o4-Kq for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:08 +0000 Received: from [193.109.254.147:63751] by server-8.bemta-14.messagelabs.com id 4D/E3-01875-83918045; Thu, 04 Sep 2014 07:48:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1409816886!13370778!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13899 invoked from network); 4 Sep 2014 07:48:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:48:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRm2-0007sz-6K for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRm2-0003UD-3I for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:06 +0000 Date: Thu, 04 Sep 2014 07:48:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: remove workaround to inject evtchn_irq on irq enable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07892f7fa14a51ef0378b415c151efa868419e30 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:41 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen: remove workaround to inject evtchn_irq on irq enable evtchn_upcall_pending is already set by common code at vcpu creation, therefore on ARM we also need to call vgic_vcpu_inject_irq for it. Currently we do that from vgic_enable_irqs as a workaround. Do this properly by introducing an appropriate arch specific hook: arch_evtchn_inject. arch_evtchn_inject is called by map_vcpu_info to inject the evtchn irq into the guest. On ARM is implemented by calling vgic_vcpu_inject_irq. On x86 guests typically don't call VCPUOP_register_vcpu_info on vcpu0, therefore avoiding the issue. However theoretically they could call VCPUOP_register_vcpu_info on vcpu0 and in that case Xen would need to inject the event channel notification into the guest if the guest is HVM. So implement arch_evtchn_inject on x86 by calling hvm_assert_evtchn_irq. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/vgic.c | 23 +++++++++-------------- xen/arch/x86/hvm/irq.c | 6 ++++++ xen/common/domain.c | 1 + xen/include/xen/event.h | 3 +++ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 2319d71..3cf5e7b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -264,20 +264,10 @@ void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); p = irq_to_pending(v_target, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); - /* We need to force the first injection of evtchn_irq because - * evtchn_upcall_pending is already set by common code on vcpu - * creation. */ - if ( irq == v_target->domain->arch.evtchn_irq && - vcpu_info(current, evtchn_upcall_pending) && - list_empty(&p->inflight) ) - vgic_vcpu_inject_irq(v_target, irq); - else { - unsigned long flags; - spin_lock_irqsave(&v_target->arch.vgic.lock, flags); - if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) - gic_raise_guest_irq(v_target, irq, p->priority); - spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); - } + spin_lock_irqsave(&v_target->arch.vgic.lock, flags); + if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) + gic_raise_guest_irq(v_target, irq, p->priority); + spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); if ( p->desc != NULL ) { irq_set_affinity(p->desc, cpumask_of(v_target->processor)); @@ -433,6 +423,11 @@ void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq) vgic_vcpu_inject_irq(v, irq); } +void arch_evtchn_inject(struct vcpu *v) +{ + vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 3b29678..35f4f94 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -468,6 +468,12 @@ int hvm_local_events_need_delivery(struct vcpu *v) return !hvm_interrupt_blocked(v, intack); } +void arch_evtchn_inject(struct vcpu *v) +{ + if ( has_hvm_container_vcpu(v) ) + hvm_assert_evtchn_irq(v); +} + static void irq_dump(struct domain *d) { struct hvm_irq *hvm_irq = &d->arch.hvm_domain.irq; diff --git a/xen/common/domain.c b/xen/common/domain.c index 1952070..e6b4ae6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1102,6 +1102,7 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset) vcpu_info(v, evtchn_upcall_pending) = 1; for ( i = 0; i < BITS_PER_EVTCHN_WORD(d); i++ ) set_bit(i, &vcpu_info(v, evtchn_pending_sel)); + arch_evtchn_inject(v); return 0; } diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 06c0654..88526f8 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -69,6 +69,9 @@ int guest_enabled_event(struct vcpu *v, uint32_t virq); /* Notify remote end of a Xen-attached event channel.*/ void notify_via_xen_event_channel(struct domain *ld, int lport); +/* Inject an event channel notification into the guest */ +void arch_evtchn_inject(struct vcpu *v); + /* * Internal event channel object storage. * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48: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 1XPRm5-0003oK-Kb; Thu, 04 Sep 2014 07:48:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRm4-0003o4-Kq for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:08 +0000 Received: from [193.109.254.147:63751] by server-8.bemta-14.messagelabs.com id 4D/E3-01875-83918045; Thu, 04 Sep 2014 07:48:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1409816886!13370778!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13899 invoked from network); 4 Sep 2014 07:48:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:48:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRm2-0007sz-6K for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRm2-0003UD-3I for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:06 +0000 Date: Thu, 04 Sep 2014 07:48:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: remove workaround to inject evtchn_irq on irq enable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 07892f7fa14a51ef0378b415c151efa868419e30 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:41 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen: remove workaround to inject evtchn_irq on irq enable evtchn_upcall_pending is already set by common code at vcpu creation, therefore on ARM we also need to call vgic_vcpu_inject_irq for it. Currently we do that from vgic_enable_irqs as a workaround. Do this properly by introducing an appropriate arch specific hook: arch_evtchn_inject. arch_evtchn_inject is called by map_vcpu_info to inject the evtchn irq into the guest. On ARM is implemented by calling vgic_vcpu_inject_irq. On x86 guests typically don't call VCPUOP_register_vcpu_info on vcpu0, therefore avoiding the issue. However theoretically they could call VCPUOP_register_vcpu_info on vcpu0 and in that case Xen would need to inject the event channel notification into the guest if the guest is HVM. So implement arch_evtchn_inject on x86 by calling hvm_assert_evtchn_irq. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/vgic.c | 23 +++++++++-------------- xen/arch/x86/hvm/irq.c | 6 ++++++ xen/common/domain.c | 1 + xen/include/xen/event.h | 3 +++ 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 2319d71..3cf5e7b 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -264,20 +264,10 @@ void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n) v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); p = irq_to_pending(v_target, irq); set_bit(GIC_IRQ_GUEST_ENABLED, &p->status); - /* We need to force the first injection of evtchn_irq because - * evtchn_upcall_pending is already set by common code on vcpu - * creation. */ - if ( irq == v_target->domain->arch.evtchn_irq && - vcpu_info(current, evtchn_upcall_pending) && - list_empty(&p->inflight) ) - vgic_vcpu_inject_irq(v_target, irq); - else { - unsigned long flags; - spin_lock_irqsave(&v_target->arch.vgic.lock, flags); - if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) - gic_raise_guest_irq(v_target, irq, p->priority); - spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); - } + spin_lock_irqsave(&v_target->arch.vgic.lock, flags); + if ( !list_empty(&p->inflight) && !test_bit(GIC_IRQ_GUEST_VISIBLE, &p->status) ) + gic_raise_guest_irq(v_target, irq, p->priority); + spin_unlock_irqrestore(&v_target->arch.vgic.lock, flags); if ( p->desc != NULL ) { irq_set_affinity(p->desc, cpumask_of(v_target->processor)); @@ -433,6 +423,11 @@ void vgic_vcpu_inject_spi(struct domain *d, unsigned int irq) vgic_vcpu_inject_irq(v, irq); } +void arch_evtchn_inject(struct vcpu *v) +{ + vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 3b29678..35f4f94 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -468,6 +468,12 @@ int hvm_local_events_need_delivery(struct vcpu *v) return !hvm_interrupt_blocked(v, intack); } +void arch_evtchn_inject(struct vcpu *v) +{ + if ( has_hvm_container_vcpu(v) ) + hvm_assert_evtchn_irq(v); +} + static void irq_dump(struct domain *d) { struct hvm_irq *hvm_irq = &d->arch.hvm_domain.irq; diff --git a/xen/common/domain.c b/xen/common/domain.c index 1952070..e6b4ae6 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1102,6 +1102,7 @@ int map_vcpu_info(struct vcpu *v, unsigned long gfn, unsigned offset) vcpu_info(v, evtchn_upcall_pending) = 1; for ( i = 0; i < BITS_PER_EVTCHN_WORD(d); i++ ) set_bit(i, &vcpu_info(v, evtchn_pending_sel)); + arch_evtchn_inject(v); return 0; } diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 06c0654..88526f8 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -69,6 +69,9 @@ int guest_enabled_event(struct vcpu *v, uint32_t virq); /* Notify remote end of a Xen-attached event channel.*/ void notify_via_xen_event_channel(struct domain *ld, int lport); +/* Inject an event channel notification into the guest */ +void arch_evtchn_inject(struct vcpu *v); + /* * Internal event channel object storage. * -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmG-0003q0-NR; Thu, 04 Sep 2014 07:48:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmF-0003pm-4k for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:19 +0000 Received: from [85.158.143.35:64261] by server-3.bemta-4.messagelabs.com id BC/48-06192-24918045; Thu, 04 Sep 2014 07:48:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409816896!13496521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8876 invoked from network); 4 Sep 2014 07:48:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:48:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmC-0007t5-Cp for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRmC-0003Uj-BR for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:16 +0000 Date: Thu, 04 Sep 2014 07:48:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: take the rank lock before accessing ipriority X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 446df2f7335f78f3368bc494212ce0e8adbad9db Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:42 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen/arm: take the rank lock before accessing ipriority Currently we read ipriority from vgic_vcpu_inject_irq without taking the rank lock. Fix that by taking the rank lock and reading ipriority at the beginning of the function. As vgic_vcpu_inject_irq is called from the irq.c upon receiving an interrupt, we need to change the implementation of vgic_lock/unlock_rank to spin_lock_irqsave to make it safe in irq context. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/vgic-v2.c | 74 ++++++++++++++++++++++--------------------- xen/arch/arm/vgic.c | 11 ++++-- xen/include/asm-arm/vgic.h | 4 +- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 39d8272..f57dbf9 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -39,6 +39,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + unsigned long flags; switch ( gicd_reg ) { @@ -77,54 +78,54 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->ienable; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->ienable; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICPENDR ... GICD_ICPENDRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->iactive; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->iactive; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ITARGETSR ... GICD_ITARGETSRN: @@ -132,12 +133,12 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_IPRIORITYR ... GICD_IPRIORITYRN: @@ -145,21 +146,21 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICFGR ... GICD_ICFGRN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: @@ -176,18 +177,18 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; /* Implementation defined -- read as zero */ @@ -269,6 +270,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct vgic_irq_rank *rank; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); uint32_t tr; + unsigned long flags; switch ( gicd_reg ) { @@ -295,7 +297,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); tr = rank->ienable; rank->ienable |= *r; /* The virtual irq is derived from register offset. @@ -303,14 +305,14 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) * to get Virtual irq number */ vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> DABT_WORD); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); tr = rank->ienable; rank->ienable &= ~*r; /* The virtual irq is derived from register offset. @@ -318,7 +320,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) * to get Virtual irq number */ vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> DABT_WORD); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: @@ -337,18 +339,18 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ITARGETSR ... GICD_ITARGETSR + 7: @@ -379,7 +381,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) !((target & 0xff) && (target & (0xff << 8)) && (target & (0xff << 16)) && (target & (0xff << 24)))) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); i = 0; while ( (i = find_next_bit(&target, 32, i)) < 32 ) { @@ -407,7 +409,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) else vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; } @@ -415,14 +417,14 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); if ( dabt.size == DABT_WORD ) rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)] = *r; else vgic_byte_write(&rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)], *r, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICFGR: /* SGIs */ @@ -434,9 +436,9 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 3cf5e7b..17b3b6d 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -158,10 +158,11 @@ struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq) struct domain *d = v->domain; struct vcpu *v_target; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + unsigned long flags; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return v_target; } @@ -368,6 +369,10 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) unsigned long flags; bool_t running; + vgic_lock_rank(v, rank, flags); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); + vgic_unlock_rank(v, rank, flags); + spin_lock_irqsave(&v->arch.vgic.lock, flags); /* vcpu offline */ @@ -385,8 +390,6 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) goto out; } - priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); - n->irq = irq; n->priority = priority; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 9b1db04..338ba03 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -107,8 +107,8 @@ struct vgic_ops { #define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) #define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) -#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) -#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) +#define vgic_lock_rank(v, r, flags) spin_lock_irqsave(&(r)->lock, flags) +#define vgic_unlock_rank(v, r, flags) spin_unlock_irqrestore(&(r)->lock, flags) /* * Rank containing GICD_ for GICD_ with -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmG-0003q0-NR; Thu, 04 Sep 2014 07:48:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmF-0003pm-4k for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:19 +0000 Received: from [85.158.143.35:64261] by server-3.bemta-4.messagelabs.com id BC/48-06192-24918045; Thu, 04 Sep 2014 07:48:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1409816896!13496521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8876 invoked from network); 4 Sep 2014 07:48:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 4 Sep 2014 07:48:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmC-0007t5-Cp for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRmC-0003Uj-BR for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:16 +0000 Date: Thu, 04 Sep 2014 07:48:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: take the rank lock before accessing ipriority X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 446df2f7335f78f3368bc494212ce0e8adbad9db Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:42 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen/arm: take the rank lock before accessing ipriority Currently we read ipriority from vgic_vcpu_inject_irq without taking the rank lock. Fix that by taking the rank lock and reading ipriority at the beginning of the function. As vgic_vcpu_inject_irq is called from the irq.c upon receiving an interrupt, we need to change the implementation of vgic_lock/unlock_rank to spin_lock_irqsave to make it safe in irq context. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/vgic-v2.c | 74 ++++++++++++++++++++++--------------------- xen/arch/arm/vgic.c | 11 ++++-- xen/include/asm-arm/vgic.h | 4 +- 3 files changed, 47 insertions(+), 42 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 39d8272..f57dbf9 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -39,6 +39,7 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) register_t *r = select_user_reg(regs, dabt.reg); struct vgic_irq_rank *rank; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + unsigned long flags; switch ( gicd_reg ) { @@ -77,54 +78,54 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->ienable; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->ienable; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICPENDR ... GICD_ICPENDRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICPENDR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->ipend, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ISACTIVER ... GICD_ISACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->iactive; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->iactive; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ITARGETSR ... GICD_ITARGETSRN: @@ -132,12 +133,12 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_IPRIORITYR ... GICD_IPRIORITYRN: @@ -145,21 +146,21 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)]; if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICFGR ... GICD_ICFGRN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)]; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: @@ -176,18 +177,18 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_CPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_SPENDSGIR ... GICD_SPENDSGIRN: if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_SPENDSGIR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); *r = vgic_byte_read(rank->pendsgi, dabt.sign, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; /* Implementation defined -- read as zero */ @@ -269,6 +270,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct vgic_irq_rank *rank; int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); uint32_t tr; + unsigned long flags; switch ( gicd_reg ) { @@ -295,7 +297,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); tr = rank->ienable; rank->ienable |= *r; /* The virtual irq is derived from register offset. @@ -303,14 +305,14 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) * to get Virtual irq number */ vgic_enable_irqs(v, (*r) & (~tr), (gicd_reg - GICD_ISENABLER) >> DABT_WORD); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICENABLER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); tr = rank->ienable; rank->ienable &= ~*r; /* The virtual irq is derived from register offset. @@ -318,7 +320,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) * to get Virtual irq number */ vgic_disable_irqs(v, (*r) & tr, (gicd_reg - GICD_ICENABLER) >> DABT_WORD); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: @@ -337,18 +339,18 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ISACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICACTIVER ... GICD_ICACTIVERN: if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 1, gicd_reg - GICD_ICACTIVER, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); rank->iactive &= ~*r; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ITARGETSR ... GICD_ITARGETSR + 7: @@ -379,7 +381,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) !((target & 0xff) && (target & (0xff << 8)) && (target & (0xff << 16)) && (target & (0xff << 24)))) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); i = 0; while ( (i = find_next_bit(&target, 32, i)) < 32 ) { @@ -407,7 +409,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) else vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; } @@ -415,14 +417,14 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_IPRIORITYR, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); if ( dabt.size == DABT_WORD ) rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)] = *r; else vgic_byte_write(&rank->ipriority[REG_RANK_INDEX(8, gicd_reg - GICD_IPRIORITYR, DABT_WORD)], *r, gicd_reg); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_ICFGR: /* SGIs */ @@ -434,9 +436,9 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 2, gicd_reg - GICD_ICFGR, DABT_WORD); if ( rank == NULL) goto write_ignore; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); rank->icfg[REG_RANK_INDEX(2, gicd_reg - GICD_ICFGR, DABT_WORD)] = *r; - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return 1; case GICD_NSACR ... GICD_NSACRN: diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 3cf5e7b..17b3b6d 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -158,10 +158,11 @@ struct vcpu *vgic_get_target_vcpu(struct vcpu *v, unsigned int irq) struct domain *d = v->domain; struct vcpu *v_target; struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + unsigned long flags; - vgic_lock_rank(v, rank); + vgic_lock_rank(v, rank, flags); v_target = d->arch.vgic.handler->get_target_vcpu(v, irq); - vgic_unlock_rank(v, rank); + vgic_unlock_rank(v, rank, flags); return v_target; } @@ -368,6 +369,10 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) unsigned long flags; bool_t running; + vgic_lock_rank(v, rank, flags); + priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); + vgic_unlock_rank(v, rank, flags); + spin_lock_irqsave(&v->arch.vgic.lock, flags); /* vcpu offline */ @@ -385,8 +390,6 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) goto out; } - priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); - n->irq = irq; n->priority = priority; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 9b1db04..338ba03 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -107,8 +107,8 @@ struct vgic_ops { #define vgic_lock(v) spin_lock_irq(&(v)->domain->arch.vgic.lock) #define vgic_unlock(v) spin_unlock_irq(&(v)->domain->arch.vgic.lock) -#define vgic_lock_rank(v, r) spin_lock(&(r)->lock) -#define vgic_unlock_rank(v, r) spin_unlock(&(r)->lock) +#define vgic_lock_rank(v, r, flags) spin_lock_irqsave(&(r)->lock, flags) +#define vgic_unlock_rank(v, r, flags) spin_unlock_irqrestore(&(r)->lock, flags) /* * Rank containing GICD_ for GICD_ with -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48: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 1XPRmP-0003ri-S0; Thu, 04 Sep 2014 07:48:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmO-0003rV-Vo for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:29 +0000 Received: from [85.158.139.211:46895] by server-5.bemta-5.messagelabs.com id DE/17-11546-C4918045; Thu, 04 Sep 2014 07:48:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1409816906!8270596!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13998 invoked from network); 4 Sep 2014 07:48:27 -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; 4 Sep 2014 07:48:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmM-0007tB-Ip for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRmM-0003V5-GR for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:26 +0000 Date: Thu, 04 Sep 2014 07:48:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: introduce bit access macros for the IRQ line status flags X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84cf3be96baaf89633871ee96553dd392c5f97a1 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:43 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen: introduce bit access macros for the IRQ line status flags Signed-off-by: Stefano Stabellini Acked-by: Julien Grall CC: Jan Beulich --- xen/include/xen/irq.h | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 40c0f3f..96d818f 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -22,15 +22,24 @@ struct irqaction { /* * IRQ line status. */ -#define IRQ_INPROGRESS (1u<<0) /* IRQ handler active - do not enter! */ -#define IRQ_DISABLED (1u<<1) /* IRQ disabled - do not enter! */ -#define IRQ_PENDING (1u<<2) /* IRQ pending - replay on enable */ -#define IRQ_REPLAY (1u<<3) /* IRQ has been replayed but not acked yet */ -#define IRQ_GUEST (1u<<4) /* IRQ is handled by guest OS(es) */ -#define IRQ_MOVE_PENDING (1u<<5) /* IRQ is migrating to another CPUs */ -#define IRQ_PER_CPU (1u<<6) /* IRQ is per CPU */ -#define IRQ_GUEST_EOI_PENDING (1u<<7) /* IRQ was disabled, pending a guest EOI */ -#define IRQF_SHARED (1<<8) /* IRQ is shared */ +#define _IRQ_INPROGRESS 0 /* IRQ handler active - do not enter! */ +#define _IRQ_DISABLED 1 /* IRQ disabled - do not enter! */ +#define _IRQ_PENDING 2 /* IRQ pending - replay on enable */ +#define _IRQ_REPLAY 3 /* IRQ has been replayed but not acked yet */ +#define _IRQ_GUEST 4 /* IRQ is handled by guest OS(es) */ +#define _IRQ_MOVE_PENDING 5 /* IRQ is migrating to another CPUs */ +#define _IRQ_PER_CPU 6 /* IRQ is per CPU */ +#define _IRQ_GUEST_EOI_PENDING 7 /* IRQ was disabled, pending a guest EOI */ +#define _IRQF_SHARED 8 /* IRQ is shared */ +#define IRQ_INPROGRESS (1u<<_IRQ_INPROGRESS) +#define IRQ_DISABLED (1u<<_IRQ_DISABLED) +#define IRQ_PENDING (1u<<_IRQ_PENDING) +#define IRQ_REPLAY (1u<<_IRQ_REPLAY) +#define IRQ_GUEST (1u<<_IRQ_GUEST) +#define IRQ_MOVE_PENDING (1u<<_IRQ_MOVE_PENDING) +#define IRQ_PER_CPU (1u<<_IRQ_PER_CPU) +#define IRQ_GUEST_EOI_PENDING (1u<<_IRQ_GUEST_EOI_PENDING) +#define IRQF_SHARED (1u<<_IRQF_SHARED) /* Special IRQ numbers. */ #define AUTO_ASSIGN_IRQ (-1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48: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 1XPRmP-0003ri-S0; Thu, 04 Sep 2014 07:48:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmO-0003rV-Vo for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:29 +0000 Received: from [85.158.139.211:46895] by server-5.bemta-5.messagelabs.com id DE/17-11546-C4918045; Thu, 04 Sep 2014 07:48:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1409816906!8270596!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13998 invoked from network); 4 Sep 2014 07:48:27 -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; 4 Sep 2014 07:48:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmM-0007tB-Ip for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRmM-0003V5-GR for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:26 +0000 Date: Thu, 04 Sep 2014 07:48:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: introduce bit access macros for the IRQ line status flags X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84cf3be96baaf89633871ee96553dd392c5f97a1 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:43 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen: introduce bit access macros for the IRQ line status flags Signed-off-by: Stefano Stabellini Acked-by: Julien Grall CC: Jan Beulich --- xen/include/xen/irq.h | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 40c0f3f..96d818f 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -22,15 +22,24 @@ struct irqaction { /* * IRQ line status. */ -#define IRQ_INPROGRESS (1u<<0) /* IRQ handler active - do not enter! */ -#define IRQ_DISABLED (1u<<1) /* IRQ disabled - do not enter! */ -#define IRQ_PENDING (1u<<2) /* IRQ pending - replay on enable */ -#define IRQ_REPLAY (1u<<3) /* IRQ has been replayed but not acked yet */ -#define IRQ_GUEST (1u<<4) /* IRQ is handled by guest OS(es) */ -#define IRQ_MOVE_PENDING (1u<<5) /* IRQ is migrating to another CPUs */ -#define IRQ_PER_CPU (1u<<6) /* IRQ is per CPU */ -#define IRQ_GUEST_EOI_PENDING (1u<<7) /* IRQ was disabled, pending a guest EOI */ -#define IRQF_SHARED (1<<8) /* IRQ is shared */ +#define _IRQ_INPROGRESS 0 /* IRQ handler active - do not enter! */ +#define _IRQ_DISABLED 1 /* IRQ disabled - do not enter! */ +#define _IRQ_PENDING 2 /* IRQ pending - replay on enable */ +#define _IRQ_REPLAY 3 /* IRQ has been replayed but not acked yet */ +#define _IRQ_GUEST 4 /* IRQ is handled by guest OS(es) */ +#define _IRQ_MOVE_PENDING 5 /* IRQ is migrating to another CPUs */ +#define _IRQ_PER_CPU 6 /* IRQ is per CPU */ +#define _IRQ_GUEST_EOI_PENDING 7 /* IRQ was disabled, pending a guest EOI */ +#define _IRQF_SHARED 8 /* IRQ is shared */ +#define IRQ_INPROGRESS (1u<<_IRQ_INPROGRESS) +#define IRQ_DISABLED (1u<<_IRQ_DISABLED) +#define IRQ_PENDING (1u<<_IRQ_PENDING) +#define IRQ_REPLAY (1u<<_IRQ_REPLAY) +#define IRQ_GUEST (1u<<_IRQ_GUEST) +#define IRQ_MOVE_PENDING (1u<<_IRQ_MOVE_PENDING) +#define IRQ_PER_CPU (1u<<_IRQ_PER_CPU) +#define IRQ_GUEST_EOI_PENDING (1u<<_IRQ_GUEST_EOI_PENDING) +#define IRQF_SHARED (1u<<_IRQF_SHARED) /* Special IRQ numbers. */ #define AUTO_ASSIGN_IRQ (-1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48: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 1XPRma-0003tK-Uw; Thu, 04 Sep 2014 07:48:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmZ-0003tB-ID for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:39 +0000 Received: from [85.158.139.211:36352] by server-15.bemta-5.messagelabs.com id 45/23-12002-65918045; Thu, 04 Sep 2014 07:48:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1409816916!12352225!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4509 invoked from network); 4 Sep 2014 07:48:37 -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 Sep 2014 07:48:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmW-0007tK-PM for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRmW-0003VV-NN for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:36 +0000 Date: Thu, 04 Sep 2014 07:48:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: make accesses to desc->status flags atomic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50d8fe8fcbab2440cfeeb65c4765868398652473 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:44 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen/arm: make accesses to desc->status flags atomic This way we don't need to take the desc->lock in order to access desc->status in many of the gic and vgic functions. Using *_bit manipulation functions on desc->status is safe on arm64: status is an unsigned int but is the first field of a struct that contains pointers, therefore the alignement of the struct is at least 8 bytes. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 4 ++-- xen/arch/arm/gic.c | 6 +++--- xen/arch/arm/irq.c | 33 +++++++++++++++++---------------- xen/include/xen/irq.h | 5 +++++ 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index da60a41..78ad4de 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -516,7 +516,7 @@ static void gicv2_irq_enable(struct irq_desc *desc) ASSERT(spin_is_locked(&desc->lock)); spin_lock_irqsave(&gicv2.lock, flags); - desc->status &= ~IRQ_DISABLED; + clear_bit(_IRQ_DISABLED, &desc->status); dsb(sy); /* Enable routing */ writel_gicd((1u << (irq % 32)), GICD_ISENABLER + (irq / 32) * 4); @@ -533,7 +533,7 @@ static void gicv2_irq_disable(struct irq_desc *desc) spin_lock_irqsave(&gicv2.lock, flags); /* Disable routing */ writel_gicd(1u << (irq % 32), GICD_ICENABLER + (irq / 32) * 4); - desc->status |= IRQ_DISABLED; + set_bit(_IRQ_DISABLED, &desc->status); spin_unlock_irqrestore(&gicv2.lock, flags); } diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 2aa9500..6611ba0 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -115,7 +115,7 @@ void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, { ASSERT(priority <= 0xff); /* Only 8 bits of priority */ ASSERT(desc->irq < gic_number_lines());/* Can't route interrupts that don't exist */ - ASSERT(desc->status & IRQ_DISABLED); + ASSERT(test_bit(_IRQ_DISABLED, &desc->status)); ASSERT(spin_is_locked(&desc->lock)); desc->handler = gic_hw_ops->gic_host_irq_type; @@ -133,7 +133,7 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, ASSERT(spin_is_locked(&desc->lock)); desc->handler = gic_hw_ops->gic_guest_irq_type; - desc->status |= IRQ_GUEST; + set_bit(_IRQ_GUEST, &desc->status); gic_set_irq_properties(desc, cpumask_of(smp_processor_id()), GIC_PRI_IRQ); @@ -369,7 +369,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) if ( p->desc != NULL ) { - p->desc->status &= ~IRQ_INPROGRESS; + clear_bit(_IRQ_INPROGRESS, &p->desc->status); if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) gic_hw_ops->deactivate_irq(p->desc); } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 7150c7a..25ecf1d 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -126,7 +126,7 @@ static inline struct domain *irq_get_domain(struct irq_desc *desc) { ASSERT(spin_is_locked(&desc->lock)); - if ( !(desc->status & IRQ_GUEST) ) + if ( !test_bit(_IRQ_GUEST, &desc->status) ) return dom_xen; ASSERT(desc->action != NULL); @@ -195,13 +195,13 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) goto out; } - if ( desc->status & IRQ_GUEST ) + if ( test_bit(_IRQ_GUEST, &desc->status) ) { struct domain *d = irq_get_domain(desc); desc->handler->end(desc); - desc->status |= IRQ_INPROGRESS; + set_bit(_IRQ_INPROGRESS, &desc->status); desc->arch.eoi_cpu = smp_processor_id(); /* the irq cannot be a PPI, we only support delivery of SPIs to @@ -210,22 +210,23 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) goto out_no_end; } - desc->status |= IRQ_PENDING; + set_bit(_IRQ_PENDING, &desc->status); /* * Since we set PENDING, if another processor is handling a different * instance of this same irq, the other processor will take care of it. */ - if ( desc->status & (IRQ_DISABLED | IRQ_INPROGRESS) ) + if ( test_bit(_IRQ_DISABLED, &desc->status) || + test_bit(_IRQ_INPROGRESS, &desc->status) ) goto out; - desc->status |= IRQ_INPROGRESS; + set_bit(_IRQ_INPROGRESS, &desc->status); - while ( desc->status & IRQ_PENDING ) + while ( test_bit(_IRQ_PENDING, &desc->status) ) { struct irqaction *action; - desc->status &= ~IRQ_PENDING; + clear_bit(_IRQ_PENDING, &desc->status); action = desc->action; spin_unlock_irq(&desc->lock); @@ -239,7 +240,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) spin_lock_irq(&desc->lock); } - desc->status &= ~IRQ_INPROGRESS; + clear_bit(_IRQ_INPROGRESS, &desc->status); out: desc->handler->end(desc); @@ -282,13 +283,13 @@ void release_irq(unsigned int irq, const void *dev_id) if ( !desc->action ) { desc->handler->shutdown(desc); - desc->status &= ~IRQ_GUEST; + clear_bit(_IRQ_GUEST, &desc->status); } spin_unlock_irqrestore(&desc->lock,flags); /* Wait to make sure it's not being used on another CPU */ - do { smp_mb(); } while ( desc->status & IRQ_INPROGRESS ); + do { smp_mb(); } while ( test_bit(_IRQ_INPROGRESS, &desc->status) ); if ( action->free_on_release ) xfree(action); @@ -305,13 +306,13 @@ static int __setup_irq(struct irq_desc *desc, unsigned int irqflags, * - if the IRQ is marked as shared * - dev_id is not NULL when IRQF_SHARED is set */ - if ( desc->action != NULL && (!(desc->status & IRQF_SHARED) || !shared) ) + if ( desc->action != NULL && (!test_bit(_IRQF_SHARED, &desc->status) || !shared) ) return -EINVAL; if ( shared && new->dev_id == NULL ) return -EINVAL; if ( shared ) - desc->status |= IRQF_SHARED; + set_bit(_IRQF_SHARED, &desc->status); new->next = desc->action; dsb(ish); @@ -332,7 +333,7 @@ int setup_irq(unsigned int irq, unsigned int irqflags, struct irqaction *new) spin_lock_irqsave(&desc->lock, flags); - if ( desc->status & IRQ_GUEST ) + if ( test_bit(_IRQ_GUEST, &desc->status) ) { struct domain *d = irq_get_domain(desc); @@ -396,10 +397,10 @@ int route_irq_to_guest(struct domain *d, unsigned int irq, { struct domain *ad = irq_get_domain(desc); - if ( (desc->status & IRQ_GUEST) && d == ad ) + if ( test_bit(_IRQ_GUEST, &desc->status) && d == ad ) goto out; - if ( desc->status & IRQ_GUEST ) + if ( test_bit(_IRQ_GUEST, &desc->status) ) printk(XENLOG_ERR "ERROR: IRQ %u is already used by domain %u\n", irq, ad->domain_id); else diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 96d818f..ffb5932 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -76,6 +76,11 @@ struct msi_desc; * This is the "IRQ descriptor", which contains various information * about the irq, including what kind of hardware handling it has, * whether it is disabled etc etc. + * + * Note: on ARMv8 we can use normal bit manipulation functions to access + * the status field because struct irq_desc contains pointers, therefore + * the alignment of the struct is at least 8 bytes and status is the + * first field. */ typedef struct irq_desc { unsigned int status; /* IRQ status */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 04 07:48:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 04 Sep 2014 07:48: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 1XPRma-0003tK-Uw; Thu, 04 Sep 2014 07:48:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmZ-0003tB-ID for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:39 +0000 Received: from [85.158.139.211:36352] by server-15.bemta-5.messagelabs.com id 45/23-12002-65918045; Thu, 04 Sep 2014 07:48:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1409816916!12352225!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4509 invoked from network); 4 Sep 2014 07:48:37 -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 Sep 2014 07:48:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPRmW-0007tK-PM for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPRmW-0003VV-NN for xen-changelog@lists.xensource.com; Thu, 04 Sep 2014 07:48:36 +0000 Date: Thu, 04 Sep 2014 07:48:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: make accesses to desc->status flags atomic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 50d8fe8fcbab2440cfeeb65c4765868398652473 Author: Stefano Stabellini AuthorDate: Wed Aug 13 17:29:44 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 3 15:23:26 2014 +0100 xen/arm: make accesses to desc->status flags atomic This way we don't need to take the desc->lock in order to access desc->status in many of the gic and vgic functions. Using *_bit manipulation functions on desc->status is safe on arm64: status is an unsigned int but is the first field of a struct that contains pointers, therefore the alignement of the struct is at least 8 bytes. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/gic-v2.c | 4 ++-- xen/arch/arm/gic.c | 6 +++--- xen/arch/arm/irq.c | 33 +++++++++++++++++---------------- xen/include/xen/irq.h | 5 +++++ 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index da60a41..78ad4de 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -516,7 +516,7 @@ static void gicv2_irq_enable(struct irq_desc *desc) ASSERT(spin_is_locked(&desc->lock)); spin_lock_irqsave(&gicv2.lock, flags); - desc->status &= ~IRQ_DISABLED; + clear_bit(_IRQ_DISABLED, &desc->status); dsb(sy); /* Enable routing */ writel_gicd((1u << (irq % 32)), GICD_ISENABLER + (irq / 32) * 4); @@ -533,7 +533,7 @@ static void gicv2_irq_disable(struct irq_desc *desc) spin_lock_irqsave(&gicv2.lock, flags); /* Disable routing */ writel_gicd(1u << (irq % 32), GICD_ICENABLER + (irq / 32) * 4); - desc->status |= IRQ_DISABLED; + set_bit(_IRQ_DISABLED, &desc->status); spin_unlock_irqrestore(&gicv2.lock, flags); } diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 2aa9500..6611ba0 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -115,7 +115,7 @@ void gic_route_irq_to_xen(struct irq_desc *desc, const cpumask_t *cpu_mask, { ASSERT(priority <= 0xff); /* Only 8 bits of priority */ ASSERT(desc->irq < gic_number_lines());/* Can't route interrupts that don't exist */ - ASSERT(desc->status & IRQ_DISABLED); + ASSERT(test_bit(_IRQ_DISABLED, &desc->status)); ASSERT(spin_is_locked(&desc->lock)); desc->handler = gic_hw_ops->gic_host_irq_type; @@ -133,7 +133,7 @@ void gic_route_irq_to_guest(struct domain *d, struct irq_desc *desc, ASSERT(spin_is_locked(&desc->lock)); desc->handler = gic_hw_ops->gic_guest_irq_type; - desc->status |= IRQ_GUEST; + set_bit(_IRQ_GUEST, &desc->status); gic_set_irq_properties(desc, cpumask_of(smp_processor_id()), GIC_PRI_IRQ); @@ -369,7 +369,7 @@ static void gic_update_one_lr(struct vcpu *v, int i) if ( p->desc != NULL ) { - p->desc->status &= ~IRQ_INPROGRESS; + clear_bit(_IRQ_INPROGRESS, &p->desc->status); if ( platform_has_quirk(PLATFORM_QUIRK_GUEST_PIRQ_NEED_EOI) ) gic_hw_ops->deactivate_irq(p->desc); } diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 7150c7a..25ecf1d 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -126,7 +126,7 @@ static inline struct domain *irq_get_domain(struct irq_desc *desc) { ASSERT(spin_is_locked(&desc->lock)); - if ( !(desc->status & IRQ_GUEST) ) + if ( !test_bit(_IRQ_GUEST, &desc->status) ) return dom_xen; ASSERT(desc->action != NULL); @@ -195,13 +195,13 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) goto out; } - if ( desc->status & IRQ_GUEST ) + if ( test_bit(_IRQ_GUEST, &desc->status) ) { struct domain *d = irq_get_domain(desc); desc->handler->end(desc); - desc->status |= IRQ_INPROGRESS; + set_bit(_IRQ_INPROGRESS, &desc->status); desc->arch.eoi_cpu = smp_processor_id(); /* the irq cannot be a PPI, we only support delivery of SPIs to @@ -210,22 +210,23 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) goto out_no_end; } - desc->status |= IRQ_PENDING; + set_bit(_IRQ_PENDING, &desc->status); /* * Since we set PENDING, if another processor is handling a different * instance of this same irq, the other processor will take care of it. */ - if ( desc->status & (IRQ_DISABLED | IRQ_INPROGRESS) ) + if ( test_bit(_IRQ_DISABLED, &desc->status) || + test_bit(_IRQ_INPROGRESS, &desc->status) ) goto out; - desc->status |= IRQ_INPROGRESS; + set_bit(_IRQ_INPROGRESS, &desc->status); - while ( desc->status & IRQ_PENDING ) + while ( test_bit(_IRQ_PENDING, &desc->status) ) { struct irqaction *action; - desc->status &= ~IRQ_PENDING; + clear_bit(_IRQ_PENDING, &desc->status); action = desc->action; spin_unlock_irq(&desc->lock); @@ -239,7 +240,7 @@ void do_IRQ(struct cpu_user_regs *regs, unsigned int irq, int is_fiq) spin_lock_irq(&desc->lock); } - desc->status &= ~IRQ_INPROGRESS; + clear_bit(_IRQ_INPROGRESS, &desc->status); out: desc->handler->end(desc); @@ -282,13 +283,13 @@ void release_irq(unsigned int irq, const void *dev_id) if ( !desc->action ) { desc->handler->shutdown(desc); - desc->status &= ~IRQ_GUEST; + clear_bit(_IRQ_GUEST, &desc->status); } spin_unlock_irqrestore(&desc->lock,flags); /* Wait to make sure it's not being used on another CPU */ - do { smp_mb(); } while ( desc->status & IRQ_INPROGRESS ); + do { smp_mb(); } while ( test_bit(_IRQ_INPROGRESS, &desc->status) ); if ( action->free_on_release ) xfree(action); @@ -305,13 +306,13 @@ static int __setup_irq(struct irq_desc *desc, unsigned int irqflags, * - if the IRQ is marked as shared * - dev_id is not NULL when IRQF_SHARED is set */ - if ( desc->action != NULL && (!(desc->status & IRQF_SHARED) || !shared) ) + if ( desc->action != NULL && (!test_bit(_IRQF_SHARED, &desc->status) || !shared) ) return -EINVAL; if ( shared && new->dev_id == NULL ) return -EINVAL; if ( shared ) - desc->status |= IRQF_SHARED; + set_bit(_IRQF_SHARED, &desc->status); new->next = desc->action; dsb(ish); @@ -332,7 +333,7 @@ int setup_irq(unsigned int irq, unsigned int irqflags, struct irqaction *new) spin_lock_irqsave(&desc->lock, flags); - if ( desc->status & IRQ_GUEST ) + if ( test_bit(_IRQ_GUEST, &desc->status) ) { struct domain *d = irq_get_domain(desc); @@ -396,10 +397,10 @@ int route_irq_to_guest(struct domain *d, unsigned int irq, { struct domain *ad = irq_get_domain(desc); - if ( (desc->status & IRQ_GUEST) && d == ad ) + if ( test_bit(_IRQ_GUEST, &desc->status) && d == ad ) goto out; - if ( desc->status & IRQ_GUEST ) + if ( test_bit(_IRQ_GUEST, &desc->status) ) printk(XENLOG_ERR "ERROR: IRQ %u is already used by domain %u\n", irq, ad->domain_id); else diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 96d818f..ffb5932 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -76,6 +76,11 @@ struct msi_desc; * This is the "IRQ descriptor", which contains various information * about the irq, including what kind of hardware handling it has, * whether it is disabled etc etc. + * + * Note: on ARMv8 we can use normal bit manipulation functions to access + * the status field because struct irq_desc contains pointers, therefore + * the alignment of the struct is at least 8 bytes and status is the + * first field. */ typedef struct irq_desc { unsigned int status; /* IRQ status */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 05 01:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Sep 2014 01:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPiZO-0005gx-LZ; Fri, 05 Sep 2014 01:44:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPiZM-0005gs-Sy for xen-changelog@lists.xensource.com; Fri, 05 Sep 2014 01:44:09 +0000 Received: from [193.109.254.147:18581] by server-11.bemta-14.messagelabs.com id A8/14-14213-86519045; Fri, 05 Sep 2014 01:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1409881446!13586190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22530 invoked from network); 5 Sep 2014 01: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; 5 Sep 2014 01:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPiZG-00024z-9L for xen-changelog@lists.xensource.com; Fri, 05 Sep 2014 01:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPiZG-00078c-6V for xen-changelog@lists.xensource.com; Fri, 05 Sep 2014 01:44:02 +0000 Date: Fri, 05 Sep 2014 01:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] numa.c: convert to xen coding style X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c33fe5459732fc85c2c279c5e8ed316b8601c58c Author: Elena Ufimtseva AuthorDate: Thu Sep 4 09:04:36 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 4 09:04:36 2014 +0200 numa.c: convert to xen coding style Convert to Xen coding style from mixed one. Signed-off-by: Elena Ufimtseva --- xen/arch/x86/numa.c | 505 ++++++++++++++++++++++++++------------------------- 1 files changed, 262 insertions(+), 243 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index b141877..628a40a 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -36,13 +36,13 @@ unsigned long memnodemapsize; u8 *memnodemap; unsigned char cpu_to_node[NR_CPUS] __read_mostly = { - [0 ... NR_CPUS-1] = NUMA_NO_NODE + [0 ... NR_CPUS-1] = NUMA_NO_NODE }; /* * Keep BIOS's CPU2node information, should not be used for memory allocaion */ unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { - [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE + [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; @@ -54,7 +54,7 @@ int acpi_numa __devinitdata; int srat_disabled(void) { - return numa_off || acpi_numa < 0; + return numa_off || acpi_numa < 0; } /* @@ -67,53 +67,56 @@ int srat_disabled(void) static int __init populate_memnodemap(const struct node *nodes, int numnodes, int shift, int *nodeids) { - unsigned long spdx, epdx; - int i, res = -1; - - memset(memnodemap, NUMA_NO_NODE, memnodemapsize * sizeof(*memnodemap)); - for (i = 0; i < numnodes; i++) { - spdx = paddr_to_pdx(nodes[i].start); - epdx = paddr_to_pdx(nodes[i].end - 1) + 1; - if (spdx >= epdx) - continue; - if ((epdx >> shift) >= memnodemapsize) - return 0; - do { - if (memnodemap[spdx >> shift] != NUMA_NO_NODE) - return -1; - - if (!nodeids) - memnodemap[spdx >> shift] = i; - else - memnodemap[spdx >> shift] = nodeids[i]; - - spdx += (1UL << shift); - } while (spdx < epdx); - res = 1; - } - return res; + unsigned long spdx, epdx; + int i, res = -1; + + memset(memnodemap, NUMA_NO_NODE, memnodemapsize * sizeof(*memnodemap)); + for ( i = 0; i < numnodes; i++ ) + { + spdx = paddr_to_pdx(nodes[i].start); + epdx = paddr_to_pdx(nodes[i].end - 1) + 1; + if ( spdx >= epdx ) + continue; + if ( (epdx >> shift) >= memnodemapsize ) + return 0; + do { + if ( memnodemap[spdx >> shift] != NUMA_NO_NODE ) + return -1; + + if ( !nodeids ) + memnodemap[spdx >> shift] = i; + else + memnodemap[spdx >> shift] = nodeids[i]; + + spdx += (1UL << shift); + } while ( spdx < epdx ); + res = 1; + } + + return res; } static int __init allocate_cachealigned_memnodemap(void) { - unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap)); - unsigned long mfn = alloc_boot_pages(size, 1); - - if (!mfn) { - printk(KERN_ERR - "NUMA: Unable to allocate Memory to Node hash map\n"); - memnodemapsize = 0; - return -1; - } - - memnodemap = mfn_to_virt(mfn); - mfn <<= PAGE_SHIFT; - size <<= PAGE_SHIFT; - printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n", - mfn, mfn + size); - memnodemapsize = size / sizeof(*memnodemap); - - return 0; + unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap)); + unsigned long mfn = alloc_boot_pages(size, 1); + + if ( !mfn ) + { + printk(KERN_ERR + "NUMA: Unable to allocate Memory to Node hash map\n"); + memnodemapsize = 0; + return -1; + } + + memnodemap = mfn_to_virt(mfn); + mfn <<= PAGE_SHIFT; + size <<= PAGE_SHIFT; + printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n", + mfn, mfn + size); + memnodemapsize = size / sizeof(*memnodemap); + + return 0; } /* @@ -121,84 +124,87 @@ static int __init allocate_cachealigned_memnodemap(void) * maximum possible shift. */ static int __init extract_lsb_from_nodes(const struct node *nodes, - int numnodes) + int numnodes) { - int i, nodes_used = 0; - unsigned long spdx, epdx; - unsigned long bitfield = 0, memtop = 0; - - for (i = 0; i < numnodes; i++) { - spdx = paddr_to_pdx(nodes[i].start); - epdx = paddr_to_pdx(nodes[i].end - 1) + 1; - if (spdx >= epdx) - continue; - bitfield |= spdx; - nodes_used++; - if (epdx > memtop) - memtop = epdx; - } - if (nodes_used <= 1) - i = BITS_PER_LONG - 1; - else - i = find_first_bit(&bitfield, sizeof(unsigned long)*8); - memnodemapsize = (memtop >> i) + 1; - return i; + int i, nodes_used = 0; + unsigned long spdx, epdx; + unsigned long bitfield = 0, memtop = 0; + + for ( i = 0; i < numnodes; i++ ) + { + spdx = paddr_to_pdx(nodes[i].start); + epdx = paddr_to_pdx(nodes[i].end - 1) + 1; + if ( spdx >= epdx ) + continue; + bitfield |= spdx; + nodes_used++; + if ( epdx > memtop ) + memtop = epdx; + } + if ( nodes_used <= 1 ) + i = BITS_PER_LONG - 1; + else + i = find_first_bit(&bitfield, sizeof(unsigned long)*8); + memnodemapsize = (memtop >> i) + 1; + return i; } int __init compute_hash_shift(struct node *nodes, int numnodes, - int *nodeids) + int *nodeids) { - int shift; - - shift = extract_lsb_from_nodes(nodes, numnodes); - if (memnodemapsize <= ARRAY_SIZE(_memnodemap)) - memnodemap = _memnodemap; - else if (allocate_cachealigned_memnodemap()) - return -1; - printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n", - shift); - - if (populate_memnodemap(nodes, numnodes, shift, nodeids) != 1) { - printk(KERN_INFO "Your memory is not aligned you need to " - "rebuild your kernel with a bigger NODEMAPSIZE " - "shift=%d\n", shift); - return -1; - } - return shift; + int shift; + + shift = extract_lsb_from_nodes(nodes, numnodes); + if ( memnodemapsize <= ARRAY_SIZE(_memnodemap) ) + memnodemap = _memnodemap; + else if ( allocate_cachealigned_memnodemap() ) + return -1; + printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n", shift); + + if ( populate_memnodemap(nodes, numnodes, shift, nodeids) != 1 ) + { + printk(KERN_INFO "Your memory is not aligned you need to " + "rebuild your hypervisor with a bigger NODEMAPSIZE " + "shift=%d\n", shift); + return -1; + } + + return shift; } /* initialize NODE_DATA given nodeid and start/end */ void __init setup_node_bootmem(int nodeid, u64 start, u64 end) { - unsigned long start_pfn, end_pfn; + unsigned long start_pfn, end_pfn; - start_pfn = start >> PAGE_SHIFT; - end_pfn = end >> PAGE_SHIFT; + start_pfn = start >> PAGE_SHIFT; + end_pfn = end >> PAGE_SHIFT; - NODE_DATA(nodeid)->node_id = nodeid; - NODE_DATA(nodeid)->node_start_pfn = start_pfn; - NODE_DATA(nodeid)->node_spanned_pages = end_pfn - start_pfn; + NODE_DATA(nodeid)->node_id = nodeid; + NODE_DATA(nodeid)->node_start_pfn = start_pfn; + NODE_DATA(nodeid)->node_spanned_pages = end_pfn - start_pfn; - node_set_online(nodeid); + node_set_online(nodeid); } void __init numa_init_array(void) { - int rr, i; - /* There are unfortunately some poorly designed mainboards around - that only connect memory to a single CPU. This breaks the 1:1 cpu->node - mapping. To avoid this fill in the mapping for all possible - CPUs, as the number of CPUs is not known yet. - We round robin the existing nodes. */ - rr = first_node(node_online_map); - for (i = 0; i < nr_cpu_ids; i++) { - if (cpu_to_node[i] != NUMA_NO_NODE) - continue; - numa_set_node(i, rr); - rr = next_node(rr, node_online_map); - if (rr == MAX_NUMNODES) - rr = first_node(node_online_map); - } - + int rr, i; + + /* There are unfortunately some poorly designed mainboards around + that only connect memory to a single CPU. This breaks the 1:1 cpu->node + mapping. To avoid this fill in the mapping for all possible + CPUs, as the number of CPUs is not known yet. + We round robin the existing nodes. */ + rr = first_node(node_online_map); + for ( i = 0; i < nr_cpu_ids; i++ ) + { + if ( cpu_to_node[i] != NUMA_NO_NODE ) + continue; + numa_set_node(i, rr); + rr = next_node(rr, node_online_map); + if ( rr == MAX_NUMNODES ) + rr = first_node(node_online_map); + } } #ifdef CONFIG_NUMA_EMU @@ -207,109 +213,117 @@ static int numa_fake __initdata = 0; /* Numa emulation */ static int __init numa_emulation(u64 start_pfn, u64 end_pfn) { - int i; - struct node nodes[MAX_NUMNODES]; - u64 sz = ((end_pfn - start_pfn)< 1) { - u64 x = 1; - while ((x << 1) < sz) - x <<= 1; - if (x < sz/2) - printk(KERN_ERR "Numa emulation unbalanced. Complain to maintainer\n"); - sz = x; - } - - memset(&nodes,0,sizeof(nodes)); - for (i = 0; i < numa_fake; i++) { - nodes[i].start = (start_pfn<> 20); - node_set_online(i); - } - memnode_shift = compute_hash_shift(nodes, numa_fake, NULL); - if (memnode_shift < 0) { - memnode_shift = 0; - printk(KERN_ERR "No NUMA hash function found. Emulation disabled.\n"); - return -1; - } - for_each_online_node(i) - setup_node_bootmem(i, nodes[i].start, nodes[i].end); - numa_init_array(); - return 0; + int i; + struct node nodes[MAX_NUMNODES]; + u64 sz = ((end_pfn - start_pfn)< 1 ) + { + u64 x = 1; + while ( (x << 1) < sz ) + x <<= 1; + if ( x < sz/2 ) + printk(KERN_ERR "Numa emulation unbalanced. Complain to maintainer\n"); + sz = x; + } + + memset(&nodes,0,sizeof(nodes)); + for ( i = 0; i < numa_fake; i++ ) + { + nodes[i].start = (start_pfn<> 20); + node_set_online(i); + } + memnode_shift = compute_hash_shift(nodes, numa_fake, NULL); + if ( memnode_shift < 0 ) + { + memnode_shift = 0; + printk(KERN_ERR "No NUMA hash function found. Emulation disabled.\n"); + return -1; + } + for_each_online_node ( i ) + setup_node_bootmem(i, nodes[i].start, nodes[i].end); + numa_init_array(); + + return 0; } #endif void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) { - int i; + int i; #ifdef CONFIG_NUMA_EMU - if (numa_fake && !numa_emulation(start_pfn, end_pfn)) - return; + if ( numa_fake && !numa_emulation(start_pfn, end_pfn) ) + return; #endif #ifdef CONFIG_ACPI_NUMA - if (!numa_off && !acpi_scan_nodes((u64)start_pfn << PAGE_SHIFT, - (u64)end_pfn << PAGE_SHIFT)) - return; + if ( !numa_off && !acpi_scan_nodes((u64)start_pfn << PAGE_SHIFT, + (u64)end_pfn << PAGE_SHIFT) ) + return; #endif - printk(KERN_INFO "%s\n", - numa_off ? "NUMA turned off" : "No NUMA configuration found"); - - printk(KERN_INFO "Faking a node at %016"PRIx64"-%016"PRIx64"\n", - (u64)start_pfn << PAGE_SHIFT, - (u64)end_pfn << PAGE_SHIFT); - /* setup dummy node covering all memory */ - memnode_shift = BITS_PER_LONG - 1; - memnodemap = _memnodemap; - nodes_clear(node_online_map); - node_set_online(0); - for (i = 0; i < nr_cpu_ids; i++) - numa_set_node(i, 0); - cpumask_copy(&node_to_cpumask[0], cpumask_of(0)); - setup_node_bootmem(0, (u64)start_pfn << PAGE_SHIFT, (u64)end_pfn << PAGE_SHIFT); + printk(KERN_INFO "%s\n", + numa_off ? "NUMA turned off" : "No NUMA configuration found"); + + printk(KERN_INFO "Faking a node at %016"PRIx64"-%016"PRIx64"\n", + (u64)start_pfn << PAGE_SHIFT, + (u64)end_pfn << PAGE_SHIFT); + /* setup dummy node covering all memory */ + memnode_shift = BITS_PER_LONG - 1; + memnodemap = _memnodemap; + nodes_clear(node_online_map); + node_set_online(0); + for ( i = 0; i < nr_cpu_ids; i++ ) + numa_set_node(i, 0); + cpumask_copy(&node_to_cpumask[0], cpumask_of(0)); + setup_node_bootmem(0, (u64)start_pfn << PAGE_SHIFT, + (u64)end_pfn << PAGE_SHIFT); } __cpuinit void numa_add_cpu(int cpu) { - cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); + cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); } void __cpuinit numa_set_node(int cpu, int node) { - cpu_to_node[cpu] = node; + cpu_to_node[cpu] = node; } /* [numa=off] */ static __init int numa_setup(char *opt) { - if (!strncmp(opt,"off",3)) - numa_off = 1; - if (!strncmp(opt,"on",2)) - numa_off = 0; + if ( !strncmp(opt,"off",3) ) + numa_off = 1; + if ( !strncmp(opt,"on",2) ) + numa_off = 0; #ifdef CONFIG_NUMA_EMU - if(!strncmp(opt, "fake=", 5)) { - numa_off = 0; - numa_fake = simple_strtoul(opt+5,NULL,0); ; - if (numa_fake >= MAX_NUMNODES) - numa_fake = MAX_NUMNODES; - } + if ( !strncmp(opt, "fake=", 5) ) + { + numa_off = 0; + numa_fake = simple_strtoul(opt+5,NULL,0); + if ( numa_fake >= MAX_NUMNODES ) + numa_fake = MAX_NUMNODES; + } #endif #ifdef CONFIG_ACPI_NUMA - if (!strncmp(opt,"noacpi",6)) { - numa_off = 0; - acpi_numa = -1; - } + if ( !strncmp(opt,"noacpi",6) ) + { + numa_off = 0; + acpi_numa = -1; + } #endif - return 1; + + return 1; } /* @@ -326,16 +340,18 @@ static __init int numa_setup(char *opt) */ void __init init_cpu_to_node(void) { - int i, node; - for (i = 0; i < nr_cpu_ids; i++) { - u32 apicid = x86_cpu_to_apicid[i]; - if (apicid == BAD_APICID) - continue; - node = apicid_to_node[apicid]; - if ( node == NUMA_NO_NODE || !node_online(node) ) - node = 0; - numa_set_node(i, node); - } + int i, node; + + for ( i = 0; i < nr_cpu_ids; i++ ) + { + u32 apicid = x86_cpu_to_apicid[i]; + if ( apicid == BAD_APICID ) + continue; + node = apicid_to_node[apicid]; + if ( node == NUMA_NO_NODE || !node_online(node) ) + node = 0; + numa_set_node(i, node); + } } EXPORT_SYMBOL(cpu_to_node); @@ -346,64 +362,67 @@ EXPORT_SYMBOL(node_data); static void dump_numa(unsigned char key) { - s_time_t now = NOW(); - int i; - struct domain *d; - struct page_info *page; - unsigned int page_num_node[MAX_NUMNODES]; - - printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key, - (u32)(now>>32), (u32)now); - - for_each_online_node(i) { - paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; - printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", - i, NODE_DATA(i)->node_id, - NODE_DATA(i)->node_start_pfn, - NODE_DATA(i)->node_spanned_pages, - avail_node_heap_pages(i)); - /* sanity check phys_to_nid() */ - printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, phys_to_nid(pa), - NODE_DATA(i)->node_id); - } - for_each_online_cpu(i) - printk("CPU%d -> NODE%d\n", i, cpu_to_node[i]); - - rcu_read_lock(&domlist_read_lock); - - printk("Memory location of each domain:\n"); - for_each_domain(d) - { - printk("Domain %u (total: %u):\n", d->domain_id, d->tot_pages); - - for_each_online_node(i) - page_num_node[i] = 0; - - spin_lock(&d->page_alloc_lock); - page_list_for_each(page, &d->page_list) - { - i = phys_to_nid((paddr_t)page_to_mfn(page) << PAGE_SHIFT); - page_num_node[i]++; - } - spin_unlock(&d->page_alloc_lock); - - for_each_online_node(i) - printk(" Node %u: %u\n", i, page_num_node[i]); - } - - rcu_read_unlock(&domlist_read_lock); + s_time_t now = NOW(); + int i; + struct domain *d; + struct page_info *page; + unsigned int page_num_node[MAX_NUMNODES]; + + printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key, + (u32)(now>>32), (u32)now); + + for_each_online_node ( i ) + { + paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; + printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", + i, NODE_DATA(i)->node_id, + NODE_DATA(i)->node_start_pfn, + NODE_DATA(i)->node_spanned_pages, + avail_node_heap_pages(i)); + /* sanity check phys_to_nid() */ + printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, + phys_to_nid(pa), + NODE_DATA(i)->node_id); + } + + for_each_online_cpu ( i ) + printk("CPU%d -> NODE%d\n", i, cpu_to_node[i]); + + rcu_read_lock(&domlist_read_lock); + + printk("Memory location of each domain:\n"); + for_each_domain ( d ) + { + printk("Domain %u (total: %u):\n", d->domain_id, d->tot_pages); + + for_each_online_node ( i ) + page_num_node[i] = 0; + + spin_lock(&d->page_alloc_lock); + page_list_for_each(page, &d->page_list) + { + i = phys_to_nid((paddr_t)page_to_mfn(page) << PAGE_SHIFT); + page_num_node[i]++; + } + spin_unlock(&d->page_alloc_lock); + + for_each_online_node ( i ) + printk(" Node %u: %u\n", i, page_num_node[i]); + } + + rcu_read_unlock(&domlist_read_lock); } static struct keyhandler dump_numa_keyhandler = { - .diagnostic = 1, - .u.fn = dump_numa, - .desc = "dump numa info" + .diagnostic = 1, + .u.fn = dump_numa, + .desc = "dump numa info" }; static __init int register_numa_trigger(void) { - register_keyhandler('u', &dump_numa_keyhandler); - return 0; + register_keyhandler('u', &dump_numa_keyhandler); + return 0; } __initcall(register_numa_trigger); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 05 01:44:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Sep 2014 01:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPiZO-0005gx-LZ; Fri, 05 Sep 2014 01:44:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPiZM-0005gs-Sy for xen-changelog@lists.xensource.com; Fri, 05 Sep 2014 01:44:09 +0000 Received: from [193.109.254.147:18581] by server-11.bemta-14.messagelabs.com id A8/14-14213-86519045; Fri, 05 Sep 2014 01:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1409881446!13586190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22530 invoked from network); 5 Sep 2014 01: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; 5 Sep 2014 01:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XPiZG-00024z-9L for xen-changelog@lists.xensource.com; Fri, 05 Sep 2014 01:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XPiZG-00078c-6V for xen-changelog@lists.xensource.com; Fri, 05 Sep 2014 01:44:02 +0000 Date: Fri, 05 Sep 2014 01:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] numa.c: convert to xen coding style X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c33fe5459732fc85c2c279c5e8ed316b8601c58c Author: Elena Ufimtseva AuthorDate: Thu Sep 4 09:04:36 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 4 09:04:36 2014 +0200 numa.c: convert to xen coding style Convert to Xen coding style from mixed one. Signed-off-by: Elena Ufimtseva --- xen/arch/x86/numa.c | 505 ++++++++++++++++++++++++++------------------------- 1 files changed, 262 insertions(+), 243 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index b141877..628a40a 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -36,13 +36,13 @@ unsigned long memnodemapsize; u8 *memnodemap; unsigned char cpu_to_node[NR_CPUS] __read_mostly = { - [0 ... NR_CPUS-1] = NUMA_NO_NODE + [0 ... NR_CPUS-1] = NUMA_NO_NODE }; /* * Keep BIOS's CPU2node information, should not be used for memory allocaion */ unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { - [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE + [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; @@ -54,7 +54,7 @@ int acpi_numa __devinitdata; int srat_disabled(void) { - return numa_off || acpi_numa < 0; + return numa_off || acpi_numa < 0; } /* @@ -67,53 +67,56 @@ int srat_disabled(void) static int __init populate_memnodemap(const struct node *nodes, int numnodes, int shift, int *nodeids) { - unsigned long spdx, epdx; - int i, res = -1; - - memset(memnodemap, NUMA_NO_NODE, memnodemapsize * sizeof(*memnodemap)); - for (i = 0; i < numnodes; i++) { - spdx = paddr_to_pdx(nodes[i].start); - epdx = paddr_to_pdx(nodes[i].end - 1) + 1; - if (spdx >= epdx) - continue; - if ((epdx >> shift) >= memnodemapsize) - return 0; - do { - if (memnodemap[spdx >> shift] != NUMA_NO_NODE) - return -1; - - if (!nodeids) - memnodemap[spdx >> shift] = i; - else - memnodemap[spdx >> shift] = nodeids[i]; - - spdx += (1UL << shift); - } while (spdx < epdx); - res = 1; - } - return res; + unsigned long spdx, epdx; + int i, res = -1; + + memset(memnodemap, NUMA_NO_NODE, memnodemapsize * sizeof(*memnodemap)); + for ( i = 0; i < numnodes; i++ ) + { + spdx = paddr_to_pdx(nodes[i].start); + epdx = paddr_to_pdx(nodes[i].end - 1) + 1; + if ( spdx >= epdx ) + continue; + if ( (epdx >> shift) >= memnodemapsize ) + return 0; + do { + if ( memnodemap[spdx >> shift] != NUMA_NO_NODE ) + return -1; + + if ( !nodeids ) + memnodemap[spdx >> shift] = i; + else + memnodemap[spdx >> shift] = nodeids[i]; + + spdx += (1UL << shift); + } while ( spdx < epdx ); + res = 1; + } + + return res; } static int __init allocate_cachealigned_memnodemap(void) { - unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap)); - unsigned long mfn = alloc_boot_pages(size, 1); - - if (!mfn) { - printk(KERN_ERR - "NUMA: Unable to allocate Memory to Node hash map\n"); - memnodemapsize = 0; - return -1; - } - - memnodemap = mfn_to_virt(mfn); - mfn <<= PAGE_SHIFT; - size <<= PAGE_SHIFT; - printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n", - mfn, mfn + size); - memnodemapsize = size / sizeof(*memnodemap); - - return 0; + unsigned long size = PFN_UP(memnodemapsize * sizeof(*memnodemap)); + unsigned long mfn = alloc_boot_pages(size, 1); + + if ( !mfn ) + { + printk(KERN_ERR + "NUMA: Unable to allocate Memory to Node hash map\n"); + memnodemapsize = 0; + return -1; + } + + memnodemap = mfn_to_virt(mfn); + mfn <<= PAGE_SHIFT; + size <<= PAGE_SHIFT; + printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n", + mfn, mfn + size); + memnodemapsize = size / sizeof(*memnodemap); + + return 0; } /* @@ -121,84 +124,87 @@ static int __init allocate_cachealigned_memnodemap(void) * maximum possible shift. */ static int __init extract_lsb_from_nodes(const struct node *nodes, - int numnodes) + int numnodes) { - int i, nodes_used = 0; - unsigned long spdx, epdx; - unsigned long bitfield = 0, memtop = 0; - - for (i = 0; i < numnodes; i++) { - spdx = paddr_to_pdx(nodes[i].start); - epdx = paddr_to_pdx(nodes[i].end - 1) + 1; - if (spdx >= epdx) - continue; - bitfield |= spdx; - nodes_used++; - if (epdx > memtop) - memtop = epdx; - } - if (nodes_used <= 1) - i = BITS_PER_LONG - 1; - else - i = find_first_bit(&bitfield, sizeof(unsigned long)*8); - memnodemapsize = (memtop >> i) + 1; - return i; + int i, nodes_used = 0; + unsigned long spdx, epdx; + unsigned long bitfield = 0, memtop = 0; + + for ( i = 0; i < numnodes; i++ ) + { + spdx = paddr_to_pdx(nodes[i].start); + epdx = paddr_to_pdx(nodes[i].end - 1) + 1; + if ( spdx >= epdx ) + continue; + bitfield |= spdx; + nodes_used++; + if ( epdx > memtop ) + memtop = epdx; + } + if ( nodes_used <= 1 ) + i = BITS_PER_LONG - 1; + else + i = find_first_bit(&bitfield, sizeof(unsigned long)*8); + memnodemapsize = (memtop >> i) + 1; + return i; } int __init compute_hash_shift(struct node *nodes, int numnodes, - int *nodeids) + int *nodeids) { - int shift; - - shift = extract_lsb_from_nodes(nodes, numnodes); - if (memnodemapsize <= ARRAY_SIZE(_memnodemap)) - memnodemap = _memnodemap; - else if (allocate_cachealigned_memnodemap()) - return -1; - printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n", - shift); - - if (populate_memnodemap(nodes, numnodes, shift, nodeids) != 1) { - printk(KERN_INFO "Your memory is not aligned you need to " - "rebuild your kernel with a bigger NODEMAPSIZE " - "shift=%d\n", shift); - return -1; - } - return shift; + int shift; + + shift = extract_lsb_from_nodes(nodes, numnodes); + if ( memnodemapsize <= ARRAY_SIZE(_memnodemap) ) + memnodemap = _memnodemap; + else if ( allocate_cachealigned_memnodemap() ) + return -1; + printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n", shift); + + if ( populate_memnodemap(nodes, numnodes, shift, nodeids) != 1 ) + { + printk(KERN_INFO "Your memory is not aligned you need to " + "rebuild your hypervisor with a bigger NODEMAPSIZE " + "shift=%d\n", shift); + return -1; + } + + return shift; } /* initialize NODE_DATA given nodeid and start/end */ void __init setup_node_bootmem(int nodeid, u64 start, u64 end) { - unsigned long start_pfn, end_pfn; + unsigned long start_pfn, end_pfn; - start_pfn = start >> PAGE_SHIFT; - end_pfn = end >> PAGE_SHIFT; + start_pfn = start >> PAGE_SHIFT; + end_pfn = end >> PAGE_SHIFT; - NODE_DATA(nodeid)->node_id = nodeid; - NODE_DATA(nodeid)->node_start_pfn = start_pfn; - NODE_DATA(nodeid)->node_spanned_pages = end_pfn - start_pfn; + NODE_DATA(nodeid)->node_id = nodeid; + NODE_DATA(nodeid)->node_start_pfn = start_pfn; + NODE_DATA(nodeid)->node_spanned_pages = end_pfn - start_pfn; - node_set_online(nodeid); + node_set_online(nodeid); } void __init numa_init_array(void) { - int rr, i; - /* There are unfortunately some poorly designed mainboards around - that only connect memory to a single CPU. This breaks the 1:1 cpu->node - mapping. To avoid this fill in the mapping for all possible - CPUs, as the number of CPUs is not known yet. - We round robin the existing nodes. */ - rr = first_node(node_online_map); - for (i = 0; i < nr_cpu_ids; i++) { - if (cpu_to_node[i] != NUMA_NO_NODE) - continue; - numa_set_node(i, rr); - rr = next_node(rr, node_online_map); - if (rr == MAX_NUMNODES) - rr = first_node(node_online_map); - } - + int rr, i; + + /* There are unfortunately some poorly designed mainboards around + that only connect memory to a single CPU. This breaks the 1:1 cpu->node + mapping. To avoid this fill in the mapping for all possible + CPUs, as the number of CPUs is not known yet. + We round robin the existing nodes. */ + rr = first_node(node_online_map); + for ( i = 0; i < nr_cpu_ids; i++ ) + { + if ( cpu_to_node[i] != NUMA_NO_NODE ) + continue; + numa_set_node(i, rr); + rr = next_node(rr, node_online_map); + if ( rr == MAX_NUMNODES ) + rr = first_node(node_online_map); + } } #ifdef CONFIG_NUMA_EMU @@ -207,109 +213,117 @@ static int numa_fake __initdata = 0; /* Numa emulation */ static int __init numa_emulation(u64 start_pfn, u64 end_pfn) { - int i; - struct node nodes[MAX_NUMNODES]; - u64 sz = ((end_pfn - start_pfn)< 1) { - u64 x = 1; - while ((x << 1) < sz) - x <<= 1; - if (x < sz/2) - printk(KERN_ERR "Numa emulation unbalanced. Complain to maintainer\n"); - sz = x; - } - - memset(&nodes,0,sizeof(nodes)); - for (i = 0; i < numa_fake; i++) { - nodes[i].start = (start_pfn<> 20); - node_set_online(i); - } - memnode_shift = compute_hash_shift(nodes, numa_fake, NULL); - if (memnode_shift < 0) { - memnode_shift = 0; - printk(KERN_ERR "No NUMA hash function found. Emulation disabled.\n"); - return -1; - } - for_each_online_node(i) - setup_node_bootmem(i, nodes[i].start, nodes[i].end); - numa_init_array(); - return 0; + int i; + struct node nodes[MAX_NUMNODES]; + u64 sz = ((end_pfn - start_pfn)< 1 ) + { + u64 x = 1; + while ( (x << 1) < sz ) + x <<= 1; + if ( x < sz/2 ) + printk(KERN_ERR "Numa emulation unbalanced. Complain to maintainer\n"); + sz = x; + } + + memset(&nodes,0,sizeof(nodes)); + for ( i = 0; i < numa_fake; i++ ) + { + nodes[i].start = (start_pfn<> 20); + node_set_online(i); + } + memnode_shift = compute_hash_shift(nodes, numa_fake, NULL); + if ( memnode_shift < 0 ) + { + memnode_shift = 0; + printk(KERN_ERR "No NUMA hash function found. Emulation disabled.\n"); + return -1; + } + for_each_online_node ( i ) + setup_node_bootmem(i, nodes[i].start, nodes[i].end); + numa_init_array(); + + return 0; } #endif void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) { - int i; + int i; #ifdef CONFIG_NUMA_EMU - if (numa_fake && !numa_emulation(start_pfn, end_pfn)) - return; + if ( numa_fake && !numa_emulation(start_pfn, end_pfn) ) + return; #endif #ifdef CONFIG_ACPI_NUMA - if (!numa_off && !acpi_scan_nodes((u64)start_pfn << PAGE_SHIFT, - (u64)end_pfn << PAGE_SHIFT)) - return; + if ( !numa_off && !acpi_scan_nodes((u64)start_pfn << PAGE_SHIFT, + (u64)end_pfn << PAGE_SHIFT) ) + return; #endif - printk(KERN_INFO "%s\n", - numa_off ? "NUMA turned off" : "No NUMA configuration found"); - - printk(KERN_INFO "Faking a node at %016"PRIx64"-%016"PRIx64"\n", - (u64)start_pfn << PAGE_SHIFT, - (u64)end_pfn << PAGE_SHIFT); - /* setup dummy node covering all memory */ - memnode_shift = BITS_PER_LONG - 1; - memnodemap = _memnodemap; - nodes_clear(node_online_map); - node_set_online(0); - for (i = 0; i < nr_cpu_ids; i++) - numa_set_node(i, 0); - cpumask_copy(&node_to_cpumask[0], cpumask_of(0)); - setup_node_bootmem(0, (u64)start_pfn << PAGE_SHIFT, (u64)end_pfn << PAGE_SHIFT); + printk(KERN_INFO "%s\n", + numa_off ? "NUMA turned off" : "No NUMA configuration found"); + + printk(KERN_INFO "Faking a node at %016"PRIx64"-%016"PRIx64"\n", + (u64)start_pfn << PAGE_SHIFT, + (u64)end_pfn << PAGE_SHIFT); + /* setup dummy node covering all memory */ + memnode_shift = BITS_PER_LONG - 1; + memnodemap = _memnodemap; + nodes_clear(node_online_map); + node_set_online(0); + for ( i = 0; i < nr_cpu_ids; i++ ) + numa_set_node(i, 0); + cpumask_copy(&node_to_cpumask[0], cpumask_of(0)); + setup_node_bootmem(0, (u64)start_pfn << PAGE_SHIFT, + (u64)end_pfn << PAGE_SHIFT); } __cpuinit void numa_add_cpu(int cpu) { - cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); + cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); } void __cpuinit numa_set_node(int cpu, int node) { - cpu_to_node[cpu] = node; + cpu_to_node[cpu] = node; } /* [numa=off] */ static __init int numa_setup(char *opt) { - if (!strncmp(opt,"off",3)) - numa_off = 1; - if (!strncmp(opt,"on",2)) - numa_off = 0; + if ( !strncmp(opt,"off",3) ) + numa_off = 1; + if ( !strncmp(opt,"on",2) ) + numa_off = 0; #ifdef CONFIG_NUMA_EMU - if(!strncmp(opt, "fake=", 5)) { - numa_off = 0; - numa_fake = simple_strtoul(opt+5,NULL,0); ; - if (numa_fake >= MAX_NUMNODES) - numa_fake = MAX_NUMNODES; - } + if ( !strncmp(opt, "fake=", 5) ) + { + numa_off = 0; + numa_fake = simple_strtoul(opt+5,NULL,0); + if ( numa_fake >= MAX_NUMNODES ) + numa_fake = MAX_NUMNODES; + } #endif #ifdef CONFIG_ACPI_NUMA - if (!strncmp(opt,"noacpi",6)) { - numa_off = 0; - acpi_numa = -1; - } + if ( !strncmp(opt,"noacpi",6) ) + { + numa_off = 0; + acpi_numa = -1; + } #endif - return 1; + + return 1; } /* @@ -326,16 +340,18 @@ static __init int numa_setup(char *opt) */ void __init init_cpu_to_node(void) { - int i, node; - for (i = 0; i < nr_cpu_ids; i++) { - u32 apicid = x86_cpu_to_apicid[i]; - if (apicid == BAD_APICID) - continue; - node = apicid_to_node[apicid]; - if ( node == NUMA_NO_NODE || !node_online(node) ) - node = 0; - numa_set_node(i, node); - } + int i, node; + + for ( i = 0; i < nr_cpu_ids; i++ ) + { + u32 apicid = x86_cpu_to_apicid[i]; + if ( apicid == BAD_APICID ) + continue; + node = apicid_to_node[apicid]; + if ( node == NUMA_NO_NODE || !node_online(node) ) + node = 0; + numa_set_node(i, node); + } } EXPORT_SYMBOL(cpu_to_node); @@ -346,64 +362,67 @@ EXPORT_SYMBOL(node_data); static void dump_numa(unsigned char key) { - s_time_t now = NOW(); - int i; - struct domain *d; - struct page_info *page; - unsigned int page_num_node[MAX_NUMNODES]; - - printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key, - (u32)(now>>32), (u32)now); - - for_each_online_node(i) { - paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; - printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", - i, NODE_DATA(i)->node_id, - NODE_DATA(i)->node_start_pfn, - NODE_DATA(i)->node_spanned_pages, - avail_node_heap_pages(i)); - /* sanity check phys_to_nid() */ - printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, phys_to_nid(pa), - NODE_DATA(i)->node_id); - } - for_each_online_cpu(i) - printk("CPU%d -> NODE%d\n", i, cpu_to_node[i]); - - rcu_read_lock(&domlist_read_lock); - - printk("Memory location of each domain:\n"); - for_each_domain(d) - { - printk("Domain %u (total: %u):\n", d->domain_id, d->tot_pages); - - for_each_online_node(i) - page_num_node[i] = 0; - - spin_lock(&d->page_alloc_lock); - page_list_for_each(page, &d->page_list) - { - i = phys_to_nid((paddr_t)page_to_mfn(page) << PAGE_SHIFT); - page_num_node[i]++; - } - spin_unlock(&d->page_alloc_lock); - - for_each_online_node(i) - printk(" Node %u: %u\n", i, page_num_node[i]); - } - - rcu_read_unlock(&domlist_read_lock); + s_time_t now = NOW(); + int i; + struct domain *d; + struct page_info *page; + unsigned int page_num_node[MAX_NUMNODES]; + + printk("'%c' pressed -> dumping numa info (now-0x%X:%08X)\n", key, + (u32)(now>>32), (u32)now); + + for_each_online_node ( i ) + { + paddr_t pa = (paddr_t)(NODE_DATA(i)->node_start_pfn + 1)<< PAGE_SHIFT; + printk("idx%d -> NODE%d start->%lu size->%lu free->%lu\n", + i, NODE_DATA(i)->node_id, + NODE_DATA(i)->node_start_pfn, + NODE_DATA(i)->node_spanned_pages, + avail_node_heap_pages(i)); + /* sanity check phys_to_nid() */ + printk("phys_to_nid(%"PRIpaddr") -> %d should be %d\n", pa, + phys_to_nid(pa), + NODE_DATA(i)->node_id); + } + + for_each_online_cpu ( i ) + printk("CPU%d -> NODE%d\n", i, cpu_to_node[i]); + + rcu_read_lock(&domlist_read_lock); + + printk("Memory location of each domain:\n"); + for_each_domain ( d ) + { + printk("Domain %u (total: %u):\n", d->domain_id, d->tot_pages); + + for_each_online_node ( i ) + page_num_node[i] = 0; + + spin_lock(&d->page_alloc_lock); + page_list_for_each(page, &d->page_list) + { + i = phys_to_nid((paddr_t)page_to_mfn(page) << PAGE_SHIFT); + page_num_node[i]++; + } + spin_unlock(&d->page_alloc_lock); + + for_each_online_node ( i ) + printk(" Node %u: %u\n", i, page_num_node[i]); + } + + rcu_read_unlock(&domlist_read_lock); } static struct keyhandler dump_numa_keyhandler = { - .diagnostic = 1, - .u.fn = dump_numa, - .desc = "dump numa info" + .diagnostic = 1, + .u.fn = dump_numa, + .desc = "dump numa info" }; static __init int register_numa_trigger(void) { - register_keyhandler('u', &dump_numa_keyhandler); - return 0; + register_keyhandler('u', &dump_numa_keyhandler); + return 0; } __initcall(register_numa_trigger); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV68-0000gW-4Y; Sun, 07 Sep 2014 05:33:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV67-0000gO-Kj for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:11 +0000 Received: from [85.158.137.68:23188] by server-12.bemta-3.messagelabs.com id EB/C1-01574-31EEB045; Sun, 07 Sep 2014 05:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1410067984!12824353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15181 invoked from network); 7 Sep 2014 05:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV60-0001go-Kp for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV60-0004ct-4g for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:04 +0000 Date: Sun, 07 Sep 2014 05:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove redundancy of MSR_P6_{PERFCTR, EVNTSEL} definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f4b3c45a64bfc55130d52688c9694fac6a554309 Author: Jan Beulich AuthorDate: Fri Sep 5 10:58:00 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 10:58:00 2014 +0200 x86: remove redundancy of MSR_P6_{PERFCTR,EVNTSEL} definitions Not only did the EVNTSEL ones get defined twice, we can also easily abstract out the numbers previously attached to them. While at it also remove an unused Geode-related define. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 20 ++++++++++---------- xen/arch/x86/nmi.c | 16 ++++++++-------- xen/arch/x86/oprofile/op_model_ppro.c | 10 +++++----- xen/include/asm-x86/msr-index.h | 12 ++---------- 4 files changed, 25 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 56f5059..68b6272 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -105,9 +105,9 @@ static void handle_pmc_quirk(u64 msr_content) if ( val & 0x1 ) { u64 cnt; - rdmsrl(MSR_P6_PERFCTR0 + i, cnt); + rdmsrl(MSR_P6_PERFCTR(i), cnt); if ( cnt == 0 ) - wrmsrl(MSR_P6_PERFCTR0 + i, 1); + wrmsrl(MSR_P6_PERFCTR(i), 1); } val >>= 1; } @@ -238,11 +238,11 @@ static int is_core2_vpmu_msr(u32 msr_index, int *type, int *index) return 1; } - if ( (msr_index >= MSR_P6_EVNTSEL0) && - (msr_index < (MSR_P6_EVNTSEL0 + core2_get_pmc_count())) ) + if ( (msr_index >= MSR_P6_EVNTSEL(0)) && + (msr_index < (MSR_P6_EVNTSEL(core2_get_pmc_count()))) ) { *type = MSR_TYPE_ARCH_CTRL; - *index = msr_index - MSR_P6_EVNTSEL0; + *index = msr_index - MSR_P6_EVNTSEL(0); return 1; } @@ -278,7 +278,7 @@ static void core2_vpmu_set_msr_bitmap(unsigned long *msr_bitmap) for ( i = 0; i < core2_ctrls.num; i++ ) clear_bit(msraddr_to_bitpos(core2_ctrls.msr[i]), msr_bitmap); for ( i = 0; i < core2_get_pmc_count(); i++ ) - clear_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL0+i), msr_bitmap); + clear_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL(i)), msr_bitmap); } static void core2_vpmu_unset_msr_bitmap(unsigned long *msr_bitmap) @@ -308,7 +308,7 @@ static void core2_vpmu_unset_msr_bitmap(unsigned long *msr_bitmap) for ( i = 0; i < core2_ctrls.num; i++ ) set_bit(msraddr_to_bitpos(core2_ctrls.msr[i]), msr_bitmap); for ( i = 0; i < core2_get_pmc_count(); i++ ) - set_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL0+i), msr_bitmap); + set_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL(i)), msr_bitmap); } static inline void __core2_vpmu_save(struct vcpu *v) @@ -359,7 +359,7 @@ static inline void __core2_vpmu_load(struct vcpu *v) for ( i = 0; i < core2_ctrls.num; i++ ) wrmsrl(core2_ctrls.msr[i], core2_vpmu_cxt->ctrls[i]); for ( i = 0; i < core2_get_pmc_count(); i++ ) - wrmsrl(MSR_P6_EVNTSEL0+i, core2_vpmu_cxt->arch_msr_pair[i].control); + wrmsrl(MSR_P6_EVNTSEL(i), core2_vpmu_cxt->arch_msr_pair[i].control); } static void core2_vpmu_load(struct vcpu *v) @@ -526,7 +526,7 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, global_ctrl = msr_content; for ( i = 0; i < core2_get_pmc_count(); i++ ) { - rdmsrl(MSR_P6_EVNTSEL0+i, non_global_ctrl); + rdmsrl(MSR_P6_EVNTSEL(i), non_global_ctrl); core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] = global_ctrl & (non_global_ctrl >> 22) & 1; global_ctrl >>= 1; @@ -555,7 +555,7 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, } break; default: - tmp = msr - MSR_P6_EVNTSEL0; + tmp = msr - MSR_P6_EVNTSEL(0); vmx_read_guest_msr(MSR_CORE_PERF_GLOBAL_CTRL, &global_ctrl); if ( tmp >= 0 && tmp < core2_get_pmc_count() ) core2_vpmu_cxt->pmu_enable->arch_pmc_enable[tmp] = diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index f8f5e4a..98c1e15 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -205,7 +205,7 @@ void disable_lapic_nmi_watchdog(void) case X86_VENDOR_INTEL: switch (boot_cpu_data.x86) { case 6: - wrmsr(MSR_P6_EVNTSEL0, 0, 0); + wrmsr(MSR_P6_EVNTSEL(0), 0, 0); break; case 15: wrmsr(MSR_P4_IQ_CCCR0, 0, 0); @@ -304,21 +304,21 @@ static void __pminit setup_p6_watchdog(unsigned counter) { unsigned int evntsel; - nmi_perfctr_msr = MSR_P6_PERFCTR0; + nmi_perfctr_msr = MSR_P6_PERFCTR(0); - clear_msr_range(MSR_P6_EVNTSEL0, 2); - clear_msr_range(MSR_P6_PERFCTR0, 2); + clear_msr_range(MSR_P6_EVNTSEL(0), 2); + clear_msr_range(MSR_P6_PERFCTR(0), 2); evntsel = P6_EVNTSEL_INT | P6_EVNTSEL_OS | P6_EVNTSEL_USR | counter; - wrmsr(MSR_P6_EVNTSEL0, evntsel, 0); + wrmsr(MSR_P6_EVNTSEL(0), evntsel, 0); write_watchdog_counter("P6_PERFCTR0"); apic_write(APIC_LVTPC, APIC_DM_NMI); evntsel |= P6_EVNTSEL0_ENABLE; - wrmsr(MSR_P6_EVNTSEL0, evntsel, 0); + wrmsr(MSR_P6_EVNTSEL(0), evntsel, 0); } static int __pminit setup_p4_watchdog(void) @@ -508,9 +508,9 @@ bool_t nmi_watchdog_tick(const struct cpu_user_regs *regs) wrmsrl(MSR_P4_IQ_CCCR0, nmi_p4_cccr_val); apic_write(APIC_LVTPC, APIC_DM_NMI); } - else if ( nmi_perfctr_msr == MSR_P6_PERFCTR0 ) + else if ( nmi_perfctr_msr == MSR_P6_PERFCTR(0) ) { - rdmsrl(MSR_P6_PERFCTR0, msr_content); + rdmsrl(MSR_P6_PERFCTR(0), msr_content); if ( msr_content & (1ULL << P6_EVENT_WIDTH) ) watchdog_tick = 0; diff --git a/xen/arch/x86/oprofile/op_model_ppro.c b/xen/arch/x86/oprofile/op_model_ppro.c index 8b9f3f6..aa99e4d 100644 --- a/xen/arch/x86/oprofile/op_model_ppro.c +++ b/xen/arch/x86/oprofile/op_model_ppro.c @@ -64,9 +64,9 @@ static void ppro_fill_in_addresses(struct op_msrs * const msrs) int i; for (i = 0; i < num_counters; i++) - msrs->counters[i].addr = MSR_P6_PERFCTR0 + i; + msrs->counters[i].addr = MSR_P6_PERFCTR(i); for (i = 0; i < num_counters; i++) - msrs->controls[i].addr = MSR_P6_EVNTSEL0 + i; + msrs->controls[i].addr = MSR_P6_EVNTSEL(i); } @@ -211,11 +211,11 @@ static int ppro_is_arch_pmu_msr(u64 msr_index, int *type, int *index) *index = msr_index - MSR_IA32_PERFCTR0; return 1; } - if ( (msr_index >= MSR_P6_EVNTSEL0) && - (msr_index < (MSR_P6_EVNTSEL0 + num_counters)) ) + if ( (msr_index >= MSR_P6_EVNTSEL(0)) && + (msr_index < (MSR_P6_EVNTSEL(num_counters))) ) { *type = MSR_TYPE_ARCH_CTRL; - *index = msr_index - MSR_P6_EVNTSEL0; + *index = msr_index - MSR_P6_EVNTSEL(0); return 1; } diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index da732b7..2056501 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -112,11 +112,6 @@ #define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - /* MSRs & bits used for VMX enabling */ #define MSR_IA32_VMX_BASIC 0x480 #define MSR_IA32_VMX_PINBASED_CTLS 0x481 @@ -329,8 +324,8 @@ #define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 /* Intel Model 6 */ -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 +#define MSR_P6_PERFCTR(n) (0x000000c1 + (n)) +#define MSR_P6_EVNTSEL(n) (0x00000186 + (n)) /* P4/Xeon+ specific */ #define MSR_IA32_MCG_EAX 0x00000180 @@ -488,7 +483,4 @@ #define _MSR_MISC_FEATURES_CPUID_FAULTING 0 #define MSR_MISC_FEATURES_CPUID_FAULTING (1ULL << _MSR_MISC_FEATURES_CPUID_FAULTING) -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - #endif /* __ASM_MSR_INDEX_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6F-0000gj-7B; Sun, 07 Sep 2014 05:33:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6E-0000ge-Is for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:18 +0000 Received: from [193.109.254.147:25861] by server-16.bemta-14.messagelabs.com id 3E/B3-16990-D1EEB045; Sun, 07 Sep 2014 05:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1410067995!9302004!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29251 invoked from network); 7 Sep 2014 05:33:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6B-0001gr-20 for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6A-0004e1-Sk for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:14 +0000 Date: Sun, 07 Sep 2014 05:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: vnuma topology and subop hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9695014966b57c5ca004c7ec3154e7e30bdb0800 Author: Elena Ufimtseva AuthorDate: Fri Sep 5 11:00:57 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 11:00:57 2014 +0200 xen: vnuma topology and subop hypercalls Define interface, structures and hypercalls for toolstack to build vnuma topology and for guests that wish to retrieve it. Two subop hypercalls introduced by patch: XEN_DOMCTL_setvnumainfo to define vNUMA domain topology per domain and XENMEM_get_vnumainfo to retrieve that topology by guest. Signed-off-by: Elena Ufimtseva Reviewed-by: Jan Beulich --- xen/common/domain.c | 3 + xen/common/domctl.c | 135 +++++++++++++++++++++++++++++++++++++++++++ xen/common/memory.c | 124 +++++++++++++++++++++++++++++++++++++++ xen/include/public/domctl.h | 31 ++++++++++ xen/include/public/memory.h | 52 ++++++++++++++++- xen/include/xen/domain.h | 12 ++++ xen/include/xen/sched.h | 4 + 7 files changed, 360 insertions(+), 1 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index e6b4ae6..62514b0 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -280,6 +280,8 @@ struct domain *domain_create( spin_lock_init(&d->pbuf_lock); + rwlock_init(&d->vnuma_rwlock); + err = -ENOMEM; if ( !zalloc_cpumask_var(&d->domain_dirty_cpumask) ) goto fail; @@ -606,6 +608,7 @@ int domain_kill(struct domain *d) evtchn_destroy(d); gnttab_release_mappings(d); tmem_destroy(d->tmem_client); + vnuma_destroy(d->vnuma); domain_set_outstanding_pages(d, 0); d->tmem_client = NULL; /* fallthrough */ diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 80b7800..222b140 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -297,6 +297,120 @@ int vcpuaffinity_params_invalid(const xen_domctl_vcpuaffinity_t *vcpuaff) guest_handle_is_null(vcpuaff->cpumap_soft.bitmap)); } +void vnuma_destroy(struct vnuma_info *vnuma) +{ + if ( vnuma ) + { + xfree(vnuma->vmemrange); + xfree(vnuma->vcpu_to_vnode); + xfree(vnuma->vdistance); + xfree(vnuma->vnode_to_pnode); + xfree(vnuma); + } +} + +/* + * Allocates memory for vNUMA, **vnuma should be NULL. + * Caller has to make sure that domain has max_pages + * and number of vcpus set for domain. + * Verifies that single allocation does not exceed + * PAGE_SIZE. + */ +static struct vnuma_info *vnuma_alloc(unsigned int nr_vnodes, + unsigned int nr_ranges, + unsigned int nr_vcpus) +{ + + struct vnuma_info *vnuma; + + /* + * Check if any of the allocations are bigger than PAGE_SIZE. + * See XSA-77. + */ + if ( nr_vnodes * nr_vnodes > (PAGE_SIZE / sizeof(*vnuma->vdistance)) || + nr_ranges > (PAGE_SIZE / sizeof(*vnuma->vmemrange)) ) + return ERR_PTR(-EINVAL); + + /* + * If allocations become larger then PAGE_SIZE, these allocations + * should be split into PAGE_SIZE allocations due to XSA-77. + */ + vnuma = xmalloc(struct vnuma_info); + if ( !vnuma ) + return ERR_PTR(-ENOMEM); + + vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes); + vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus); + vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes); + vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges); + + if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL || + vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL ) + { + vnuma_destroy(vnuma); + return ERR_PTR(-ENOMEM); + } + + return vnuma; +} + +/* + * Construct vNUMA topology form uinfo. + */ +static struct vnuma_info *vnuma_init(const struct xen_domctl_vnuma *uinfo, + const struct domain *d) +{ + unsigned int i, nr_vnodes; + int ret = -EINVAL; + struct vnuma_info *info; + + nr_vnodes = uinfo->nr_vnodes; + + if ( nr_vnodes == 0 || uinfo->nr_vcpus != d->max_vcpus || uinfo->pad != 0 ) + return ERR_PTR(ret); + + info = vnuma_alloc(nr_vnodes, uinfo->nr_vmemranges, d->max_vcpus); + if ( IS_ERR(info) ) + return info; + + ret = -EFAULT; + + if ( copy_from_guest(info->vdistance, uinfo->vdistance, + nr_vnodes * nr_vnodes) ) + goto vnuma_fail; + + if ( copy_from_guest(info->vcpu_to_vnode, uinfo->vcpu_to_vnode, + d->max_vcpus) ) + goto vnuma_fail; + + if ( copy_from_guest(info->vnode_to_pnode, uinfo->vnode_to_pnode, + nr_vnodes) ) + goto vnuma_fail; + + if (copy_from_guest(info->vmemrange, uinfo->vmemrange, + uinfo->nr_vmemranges)) + goto vnuma_fail; + + info->nr_vnodes = nr_vnodes; + info->nr_vmemranges = uinfo->nr_vmemranges; + + /* Check that vmemranges flags are zero. */ + for ( i = 0; i < info->nr_vmemranges; i++ ) + { + if ( info->vmemrange[i].flags != 0 ) + { + ret = -EINVAL; + goto vnuma_fail; + } + } + + return info; + + vnuma_fail: + vnuma_destroy(info); + return ERR_PTR(ret); +} + long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) { long ret = 0; @@ -1033,6 +1147,27 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } break; + case XEN_DOMCTL_setvnumainfo: + { + struct vnuma_info *vnuma; + + vnuma = vnuma_init(&op->u.vnuma, d); + if ( IS_ERR(vnuma) ) + { + ret = PTR_ERR(vnuma); + break; + } + + /* overwrite vnuma topology for domain. */ + write_lock(&d->vnuma_rwlock); + vnuma_destroy(d->vnuma); + d->vnuma = vnuma; + write_unlock(&d->vnuma_rwlock); + + ret = 0; + } + break; + default: ret = arch_do_domctl(op, d, u_domctl); break; diff --git a/xen/common/memory.c b/xen/common/memory.c index 2433111..81be69e 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -969,6 +969,130 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; + case XENMEM_get_vnumainfo: + { + struct vnuma_topology_info topology; + struct domain *d; + unsigned int dom_vnodes, dom_vranges, dom_vcpus; + struct vnuma_info tmp; + + /* + * Guest passes nr_vnodes, number of regions and nr_vcpus thus + * we know how much memory guest has allocated. + */ + if ( copy_from_guest(&topology, arg, 1 )) + return -EFAULT; + + if ( topology.pad != 0 ) + return -EINVAL; + + if ( (d = rcu_lock_domain_by_any_id(topology.domid)) == NULL ) + return -ESRCH; + + read_lock(&d->vnuma_rwlock); + + if ( d->vnuma == NULL ) + { + read_unlock(&d->vnuma_rwlock); + rcu_unlock_domain(d); + return -EOPNOTSUPP; + } + + dom_vnodes = d->vnuma->nr_vnodes; + dom_vranges = d->vnuma->nr_vmemranges; + dom_vcpus = d->max_vcpus; + + /* + * Copied from guest values may differ from domain vnuma config. + * Check here guest parameters make sure we dont overflow. + * Additionaly check padding. + */ + if ( topology.nr_vnodes < dom_vnodes || + topology.nr_vcpus < dom_vcpus || + topology.nr_vmemranges < dom_vranges ) + { + read_unlock(&d->vnuma_rwlock); + rcu_unlock_domain(d); + + topology.nr_vnodes = dom_vnodes; + topology.nr_vcpus = dom_vcpus; + topology.nr_vmemranges = dom_vranges; + + /* Copy back needed values. */ + return __copy_to_guest(arg, &topology, 1) ? -EFAULT : -ENOBUFS; + } + + read_unlock(&d->vnuma_rwlock); + + tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes * dom_vnodes); + tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges); + tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus); + + if ( tmp.vdistance == NULL || + tmp.vmemrange == NULL || + tmp.vcpu_to_vnode == NULL ) + { + rc = -ENOMEM; + goto vnumainfo_out; + } + + /* + * Check if vnuma info has changed and if the allocated arrays + * are not big enough. + */ + read_lock(&d->vnuma_rwlock); + + if ( dom_vnodes < d->vnuma->nr_vnodes || + dom_vranges < d->vnuma->nr_vmemranges || + dom_vcpus < d->max_vcpus ) + { + read_unlock(&d->vnuma_rwlock); + rc = -EAGAIN; + goto vnumainfo_out; + } + + dom_vnodes = d->vnuma->nr_vnodes; + dom_vranges = d->vnuma->nr_vmemranges; + dom_vcpus = d->max_vcpus; + + memcpy(tmp.vmemrange, d->vnuma->vmemrange, + sizeof(*d->vnuma->vmemrange) * dom_vranges); + memcpy(tmp.vdistance, d->vnuma->vdistance, + sizeof(*d->vnuma->vdistance) * dom_vnodes * dom_vnodes); + memcpy(tmp.vcpu_to_vnode, d->vnuma->vcpu_to_vnode, + sizeof(*d->vnuma->vcpu_to_vnode) * dom_vcpus); + + read_unlock(&d->vnuma_rwlock); + + rc = -EFAULT; + + if ( copy_to_guest(topology.vmemrange.h, tmp.vmemrange, + dom_vranges) != 0 ) + goto vnumainfo_out; + + if ( copy_to_guest(topology.vdistance.h, tmp.vdistance, + dom_vnodes * dom_vnodes) != 0 ) + goto vnumainfo_out; + + if ( copy_to_guest(topology.vcpu_to_vnode.h, tmp.vcpu_to_vnode, + dom_vcpus) != 0 ) + goto vnumainfo_out; + + topology.nr_vnodes = dom_vnodes; + topology.nr_vcpus = dom_vcpus; + topology.nr_vmemranges = dom_vranges; + + rc = __copy_to_guest(arg, &topology, 1) ? -EFAULT : 0; + + vnumainfo_out: + rcu_unlock_domain(d); + + xfree(tmp.vdistance); + xfree(tmp.vmemrange); + xfree(tmp.vcpu_to_vnode); + break; + } + default: rc = arch_memory_op(cmd, arg); break; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 5b11bbf..07c4fd6 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -35,6 +35,7 @@ #include "xen.h" #include "grant_table.h" #include "hvm/save.h" +#include "memory.h" #define XEN_DOMCTL_INTERFACE_VERSION 0x0000000a @@ -934,6 +935,34 @@ struct xen_domctl_vcpu_msrs { }; typedef struct xen_domctl_vcpu_msrs xen_domctl_vcpu_msrs_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msrs_t); + +/* + * Use in XEN_DOMCTL_setvnumainfo to set + * vNUMA domain topology. + */ +struct xen_domctl_vnuma { + uint32_t nr_vnodes; + uint32_t nr_vmemranges; + uint32_t nr_vcpus; + uint32_t pad; + XEN_GUEST_HANDLE_64(uint) vdistance; + XEN_GUEST_HANDLE_64(uint) vcpu_to_vnode; + + /* + * vnodes to physical NUMA nodes mask. + * This kept on per-domain basis for + * interested consumers, such as numa aware ballooning. + */ + XEN_GUEST_HANDLE_64(uint) vnode_to_pnode; + + /* + * memory rages for each vNUMA node + */ + XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange; +}; +typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); + #endif struct xen_domctl { @@ -1008,6 +1037,7 @@ struct xen_domctl { #define XEN_DOMCTL_cacheflush 71 #define XEN_DOMCTL_get_vcpu_msrs 72 #define XEN_DOMCTL_set_vcpu_msrs 73 +#define XEN_DOMCTL_setvnumainfo 74 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1068,6 +1098,7 @@ struct xen_domctl { struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; + struct xen_domctl_vnuma vnuma; uint8_t pad[128]; } u; }; diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 2c57aa0..db961ec 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -521,9 +521,59 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); * The zero value is appropiate. */ +/* vNUMA node memory ranges */ +struct vmemrange { + uint64_t start, end; + unsigned int flags; + unsigned int nid; +}; + +typedef struct vmemrange vmemrange_t; +DEFINE_XEN_GUEST_HANDLE(vmemrange_t); + +/* + * vNUMA topology specifies vNUMA node number, distance table, + * memory ranges and vcpu mapping provided for guests. + * XENMEM_get_vnumainfo hypercall expects to see from guest + * nr_vnodes, nr_vmemranges and nr_vcpus to indicate available memory. + * After filling guests structures, nr_vnodes, nr_vmemranges and nr_vcpus + * copied back to guest. Domain returns expected values of nr_vnodes, + * nr_vmemranges and nr_vcpus to guest if the values where incorrect. + */ +struct vnuma_topology_info { + /* IN */ + domid_t domid; + uint16_t pad; + /* IN/OUT */ + unsigned int nr_vnodes; + unsigned int nr_vcpus; + unsigned int nr_vmemranges; + /* OUT */ + union { + XEN_GUEST_HANDLE(uint) h; + uint64_t pad; + } vdistance; + union { + XEN_GUEST_HANDLE(uint) h; + uint64_t pad; + } vcpu_to_vnode; + union { + XEN_GUEST_HANDLE(vmemrange_t) h; + uint64_t pad; + } vmemrange; +}; +typedef struct vnuma_topology_info vnuma_topology_info_t; +DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t); + +/* + * XENMEM_get_vnumainfo used by guest to get + * vNUMA topology from hypervisor. + */ +#define XENMEM_get_vnumainfo 26 + #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ -/* Next available subop number is 26 */ +/* Next available subop number is 27 */ #endif /* __XEN_PUBLIC_MEMORY_H__ */ diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index bb1c398..c5664c2 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -89,4 +89,16 @@ extern unsigned int xen_processor_pmbits; extern bool_t opt_dom0_vcpus_pin; +/* vnuma topology per domain. */ +struct vnuma_info { + unsigned int nr_vnodes; + unsigned int nr_vmemranges; + unsigned int *vdistance; + unsigned int *vcpu_to_vnode; + unsigned int *vnode_to_pnode; + struct vmemrange *vmemrange; +}; + +void vnuma_destroy(struct vnuma_info *vnuma); + #endif /* __XEN_DOMAIN_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 4575dda..c5157e6 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -452,6 +452,10 @@ struct domain nodemask_t node_affinity; unsigned int last_alloc_node; spinlock_t node_affinity_lock; + + /* vNUMA topology accesses are protected by rwlock. */ + rwlock_t vnuma_rwlock; + struct vnuma_info *vnuma; }; struct domain_setup_info -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6F-0000gj-7B; Sun, 07 Sep 2014 05:33:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6E-0000ge-Is for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:18 +0000 Received: from [193.109.254.147:25861] by server-16.bemta-14.messagelabs.com id 3E/B3-16990-D1EEB045; Sun, 07 Sep 2014 05:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1410067995!9302004!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29251 invoked from network); 7 Sep 2014 05:33:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6B-0001gr-20 for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6A-0004e1-Sk for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:14 +0000 Date: Sun, 07 Sep 2014 05:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: vnuma topology and subop hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9695014966b57c5ca004c7ec3154e7e30bdb0800 Author: Elena Ufimtseva AuthorDate: Fri Sep 5 11:00:57 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 11:00:57 2014 +0200 xen: vnuma topology and subop hypercalls Define interface, structures and hypercalls for toolstack to build vnuma topology and for guests that wish to retrieve it. Two subop hypercalls introduced by patch: XEN_DOMCTL_setvnumainfo to define vNUMA domain topology per domain and XENMEM_get_vnumainfo to retrieve that topology by guest. Signed-off-by: Elena Ufimtseva Reviewed-by: Jan Beulich --- xen/common/domain.c | 3 + xen/common/domctl.c | 135 +++++++++++++++++++++++++++++++++++++++++++ xen/common/memory.c | 124 +++++++++++++++++++++++++++++++++++++++ xen/include/public/domctl.h | 31 ++++++++++ xen/include/public/memory.h | 52 ++++++++++++++++- xen/include/xen/domain.h | 12 ++++ xen/include/xen/sched.h | 4 + 7 files changed, 360 insertions(+), 1 deletions(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index e6b4ae6..62514b0 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -280,6 +280,8 @@ struct domain *domain_create( spin_lock_init(&d->pbuf_lock); + rwlock_init(&d->vnuma_rwlock); + err = -ENOMEM; if ( !zalloc_cpumask_var(&d->domain_dirty_cpumask) ) goto fail; @@ -606,6 +608,7 @@ int domain_kill(struct domain *d) evtchn_destroy(d); gnttab_release_mappings(d); tmem_destroy(d->tmem_client); + vnuma_destroy(d->vnuma); domain_set_outstanding_pages(d, 0); d->tmem_client = NULL; /* fallthrough */ diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 80b7800..222b140 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -297,6 +297,120 @@ int vcpuaffinity_params_invalid(const xen_domctl_vcpuaffinity_t *vcpuaff) guest_handle_is_null(vcpuaff->cpumap_soft.bitmap)); } +void vnuma_destroy(struct vnuma_info *vnuma) +{ + if ( vnuma ) + { + xfree(vnuma->vmemrange); + xfree(vnuma->vcpu_to_vnode); + xfree(vnuma->vdistance); + xfree(vnuma->vnode_to_pnode); + xfree(vnuma); + } +} + +/* + * Allocates memory for vNUMA, **vnuma should be NULL. + * Caller has to make sure that domain has max_pages + * and number of vcpus set for domain. + * Verifies that single allocation does not exceed + * PAGE_SIZE. + */ +static struct vnuma_info *vnuma_alloc(unsigned int nr_vnodes, + unsigned int nr_ranges, + unsigned int nr_vcpus) +{ + + struct vnuma_info *vnuma; + + /* + * Check if any of the allocations are bigger than PAGE_SIZE. + * See XSA-77. + */ + if ( nr_vnodes * nr_vnodes > (PAGE_SIZE / sizeof(*vnuma->vdistance)) || + nr_ranges > (PAGE_SIZE / sizeof(*vnuma->vmemrange)) ) + return ERR_PTR(-EINVAL); + + /* + * If allocations become larger then PAGE_SIZE, these allocations + * should be split into PAGE_SIZE allocations due to XSA-77. + */ + vnuma = xmalloc(struct vnuma_info); + if ( !vnuma ) + return ERR_PTR(-ENOMEM); + + vnuma->vdistance = xmalloc_array(unsigned int, nr_vnodes * nr_vnodes); + vnuma->vcpu_to_vnode = xmalloc_array(unsigned int, nr_vcpus); + vnuma->vnode_to_pnode = xmalloc_array(unsigned int, nr_vnodes); + vnuma->vmemrange = xmalloc_array(vmemrange_t, nr_ranges); + + if ( vnuma->vdistance == NULL || vnuma->vmemrange == NULL || + vnuma->vcpu_to_vnode == NULL || vnuma->vnode_to_pnode == NULL ) + { + vnuma_destroy(vnuma); + return ERR_PTR(-ENOMEM); + } + + return vnuma; +} + +/* + * Construct vNUMA topology form uinfo. + */ +static struct vnuma_info *vnuma_init(const struct xen_domctl_vnuma *uinfo, + const struct domain *d) +{ + unsigned int i, nr_vnodes; + int ret = -EINVAL; + struct vnuma_info *info; + + nr_vnodes = uinfo->nr_vnodes; + + if ( nr_vnodes == 0 || uinfo->nr_vcpus != d->max_vcpus || uinfo->pad != 0 ) + return ERR_PTR(ret); + + info = vnuma_alloc(nr_vnodes, uinfo->nr_vmemranges, d->max_vcpus); + if ( IS_ERR(info) ) + return info; + + ret = -EFAULT; + + if ( copy_from_guest(info->vdistance, uinfo->vdistance, + nr_vnodes * nr_vnodes) ) + goto vnuma_fail; + + if ( copy_from_guest(info->vcpu_to_vnode, uinfo->vcpu_to_vnode, + d->max_vcpus) ) + goto vnuma_fail; + + if ( copy_from_guest(info->vnode_to_pnode, uinfo->vnode_to_pnode, + nr_vnodes) ) + goto vnuma_fail; + + if (copy_from_guest(info->vmemrange, uinfo->vmemrange, + uinfo->nr_vmemranges)) + goto vnuma_fail; + + info->nr_vnodes = nr_vnodes; + info->nr_vmemranges = uinfo->nr_vmemranges; + + /* Check that vmemranges flags are zero. */ + for ( i = 0; i < info->nr_vmemranges; i++ ) + { + if ( info->vmemrange[i].flags != 0 ) + { + ret = -EINVAL; + goto vnuma_fail; + } + } + + return info; + + vnuma_fail: + vnuma_destroy(info); + return ERR_PTR(ret); +} + long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) { long ret = 0; @@ -1033,6 +1147,27 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) } break; + case XEN_DOMCTL_setvnumainfo: + { + struct vnuma_info *vnuma; + + vnuma = vnuma_init(&op->u.vnuma, d); + if ( IS_ERR(vnuma) ) + { + ret = PTR_ERR(vnuma); + break; + } + + /* overwrite vnuma topology for domain. */ + write_lock(&d->vnuma_rwlock); + vnuma_destroy(d->vnuma); + d->vnuma = vnuma; + write_unlock(&d->vnuma_rwlock); + + ret = 0; + } + break; + default: ret = arch_do_domctl(op, d, u_domctl); break; diff --git a/xen/common/memory.c b/xen/common/memory.c index 2433111..81be69e 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -969,6 +969,130 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; + case XENMEM_get_vnumainfo: + { + struct vnuma_topology_info topology; + struct domain *d; + unsigned int dom_vnodes, dom_vranges, dom_vcpus; + struct vnuma_info tmp; + + /* + * Guest passes nr_vnodes, number of regions and nr_vcpus thus + * we know how much memory guest has allocated. + */ + if ( copy_from_guest(&topology, arg, 1 )) + return -EFAULT; + + if ( topology.pad != 0 ) + return -EINVAL; + + if ( (d = rcu_lock_domain_by_any_id(topology.domid)) == NULL ) + return -ESRCH; + + read_lock(&d->vnuma_rwlock); + + if ( d->vnuma == NULL ) + { + read_unlock(&d->vnuma_rwlock); + rcu_unlock_domain(d); + return -EOPNOTSUPP; + } + + dom_vnodes = d->vnuma->nr_vnodes; + dom_vranges = d->vnuma->nr_vmemranges; + dom_vcpus = d->max_vcpus; + + /* + * Copied from guest values may differ from domain vnuma config. + * Check here guest parameters make sure we dont overflow. + * Additionaly check padding. + */ + if ( topology.nr_vnodes < dom_vnodes || + topology.nr_vcpus < dom_vcpus || + topology.nr_vmemranges < dom_vranges ) + { + read_unlock(&d->vnuma_rwlock); + rcu_unlock_domain(d); + + topology.nr_vnodes = dom_vnodes; + topology.nr_vcpus = dom_vcpus; + topology.nr_vmemranges = dom_vranges; + + /* Copy back needed values. */ + return __copy_to_guest(arg, &topology, 1) ? -EFAULT : -ENOBUFS; + } + + read_unlock(&d->vnuma_rwlock); + + tmp.vdistance = xmalloc_array(unsigned int, dom_vnodes * dom_vnodes); + tmp.vmemrange = xmalloc_array(vmemrange_t, dom_vranges); + tmp.vcpu_to_vnode = xmalloc_array(unsigned int, dom_vcpus); + + if ( tmp.vdistance == NULL || + tmp.vmemrange == NULL || + tmp.vcpu_to_vnode == NULL ) + { + rc = -ENOMEM; + goto vnumainfo_out; + } + + /* + * Check if vnuma info has changed and if the allocated arrays + * are not big enough. + */ + read_lock(&d->vnuma_rwlock); + + if ( dom_vnodes < d->vnuma->nr_vnodes || + dom_vranges < d->vnuma->nr_vmemranges || + dom_vcpus < d->max_vcpus ) + { + read_unlock(&d->vnuma_rwlock); + rc = -EAGAIN; + goto vnumainfo_out; + } + + dom_vnodes = d->vnuma->nr_vnodes; + dom_vranges = d->vnuma->nr_vmemranges; + dom_vcpus = d->max_vcpus; + + memcpy(tmp.vmemrange, d->vnuma->vmemrange, + sizeof(*d->vnuma->vmemrange) * dom_vranges); + memcpy(tmp.vdistance, d->vnuma->vdistance, + sizeof(*d->vnuma->vdistance) * dom_vnodes * dom_vnodes); + memcpy(tmp.vcpu_to_vnode, d->vnuma->vcpu_to_vnode, + sizeof(*d->vnuma->vcpu_to_vnode) * dom_vcpus); + + read_unlock(&d->vnuma_rwlock); + + rc = -EFAULT; + + if ( copy_to_guest(topology.vmemrange.h, tmp.vmemrange, + dom_vranges) != 0 ) + goto vnumainfo_out; + + if ( copy_to_guest(topology.vdistance.h, tmp.vdistance, + dom_vnodes * dom_vnodes) != 0 ) + goto vnumainfo_out; + + if ( copy_to_guest(topology.vcpu_to_vnode.h, tmp.vcpu_to_vnode, + dom_vcpus) != 0 ) + goto vnumainfo_out; + + topology.nr_vnodes = dom_vnodes; + topology.nr_vcpus = dom_vcpus; + topology.nr_vmemranges = dom_vranges; + + rc = __copy_to_guest(arg, &topology, 1) ? -EFAULT : 0; + + vnumainfo_out: + rcu_unlock_domain(d); + + xfree(tmp.vdistance); + xfree(tmp.vmemrange); + xfree(tmp.vcpu_to_vnode); + break; + } + default: rc = arch_memory_op(cmd, arg); break; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 5b11bbf..07c4fd6 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -35,6 +35,7 @@ #include "xen.h" #include "grant_table.h" #include "hvm/save.h" +#include "memory.h" #define XEN_DOMCTL_INTERFACE_VERSION 0x0000000a @@ -934,6 +935,34 @@ struct xen_domctl_vcpu_msrs { }; typedef struct xen_domctl_vcpu_msrs xen_domctl_vcpu_msrs_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msrs_t); + +/* + * Use in XEN_DOMCTL_setvnumainfo to set + * vNUMA domain topology. + */ +struct xen_domctl_vnuma { + uint32_t nr_vnodes; + uint32_t nr_vmemranges; + uint32_t nr_vcpus; + uint32_t pad; + XEN_GUEST_HANDLE_64(uint) vdistance; + XEN_GUEST_HANDLE_64(uint) vcpu_to_vnode; + + /* + * vnodes to physical NUMA nodes mask. + * This kept on per-domain basis for + * interested consumers, such as numa aware ballooning. + */ + XEN_GUEST_HANDLE_64(uint) vnode_to_pnode; + + /* + * memory rages for each vNUMA node + */ + XEN_GUEST_HANDLE_64(vmemrange_t) vmemrange; +}; +typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); + #endif struct xen_domctl { @@ -1008,6 +1037,7 @@ struct xen_domctl { #define XEN_DOMCTL_cacheflush 71 #define XEN_DOMCTL_get_vcpu_msrs 72 #define XEN_DOMCTL_set_vcpu_msrs 73 +#define XEN_DOMCTL_setvnumainfo 74 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1068,6 +1098,7 @@ struct xen_domctl { struct xen_domctl_cacheflush cacheflush; struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; + struct xen_domctl_vnuma vnuma; uint8_t pad[128]; } u; }; diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 2c57aa0..db961ec 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -521,9 +521,59 @@ DEFINE_XEN_GUEST_HANDLE(xen_mem_sharing_op_t); * The zero value is appropiate. */ +/* vNUMA node memory ranges */ +struct vmemrange { + uint64_t start, end; + unsigned int flags; + unsigned int nid; +}; + +typedef struct vmemrange vmemrange_t; +DEFINE_XEN_GUEST_HANDLE(vmemrange_t); + +/* + * vNUMA topology specifies vNUMA node number, distance table, + * memory ranges and vcpu mapping provided for guests. + * XENMEM_get_vnumainfo hypercall expects to see from guest + * nr_vnodes, nr_vmemranges and nr_vcpus to indicate available memory. + * After filling guests structures, nr_vnodes, nr_vmemranges and nr_vcpus + * copied back to guest. Domain returns expected values of nr_vnodes, + * nr_vmemranges and nr_vcpus to guest if the values where incorrect. + */ +struct vnuma_topology_info { + /* IN */ + domid_t domid; + uint16_t pad; + /* IN/OUT */ + unsigned int nr_vnodes; + unsigned int nr_vcpus; + unsigned int nr_vmemranges; + /* OUT */ + union { + XEN_GUEST_HANDLE(uint) h; + uint64_t pad; + } vdistance; + union { + XEN_GUEST_HANDLE(uint) h; + uint64_t pad; + } vcpu_to_vnode; + union { + XEN_GUEST_HANDLE(vmemrange_t) h; + uint64_t pad; + } vmemrange; +}; +typedef struct vnuma_topology_info vnuma_topology_info_t; +DEFINE_XEN_GUEST_HANDLE(vnuma_topology_info_t); + +/* + * XENMEM_get_vnumainfo used by guest to get + * vNUMA topology from hypervisor. + */ +#define XENMEM_get_vnumainfo 26 + #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ -/* Next available subop number is 26 */ +/* Next available subop number is 27 */ #endif /* __XEN_PUBLIC_MEMORY_H__ */ diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index bb1c398..c5664c2 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -89,4 +89,16 @@ extern unsigned int xen_processor_pmbits; extern bool_t opt_dom0_vcpus_pin; +/* vnuma topology per domain. */ +struct vnuma_info { + unsigned int nr_vnodes; + unsigned int nr_vmemranges; + unsigned int *vdistance; + unsigned int *vcpu_to_vnode; + unsigned int *vnode_to_pnode; + struct vmemrange *vmemrange; +}; + +void vnuma_destroy(struct vnuma_info *vnuma); + #endif /* __XEN_DOMAIN_H__ */ diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 4575dda..c5157e6 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -452,6 +452,10 @@ struct domain nodemask_t node_affinity; unsigned int last_alloc_node; spinlock_t node_affinity_lock; + + /* vNUMA topology accesses are protected by rwlock. */ + rwlock_t vnuma_rwlock; + struct vnuma_info *vnuma; }; struct domain_setup_info -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV68-0000gW-4Y; Sun, 07 Sep 2014 05:33:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV67-0000gO-Kj for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:11 +0000 Received: from [85.158.137.68:23188] by server-12.bemta-3.messagelabs.com id EB/C1-01574-31EEB045; Sun, 07 Sep 2014 05:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1410067984!12824353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15181 invoked from network); 7 Sep 2014 05:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV60-0001go-Kp for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV60-0004ct-4g for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:04 +0000 Date: Sun, 07 Sep 2014 05:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: remove redundancy of MSR_P6_{PERFCTR, EVNTSEL} definitions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f4b3c45a64bfc55130d52688c9694fac6a554309 Author: Jan Beulich AuthorDate: Fri Sep 5 10:58:00 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 10:58:00 2014 +0200 x86: remove redundancy of MSR_P6_{PERFCTR,EVNTSEL} definitions Not only did the EVNTSEL ones get defined twice, we can also easily abstract out the numbers previously attached to them. While at it also remove an unused Geode-related define. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vpmu_core2.c | 20 ++++++++++---------- xen/arch/x86/nmi.c | 16 ++++++++-------- xen/arch/x86/oprofile/op_model_ppro.c | 10 +++++----- xen/include/asm-x86/msr-index.h | 12 ++---------- 4 files changed, 25 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vpmu_core2.c b/xen/arch/x86/hvm/vmx/vpmu_core2.c index 56f5059..68b6272 100644 --- a/xen/arch/x86/hvm/vmx/vpmu_core2.c +++ b/xen/arch/x86/hvm/vmx/vpmu_core2.c @@ -105,9 +105,9 @@ static void handle_pmc_quirk(u64 msr_content) if ( val & 0x1 ) { u64 cnt; - rdmsrl(MSR_P6_PERFCTR0 + i, cnt); + rdmsrl(MSR_P6_PERFCTR(i), cnt); if ( cnt == 0 ) - wrmsrl(MSR_P6_PERFCTR0 + i, 1); + wrmsrl(MSR_P6_PERFCTR(i), 1); } val >>= 1; } @@ -238,11 +238,11 @@ static int is_core2_vpmu_msr(u32 msr_index, int *type, int *index) return 1; } - if ( (msr_index >= MSR_P6_EVNTSEL0) && - (msr_index < (MSR_P6_EVNTSEL0 + core2_get_pmc_count())) ) + if ( (msr_index >= MSR_P6_EVNTSEL(0)) && + (msr_index < (MSR_P6_EVNTSEL(core2_get_pmc_count()))) ) { *type = MSR_TYPE_ARCH_CTRL; - *index = msr_index - MSR_P6_EVNTSEL0; + *index = msr_index - MSR_P6_EVNTSEL(0); return 1; } @@ -278,7 +278,7 @@ static void core2_vpmu_set_msr_bitmap(unsigned long *msr_bitmap) for ( i = 0; i < core2_ctrls.num; i++ ) clear_bit(msraddr_to_bitpos(core2_ctrls.msr[i]), msr_bitmap); for ( i = 0; i < core2_get_pmc_count(); i++ ) - clear_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL0+i), msr_bitmap); + clear_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL(i)), msr_bitmap); } static void core2_vpmu_unset_msr_bitmap(unsigned long *msr_bitmap) @@ -308,7 +308,7 @@ static void core2_vpmu_unset_msr_bitmap(unsigned long *msr_bitmap) for ( i = 0; i < core2_ctrls.num; i++ ) set_bit(msraddr_to_bitpos(core2_ctrls.msr[i]), msr_bitmap); for ( i = 0; i < core2_get_pmc_count(); i++ ) - set_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL0+i), msr_bitmap); + set_bit(msraddr_to_bitpos(MSR_P6_EVNTSEL(i)), msr_bitmap); } static inline void __core2_vpmu_save(struct vcpu *v) @@ -359,7 +359,7 @@ static inline void __core2_vpmu_load(struct vcpu *v) for ( i = 0; i < core2_ctrls.num; i++ ) wrmsrl(core2_ctrls.msr[i], core2_vpmu_cxt->ctrls[i]); for ( i = 0; i < core2_get_pmc_count(); i++ ) - wrmsrl(MSR_P6_EVNTSEL0+i, core2_vpmu_cxt->arch_msr_pair[i].control); + wrmsrl(MSR_P6_EVNTSEL(i), core2_vpmu_cxt->arch_msr_pair[i].control); } static void core2_vpmu_load(struct vcpu *v) @@ -526,7 +526,7 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, global_ctrl = msr_content; for ( i = 0; i < core2_get_pmc_count(); i++ ) { - rdmsrl(MSR_P6_EVNTSEL0+i, non_global_ctrl); + rdmsrl(MSR_P6_EVNTSEL(i), non_global_ctrl); core2_vpmu_cxt->pmu_enable->arch_pmc_enable[i] = global_ctrl & (non_global_ctrl >> 22) & 1; global_ctrl >>= 1; @@ -555,7 +555,7 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, } break; default: - tmp = msr - MSR_P6_EVNTSEL0; + tmp = msr - MSR_P6_EVNTSEL(0); vmx_read_guest_msr(MSR_CORE_PERF_GLOBAL_CTRL, &global_ctrl); if ( tmp >= 0 && tmp < core2_get_pmc_count() ) core2_vpmu_cxt->pmu_enable->arch_pmc_enable[tmp] = diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index f8f5e4a..98c1e15 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -205,7 +205,7 @@ void disable_lapic_nmi_watchdog(void) case X86_VENDOR_INTEL: switch (boot_cpu_data.x86) { case 6: - wrmsr(MSR_P6_EVNTSEL0, 0, 0); + wrmsr(MSR_P6_EVNTSEL(0), 0, 0); break; case 15: wrmsr(MSR_P4_IQ_CCCR0, 0, 0); @@ -304,21 +304,21 @@ static void __pminit setup_p6_watchdog(unsigned counter) { unsigned int evntsel; - nmi_perfctr_msr = MSR_P6_PERFCTR0; + nmi_perfctr_msr = MSR_P6_PERFCTR(0); - clear_msr_range(MSR_P6_EVNTSEL0, 2); - clear_msr_range(MSR_P6_PERFCTR0, 2); + clear_msr_range(MSR_P6_EVNTSEL(0), 2); + clear_msr_range(MSR_P6_PERFCTR(0), 2); evntsel = P6_EVNTSEL_INT | P6_EVNTSEL_OS | P6_EVNTSEL_USR | counter; - wrmsr(MSR_P6_EVNTSEL0, evntsel, 0); + wrmsr(MSR_P6_EVNTSEL(0), evntsel, 0); write_watchdog_counter("P6_PERFCTR0"); apic_write(APIC_LVTPC, APIC_DM_NMI); evntsel |= P6_EVNTSEL0_ENABLE; - wrmsr(MSR_P6_EVNTSEL0, evntsel, 0); + wrmsr(MSR_P6_EVNTSEL(0), evntsel, 0); } static int __pminit setup_p4_watchdog(void) @@ -508,9 +508,9 @@ bool_t nmi_watchdog_tick(const struct cpu_user_regs *regs) wrmsrl(MSR_P4_IQ_CCCR0, nmi_p4_cccr_val); apic_write(APIC_LVTPC, APIC_DM_NMI); } - else if ( nmi_perfctr_msr == MSR_P6_PERFCTR0 ) + else if ( nmi_perfctr_msr == MSR_P6_PERFCTR(0) ) { - rdmsrl(MSR_P6_PERFCTR0, msr_content); + rdmsrl(MSR_P6_PERFCTR(0), msr_content); if ( msr_content & (1ULL << P6_EVENT_WIDTH) ) watchdog_tick = 0; diff --git a/xen/arch/x86/oprofile/op_model_ppro.c b/xen/arch/x86/oprofile/op_model_ppro.c index 8b9f3f6..aa99e4d 100644 --- a/xen/arch/x86/oprofile/op_model_ppro.c +++ b/xen/arch/x86/oprofile/op_model_ppro.c @@ -64,9 +64,9 @@ static void ppro_fill_in_addresses(struct op_msrs * const msrs) int i; for (i = 0; i < num_counters; i++) - msrs->counters[i].addr = MSR_P6_PERFCTR0 + i; + msrs->counters[i].addr = MSR_P6_PERFCTR(i); for (i = 0; i < num_counters; i++) - msrs->controls[i].addr = MSR_P6_EVNTSEL0 + i; + msrs->controls[i].addr = MSR_P6_EVNTSEL(i); } @@ -211,11 +211,11 @@ static int ppro_is_arch_pmu_msr(u64 msr_index, int *type, int *index) *index = msr_index - MSR_IA32_PERFCTR0; return 1; } - if ( (msr_index >= MSR_P6_EVNTSEL0) && - (msr_index < (MSR_P6_EVNTSEL0 + num_counters)) ) + if ( (msr_index >= MSR_P6_EVNTSEL(0)) && + (msr_index < (MSR_P6_EVNTSEL(num_counters))) ) { *type = MSR_TYPE_ARCH_CTRL; - *index = msr_index - MSR_P6_EVNTSEL0; + *index = msr_index - MSR_P6_EVNTSEL(0); return 1; } diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index da732b7..2056501 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -112,11 +112,6 @@ #define MSR_AMD64_MCx_MASK(x) (MSR_AMD64_MC0_MASK + (x)) -#define MSR_P6_PERFCTR0 0x000000c1 -#define MSR_P6_PERFCTR1 0x000000c2 -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 - /* MSRs & bits used for VMX enabling */ #define MSR_IA32_VMX_BASIC 0x480 #define MSR_IA32_VMX_PINBASED_CTLS 0x481 @@ -329,8 +324,8 @@ #define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 /* Intel Model 6 */ -#define MSR_P6_EVNTSEL0 0x00000186 -#define MSR_P6_EVNTSEL1 0x00000187 +#define MSR_P6_PERFCTR(n) (0x000000c1 + (n)) +#define MSR_P6_EVNTSEL(n) (0x00000186 + (n)) /* P4/Xeon+ specific */ #define MSR_IA32_MCG_EAX 0x00000180 @@ -488,7 +483,4 @@ #define _MSR_MISC_FEATURES_CPUID_FAULTING 0 #define MSR_MISC_FEATURES_CPUID_FAULTING (1ULL << _MSR_MISC_FEATURES_CPUID_FAULTING) -/* Geode defined MSRs */ -#define MSR_GEODE_BUSCONT_CONF0 0x00001900 - #endif /* __ASM_MSR_INDEX_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6Q-0000iF-9z; Sun, 07 Sep 2014 05:33:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6P-0000i1-7E for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:29 +0000 Received: from [85.158.139.211:34201] by server-14.bemta-5.messagelabs.com id 40/64-12422-82EEB045; Sun, 07 Sep 2014 05:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1410068005!12935173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.5 required=7.0 tests=BODY_RANDOM_LONG,LONGWORDS X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4308 invoked from network); 7 Sep 2014 05:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6L-0001h0-Cf for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6L-0004eN-9U for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:25 +0000 Date: Sun, 07 Sep 2014 05:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm bits for vNUMA hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40c7af684fc0bf89c7b643a5492b4abd920fba86 Author: Elena Ufimtseva AuthorDate: Fri Sep 5 11:01:45 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 11:01:45 2014 +0200 xsm bits for vNUMA hypercalls Define xsm_get_vnumainfo hypercall used for domain which wish to receive vnuma topology. Add xsm hook for XEN_DOMCTL_setvnumainfo. Also adds basic policies. Signed-off-by: Elena Ufimtseva Acked-by: Daniel De Graaf --- tools/flask/policy/policy/modules/xen/xen.if | 3 ++- tools/flask/policy/policy/modules/xen/xen.te | 2 +- xen/common/memory.c | 7 +++++++ xen/include/xsm/dummy.h | 6 ++++++ xen/include/xsm/xsm.h | 7 +++++++ xen/xsm/dummy.c | 1 + xen/xsm/flask/hooks.c | 10 ++++++++++ xen/xsm/flask/policy/access_vectors | 4 ++++ 8 files changed, 38 insertions(+), 2 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index dedc035..32b51b6 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -49,7 +49,7 @@ define(`create_domain_common', ` getdomaininfo hypercall setvcpucontext setextvcpucontext getscheduler getvcpuinfo getvcpuextstate getaddrsize getaffinity setaffinity }; - allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn }; + allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo }; allow $1 $2:security check_context; allow $1 $2:shadow enable; allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op }; @@ -81,6 +81,7 @@ define(`manage_domain', ` allow $1 $2:domain { getdomaininfo getvcpuinfo getaffinity getaddrsize pause unpause trigger shutdown destroy setaffinity setdomainmaxmem getscheduler }; + allow $1 $2:domain2 set_vnumainfo; ') # migrate_domain_out(priv, target) diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index bb59fe8..1937883 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -76,7 +76,7 @@ allow dom0_t dom0_t:domain { getpodtarget setpodtarget set_misc_info set_virq_handler }; allow dom0_t dom0_t:domain2 { - set_cpuid gettsc settsc setscheduler set_max_evtchn + set_cpuid gettsc settsc setscheduler set_max_evtchn set_vnumainfo get_vnumainfo }; allow dom0_t dom0_t:resource { add remove }; diff --git a/xen/common/memory.c b/xen/common/memory.c index 81be69e..031672a 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -989,6 +989,13 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( (d = rcu_lock_domain_by_any_id(topology.domid)) == NULL ) return -ESRCH; + rc = xsm_get_vnumainfo(XSM_TARGET, d); + if ( rc ) + { + rcu_unlock_domain(d); + return rc; + } + read_lock(&d->vnuma_rwlock); if ( d->vnuma == NULL ) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index c5aa316..df55e70 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -317,6 +317,12 @@ static XSM_INLINE int xsm_set_pod_target(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } +static XSM_INLINE int xsm_get_vnumainfo(XSM_DEFAULT_ARG struct domain *d) +{ + XSM_ASSERT_ACTION(XSM_TARGET); + return xsm_default_action(action, current->domain, d); +} + #if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index a85045d..6c1c079 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -139,6 +139,7 @@ struct xsm_operations { int (*hvm_param) (struct domain *d, unsigned long op); int (*hvm_control) (struct domain *d, unsigned long op); int (*hvm_param_nested) (struct domain *d); + int (*get_vnumainfo) (struct domain *d); #ifdef CONFIG_X86 int (*do_mca) (void); @@ -534,6 +535,11 @@ static inline int xsm_hvm_param_nested (xsm_default_t def, struct domain *d) return xsm_ops->hvm_param_nested(d); } +static inline int xsm_get_vnumainfo (xsm_default_t def, struct domain *d) +{ + return xsm_ops->get_vnumainfo(d); +} + #ifdef CONFIG_X86 static inline int xsm_do_mca(xsm_default_t def) { @@ -653,6 +659,7 @@ static inline int xsm_ioport_mapping (xsm_default_t def, struct domain *d, uint3 { return xsm_ops->ioport_mapping(d, s, e, allow); } + #endif /* CONFIG_X86 */ #endif /* XSM_NO_WRAPPERS */ diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index c95c803..0826a8b 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -85,6 +85,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, iomem_permission); set_to_dummy_if_null(ops, iomem_mapping); set_to_dummy_if_null(ops, pci_config_permission); + set_to_dummy_if_null(ops, get_vnumainfo); #if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) set_to_dummy_if_null(ops, get_device_group); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index f2f59ea..00efba1 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -404,6 +404,11 @@ static int flask_claim_pages(struct domain *d) return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SETCLAIM); } +static int flask_get_vnumainfo(struct domain *d) +{ + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__GET_VNUMAINFO); +} + static int flask_console_io(struct domain *d, int cmd) { u32 perm; @@ -715,6 +720,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_cacheflush: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CACHEFLUSH); + case XEN_DOMCTL_setvnumainfo: + return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN2__SET_VNUMAINFO); + default: printk("flask_domctl: Unknown op %d\n", cmd); return -EPERM; @@ -1552,6 +1560,8 @@ static struct xsm_operations flask_ops = { .hvm_param_nested = flask_hvm_param_nested, .do_xsm_op = do_flask_op, + .get_vnumainfo = flask_get_vnumainfo, + #ifdef CONFIG_COMPAT .do_compat_op = compat_flask_op, #endif diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 32371a9..d279841 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -200,6 +200,10 @@ class domain2 cacheflush # Creation of the hardware domain when it is not dom0 create_hardware_domain +# XEN_DOMCTL_setvnumainfo + set_vnumainfo +# XENMEM_getvnumainfo + get_vnumainfo } # Similar to class domain, but primarily contains domctls related to HVM domains -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6Q-0000iF-9z; Sun, 07 Sep 2014 05:33:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6P-0000i1-7E for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:29 +0000 Received: from [85.158.139.211:34201] by server-14.bemta-5.messagelabs.com id 40/64-12422-82EEB045; Sun, 07 Sep 2014 05:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1410068005!12935173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=2.5 required=7.0 tests=BODY_RANDOM_LONG,LONGWORDS X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4308 invoked from network); 7 Sep 2014 05:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6L-0001h0-Cf for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6L-0004eN-9U for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:25 +0000 Date: Sun, 07 Sep 2014 05:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm bits for vNUMA hypercalls X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40c7af684fc0bf89c7b643a5492b4abd920fba86 Author: Elena Ufimtseva AuthorDate: Fri Sep 5 11:01:45 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 11:01:45 2014 +0200 xsm bits for vNUMA hypercalls Define xsm_get_vnumainfo hypercall used for domain which wish to receive vnuma topology. Add xsm hook for XEN_DOMCTL_setvnumainfo. Also adds basic policies. Signed-off-by: Elena Ufimtseva Acked-by: Daniel De Graaf --- tools/flask/policy/policy/modules/xen/xen.if | 3 ++- tools/flask/policy/policy/modules/xen/xen.te | 2 +- xen/common/memory.c | 7 +++++++ xen/include/xsm/dummy.h | 6 ++++++ xen/include/xsm/xsm.h | 7 +++++++ xen/xsm/dummy.c | 1 + xen/xsm/flask/hooks.c | 10 ++++++++++ xen/xsm/flask/policy/access_vectors | 4 ++++ 8 files changed, 38 insertions(+), 2 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index dedc035..32b51b6 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -49,7 +49,7 @@ define(`create_domain_common', ` getdomaininfo hypercall setvcpucontext setextvcpucontext getscheduler getvcpuinfo getvcpuextstate getaddrsize getaffinity setaffinity }; - allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn }; + allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo }; allow $1 $2:security check_context; allow $1 $2:shadow enable; allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op }; @@ -81,6 +81,7 @@ define(`manage_domain', ` allow $1 $2:domain { getdomaininfo getvcpuinfo getaffinity getaddrsize pause unpause trigger shutdown destroy setaffinity setdomainmaxmem getscheduler }; + allow $1 $2:domain2 set_vnumainfo; ') # migrate_domain_out(priv, target) diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index bb59fe8..1937883 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -76,7 +76,7 @@ allow dom0_t dom0_t:domain { getpodtarget setpodtarget set_misc_info set_virq_handler }; allow dom0_t dom0_t:domain2 { - set_cpuid gettsc settsc setscheduler set_max_evtchn + set_cpuid gettsc settsc setscheduler set_max_evtchn set_vnumainfo get_vnumainfo }; allow dom0_t dom0_t:resource { add remove }; diff --git a/xen/common/memory.c b/xen/common/memory.c index 81be69e..031672a 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -989,6 +989,13 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( (d = rcu_lock_domain_by_any_id(topology.domid)) == NULL ) return -ESRCH; + rc = xsm_get_vnumainfo(XSM_TARGET, d); + if ( rc ) + { + rcu_unlock_domain(d); + return rc; + } + read_lock(&d->vnuma_rwlock); if ( d->vnuma == NULL ) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index c5aa316..df55e70 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -317,6 +317,12 @@ static XSM_INLINE int xsm_set_pod_target(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } +static XSM_INLINE int xsm_get_vnumainfo(XSM_DEFAULT_ARG struct domain *d) +{ + XSM_ASSERT_ACTION(XSM_TARGET); + return xsm_default_action(action, current->domain, d); +} + #if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index a85045d..6c1c079 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -139,6 +139,7 @@ struct xsm_operations { int (*hvm_param) (struct domain *d, unsigned long op); int (*hvm_control) (struct domain *d, unsigned long op); int (*hvm_param_nested) (struct domain *d); + int (*get_vnumainfo) (struct domain *d); #ifdef CONFIG_X86 int (*do_mca) (void); @@ -534,6 +535,11 @@ static inline int xsm_hvm_param_nested (xsm_default_t def, struct domain *d) return xsm_ops->hvm_param_nested(d); } +static inline int xsm_get_vnumainfo (xsm_default_t def, struct domain *d) +{ + return xsm_ops->get_vnumainfo(d); +} + #ifdef CONFIG_X86 static inline int xsm_do_mca(xsm_default_t def) { @@ -653,6 +659,7 @@ static inline int xsm_ioport_mapping (xsm_default_t def, struct domain *d, uint3 { return xsm_ops->ioport_mapping(d, s, e, allow); } + #endif /* CONFIG_X86 */ #endif /* XSM_NO_WRAPPERS */ diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index c95c803..0826a8b 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -85,6 +85,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, iomem_permission); set_to_dummy_if_null(ops, iomem_mapping); set_to_dummy_if_null(ops, pci_config_permission); + set_to_dummy_if_null(ops, get_vnumainfo); #if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) set_to_dummy_if_null(ops, get_device_group); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index f2f59ea..00efba1 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -404,6 +404,11 @@ static int flask_claim_pages(struct domain *d) return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SETCLAIM); } +static int flask_get_vnumainfo(struct domain *d) +{ + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__GET_VNUMAINFO); +} + static int flask_console_io(struct domain *d, int cmd) { u32 perm; @@ -715,6 +720,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_cacheflush: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__CACHEFLUSH); + case XEN_DOMCTL_setvnumainfo: + return current_has_perm(d, SECCLASS_DOMAIN, DOMAIN2__SET_VNUMAINFO); + default: printk("flask_domctl: Unknown op %d\n", cmd); return -EPERM; @@ -1552,6 +1560,8 @@ static struct xsm_operations flask_ops = { .hvm_param_nested = flask_hvm_param_nested, .do_xsm_op = do_flask_op, + .get_vnumainfo = flask_get_vnumainfo, + #ifdef CONFIG_COMPAT .do_compat_op = compat_flask_op, #endif diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index 32371a9..d279841 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -200,6 +200,10 @@ class domain2 cacheflush # Creation of the hardware domain when it is not dom0 create_hardware_domain +# XEN_DOMCTL_setvnumainfo + set_vnumainfo +# XENMEM_getvnumainfo + get_vnumainfo } # Similar to class domain, but primarily contains domctls related to HVM domains -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6Z-0000jq-Ee; Sun, 07 Sep 2014 05:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6Y-0000jf-O7 for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:38 +0000 Received: from [85.158.139.211:15131] by server-16.bemta-5.messagelabs.com id 89/30-01029-13EEB045; Sun, 07 Sep 2014 05:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1410068015!12935183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4453 invoked from network); 7 Sep 2014 05:33:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6V-0001h8-NI for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6V-0004en-Id for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:35 +0000 Date: Sun, 07 Sep 2014 05:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Introduce xc_domain_setvnuma to set vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6b6884ec577a59281e4953f27a2376363012151 Author: Elena Ufimtseva AuthorDate: Fri Sep 5 11:02:22 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 11:02:22 2014 +0200 libxc: Introduce xc_domain_setvnuma to set vNUMA With the introduction of the XEN_DOMCTL_setvnumainfo in patch titled: "xen: vnuma topology and subop hypercalls" we put in the plumbing here to use from the toolstack. The user is allowed to call this multiple times if they wish so. It will error out if the nr_vnodes or nr_vcpus is zero. Signed-off-by: Elena Ufimtseva Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 10 +++++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 1eba393..1a6f90a 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2134,6 +2134,74 @@ int xc_domain_set_max_evtchn(xc_interface *xch, uint32_t domid, return do_domctl(xch, &domctl); } +/* Plumbing Xen with vNUMA topology */ +int xc_domain_setvnuma(xc_interface *xch, + uint32_t domid, + uint32_t nr_vnodes, + uint32_t nr_vmemranges, + uint32_t nr_vcpus, + vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode, + unsigned int *vnode_to_pnode) +{ + int rc; + DECLARE_DOMCTL; + DECLARE_HYPERCALL_BOUNCE(vmemrange, sizeof(*vmemrange) * nr_vmemranges, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(vdistance, sizeof(*vdistance) * + nr_vnodes * nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(vcpu_to_vnode, sizeof(*vcpu_to_vnode) * nr_vcpus, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(vnode_to_pnode, sizeof(*vnode_to_pnode) * + nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + errno = EINVAL; + + if ( nr_vnodes == 0 || nr_vmemranges == 0 || + nr_vmemranges < nr_vnodes || nr_vcpus == 0 ) + return -1; + + if ( !vdistance || !vcpu_to_vnode || !vmemrange || !vnode_to_pnode ) + { + PERROR("%s: Cant set vnuma without initializing topology", __func__); + return -1; + } + + if ( xc_hypercall_bounce_pre(xch, vmemrange) || + xc_hypercall_bounce_pre(xch, vdistance) || + xc_hypercall_bounce_pre(xch, vcpu_to_vnode) || + xc_hypercall_bounce_pre(xch, vnode_to_pnode) ) + { + rc = -1; + goto vnumaset_fail; + + } + + set_xen_guest_handle(domctl.u.vnuma.vmemrange, vmemrange); + set_xen_guest_handle(domctl.u.vnuma.vdistance, vdistance); + set_xen_guest_handle(domctl.u.vnuma.vcpu_to_vnode, vcpu_to_vnode); + set_xen_guest_handle(domctl.u.vnuma.vnode_to_pnode, vnode_to_pnode); + + domctl.cmd = XEN_DOMCTL_setvnumainfo; + domctl.domain = (domid_t)domid; + domctl.u.vnuma.nr_vnodes = nr_vnodes; + domctl.u.vnuma.nr_vmemranges = nr_vmemranges; + domctl.u.vnuma.nr_vcpus = nr_vcpus; + domctl.u.vnuma.pad = 0; + + rc = do_domctl(xch, &domctl); + + vnumaset_fail: + xc_hypercall_bounce_post(xch, vmemrange); + xc_hypercall_bounce_post(xch, vdistance); + xc_hypercall_bounce_post(xch, vcpu_to_vnode); + xc_hypercall_bounce_post(xch, vnode_to_pnode); + + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 1c5d0db..1c8aa42 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1245,6 +1245,16 @@ int xc_domain_set_memmap_limit(xc_interface *xch, uint32_t domid, unsigned long map_limitkb); +int xc_domain_setvnuma(xc_interface *xch, + uint32_t domid, + uint32_t nr_vnodes, + uint32_t nr_regions, + uint32_t nr_vcpus, + vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode, + unsigned int *vnode_to_pnode); + #if defined(__i386__) || defined(__x86_64__) /* * PC BIOS standard E820 types and structure. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6Z-0000jq-Ee; Sun, 07 Sep 2014 05:33:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6Y-0000jf-O7 for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:38 +0000 Received: from [85.158.139.211:15131] by server-16.bemta-5.messagelabs.com id 89/30-01029-13EEB045; Sun, 07 Sep 2014 05:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1410068015!12935183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4453 invoked from network); 7 Sep 2014 05:33:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 7 Sep 2014 05:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6V-0001h8-NI for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6V-0004en-Id for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:35 +0000 Date: Sun, 07 Sep 2014 05:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: Introduce xc_domain_setvnuma to set vNUMA X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6b6884ec577a59281e4953f27a2376363012151 Author: Elena Ufimtseva AuthorDate: Fri Sep 5 11:02:22 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 11:02:22 2014 +0200 libxc: Introduce xc_domain_setvnuma to set vNUMA With the introduction of the XEN_DOMCTL_setvnumainfo in patch titled: "xen: vnuma topology and subop hypercalls" we put in the plumbing here to use from the toolstack. The user is allowed to call this multiple times if they wish so. It will error out if the nr_vnodes or nr_vcpus is zero. Signed-off-by: Elena Ufimtseva Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Ian Campbell --- tools/libxc/xc_domain.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 10 +++++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 1eba393..1a6f90a 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -2134,6 +2134,74 @@ int xc_domain_set_max_evtchn(xc_interface *xch, uint32_t domid, return do_domctl(xch, &domctl); } +/* Plumbing Xen with vNUMA topology */ +int xc_domain_setvnuma(xc_interface *xch, + uint32_t domid, + uint32_t nr_vnodes, + uint32_t nr_vmemranges, + uint32_t nr_vcpus, + vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode, + unsigned int *vnode_to_pnode) +{ + int rc; + DECLARE_DOMCTL; + DECLARE_HYPERCALL_BOUNCE(vmemrange, sizeof(*vmemrange) * nr_vmemranges, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(vdistance, sizeof(*vdistance) * + nr_vnodes * nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(vcpu_to_vnode, sizeof(*vcpu_to_vnode) * nr_vcpus, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + DECLARE_HYPERCALL_BOUNCE(vnode_to_pnode, sizeof(*vnode_to_pnode) * + nr_vnodes, + XC_HYPERCALL_BUFFER_BOUNCE_BOTH); + errno = EINVAL; + + if ( nr_vnodes == 0 || nr_vmemranges == 0 || + nr_vmemranges < nr_vnodes || nr_vcpus == 0 ) + return -1; + + if ( !vdistance || !vcpu_to_vnode || !vmemrange || !vnode_to_pnode ) + { + PERROR("%s: Cant set vnuma without initializing topology", __func__); + return -1; + } + + if ( xc_hypercall_bounce_pre(xch, vmemrange) || + xc_hypercall_bounce_pre(xch, vdistance) || + xc_hypercall_bounce_pre(xch, vcpu_to_vnode) || + xc_hypercall_bounce_pre(xch, vnode_to_pnode) ) + { + rc = -1; + goto vnumaset_fail; + + } + + set_xen_guest_handle(domctl.u.vnuma.vmemrange, vmemrange); + set_xen_guest_handle(domctl.u.vnuma.vdistance, vdistance); + set_xen_guest_handle(domctl.u.vnuma.vcpu_to_vnode, vcpu_to_vnode); + set_xen_guest_handle(domctl.u.vnuma.vnode_to_pnode, vnode_to_pnode); + + domctl.cmd = XEN_DOMCTL_setvnumainfo; + domctl.domain = (domid_t)domid; + domctl.u.vnuma.nr_vnodes = nr_vnodes; + domctl.u.vnuma.nr_vmemranges = nr_vmemranges; + domctl.u.vnuma.nr_vcpus = nr_vcpus; + domctl.u.vnuma.pad = 0; + + rc = do_domctl(xch, &domctl); + + vnumaset_fail: + xc_hypercall_bounce_post(xch, vmemrange); + xc_hypercall_bounce_post(xch, vdistance); + xc_hypercall_bounce_post(xch, vcpu_to_vnode); + xc_hypercall_bounce_post(xch, vnode_to_pnode); + + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 1c5d0db..1c8aa42 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -1245,6 +1245,16 @@ int xc_domain_set_memmap_limit(xc_interface *xch, uint32_t domid, unsigned long map_limitkb); +int xc_domain_setvnuma(xc_interface *xch, + uint32_t domid, + uint32_t nr_vnodes, + uint32_t nr_regions, + uint32_t nr_vcpus, + vmemrange_t *vmemrange, + unsigned int *vdistance, + unsigned int *vcpu_to_vnode, + unsigned int *vnode_to_pnode); + #if defined(__i386__) || defined(__x86_64__) /* * PC BIOS standard E820 types and structure. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6j-0000ld-HD; Sun, 07 Sep 2014 05:33:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6i-0000lJ-DX for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:48 +0000 Received: from [193.109.254.147:26465] by server-7.bemta-14.messagelabs.com id 74/14-13362-B3EEB045; Sun, 07 Sep 2014 05:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1410068026!8532695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.9 required=7.0 tests=SUBJ_HAS_UNIQ_ID X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17257 invoked from network); 7 Sep 2014 05:33:47 -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; 7 Sep 2014 05:33:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6f-0001hE-TG for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6f-0004fA-R1 for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:45 +0000 Date: Sun, 07 Sep 2014 05:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vNUMA: fix build on ARM after commit 9695014966 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93d5f192d4903953baa8c2115534d23140236176 Author: Jan Beulich AuthorDate: Fri Sep 5 15:02:28 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 15:02:28 2014 +0200 vNUMA: fix build on ARM after commit 9695014966 The new domctl isn't really x86-specific. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Tested-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/include/public/domctl.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 07c4fd6..69a8b44 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -935,6 +935,7 @@ struct xen_domctl_vcpu_msrs { }; typedef struct xen_domctl_vcpu_msrs xen_domctl_vcpu_msrs_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msrs_t); +#endif /* * Use in XEN_DOMCTL_setvnumainfo to set @@ -963,8 +964,6 @@ struct xen_domctl_vnuma { typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); -#endif - struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 07 05:33:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 07 Sep 2014 05:33:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6j-0000ld-HD; Sun, 07 Sep 2014 05:33:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6i-0000lJ-DX for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:48 +0000 Received: from [193.109.254.147:26465] by server-7.bemta-14.messagelabs.com id 74/14-13362-B3EEB045; Sun, 07 Sep 2014 05:33:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1410068026!8532695!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.9 required=7.0 tests=SUBJ_HAS_UNIQ_ID X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17257 invoked from network); 7 Sep 2014 05:33:47 -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; 7 Sep 2014 05:33:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XQV6f-0001hE-TG for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XQV6f-0004fA-R1 for xen-changelog@lists.xensource.com; Sun, 07 Sep 2014 05:33:45 +0000 Date: Sun, 07 Sep 2014 05:33:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vNUMA: fix build on ARM after commit 9695014966 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 93d5f192d4903953baa8c2115534d23140236176 Author: Jan Beulich AuthorDate: Fri Sep 5 15:02:28 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 5 15:02:28 2014 +0200 vNUMA: fix build on ARM after commit 9695014966 The new domctl isn't really x86-specific. Signed-off-by: Jan Beulich Acked-by: Ian Campbell Tested-by: Ian Campbell Reviewed-by: Andrew Cooper --- xen/include/public/domctl.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 07c4fd6..69a8b44 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -935,6 +935,7 @@ struct xen_domctl_vcpu_msrs { }; typedef struct xen_domctl_vcpu_msrs xen_domctl_vcpu_msrs_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msrs_t); +#endif /* * Use in XEN_DOMCTL_setvnumainfo to set @@ -963,8 +964,6 @@ struct xen_domctl_vnuma { typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); -#endif - struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 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 Sep 08 23:11:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85T-0002pl-Ad; Mon, 08 Sep 2014 23:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85S-0002pg-4N for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:06 +0000 Received: from [85.158.139.211:53814] by server-12.bemta-5.messagelabs.com id 73/A5-22251-9873E045; Mon, 08 Sep 2014 23:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1410217863!13223626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3402 invoked from network); 8 Sep 2014 23:11:04 -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; 8 Sep 2014 23:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85P-0004Gg-7o for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85O-0003Md-RZ for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:02 +0000 Date: Mon, 08 Sep 2014 23:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Don't pass "multiboot, module" DTB nodes to dom0. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46a36938a9a798a7a581b4d76ae09121e7be49ef Author: Ian Campbell AuthorDate: Tue Aug 5 10:53:25 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 10:58:44 2014 +0100 xen: arm: Don't pass "multiboot, module" DTB nodes to dom0. Support for loading these was added in a860dfeec090 "xen: arm: implement generic multiboot compatibility strings". Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 51d793a..2d316dd 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1049,6 +1049,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, { DT_MATCH_COMPATIBLE("xen,xen"), DT_MATCH_COMPATIBLE("xen,multiboot-module"), + DT_MATCH_COMPATIBLE("multiboot,module"), DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), -- generated by git-patchbot for /home/xen/git/xen.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 Sep 08 23:11:16 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85T-0002pl-Ad; Mon, 08 Sep 2014 23:11:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85S-0002pg-4N for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:06 +0000 Received: from [85.158.139.211:53814] by server-12.bemta-5.messagelabs.com id 73/A5-22251-9873E045; Mon, 08 Sep 2014 23:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1410217863!13223626!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3402 invoked from network); 8 Sep 2014 23:11:04 -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; 8 Sep 2014 23:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85P-0004Gg-7o for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85O-0003Md-RZ for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:02 +0000 Date: Mon, 08 Sep 2014 23:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Don't pass "multiboot, module" DTB nodes to dom0. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 46a36938a9a798a7a581b4d76ae09121e7be49ef Author: Ian Campbell AuthorDate: Tue Aug 5 10:53:25 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 10:58:44 2014 +0100 xen: arm: Don't pass "multiboot, module" DTB nodes to dom0. Support for loading these was added in a860dfeec090 "xen: arm: implement generic multiboot compatibility strings". Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 51d793a..2d316dd 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1049,6 +1049,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, { DT_MATCH_COMPATIBLE("xen,xen"), DT_MATCH_COMPATIBLE("xen,multiboot-module"), + DT_MATCH_COMPATIBLE("multiboot,module"), DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), -- generated by git-patchbot for /home/xen/git/xen.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 Sep 08 23:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23: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 1XR85d-0002qP-D9; Mon, 08 Sep 2014 23:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85c-0002q3-3c for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:16 +0000 Received: from [193.109.254.147:59225] by server-11.bemta-14.messagelabs.com id 37/BC-14213-3973E045; Mon, 08 Sep 2014 23:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1410217873!14167549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4721 invoked from network); 8 Sep 2014 23:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85Z-0004Gj-Oh for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85Z-0003NX-D7 for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:13 +0000 Date: Mon, 08 Sep 2014 23:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: remove uint32 use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddfb12eed686148fc50bbf58e992dc2d2c627b22 Author: M A Young AuthorDate: Sun Sep 7 20:10:33 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 10:59:59 2014 +0100 tools/ocaml: remove uint32 use OCaml is replacing its own uint32 type with the ISO C99 uint32_t type in 4.03.0+dev. Ths patch replaces the remaining uses of uint32 with uint32_t in the ocaml C code for xen. Signed-off-by: Michael Young Acked-by: David Scott --- tools/ocaml/libs/xb/xs_ring_stubs.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index 8bd1047..17656c2 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -42,8 +43,8 @@ static int xs_ring_read(struct mmap_interface *interface, XENSTORE_RING_IDX cons, prod; /* offsets only */ int to_read; - cons = *(volatile uint32*)&intf->req_cons; - prod = *(volatile uint32*)&intf->req_prod; + cons = *(volatile uint32_t*)&intf->req_cons; + prod = *(volatile uint32_t*)&intf->req_prod; xen_mb(); if ((prod - cons) > XENSTORE_RING_SIZE) @@ -72,8 +73,8 @@ static int xs_ring_write(struct mmap_interface *interface, XENSTORE_RING_IDX cons, prod; int can_write; - cons = *(volatile uint32*)&intf->rsp_cons; - prod = *(volatile uint32*)&intf->rsp_prod; + cons = *(volatile uint32_t*)&intf->rsp_cons; + prod = *(volatile uint32_t*)&intf->rsp_prod; xen_mb(); if ( (prod - cons) >= XENSTORE_RING_SIZE ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23: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 1XR85d-0002qP-D9; Mon, 08 Sep 2014 23:11:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85c-0002q3-3c for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:16 +0000 Received: from [193.109.254.147:59225] by server-11.bemta-14.messagelabs.com id 37/BC-14213-3973E045; Mon, 08 Sep 2014 23:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1410217873!14167549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4721 invoked from network); 8 Sep 2014 23:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85Z-0004Gj-Oh for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85Z-0003NX-D7 for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:13 +0000 Date: Mon, 08 Sep 2014 23:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: remove uint32 use X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ddfb12eed686148fc50bbf58e992dc2d2c627b22 Author: M A Young AuthorDate: Sun Sep 7 20:10:33 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 10:59:59 2014 +0100 tools/ocaml: remove uint32 use OCaml is replacing its own uint32 type with the ISO C99 uint32_t type in 4.03.0+dev. Ths patch replaces the remaining uses of uint32 with uint32_t in the ocaml C code for xen. Signed-off-by: Michael Young Acked-by: David Scott --- tools/ocaml/libs/xb/xs_ring_stubs.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/libs/xb/xs_ring_stubs.c b/tools/ocaml/libs/xb/xs_ring_stubs.c index 8bd1047..17656c2 100644 --- a/tools/ocaml/libs/xb/xs_ring_stubs.c +++ b/tools/ocaml/libs/xb/xs_ring_stubs.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -42,8 +43,8 @@ static int xs_ring_read(struct mmap_interface *interface, XENSTORE_RING_IDX cons, prod; /* offsets only */ int to_read; - cons = *(volatile uint32*)&intf->req_cons; - prod = *(volatile uint32*)&intf->req_prod; + cons = *(volatile uint32_t*)&intf->req_cons; + prod = *(volatile uint32_t*)&intf->req_prod; xen_mb(); if ((prod - cons) > XENSTORE_RING_SIZE) @@ -72,8 +73,8 @@ static int xs_ring_write(struct mmap_interface *interface, XENSTORE_RING_IDX cons, prod; int can_write; - cons = *(volatile uint32*)&intf->rsp_cons; - prod = *(volatile uint32*)&intf->rsp_prod; + cons = *(volatile uint32_t*)&intf->rsp_cons; + prod = *(volatile uint32_t*)&intf->rsp_prod; xen_mb(); if ( (prod - cons) >= XENSTORE_RING_SIZE ) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85o-0002rZ-Fu; Mon, 08 Sep 2014 23:11:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85m-0002rU-TM for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:27 +0000 Received: from [193.109.254.147:59485] by server-14.bemta-14.messagelabs.com id D7/8A-18345-E973E045; Mon, 08 Sep 2014 23:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1410217884!14233402!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1616 invoked from network); 8 Sep 2014 23:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85k-0004Gs-4B for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85j-0003Nt-Sy for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:23 +0000 Date: Mon, 08 Sep 2014 23:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: convert vcpuid to signed in main_vcpupin() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e509f8e8d17b5cab0d6ac4aba0ddac12245fc023 Author: Dario Faggioli AuthorDate: Thu Sep 4 13:44:24 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:01:16 2014 +0100 xl: convert vcpuid to signed in main_vcpupin() As it needs to be, considering that we assign -1 to it (and that, later, we check for it to be -1), to signify 'all vcpus'. While at it, fix a coding style nit and improve error reporting. Signed-off-by: Dario Faggioli Reviewed-by: Don Slutz Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e6b9615..8a38077 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4638,7 +4638,12 @@ int main_vcpupin(int argc, char **argv) libxl_vcpuinfo *vcpuinfo; libxl_bitmap cpumap_hard, cpumap_soft;; libxl_bitmap *soft = &cpumap_soft, *hard = &cpumap_hard; - uint32_t vcpuid, domid; + uint32_t domid; + /* + * int would be enough for vcpuid, but we don't want to + * mess aroung range checking the return value of strtol(). + */ + long vcpuid; const char *vcpu, *hard_str, *soft_str; char *endptr; int opt, nb_cpu, nb_vcpu, rc = -1; @@ -4656,10 +4661,10 @@ int main_vcpupin(int argc, char **argv) soft_str = (argc > optind+3) ? argv[optind+3] : NULL; /* Figure out with which vCPU we are dealing with */ - vcpuid = strtoul(vcpu, &endptr, 10); - if (vcpu == endptr) { + vcpuid = strtol(vcpu, &endptr, 10); + if (vcpu == endptr || vcpuid < 0) { if (strcmp(vcpu, "all")) { - fprintf(stderr, "Error: Invalid argument.\n"); + fprintf(stderr, "Error: Invalid argument %s as VCPU.\n", vcpu); goto out; } vcpuid = -1; @@ -4725,12 +4730,11 @@ int main_vcpupin(int argc, char **argv) if (vcpuid != -1) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, hard, soft)) { - fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", + fprintf(stderr, "Could not set affinity for vcpu `%ld'.\n", vcpuid); goto out; } - } - else { + } else { if (!(vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nb_cpu))) { fprintf(stderr, "libxl_list_vcpu failed.\n"); 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 Mon Sep 08 23:11:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85o-0002rZ-Fu; Mon, 08 Sep 2014 23:11:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85m-0002rU-TM for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:27 +0000 Received: from [193.109.254.147:59485] by server-14.bemta-14.messagelabs.com id D7/8A-18345-E973E045; Mon, 08 Sep 2014 23:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1410217884!14233402!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1616 invoked from network); 8 Sep 2014 23:11:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85k-0004Gs-4B for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85j-0003Nt-Sy for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:23 +0000 Date: Mon, 08 Sep 2014 23:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: convert vcpuid to signed in main_vcpupin() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e509f8e8d17b5cab0d6ac4aba0ddac12245fc023 Author: Dario Faggioli AuthorDate: Thu Sep 4 13:44:24 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:01:16 2014 +0100 xl: convert vcpuid to signed in main_vcpupin() As it needs to be, considering that we assign -1 to it (and that, later, we check for it to be -1), to signify 'all vcpus'. While at it, fix a coding style nit and improve error reporting. Signed-off-by: Dario Faggioli Reviewed-by: Don Slutz Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index e6b9615..8a38077 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -4638,7 +4638,12 @@ int main_vcpupin(int argc, char **argv) libxl_vcpuinfo *vcpuinfo; libxl_bitmap cpumap_hard, cpumap_soft;; libxl_bitmap *soft = &cpumap_soft, *hard = &cpumap_hard; - uint32_t vcpuid, domid; + uint32_t domid; + /* + * int would be enough for vcpuid, but we don't want to + * mess aroung range checking the return value of strtol(). + */ + long vcpuid; const char *vcpu, *hard_str, *soft_str; char *endptr; int opt, nb_cpu, nb_vcpu, rc = -1; @@ -4656,10 +4661,10 @@ int main_vcpupin(int argc, char **argv) soft_str = (argc > optind+3) ? argv[optind+3] : NULL; /* Figure out with which vCPU we are dealing with */ - vcpuid = strtoul(vcpu, &endptr, 10); - if (vcpu == endptr) { + vcpuid = strtol(vcpu, &endptr, 10); + if (vcpu == endptr || vcpuid < 0) { if (strcmp(vcpu, "all")) { - fprintf(stderr, "Error: Invalid argument.\n"); + fprintf(stderr, "Error: Invalid argument %s as VCPU.\n", vcpu); goto out; } vcpuid = -1; @@ -4725,12 +4730,11 @@ int main_vcpupin(int argc, char **argv) if (vcpuid != -1) { if (libxl_set_vcpuaffinity(ctx, domid, vcpuid, hard, soft)) { - fprintf(stderr, "Could not set affinity for vcpu `%u'.\n", + fprintf(stderr, "Could not set affinity for vcpu `%ld'.\n", vcpuid); goto out; } - } - else { + } else { if (!(vcpuinfo = libxl_list_vcpu(ctx, domid, &nb_vcpu, &nb_cpu))) { fprintf(stderr, "libxl_list_vcpu failed.\n"); 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 Mon Sep 08 23:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85y-0002sw-Ia; Mon, 08 Sep 2014 23:11:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85w-0002sc-QN for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:36 +0000 Received: from [193.109.254.147:2205] by server-10.bemta-14.messagelabs.com id C2/C8-01463-8A73E045; Mon, 08 Sep 2014 23:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410217894!14270434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24336 invoked from network); 8 Sep 2014 23:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85u-0004H0-9C for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85u-0003OK-7L for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:34 +0000 Date: Mon, 08 Sep 2014 23:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: do not set CONFIG_TEST for caml & C stubdom examples X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea61dbe00f4cf230fdf5545ae41e6fdc6d9eb633 Author: Samuel Thibault AuthorDate: Sat Sep 6 11:51:42 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:01:59 2014 +0100 stubdom: do not set CONFIG_TEST for caml & C stubdom examples caml & C stubdom examples should not enable the tests, they already provide their own main function. Signed-off-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/c/minios.cfg | 1 - stubdom/caml/minios.cfg | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg index e1faee5..e69de29 100644 --- a/stubdom/c/minios.cfg +++ b/stubdom/c/minios.cfg @@ -1 +0,0 @@ -CONFIG_TEST=y diff --git a/stubdom/caml/minios.cfg b/stubdom/caml/minios.cfg index e1faee5..e69de29 100644 --- a/stubdom/caml/minios.cfg +++ b/stubdom/caml/minios.cfg @@ -1 +0,0 @@ -CONFIG_TEST=y -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:11:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85y-0002sw-Ia; Mon, 08 Sep 2014 23:11:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85w-0002sc-QN for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:36 +0000 Received: from [193.109.254.147:2205] by server-10.bemta-14.messagelabs.com id C2/C8-01463-8A73E045; Mon, 08 Sep 2014 23:11:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410217894!14270434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24336 invoked from network); 8 Sep 2014 23:11:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR85u-0004H0-9C for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR85u-0003OK-7L for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:34 +0000 Date: Mon, 08 Sep 2014 23:11:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] stubdom: do not set CONFIG_TEST for caml & C stubdom examples X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea61dbe00f4cf230fdf5545ae41e6fdc6d9eb633 Author: Samuel Thibault AuthorDate: Sat Sep 6 11:51:42 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:01:59 2014 +0100 stubdom: do not set CONFIG_TEST for caml & C stubdom examples caml & C stubdom examples should not enable the tests, they already provide their own main function. Signed-off-by: Samuel Thibault Acked-by: Ian Campbell --- stubdom/c/minios.cfg | 1 - stubdom/caml/minios.cfg | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg index e1faee5..e69de29 100644 --- a/stubdom/c/minios.cfg +++ b/stubdom/c/minios.cfg @@ -1 +0,0 @@ -CONFIG_TEST=y diff --git a/stubdom/caml/minios.cfg b/stubdom/caml/minios.cfg index e1faee5..e69de29 100644 --- a/stubdom/caml/minios.cfg +++ b/stubdom/caml/minios.cfg @@ -1 +0,0 @@ -CONFIG_TEST=y -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:11:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR868-0002ul-LC; Mon, 08 Sep 2014 23:11:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR866-0002uG-R6 for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:46 +0000 Received: from [193.109.254.147:22548] by server-2.bemta-14.messagelabs.com id 16/30-07861-2B73E045; Mon, 08 Sep 2014 23:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1410217904!10912217!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14278 invoked from network); 8 Sep 2014 23:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR864-0004H6-Ec for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR864-0003Oj-Cu for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:44 +0000 Date: Mon, 08 Sep 2014 23:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Fix build of libxl with ./configure --disable-blktap2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 489ddd21e3bb7782902a2e983183c7b2f64a8fef Author: Andrew Cooper AuthorDate: Fri Aug 15 15:32:57 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 11:21:18 2014 +0100 tools/libxl: Fix build of libxl with ./configure --disable-blktap2 Autoconf already has appropriate Linux/non-Linux logic for CONFIG_BLKTAP2. Let LIBXL_BLKTAP inherit directly from CONFIG_BLKTAP2, rather than requiring a further LIBXL_BLKTAP=n in addition to ./configure --disable-blktap2 to get libxl to successfully link under Linux. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/Rules.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 5bac700..fa59365 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -55,11 +55,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) -ifeq ($(CONFIG_Linux),y) -LIBXL_BLKTAP ?= y -else -LIBXL_BLKTAP ?= n -endif +LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) ifeq ($(LIBXL_BLKTAP),y) CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 08 23:11:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR868-0002ul-LC; Mon, 08 Sep 2014 23:11:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR866-0002uG-R6 for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:46 +0000 Received: from [193.109.254.147:22548] by server-2.bemta-14.messagelabs.com id 16/30-07861-2B73E045; Mon, 08 Sep 2014 23:11:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1410217904!10912217!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14278 invoked from network); 8 Sep 2014 23:11:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:11:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR864-0004H6-Ec for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR864-0003Oj-Cu for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:44 +0000 Date: Mon, 08 Sep 2014 23:11:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Fix build of libxl with ./configure --disable-blktap2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 489ddd21e3bb7782902a2e983183c7b2f64a8fef Author: Andrew Cooper AuthorDate: Fri Aug 15 15:32:57 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 11:21:18 2014 +0100 tools/libxl: Fix build of libxl with ./configure --disable-blktap2 Autoconf already has appropriate Linux/non-Linux logic for CONFIG_BLKTAP2. Let LIBXL_BLKTAP inherit directly from CONFIG_BLKTAP2, rather than requiring a further LIBXL_BLKTAP=n in addition to ./configure --disable-blktap2 to get libxl to successfully link under Linux. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/Rules.mk | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 5bac700..fa59365 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -55,11 +55,7 @@ CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) -L$(XEN_LIBVCHAN) -lxenvchan SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) -ifeq ($(CONFIG_Linux),y) -LIBXL_BLKTAP ?= y -else -LIBXL_BLKTAP ?= n -endif +LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) ifeq ($(LIBXL_BLKTAP),y) CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 08 23:11:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86I-0002wd-O3; Mon, 08 Sep 2014 23:11:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86H-0002wL-GG for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:57 +0000 Received: from [85.158.139.211:50909] by server-8.bemta-5.messagelabs.com id 62/23-22440-CB73E045; Mon, 08 Sep 2014 23:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1410217914!9101387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21754 invoked from network); 8 Sep 2014 23:11:56 -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; 8 Sep 2014 23:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86E-0004HF-JY for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR86E-0003P5-HV for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:54 +0000 Date: Mon, 08 Sep 2014 23:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: introduce uImage probe function for Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 492e5b21b7ecfbbb59df1fc9ead2a94981514cc8 Author: Oleksandr Dmytryshyn AuthorDate: Thu Aug 28 13:54:21 2014 +0300 Commit: Ian Campbell CommitDate: Mon Sep 8 11:42:02 2014 +0100 xen: arm: introduce uImage probe function for Dom0 Patch adds a possibility to boot dom0 kernel from uImage. uImage header format: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/image.h Signed-off-by: Oleksandr Dmytryshyn Reviewed-by: Julien Grall Acked-by: Ian Campbell [ ijc -- fixed up coding style nit to be consistent with surrounding, but differently wrong, coding style. s/Not supported/Unsupported/ s/uimage->arch/uimage.arch/ ] --- xen/arch/arm/kernel.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index d635a7e..1b8ac9a 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -16,6 +16,9 @@ #include "kernel.h" +#define UIMAGE_MAGIC 0x27051956 +#define UIMAGE_NMLEN 32 + #define ZIMAGE32_MAGIC_OFFSET 0x24 #define ZIMAGE32_START_OFFSET 0x28 #define ZIMAGE32_END_OFFSET 0x2c @@ -188,6 +191,72 @@ static void kernel_zimage_load(struct kernel_info *info) } } +/* + * Uimage CPU Architecture Codes + */ +#define IH_ARCH_ARM 2 /* ARM */ +#define IH_ARCH_ARM64 22 /* ARM64 */ + +/* + * Check if the image is a uImage and setup kernel_info + */ +static int kernel_uimage_probe(struct kernel_info *info, + paddr_t addr, paddr_t size) +{ + struct { + __be32 magic; /* Image Header Magic Number */ + __be32 hcrc; /* Image Header CRC Checksum */ + __be32 time; /* Image Creation Timestamp */ + __be32 size; /* Image Data Size */ + __be32 load; /* Data Load Address */ + __be32 ep; /* Entry Point Address */ + __be32 dcrc; /* Image Data CRC Checksum */ + uint8_t os; /* Operating System */ + uint8_t arch; /* CPU architecture */ + uint8_t type; /* Image Type */ + uint8_t comp; /* Compression Type */ + uint8_t name[UIMAGE_NMLEN]; /* Image Name */ + } uimage; + + uint32_t len; + + if ( size < sizeof(uimage) ) + return -EINVAL; + + copy_from_paddr(&uimage, addr, sizeof(uimage)); + + if ( be32_to_cpu(uimage.magic) != UIMAGE_MAGIC ) + return -EINVAL; + + len = be32_to_cpu(uimage.size); + + if ( len > size - sizeof(uimage) ) + return -EINVAL; + + info->zimage.kernel_addr = addr + sizeof(uimage); + info->zimage.len = len; + + info->entry = info->zimage.start; + info->load = kernel_zimage_load; + +#ifdef CONFIG_ARM_64 + switch ( uimage.arch ) + { + case IH_ARCH_ARM: + info->type = DOMAIN_32BIT; + break; + case IH_ARCH_ARM64: + info->type = DOMAIN_64BIT; + break; + default: + printk(XENLOG_ERR "Unsupported uImage arch type %d\n", uimage.arch); + return -EINVAL; + } +#endif + + return 0; +} + #ifdef CONFIG_ARM_64 /* * Check if the image is a 64-bit Image. @@ -398,6 +467,8 @@ int kernel_probe(struct kernel_info *info) rc = kernel_zimage64_probe(info, start, size); if (rc < 0) #endif + rc = kernel_uimage_probe(info, start, size); + if (rc < 0) rc = kernel_zimage32_probe(info, start, size); if (rc < 0) rc = kernel_elf_probe(info, start, size); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:11:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:11:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86I-0002wd-O3; Mon, 08 Sep 2014 23:11:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86H-0002wL-GG for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:57 +0000 Received: from [85.158.139.211:50909] by server-8.bemta-5.messagelabs.com id 62/23-22440-CB73E045; Mon, 08 Sep 2014 23:11:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1410217914!9101387!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21754 invoked from network); 8 Sep 2014 23:11:56 -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; 8 Sep 2014 23:11:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86E-0004HF-JY for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR86E-0003P5-HV for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:11:54 +0000 Date: Mon, 08 Sep 2014 23:11:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: introduce uImage probe function for Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 492e5b21b7ecfbbb59df1fc9ead2a94981514cc8 Author: Oleksandr Dmytryshyn AuthorDate: Thu Aug 28 13:54:21 2014 +0300 Commit: Ian Campbell CommitDate: Mon Sep 8 11:42:02 2014 +0100 xen: arm: introduce uImage probe function for Dom0 Patch adds a possibility to boot dom0 kernel from uImage. uImage header format: http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/image.h Signed-off-by: Oleksandr Dmytryshyn Reviewed-by: Julien Grall Acked-by: Ian Campbell [ ijc -- fixed up coding style nit to be consistent with surrounding, but differently wrong, coding style. s/Not supported/Unsupported/ s/uimage->arch/uimage.arch/ ] --- xen/arch/arm/kernel.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 71 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index d635a7e..1b8ac9a 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -16,6 +16,9 @@ #include "kernel.h" +#define UIMAGE_MAGIC 0x27051956 +#define UIMAGE_NMLEN 32 + #define ZIMAGE32_MAGIC_OFFSET 0x24 #define ZIMAGE32_START_OFFSET 0x28 #define ZIMAGE32_END_OFFSET 0x2c @@ -188,6 +191,72 @@ static void kernel_zimage_load(struct kernel_info *info) } } +/* + * Uimage CPU Architecture Codes + */ +#define IH_ARCH_ARM 2 /* ARM */ +#define IH_ARCH_ARM64 22 /* ARM64 */ + +/* + * Check if the image is a uImage and setup kernel_info + */ +static int kernel_uimage_probe(struct kernel_info *info, + paddr_t addr, paddr_t size) +{ + struct { + __be32 magic; /* Image Header Magic Number */ + __be32 hcrc; /* Image Header CRC Checksum */ + __be32 time; /* Image Creation Timestamp */ + __be32 size; /* Image Data Size */ + __be32 load; /* Data Load Address */ + __be32 ep; /* Entry Point Address */ + __be32 dcrc; /* Image Data CRC Checksum */ + uint8_t os; /* Operating System */ + uint8_t arch; /* CPU architecture */ + uint8_t type; /* Image Type */ + uint8_t comp; /* Compression Type */ + uint8_t name[UIMAGE_NMLEN]; /* Image Name */ + } uimage; + + uint32_t len; + + if ( size < sizeof(uimage) ) + return -EINVAL; + + copy_from_paddr(&uimage, addr, sizeof(uimage)); + + if ( be32_to_cpu(uimage.magic) != UIMAGE_MAGIC ) + return -EINVAL; + + len = be32_to_cpu(uimage.size); + + if ( len > size - sizeof(uimage) ) + return -EINVAL; + + info->zimage.kernel_addr = addr + sizeof(uimage); + info->zimage.len = len; + + info->entry = info->zimage.start; + info->load = kernel_zimage_load; + +#ifdef CONFIG_ARM_64 + switch ( uimage.arch ) + { + case IH_ARCH_ARM: + info->type = DOMAIN_32BIT; + break; + case IH_ARCH_ARM64: + info->type = DOMAIN_64BIT; + break; + default: + printk(XENLOG_ERR "Unsupported uImage arch type %d\n", uimage.arch); + return -EINVAL; + } +#endif + + return 0; +} + #ifdef CONFIG_ARM_64 /* * Check if the image is a 64-bit Image. @@ -398,6 +467,8 @@ int kernel_probe(struct kernel_info *info) rc = kernel_zimage64_probe(info, start, size); if (rc < 0) #endif + rc = kernel_uimage_probe(info, start, size); + if (rc < 0) rc = kernel_zimage32_probe(info, start, size); if (rc < 0) rc = kernel_elf_probe(info, start, size); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:12:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:12:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86S-0002yD-Qu; Mon, 08 Sep 2014 23:12:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86R-0002xv-Lf for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:07 +0000 Content-Length: 1972 Received: from [85.158.137.68:63482] by server-5.bemta-3.messagelabs.com id 6E/44-30889-6C73E045; Mon, 08 Sep 2014 23:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1410217925!9530584!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30692 invoked from network); 8 Sep 2014 23:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86O-0004HK-SA for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR86O-0003Pb-NN for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:04 +0000 Date: Mon, 08 Sep 2014 23:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: disable stubdomain build by default on FreeBSD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7851378425881192253==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7851378425881192253== Content-Length: 1578 Content-Transfer-Encoding: quoted-printable commit 10ebe272c1a422c480f1fa7d383cf8c426052490 Author: Roger Pau Monne AuthorDate: Thu Aug 14 15:47:49 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:42:20 2014 +0100 configure: disable stubdomain build by default on FreeBSD Stubdomain code as-is doesn't compile on FreeBSD, so disable it for now in order to have a working build. Please re-run autoconf after committing. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Acked-by: Ian Campbell --- configure | 6 ++++++ configure.ac | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a6efd35..5090baf 100755 --- a/configure +++ b/configure @@ -1916,6 +1916,12 @@ case "$host_cpu" in ;; esac +case "$host_os" in + freebsd*) + arch_enable_stubdom=3Dn + ;; +esac + diff --git a/configure.ac b/configure.ac index f32f9af..1843b52 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,13 @@ case "$host_cpu" in ;; esac +dnl Stubdomains need some work in order to compile on FreeBSD +case "$host_os" in + freebsd*) + arch_enable_stubdom=3Dn + ;; +esac + AX_SUBSYSTEM_DEFAULT_ENABLE([xen]) AX_SUBSYSTEM_DEFAULT_ENABLE([tools]) AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7851378425881192253== 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 --===============7851378425881192253==-- From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:12:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:12:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86S-0002yD-Qu; Mon, 08 Sep 2014 23:12:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86R-0002xv-Lf for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:07 +0000 Content-Length: 1972 Received: from [85.158.137.68:63482] by server-5.bemta-3.messagelabs.com id 6E/44-30889-6C73E045; Mon, 08 Sep 2014 23:12:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1410217925!9530584!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30692 invoked from network); 8 Sep 2014 23:12:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:12:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86O-0004HK-SA for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR86O-0003Pb-NN for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:04 +0000 Date: Mon, 08 Sep 2014 23:12:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] configure: disable stubdomain build by default on FreeBSD X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7851378425881192253==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7851378425881192253== Content-Length: 1578 Content-Transfer-Encoding: quoted-printable commit 10ebe272c1a422c480f1fa7d383cf8c426052490 Author: Roger Pau Monne AuthorDate: Thu Aug 14 15:47:49 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:42:20 2014 +0100 configure: disable stubdomain build by default on FreeBSD Stubdomain code as-is doesn't compile on FreeBSD, so disable it for now in order to have a working build. Please re-run autoconf after committing. Signed-off-by: Roger Pau Monn=C3=A9 Cc: Ian Jackson Acked-by: Ian Campbell --- configure | 6 ++++++ configure.ac | 7 +++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/configure b/configure index a6efd35..5090baf 100755 --- a/configure +++ b/configure @@ -1916,6 +1916,12 @@ case "$host_cpu" in ;; esac +case "$host_os" in + freebsd*) + arch_enable_stubdom=3Dn + ;; +esac + diff --git a/configure.ac b/configure.ac index f32f9af..1843b52 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,13 @@ case "$host_cpu" in ;; esac +dnl Stubdomains need some work in order to compile on FreeBSD +case "$host_os" in + freebsd*) + arch_enable_stubdom=3Dn + ;; +esac + AX_SUBSYSTEM_DEFAULT_ENABLE([xen]) AX_SUBSYSTEM_DEFAULT_ENABLE([tools]) AX_SUBSYSTEM_CONDITIONAL([stubdom], $arch_enable_stubdom) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7851378425881192253== 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 --===============7851378425881192253==-- From xen-changelog-bounces@lists.xen.org Mon Sep 08 23:12:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:12: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 1XR86c-0002zb-TU; Mon, 08 Sep 2014 23:12:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86b-0002zL-IX for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:17 +0000 Received: from [193.109.254.147:17322] by server-2.bemta-14.messagelabs.com id E7/60-07861-0D73E045; Mon, 08 Sep 2014 23:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1410217935!14264698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20668 invoked from network); 8 Sep 2014 23:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86Z-0004Hu-5B for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR86Z-0003Qi-0O for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:15 +0000 Date: Mon, 08 Sep 2014 23:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-access: Print gla valid/fault information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4adc3de63f726315e5cd639cce1b766e8df8fddc Author: Tamas K Lengyel AuthorDate: Wed Aug 13 11:28:20 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:42:25 2014 +0100 tools/xen-access: Print gla valid/fault information Extend the print-out of the memory violations to show gla valid/fault information. Signed-off-by: Tamas K Lengyel Acked-by: Ian Campbell --- tools/tests/xen-access/xen-access.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 090df5f..6cb382d 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -566,13 +566,16 @@ int main(int argc, char *argv[]) } printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" - PRIx64") gla %016"PRIx64" (vcpu %d)\n", + PRIx64") gla %016"PRIx64" (valid: %c; fault in gpt: %c; fault with gla: %c) (vcpu %u)\n", req.access_r ? 'r' : '-', req.access_w ? 'w' : '-', req.access_x ? 'x' : '-', req.gfn, req.offset, req.gla, + req.gla_valid ? 'y' : 'n', + req.fault_in_gpt ? 'y' : 'n', + req.fault_with_gla ? 'y': 'n', req.vcpu_id); if ( default_access != after_first_access ) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 08 23:12:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 08 Sep 2014 23:12: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 1XR86c-0002zb-TU; Mon, 08 Sep 2014 23:12:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86b-0002zL-IX for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:17 +0000 Received: from [193.109.254.147:17322] by server-2.bemta-14.messagelabs.com id E7/60-07861-0D73E045; Mon, 08 Sep 2014 23:12:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1410217935!14264698!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20668 invoked from network); 8 Sep 2014 23:12:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 8 Sep 2014 23:12:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XR86Z-0004Hu-5B for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XR86Z-0003Qi-0O for xen-changelog@lists.xensource.com; Mon, 08 Sep 2014 23:12:15 +0000 Date: Mon, 08 Sep 2014 23:12:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xen-access: Print gla valid/fault information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4adc3de63f726315e5cd639cce1b766e8df8fddc Author: Tamas K Lengyel AuthorDate: Wed Aug 13 11:28:20 2014 +0200 Commit: Ian Campbell CommitDate: Mon Sep 8 11:42:25 2014 +0100 tools/xen-access: Print gla valid/fault information Extend the print-out of the memory violations to show gla valid/fault information. Signed-off-by: Tamas K Lengyel Acked-by: Ian Campbell --- tools/tests/xen-access/xen-access.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c index 090df5f..6cb382d 100644 --- a/tools/tests/xen-access/xen-access.c +++ b/tools/tests/xen-access/xen-access.c @@ -566,13 +566,16 @@ int main(int argc, char *argv[]) } printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06" - PRIx64") gla %016"PRIx64" (vcpu %d)\n", + PRIx64") gla %016"PRIx64" (valid: %c; fault in gpt: %c; fault with gla: %c) (vcpu %u)\n", req.access_r ? 'r' : '-', req.access_w ? 'w' : '-', req.access_x ? 'x' : '-', req.gfn, req.offset, req.gla, + req.gla_valid ? 'y' : 'n', + req.fault_in_gpt ? 'y' : 'n', + req.fault_with_gla ? 'y': 'n', req.vcpu_id); if ( default_access != after_first_access ) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 03:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03: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 1XRYJJ-0002MT-5T; Wed, 10 Sep 2014 03:11:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJI-0002ML-0F for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:08 +0000 Received: from [85.158.143.35:39414] by server-2.bemta-4.messagelabs.com id 55/80-04525-B41CF045; Wed, 10 Sep 2014 03:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1410318665!12753858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17207 invoked from network); 10 Sep 2014 03:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJD-0004TV-UI for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJD-0001mf-Kj for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:03 +0000 Date: Wed, 10 Sep 2014 03:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: don't include lib.h from mm.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a80e7d0d392076a0466cc3a1476aeb24182401de Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:30 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:27 2014 +0100 mini-os: don't include lib.h from mm.h This breaks the include cycle hypervisor.h -> hypercall-x86_32.h -> mm.h -> lib.h -> gntmap.h -> os.h -> hypervisor.h. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/include/mm.h | 3 +-- extras/mini-os/lock.c | 1 + extras/mini-os/main.c | 1 + extras/mini-os/tpm_tis.c | 1 + extras/mini-os/tpmfront.c | 1 + stubdom/vtpmmgr/disk_tpm.c | 1 + stubdom/vtpmmgr/vtpm_cmd_handler.c | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/include/mm.h b/extras/mini-os/include/mm.h index a94cd6d..a177251 100644 --- a/extras/mini-os/include/mm.h +++ b/extras/mini-os/include/mm.h @@ -32,8 +32,7 @@ #else #error "Unsupported architecture" #endif - -#include +#include #include #include diff --git a/extras/mini-os/lock.c b/extras/mini-os/lock.c index 71a4971..61194e5 100644 --- a/extras/mini-os/lock.c +++ b/extras/mini-os/lock.c @@ -9,6 +9,7 @@ #include #include #include +#include int ___lock_init(_LOCK_T *lock) { diff --git a/extras/mini-os/main.c b/extras/mini-os/main.c index aec0586..4ec40b5 100644 --- a/extras/mini-os/main.c +++ b/extras/mini-os/main.c @@ -15,6 +15,7 @@ #include #include #include +#include extern int main(int argc, char *argv[], char *envp[]); extern void __libc_init_array(void); diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c index dc4134a..b067cb7 100644 --- a/extras/mini-os/tpm_tis.c +++ b/extras/mini-os/tpm_tis.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c index ce5b3e1..6049244 100644 --- a/extras/mini-os/tpmfront.c +++ b/extras/mini-os/tpmfront.c @@ -31,6 +31,7 @@ #include #include #include +#include #include //#define TPMFRONT_PRINT_DEBUG diff --git a/stubdom/vtpmmgr/disk_tpm.c b/stubdom/vtpmmgr/disk_tpm.c index a9f4552..d650fbc 100644 --- a/stubdom/vtpmmgr/disk_tpm.c +++ b/stubdom/vtpmmgr/disk_tpm.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/stubdom/vtpmmgr/vtpm_cmd_handler.c b/stubdom/vtpmmgr/vtpm_cmd_handler.c index 8a42790..13ead93 100644 --- a/stubdom/vtpmmgr/vtpm_cmd_handler.c +++ b/stubdom/vtpmmgr/vtpm_cmd_handler.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03: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 1XRYJJ-0002MT-5T; Wed, 10 Sep 2014 03:11:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJI-0002ML-0F for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:08 +0000 Received: from [85.158.143.35:39414] by server-2.bemta-4.messagelabs.com id 55/80-04525-B41CF045; Wed, 10 Sep 2014 03:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1410318665!12753858!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17207 invoked from network); 10 Sep 2014 03:11:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJD-0004TV-UI for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJD-0001mf-Kj for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:03 +0000 Date: Wed, 10 Sep 2014 03:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: don't include lib.h from mm.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a80e7d0d392076a0466cc3a1476aeb24182401de Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:30 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:27 2014 +0100 mini-os: don't include lib.h from mm.h This breaks the include cycle hypervisor.h -> hypercall-x86_32.h -> mm.h -> lib.h -> gntmap.h -> os.h -> hypervisor.h. Signed-off-by: Thomas Leonard Acked-by: Ian Campbell Acked-by: Samuel Thibault --- extras/mini-os/include/mm.h | 3 +-- extras/mini-os/lock.c | 1 + extras/mini-os/main.c | 1 + extras/mini-os/tpm_tis.c | 1 + extras/mini-os/tpmfront.c | 1 + stubdom/vtpmmgr/disk_tpm.c | 1 + stubdom/vtpmmgr/vtpm_cmd_handler.c | 1 + 7 files changed, 7 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/include/mm.h b/extras/mini-os/include/mm.h index a94cd6d..a177251 100644 --- a/extras/mini-os/include/mm.h +++ b/extras/mini-os/include/mm.h @@ -32,8 +32,7 @@ #else #error "Unsupported architecture" #endif - -#include +#include #include #include diff --git a/extras/mini-os/lock.c b/extras/mini-os/lock.c index 71a4971..61194e5 100644 --- a/extras/mini-os/lock.c +++ b/extras/mini-os/lock.c @@ -9,6 +9,7 @@ #include #include #include +#include int ___lock_init(_LOCK_T *lock) { diff --git a/extras/mini-os/main.c b/extras/mini-os/main.c index aec0586..4ec40b5 100644 --- a/extras/mini-os/main.c +++ b/extras/mini-os/main.c @@ -15,6 +15,7 @@ #include #include #include +#include extern int main(int argc, char *argv[], char *envp[]); extern void __libc_init_array(void); diff --git a/extras/mini-os/tpm_tis.c b/extras/mini-os/tpm_tis.c index dc4134a..b067cb7 100644 --- a/extras/mini-os/tpm_tis.c +++ b/extras/mini-os/tpm_tis.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/extras/mini-os/tpmfront.c b/extras/mini-os/tpmfront.c index ce5b3e1..6049244 100644 --- a/extras/mini-os/tpmfront.c +++ b/extras/mini-os/tpmfront.c @@ -31,6 +31,7 @@ #include #include #include +#include #include //#define TPMFRONT_PRINT_DEBUG diff --git a/stubdom/vtpmmgr/disk_tpm.c b/stubdom/vtpmmgr/disk_tpm.c index a9f4552..d650fbc 100644 --- a/stubdom/vtpmmgr/disk_tpm.c +++ b/stubdom/vtpmmgr/disk_tpm.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include diff --git a/stubdom/vtpmmgr/vtpm_cmd_handler.c b/stubdom/vtpmmgr/vtpm_cmd_handler.c index 8a42790..13ead93 100644 --- a/stubdom/vtpmmgr/vtpm_cmd_handler.c +++ b/stubdom/vtpmmgr/vtpm_cmd_handler.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:11:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJU-0002N4-9U; Wed, 10 Sep 2014 03:11:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJT-0002Mr-9K for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:19 +0000 Received: from [85.158.139.211:39630] by server-7.bemta-5.messagelabs.com id 1B/FA-30869-551CF045; Wed, 10 Sep 2014 03:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1410318675!8117059!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11353 invoked from network); 10 Sep 2014 03:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJP-0004TY-Mx for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJP-0001nZ-Hb for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:15 +0000 Date: Wed, 10 Sep 2014 03:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: added HYPERVISOR_xsm_op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2903df843007e267a489a48f1c6ab03f7ea1d09a Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:31 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:27 2014 +0100 mini-os: added HYPERVISOR_xsm_op Avoids using _hypercall1 in events.c. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/events.c | 4 ++-- extras/mini-os/include/x86/os.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index 48742de..2a23042 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -245,7 +245,7 @@ int evtchn_get_peercontext(evtchn_port_t local_port, char *ctx, int size) op.cmd = FLASK_GET_PEER_SID; op.interface_version = XEN_FLASK_INTERFACE_VERSION; op.u.peersid.evtchn = local_port; - rc = _hypercall1(int, xsm_op, &op); + rc = HYPERVISOR_xsm_op(&op); if (rc) return rc; sid = op.u.peersid.sid; @@ -253,7 +253,7 @@ int evtchn_get_peercontext(evtchn_port_t local_port, char *ctx, int size) op.u.sid_context.sid = sid; op.u.sid_context.size = size; set_xen_guest_handle(op.u.sid_context.context, ctx); - rc = _hypercall1(int, xsm_op, &op); + rc = HYPERVISOR_xsm_op(&op); return rc; } diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 192b23cd..ee9050b 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -15,6 +15,7 @@ #include #include #include +#include #define USED __attribute__ ((used)) @@ -558,6 +559,12 @@ static __inline__ int synch_var_test_bit(int nr, volatile void * addr) synch_const_test_bit((nr),(addr)) : \ synch_var_test_bit((nr),(addr))) +static inline int +HYPERVISOR_xsm_op( + struct xen_flask_op *op) +{ + return _hypercall1(int, xsm_op, op); +} #undef ADDR -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:11:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJU-0002N4-9U; Wed, 10 Sep 2014 03:11:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJT-0002Mr-9K for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:19 +0000 Received: from [85.158.139.211:39630] by server-7.bemta-5.messagelabs.com id 1B/FA-30869-551CF045; Wed, 10 Sep 2014 03:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1410318675!8117059!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11353 invoked from network); 10 Sep 2014 03:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJP-0004TY-Mx for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJP-0001nZ-Hb for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:15 +0000 Date: Wed, 10 Sep 2014 03:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: added HYPERVISOR_xsm_op X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2903df843007e267a489a48f1c6ab03f7ea1d09a Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:31 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:27 2014 +0100 mini-os: added HYPERVISOR_xsm_op Avoids using _hypercall1 in events.c. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/events.c | 4 ++-- extras/mini-os/include/x86/os.h | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index 48742de..2a23042 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -245,7 +245,7 @@ int evtchn_get_peercontext(evtchn_port_t local_port, char *ctx, int size) op.cmd = FLASK_GET_PEER_SID; op.interface_version = XEN_FLASK_INTERFACE_VERSION; op.u.peersid.evtchn = local_port; - rc = _hypercall1(int, xsm_op, &op); + rc = HYPERVISOR_xsm_op(&op); if (rc) return rc; sid = op.u.peersid.sid; @@ -253,7 +253,7 @@ int evtchn_get_peercontext(evtchn_port_t local_port, char *ctx, int size) op.u.sid_context.sid = sid; op.u.sid_context.size = size; set_xen_guest_handle(op.u.sid_context.context, ctx); - rc = _hypercall1(int, xsm_op, &op); + rc = HYPERVISOR_xsm_op(&op); return rc; } diff --git a/extras/mini-os/include/x86/os.h b/extras/mini-os/include/x86/os.h index 192b23cd..ee9050b 100644 --- a/extras/mini-os/include/x86/os.h +++ b/extras/mini-os/include/x86/os.h @@ -15,6 +15,7 @@ #include #include #include +#include #define USED __attribute__ ((used)) @@ -558,6 +559,12 @@ static __inline__ int synch_var_test_bit(int nr, volatile void * addr) synch_const_test_bit((nr),(addr)) : \ synch_var_test_bit((nr),(addr))) +static inline int +HYPERVISOR_xsm_op( + struct xen_flask_op *op) +{ + return _hypercall1(int, xsm_op, op); +} #undef ADDR -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:11:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJe-0002OH-Dd; Wed, 10 Sep 2014 03:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJd-0002OB-Gz for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:29 +0000 Received: from [85.158.139.211:6388] by server-16.bemta-5.messagelabs.com id 2C/4A-01029-061CF045; Wed, 10 Sep 2014 03:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1410318686!9370750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27452 invoked from network); 10 Sep 2014 03:11:27 -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; 10 Sep 2014 03:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJZ-0004Th-S3 for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJZ-0001ny-QG for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:25 +0000 Date: Wed, 10 Sep 2014 03:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: move poor rand function to test.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b4afdbe8199a85c4a187d4ee3763b09606df121 Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:32 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:36 2014 +0100 mini-os: move poor rand function to test.c It's only used by test.c and probably isn't something that should be exposed for general use (it just calls gettimeofday). This is also useful for ARM, which doesn't use math.c, where this used to live. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/lib/math.c | 13 ------------- extras/mini-os/test.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extras/mini-os/lib/math.c b/extras/mini-os/lib/math.c index c941b4c..561393e 100644 --- a/extras/mini-os/lib/math.c +++ b/extras/mini-os/lib/math.c @@ -424,16 +424,3 @@ __moddi3(quad_t a, quad_t b) (void)__qdivrem(ua, ub, &ur); return (neg ? -ur : ur); } - -#ifndef HAVE_LIBC -/* Should be random enough for our uses */ -int rand(void) -{ - static unsigned int previous; - struct timeval tv; - gettimeofday(&tv, NULL); - previous += tv.tv_sec + tv.tv_usec; - previous *= RAND_MIX; - return previous; -} -#endif diff --git a/extras/mini-os/test.c b/extras/mini-os/test.c index 20d372b..0d7aba4 100644 --- a/extras/mini-os/test.c +++ b/extras/mini-os/test.c @@ -60,6 +60,19 @@ static void xenbus_tester(void *p) } #endif +#ifndef HAVE_LIBC +/* Should be random enough for our uses */ +int rand(void) +{ + static unsigned int previous; + struct timeval tv; + gettimeofday(&tv, NULL); + previous += tv.tv_sec + tv.tv_usec; + previous *= RAND_MIX; + return previous; +} +#endif + static void periodic_thread(void *p) { struct timeval tv; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 03:11:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJe-0002OH-Dd; Wed, 10 Sep 2014 03:11:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJd-0002OB-Gz for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:29 +0000 Received: from [85.158.139.211:6388] by server-16.bemta-5.messagelabs.com id 2C/4A-01029-061CF045; Wed, 10 Sep 2014 03:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1410318686!9370750!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27452 invoked from network); 10 Sep 2014 03:11:27 -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; 10 Sep 2014 03:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJZ-0004Th-S3 for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJZ-0001ny-QG for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:25 +0000 Date: Wed, 10 Sep 2014 03:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: move poor rand function to test.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b4afdbe8199a85c4a187d4ee3763b09606df121 Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:32 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:36 2014 +0100 mini-os: move poor rand function to test.c It's only used by test.c and probably isn't something that should be exposed for general use (it just calls gettimeofday). This is also useful for ARM, which doesn't use math.c, where this used to live. Signed-off-by: Thomas Leonard Acked-by: Samuel Thibault --- extras/mini-os/lib/math.c | 13 ------------- extras/mini-os/test.c | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/extras/mini-os/lib/math.c b/extras/mini-os/lib/math.c index c941b4c..561393e 100644 --- a/extras/mini-os/lib/math.c +++ b/extras/mini-os/lib/math.c @@ -424,16 +424,3 @@ __moddi3(quad_t a, quad_t b) (void)__qdivrem(ua, ub, &ur); return (neg ? -ur : ur); } - -#ifndef HAVE_LIBC -/* Should be random enough for our uses */ -int rand(void) -{ - static unsigned int previous; - struct timeval tv; - gettimeofday(&tv, NULL); - previous += tv.tv_sec + tv.tv_usec; - previous *= RAND_MIX; - return previous; -} -#endif diff --git a/extras/mini-os/test.c b/extras/mini-os/test.c index 20d372b..0d7aba4 100644 --- a/extras/mini-os/test.c +++ b/extras/mini-os/test.c @@ -60,6 +60,19 @@ static void xenbus_tester(void *p) } #endif +#ifndef HAVE_LIBC +/* Should be random enough for our uses */ +int rand(void) +{ + static unsigned int previous; + struct timeval tv; + gettimeofday(&tv, NULL); + previous += tv.tv_sec + tv.tv_usec; + previous *= RAND_MIX; + return previous; +} +#endif + static void periodic_thread(void *p) { struct timeval tv; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 03:11:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJo-0002Ph-HT; Wed, 10 Sep 2014 03:11:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJn-0002PQ-EV for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:39 +0000 Received: from [85.158.143.35:17632] by server-2.bemta-4.messagelabs.com id AE/C0-04525-A61CF045; Wed, 10 Sep 2014 03:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1410318696!12044890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12079 invoked from network); 10 Sep 2014 03:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJk-0004Tp-1p for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJk-0001oO-01 for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:36 +0000 Date: Wed, 10 Sep 2014 03:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: add header files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit abc465b15c341035e6a398e34a108be63035cfc2 Author: Karim Raslan AuthorDate: Fri Aug 8 16:47:33 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:49 2014 +0100 mini-os: arm: add header files Adds header files for future ARM support. Based on work by Karim Allah Ahmed. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Julien Grall Acked-by: Samuel Thibault --- extras/mini-os/include/arm/arch_endian.h | 7 + extras/mini-os/include/arm/arch_limits.h | 9 + extras/mini-os/include/arm/arch_mm.h | 38 ++++ extras/mini-os/include/arm/arch_sched.h | 19 ++ extras/mini-os/include/arm/arch_spinlock.h | 36 ++++ extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 + extras/mini-os/include/arm/gic.h | 1 + extras/mini-os/include/arm/hypercall-arm.h | 98 ++++++++++ extras/mini-os/include/arm/os.h | 216 ++++++++++++++++++++++ extras/mini-os/include/arm/traps.h | 20 ++ extras/mini-os/include/hypervisor.h | 2 + extras/mini-os/include/mm.h | 2 + extras/mini-os/include/types.h | 10 +- 13 files changed, 454 insertions(+), 5 deletions(-) diff --git a/extras/mini-os/include/arm/arch_endian.h b/extras/mini-os/include/arm/arch_endian.h new file mode 100644 index 0000000..0771683 --- /dev/null +++ b/extras/mini-os/include/arm/arch_endian.h @@ -0,0 +1,7 @@ +#ifndef ARCH_ENDIAN_H +#error "Do not include arch_endian by itself, include endian.h" +#else + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif diff --git a/extras/mini-os/include/arm/arch_limits.h b/extras/mini-os/include/arm/arch_limits.h new file mode 100644 index 0000000..bae99e1 --- /dev/null +++ b/extras/mini-os/include/arm/arch_limits.h @@ -0,0 +1,9 @@ +#ifndef __ARCH_LIMITS_H__ +#define __ARCH_LIMITS_H__ + +#include + +#define __STACK_SIZE_PAGE_ORDER 2 +#define __STACK_SIZE (4 * PAGE_SIZE) + +#endif diff --git a/extras/mini-os/include/arm/arch_mm.h b/extras/mini-os/include/arm/arch_mm.h new file mode 100644 index 0000000..085d4e5 --- /dev/null +++ b/extras/mini-os/include/arm/arch_mm.h @@ -0,0 +1,38 @@ +#ifndef _ARCH_MM_H_ +#define _ARCH_MM_H_ + +typedef uint64_t paddr_t; + +extern char _text, _etext, _erodata, _edata, _end, __bss_start; +extern int _boot_stack[]; +extern int _boot_stack_end[]; +extern uint32_t physical_address_offset; /* Add this to a virtual address to get the physical address (wraps at 4GB) */ + +#define PAGE_SHIFT 12 +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE-1)) + +#define L1_PAGETABLE_SHIFT 12 + +#define to_phys(x) (((paddr_t)(x)+physical_address_offset) & 0xffffffff) +#define to_virt(x) ((void *)(((x)-physical_address_offset) & 0xffffffff)) + +#define PFN_UP(x) (unsigned long)(((x) + PAGE_SIZE-1) >> L1_PAGETABLE_SHIFT) +#define PFN_DOWN(x) (unsigned long)((x) >> L1_PAGETABLE_SHIFT) +#define PFN_PHYS(x) ((uint64_t)(x) << L1_PAGETABLE_SHIFT) +#define PHYS_PFN(x) (unsigned long)((x) >> L1_PAGETABLE_SHIFT) + +#define virt_to_pfn(_virt) (PFN_DOWN(to_phys(_virt))) +#define virt_to_mfn(_virt) (PFN_DOWN(to_phys(_virt))) +#define mfn_to_virt(_mfn) (to_virt(PFN_PHYS(_mfn))) +#define pfn_to_virt(_pfn) (to_virt(PFN_PHYS(_pfn))) + +#define mfn_to_pfn(x) (x) +#define pfn_to_mfn(x) (x) + +#define virtual_to_mfn(_virt) virt_to_mfn(_virt) + +// FIXME +#define map_frames(f, n) (NULL) + +#endif diff --git a/extras/mini-os/include/arm/arch_sched.h b/extras/mini-os/include/arm/arch_sched.h new file mode 100644 index 0000000..de3ac02 --- /dev/null +++ b/extras/mini-os/include/arm/arch_sched.h @@ -0,0 +1,19 @@ +#ifndef __ARCH_SCHED_H__ +#define __ARCH_SCHED_H__ + +#include "arch_limits.h" + +static inline struct thread* get_current(void) +{ + struct thread **current; + unsigned long sp; + __asm__ __volatile__ ("mov %0, sp":"=r"(sp)); + current = (void *)(unsigned long)(sp & ~(__STACK_SIZE-1)); + return *current; +} + +void __arch_switch_threads(unsigned long *prevctx, unsigned long *nextctx); + +#define arch_switch_threads(prev,next) __arch_switch_threads(&(prev)->sp, &(next)->sp) + +#endif /* __ARCH_SCHED_H__ */ diff --git a/extras/mini-os/include/arm/arch_spinlock.h b/extras/mini-os/include/arm/arch_spinlock.h new file mode 100755 index 0000000..dccb9fc --- /dev/null +++ b/extras/mini-os/include/arm/arch_spinlock.h @@ -0,0 +1,36 @@ +#ifndef __ARCH_ASM_SPINLOCK_H +#define __ARCH_ASM_SPINLOCK_H + +#include "os.h" + +#define ARCH_SPIN_LOCK_UNLOCKED { 1 } + +/* + * Simple spin lock operations. There are two variants, one clears IRQ's + * on the local processor, one does not. + * + * We make no fairness assumptions. They have a cost. + */ + +#define arch_spin_is_locked(x) (*(volatile signed char *)(&(x)->slock) <= 0) +#define arch_spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) + +static inline void _raw_spin_unlock(spinlock_t *lock) +{ + xchg(&lock->slock, 1); +} + +static inline int _raw_spin_trylock(spinlock_t *lock) +{ + return xchg(&lock->slock, 0) != 0 ? 1 : 0; +} + +static inline void _raw_spin_lock(spinlock_t *lock) +{ + volatile int was_locked; + do { + was_locked = xchg(&lock->slock, 0) == 0 ? 1 : 0; + } while(was_locked); +} + +#endif diff --git a/extras/mini-os/include/arm/arm32/arch_wordsize.h b/extras/mini-os/include/arm/arm32/arch_wordsize.h new file mode 100644 index 0000000..b47eee9 --- /dev/null +++ b/extras/mini-os/include/arm/arm32/arch_wordsize.h @@ -0,0 +1 @@ +#define __WORDSIZE 32 diff --git a/extras/mini-os/include/arm/gic.h b/extras/mini-os/include/arm/gic.h new file mode 100644 index 0000000..cead2e5 --- /dev/null +++ b/extras/mini-os/include/arm/gic.h @@ -0,0 +1 @@ +void gic_init(void); diff --git a/extras/mini-os/include/arm/hypercall-arm.h b/extras/mini-os/include/arm/hypercall-arm.h new file mode 100644 index 0000000..26ac9f8 --- /dev/null +++ b/extras/mini-os/include/arm/hypercall-arm.h @@ -0,0 +1,98 @@ +/****************************************************************************** + * hypercall-arm.h + * + * Copied from XenLinux. + * + * Copyright (c) 2002-2004, K A Fraser + * + * 64-bit updates: + * Benjamin Liu + * Jun Nakajima + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __HYPERCALL_ARM_H__ +#define __HYPERCALL_ARM_H__ + +#include +#include +#include +#include + +int +HYPERVISOR_sched_op( + int cmd, void *arg); + +static inline int +HYPERVISOR_shutdown( + unsigned int reason) +{ + struct sched_shutdown shutdown = { .reason = reason }; + HYPERVISOR_sched_op(SCHEDOP_shutdown, &shutdown); +} + +int +HYPERVISOR_memory_op( + unsigned int cmd, void *arg); + +int +HYPERVISOR_event_channel_op( + int cmd, void *op); + +int +HYPERVISOR_xen_version( + int cmd, void *arg); + +int +HYPERVISOR_console_io( + int cmd, int count, char *str); + +int +HYPERVISOR_physdev_op( + void *physdev_op); + +int +HYPERVISOR_grant_table_op( + unsigned int cmd, void *uop, unsigned int count); + +int +HYPERVISOR_vcpu_op( + int cmd, int vcpuid, void *extra_args); + +int +HYPERVISOR_sysctl( + unsigned long op); + +int +HYPERVISOR_domctl( + unsigned long op); + +int +HYPERVISOR_hvm_op( + unsigned long op, void *arg); + +int +HYPERVISOR_xsm_op( + struct xen_flask_op *); + +#endif /* __HYPERCALL_ARM_H__ */ diff --git a/extras/mini-os/include/arm/os.h b/extras/mini-os/include/arm/os.h new file mode 100644 index 0000000..6a1cc37 --- /dev/null +++ b/extras/mini-os/include/arm/os.h @@ -0,0 +1,216 @@ +#ifndef _OS_H_ +#define _OS_H_ + +#ifndef __ASSEMBLY__ + +#include +#include +#include +#include +#include + +void arch_fini(void); +void timer_handler(evtchn_port_t port, struct pt_regs *regs, void *ign); + +extern void *device_tree; + +#define BUG() while(1){asm volatile (".word 0xe7f000f0\n");} /* Undefined instruction; will call our fault handler. */ + +#define smp_processor_id() 0 + +#define barrier() __asm__ __volatile__("": : :"memory") + +extern shared_info_t *HYPERVISOR_shared_info; + +// disable interrupts +static inline void local_irq_disable(void) { + __asm__ __volatile__("cpsid i":::"memory"); +} + +// enable interrupts +static inline void local_irq_enable(void) { + __asm__ __volatile__("cpsie i":::"memory"); +} + +#define local_irq_save(x) { \ + __asm__ __volatile__("mrs %0, cpsr;cpsid i":"=r"(x)::"memory"); \ +} + +#define local_irq_restore(x) { \ + __asm__ __volatile__("msr cpsr_c, %0"::"r"(x):"memory"); \ +} + +#define local_save_flags(x) { \ + __asm__ __volatile__("mrs %0, cpsr":"=r"(x)::"memory"); \ +} + +static inline int irqs_disabled(void) { + int x; + local_save_flags(x); + return x & 0x80; +} + +/* We probably only need "dmb" here, but we'll start by being paranoid. */ +#define mb() __asm__("dsb":::"memory"); +#define rmb() __asm__("dsb":::"memory"); +#define wmb() __asm__("dsb":::"memory"); + +/************************** arm *******************************/ +#ifdef __INSIDE_MINIOS__ +#if defined (__arm__) +#define xchg(ptr,v) __atomic_exchange_n(ptr, v, __ATOMIC_SEQ_CST) + +/** + * test_and_clear_bit - Clear a bit and return its old value + * @nr: Bit to clear + * @addr: Address to count from + * + * Note that @nr may be almost arbitrarily large; this function is not + * restricted to acting on a single-word quantity. + * + * This operation is atomic. + * If you need a memory barrier, use synch_test_and_clear_bit instead. + */ +static __inline__ int test_and_clear_bit(int nr, volatile void * addr) +{ + uint8_t *byte = ((uint8_t *)addr) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_and(byte, ~bit, __ATOMIC_RELAXED); + + return (orig & bit) != 0; +} + +/** + * Atomically set a bit and return the old value. + * Similar to test_and_clear_bit. + */ +static __inline__ int test_and_set_bit(int nr, volatile void *base) +{ + uint8_t *byte = ((uint8_t *)base) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_or(byte, bit, __ATOMIC_RELAXED); + + return (orig & bit) != 0; +} + +/** + * Test whether a bit is set. */ +static __inline__ int test_bit(int nr, const volatile unsigned long *addr) +{ + const uint8_t *ptr = (const uint8_t *) addr; + return ((1 << (nr & 7)) & (ptr[nr >> 3])) != 0; +} + +/** + * Atomically set a bit in memory (like test_and_set_bit but discards result). + */ +static __inline__ void set_bit(int nr, volatile unsigned long *addr) +{ + test_and_set_bit(nr, addr); +} + +/** + * Atomically clear a bit in memory (like test_and_clear_bit but discards result). + */ +static __inline__ void clear_bit(int nr, volatile unsigned long *addr) +{ + test_and_clear_bit(nr, addr); +} + +/** + * __ffs - find first (lowest) set bit in word. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static __inline__ unsigned long __ffs(unsigned long word) +{ + int clz; + + /* xxxxx10000 = word + * xxxxx01111 = word - 1 + * 0000011111 = word ^ (word - 1) + * 4 = 31 - clz(word ^ (word - 1)) + */ + + __asm__ ( + "sub r0, %[word], #1\n" + "eor r0, r0, %[word]\n" + "clz %[clz], r0\n": + /* Outputs: */ + [clz] "=r"(clz): + /* Inputs: */ + [word] "r"(word): + /* Clobbers: */ + "r0"); + + return 31 - clz; +} + +#else /* ifdef __arm__ */ +#error "Unsupported architecture" +#endif +#endif /* ifdef __INSIDE_MINIOS */ + +/********************* common arm32 and arm64 ****************************/ + +/* If *ptr == old, then store new there (and return new). + * Otherwise, return the old value. + * Atomic. */ +#define synch_cmpxchg(ptr, old, new) \ +({ __typeof__(*ptr) stored = old; \ + __atomic_compare_exchange_n(ptr, &stored, new, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? new : old; \ +}) + +/* As test_and_clear_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ int synch_test_and_clear_bit(int nr, volatile void *addr) +{ + uint8_t *byte = ((uint8_t *)addr) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_and(byte, ~bit, __ATOMIC_SEQ_CST); + + return (orig & bit) != 0; +} + +/* As test_and_set_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ int synch_test_and_set_bit(int nr, volatile void *base) +{ + uint8_t *byte = ((uint8_t *)base) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_or(byte, bit, __ATOMIC_SEQ_CST); + + return (orig & bit) != 0; +} + +/* As set_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ void synch_set_bit(int nr, volatile void *addr) +{ + synch_test_and_set_bit(nr, addr); +} + +/* As clear_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ void synch_clear_bit(int nr, volatile void *addr) +{ + synch_test_and_clear_bit(nr, addr); +} + +/* As test_bit, but with a following memory barrier. */ +static __inline__ int synch_test_bit(int nr, volatile void *addr) +{ + int result; + result = test_bit(nr, addr); + barrier(); + return result; +} + +#endif /* not assembly */ + +#endif diff --git a/extras/mini-os/include/arm/traps.h b/extras/mini-os/include/arm/traps.h new file mode 100644 index 0000000..704df22 --- /dev/null +++ b/extras/mini-os/include/arm/traps.h @@ -0,0 +1,20 @@ +#ifndef _TRAPS_H_ +#define _TRAPS_H_ + +struct pt_regs { + unsigned long r0; + unsigned long r1; + unsigned long r2; + unsigned long r3; + unsigned long r4; + unsigned long r5; + unsigned long r6; + unsigned long r7; + unsigned long r8; + unsigned long r9; + unsigned long r10; + unsigned long r11; + unsigned long r12; +}; + +#endif diff --git a/extras/mini-os/include/hypervisor.h b/extras/mini-os/include/hypervisor.h index a62cb78..21b3566 100644 --- a/extras/mini-os/include/hypervisor.h +++ b/extras/mini-os/include/hypervisor.h @@ -18,6 +18,8 @@ #include #elif defined(__x86_64__) #include +#elif defined(__arm__) || defined(__aarch64__) +#include #else #error "Unsupported architecture" #endif diff --git a/extras/mini-os/include/mm.h b/extras/mini-os/include/mm.h index a177251..f57d8ab 100644 --- a/extras/mini-os/include/mm.h +++ b/extras/mini-os/include/mm.h @@ -29,6 +29,8 @@ #include #elif defined(__x86_64__) #include +#elif defined(__arm__) || defined(__aarch64__) +#include #else #error "Unsupported architecture" #endif diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h index 93356fe..be9f1d3 100644 --- a/extras/mini-os/include/types.h +++ b/extras/mini-os/include/types.h @@ -27,7 +27,7 @@ typedef unsigned char u_char; typedef unsigned int u_int; typedef unsigned long u_long; #endif -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) typedef long long quad_t; typedef unsigned long long u_quad_t; #elif defined(__x86_64__) @@ -39,10 +39,10 @@ typedef unsigned long u_quad_t; #include #include #else -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) typedef unsigned int uintptr_t; typedef int intptr_t; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) typedef unsigned long uintptr_t; typedef long intptr_t; #endif /* __i386__ || __x86_64__ */ @@ -52,10 +52,10 @@ typedef unsigned short uint16_t; typedef signed short int16_t; typedef unsigned int uint32_t; typedef signed int int32_t; -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) typedef signed long long int64_t; typedef unsigned long long uint64_t; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) typedef signed long int64_t; typedef unsigned long uint64_t; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:11:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJo-0002Ph-HT; Wed, 10 Sep 2014 03:11:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJn-0002PQ-EV for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:39 +0000 Received: from [85.158.143.35:17632] by server-2.bemta-4.messagelabs.com id AE/C0-04525-A61CF045; Wed, 10 Sep 2014 03:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1410318696!12044890!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12079 invoked from network); 10 Sep 2014 03:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJk-0004Tp-1p for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJk-0001oO-01 for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:36 +0000 Date: Wed, 10 Sep 2014 03:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: add header files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit abc465b15c341035e6a398e34a108be63035cfc2 Author: Karim Raslan AuthorDate: Fri Aug 8 16:47:33 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:15:49 2014 +0100 mini-os: arm: add header files Adds header files for future ARM support. Based on work by Karim Allah Ahmed. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Julien Grall Acked-by: Samuel Thibault --- extras/mini-os/include/arm/arch_endian.h | 7 + extras/mini-os/include/arm/arch_limits.h | 9 + extras/mini-os/include/arm/arch_mm.h | 38 ++++ extras/mini-os/include/arm/arch_sched.h | 19 ++ extras/mini-os/include/arm/arch_spinlock.h | 36 ++++ extras/mini-os/include/arm/arm32/arch_wordsize.h | 1 + extras/mini-os/include/arm/gic.h | 1 + extras/mini-os/include/arm/hypercall-arm.h | 98 ++++++++++ extras/mini-os/include/arm/os.h | 216 ++++++++++++++++++++++ extras/mini-os/include/arm/traps.h | 20 ++ extras/mini-os/include/hypervisor.h | 2 + extras/mini-os/include/mm.h | 2 + extras/mini-os/include/types.h | 10 +- 13 files changed, 454 insertions(+), 5 deletions(-) diff --git a/extras/mini-os/include/arm/arch_endian.h b/extras/mini-os/include/arm/arch_endian.h new file mode 100644 index 0000000..0771683 --- /dev/null +++ b/extras/mini-os/include/arm/arch_endian.h @@ -0,0 +1,7 @@ +#ifndef ARCH_ENDIAN_H +#error "Do not include arch_endian by itself, include endian.h" +#else + +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif diff --git a/extras/mini-os/include/arm/arch_limits.h b/extras/mini-os/include/arm/arch_limits.h new file mode 100644 index 0000000..bae99e1 --- /dev/null +++ b/extras/mini-os/include/arm/arch_limits.h @@ -0,0 +1,9 @@ +#ifndef __ARCH_LIMITS_H__ +#define __ARCH_LIMITS_H__ + +#include + +#define __STACK_SIZE_PAGE_ORDER 2 +#define __STACK_SIZE (4 * PAGE_SIZE) + +#endif diff --git a/extras/mini-os/include/arm/arch_mm.h b/extras/mini-os/include/arm/arch_mm.h new file mode 100644 index 0000000..085d4e5 --- /dev/null +++ b/extras/mini-os/include/arm/arch_mm.h @@ -0,0 +1,38 @@ +#ifndef _ARCH_MM_H_ +#define _ARCH_MM_H_ + +typedef uint64_t paddr_t; + +extern char _text, _etext, _erodata, _edata, _end, __bss_start; +extern int _boot_stack[]; +extern int _boot_stack_end[]; +extern uint32_t physical_address_offset; /* Add this to a virtual address to get the physical address (wraps at 4GB) */ + +#define PAGE_SHIFT 12 +#define PAGE_SIZE (1 << PAGE_SHIFT) +#define PAGE_MASK (~(PAGE_SIZE-1)) + +#define L1_PAGETABLE_SHIFT 12 + +#define to_phys(x) (((paddr_t)(x)+physical_address_offset) & 0xffffffff) +#define to_virt(x) ((void *)(((x)-physical_address_offset) & 0xffffffff)) + +#define PFN_UP(x) (unsigned long)(((x) + PAGE_SIZE-1) >> L1_PAGETABLE_SHIFT) +#define PFN_DOWN(x) (unsigned long)((x) >> L1_PAGETABLE_SHIFT) +#define PFN_PHYS(x) ((uint64_t)(x) << L1_PAGETABLE_SHIFT) +#define PHYS_PFN(x) (unsigned long)((x) >> L1_PAGETABLE_SHIFT) + +#define virt_to_pfn(_virt) (PFN_DOWN(to_phys(_virt))) +#define virt_to_mfn(_virt) (PFN_DOWN(to_phys(_virt))) +#define mfn_to_virt(_mfn) (to_virt(PFN_PHYS(_mfn))) +#define pfn_to_virt(_pfn) (to_virt(PFN_PHYS(_pfn))) + +#define mfn_to_pfn(x) (x) +#define pfn_to_mfn(x) (x) + +#define virtual_to_mfn(_virt) virt_to_mfn(_virt) + +// FIXME +#define map_frames(f, n) (NULL) + +#endif diff --git a/extras/mini-os/include/arm/arch_sched.h b/extras/mini-os/include/arm/arch_sched.h new file mode 100644 index 0000000..de3ac02 --- /dev/null +++ b/extras/mini-os/include/arm/arch_sched.h @@ -0,0 +1,19 @@ +#ifndef __ARCH_SCHED_H__ +#define __ARCH_SCHED_H__ + +#include "arch_limits.h" + +static inline struct thread* get_current(void) +{ + struct thread **current; + unsigned long sp; + __asm__ __volatile__ ("mov %0, sp":"=r"(sp)); + current = (void *)(unsigned long)(sp & ~(__STACK_SIZE-1)); + return *current; +} + +void __arch_switch_threads(unsigned long *prevctx, unsigned long *nextctx); + +#define arch_switch_threads(prev,next) __arch_switch_threads(&(prev)->sp, &(next)->sp) + +#endif /* __ARCH_SCHED_H__ */ diff --git a/extras/mini-os/include/arm/arch_spinlock.h b/extras/mini-os/include/arm/arch_spinlock.h new file mode 100755 index 0000000..dccb9fc --- /dev/null +++ b/extras/mini-os/include/arm/arch_spinlock.h @@ -0,0 +1,36 @@ +#ifndef __ARCH_ASM_SPINLOCK_H +#define __ARCH_ASM_SPINLOCK_H + +#include "os.h" + +#define ARCH_SPIN_LOCK_UNLOCKED { 1 } + +/* + * Simple spin lock operations. There are two variants, one clears IRQ's + * on the local processor, one does not. + * + * We make no fairness assumptions. They have a cost. + */ + +#define arch_spin_is_locked(x) (*(volatile signed char *)(&(x)->slock) <= 0) +#define arch_spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x)) + +static inline void _raw_spin_unlock(spinlock_t *lock) +{ + xchg(&lock->slock, 1); +} + +static inline int _raw_spin_trylock(spinlock_t *lock) +{ + return xchg(&lock->slock, 0) != 0 ? 1 : 0; +} + +static inline void _raw_spin_lock(spinlock_t *lock) +{ + volatile int was_locked; + do { + was_locked = xchg(&lock->slock, 0) == 0 ? 1 : 0; + } while(was_locked); +} + +#endif diff --git a/extras/mini-os/include/arm/arm32/arch_wordsize.h b/extras/mini-os/include/arm/arm32/arch_wordsize.h new file mode 100644 index 0000000..b47eee9 --- /dev/null +++ b/extras/mini-os/include/arm/arm32/arch_wordsize.h @@ -0,0 +1 @@ +#define __WORDSIZE 32 diff --git a/extras/mini-os/include/arm/gic.h b/extras/mini-os/include/arm/gic.h new file mode 100644 index 0000000..cead2e5 --- /dev/null +++ b/extras/mini-os/include/arm/gic.h @@ -0,0 +1 @@ +void gic_init(void); diff --git a/extras/mini-os/include/arm/hypercall-arm.h b/extras/mini-os/include/arm/hypercall-arm.h new file mode 100644 index 0000000..26ac9f8 --- /dev/null +++ b/extras/mini-os/include/arm/hypercall-arm.h @@ -0,0 +1,98 @@ +/****************************************************************************** + * hypercall-arm.h + * + * Copied from XenLinux. + * + * Copyright (c) 2002-2004, K A Fraser + * + * 64-bit updates: + * Benjamin Liu + * Jun Nakajima + * + * This file may be distributed separately from the Linux kernel, or + * incorporated into other software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#ifndef __HYPERCALL_ARM_H__ +#define __HYPERCALL_ARM_H__ + +#include +#include +#include +#include + +int +HYPERVISOR_sched_op( + int cmd, void *arg); + +static inline int +HYPERVISOR_shutdown( + unsigned int reason) +{ + struct sched_shutdown shutdown = { .reason = reason }; + HYPERVISOR_sched_op(SCHEDOP_shutdown, &shutdown); +} + +int +HYPERVISOR_memory_op( + unsigned int cmd, void *arg); + +int +HYPERVISOR_event_channel_op( + int cmd, void *op); + +int +HYPERVISOR_xen_version( + int cmd, void *arg); + +int +HYPERVISOR_console_io( + int cmd, int count, char *str); + +int +HYPERVISOR_physdev_op( + void *physdev_op); + +int +HYPERVISOR_grant_table_op( + unsigned int cmd, void *uop, unsigned int count); + +int +HYPERVISOR_vcpu_op( + int cmd, int vcpuid, void *extra_args); + +int +HYPERVISOR_sysctl( + unsigned long op); + +int +HYPERVISOR_domctl( + unsigned long op); + +int +HYPERVISOR_hvm_op( + unsigned long op, void *arg); + +int +HYPERVISOR_xsm_op( + struct xen_flask_op *); + +#endif /* __HYPERCALL_ARM_H__ */ diff --git a/extras/mini-os/include/arm/os.h b/extras/mini-os/include/arm/os.h new file mode 100644 index 0000000..6a1cc37 --- /dev/null +++ b/extras/mini-os/include/arm/os.h @@ -0,0 +1,216 @@ +#ifndef _OS_H_ +#define _OS_H_ + +#ifndef __ASSEMBLY__ + +#include +#include +#include +#include +#include + +void arch_fini(void); +void timer_handler(evtchn_port_t port, struct pt_regs *regs, void *ign); + +extern void *device_tree; + +#define BUG() while(1){asm volatile (".word 0xe7f000f0\n");} /* Undefined instruction; will call our fault handler. */ + +#define smp_processor_id() 0 + +#define barrier() __asm__ __volatile__("": : :"memory") + +extern shared_info_t *HYPERVISOR_shared_info; + +// disable interrupts +static inline void local_irq_disable(void) { + __asm__ __volatile__("cpsid i":::"memory"); +} + +// enable interrupts +static inline void local_irq_enable(void) { + __asm__ __volatile__("cpsie i":::"memory"); +} + +#define local_irq_save(x) { \ + __asm__ __volatile__("mrs %0, cpsr;cpsid i":"=r"(x)::"memory"); \ +} + +#define local_irq_restore(x) { \ + __asm__ __volatile__("msr cpsr_c, %0"::"r"(x):"memory"); \ +} + +#define local_save_flags(x) { \ + __asm__ __volatile__("mrs %0, cpsr":"=r"(x)::"memory"); \ +} + +static inline int irqs_disabled(void) { + int x; + local_save_flags(x); + return x & 0x80; +} + +/* We probably only need "dmb" here, but we'll start by being paranoid. */ +#define mb() __asm__("dsb":::"memory"); +#define rmb() __asm__("dsb":::"memory"); +#define wmb() __asm__("dsb":::"memory"); + +/************************** arm *******************************/ +#ifdef __INSIDE_MINIOS__ +#if defined (__arm__) +#define xchg(ptr,v) __atomic_exchange_n(ptr, v, __ATOMIC_SEQ_CST) + +/** + * test_and_clear_bit - Clear a bit and return its old value + * @nr: Bit to clear + * @addr: Address to count from + * + * Note that @nr may be almost arbitrarily large; this function is not + * restricted to acting on a single-word quantity. + * + * This operation is atomic. + * If you need a memory barrier, use synch_test_and_clear_bit instead. + */ +static __inline__ int test_and_clear_bit(int nr, volatile void * addr) +{ + uint8_t *byte = ((uint8_t *)addr) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_and(byte, ~bit, __ATOMIC_RELAXED); + + return (orig & bit) != 0; +} + +/** + * Atomically set a bit and return the old value. + * Similar to test_and_clear_bit. + */ +static __inline__ int test_and_set_bit(int nr, volatile void *base) +{ + uint8_t *byte = ((uint8_t *)base) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_or(byte, bit, __ATOMIC_RELAXED); + + return (orig & bit) != 0; +} + +/** + * Test whether a bit is set. */ +static __inline__ int test_bit(int nr, const volatile unsigned long *addr) +{ + const uint8_t *ptr = (const uint8_t *) addr; + return ((1 << (nr & 7)) & (ptr[nr >> 3])) != 0; +} + +/** + * Atomically set a bit in memory (like test_and_set_bit but discards result). + */ +static __inline__ void set_bit(int nr, volatile unsigned long *addr) +{ + test_and_set_bit(nr, addr); +} + +/** + * Atomically clear a bit in memory (like test_and_clear_bit but discards result). + */ +static __inline__ void clear_bit(int nr, volatile unsigned long *addr) +{ + test_and_clear_bit(nr, addr); +} + +/** + * __ffs - find first (lowest) set bit in word. + * @word: The word to search + * + * Undefined if no bit exists, so code should check against 0 first. + */ +static __inline__ unsigned long __ffs(unsigned long word) +{ + int clz; + + /* xxxxx10000 = word + * xxxxx01111 = word - 1 + * 0000011111 = word ^ (word - 1) + * 4 = 31 - clz(word ^ (word - 1)) + */ + + __asm__ ( + "sub r0, %[word], #1\n" + "eor r0, r0, %[word]\n" + "clz %[clz], r0\n": + /* Outputs: */ + [clz] "=r"(clz): + /* Inputs: */ + [word] "r"(word): + /* Clobbers: */ + "r0"); + + return 31 - clz; +} + +#else /* ifdef __arm__ */ +#error "Unsupported architecture" +#endif +#endif /* ifdef __INSIDE_MINIOS */ + +/********************* common arm32 and arm64 ****************************/ + +/* If *ptr == old, then store new there (and return new). + * Otherwise, return the old value. + * Atomic. */ +#define synch_cmpxchg(ptr, old, new) \ +({ __typeof__(*ptr) stored = old; \ + __atomic_compare_exchange_n(ptr, &stored, new, 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST) ? new : old; \ +}) + +/* As test_and_clear_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ int synch_test_and_clear_bit(int nr, volatile void *addr) +{ + uint8_t *byte = ((uint8_t *)addr) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_and(byte, ~bit, __ATOMIC_SEQ_CST); + + return (orig & bit) != 0; +} + +/* As test_and_set_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ int synch_test_and_set_bit(int nr, volatile void *base) +{ + uint8_t *byte = ((uint8_t *)base) + (nr >> 3); + uint8_t bit = 1 << (nr & 7); + uint8_t orig; + + orig = __atomic_fetch_or(byte, bit, __ATOMIC_SEQ_CST); + + return (orig & bit) != 0; +} + +/* As set_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ void synch_set_bit(int nr, volatile void *addr) +{ + synch_test_and_set_bit(nr, addr); +} + +/* As clear_bit, but using __ATOMIC_SEQ_CST */ +static __inline__ void synch_clear_bit(int nr, volatile void *addr) +{ + synch_test_and_clear_bit(nr, addr); +} + +/* As test_bit, but with a following memory barrier. */ +static __inline__ int synch_test_bit(int nr, volatile void *addr) +{ + int result; + result = test_bit(nr, addr); + barrier(); + return result; +} + +#endif /* not assembly */ + +#endif diff --git a/extras/mini-os/include/arm/traps.h b/extras/mini-os/include/arm/traps.h new file mode 100644 index 0000000..704df22 --- /dev/null +++ b/extras/mini-os/include/arm/traps.h @@ -0,0 +1,20 @@ +#ifndef _TRAPS_H_ +#define _TRAPS_H_ + +struct pt_regs { + unsigned long r0; + unsigned long r1; + unsigned long r2; + unsigned long r3; + unsigned long r4; + unsigned long r5; + unsigned long r6; + unsigned long r7; + unsigned long r8; + unsigned long r9; + unsigned long r10; + unsigned long r11; + unsigned long r12; +}; + +#endif diff --git a/extras/mini-os/include/hypervisor.h b/extras/mini-os/include/hypervisor.h index a62cb78..21b3566 100644 --- a/extras/mini-os/include/hypervisor.h +++ b/extras/mini-os/include/hypervisor.h @@ -18,6 +18,8 @@ #include #elif defined(__x86_64__) #include +#elif defined(__arm__) || defined(__aarch64__) +#include #else #error "Unsupported architecture" #endif diff --git a/extras/mini-os/include/mm.h b/extras/mini-os/include/mm.h index a177251..f57d8ab 100644 --- a/extras/mini-os/include/mm.h +++ b/extras/mini-os/include/mm.h @@ -29,6 +29,8 @@ #include #elif defined(__x86_64__) #include +#elif defined(__arm__) || defined(__aarch64__) +#include #else #error "Unsupported architecture" #endif diff --git a/extras/mini-os/include/types.h b/extras/mini-os/include/types.h index 93356fe..be9f1d3 100644 --- a/extras/mini-os/include/types.h +++ b/extras/mini-os/include/types.h @@ -27,7 +27,7 @@ typedef unsigned char u_char; typedef unsigned int u_int; typedef unsigned long u_long; #endif -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) typedef long long quad_t; typedef unsigned long long u_quad_t; #elif defined(__x86_64__) @@ -39,10 +39,10 @@ typedef unsigned long u_quad_t; #include #include #else -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) typedef unsigned int uintptr_t; typedef int intptr_t; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) typedef unsigned long uintptr_t; typedef long intptr_t; #endif /* __i386__ || __x86_64__ */ @@ -52,10 +52,10 @@ typedef unsigned short uint16_t; typedef signed short int16_t; typedef unsigned int uint32_t; typedef signed int int32_t; -#ifdef __i386__ +#if defined(__i386__) || defined(__arm__) typedef signed long long int64_t; typedef unsigned long long uint64_t; -#elif defined(__x86_64__) +#elif defined(__x86_64__) || defined(__aarch64__) typedef signed long int64_t; typedef unsigned long uint64_t; #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:11:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJz-0002Rh-Nb; Wed, 10 Sep 2014 03:11:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJy-0002RL-0C for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:50 +0000 Content-Length: 16464 Received: from [85.158.139.211:40690] by server-17.bemta-5.messagelabs.com id E3/D8-08943-571CF045; Wed, 10 Sep 2014 03:11:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1410318706!13540342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9834 invoked from network); 10 Sep 2014 03:11:47 -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; 10 Sep 2014 03:11:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJu-0004Tv-6k for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJu-0001ok-5U for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:46 +0000 Date: Wed, 10 Sep 2014 03:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: boot code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0339609217950956841==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0339609217950956841== Content-Length: 16534 Content-Transfer-Encoding: quoted-printable commit dce56dfac03cdc55b95e764b953f459ca0abe5b6 Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:34 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:16:06 2014 +0100 mini-os: arm: boot code Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/arm32.S | 211 ++++++++++++++++++++++++++++++ extras/mini-os/arch/arm/hypercalls32.S | 64 +++++++++ extras/mini-os/arch/arm/minios-arm32.lds | 83 ++++++++++++ extras/mini-os/arch/arm/setup.c | 119 +++++++++++++++++ 4 files changed, 477 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/arm32.S b/extras/mini-os/arch/arm/arm32.S new file mode 100644 index 0000000..d2e6932 --- /dev/null +++ b/extras/mini-os/arch/arm/arm32.S @@ -0,0 +1,211 @@ +@ Offset of the kernel within the RAM. This is a Linux/zImage convention which we +@ rely on for now. +#define ZIMAGE_KERNEL_OFFSET 0x8000 + +.section .text + +.globl _start +_start: + @ zImage header +.rept 8 + mov r0, r0 +.endr + b reset + .word 0x016f2818 @ Magic numbers to help the loader + .word 0 @ zImage start address (0 =3D relocatable) + .word _edata - _start @ zImage end address (excludes bss section) + @ end of zImage header + +@ Called at boot time. Sets up MMU, exception vectors and stack, and then calls C arch_init() function. +@ =3D> r2 -> DTB +@ <=3D never returns +@ Note: this boot code needs to be within the first (1MB - ZIMAGE_KERNEL_OFFSET) of _start. +reset: + @ Problem: the C code wants to be at a known address (_start), but Xen might + @ load us anywhere. We initialise the MMU (mapping virtual to physical @ addresses) + @ so everything ends up where the code expects it to be. + @ + @ We calculate the offet between where the linker thought _start would be and where + @ it actually is and initialise the page tables to have that offset for every page. + @ + @ When we turn on the MMU, we're still executing at the old address. We don't want + @ the code to disappear from under us. So we have to do the mapping in stages: + @ + @ 1. set up a mapping to our current page from both its current and desired addresses + @ 2. enable the MMU + @ 3. jump to the new address + @ 4. remap all the other pages with the calculated offset + + adr r1, _start @ r1 =3D physical address of _start + ldr r3, =3D_start @ r3 =3D (desired) virtual address of _start + sub r9, r1, r3 @ r9 =3D (physical - virtual) offset + + ldr r7, =3D_page_dir @ r7 =3D (desired) virtual addr of translation table + add r1, r7, r9 @ r1 =3D physical addr of translation table + + @ Tell the system where our page table is located. + @ This is the 16 KB top-level translation table, in which + @ each word maps one 1MB virtual section to a physical section. + @ Note: We leave TTBCR as 0, meaning that only TTBR0 is used and + @ we use the short-descriptor format (32-bit physical addresses). + orr r0, r1, #0b0001011 @ Sharable, Inner/Outer Write-Back Write-Allocate Cacheable + mcr p15, 0, r0, c2, c0, 0 @ set TTBR0 + + @ Set access permission for domains. + @ Domains are deprecated, but we have to configure them anyway. + @ We mark every page as being domain 0 and set domain 0 to "client mode" + @ (client mode =3D use access flags in page table). + mov r0, #1 @ 1 =3D client + mcr p15, 0, r0, c3, c0, 0 @ DACR + + @ Template (flags) for a 1 MB page-table entry. + @ TEX[2:0] C B =3D 001 1 1 (outer and inner write-back, write-allocate) + ldr r8, =3D(0x2 + /* Section entry */ \ + 0xc + /* C B */ \ + (3 << 10) + /* Read/write */ \ + (1 << 12) + /* TEX */ \ + (1 << 16) + /* Sharable */ \ + (1<<19)) /* Non-secure */ + @ r8 =3D template page table entry + + @ Add an entry for the current physical section, at the old and new + @ addresses. It's OK if they're the same. + mov r0, pc, lsr#20 + mov r0, r0, lsl#20 @ r0 =3D physical address of this code's section start + orr r3, r0, r8 @ r3 =3D table entry for this section + ldr r4, =3D_start @ r4 =3D desired virtual address of this section + str r3, [r1, r4, lsr#18] @ map desired virtual section to this code + str r3, [r1, r0, lsr#18] @ map current section to this code too + + @ Invalidate TLB + dsb @ Caching is off, but must still prevent reordering + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + + @ Enable MMU / SCTLR + mrc p15, 0, r1, c1, c0, 0 @ SCTLR + orr r1, r1, #3 << 11 @ enable icache, branch prediction + orr r1, r1, #4 + 1 @ enable dcache, MMU + mcr p15, 0, r1, c1, c0, 0 @ SCTLR + isb + + ldr r1, =3Dstage2 @ Virtual address of stage2 + bx r1 + +@ Called once the MMU is enabled. The boot code and the page table are mapped, +@ but nothing else is yet. +@ +@ =3D> r2 -> dtb (physical) +@ r7 =3D virtual address of page table +@ r8 =3D section entry template (flags) +@ r9 =3D desired physical - virtual offset +@ pc -> somewhere in newly-mapped virtual code section +stage2: + @ Invalidate TLB + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ The new mapping has now taken effect: + @ r7 -> page_dir + + @ Fill in the whole top-level translation table (at page_dir). + @ Populate the whole pagedir with 1MB section descriptors. + + mov r1, r7 @ r1 -> first section entry + add r3, r1, #4*4*1024 @ limit (4 GB address space, 4 byte entries) + orr r0, r8, r9 @ r0 =3D entry mapping section zero to start of physical RAM +1: + str r0, [r1],#4 @ write the section entry + add r0, r0, #1 << 20 @ next physical page (wraps) + cmp r1, r3 + bne 1b + + @ Invalidate TLB + dsb + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ Set VBAR -> exception_vector_table + @ SCTLR.V =3D 0 + adr r0, exception_vector_table + mcr p15, 0, r0, c12, c0, 0 + + @ Enable hardware floating point: + @ 1. Access to CP10 and CP11 must be enabled in the Coprocessor Access + @ Control Register (CP15.CACR): + mrc p15, 0, r1, c1, c0, 2 @ CACR + orr r1, r1, #(3 << 20) + (3 << 22) @ full access for CP10 & CP11 + mcr p15, 0, r1, c1, c0, 2 + @ 2. The EN bit in the FPEXC register must be set: + vmrs r0, FPEXC + orr r0, r0, #1<<30 @ EN (enable) + vmsr FPEXC, r0 + + @ Initialise 16 KB stack + ldr sp, =3D_boot_stack_end + + sub r0, r2, r9 @ r0 -> device tree (virtual address) + mov r1, r9 @ r1 =3D physical_address_offset + + b arch_init + +.pushsection .bss +@ Note: calling arch_init zeroes out this region. +.align 12 +.globl shared_info_page +shared_info_page: + .fill (1024), 4, 0x0 + +.align 3 +.globl irqstack +.globl irqstack_end +irqstack: + .fill (1024), 4, 0x0 +irqstack_end: + +.popsection + +@ exception base address +.align 5 +.globl exception_vector_table +@ Note: remember to call CLREX if returning from an exception: +@ "The architecture enables the local monitor to treat any exclusive store as +@ matching a previous LDREX address. For this reason, use of the CLREX +@ instruction to clear an existing tag is required on context switches." +@ -- ARM Cortex-A Series Programmer=E2=80=99s Guide (Version: 4.0) +exception_vector_table: + b . @ reset + b . @ undefined instruction + b . @ supervisor call + b . @ prefetch call + b . @ prefetch abort + b . @ data abort + b irq_handler @ irq + .word 0xe7f000f0 @ abort on FIQ + +@ Call fault_undefined_instruction in "Undefined mode" +bug: + .word 0xe7f000f0 @ und/udf - a "Permanently Undefined" instruction + +irq_handler: + ldr sp, =3Dirqstack_end + push {r0 - r12, r14} + + ldr r0, IRQ_handler + cmp r0, #0 + beq bug + blx r0 @ call handler + + @ Return from IRQ + pop {r0 - r12, r14} + clrex + subs pc, lr, #4 + +.globl IRQ_handler +IRQ_handler: + .long 0x0 + +@ This is called if you try to divide by zero. For now, we make a supervisor call, +@ which will make us halt. +.globl raise +raise: + svc 0 diff --git a/extras/mini-os/arch/arm/hypercalls32.S b/extras/mini-os/arch/arm/hypercalls32.S new file mode 100644 index 0000000..af8e175 --- /dev/null +++ b/extras/mini-os/arch/arm/hypercalls32.S @@ -0,0 +1,64 @@ +/****************************************************************************** + * hypercall.S + * + * Xen hypercall wrappers + * + * Stefano Stabellini , Citrix, 2012 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include + +#define __HVC(imm16) .long ((0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F)) & 0xFFFFFFFF) + +#define XEN_IMM 0xEA1 + +#define HYPERCALL_SIMPLE(hypercall) \ +.globl HYPERVISOR_##hypercall; \ +.align 4,0x90; \ +HYPERVISOR_##hypercall: \ + mov r12, #__HYPERVISOR_##hypercall; \ + __HVC(XEN_IMM); \ + mov pc, lr; + +#define _hypercall0 HYPERCALL_SIMPLE +#define _hypercall1 HYPERCALL_SIMPLE +#define _hypercall2 HYPERCALL_SIMPLE +#define _hypercall3 HYPERCALL_SIMPLE +#define _hypercall4 HYPERCALL_SIMPLE + +_hypercall2(sched_op); +_hypercall2(memory_op); +_hypercall2(event_channel_op); +_hypercall2(xen_version); +_hypercall3(console_io); +_hypercall1(physdev_op); +_hypercall3(grant_table_op); +_hypercall3(vcpu_op); +_hypercall1(sysctl); +_hypercall1(domctl); +_hypercall2(hvm_op); +_hypercall1(xsm_op); diff --git a/extras/mini-os/arch/arm/minios-arm32.lds b/extras/mini-os/arch/arm/minios-arm32.lds new file mode 100755 index 0000000..9627162 --- /dev/null +++ b/extras/mini-os/arch/arm/minios-arm32.lds @@ -0,0 +1,83 @@ +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + /* Note: we currently assume that Xen will load the kernel image + * at start-of-RAM + 0x8000. We use this initial 32 KB for the stack + * and translation tables. + */ + _boot_stack =3D 0x400000; /* 16 KB boot stack */ + _boot_stack_end =3D 0x404000; + _page_dir =3D 0x404000; /* 16 KB translation table */ + . =3D 0x408000; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(32 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + LONG(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + LONG(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + /* Note: linker will insert any extra sections here, just before .bss */ + + .bss : { + _edata =3D .; /* End of data included in image */ + /* Nothing after here is included in the zImage's size */ + + __bss_start =3D .; + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os/arch/arm/setup.c b/extras/mini-os/arch/arm/setup.c new file mode 100644 index 0000000..06afe46 --- /dev/null +++ b/extras/mini-os/arch/arm/setup.c @@ -0,0 +1,119 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * This structure contains start-of-day info, such as pagetable base pointer, + * address of the shared_info structure, and things like that. + * On x86, the hypervisor passes it to us. On ARM, we fill it in ourselves. + */ +union start_info_union start_info_union; + +/* + * Shared page for communicating with the hypervisor. + * Events flags go here, for example. + */ +shared_info_t *HYPERVISOR_shared_info; + +extern char shared_info_page[PAGE_SIZE]; + +void *device_tree; + +static int hvm_get_parameter(int idx, uint64_t *value) +{ + struct xen_hvm_param xhv; + int ret; + + xhv.domid =3D DOMID_SELF; + xhv.index =3D idx; + ret =3D HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); + if (ret < 0) { + BUG(); + } + *value =3D xhv.value; + return ret; +} + +static void get_console(void) +{ + uint64_t v =3D -1; + + hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v); + start_info.console.domU.evtchn =3D v; + + hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v); + start_info.console.domU.mfn =3D v; + + printk("Console is on port %d\n", start_info.console.domU.evtchn); + printk("Console ring is at mfn %lx\n", (unsigned long) start_info.console.domU.mfn); +} + +void get_xenbus(void) +{ + uint64_t value; + + if (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &value)) + BUG(); + + start_info.store_evtchn =3D (int)value; + + if(hvm_get_parameter(HVM_PARAM_STORE_PFN, &value)) + BUG(); + start_info.store_mfn =3D (unsigned long)value; +} + +/* + * INITIAL C ENTRY POINT. + */ +void arch_init(void *dtb_pointer, uint32_t physical_offset) +{ + struct xen_add_to_physmap xatp; + int r; + + memset(&__bss_start, 0, &_end - &__bss_start); + + physical_address_offset =3D physical_offset; + + xprintk("Virtual -> physical offset =3D %x\n", physical_address_offset); + + xprintk("Checking DTB at %p...\n", dtb_pointer); + + if ((r =3D fdt_check_header(dtb_pointer))) { + xprintk("Invalid DTB from Xen: %s\n", fdt_strerror(r)); + BUG(); + } + device_tree =3D dtb_pointer; + + /* Map shared_info page */ + xatp.domid =3D DOMID_SELF; + xatp.idx =3D 0; + xatp.space =3D XENMAPSPACE_shared_info; + xatp.gpfn =3D virt_to_pfn(shared_info_page); + if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp) !=3D 0) + BUG(); + HYPERVISOR_shared_info =3D (struct shared_info *)shared_info_page; + + /* Fill in start_info */ + get_console(); + get_xenbus(); + + gic_init(); + + start_kernel(); +} + +void +arch_fini(void) +{ +} + +void +arch_do_exit(void) +{ +} -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0339609217950956841== 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 --===============0339609217950956841==-- From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:11:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:11:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJz-0002Rh-Nb; Wed, 10 Sep 2014 03:11:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJy-0002RL-0C for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:50 +0000 Content-Length: 16464 Received: from [85.158.139.211:40690] by server-17.bemta-5.messagelabs.com id E3/D8-08943-571CF045; Wed, 10 Sep 2014 03:11:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1410318706!13540342!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9834 invoked from network); 10 Sep 2014 03:11:47 -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; 10 Sep 2014 03:11:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYJu-0004Tv-6k for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYJu-0001ok-5U for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:46 +0000 Date: Wed, 10 Sep 2014 03:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: boot code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0339609217950956841==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0339609217950956841== Content-Length: 16534 Content-Transfer-Encoding: quoted-printable commit dce56dfac03cdc55b95e764b953f459ca0abe5b6 Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:34 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:16:06 2014 +0100 mini-os: arm: boot code Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/arm32.S | 211 ++++++++++++++++++++++++++++++ extras/mini-os/arch/arm/hypercalls32.S | 64 +++++++++ extras/mini-os/arch/arm/minios-arm32.lds | 83 ++++++++++++ extras/mini-os/arch/arm/setup.c | 119 +++++++++++++++++ 4 files changed, 477 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/arm32.S b/extras/mini-os/arch/arm/arm32.S new file mode 100644 index 0000000..d2e6932 --- /dev/null +++ b/extras/mini-os/arch/arm/arm32.S @@ -0,0 +1,211 @@ +@ Offset of the kernel within the RAM. This is a Linux/zImage convention which we +@ rely on for now. +#define ZIMAGE_KERNEL_OFFSET 0x8000 + +.section .text + +.globl _start +_start: + @ zImage header +.rept 8 + mov r0, r0 +.endr + b reset + .word 0x016f2818 @ Magic numbers to help the loader + .word 0 @ zImage start address (0 =3D relocatable) + .word _edata - _start @ zImage end address (excludes bss section) + @ end of zImage header + +@ Called at boot time. Sets up MMU, exception vectors and stack, and then calls C arch_init() function. +@ =3D> r2 -> DTB +@ <=3D never returns +@ Note: this boot code needs to be within the first (1MB - ZIMAGE_KERNEL_OFFSET) of _start. +reset: + @ Problem: the C code wants to be at a known address (_start), but Xen might + @ load us anywhere. We initialise the MMU (mapping virtual to physical @ addresses) + @ so everything ends up where the code expects it to be. + @ + @ We calculate the offet between where the linker thought _start would be and where + @ it actually is and initialise the page tables to have that offset for every page. + @ + @ When we turn on the MMU, we're still executing at the old address. We don't want + @ the code to disappear from under us. So we have to do the mapping in stages: + @ + @ 1. set up a mapping to our current page from both its current and desired addresses + @ 2. enable the MMU + @ 3. jump to the new address + @ 4. remap all the other pages with the calculated offset + + adr r1, _start @ r1 =3D physical address of _start + ldr r3, =3D_start @ r3 =3D (desired) virtual address of _start + sub r9, r1, r3 @ r9 =3D (physical - virtual) offset + + ldr r7, =3D_page_dir @ r7 =3D (desired) virtual addr of translation table + add r1, r7, r9 @ r1 =3D physical addr of translation table + + @ Tell the system where our page table is located. + @ This is the 16 KB top-level translation table, in which + @ each word maps one 1MB virtual section to a physical section. + @ Note: We leave TTBCR as 0, meaning that only TTBR0 is used and + @ we use the short-descriptor format (32-bit physical addresses). + orr r0, r1, #0b0001011 @ Sharable, Inner/Outer Write-Back Write-Allocate Cacheable + mcr p15, 0, r0, c2, c0, 0 @ set TTBR0 + + @ Set access permission for domains. + @ Domains are deprecated, but we have to configure them anyway. + @ We mark every page as being domain 0 and set domain 0 to "client mode" + @ (client mode =3D use access flags in page table). + mov r0, #1 @ 1 =3D client + mcr p15, 0, r0, c3, c0, 0 @ DACR + + @ Template (flags) for a 1 MB page-table entry. + @ TEX[2:0] C B =3D 001 1 1 (outer and inner write-back, write-allocate) + ldr r8, =3D(0x2 + /* Section entry */ \ + 0xc + /* C B */ \ + (3 << 10) + /* Read/write */ \ + (1 << 12) + /* TEX */ \ + (1 << 16) + /* Sharable */ \ + (1<<19)) /* Non-secure */ + @ r8 =3D template page table entry + + @ Add an entry for the current physical section, at the old and new + @ addresses. It's OK if they're the same. + mov r0, pc, lsr#20 + mov r0, r0, lsl#20 @ r0 =3D physical address of this code's section start + orr r3, r0, r8 @ r3 =3D table entry for this section + ldr r4, =3D_start @ r4 =3D desired virtual address of this section + str r3, [r1, r4, lsr#18] @ map desired virtual section to this code + str r3, [r1, r0, lsr#18] @ map current section to this code too + + @ Invalidate TLB + dsb @ Caching is off, but must still prevent reordering + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + + @ Enable MMU / SCTLR + mrc p15, 0, r1, c1, c0, 0 @ SCTLR + orr r1, r1, #3 << 11 @ enable icache, branch prediction + orr r1, r1, #4 + 1 @ enable dcache, MMU + mcr p15, 0, r1, c1, c0, 0 @ SCTLR + isb + + ldr r1, =3Dstage2 @ Virtual address of stage2 + bx r1 + +@ Called once the MMU is enabled. The boot code and the page table are mapped, +@ but nothing else is yet. +@ +@ =3D> r2 -> dtb (physical) +@ r7 =3D virtual address of page table +@ r8 =3D section entry template (flags) +@ r9 =3D desired physical - virtual offset +@ pc -> somewhere in newly-mapped virtual code section +stage2: + @ Invalidate TLB + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ The new mapping has now taken effect: + @ r7 -> page_dir + + @ Fill in the whole top-level translation table (at page_dir). + @ Populate the whole pagedir with 1MB section descriptors. + + mov r1, r7 @ r1 -> first section entry + add r3, r1, #4*4*1024 @ limit (4 GB address space, 4 byte entries) + orr r0, r8, r9 @ r0 =3D entry mapping section zero to start of physical RAM +1: + str r0, [r1],#4 @ write the section entry + add r0, r0, #1 << 20 @ next physical page (wraps) + cmp r1, r3 + bne 1b + + @ Invalidate TLB + dsb + mcr p15, 0, r1, c8, c7, 0 @ TLBIALL + isb + + @ Set VBAR -> exception_vector_table + @ SCTLR.V =3D 0 + adr r0, exception_vector_table + mcr p15, 0, r0, c12, c0, 0 + + @ Enable hardware floating point: + @ 1. Access to CP10 and CP11 must be enabled in the Coprocessor Access + @ Control Register (CP15.CACR): + mrc p15, 0, r1, c1, c0, 2 @ CACR + orr r1, r1, #(3 << 20) + (3 << 22) @ full access for CP10 & CP11 + mcr p15, 0, r1, c1, c0, 2 + @ 2. The EN bit in the FPEXC register must be set: + vmrs r0, FPEXC + orr r0, r0, #1<<30 @ EN (enable) + vmsr FPEXC, r0 + + @ Initialise 16 KB stack + ldr sp, =3D_boot_stack_end + + sub r0, r2, r9 @ r0 -> device tree (virtual address) + mov r1, r9 @ r1 =3D physical_address_offset + + b arch_init + +.pushsection .bss +@ Note: calling arch_init zeroes out this region. +.align 12 +.globl shared_info_page +shared_info_page: + .fill (1024), 4, 0x0 + +.align 3 +.globl irqstack +.globl irqstack_end +irqstack: + .fill (1024), 4, 0x0 +irqstack_end: + +.popsection + +@ exception base address +.align 5 +.globl exception_vector_table +@ Note: remember to call CLREX if returning from an exception: +@ "The architecture enables the local monitor to treat any exclusive store as +@ matching a previous LDREX address. For this reason, use of the CLREX +@ instruction to clear an existing tag is required on context switches." +@ -- ARM Cortex-A Series Programmer=E2=80=99s Guide (Version: 4.0) +exception_vector_table: + b . @ reset + b . @ undefined instruction + b . @ supervisor call + b . @ prefetch call + b . @ prefetch abort + b . @ data abort + b irq_handler @ irq + .word 0xe7f000f0 @ abort on FIQ + +@ Call fault_undefined_instruction in "Undefined mode" +bug: + .word 0xe7f000f0 @ und/udf - a "Permanently Undefined" instruction + +irq_handler: + ldr sp, =3Dirqstack_end + push {r0 - r12, r14} + + ldr r0, IRQ_handler + cmp r0, #0 + beq bug + blx r0 @ call handler + + @ Return from IRQ + pop {r0 - r12, r14} + clrex + subs pc, lr, #4 + +.globl IRQ_handler +IRQ_handler: + .long 0x0 + +@ This is called if you try to divide by zero. For now, we make a supervisor call, +@ which will make us halt. +.globl raise +raise: + svc 0 diff --git a/extras/mini-os/arch/arm/hypercalls32.S b/extras/mini-os/arch/arm/hypercalls32.S new file mode 100644 index 0000000..af8e175 --- /dev/null +++ b/extras/mini-os/arch/arm/hypercalls32.S @@ -0,0 +1,64 @@ +/****************************************************************************** + * hypercall.S + * + * Xen hypercall wrappers + * + * Stefano Stabellini , Citrix, 2012 + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation; or, when distributed + * separately from the Linux kernel or incorporated into other + * software packages, subject to the following license: + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this source file (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#include + +#define __HVC(imm16) .long ((0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F)) & 0xFFFFFFFF) + +#define XEN_IMM 0xEA1 + +#define HYPERCALL_SIMPLE(hypercall) \ +.globl HYPERVISOR_##hypercall; \ +.align 4,0x90; \ +HYPERVISOR_##hypercall: \ + mov r12, #__HYPERVISOR_##hypercall; \ + __HVC(XEN_IMM); \ + mov pc, lr; + +#define _hypercall0 HYPERCALL_SIMPLE +#define _hypercall1 HYPERCALL_SIMPLE +#define _hypercall2 HYPERCALL_SIMPLE +#define _hypercall3 HYPERCALL_SIMPLE +#define _hypercall4 HYPERCALL_SIMPLE + +_hypercall2(sched_op); +_hypercall2(memory_op); +_hypercall2(event_channel_op); +_hypercall2(xen_version); +_hypercall3(console_io); +_hypercall1(physdev_op); +_hypercall3(grant_table_op); +_hypercall3(vcpu_op); +_hypercall1(sysctl); +_hypercall1(domctl); +_hypercall2(hvm_op); +_hypercall1(xsm_op); diff --git a/extras/mini-os/arch/arm/minios-arm32.lds b/extras/mini-os/arch/arm/minios-arm32.lds new file mode 100755 index 0000000..9627162 --- /dev/null +++ b/extras/mini-os/arch/arm/minios-arm32.lds @@ -0,0 +1,83 @@ +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + /* Note: we currently assume that Xen will load the kernel image + * at start-of-RAM + 0x8000. We use this initial 32 KB for the stack + * and translation tables. + */ + _boot_stack =3D 0x400000; /* 16 KB boot stack */ + _boot_stack_end =3D 0x404000; + _page_dir =3D 0x404000; /* 16 KB translation table */ + . =3D 0x408000; + _text =3D .; /* Text and read-only data */ + .text : { + *(.text) + *(.gnu.warning) + } =3D 0x9090 + + _etext =3D .; /* End of text section */ + + .rodata : { *(.rodata) *(.rodata.*) } + . =3D ALIGN(4096); + _erodata =3D .; + + /* newlib initialization functions */ + . =3D ALIGN(32 / 8); + PROVIDE (__preinit_array_start =3D .); + .preinit_array : { *(.preinit_array) } + PROVIDE (__preinit_array_end =3D .); + PROVIDE (__init_array_start =3D .); + .init_array : { *(.init_array) } + PROVIDE (__init_array_end =3D .); + PROVIDE (__fini_array_start =3D .); + .fini_array : { *(.fini_array) } + PROVIDE (__fini_array_end =3D .); + + .ctors : { + __CTOR_LIST__ =3D .; + *(.ctors) + CONSTRUCTORS + LONG(0) + __CTOR_END__ =3D .; + } + + .dtors : { + __DTOR_LIST__ =3D .; + *(.dtors) + LONG(0) + __DTOR_END__ =3D .; + } + + .data : { /* Data */ + *(.data) + } + + /* Note: linker will insert any extra sections here, just before .bss */ + + .bss : { + _edata =3D .; /* End of data included in image */ + /* Nothing after here is included in the zImage's size */ + + __bss_start =3D .; + *(.bss) + *(.app.bss) + } + _end =3D . ; + + /* Sections to be discarded */ + /DISCARD/ : { + *(.text.exit) + *(.data.exit) + *(.exitcall.exit) + } + + /* Stabs debugging sections. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + .stab.excl 0 : { *(.stab.excl) } + .stab.exclstr 0 : { *(.stab.exclstr) } + .stab.index 0 : { *(.stab.index) } + .stab.indexstr 0 : { *(.stab.indexstr) } + .comment 0 : { *(.comment) } +} diff --git a/extras/mini-os/arch/arm/setup.c b/extras/mini-os/arch/arm/setup.c new file mode 100644 index 0000000..06afe46 --- /dev/null +++ b/extras/mini-os/arch/arm/setup.c @@ -0,0 +1,119 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * This structure contains start-of-day info, such as pagetable base pointer, + * address of the shared_info structure, and things like that. + * On x86, the hypervisor passes it to us. On ARM, we fill it in ourselves. + */ +union start_info_union start_info_union; + +/* + * Shared page for communicating with the hypervisor. + * Events flags go here, for example. + */ +shared_info_t *HYPERVISOR_shared_info; + +extern char shared_info_page[PAGE_SIZE]; + +void *device_tree; + +static int hvm_get_parameter(int idx, uint64_t *value) +{ + struct xen_hvm_param xhv; + int ret; + + xhv.domid =3D DOMID_SELF; + xhv.index =3D idx; + ret =3D HYPERVISOR_hvm_op(HVMOP_get_param, &xhv); + if (ret < 0) { + BUG(); + } + *value =3D xhv.value; + return ret; +} + +static void get_console(void) +{ + uint64_t v =3D -1; + + hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v); + start_info.console.domU.evtchn =3D v; + + hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v); + start_info.console.domU.mfn =3D v; + + printk("Console is on port %d\n", start_info.console.domU.evtchn); + printk("Console ring is at mfn %lx\n", (unsigned long) start_info.console.domU.mfn); +} + +void get_xenbus(void) +{ + uint64_t value; + + if (hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &value)) + BUG(); + + start_info.store_evtchn =3D (int)value; + + if(hvm_get_parameter(HVM_PARAM_STORE_PFN, &value)) + BUG(); + start_info.store_mfn =3D (unsigned long)value; +} + +/* + * INITIAL C ENTRY POINT. + */ +void arch_init(void *dtb_pointer, uint32_t physical_offset) +{ + struct xen_add_to_physmap xatp; + int r; + + memset(&__bss_start, 0, &_end - &__bss_start); + + physical_address_offset =3D physical_offset; + + xprintk("Virtual -> physical offset =3D %x\n", physical_address_offset); + + xprintk("Checking DTB at %p...\n", dtb_pointer); + + if ((r =3D fdt_check_header(dtb_pointer))) { + xprintk("Invalid DTB from Xen: %s\n", fdt_strerror(r)); + BUG(); + } + device_tree =3D dtb_pointer; + + /* Map shared_info page */ + xatp.domid =3D DOMID_SELF; + xatp.idx =3D 0; + xatp.space =3D XENMAPSPACE_shared_info; + xatp.gpfn =3D virt_to_pfn(shared_info_page); + if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp) !=3D 0) + BUG(); + HYPERVISOR_shared_info =3D (struct shared_info *)shared_info_page; + + /* Fill in start_info */ + get_console(); + get_xenbus(); + + gic_init(); + + start_kernel(); +} + +void +arch_fini(void) +{ +} + +void +arch_do_exit(void) +{ +} -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0339609217950956841== 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 --===============0339609217950956841==-- From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:12:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:12:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYK8-0002Tn-Ce; Wed, 10 Sep 2014 03:12:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYK6-0002TC-RP for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:59 +0000 Received: from [193.109.254.147:18033] by server-15.bemta-14.messagelabs.com id D9/68-30948-E71CF045; Wed, 10 Sep 2014 03:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1410318716!14539588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26993 invoked from network); 10 Sep 2014 03:11:57 -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; 10 Sep 2014 03:11:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYK4-0004U4-Ah for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYK4-0001pV-9D for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:56 +0000 Date: Wed, 10 Sep 2014 03:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: memory 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 7262f0a93ae43de18577307e6139ab0600e51749 Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:35 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:16:27 2014 +0100 mini-os: arm: memory management Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/mm.c | 139 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/mm.c b/extras/mini-os/arch/arm/mm.c new file mode 100644 index 0000000..efecc51 --- /dev/null +++ b/extras/mini-os/arch/arm/mm.c @@ -0,0 +1,139 @@ +#include +#include +#include +#include +#include +#include + +uint32_t physical_address_offset; + +unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) +{ + // FIXME + BUG(); +} + +void arch_init_mm(unsigned long *start_pfn_p, unsigned long *max_pfn_p) +{ + int memory; + int prop_len = 0; + const uint64_t *regs; + + printk(" _text: %p(VA)\n", &_text); + printk(" _etext: %p(VA)\n", &_etext); + printk(" _erodata: %p(VA)\n", &_erodata); + printk(" _edata: %p(VA)\n", &_edata); + printk(" stack start: %p(VA)\n", _boot_stack); + printk(" _end: %p(VA)\n", &_end); + + if (fdt_num_mem_rsv(device_tree) != 0) + printk("WARNING: reserved memory not supported!\n"); + + memory = fdt_node_offset_by_prop_value(device_tree, -1, "device_type", "memory", sizeof("memory")); + if (memory < 0) { + printk("No memory found in FDT!\n"); + BUG(); + } + + /* Xen will always provide us at least one bank of memory. + * Mini-OS will use the first bank for the time-being. */ + regs = fdt_getprop(device_tree, memory, "reg", &prop_len); + + /* The property must contain at least the start address + * and size, each of which is 8-bytes. */ + if (regs == NULL || prop_len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, prop_len); + BUG(); + } + + unsigned int end = (unsigned int) &_end; + paddr_t mem_base = fdt64_to_cpu(regs[0]); + uint64_t mem_size = fdt64_to_cpu(regs[1]); + printk("Found memory at 0x%llx (len 0x%llx)\n", + (unsigned long long) mem_base, (unsigned long long) mem_size); + + BUG_ON(to_virt(mem_base) > (void *) &_text); /* Our image isn't in our RAM! */ + *start_pfn_p = PFN_UP(to_phys(end)); + uint64_t heap_len = mem_size - (PFN_PHYS(*start_pfn_p) - mem_base); + *max_pfn_p = *start_pfn_p + PFN_DOWN(heap_len); + + printk("Using pages %lu to %lu as free space for heap.\n", *start_pfn_p, *max_pfn_p); + + /* The device tree is probably in memory that we're about to hand over to the page + * allocator, so move it to the end and reserve that space. + */ + uint32_t fdt_size = fdt_totalsize(device_tree); + void *new_device_tree = to_virt(((*max_pfn_p << PAGE_SHIFT) - fdt_size) & PAGE_MASK); + if (new_device_tree != device_tree) { + memmove(new_device_tree, device_tree, fdt_size); + } + device_tree = new_device_tree; + *max_pfn_p = to_phys(new_device_tree) >> PAGE_SHIFT; +} + +void arch_init_p2m(unsigned long max_pfn) +{ +} + +void arch_init_demand_mapping_area(unsigned long cur_pfn) +{ +} + +/* Get Xen's suggested physical page assignments for the grant table. */ +static paddr_t get_gnttab_base(void) +{ + int hypervisor; + int len = 0; + const uint64_t *regs; + paddr_t gnttab_base; + + hypervisor = fdt_node_offset_by_compatible(device_tree, -1, "xen,xen"); + BUG_ON(hypervisor < 0); + + regs = fdt_getprop(device_tree, hypervisor, "reg", &len); + /* The property contains the address and size, 8-bytes each. */ + if (regs == NULL || len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, len); + BUG(); + } + + gnttab_base = fdt64_to_cpu(regs[0]); + + printk("FDT suggests grant table base %llx\n", (unsigned long long) gnttab_base); + + return gnttab_base; +} + +grant_entry_t *arch_init_gnttab(int nr_grant_frames) +{ + struct xen_add_to_physmap xatp; + struct gnttab_setup_table setup; + xen_pfn_t frames[nr_grant_frames]; + paddr_t gnttab_table; + int i, rc; + + gnttab_table = get_gnttab_base(); + + for (i = 0; i < nr_grant_frames; i++) + { + xatp.domid = DOMID_SELF; + xatp.size = 0; /* Seems to be unused */ + xatp.space = XENMAPSPACE_grant_table; + xatp.idx = i; + xatp.gpfn = (gnttab_table >> PAGE_SHIFT) + i; + rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); + BUG_ON(rc != 0); + } + + setup.dom = DOMID_SELF; + setup.nr_frames = nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + if (setup.status != 0) + { + printk("GNTTABOP_setup_table failed; status = %d\n", setup.status); + BUG(); + } + + return to_virt(gnttab_table); +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:12:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:12:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYK8-0002Tn-Ce; Wed, 10 Sep 2014 03:12:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYK6-0002TC-RP for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:59 +0000 Received: from [193.109.254.147:18033] by server-15.bemta-14.messagelabs.com id D9/68-30948-E71CF045; Wed, 10 Sep 2014 03:11:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1410318716!14539588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26993 invoked from network); 10 Sep 2014 03:11:57 -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; 10 Sep 2014 03:11:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYK4-0004U4-Ah for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYK4-0001pV-9D for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:11:56 +0000 Date: Wed, 10 Sep 2014 03:11:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: memory 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 7262f0a93ae43de18577307e6139ab0600e51749 Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:35 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:16:27 2014 +0100 mini-os: arm: memory management Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/mm.c | 139 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 139 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/mm.c b/extras/mini-os/arch/arm/mm.c new file mode 100644 index 0000000..efecc51 --- /dev/null +++ b/extras/mini-os/arch/arm/mm.c @@ -0,0 +1,139 @@ +#include +#include +#include +#include +#include +#include + +uint32_t physical_address_offset; + +unsigned long allocate_ondemand(unsigned long n, unsigned long alignment) +{ + // FIXME + BUG(); +} + +void arch_init_mm(unsigned long *start_pfn_p, unsigned long *max_pfn_p) +{ + int memory; + int prop_len = 0; + const uint64_t *regs; + + printk(" _text: %p(VA)\n", &_text); + printk(" _etext: %p(VA)\n", &_etext); + printk(" _erodata: %p(VA)\n", &_erodata); + printk(" _edata: %p(VA)\n", &_edata); + printk(" stack start: %p(VA)\n", _boot_stack); + printk(" _end: %p(VA)\n", &_end); + + if (fdt_num_mem_rsv(device_tree) != 0) + printk("WARNING: reserved memory not supported!\n"); + + memory = fdt_node_offset_by_prop_value(device_tree, -1, "device_type", "memory", sizeof("memory")); + if (memory < 0) { + printk("No memory found in FDT!\n"); + BUG(); + } + + /* Xen will always provide us at least one bank of memory. + * Mini-OS will use the first bank for the time-being. */ + regs = fdt_getprop(device_tree, memory, "reg", &prop_len); + + /* The property must contain at least the start address + * and size, each of which is 8-bytes. */ + if (regs == NULL || prop_len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, prop_len); + BUG(); + } + + unsigned int end = (unsigned int) &_end; + paddr_t mem_base = fdt64_to_cpu(regs[0]); + uint64_t mem_size = fdt64_to_cpu(regs[1]); + printk("Found memory at 0x%llx (len 0x%llx)\n", + (unsigned long long) mem_base, (unsigned long long) mem_size); + + BUG_ON(to_virt(mem_base) > (void *) &_text); /* Our image isn't in our RAM! */ + *start_pfn_p = PFN_UP(to_phys(end)); + uint64_t heap_len = mem_size - (PFN_PHYS(*start_pfn_p) - mem_base); + *max_pfn_p = *start_pfn_p + PFN_DOWN(heap_len); + + printk("Using pages %lu to %lu as free space for heap.\n", *start_pfn_p, *max_pfn_p); + + /* The device tree is probably in memory that we're about to hand over to the page + * allocator, so move it to the end and reserve that space. + */ + uint32_t fdt_size = fdt_totalsize(device_tree); + void *new_device_tree = to_virt(((*max_pfn_p << PAGE_SHIFT) - fdt_size) & PAGE_MASK); + if (new_device_tree != device_tree) { + memmove(new_device_tree, device_tree, fdt_size); + } + device_tree = new_device_tree; + *max_pfn_p = to_phys(new_device_tree) >> PAGE_SHIFT; +} + +void arch_init_p2m(unsigned long max_pfn) +{ +} + +void arch_init_demand_mapping_area(unsigned long cur_pfn) +{ +} + +/* Get Xen's suggested physical page assignments for the grant table. */ +static paddr_t get_gnttab_base(void) +{ + int hypervisor; + int len = 0; + const uint64_t *regs; + paddr_t gnttab_base; + + hypervisor = fdt_node_offset_by_compatible(device_tree, -1, "xen,xen"); + BUG_ON(hypervisor < 0); + + regs = fdt_getprop(device_tree, hypervisor, "reg", &len); + /* The property contains the address and size, 8-bytes each. */ + if (regs == NULL || len < 16) { + printk("Bad 'reg' property: %p %d\n", regs, len); + BUG(); + } + + gnttab_base = fdt64_to_cpu(regs[0]); + + printk("FDT suggests grant table base %llx\n", (unsigned long long) gnttab_base); + + return gnttab_base; +} + +grant_entry_t *arch_init_gnttab(int nr_grant_frames) +{ + struct xen_add_to_physmap xatp; + struct gnttab_setup_table setup; + xen_pfn_t frames[nr_grant_frames]; + paddr_t gnttab_table; + int i, rc; + + gnttab_table = get_gnttab_base(); + + for (i = 0; i < nr_grant_frames; i++) + { + xatp.domid = DOMID_SELF; + xatp.size = 0; /* Seems to be unused */ + xatp.space = XENMAPSPACE_grant_table; + xatp.idx = i; + xatp.gpfn = (gnttab_table >> PAGE_SHIFT) + i; + rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); + BUG_ON(rc != 0); + } + + setup.dom = DOMID_SELF; + setup.nr_frames = nr_grant_frames; + set_xen_guest_handle(setup.frame_list, frames); + HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1); + if (setup.status != 0) + { + printk("GNTTABOP_setup_table failed; status = %d\n", setup.status); + BUG(); + } + + return to_virt(gnttab_table); +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:12:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:12: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 1XRYKH-0002VZ-FX; Wed, 10 Sep 2014 03:12:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKG-0002VK-Oi for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:08 +0000 Received: from [85.158.143.35:18976] by server-2.bemta-4.messagelabs.com id A7/11-04525-881CF045; Wed, 10 Sep 2014 03:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1410318726!5467610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29904 invoked from network); 10 Sep 2014 03:12:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKE-0004Ud-FO for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYKE-0001qG-DX for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:06 +0000 Date: Wed, 10 Sep 2014 03:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: scheduling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b98553ffc540a44f595156d61f8110f2bbae47f Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:36 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:16:47 2014 +0100 mini-os: arm: scheduling Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/arm32.S | 22 ++++++++++++++++++ extras/mini-os/arch/arm/sched.c | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/arm32.S b/extras/mini-os/arch/arm/arm32.S index d2e6932..73223c8 100644 --- a/extras/mini-os/arch/arm/arm32.S +++ b/extras/mini-os/arch/arm/arm32.S @@ -204,8 +204,30 @@ irq_handler: IRQ_handler: .long 0x0 + +.globl __arch_switch_threads +@ => r0 = &prev->sp +@ r1 = &next->sp +@ <= returns to next thread's saved return address +__arch_switch_threads: + push {r4-r11} @ Store callee-saved registers to old thread's stack + stmia r0, {sp, lr} @ Store current sp and ip to prev's struct thread + + ldmia r1, {sp, lr} @ Load new sp, ip from next's struct thread + pop {r4-r11} @ Load callee-saved registers from new thread's stack + + bx lr + @ This is called if you try to divide by zero. For now, we make a supervisor call, @ which will make us halt. .globl raise raise: svc 0 + +.globl arm_start_thread +arm_start_thread: + pop {r0, r1} + @ r0 = user data + @ r1 -> thread's main function + ldr lr, =exit_thread + bx r1 diff --git a/extras/mini-os/arch/arm/sched.c b/extras/mini-os/arch/arm/sched.c new file mode 100644 index 0000000..8091566 --- /dev/null +++ b/extras/mini-os/arch/arm/sched.c @@ -0,0 +1,47 @@ +#include +#include +#include + +void arm_start_thread(void); + +/* The AAPCS requires the callee (e.g. __arch_switch_threads) to preserve r4-r11. */ +#define CALLEE_SAVED_REGISTERS 8 + +/* Architecture specific setup of thread creation */ +struct thread* arch_create_thread(char *name, void (*function)(void *), + void *data) +{ + struct thread *thread; + + thread = xmalloc(struct thread); + /* We can't use lazy allocation here since the trap handler runs on the stack */ + thread->stack = (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); + thread->name = name; + printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, + thread->stack); + + /* Save pointer to the thread on the stack, used by current macro */ + *((unsigned long *)thread->stack) = (unsigned long)thread; + + /* Push the details to pass to arm_start_thread onto the stack. */ + int *sp = (int *) (thread->stack + STACK_SIZE); + *(--sp) = (int) function; + *(--sp) = (int) data; + + /* We leave room for the 8 callee-saved registers which we will + * try to restore on thread switch, even though they're not needed + * for the initial switch. */ + thread->sp = (unsigned long) sp - 4 * CALLEE_SAVED_REGISTERS; + + thread->ip = (unsigned long) arm_start_thread; + + return thread; +} + +void run_idle_thread(void) +{ + __asm__ __volatile__ ("mov sp, %0; bx %1":: + "r"(idle_thread->sp + 4 * CALLEE_SAVED_REGISTERS), + "r"(idle_thread->ip)); + /* Never arrive here! */ +} -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 03:12:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:12: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 1XRYKH-0002VZ-FX; Wed, 10 Sep 2014 03:12:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKG-0002VK-Oi for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:08 +0000 Received: from [85.158.143.35:18976] by server-2.bemta-4.messagelabs.com id A7/11-04525-881CF045; Wed, 10 Sep 2014 03:12:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1410318726!5467610!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29904 invoked from network); 10 Sep 2014 03:12:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 10 Sep 2014 03:12:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKE-0004Ud-FO for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYKE-0001qG-DX for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:06 +0000 Date: Wed, 10 Sep 2014 03:12:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: scheduling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2b98553ffc540a44f595156d61f8110f2bbae47f Author: Thomas Leonard AuthorDate: Fri Aug 8 16:47:36 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:16:47 2014 +0100 mini-os: arm: scheduling Based on an initial patch by Karim Raslan. Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/arm32.S | 22 ++++++++++++++++++ extras/mini-os/arch/arm/sched.c | 47 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/arm32.S b/extras/mini-os/arch/arm/arm32.S index d2e6932..73223c8 100644 --- a/extras/mini-os/arch/arm/arm32.S +++ b/extras/mini-os/arch/arm/arm32.S @@ -204,8 +204,30 @@ irq_handler: IRQ_handler: .long 0x0 + +.globl __arch_switch_threads +@ => r0 = &prev->sp +@ r1 = &next->sp +@ <= returns to next thread's saved return address +__arch_switch_threads: + push {r4-r11} @ Store callee-saved registers to old thread's stack + stmia r0, {sp, lr} @ Store current sp and ip to prev's struct thread + + ldmia r1, {sp, lr} @ Load new sp, ip from next's struct thread + pop {r4-r11} @ Load callee-saved registers from new thread's stack + + bx lr + @ This is called if you try to divide by zero. For now, we make a supervisor call, @ which will make us halt. .globl raise raise: svc 0 + +.globl arm_start_thread +arm_start_thread: + pop {r0, r1} + @ r0 = user data + @ r1 -> thread's main function + ldr lr, =exit_thread + bx r1 diff --git a/extras/mini-os/arch/arm/sched.c b/extras/mini-os/arch/arm/sched.c new file mode 100644 index 0000000..8091566 --- /dev/null +++ b/extras/mini-os/arch/arm/sched.c @@ -0,0 +1,47 @@ +#include +#include +#include + +void arm_start_thread(void); + +/* The AAPCS requires the callee (e.g. __arch_switch_threads) to preserve r4-r11. */ +#define CALLEE_SAVED_REGISTERS 8 + +/* Architecture specific setup of thread creation */ +struct thread* arch_create_thread(char *name, void (*function)(void *), + void *data) +{ + struct thread *thread; + + thread = xmalloc(struct thread); + /* We can't use lazy allocation here since the trap handler runs on the stack */ + thread->stack = (char *)alloc_pages(STACK_SIZE_PAGE_ORDER); + thread->name = name; + printk("Thread \"%s\": pointer: 0x%p, stack: 0x%p\n", name, thread, + thread->stack); + + /* Save pointer to the thread on the stack, used by current macro */ + *((unsigned long *)thread->stack) = (unsigned long)thread; + + /* Push the details to pass to arm_start_thread onto the stack. */ + int *sp = (int *) (thread->stack + STACK_SIZE); + *(--sp) = (int) function; + *(--sp) = (int) data; + + /* We leave room for the 8 callee-saved registers which we will + * try to restore on thread switch, even though they're not needed + * for the initial switch. */ + thread->sp = (unsigned long) sp - 4 * CALLEE_SAVED_REGISTERS; + + thread->ip = (unsigned long) arm_start_thread; + + return thread; +} + +void run_idle_thread(void) +{ + __asm__ __volatile__ ("mov sp, %0; bx %1":: + "r"(idle_thread->sp + 4 * CALLEE_SAVED_REGISTERS), + "r"(idle_thread->ip)); + /* Never arrive here! */ +} -- generated by git-patchbot for /home/xen/git/xen.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 Sep 10 03:12:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:12:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKS-0002Yu-Kv; Wed, 10 Sep 2014 03:12:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKR-0002YW-6e for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:19 +0000 Received: from [193.109.254.147:63350] by server-2.bemta-14.messagelabs.com id 14/6A-07861-291CF045; Wed, 10 Sep 2014 03:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1410318736!14556484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23606 invoked from network); 10 Sep 2014 03:12:17 -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; 10 Sep 2014 03:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKO-0004Um-OP for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYKO-0001rW-IX for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:16 +0000 Date: Wed, 10 Sep 2014 03:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b06c469a7b69da98e416a954817346fa793d332d Author: Karim Raslan AuthorDate: Fri Aug 8 16:47:37 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:17:02 2014 +0100 mini-os: arm: events Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/events.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/events.c b/extras/mini-os/arch/arm/events.c new file mode 100644 index 0000000..441010d --- /dev/null +++ b/extras/mini-os/arch/arm/events.c @@ -0,0 +1,31 @@ +#include +#include +#include +#include + +static void virq_debug(evtchn_port_t port, struct pt_regs *regs, void *params) +{ + printk("Received a virq_debug event\n"); +} + +evtchn_port_t debug_port = -1; +void arch_init_events(void) +{ + debug_port = bind_virq(VIRQ_DEBUG, (evtchn_handler_t)virq_debug, 0); + if(debug_port == -1) + BUG(); + unmask_evtchn(debug_port); +} + +void arch_unbind_ports(void) +{ + if(debug_port != -1) + { + mask_evtchn(debug_port); + unbind_evtchn(debug_port); + } +} + +void arch_fini_events(void) +{ +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 10 03:12:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Sep 2014 03:12:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKS-0002Yu-Kv; Wed, 10 Sep 2014 03:12:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKR-0002YW-6e for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:19 +0000 Received: from [193.109.254.147:63350] by server-2.bemta-14.messagelabs.com id 14/6A-07861-291CF045; Wed, 10 Sep 2014 03:12:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1410318736!14556484!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23606 invoked from network); 10 Sep 2014 03:12:17 -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; 10 Sep 2014 03:12:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XRYKO-0004Um-OP for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XRYKO-0001rW-IX for xen-changelog@lists.xensource.com; Wed, 10 Sep 2014 03:12:16 +0000 Date: Wed, 10 Sep 2014 03:12:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mini-os: arm: events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b06c469a7b69da98e416a954817346fa793d332d Author: Karim Raslan AuthorDate: Fri Aug 8 16:47:37 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 8 12:17:02 2014 +0100 mini-os: arm: events Signed-off-by: Karim Allah Ahmed Signed-off-by: Thomas Leonard Acked-by: Ian Campbell --- extras/mini-os/arch/arm/events.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/extras/mini-os/arch/arm/events.c b/extras/mini-os/arch/arm/events.c new file mode 100644 index 0000000..441010d --- /dev/null +++ b/extras/mini-os/arch/arm/events.c @@ -0,0 +1,31 @@ +#include +#include +#include +#include + +static void virq_debug(evtchn_port_t port, struct pt_regs *regs, void *params) +{ + printk("Received a virq_debug event\n"); +} + +evtchn_port_t debug_port = -1; +void arch_init_events(void) +{ + debug_port = bind_virq(VIRQ_DEBUG, (evtchn_handler_t)virq_debug, 0); + if(debug_port == -1) + BUG(); + unmask_evtchn(debug_port); +} + +void arch_unbind_ports(void) +{ + if(debug_port != -1) + { + mask_evtchn(debug_port); + unbind_evtchn(debug_port); + } +} + +void arch_fini_events(void) +{ +} -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01: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 1XSFYt-0003Uu-1d; Fri, 12 Sep 2014 01:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFYr-0003Up-Ru for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:05 +0000 Received: from [85.158.139.211:40687] by server-2.bemta-5.messagelabs.com id 12/0F-31832-DBA42145; Fri, 12 Sep 2014 01:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1410484923!11105668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5675 invoked from network); 12 Sep 2014 01:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFYp-0000Bo-9c for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFYp-0000Dr-4x for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:03 +0000 Date: Fri, 12 Sep 2014 01:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move itargets initialization to vgic-v2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77e6abba1f853b4c9a2628f32772830514fd0f3f Author: Vijaya Kumar K AuthorDate: Thu Sep 4 18:45:21 2014 +0530 Commit: Ian Campbell CommitDate: Tue Sep 9 11:35:05 2014 +0100 xen/arm: move itargets initialization to vgic-v2 itarget registers are GIC version specific. So move initialization of these registers to vgic-v2 driver. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Reviewed-by: Julien Grall --- xen/arch/arm/vgic-v2.c | 7 +++++++ xen/arch/arm/vgic.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index f57dbf9..54751b6 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -538,6 +538,13 @@ static int vgic_v2_vcpu_init(struct vcpu *v) static int vgic_v2_domain_init(struct domain *d) { + int i; + + /* By default deliver to CPU0 */ + for ( i = 0; i < DOMAIN_NR_RANKS(d); i++ ) + memset(d->arch.vgic.shared_irqs[i].itargets, 0x1, + sizeof(d->arch.vgic.shared_irqs[i].itargets)); + /* We rely on gicv_setup() to initialize dbase(vGIC distributor base) */ register_mmio_handler(d, &vgic_v2_distr_mmio_handler, d->arch.vgic.dbase, PAGE_SIZE); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 17b3b6d..6b41dbf 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -96,13 +96,7 @@ int domain_vgic_init(struct domain *d) INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); } for (i=0; iarch.vgic.shared_irqs[i].lock); - /* By default deliver to CPU0 */ - memset(d->arch.vgic.shared_irqs[i].itargets, - 0x1, - sizeof(d->arch.vgic.shared_irqs[i].itargets)); - } d->arch.vgic.handler->domain_init(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01: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 1XSFYt-0003Uu-1d; Fri, 12 Sep 2014 01:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFYr-0003Up-Ru for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:05 +0000 Received: from [85.158.139.211:40687] by server-2.bemta-5.messagelabs.com id 12/0F-31832-DBA42145; Fri, 12 Sep 2014 01:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1410484923!11105668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5675 invoked from network); 12 Sep 2014 01:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFYp-0000Bo-9c for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFYp-0000Dr-4x for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:03 +0000 Date: Fri, 12 Sep 2014 01:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: move itargets initialization to vgic-v2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77e6abba1f853b4c9a2628f32772830514fd0f3f Author: Vijaya Kumar K AuthorDate: Thu Sep 4 18:45:21 2014 +0530 Commit: Ian Campbell CommitDate: Tue Sep 9 11:35:05 2014 +0100 xen/arm: move itargets initialization to vgic-v2 itarget registers are GIC version specific. So move initialization of these registers to vgic-v2 driver. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Reviewed-by: Julien Grall --- xen/arch/arm/vgic-v2.c | 7 +++++++ xen/arch/arm/vgic.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index f57dbf9..54751b6 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -538,6 +538,13 @@ static int vgic_v2_vcpu_init(struct vcpu *v) static int vgic_v2_domain_init(struct domain *d) { + int i; + + /* By default deliver to CPU0 */ + for ( i = 0; i < DOMAIN_NR_RANKS(d); i++ ) + memset(d->arch.vgic.shared_irqs[i].itargets, 0x1, + sizeof(d->arch.vgic.shared_irqs[i].itargets)); + /* We rely on gicv_setup() to initialize dbase(vGIC distributor base) */ register_mmio_handler(d, &vgic_v2_distr_mmio_handler, d->arch.vgic.dbase, PAGE_SIZE); diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 17b3b6d..6b41dbf 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -96,13 +96,7 @@ int domain_vgic_init(struct domain *d) INIT_LIST_HEAD(&d->arch.vgic.pending_irqs[i].lr_queue); } for (i=0; iarch.vgic.shared_irqs[i].lock); - /* By default deliver to CPU0 */ - memset(d->arch.vgic.shared_irqs[i].itargets, - 0x1, - sizeof(d->arch.vgic.shared_irqs[i].itargets)); - } d->arch.vgic.handler->domain_init(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZ3-0003Vk-6H; Fri, 12 Sep 2014 01:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZ2-0003Vb-9R for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:16 +0000 Received: from [85.158.137.68:56419] by server-17.bemta-3.messagelabs.com id 35/52-01689-7CA42145; Fri, 12 Sep 2014 01:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1410484933!14048895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3888 invoked from network); 12 Sep 2014 01:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFYz-0000Br-J9 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFYz-0000EF-Eb for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:13 +0000 Date: Fri, 12 Sep 2014 01:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: domain_vgic_init: Avoid double free on shared_irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b41618f5a08145b0198af4a8a2ce361d7e677e6 Author: Julien Grall AuthorDate: Fri Jul 25 15:17:26 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:43:38 2014 +0100 xen/arm: domain_vgic_init: Avoid double free on shared_irqs When the function domain_vgic_init is failing to initialize pending_irqs, it will free shared_irqs. Few call later, domain_vgic_free will be called an try to free a second time the same variable. This will result to a double free. Remove the free in domain_vgic_init and rely on domain_vgic_free to correctly release the memory. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 6b41dbf..1372ffc 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -85,10 +85,7 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.pending_irqs = xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); if ( d->arch.vgic.pending_irqs == NULL ) - { - xfree(d->arch.vgic.shared_irqs); return -ENOMEM; - } for (i=0; iarch.vgic.nr_lines; i++) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZ3-0003Vk-6H; Fri, 12 Sep 2014 01:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZ2-0003Vb-9R for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:16 +0000 Received: from [85.158.137.68:56419] by server-17.bemta-3.messagelabs.com id 35/52-01689-7CA42145; Fri, 12 Sep 2014 01:22:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1410484933!14048895!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=SUBJECT_RANDOMQ X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3888 invoked from network); 12 Sep 2014 01:22:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFYz-0000Br-J9 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFYz-0000EF-Eb for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:13 +0000 Date: Fri, 12 Sep 2014 01:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: domain_vgic_init: Avoid double free on shared_irqs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7b41618f5a08145b0198af4a8a2ce361d7e677e6 Author: Julien Grall AuthorDate: Fri Jul 25 15:17:26 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:43:38 2014 +0100 xen/arm: domain_vgic_init: Avoid double free on shared_irqs When the function domain_vgic_init is failing to initialize pending_irqs, it will free shared_irqs. Few call later, domain_vgic_free will be called an try to free a second time the same variable. This will result to a double free. Remove the free in domain_vgic_init and rely on domain_vgic_free to correctly release the memory. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/vgic.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 6b41dbf..1372ffc 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -85,10 +85,7 @@ int domain_vgic_init(struct domain *d) d->arch.vgic.pending_irqs = xzalloc_array(struct pending_irq, d->arch.vgic.nr_lines); if ( d->arch.vgic.pending_irqs == NULL ) - { - xfree(d->arch.vgic.shared_irqs); return -ENOMEM; - } for (i=0; iarch.vgic.nr_lines; i++) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZD-0003Wz-9E; Fri, 12 Sep 2014 01:22:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZC-0003Wo-Aj for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:26 +0000 Received: from [193.109.254.147:56818] by server-8.bemta-14.messagelabs.com id 48/0F-01875-1DA42145; Fri, 12 Sep 2014 01:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1410484944!15050241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16264 invoked from network); 12 Sep 2014 01:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZ9-0000C1-QC for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZ9-0000Ee-NT for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:23 +0000 Date: Fri, 12 Sep 2014 01:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 808b34d84544fca0b79985bbefc450ae399dd340 Author: Stefano Stabellini AuthorDate: Fri Aug 1 15:45:23 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:47:08 2014 +0100 xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86 Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/common/memory.c | 4 ---- xen/include/asm-x86/domain.h | 1 + 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 031672a..2e3225d 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -29,10 +29,6 @@ #include #include -#ifndef is_domain_direct_mapped -# define is_domain_direct_mapped(d) ((void)(d), 0) -#endif - struct memop_args { /* INPUT */ struct domain *domain; /* Domain to be affected. */ diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 83329ed..8fc5a45 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -19,6 +19,7 @@ #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) #define is_hvm_pv_evtchn_vcpu(v) (is_hvm_pv_evtchn_domain(v->domain)) +#define is_domain_direct_mapped(d) ((void)(d), 0) #define VCPU_TRAP_NMI 1 #define VCPU_TRAP_MCE 2 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZD-0003Wz-9E; Fri, 12 Sep 2014 01:22:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZC-0003Wo-Aj for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:26 +0000 Received: from [193.109.254.147:56818] by server-8.bemta-14.messagelabs.com id 48/0F-01875-1DA42145; Fri, 12 Sep 2014 01:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1410484944!15050241!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16264 invoked from network); 12 Sep 2014 01:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZ9-0000C1-QC for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZ9-0000Ee-NT for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:23 +0000 Date: Fri, 12 Sep 2014 01:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 808b34d84544fca0b79985bbefc450ae399dd340 Author: Stefano Stabellini AuthorDate: Fri Aug 1 15:45:23 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:47:08 2014 +0100 xen/x86: introduce is_domain_direct_mapped(d) as ((void)(d), 0) on x86 Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/common/memory.c | 4 ---- xen/include/asm-x86/domain.h | 1 + 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 031672a..2e3225d 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -29,10 +29,6 @@ #include #include -#ifndef is_domain_direct_mapped -# define is_domain_direct_mapped(d) ((void)(d), 0) -#endif - struct memop_args { /* INPUT */ struct domain *domain; /* Domain to be affected. */ diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 83329ed..8fc5a45 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -19,6 +19,7 @@ #define is_hvm_pv_evtchn_domain(d) (has_hvm_container_domain(d) && \ d->arch.hvm_domain.irq.callback_via_type == HVMIRQ_callback_vector) #define is_hvm_pv_evtchn_vcpu(v) (is_hvm_pv_evtchn_domain(v->domain)) +#define is_domain_direct_mapped(d) ((void)(d), 0) #define VCPU_TRAP_NMI 1 #define VCPU_TRAP_MCE 2 -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZO-0003Ye-C9; Fri, 12 Sep 2014 01:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZM-0003YM-Nh for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:36 +0000 Received: from [85.158.143.35:55851] by server-1.bemta-4.messagelabs.com id FE/61-05872-CDA42145; Fri, 12 Sep 2014 01:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1410484954!5992616!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4380 invoked from network); 12 Sep 2014 01:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZK-0000C9-0u for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZJ-0000F7-Ux for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:33 +0000 Date: Fri, 12 Sep 2014 01:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: introduce arch_grant_(un)map_page_identity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e25a5f4d8cf3b55718048abdd21c7d0de64ae54c Author: Stefano Stabellini AuthorDate: Fri Aug 1 15:45:24 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:47:08 2014 +0100 xen: introduce arch_grant_(un)map_page_identity Introduce two arch specific functions to create a new p2m mapping of granted pages at pfn == mfn. We don't an x86 implementation as these functions should never be compiled on x86 (they are called from an if (0) statement). Base the implementation of arm_smmu_(un)map_page on arch_grant_(un)map_page_identity. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Jan Beulich --- xen/arch/arm/p2m.c | 26 ++++++++++++++++++++++++++ xen/drivers/passthrough/arm/smmu.c | 13 ++----------- xen/include/asm-arm/p2m.h | 4 ++++ xen/include/asm-x86/p2m.h | 4 ++++ 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index fc8c0dd..a7dcdf5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -927,6 +927,32 @@ void guest_physmap_remove_page(struct domain *d, pfn_to_paddr(mfn), MATTR_MEM, p2m_invalid); } +int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable) +{ + p2m_type_t t; + + ASSERT(is_domain_direct_mapped(d)); + + /* This is not an IOMMU mapping but it is not a regular RAM p2m type + * either. We are using IOMMU p2m types here to prevent the pages + * from being used as grants. */ + if ( writeable ) + t = p2m_iommu_map_rw; + else + t = p2m_iommu_map_ro; + + return guest_physmap_add_entry(d, frame, frame, 0, t); +} + +int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame) +{ + ASSERT(is_domain_direct_mapped(d)); + + guest_physmap_remove_page(d, frame, frame, 0); + return 0; +} + int p2m_alloc_table(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index f4eb2a2..fb0c694 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -1539,8 +1539,6 @@ static void arm_smmu_iommu_domain_teardown(struct domain *d) static int arm_smmu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags) { - p2m_type_t t; - /* Grant mappings can be used for DMA requests. The dev_bus_addr returned by * the hypercall is the MFN (not the IPA). For device protected by * an IOMMU, Xen needs to add a 1:1 mapping in the domain p2m to @@ -1555,12 +1553,7 @@ static int arm_smmu_map_page(struct domain *d, unsigned long gfn, if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) return -EINVAL; - t = (flags & IOMMUF_writable) ? p2m_iommu_map_rw : p2m_iommu_map_ro; - - /* The function guest_physmap_add_entry replaces the current mapping - * if there is already one... - */ - return guest_physmap_add_entry(d, gfn, mfn, 0, t); + return arch_grant_map_page_identity(d, mfn, flags & IOMMUF_writable); } static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) @@ -1571,9 +1564,7 @@ static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) if ( !is_domain_direct_mapped(d) ) return -EINVAL; - guest_physmap_remove_page(d, gfn, gfn, 0); - - return 0; + return arch_grant_unmap_page_identity(d, gfn); } static const struct iommu_ops arm_smmu_iommu_ops = { diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 08ce07b..97cbae4 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -194,6 +194,10 @@ static inline int get_page_and_type(struct page_info *page, return rc; } +int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable); +int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame); + #endif /* _XEN_P2M_H */ /* diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 39f235d..bae669e 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -719,6 +719,10 @@ static inline unsigned int p2m_get_iommu_flags(p2m_type_t p2mt) return flags; } +extern int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable); +extern int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame); + #endif /* _XEN_P2M_H */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZO-0003Ye-C9; Fri, 12 Sep 2014 01:22:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZM-0003YM-Nh for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:36 +0000 Received: from [85.158.143.35:55851] by server-1.bemta-4.messagelabs.com id FE/61-05872-CDA42145; Fri, 12 Sep 2014 01:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1410484954!5992616!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4380 invoked from network); 12 Sep 2014 01:22:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZK-0000C9-0u for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZJ-0000F7-Ux for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:33 +0000 Date: Fri, 12 Sep 2014 01:22:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: introduce arch_grant_(un)map_page_identity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e25a5f4d8cf3b55718048abdd21c7d0de64ae54c Author: Stefano Stabellini AuthorDate: Fri Aug 1 15:45:24 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:47:08 2014 +0100 xen: introduce arch_grant_(un)map_page_identity Introduce two arch specific functions to create a new p2m mapping of granted pages at pfn == mfn. We don't an x86 implementation as these functions should never be compiled on x86 (they are called from an if (0) statement). Base the implementation of arm_smmu_(un)map_page on arch_grant_(un)map_page_identity. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Jan Beulich --- xen/arch/arm/p2m.c | 26 ++++++++++++++++++++++++++ xen/drivers/passthrough/arm/smmu.c | 13 ++----------- xen/include/asm-arm/p2m.h | 4 ++++ xen/include/asm-x86/p2m.h | 4 ++++ 4 files changed, 36 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index fc8c0dd..a7dcdf5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -927,6 +927,32 @@ void guest_physmap_remove_page(struct domain *d, pfn_to_paddr(mfn), MATTR_MEM, p2m_invalid); } +int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable) +{ + p2m_type_t t; + + ASSERT(is_domain_direct_mapped(d)); + + /* This is not an IOMMU mapping but it is not a regular RAM p2m type + * either. We are using IOMMU p2m types here to prevent the pages + * from being used as grants. */ + if ( writeable ) + t = p2m_iommu_map_rw; + else + t = p2m_iommu_map_ro; + + return guest_physmap_add_entry(d, frame, frame, 0, t); +} + +int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame) +{ + ASSERT(is_domain_direct_mapped(d)); + + guest_physmap_remove_page(d, frame, frame, 0); + return 0; +} + int p2m_alloc_table(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index f4eb2a2..fb0c694 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -1539,8 +1539,6 @@ static void arm_smmu_iommu_domain_teardown(struct domain *d) static int arm_smmu_map_page(struct domain *d, unsigned long gfn, unsigned long mfn, unsigned int flags) { - p2m_type_t t; - /* Grant mappings can be used for DMA requests. The dev_bus_addr returned by * the hypercall is the MFN (not the IPA). For device protected by * an IOMMU, Xen needs to add a 1:1 mapping in the domain p2m to @@ -1555,12 +1553,7 @@ static int arm_smmu_map_page(struct domain *d, unsigned long gfn, if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) return -EINVAL; - t = (flags & IOMMUF_writable) ? p2m_iommu_map_rw : p2m_iommu_map_ro; - - /* The function guest_physmap_add_entry replaces the current mapping - * if there is already one... - */ - return guest_physmap_add_entry(d, gfn, mfn, 0, t); + return arch_grant_map_page_identity(d, mfn, flags & IOMMUF_writable); } static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) @@ -1571,9 +1564,7 @@ static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) if ( !is_domain_direct_mapped(d) ) return -EINVAL; - guest_physmap_remove_page(d, gfn, gfn, 0); - - return 0; + return arch_grant_unmap_page_identity(d, gfn); } static const struct iommu_ops arm_smmu_iommu_ops = { diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 08ce07b..97cbae4 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -194,6 +194,10 @@ static inline int get_page_and_type(struct page_info *page, return rc; } +int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable); +int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame); + #endif /* _XEN_P2M_H */ /* diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 39f235d..bae669e 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -719,6 +719,10 @@ static inline unsigned int p2m_get_iommu_flags(p2m_type_t p2mt) return flags; } +extern int arch_grant_map_page_identity(struct domain *d, unsigned long frame, + bool_t writeable); +extern int arch_grant_unmap_page_identity(struct domain *d, unsigned long frame); + #endif /* _XEN_P2M_H */ /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZY-0003aO-Ew; Fri, 12 Sep 2014 01:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZX-0003a4-4O for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:47 +0000 Received: from [85.158.139.211:45711] by server-15.bemta-5.messagelabs.com id 93/09-12002-6EA42145; Fri, 12 Sep 2014 01:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1410484964!8666165!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2538 invoked from network); 12 Sep 2014 01:22:45 -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 Sep 2014 01:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZU-0000CF-6U for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZU-0000GB-4j for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:44 +0000 Date: Fri, 12 Sep 2014 01:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: introduce XENFEAT_grant_map_identity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d09ef6906ca0a9957e21334ad2c3eed626abe63 Author: Stefano Stabellini AuthorDate: Fri Aug 1 15:45:25 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:47:09 2014 +0100 xen/arm: introduce XENFEAT_grant_map_identity The flag specifies that the hypervisor maps a grant page to guest physical address == machine address of the page in addition to the normal grant mapping address. Frontends are allowed to map the same page multiple times using multiple grant references. On the backend side it can be difficult to find out the physical address corresponding to a particular machine address, especially at the completion of a dma operation. To simplify address translations, we introduce a second mapping of the grant at physical address == machine address so that dom0 can issue cache maintenance operations without having to find the pfn. Call arch_grant_map_page_identity and arch_grant_unmap_page_identity from __gnttab_map_grant_ref and __gnttab_unmap_common to introduce the second mapping if the domain is directly mapped. To do so we also need to change gnttab_need_iommu_mapping to just be defined as is_domain_direct_mapped on arm. Remove arm_smmu_map_page and arm_smmu_unmap_page as they have become unused. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/common/grant_table.c | 30 +++++++++++++++++++++++++----- xen/common/kernel.c | 2 ++ xen/drivers/passthrough/arm/smmu.c | 33 --------------------------------- xen/include/asm-arm/grant_table.h | 3 +-- xen/include/public/features.h | 3 +++ 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 464007e..23266c3 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -738,13 +738,23 @@ __gnttab_map_grant_ref( !(old_pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) ) { if ( wrc == 0 ) - err = iommu_map_page(ld, frame, frame, - IOMMUF_readable|IOMMUF_writable); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_map_page_identity(ld, frame, 1); + else + err = iommu_map_page(ld, frame, frame, + IOMMUF_readable|IOMMUF_writable); + } } else if ( act_pin && !old_pin ) { if ( (wrc + rdc) == 0 ) - err = iommu_map_page(ld, frame, frame, IOMMUF_readable); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_map_page_identity(ld, frame, 0); + else + err = iommu_map_page(ld, frame, frame, IOMMUF_readable); + } } if ( err ) { @@ -941,9 +951,19 @@ __gnttab_unmap_common( int err = 0; mapcount(lgt, rd, op->frame, &wrc, &rdc); if ( (wrc + rdc) == 0 ) - err = iommu_unmap_page(ld, op->frame); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_unmap_page_identity(ld, op->frame); + else + err = iommu_unmap_page(ld, op->frame); + } else if ( wrc == 0 ) - err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_map_page_identity(ld, op->frame, 0); + else + err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); + } if ( err ) { rc = GNTST_general_error; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d23c422..ce65486 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -332,6 +332,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } #endif + if ( is_domain_direct_mapped(d) ) + fi.submap |= 1U << XENFEAT_grant_map_identity; break; default: return -EINVAL; diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index fb0c694..21b4572 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -1536,37 +1536,6 @@ static void arm_smmu_iommu_domain_teardown(struct domain *d) xfree(smmu_domain); } -static int arm_smmu_map_page(struct domain *d, unsigned long gfn, - unsigned long mfn, unsigned int flags) -{ - /* Grant mappings can be used for DMA requests. The dev_bus_addr returned by - * the hypercall is the MFN (not the IPA). For device protected by - * an IOMMU, Xen needs to add a 1:1 mapping in the domain p2m to - * allow DMA request to work. - * This is only valid when the domain is directed mapped. Hence this - * function should only be used by gnttab code with gfn == mfn. - */ - BUG_ON(!is_domain_direct_mapped(d)); - BUG_ON(mfn != gfn); - - /* We only support readable and writable flags */ - if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) - return -EINVAL; - - return arch_grant_map_page_identity(d, mfn, flags & IOMMUF_writable); -} - -static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) -{ - /* This function should only be used by gnttab code when the domain - * is direct mapped - */ - if ( !is_domain_direct_mapped(d) ) - return -EINVAL; - - return arch_grant_unmap_page_identity(d, gfn); -} - static const struct iommu_ops arm_smmu_iommu_ops = { .init = arm_smmu_iommu_domain_init, .hwdom_init = arm_smmu_iommu_hwdom_init, @@ -1575,8 +1544,6 @@ static const struct iommu_ops arm_smmu_iommu_ops = { .iotlb_flush_all = arm_smmu_iotlb_flush_all, .assign_dt_device = arm_smmu_attach_dev, .reassign_dt_device = arm_smmu_reassign_dt_dev, - .map_page = arm_smmu_map_page, - .unmap_page = arm_smmu_unmap_page, }; static int __init smmu_init(struct dt_device_node *dev, diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index eac8a70..47147ce 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -33,8 +33,7 @@ static inline int replace_grant_supported(void) ( ((i >= nr_grant_frames(d->grant_table)) && \ (i < max_nr_grant_frames)) ? 0 : (d->arch.grant_table_gpfn[i])) -#define gnttab_need_iommu_mapping(d) \ - (is_domain_direct_mapped(d) && need_iommu(d)) +#define gnttab_need_iommu_mapping(d) (is_domain_direct_mapped(d)) #endif /* __ASM_GRANT_TABLE_H__ */ /* diff --git a/xen/include/public/features.h b/xen/include/public/features.h index a149aa6..b7bf83f 100644 --- a/xen/include/public/features.h +++ b/xen/include/public/features.h @@ -94,6 +94,9 @@ /* operation as Dom0 is supported */ #define XENFEAT_dom0 11 +/* Xen also maps grant references at pfn = mfn */ +#define XENFEAT_grant_map_identity 12 + #define XENFEAT_NR_SUBMAPS 1 #endif /* __XEN_PUBLIC_FEATURES_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZY-0003aO-Ew; Fri, 12 Sep 2014 01:22:48 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZX-0003a4-4O for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:47 +0000 Received: from [85.158.139.211:45711] by server-15.bemta-5.messagelabs.com id 93/09-12002-6EA42145; Fri, 12 Sep 2014 01:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1410484964!8666165!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2538 invoked from network); 12 Sep 2014 01:22:45 -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 Sep 2014 01:22:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZU-0000CF-6U for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZU-0000GB-4j for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:44 +0000 Date: Fri, 12 Sep 2014 01:22:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: introduce XENFEAT_grant_map_identity X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8d09ef6906ca0a9957e21334ad2c3eed626abe63 Author: Stefano Stabellini AuthorDate: Fri Aug 1 15:45:25 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 11:47:09 2014 +0100 xen/arm: introduce XENFEAT_grant_map_identity The flag specifies that the hypervisor maps a grant page to guest physical address == machine address of the page in addition to the normal grant mapping address. Frontends are allowed to map the same page multiple times using multiple grant references. On the backend side it can be difficult to find out the physical address corresponding to a particular machine address, especially at the completion of a dma operation. To simplify address translations, we introduce a second mapping of the grant at physical address == machine address so that dom0 can issue cache maintenance operations without having to find the pfn. Call arch_grant_map_page_identity and arch_grant_unmap_page_identity from __gnttab_map_grant_ref and __gnttab_unmap_common to introduce the second mapping if the domain is directly mapped. To do so we also need to change gnttab_need_iommu_mapping to just be defined as is_domain_direct_mapped on arm. Remove arm_smmu_map_page and arm_smmu_unmap_page as they have become unused. Signed-off-by: Stefano Stabellini Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/common/grant_table.c | 30 +++++++++++++++++++++++++----- xen/common/kernel.c | 2 ++ xen/drivers/passthrough/arm/smmu.c | 33 --------------------------------- xen/include/asm-arm/grant_table.h | 3 +-- xen/include/public/features.h | 3 +++ 5 files changed, 31 insertions(+), 40 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 464007e..23266c3 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -738,13 +738,23 @@ __gnttab_map_grant_ref( !(old_pin & (GNTPIN_hstw_mask|GNTPIN_devw_mask)) ) { if ( wrc == 0 ) - err = iommu_map_page(ld, frame, frame, - IOMMUF_readable|IOMMUF_writable); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_map_page_identity(ld, frame, 1); + else + err = iommu_map_page(ld, frame, frame, + IOMMUF_readable|IOMMUF_writable); + } } else if ( act_pin && !old_pin ) { if ( (wrc + rdc) == 0 ) - err = iommu_map_page(ld, frame, frame, IOMMUF_readable); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_map_page_identity(ld, frame, 0); + else + err = iommu_map_page(ld, frame, frame, IOMMUF_readable); + } } if ( err ) { @@ -941,9 +951,19 @@ __gnttab_unmap_common( int err = 0; mapcount(lgt, rd, op->frame, &wrc, &rdc); if ( (wrc + rdc) == 0 ) - err = iommu_unmap_page(ld, op->frame); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_unmap_page_identity(ld, op->frame); + else + err = iommu_unmap_page(ld, op->frame); + } else if ( wrc == 0 ) - err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); + { + if ( is_domain_direct_mapped(ld) ) + err = arch_grant_map_page_identity(ld, op->frame, 0); + else + err = iommu_map_page(ld, op->frame, op->frame, IOMMUF_readable); + } if ( err ) { rc = GNTST_general_error; diff --git a/xen/common/kernel.c b/xen/common/kernel.c index d23c422..ce65486 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -332,6 +332,8 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } #endif + if ( is_domain_direct_mapped(d) ) + fi.submap |= 1U << XENFEAT_grant_map_identity; break; default: return -EINVAL; diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index fb0c694..21b4572 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -1536,37 +1536,6 @@ static void arm_smmu_iommu_domain_teardown(struct domain *d) xfree(smmu_domain); } -static int arm_smmu_map_page(struct domain *d, unsigned long gfn, - unsigned long mfn, unsigned int flags) -{ - /* Grant mappings can be used for DMA requests. The dev_bus_addr returned by - * the hypercall is the MFN (not the IPA). For device protected by - * an IOMMU, Xen needs to add a 1:1 mapping in the domain p2m to - * allow DMA request to work. - * This is only valid when the domain is directed mapped. Hence this - * function should only be used by gnttab code with gfn == mfn. - */ - BUG_ON(!is_domain_direct_mapped(d)); - BUG_ON(mfn != gfn); - - /* We only support readable and writable flags */ - if ( !(flags & (IOMMUF_readable | IOMMUF_writable)) ) - return -EINVAL; - - return arch_grant_map_page_identity(d, mfn, flags & IOMMUF_writable); -} - -static int arm_smmu_unmap_page(struct domain *d, unsigned long gfn) -{ - /* This function should only be used by gnttab code when the domain - * is direct mapped - */ - if ( !is_domain_direct_mapped(d) ) - return -EINVAL; - - return arch_grant_unmap_page_identity(d, gfn); -} - static const struct iommu_ops arm_smmu_iommu_ops = { .init = arm_smmu_iommu_domain_init, .hwdom_init = arm_smmu_iommu_hwdom_init, @@ -1575,8 +1544,6 @@ static const struct iommu_ops arm_smmu_iommu_ops = { .iotlb_flush_all = arm_smmu_iotlb_flush_all, .assign_dt_device = arm_smmu_attach_dev, .reassign_dt_device = arm_smmu_reassign_dt_dev, - .map_page = arm_smmu_map_page, - .unmap_page = arm_smmu_unmap_page, }; static int __init smmu_init(struct dt_device_node *dev, diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index eac8a70..47147ce 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -33,8 +33,7 @@ static inline int replace_grant_supported(void) ( ((i >= nr_grant_frames(d->grant_table)) && \ (i < max_nr_grant_frames)) ? 0 : (d->arch.grant_table_gpfn[i])) -#define gnttab_need_iommu_mapping(d) \ - (is_domain_direct_mapped(d) && need_iommu(d)) +#define gnttab_need_iommu_mapping(d) (is_domain_direct_mapped(d)) #endif /* __ASM_GRANT_TABLE_H__ */ /* diff --git a/xen/include/public/features.h b/xen/include/public/features.h index a149aa6..b7bf83f 100644 --- a/xen/include/public/features.h +++ b/xen/include/public/features.h @@ -94,6 +94,9 @@ /* operation as Dom0 is supported */ #define XENFEAT_dom0 11 +/* Xen also maps grant references at pfn = mfn */ +#define XENFEAT_grant_map_identity 12 + #define XENFEAT_NR_SUBMAPS 1 #endif /* __XEN_PUBLIC_FEATURES_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZi-0003bk-Hu; Fri, 12 Sep 2014 01:22:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZh-0003bZ-5s for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:57 +0000 Received: from [85.158.137.68:57458] by server-3.bemta-3.messagelabs.com id 9E/1F-22751-0FA42145; Fri, 12 Sep 2014 01:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1410484974!11162434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3725 invoked from network); 12 Sep 2014 01:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZe-0000CP-C4 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZe-0000GX-9s for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:54 +0000 Date: Fri, 12 Sep 2014 01:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make userdata_path libxl internal function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34714e3222eab8cfc0b3a9d5b46b2dfe6dcc7f7f Author: Wei Liu AuthorDate: Thu Sep 4 23:43:07 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:45:10 2014 +0100 libxl: make userdata_path libxl internal function Later patch will make use of it to generate file path and name. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 14 +++++++------- tools/libxl/libxl_internal.h | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c944804..5e0cb80 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1807,9 +1807,9 @@ char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) return GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(uuid)); } -static const char *userdata_path(libxl__gc *gc, uint32_t domid, - const char *userdata_userid, - const char *wh) +const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const char *wh) { libxl_ctx *ctx = libxl__gc_owner(gc); char *uuid_string; @@ -1844,7 +1844,7 @@ void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid) glob_t gl; int r, i; - pattern = userdata_path(gc, domid, "*", "?"); + pattern = libxl__userdata_path(gc, domid, "*", "?"); if (!pattern) goto out; @@ -1875,7 +1875,7 @@ int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, int e, rc; int fd = -1; - filename = userdata_path(gc, domid, userdata_userid, "d"); + filename = libxl__userdata_path(gc, domid, userdata_userid, "d"); if (!filename) { rc = ERROR_NOMEM; goto out; @@ -1886,7 +1886,7 @@ int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, goto out; } - newfilename = userdata_path(gc, domid, userdata_userid, "n"); + newfilename = libxl__userdata_path(gc, domid, userdata_userid, "n"); if (!newfilename) { rc = ERROR_NOMEM; goto out; @@ -1937,7 +1937,7 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, int datalen = 0; void *data = 0; - filename = userdata_path(gc, domid, userdata_userid, "d"); + filename = libxl__userdata_path(gc, domid, userdata_userid, "d"); if (!filename) { rc = ERROR_NOMEM; goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 04c9378..7244473 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -992,6 +992,9 @@ _hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); +_hidden const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const char *wh); _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume(libxl__gc *gc, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:22:58 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:22:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZi-0003bk-Hu; Fri, 12 Sep 2014 01:22:58 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZh-0003bZ-5s for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:57 +0000 Received: from [85.158.137.68:57458] by server-3.bemta-3.messagelabs.com id 9E/1F-22751-0FA42145; Fri, 12 Sep 2014 01:22:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1410484974!11162434!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3725 invoked from network); 12 Sep 2014 01:22:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:22:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZe-0000CP-C4 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZe-0000GX-9s for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:22:54 +0000 Date: Fri, 12 Sep 2014 01:22:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make userdata_path libxl internal function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 34714e3222eab8cfc0b3a9d5b46b2dfe6dcc7f7f Author: Wei Liu AuthorDate: Thu Sep 4 23:43:07 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:45:10 2014 +0100 libxl: make userdata_path libxl internal function Later patch will make use of it to generate file path and name. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_dom.c | 14 +++++++------- tools/libxl/libxl_internal.h | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index c944804..5e0cb80 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1807,9 +1807,9 @@ char *libxl__uuid2string(libxl__gc *gc, const libxl_uuid uuid) return GCSPRINTF(LIBXL_UUID_FMT, LIBXL_UUID_BYTES(uuid)); } -static const char *userdata_path(libxl__gc *gc, uint32_t domid, - const char *userdata_userid, - const char *wh) +const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const char *wh) { libxl_ctx *ctx = libxl__gc_owner(gc); char *uuid_string; @@ -1844,7 +1844,7 @@ void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid) glob_t gl; int r, i; - pattern = userdata_path(gc, domid, "*", "?"); + pattern = libxl__userdata_path(gc, domid, "*", "?"); if (!pattern) goto out; @@ -1875,7 +1875,7 @@ int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, int e, rc; int fd = -1; - filename = userdata_path(gc, domid, userdata_userid, "d"); + filename = libxl__userdata_path(gc, domid, userdata_userid, "d"); if (!filename) { rc = ERROR_NOMEM; goto out; @@ -1886,7 +1886,7 @@ int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, goto out; } - newfilename = userdata_path(gc, domid, userdata_userid, "n"); + newfilename = libxl__userdata_path(gc, domid, userdata_userid, "n"); if (!newfilename) { rc = ERROR_NOMEM; goto out; @@ -1937,7 +1937,7 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, int datalen = 0; void *data = 0; - filename = userdata_path(gc, domid, userdata_userid, "d"); + filename = libxl__userdata_path(gc, domid, userdata_userid, "d"); if (!filename) { rc = ERROR_NOMEM; goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 04c9378..7244473 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -992,6 +992,9 @@ _hidden int libxl__toolstack_restore(uint32_t domid, const uint8_t *buf, uint32_t size, void *data); _hidden int libxl__domain_resume_device_model(libxl__gc *gc, uint32_t domid); +_hidden const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const char *wh); _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); _hidden int libxl__domain_resume(libxl__gc *gc, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01: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 1XSFZs-0003dr-Ss; Fri, 12 Sep 2014 01: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 1XSFZr-0003dT-AM for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:07 +0000 Received: from [85.158.139.211:46282] by server-16.bemta-5.messagelabs.com id 9A/60-01029-AFA42145; Fri, 12 Sep 2014 01:23:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1410484984!8602243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14120 invoked from network); 12 Sep 2014 01:23:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZo-0000Cz-Iw for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZo-0000H3-Go for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:04 +0000 Date: Fri, 12 Sep 2014 01:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: functions to lock / unlock libxl userdata store X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2cd9d4f56c3efd4d9e1b5040dfd7f418635554a Author: Wei Liu AuthorDate: Thu Sep 4 23:43:08 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:45:10 2014 +0100 libxl: functions to lock / unlock libxl userdata store This lock is used to protect all userdata files related to a particular domain, which include but are not limited to domain configuration. A new "domain-userdata-lock" entry is introduced in libxl registry. This lock works among different processes and different threads within the same process. Locking protocol inspired by Ian Jackson's chiark-utils with-lock-ex. A file lock is taken with flock(2). If that succeeds that thread fstat the fd and stat the lock file path. If the device and inode match then the lock has been successfully acquired. This lock remains acquired until the lock file gets deleted or released by flock(2). If device and inode don't match then another thread acquired the lock and deleted the file in the meantime; lock procedure should restart. Portability note: this lock utilises flock(2) so a proper implementation of flock(2) is required -- that is, it should not be implemented with fcntl(2). Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.h | 3 ++ tools/libxl/libxl_internal.c | 69 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 5 +++ 3 files changed, 77 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 460207b..1ca25ae 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1220,6 +1220,9 @@ void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid, * "xl" domain config file in xl format, Unix line endings * "libvirt-xml" domain config file in libvirt XML format. See * http://libvirt.org/formatdomain.html + * "domain-userdata-lock" lock file to protect domain userdata in libxl. + * It's a per-domain lock. Applications should + * not touch this file. * * libxl does not enforce the registration of userdata userids or the * semantics of the data. For specifications of the data formats diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index b880c89..edf864b 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -381,6 +381,75 @@ out: return rc; } +/* Portability note: this lock utilises flock(2) so a proper implementation of + * flock(2) is required. + */ +libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid) +{ + libxl__carefd *carefd = NULL; + const char *lockfile; + int fd; + struct stat stab, fstab; + + lockfile = libxl__userdata_path(gc, domid, "domain-userdata-lock", "l"); + if (!lockfile) goto out; + + while (true) { + libxl__carefd_begin(); + fd = open(lockfile, O_RDWR|O_CREAT, 0666); + if (fd < 0) + LOGE(ERROR, "cannot open lockfile %s, errno=%d", lockfile, errno); + carefd = libxl__carefd_opened(CTX, fd); + if (fd < 0) goto out; + + /* Lock the file in exclusive mode, wait indefinitely to + * acquire the lock + */ + while (flock(fd, LOCK_EX)) { + switch (errno) { + case EINTR: + /* Signal received, retry */ + continue; + default: + /* All other errno: EBADF, EINVAL, ENOLCK, EWOULDBLOCK */ + LOGE(ERROR, + "unexpected error while trying to lock %s, fd=%d, errno=%d", + lockfile, fd, errno); + goto out; + } + } + + if (fstat(fd, &fstab)) { + LOGE(ERROR, "cannot fstat %s, fd=%d, errno=%d", + lockfile, fd, errno); + goto out; + } + if (stat(lockfile, &stab)) { + if (errno != ENOENT) { + LOGE(ERROR, "cannot stat %s, errno=%d", lockfile, errno); + goto out; + } + } else { + if (stab.st_dev == fstab.st_dev && stab.st_ino == fstab.st_ino) + break; + } + + libxl__carefd_close(carefd); + } + + return carefd; + +out: + if (carefd) libxl__carefd_close(carefd); + return NULL; +} + +void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd) +{ + /* Simply closing the file descriptor releases the lock */ + libxl__carefd_close(lock_carefd); +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7244473..0cedd30 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -3223,6 +3224,10 @@ static inline int libxl__key_value_list_is_empty(libxl_key_value_list *pkvl) int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); +/* Portability note: a proper flock(2) implementation is required */ +libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); +void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd); + #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01: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 1XSFZs-0003dr-Ss; Fri, 12 Sep 2014 01: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 1XSFZr-0003dT-AM for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:07 +0000 Received: from [85.158.139.211:46282] by server-16.bemta-5.messagelabs.com id 9A/60-01029-AFA42145; Fri, 12 Sep 2014 01:23:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1410484984!8602243!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14120 invoked from network); 12 Sep 2014 01:23:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZo-0000Cz-Iw for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZo-0000H3-Go for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:04 +0000 Date: Fri, 12 Sep 2014 01:23:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: functions to lock / unlock libxl userdata store X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2cd9d4f56c3efd4d9e1b5040dfd7f418635554a Author: Wei Liu AuthorDate: Thu Sep 4 23:43:08 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:45:10 2014 +0100 libxl: functions to lock / unlock libxl userdata store This lock is used to protect all userdata files related to a particular domain, which include but are not limited to domain configuration. A new "domain-userdata-lock" entry is introduced in libxl registry. This lock works among different processes and different threads within the same process. Locking protocol inspired by Ian Jackson's chiark-utils with-lock-ex. A file lock is taken with flock(2). If that succeeds that thread fstat the fd and stat the lock file path. If the device and inode match then the lock has been successfully acquired. This lock remains acquired until the lock file gets deleted or released by flock(2). If device and inode don't match then another thread acquired the lock and deleted the file in the meantime; lock procedure should restart. Portability note: this lock utilises flock(2) so a proper implementation of flock(2) is required -- that is, it should not be implemented with fcntl(2). Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.h | 3 ++ tools/libxl/libxl_internal.c | 69 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 5 +++ 3 files changed, 77 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 460207b..1ca25ae 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1220,6 +1220,9 @@ void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid, * "xl" domain config file in xl format, Unix line endings * "libvirt-xml" domain config file in libvirt XML format. See * http://libvirt.org/formatdomain.html + * "domain-userdata-lock" lock file to protect domain userdata in libxl. + * It's a per-domain lock. Applications should + * not touch this file. * * libxl does not enforce the registration of userdata userids or the * semantics of the data. For specifications of the data formats diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index b880c89..edf864b 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -381,6 +381,75 @@ out: return rc; } +/* Portability note: this lock utilises flock(2) so a proper implementation of + * flock(2) is required. + */ +libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid) +{ + libxl__carefd *carefd = NULL; + const char *lockfile; + int fd; + struct stat stab, fstab; + + lockfile = libxl__userdata_path(gc, domid, "domain-userdata-lock", "l"); + if (!lockfile) goto out; + + while (true) { + libxl__carefd_begin(); + fd = open(lockfile, O_RDWR|O_CREAT, 0666); + if (fd < 0) + LOGE(ERROR, "cannot open lockfile %s, errno=%d", lockfile, errno); + carefd = libxl__carefd_opened(CTX, fd); + if (fd < 0) goto out; + + /* Lock the file in exclusive mode, wait indefinitely to + * acquire the lock + */ + while (flock(fd, LOCK_EX)) { + switch (errno) { + case EINTR: + /* Signal received, retry */ + continue; + default: + /* All other errno: EBADF, EINVAL, ENOLCK, EWOULDBLOCK */ + LOGE(ERROR, + "unexpected error while trying to lock %s, fd=%d, errno=%d", + lockfile, fd, errno); + goto out; + } + } + + if (fstat(fd, &fstab)) { + LOGE(ERROR, "cannot fstat %s, fd=%d, errno=%d", + lockfile, fd, errno); + goto out; + } + if (stat(lockfile, &stab)) { + if (errno != ENOENT) { + LOGE(ERROR, "cannot stat %s, errno=%d", lockfile, errno); + goto out; + } + } else { + if (stab.st_dev == fstab.st_dev && stab.st_ino == fstab.st_ino) + break; + } + + libxl__carefd_close(carefd); + } + + return carefd; + +out: + if (carefd) libxl__carefd_close(carefd); + return NULL; +} + +void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd) +{ + /* Simply closing the file descriptor releases the lock */ + libxl__carefd_close(lock_carefd); +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 7244473..0cedd30 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -3223,6 +3224,10 @@ static inline int libxl__key_value_list_is_empty(libxl_key_value_list *pkvl) int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); +/* Portability note: a proper flock(2) implementation is required */ +libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); +void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd); + #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23: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 1XSFa2-0003fL-Vb; Fri, 12 Sep 2014 01:23:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFa1-0003f3-IF for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:17 +0000 Received: from [85.158.139.211:46627] by server-8.bemta-5.messagelabs.com id 56/9B-22440-40B42145; Fri, 12 Sep 2014 01:23:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1410484995!13983684!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23970 invoked from network); 12 Sep 2014 01:23:16 -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; 12 Sep 2014 01:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZy-0000D5-QF for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZy-0000HU-NL for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:14 +0000 Date: Fri, 12 Sep 2014 01:23:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: properly lock userdata store X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b61d5a9a76363fad9cd10ac1c40288e01d43d85f Author: Wei Liu AuthorDate: Thu Sep 4 23:43:09 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:13 2014 +0100 libxl: properly lock userdata store Originally libxl user data store didn't have lock at all. There could be such race condition as mentioned by Ian Jackson: Task 1 Task 2 Creating the domain Trying to shut down actually create domain observe domid start domain destruction delete all userdata destroy domain store the userdata *** forbidden state created: userdata exists but domain doesn't *** userdata has been leaked [ would now bomb out ] This patch adds in proper locking to libxl user data store. The lock is associated with a specific domain (i.e. a per-domain lock). As for locking hierachy, we first take CTX lock (which is implemented with pthread recursive mutex so even if the application has taken it we're fine), then take the file lock. These locks are released in reversed order. A new libxl error code ERROR_LOCK_FAIL is introduced to describe failure to acquire locks. Also factor out libxl__userdata_{retrieve,store}, so that other functions that already hold the lock can call them to manipulate user data. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 8 ++++ tools/libxl/libxl_dom.c | 73 +++++++++++++++++++++++++++++++++++------- tools/libxl/libxl_internal.h | 10 ++++++ tools/libxl/libxl_types.idl | 1 + 4 files changed, 80 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2ae5fca..9bb1a90 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1530,6 +1530,7 @@ static void devices_destroy_cb(libxl__egc *egc, uint32_t domid = dis->domid; char *dom_path; char *vm_path; + libxl__carefd *lock = NULL; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { @@ -1555,6 +1556,12 @@ static void devices_destroy_cb(libxl__egc *egc, xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid)); + /* This is async operation, we already hold CTX lock */ + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } libxl__userdata_destroyall(gc, domid); rc = xc_domain_destroy(ctx->xch, domid); @@ -1566,6 +1573,7 @@ static void devices_destroy_cb(libxl__egc *egc, rc = 0; out: + if (lock) libxl__unlock_domain_userdata(lock); dis->callback(egc, dis, rc); return; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 5e0cb80..0dfdb08 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1865,11 +1865,10 @@ out: return; } -int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, - const char *userdata_userid, - const uint8_t *data, int datalen) +int libxl__userdata_store(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const uint8_t *data, int datalen) { - GC_INIT(ctx); const char *filename; const char *newfilename; int e, rc; @@ -1898,7 +1897,7 @@ int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, if (fd < 0) goto err; - if (libxl_write_exactly(ctx, fd, data, datalen, "userdata", newfilename)) + if (libxl_write_exactly(CTX, fd, data, datalen, "userdata", newfilename)) goto err; if (close(fd) < 0) { @@ -1920,18 +1919,42 @@ err: } if (rc) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot write/rename %s for %s", + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "cannot write/rename %s for %s", newfilename, filename); out: - GC_FREE; return rc; } -int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, - const char *userdata_userid, - uint8_t **data_r, int *datalen_r) +int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid, + const uint8_t *data, int datalen) { GC_INIT(ctx); + int rc; + libxl__carefd *lock; + + CTX_LOCK; + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__userdata_store(gc, domid, userdata_userid, + data, datalen); + + libxl__unlock_domain_userdata(lock); + +out: + CTX_UNLOCK; + GC_FREE; + return rc; +} + +int libxl__userdata_retrieve(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + uint8_t **data_r, int *datalen_r) +{ const char *filename; int e, rc; int datalen = 0; @@ -1943,13 +1966,13 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, goto out; } - e = libxl_read_file_contents(ctx, filename, data_r ? &data : 0, &datalen); + e = libxl_read_file_contents(CTX, filename, data_r ? &data : 0, &datalen); if (e && errno != ENOENT) { rc = ERROR_FAIL; goto out; } if (!e && !datalen) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "userdata file %s is empty", filename); + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, "userdata file %s is empty", filename); if (data_r) assert(!*data_r); rc = ERROR_FAIL; goto out; @@ -1958,7 +1981,33 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, if (data_r) *data_r = data; if (datalen_r) *datalen_r = datalen; rc = 0; + +out: + return rc; +} + +int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid, + uint8_t **data_r, int *datalen_r) +{ + GC_INIT(ctx); + int rc; + libxl__carefd *lock; + + CTX_LOCK; + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__userdata_retrieve(gc, domid, userdata_userid, + data_r, datalen_r); + + + libxl__unlock_domain_userdata(lock); out: + CTX_UNLOCK; GC_FREE; return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0cedd30..bc89e79 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -997,6 +997,16 @@ _hidden const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, const char *userdata_userid, const char *wh); _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); +/* Caller must hold userdata store lock before calling + * libxl__userdata_{retrieve,store} + * See libxl__{un,}lock_domain_userdata. + */ +_hidden int libxl__userdata_retrieve(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + uint8_t **data_r, int *datalen_r); +_hidden int libxl__userdata_store(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const uint8_t *data, int datalen); _hidden int libxl__domain_resume(libxl__gc *gc, uint32_t domid, int suspend_cancel); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 931c9e9..95681d5 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -58,6 +58,7 @@ libxl_error = Enumeration("error", [ (-12, "OSEVENT_REG_FAIL"), (-13, "BUFFERFULL"), (-14, "UNKNOWN_CHILD"), + (-15, "LOCK_FAIL"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_type", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23: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 1XSFa2-0003fL-Vb; Fri, 12 Sep 2014 01:23:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFa1-0003f3-IF for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:17 +0000 Received: from [85.158.139.211:46627] by server-8.bemta-5.messagelabs.com id 56/9B-22440-40B42145; Fri, 12 Sep 2014 01:23:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1410484995!13983684!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23970 invoked from network); 12 Sep 2014 01:23:16 -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; 12 Sep 2014 01:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFZy-0000D5-QF for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFZy-0000HU-NL for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:14 +0000 Date: Fri, 12 Sep 2014 01:23:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: properly lock userdata store X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b61d5a9a76363fad9cd10ac1c40288e01d43d85f Author: Wei Liu AuthorDate: Thu Sep 4 23:43:09 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:13 2014 +0100 libxl: properly lock userdata store Originally libxl user data store didn't have lock at all. There could be such race condition as mentioned by Ian Jackson: Task 1 Task 2 Creating the domain Trying to shut down actually create domain observe domid start domain destruction delete all userdata destroy domain store the userdata *** forbidden state created: userdata exists but domain doesn't *** userdata has been leaked [ would now bomb out ] This patch adds in proper locking to libxl user data store. The lock is associated with a specific domain (i.e. a per-domain lock). As for locking hierachy, we first take CTX lock (which is implemented with pthread recursive mutex so even if the application has taken it we're fine), then take the file lock. These locks are released in reversed order. A new libxl error code ERROR_LOCK_FAIL is introduced to describe failure to acquire locks. Also factor out libxl__userdata_{retrieve,store}, so that other functions that already hold the lock can call them to manipulate user data. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 8 ++++ tools/libxl/libxl_dom.c | 73 +++++++++++++++++++++++++++++++++++------- tools/libxl/libxl_internal.h | 10 ++++++ tools/libxl/libxl_types.idl | 1 + 4 files changed, 80 insertions(+), 12 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 2ae5fca..9bb1a90 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1530,6 +1530,7 @@ static void devices_destroy_cb(libxl__egc *egc, uint32_t domid = dis->domid; char *dom_path; char *vm_path; + libxl__carefd *lock = NULL; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { @@ -1555,6 +1556,12 @@ static void devices_destroy_cb(libxl__egc *egc, xs_rm(ctx->xsh, XBT_NULL, libxl__sprintf(gc, "/local/domain/%d/hvmloader", domid)); + /* This is async operation, we already hold CTX lock */ + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } libxl__userdata_destroyall(gc, domid); rc = xc_domain_destroy(ctx->xch, domid); @@ -1566,6 +1573,7 @@ static void devices_destroy_cb(libxl__egc *egc, rc = 0; out: + if (lock) libxl__unlock_domain_userdata(lock); dis->callback(egc, dis, rc); return; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 5e0cb80..0dfdb08 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1865,11 +1865,10 @@ out: return; } -int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, - const char *userdata_userid, - const uint8_t *data, int datalen) +int libxl__userdata_store(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const uint8_t *data, int datalen) { - GC_INIT(ctx); const char *filename; const char *newfilename; int e, rc; @@ -1898,7 +1897,7 @@ int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, if (fd < 0) goto err; - if (libxl_write_exactly(ctx, fd, data, datalen, "userdata", newfilename)) + if (libxl_write_exactly(CTX, fd, data, datalen, "userdata", newfilename)) goto err; if (close(fd) < 0) { @@ -1920,18 +1919,42 @@ err: } if (rc) - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "cannot write/rename %s for %s", + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "cannot write/rename %s for %s", newfilename, filename); out: - GC_FREE; return rc; } -int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, - const char *userdata_userid, - uint8_t **data_r, int *datalen_r) +int libxl_userdata_store(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid, + const uint8_t *data, int datalen) { GC_INIT(ctx); + int rc; + libxl__carefd *lock; + + CTX_LOCK; + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__userdata_store(gc, domid, userdata_userid, + data, datalen); + + libxl__unlock_domain_userdata(lock); + +out: + CTX_UNLOCK; + GC_FREE; + return rc; +} + +int libxl__userdata_retrieve(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + uint8_t **data_r, int *datalen_r) +{ const char *filename; int e, rc; int datalen = 0; @@ -1943,13 +1966,13 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, goto out; } - e = libxl_read_file_contents(ctx, filename, data_r ? &data : 0, &datalen); + e = libxl_read_file_contents(CTX, filename, data_r ? &data : 0, &datalen); if (e && errno != ENOENT) { rc = ERROR_FAIL; goto out; } if (!e && !datalen) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "userdata file %s is empty", filename); + LIBXL__LOG(CTX, LIBXL__LOG_ERROR, "userdata file %s is empty", filename); if (data_r) assert(!*data_r); rc = ERROR_FAIL; goto out; @@ -1958,7 +1981,33 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, if (data_r) *data_r = data; if (datalen_r) *datalen_r = datalen; rc = 0; + +out: + return rc; +} + +int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid, + uint8_t **data_r, int *datalen_r) +{ + GC_INIT(ctx); + int rc; + libxl__carefd *lock; + + CTX_LOCK; + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__userdata_retrieve(gc, domid, userdata_userid, + data_r, datalen_r); + + + libxl__unlock_domain_userdata(lock); out: + CTX_UNLOCK; GC_FREE; return rc; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 0cedd30..bc89e79 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -997,6 +997,16 @@ _hidden const char *libxl__userdata_path(libxl__gc *gc, uint32_t domid, const char *userdata_userid, const char *wh); _hidden void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid); +/* Caller must hold userdata store lock before calling + * libxl__userdata_{retrieve,store} + * See libxl__{un,}lock_domain_userdata. + */ +_hidden int libxl__userdata_retrieve(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + uint8_t **data_r, int *datalen_r); +_hidden int libxl__userdata_store(libxl__gc *gc, uint32_t domid, + const char *userdata_userid, + const uint8_t *data, int datalen); _hidden int libxl__domain_resume(libxl__gc *gc, uint32_t domid, int suspend_cancel); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 931c9e9..95681d5 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -58,6 +58,7 @@ libxl_error = Enumeration("error", [ (-12, "OSEVENT_REG_FAIL"), (-13, "BUFFERFULL"), (-14, "UNKNOWN_CHILD"), + (-15, "LOCK_FAIL"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_type", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23: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 1XSFaC-0003gh-27; Fri, 12 Sep 2014 01:23:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaB-0003ga-LM for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:27 +0000 Received: from [193.109.254.147:10193] by server-10.bemta-14.messagelabs.com id FF/E3-01463-F0B42145; Fri, 12 Sep 2014 01:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1410485005!11694109!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4099 invoked from network); 12 Sep 2014 01:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFa9-0000DB-05 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFa8-0000Hq-Th for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:24 +0000 Date: Fri, 12 Sep 2014 01:23:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl-json format and internal functions to get / set it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72018008c89414092e7d6edb6775a90f151e66ec Author: Wei Liu AuthorDate: Thu Sep 4 23:43:10 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: libxl-json format and internal functions to get / set it Introduce a new format in libxl userdata store called "libxl-json". This file format contains JSON version of libxl_domain_config, generated by libxl. Applications are not supposed to access this file directly. Two internal functions to get and set libxl_domain_configuration are also introduced. Also introduce a new error code to indicate abnormal state that libxl-json config file is empty. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl.h | 5 +++ tools/libxl/libxl_internal.c | 56 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 11 ++++++++ tools/libxl/libxl_types.idl | 1 + 4 files changed, 73 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 1ca25ae..dab3a67 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1223,6 +1223,11 @@ void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid, * "domain-userdata-lock" lock file to protect domain userdata in libxl. * It's a per-domain lock. Applications should * not touch this file. + * "libxl-json" libxl_domain_config object in JSON format, generated + * by libxl. Applications should not access this file + * directly. This file is protected by domain-userdata-lock + * for against Read-Modify-Write operation and domain + * destruction. * * libxl does not enforce the registration of userdata userids or the * semantics of the data. For specifications of the data formats diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index edf864b..8ac1c14 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -450,6 +450,62 @@ void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd) libxl__carefd_close(lock_carefd); } +int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config) +{ + uint8_t *data = NULL; + int rc, len; + + rc = libxl__userdata_retrieve(gc, domid, "libxl-json", &data, &len); + if (rc) { + LOGEV(ERROR, rc, + "failed to retrieve domain configuration for domain %d", domid); + rc = ERROR_FAIL; + goto out; + } + + if (len == 0) { + /* No logging, not necessary an error from caller's PoV. */ + rc = ERROR_JSON_CONFIG_EMPTY; + goto out; + } + rc = libxl_domain_config_from_json(CTX, d_config, (const char *)data); + +out: + free(data); + return rc; +} + +int libxl__set_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config) +{ + char *d_config_json; + int rc; + + d_config_json = libxl_domain_config_to_json(CTX, d_config); + if (!d_config_json) { + LOGE(ERROR, + "failed to convert domain configuration to JSON for domain %d", + domid); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__userdata_store(gc, domid, "libxl-json", + (const uint8_t *)d_config_json, + strlen(d_config_json) + 1 /* include '\0' */); + if (rc) { + LOGEV(ERROR, rc, "failed to store domain configuration for domain %d", + domid); + rc = ERROR_FAIL; + goto out; + } + +out: + free(d_config_json); + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bc89e79..22c564f 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3238,6 +3238,17 @@ int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd); +/* + * Retrieve / store domain configuration from / to libxl private + * data store. The registry entry in libxl private data store + * is "libxl-json". + * Caller must hold user data lock. + */ +int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config); +int libxl__set_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config); + #endif /* diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 95681d5..1cd635e 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -59,6 +59,7 @@ libxl_error = Enumeration("error", [ (-13, "BUFFERFULL"), (-14, "UNKNOWN_CHILD"), (-15, "LOCK_FAIL"), + (-16, "JSON_CONFIG_EMPTY"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_type", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23: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 1XSFaC-0003gh-27; Fri, 12 Sep 2014 01:23:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaB-0003ga-LM for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:27 +0000 Received: from [193.109.254.147:10193] by server-10.bemta-14.messagelabs.com id FF/E3-01463-F0B42145; Fri, 12 Sep 2014 01:23:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1410485005!11694109!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4099 invoked from network); 12 Sep 2014 01:23:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFa9-0000DB-05 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFa8-0000Hq-Th for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:24 +0000 Date: Fri, 12 Sep 2014 01:23:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl-json format and internal functions to get / set it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72018008c89414092e7d6edb6775a90f151e66ec Author: Wei Liu AuthorDate: Thu Sep 4 23:43:10 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: libxl-json format and internal functions to get / set it Introduce a new format in libxl userdata store called "libxl-json". This file format contains JSON version of libxl_domain_config, generated by libxl. Applications are not supposed to access this file directly. Two internal functions to get and set libxl_domain_configuration are also introduced. Also introduce a new error code to indicate abnormal state that libxl-json config file is empty. Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl.h | 5 +++ tools/libxl/libxl_internal.c | 56 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 11 ++++++++ tools/libxl/libxl_types.idl | 1 + 4 files changed, 73 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 1ca25ae..dab3a67 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1223,6 +1223,11 @@ void libxl_cpuid_set(libxl_ctx *ctx, uint32_t domid, * "domain-userdata-lock" lock file to protect domain userdata in libxl. * It's a per-domain lock. Applications should * not touch this file. + * "libxl-json" libxl_domain_config object in JSON format, generated + * by libxl. Applications should not access this file + * directly. This file is protected by domain-userdata-lock + * for against Read-Modify-Write operation and domain + * destruction. * * libxl does not enforce the registration of userdata userids or the * semantics of the data. For specifications of the data formats diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index edf864b..8ac1c14 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -450,6 +450,62 @@ void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd) libxl__carefd_close(lock_carefd); } +int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config) +{ + uint8_t *data = NULL; + int rc, len; + + rc = libxl__userdata_retrieve(gc, domid, "libxl-json", &data, &len); + if (rc) { + LOGEV(ERROR, rc, + "failed to retrieve domain configuration for domain %d", domid); + rc = ERROR_FAIL; + goto out; + } + + if (len == 0) { + /* No logging, not necessary an error from caller's PoV. */ + rc = ERROR_JSON_CONFIG_EMPTY; + goto out; + } + rc = libxl_domain_config_from_json(CTX, d_config, (const char *)data); + +out: + free(data); + return rc; +} + +int libxl__set_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config) +{ + char *d_config_json; + int rc; + + d_config_json = libxl_domain_config_to_json(CTX, d_config); + if (!d_config_json) { + LOGE(ERROR, + "failed to convert domain configuration to JSON for domain %d", + domid); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__userdata_store(gc, domid, "libxl-json", + (const uint8_t *)d_config_json, + strlen(d_config_json) + 1 /* include '\0' */); + if (rc) { + LOGEV(ERROR, rc, "failed to store domain configuration for domain %d", + domid); + rc = ERROR_FAIL; + goto out; + } + +out: + free(d_config_json); + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index bc89e79..22c564f 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3238,6 +3238,17 @@ int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd); +/* + * Retrieve / store domain configuration from / to libxl private + * data store. The registry entry in libxl private data store + * is "libxl-json". + * Caller must hold user data lock. + */ +int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config); +int libxl__set_domain_configuration(libxl__gc *gc, uint32_t domid, + libxl_domain_config *d_config); + #endif /* diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 95681d5..1cd635e 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -59,6 +59,7 @@ libxl_error = Enumeration("error", [ (-13, "BUFFERFULL"), (-14, "UNKNOWN_CHILD"), (-15, "LOCK_FAIL"), + (-16, "JSON_CONFIG_EMPTY"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_type", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23: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 1XSFaO-0003i6-4z; Fri, 12 Sep 2014 01:23:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaL-0003ht-LQ for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:37 +0000 Received: from [85.158.143.35:57473] by server-3.bemta-4.messagelabs.com id 95/5A-06192-91B42145; Fri, 12 Sep 2014 01:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1410485015!12476149!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3741 invoked from network); 12 Sep 2014 01:23:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaJ-0000DJ-5m for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFaJ-0000IG-4n for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:35 +0000 Date: Fri, 12 Sep 2014 01:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: store a copy of configuration when creating domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af1f8aa9899f5ff8a1783a49fe6f0c566b8b7bc7 Author: Wei Liu AuthorDate: Thu Sep 4 23:43:11 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: store a copy of configuration when creating domain The configuration is stored in libxl-json format. It will be used as template to reconstruct domain configuration during runtime. There's only one write to disk when domain creation finishes. We therefore have a window that the domain exists but has no JSON config in disk. We define this state as domain being created or destroyed. Any other operations that need to access JSON config should bail. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 22 ++++++++++++++++++++++ tools/libxl/libxl_internal.c | 21 +++++++++++++++++++++ tools/libxl/libxl_internal.h | 21 +++++++++++++++++++++ 3 files changed, 64 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index ee328e9..57a0ece 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1389,10 +1389,30 @@ static void domcreate_complete(libxl__egc *egc, { STATE_AO_GC(dcs->ao); libxl_domain_config *const d_config = dcs->guest_config; + libxl_domain_config *d_config_saved = &dcs->guest_config_saved; if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); + if (!rc) { + libxl__carefd *lock; + + /* Note that we hold CTX lock at this point so only need to + * take data store lock + */ + lock = libxl__lock_domain_userdata(gc, dcs->guest_domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + } else { + libxl__update_domain_configuration(gc, d_config_saved, d_config); + rc = libxl__set_domain_configuration(gc, dcs->guest_domid, + d_config_saved); + libxl__unlock_domain_userdata(lock); + } + } + + libxl_domain_config_dispose(d_config_saved); + if (rc) { if (dcs->guest_domid) { dcs->dds.ao = ao; @@ -1443,6 +1463,8 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, GCNEW(cdcs); cdcs->dcs.ao = ao; cdcs->dcs.guest_config = d_config; + libxl_domain_config_init(&cdcs->dcs.guest_config_saved); + libxl_domain_config_copy(ctx, &cdcs->dcs.guest_config_saved, d_config); cdcs->dcs.restore_fd = restore_fd; cdcs->dcs.callback = domain_create_cb; cdcs->dcs.checkpointed_stream = checkpointed_stream; diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 8ac1c14..e9747f1 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -506,6 +506,27 @@ out: return rc; } +void libxl__update_domain_configuration(libxl__gc *gc, + libxl_domain_config *dst, + const libxl_domain_config *src) +{ + int i; + + /* update network interface information */ + for (i = 0; i < src->num_nics; i++) + libxl__update_config_nic(gc, &dst->nics[i], &src->nics[i]); + + /* update vtpm information */ + for (i = 0; i < src->num_vtpms; i++) + libxl__update_config_vtpm(gc, &dst->vtpms[i], &src->vtpms[i]); + + /* update guest UUID */ + libxl_uuid_copy(CTX, &dst->c_info.uuid, &src->c_info.uuid); + + /* video ram */ + dst->b_info.video_memkb = src->b_info.video_memkb; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 22c564f..3b8f74e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2781,6 +2781,7 @@ struct libxl__domain_create_state { /* filled in by user */ libxl__ao *ao; libxl_domain_config *guest_config; + libxl_domain_config guest_config_saved; /* vanilla config */ int restore_fd; libxl__domain_create_cb *callback; libxl_asyncprogress_how aop_console_how; @@ -3249,6 +3250,26 @@ int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, int libxl__set_domain_configuration(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_config); +/* ------ Things related to updating domain configurations ----- */ +void libxl__update_domain_configuration(libxl__gc *gc, + libxl_domain_config *dst, + const libxl_domain_config *src); +static inline void libxl__update_config_nic(libxl__gc *gc, + libxl_device_nic *dst, + libxl_device_nic *src) +{ + dst->devid = src->devid; + libxl_mac_copy(CTX, &dst->mac, &src->mac); +} + +static inline void libxl__update_config_vtpm(libxl__gc *gc, + libxl_device_vtpm *dst, + libxl_device_vtpm *src) +{ + dst->devid = src->devid; + libxl_uuid_copy(CTX, &dst->uuid, &src->uuid); +} + #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23: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 1XSFaO-0003i6-4z; Fri, 12 Sep 2014 01:23:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaL-0003ht-LQ for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:37 +0000 Received: from [85.158.143.35:57473] by server-3.bemta-4.messagelabs.com id 95/5A-06192-91B42145; Fri, 12 Sep 2014 01:23:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1410485015!12476149!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3741 invoked from network); 12 Sep 2014 01:23:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaJ-0000DJ-5m for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFaJ-0000IG-4n for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:35 +0000 Date: Fri, 12 Sep 2014 01:23:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: store a copy of configuration when creating domain X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af1f8aa9899f5ff8a1783a49fe6f0c566b8b7bc7 Author: Wei Liu AuthorDate: Thu Sep 4 23:43:11 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: store a copy of configuration when creating domain The configuration is stored in libxl-json format. It will be used as template to reconstruct domain configuration during runtime. There's only one write to disk when domain creation finishes. We therefore have a window that the domain exists but has no JSON config in disk. We define this state as domain being created or destroyed. Any other operations that need to access JSON config should bail. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 22 ++++++++++++++++++++++ tools/libxl/libxl_internal.c | 21 +++++++++++++++++++++ tools/libxl/libxl_internal.h | 21 +++++++++++++++++++++ 3 files changed, 64 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index ee328e9..57a0ece 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1389,10 +1389,30 @@ static void domcreate_complete(libxl__egc *egc, { STATE_AO_GC(dcs->ao); libxl_domain_config *const d_config = dcs->guest_config; + libxl_domain_config *d_config_saved = &dcs->guest_config_saved; if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); + if (!rc) { + libxl__carefd *lock; + + /* Note that we hold CTX lock at this point so only need to + * take data store lock + */ + lock = libxl__lock_domain_userdata(gc, dcs->guest_domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + } else { + libxl__update_domain_configuration(gc, d_config_saved, d_config); + rc = libxl__set_domain_configuration(gc, dcs->guest_domid, + d_config_saved); + libxl__unlock_domain_userdata(lock); + } + } + + libxl_domain_config_dispose(d_config_saved); + if (rc) { if (dcs->guest_domid) { dcs->dds.ao = ao; @@ -1443,6 +1463,8 @@ static int do_domain_create(libxl_ctx *ctx, libxl_domain_config *d_config, GCNEW(cdcs); cdcs->dcs.ao = ao; cdcs->dcs.guest_config = d_config; + libxl_domain_config_init(&cdcs->dcs.guest_config_saved); + libxl_domain_config_copy(ctx, &cdcs->dcs.guest_config_saved, d_config); cdcs->dcs.restore_fd = restore_fd; cdcs->dcs.callback = domain_create_cb; cdcs->dcs.checkpointed_stream = checkpointed_stream; diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 8ac1c14..e9747f1 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -506,6 +506,27 @@ out: return rc; } +void libxl__update_domain_configuration(libxl__gc *gc, + libxl_domain_config *dst, + const libxl_domain_config *src) +{ + int i; + + /* update network interface information */ + for (i = 0; i < src->num_nics; i++) + libxl__update_config_nic(gc, &dst->nics[i], &src->nics[i]); + + /* update vtpm information */ + for (i = 0; i < src->num_vtpms; i++) + libxl__update_config_vtpm(gc, &dst->vtpms[i], &src->vtpms[i]); + + /* update guest UUID */ + libxl_uuid_copy(CTX, &dst->c_info.uuid, &src->c_info.uuid); + + /* video ram */ + dst->b_info.video_memkb = src->b_info.video_memkb; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 22c564f..3b8f74e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2781,6 +2781,7 @@ struct libxl__domain_create_state { /* filled in by user */ libxl__ao *ao; libxl_domain_config *guest_config; + libxl_domain_config guest_config_saved; /* vanilla config */ int restore_fd; libxl__domain_create_cb *callback; libxl_asyncprogress_how aop_console_how; @@ -3249,6 +3250,26 @@ int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, int libxl__set_domain_configuration(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_config); +/* ------ Things related to updating domain configurations ----- */ +void libxl__update_domain_configuration(libxl__gc *gc, + libxl_domain_config *dst, + const libxl_domain_config *src); +static inline void libxl__update_config_nic(libxl__gc *gc, + libxl_device_nic *dst, + libxl_device_nic *src) +{ + dst->devid = src->devid; + libxl_mac_copy(CTX, &dst->mac, &src->mac); +} + +static inline void libxl__update_config_vtpm(libxl__gc *gc, + libxl_device_vtpm *dst, + libxl_device_vtpm *src) +{ + dst->devid = src->devid; + libxl_uuid_copy(CTX, &dst->uuid, &src->uuid); +} + #endif /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01: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 1XSFaX-0003jh-5p; Fri, 12 Sep 2014 01:23:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaW-0003jR-2N for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:48 +0000 Received: from [85.158.137.68:62659] by server-6.bemta-3.messagelabs.com id 1C/31-29521-32B42145; Fri, 12 Sep 2014 01:23:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1410485025!10299141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9932 invoked from network); 12 Sep 2014 01:23:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaT-0000DQ-BF for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFaT-0000JL-9H for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:45 +0000 Date: Fri, 12 Sep 2014 01:23:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce libxl__device_from_pcidev X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e56e7855e13da418baa402669ba0800389127b7 Author: Wei Liu AuthorDate: Thu Sep 4 23:43:12 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: introduce libxl__device_from_pcidev Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2782d0e..0500cf3 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -64,6 +64,20 @@ static void libxl_create_pci_backend_device(libxl__gc *gc, flexarray_t *back, in flexarray_append_pair(back, libxl__sprintf(gc, "state-%d", num), libxl__sprintf(gc, "%d", 1)); } +static int libxl__device_from_pcidev(libxl__gc *gc, uint32_t domid, + libxl_device_pci *pcidev, + libxl__device *device) +{ + device->backend_devid = 0; + device->backend_domid = 0; + device->backend_kind = LIBXL__DEVICE_KIND_PCI; + device->devid = 0; + device->domid = domid; + device->kind = LIBXL__DEVICE_KIND_PCI; + + return 0; +} + int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num) { @@ -81,12 +95,7 @@ int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Creating pci backend"); /* add pci device */ - device.backend_devid = 0; - device.backend_domid = 0; - device.backend_kind = LIBXL__DEVICE_KIND_PCI; - device.devid = 0; - device.domid = domid; - device.kind = LIBXL__DEVICE_KIND_PCI; + libxl__device_from_pcidev(gc, domid, pcidev, &device); flexarray_append_pair(back, "frontend-id", libxl__sprintf(gc, "%d", domid)); flexarray_append_pair(back, "online", "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 Fri Sep 12 01:23:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01: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 1XSFaX-0003jh-5p; Fri, 12 Sep 2014 01:23:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaW-0003jR-2N for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:48 +0000 Received: from [85.158.137.68:62659] by server-6.bemta-3.messagelabs.com id 1C/31-29521-32B42145; Fri, 12 Sep 2014 01:23:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1410485025!10299141!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9932 invoked from network); 12 Sep 2014 01:23:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFaT-0000DQ-BF for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFaT-0000JL-9H for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:45 +0000 Date: Fri, 12 Sep 2014 01:23:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce libxl__device_from_pcidev X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e56e7855e13da418baa402669ba0800389127b7 Author: Wei Liu AuthorDate: Thu Sep 4 23:43:12 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: introduce libxl__device_from_pcidev Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_pci.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 2782d0e..0500cf3 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -64,6 +64,20 @@ static void libxl_create_pci_backend_device(libxl__gc *gc, flexarray_t *back, in flexarray_append_pair(back, libxl__sprintf(gc, "state-%d", num), libxl__sprintf(gc, "%d", 1)); } +static int libxl__device_from_pcidev(libxl__gc *gc, uint32_t domid, + libxl_device_pci *pcidev, + libxl__device *device) +{ + device->backend_devid = 0; + device->backend_domid = 0; + device->backend_kind = LIBXL__DEVICE_KIND_PCI; + device->devid = 0; + device->domid = domid; + device->kind = LIBXL__DEVICE_KIND_PCI; + + return 0; +} + int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int num) { @@ -81,12 +95,7 @@ int libxl__create_pci_backend(libxl__gc *gc, uint32_t domid, LIBXL__LOG(ctx, LIBXL__LOG_DEBUG, "Creating pci backend"); /* add pci device */ - device.backend_devid = 0; - device.backend_domid = 0; - device.backend_kind = LIBXL__DEVICE_KIND_PCI; - device.devid = 0; - device.domid = domid; - device.kind = LIBXL__DEVICE_KIND_PCI; + libxl__device_from_pcidev(gc, domid, pcidev, &device); flexarray_append_pair(back, "frontend-id", libxl__sprintf(gc, "%d", domid)); flexarray_append_pair(back, "online", "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 Fri Sep 12 01:23:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFah-0003lR-8Z; Fri, 12 Sep 2014 01:23:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFag-0003l9-Dd for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:58 +0000 Received: from [85.158.139.211:47786] by server-12.bemta-5.messagelabs.com id EC/C2-22251-D2B42145; Fri, 12 Sep 2014 01:23:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1410485035!14009206!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30291 invoked from network); 12 Sep 2014 01:23:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFad-0000DZ-Fm for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFad-0000Jn-Eh for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:55 +0000 Date: Fri, 12 Sep 2014 01:23:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: disallow attaching the same device more than once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d5d5eca4afa35332891112f5f25c2f2cba790a2 Author: Wei Liu AuthorDate: Thu Sep 4 23:43:13 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: disallow attaching the same device more than once Originally the code allowed users to attach the same device more than once. It just stupidly overwrites xenstore entries. This is bogus as frontend will be very confused. Introduce a helper function to check if the device to be written to xenstore already exists. A new error code is also introduced. The check and add are within one xs transaction. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 70 +++++++++++++++++++++++++++++++++++++----- tools/libxl/libxl_device.c | 19 +++++++++++ tools/libxl/libxl_internal.h | 3 ++ tools/libxl/libxl_pci.c | 35 ++++++++++++++++----- tools/libxl/libxl_types.idl | 1 + 5 files changed, 112 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9bb1a90..ad3495a 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1893,6 +1893,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_t *back; libxl__device *device; int rc; + xs_transaction_t t = XBT_NULL; rc = libxl__device_vtpm_setdefault(gc, vtpm); if (rc) goto out; @@ -1932,10 +1933,30 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, "handle"); flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back, back->count), - libxl__xs_kvs_of_flexarray(gc, front, front->count), - NULL); + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { /* already exists in xenstore */ + LOG(ERROR, "device already exists in xenstore"); + aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ + rc = ERROR_DEVICE_EXISTS; + goto out; + } + + libxl__device_generic_add(gc, t, device, + libxl__xs_kvs_of_flexarray(gc, back, + back->count), + libxl__xs_kvs_of_flexarray(gc, front, + front->count), + NULL); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } aodev->dev = device; aodev->action = LIBXL__DEVICE_ACTION_ADD; @@ -1943,6 +1964,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, rc = 0; out: + libxl__xs_transaction_abort(gc, &t); aodev->rc = rc; if(rc) aodev->callback(egc, aodev); return; @@ -2209,6 +2231,15 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, goto out; } + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { /* already exists in xenstore */ + LOG(ERROR, "device already exists in xenstore"); + aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ + rc = ERROR_DEVICE_EXISTS; + goto out; + } + switch (disk->backend) { case LIBXL_DISK_BACKEND_PHY: dev = disk->pdev_path; @@ -2998,6 +3029,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_t *back; libxl__device *device; int rc; + xs_transaction_t t = XBT_NULL; rc = libxl__device_nic_setdefault(gc, nic, domid); if (rc) goto out; @@ -3068,10 +3100,31 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, "mac"); flexarray_append(front, libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nic->mac))); - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back, back->count), - libxl__xs_kvs_of_flexarray(gc, front, front->count), - NULL); + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { /* already exists in xenstore */ + LOG(ERROR, "device already exists in xenstore"); + aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ + rc = ERROR_DEVICE_EXISTS; + goto out; + } + + libxl__device_generic_add(gc, t, device, + libxl__xs_kvs_of_flexarray(gc, back, + back->count), + libxl__xs_kvs_of_flexarray(gc, front, + front->count), + NULL); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } aodev->dev = device; aodev->action = LIBXL__DEVICE_ACTION_ADD; @@ -3079,6 +3132,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, rc = 0; out: + libxl__xs_transaction_abort(gc, &t); aodev->rc = rc; if (rc) aodev->callback(egc, aodev); return; diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index f8a2e1b..045212f 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -40,6 +40,25 @@ char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device) device->domid, device->devid); } +/* Returns 1 if device exists, 0 if not, ERROR_* (<0) on error. */ +int libxl__device_exists(libxl__gc *gc, xs_transaction_t t, + libxl__device *device) +{ + int rc; + char *be_path = libxl__device_backend_path(gc, device); + const char *dir; + + be_path = libxl__device_backend_path(gc, device); + rc = libxl__xs_read_checked(gc, t, be_path, &dir); + + if (rc) + return rc; + + if (dir) + return 1; + return 0; +} + int libxl__parse_backend_path(libxl__gc *gc, const char *path, libxl__device *dev) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 3b8f74e..fafef5a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1033,6 +1033,9 @@ _hidden int libxl__device_console_add(libxl__gc *gc, uint32_t domid, libxl__device_console *console, libxl__domain_build_state *state); +/* Returns 1 if device exists, 0 if not, ERROR_* (<0) on error. */ +_hidden int libxl__device_exists(libxl__gc *gc, xs_transaction_t t, + libxl__device *device); _hidden int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, libxl__device *device, char **bents, char **fents, char **ro_fents); _hidden char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device); diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 0500cf3..38a9642 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -124,6 +124,8 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d char *num_devs, *be_path; int num = 0; xs_transaction_t t; + libxl__device *device; + int rc; be_path = libxl__sprintf(gc, "%s/backend/pci/%d/0", libxl__xs_get_dompath(gc, 0), domid); num_devs = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/num_devs", be_path)); @@ -148,15 +150,32 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d if (!starting) flexarray_append_pair(back, "state", libxl__sprintf(gc, "%d", 7)); -retry_transaction: - t = xs_transaction_start(ctx->xsh); - libxl__xs_writev(gc, t, be_path, - libxl__xs_kvs_of_flexarray(gc, back, back->count)); - if (!xs_transaction_end(ctx->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + GCNEW(device); + libxl__device_from_pcidev(gc, domid, pcidev, device); - return 0; + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { + LOG(ERROR, "device already exists in xenstore"); + rc = ERROR_DEVICE_EXISTS; + goto out; + } + + libxl__xs_writev(gc, t, be_path, + libxl__xs_kvs_of_flexarray(gc, back, back->count)); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } + +out: + libxl__xs_transaction_abort(gc, &t); + return rc; } static int libxl__device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 1cd635e..f1fcbc3 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -60,6 +60,7 @@ libxl_error = Enumeration("error", [ (-14, "UNKNOWN_CHILD"), (-15, "LOCK_FAIL"), (-16, "JSON_CONFIG_EMPTY"), + (-17, "DEVICE_EXISTS"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_type", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:23:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:23:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFah-0003lR-8Z; Fri, 12 Sep 2014 01:23:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFag-0003l9-Dd for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:58 +0000 Received: from [85.158.139.211:47786] by server-12.bemta-5.messagelabs.com id EC/C2-22251-D2B42145; Fri, 12 Sep 2014 01:23:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1410485035!14009206!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30291 invoked from network); 12 Sep 2014 01:23:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:23:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFad-0000DZ-Fm for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFad-0000Jn-Eh for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:23:55 +0000 Date: Fri, 12 Sep 2014 01:23:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: disallow attaching the same device more than once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0d5d5eca4afa35332891112f5f25c2f2cba790a2 Author: Wei Liu AuthorDate: Thu Sep 4 23:43:13 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:23 2014 +0100 libxl: disallow attaching the same device more than once Originally the code allowed users to attach the same device more than once. It just stupidly overwrites xenstore entries. This is bogus as frontend will be very confused. Introduce a helper function to check if the device to be written to xenstore already exists. A new error code is also introduced. The check and add are within one xs transaction. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 70 +++++++++++++++++++++++++++++++++++++----- tools/libxl/libxl_device.c | 19 +++++++++++ tools/libxl/libxl_internal.h | 3 ++ tools/libxl/libxl_pci.c | 35 ++++++++++++++++----- tools/libxl/libxl_types.idl | 1 + 5 files changed, 112 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9bb1a90..ad3495a 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1893,6 +1893,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_t *back; libxl__device *device; int rc; + xs_transaction_t t = XBT_NULL; rc = libxl__device_vtpm_setdefault(gc, vtpm); if (rc) goto out; @@ -1932,10 +1933,30 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, "handle"); flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back, back->count), - libxl__xs_kvs_of_flexarray(gc, front, front->count), - NULL); + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { /* already exists in xenstore */ + LOG(ERROR, "device already exists in xenstore"); + aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ + rc = ERROR_DEVICE_EXISTS; + goto out; + } + + libxl__device_generic_add(gc, t, device, + libxl__xs_kvs_of_flexarray(gc, back, + back->count), + libxl__xs_kvs_of_flexarray(gc, front, + front->count), + NULL); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } aodev->dev = device; aodev->action = LIBXL__DEVICE_ACTION_ADD; @@ -1943,6 +1964,7 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, rc = 0; out: + libxl__xs_transaction_abort(gc, &t); aodev->rc = rc; if(rc) aodev->callback(egc, aodev); return; @@ -2209,6 +2231,15 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, goto out; } + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { /* already exists in xenstore */ + LOG(ERROR, "device already exists in xenstore"); + aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ + rc = ERROR_DEVICE_EXISTS; + goto out; + } + switch (disk->backend) { case LIBXL_DISK_BACKEND_PHY: dev = disk->pdev_path; @@ -2998,6 +3029,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_t *back; libxl__device *device; int rc; + xs_transaction_t t = XBT_NULL; rc = libxl__device_nic_setdefault(gc, nic, domid); if (rc) goto out; @@ -3068,10 +3100,31 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, "mac"); flexarray_append(front, libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nic->mac))); - libxl__device_generic_add(gc, XBT_NULL, device, - libxl__xs_kvs_of_flexarray(gc, back, back->count), - libxl__xs_kvs_of_flexarray(gc, front, front->count), - NULL); + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { /* already exists in xenstore */ + LOG(ERROR, "device already exists in xenstore"); + aodev->action = LIBXL__DEVICE_ACTION_ADD; /* for error message */ + rc = ERROR_DEVICE_EXISTS; + goto out; + } + + libxl__device_generic_add(gc, t, device, + libxl__xs_kvs_of_flexarray(gc, back, + back->count), + libxl__xs_kvs_of_flexarray(gc, front, + front->count), + NULL); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } aodev->dev = device; aodev->action = LIBXL__DEVICE_ACTION_ADD; @@ -3079,6 +3132,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, rc = 0; out: + libxl__xs_transaction_abort(gc, &t); aodev->rc = rc; if (rc) aodev->callback(egc, aodev); return; diff --git a/tools/libxl/libxl_device.c b/tools/libxl/libxl_device.c index f8a2e1b..045212f 100644 --- a/tools/libxl/libxl_device.c +++ b/tools/libxl/libxl_device.c @@ -40,6 +40,25 @@ char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device) device->domid, device->devid); } +/* Returns 1 if device exists, 0 if not, ERROR_* (<0) on error. */ +int libxl__device_exists(libxl__gc *gc, xs_transaction_t t, + libxl__device *device) +{ + int rc; + char *be_path = libxl__device_backend_path(gc, device); + const char *dir; + + be_path = libxl__device_backend_path(gc, device); + rc = libxl__xs_read_checked(gc, t, be_path, &dir); + + if (rc) + return rc; + + if (dir) + return 1; + return 0; +} + int libxl__parse_backend_path(libxl__gc *gc, const char *path, libxl__device *dev) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 3b8f74e..fafef5a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1033,6 +1033,9 @@ _hidden int libxl__device_console_add(libxl__gc *gc, uint32_t domid, libxl__device_console *console, libxl__domain_build_state *state); +/* Returns 1 if device exists, 0 if not, ERROR_* (<0) on error. */ +_hidden int libxl__device_exists(libxl__gc *gc, xs_transaction_t t, + libxl__device *device); _hidden int libxl__device_generic_add(libxl__gc *gc, xs_transaction_t t, libxl__device *device, char **bents, char **fents, char **ro_fents); _hidden char *libxl__device_backend_path(libxl__gc *gc, libxl__device *device); diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 0500cf3..38a9642 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -124,6 +124,8 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d char *num_devs, *be_path; int num = 0; xs_transaction_t t; + libxl__device *device; + int rc; be_path = libxl__sprintf(gc, "%s/backend/pci/%d/0", libxl__xs_get_dompath(gc, 0), domid); num_devs = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/num_devs", be_path)); @@ -148,15 +150,32 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d if (!starting) flexarray_append_pair(back, "state", libxl__sprintf(gc, "%d", 7)); -retry_transaction: - t = xs_transaction_start(ctx->xsh); - libxl__xs_writev(gc, t, be_path, - libxl__xs_kvs_of_flexarray(gc, back, back->count)); - if (!xs_transaction_end(ctx->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + GCNEW(device); + libxl__device_from_pcidev(gc, domid, pcidev, device); - return 0; + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__device_exists(gc, t, device); + if (rc < 0) goto out; + if (rc == 1) { + LOG(ERROR, "device already exists in xenstore"); + rc = ERROR_DEVICE_EXISTS; + goto out; + } + + libxl__xs_writev(gc, t, be_path, + libxl__xs_kvs_of_flexarray(gc, back, back->count)); + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } + +out: + libxl__xs_transaction_abort(gc, &t); + return rc; } static int libxl__device_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev) diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 1cd635e..f1fcbc3 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -60,6 +60,7 @@ libxl_error = Enumeration("error", [ (-14, "UNKNOWN_CHILD"), (-15, "LOCK_FAIL"), (-16, "JSON_CONFIG_EMPTY"), + (-17, "DEVICE_EXISTS"), ], value_namespace = "") libxl_domain_type = Enumeration("domain_type", [ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24: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 1XSFat-0003nR-CF; Fri, 12 Sep 2014 01:24:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFar-0003nG-VZ for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:10 +0000 Received: from [85.158.137.68:23560] by server-17.bemta-3.messagelabs.com id 5A/23-01689-93B42145; Fri, 12 Sep 2014 01:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1410485045!13345357!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23561 invoked from network); 12 Sep 2014 01:24:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFan-0000E9-Kb for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFan-0000KJ-J7 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:05 +0000 Date: Fri, 12 Sep 2014 01:24:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce helper to initialise Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae931f568fe9e91179f3ff3aab199a84d39a626b Author: Wei Liu AuthorDate: Thu Sep 4 23:43:14 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:33 2014 +0100 libxl: introduce helper to initialise Dom0 This small helper is responsible for generating Dom0 JSON config stub and writing Dom0 xenstore entries. This helpers subsumes two calls to xenstore-write in xencommons script. Dom0 UUID is intentionally left untouched, so it is always all zeros. This makes sure that we don't leak Dom0 stubs across rebooting. Signed-off-by: Wei Liu Acked-by: Ian Campbell [ ijc -- folded in incremental patch for *BSD ] --- .gitignore | 1 + tools/hotplug/FreeBSD/rc.d/xencommons | 5 +- tools/hotplug/Linux/init.d/xencommons.in.in | 5 +- tools/hotplug/NetBSD/rc.d/xencommons | 5 +- tools/libxl/Makefile | 10 ++- tools/libxl/xen-init-dom0.c | 120 +++++++++++++++++++++++++++ 6 files changed, 136 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 6d725aa..8e34b85 100644 --- a/.gitignore +++ b/.gitignore @@ -313,6 +313,7 @@ tools/libxl/testidl.c tools/libxl/*.pyc tools/libxl/libxl-save-helper tools/libxl/test_timedereg +tools/libxl/xen-init-dom0 tools/blktap2/control/tap-ctl tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons b/tools/hotplug/FreeBSD/rc.d/xencommons index a797016..2d9034c 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons +++ b/tools/hotplug/FreeBSD/rc.d/xencommons @@ -64,9 +64,8 @@ xen_startcmd() printf "\n" - printf "Setting domain 0 name and domid.\n" - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + printf "Setting domain 0 name, domid and JSON config...\n" + ${PRIVATE_BINDIR}/xen-init-dom0 } xen_stop() diff --git a/tools/hotplug/Linux/init.d/xencommons.in.in b/tools/hotplug/Linux/init.d/xencommons.in.in index b311bb8..1d860d9 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in.in +++ b/tools/hotplug/Linux/init.d/xencommons.in.in @@ -90,9 +90,8 @@ do_start () { exit 1 fi - echo Setting domain 0 name and domid... - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + echo Setting domain 0 name, domid and JSON config... + ${PRIVATE_BINDIR}/xen-init-dom0 fi echo Starting xenconsoled... diff --git a/tools/hotplug/NetBSD/rc.d/xencommons b/tools/hotplug/NetBSD/rc.d/xencommons index b1c3531..7ac87e2 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons +++ b/tools/hotplug/NetBSD/rc.d/xencommons @@ -68,9 +68,8 @@ xen_startcmd() printf "\n" - printf "Setting domain 0 name and domid.\n" - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + printf "Setting domain 0 name, domid and JSON config...\n" + ${PRIVATE_BINDIR}/xen-init-dom0 } xen_stop() diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index bd0db3b..4bee4af 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -110,7 +110,7 @@ LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h -CLIENTS = xl testidl libxl-save-helper +CLIENTS = xl testidl libxl-save-helper xen-init-dom0 CFLAGS_XL += $(CFLAGS_libxenlight) CFLAGS_XL += -Wshadow @@ -121,6 +121,10 @@ $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. +XEN_INIT_DOM0_OBJS = xen-init-dom0.o +$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenctrl) +$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore) + SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) @@ -222,6 +226,9 @@ libxlutil.a: $(LIBXLU_OBJS) xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) +xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) @@ -239,6 +246,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) diff --git a/tools/libxl/xen-init-dom0.c b/tools/libxl/xen-init-dom0.c new file mode 100644 index 0000000..7925d64 --- /dev/null +++ b/tools/libxl/xen-init-dom0.c @@ -0,0 +1,120 @@ +#include +#include +#include +#include +#include + +#include +#include +#include + +#define DOMNAME_PATH "/local/domain/0/name" +#define DOMID_PATH "/local/domain/0/domid" + +static libxl_ctx *ctx; +static xentoollog_logger_stdiostream *logger; +static struct xs_handle *xsh; + +static void ctx_alloc(void) +{ + if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, + (xentoollog_logger *)logger)) { + fprintf(stderr, "cannot init libxl context\n"); + exit(1); + } + xsh = xs_open(0); + if (!xsh) { + fprintf(stderr, "cannot open xenstore connection\n"); + exit(1); + } +} + +static void ctx_free(void) +{ + if (ctx) { + libxl_ctx_free(ctx); + ctx = NULL; + } + if (logger) { + xtl_logger_destroy((xentoollog_logger *)logger); + logger = NULL; + } + if (xsh) { + xs_close(xsh); + xsh = NULL; + } +} + +int main(int argc, char **argv) +{ + int rc; + libxl_domain_config dom0_config; + char *domname_string = NULL, *domid_string = NULL; + char *json = NULL;; + + logger = xtl_createlogger_stdiostream(stderr, XTL_ERROR, 0); + if (!logger) exit(1); + + atexit(ctx_free); + + ctx_alloc(); + + libxl_domain_config_init(&dom0_config); + + /* Sanity check: this program can only be run once. */ + domid_string = xs_read(xsh, XBT_NULL, DOMID_PATH, NULL); + domname_string = xs_read(xsh, XBT_NULL, DOMNAME_PATH, NULL); + if (domid_string && domname_string) { + fprintf(stderr, "Dom0 is already set up\n"); + rc = 0; + goto out; + } + + /* Generate stub JSON config. */ + dom0_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; + libxl_domain_build_info_init_type(&dom0_config.b_info, + LIBXL_DOMAIN_TYPE_PV); + + json = libxl_domain_config_to_json(ctx, &dom0_config); + /* libxl-json format requires the string ends with '\0'. Code + * snippet taken from libxl. + */ + rc = libxl_userdata_store(ctx, 0, "libxl-json", + (const uint8_t *)json, + strlen(json) + 1 /* include '\0' */); + if (rc) { + fprintf(stderr, "cannot store stub json config for Dom0\n"); + goto out; + } + + /* Write xenstore entries. */ + if (!xs_write(xsh, XBT_NULL, DOMID_PATH, "0", strlen("0"))) { + fprintf(stderr, "cannot set domid for Dom0\n"); + rc = 1; + goto out; + } + + if (!xs_write(xsh, XBT_NULL, DOMNAME_PATH, "Domain-0", + strlen("Domain-0"))) { + fprintf(stderr, "cannot set domain name for Dom0\n"); + rc = 1; + goto out; + } + + printf("Done setting up Dom0\n"); + +out: + libxl_domain_config_dispose(&dom0_config); + free(domid_string); + free(domname_string); + free(json); + return rc; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24: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 1XSFat-0003nR-CF; Fri, 12 Sep 2014 01:24:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFar-0003nG-VZ for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:10 +0000 Received: from [85.158.137.68:23560] by server-17.bemta-3.messagelabs.com id 5A/23-01689-93B42145; Fri, 12 Sep 2014 01:24:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1410485045!13345357!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23561 invoked from network); 12 Sep 2014 01:24:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFan-0000E9-Kb for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFan-0000KJ-J7 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:05 +0000 Date: Fri, 12 Sep 2014 01:24:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce helper to initialise Dom0 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ae931f568fe9e91179f3ff3aab199a84d39a626b Author: Wei Liu AuthorDate: Thu Sep 4 23:43:14 2014 +0100 Commit: Ian Campbell CommitDate: Tue Sep 9 12:46:33 2014 +0100 libxl: introduce helper to initialise Dom0 This small helper is responsible for generating Dom0 JSON config stub and writing Dom0 xenstore entries. This helpers subsumes two calls to xenstore-write in xencommons script. Dom0 UUID is intentionally left untouched, so it is always all zeros. This makes sure that we don't leak Dom0 stubs across rebooting. Signed-off-by: Wei Liu Acked-by: Ian Campbell [ ijc -- folded in incremental patch for *BSD ] --- .gitignore | 1 + tools/hotplug/FreeBSD/rc.d/xencommons | 5 +- tools/hotplug/Linux/init.d/xencommons.in.in | 5 +- tools/hotplug/NetBSD/rc.d/xencommons | 5 +- tools/libxl/Makefile | 10 ++- tools/libxl/xen-init-dom0.c | 120 +++++++++++++++++++++++++++ 6 files changed, 136 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 6d725aa..8e34b85 100644 --- a/.gitignore +++ b/.gitignore @@ -313,6 +313,7 @@ tools/libxl/testidl.c tools/libxl/*.pyc tools/libxl/libxl-save-helper tools/libxl/test_timedereg +tools/libxl/xen-init-dom0 tools/blktap2/control/tap-ctl tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz diff --git a/tools/hotplug/FreeBSD/rc.d/xencommons b/tools/hotplug/FreeBSD/rc.d/xencommons index a797016..2d9034c 100644 --- a/tools/hotplug/FreeBSD/rc.d/xencommons +++ b/tools/hotplug/FreeBSD/rc.d/xencommons @@ -64,9 +64,8 @@ xen_startcmd() printf "\n" - printf "Setting domain 0 name and domid.\n" - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + printf "Setting domain 0 name, domid and JSON config...\n" + ${PRIVATE_BINDIR}/xen-init-dom0 } xen_stop() diff --git a/tools/hotplug/Linux/init.d/xencommons.in.in b/tools/hotplug/Linux/init.d/xencommons.in.in index b311bb8..1d860d9 100644 --- a/tools/hotplug/Linux/init.d/xencommons.in.in +++ b/tools/hotplug/Linux/init.d/xencommons.in.in @@ -90,9 +90,8 @@ do_start () { exit 1 fi - echo Setting domain 0 name and domid... - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + echo Setting domain 0 name, domid and JSON config... + ${PRIVATE_BINDIR}/xen-init-dom0 fi echo Starting xenconsoled... diff --git a/tools/hotplug/NetBSD/rc.d/xencommons b/tools/hotplug/NetBSD/rc.d/xencommons index b1c3531..7ac87e2 100644 --- a/tools/hotplug/NetBSD/rc.d/xencommons +++ b/tools/hotplug/NetBSD/rc.d/xencommons @@ -68,9 +68,8 @@ xen_startcmd() printf "\n" - printf "Setting domain 0 name and domid.\n" - ${BINDIR}/xenstore-write "/local/domain/0/name" "Domain-0" - ${BINDIR}/xenstore-write "/local/domain/0/domid" 0 + printf "Setting domain 0 name, domid and JSON config...\n" + ${PRIVATE_BINDIR}/xen-init-dom0 } xen_stop() diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index bd0db3b..4bee4af 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -110,7 +110,7 @@ LIBXLU_OBJS = libxlu_cfg_y.o libxlu_cfg_l.o libxlu_cfg.o \ libxlu_disk_l.o libxlu_disk.o libxlu_vif.o libxlu_pci.o $(LIBXLU_OBJS): CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h -CLIENTS = xl testidl libxl-save-helper +CLIENTS = xl testidl libxl-save-helper xen-init-dom0 CFLAGS_XL += $(CFLAGS_libxenlight) CFLAGS_XL += -Wshadow @@ -121,6 +121,10 @@ $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. +XEN_INIT_DOM0_OBJS = xen-init-dom0.o +$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenctrl) +$(XEN_INIT_DOM0_OBJS): CFLAGS += $(CFLAGS_libxenstore) + SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o $(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) @@ -222,6 +226,9 @@ libxlutil.a: $(LIBXLU_OBJS) xl: $(XL_OBJS) libxlutil.so libxenlight.so $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) +xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) @@ -239,6 +246,7 @@ install: all $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) $(INSTALL_DIR) $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) xl $(DESTDIR)$(SBINDIR) + $(INSTALL_PROG) xen-init-dom0 $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(PRIVATE_BINDIR) $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR) $(SYMLINK_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(LIBDIR)/libxenlight.so.$(MAJOR) diff --git a/tools/libxl/xen-init-dom0.c b/tools/libxl/xen-init-dom0.c new file mode 100644 index 0000000..7925d64 --- /dev/null +++ b/tools/libxl/xen-init-dom0.c @@ -0,0 +1,120 @@ +#include +#include +#include +#include +#include + +#include +#include +#include + +#define DOMNAME_PATH "/local/domain/0/name" +#define DOMID_PATH "/local/domain/0/domid" + +static libxl_ctx *ctx; +static xentoollog_logger_stdiostream *logger; +static struct xs_handle *xsh; + +static void ctx_alloc(void) +{ + if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, + (xentoollog_logger *)logger)) { + fprintf(stderr, "cannot init libxl context\n"); + exit(1); + } + xsh = xs_open(0); + if (!xsh) { + fprintf(stderr, "cannot open xenstore connection\n"); + exit(1); + } +} + +static void ctx_free(void) +{ + if (ctx) { + libxl_ctx_free(ctx); + ctx = NULL; + } + if (logger) { + xtl_logger_destroy((xentoollog_logger *)logger); + logger = NULL; + } + if (xsh) { + xs_close(xsh); + xsh = NULL; + } +} + +int main(int argc, char **argv) +{ + int rc; + libxl_domain_config dom0_config; + char *domname_string = NULL, *domid_string = NULL; + char *json = NULL;; + + logger = xtl_createlogger_stdiostream(stderr, XTL_ERROR, 0); + if (!logger) exit(1); + + atexit(ctx_free); + + ctx_alloc(); + + libxl_domain_config_init(&dom0_config); + + /* Sanity check: this program can only be run once. */ + domid_string = xs_read(xsh, XBT_NULL, DOMID_PATH, NULL); + domname_string = xs_read(xsh, XBT_NULL, DOMNAME_PATH, NULL); + if (domid_string && domname_string) { + fprintf(stderr, "Dom0 is already set up\n"); + rc = 0; + goto out; + } + + /* Generate stub JSON config. */ + dom0_config.c_info.type = LIBXL_DOMAIN_TYPE_PV; + libxl_domain_build_info_init_type(&dom0_config.b_info, + LIBXL_DOMAIN_TYPE_PV); + + json = libxl_domain_config_to_json(ctx, &dom0_config); + /* libxl-json format requires the string ends with '\0'. Code + * snippet taken from libxl. + */ + rc = libxl_userdata_store(ctx, 0, "libxl-json", + (const uint8_t *)json, + strlen(json) + 1 /* include '\0' */); + if (rc) { + fprintf(stderr, "cannot store stub json config for Dom0\n"); + goto out; + } + + /* Write xenstore entries. */ + if (!xs_write(xsh, XBT_NULL, DOMID_PATH, "0", strlen("0"))) { + fprintf(stderr, "cannot set domid for Dom0\n"); + rc = 1; + goto out; + } + + if (!xs_write(xsh, XBT_NULL, DOMNAME_PATH, "Domain-0", + strlen("Domain-0"))) { + fprintf(stderr, "cannot set domain name for Dom0\n"); + rc = 1; + goto out; + } + + printf("Done setting up Dom0\n"); + +out: + libxl_domain_config_dispose(&dom0_config); + free(domid_string); + free(domname_string); + free(json); + return rc; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24: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 1XSFb1-0003ob-Fw; Fri, 12 Sep 2014 01:24:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFb0-0003oP-BH for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:18 +0000 Received: from [193.109.254.147:11521] by server-8.bemta-14.messagelabs.com id D2/CF-01875-14B42145; Fri, 12 Sep 2014 01:24:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410485055!15048639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31179 invoked from network); 12 Sep 2014 01:24:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFax-0000EF-Q9 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFax-0000Kk-Nk for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:15 +0000 Date: Fri, 12 Sep 2014 01:24:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/flask: handle XEN_DOMCTL_memory_mapping for all architectures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e55fc3749d2ccda1359e50bfcb649e6ae5a5aae9 Author: Arianna Avanzini AuthorDate: Thu Sep 4 13:49:52 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:24:19 2014 +0100 xsm/flask: handle XEN_DOMCTL_memory_mapping for all architectures Currently, FLASK only handles the memory_mapping hypercall for the x86 architecture. As the DOMCTL's hook now is in common code and no more specific to x86, this commit lets the DOMCTL be handled also for other architectures. Signed-off-by: Arianna Avanzini Reviewed-by: Julien Grall Acked-by: Ian Campbell Acked-by: Daniel De Graaf Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/xsm/flask/hooks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 00efba1..df05566 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -575,6 +575,7 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_scheduler_op: case XEN_DOMCTL_irq_permission: case XEN_DOMCTL_iomem_permission: + case XEN_DOMCTL_memory_mapping: case XEN_DOMCTL_set_target: #ifdef CONFIG_X86 /* These have individual XSM hooks (arch/x86/domctl.c) */ @@ -582,7 +583,6 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_ioport_permission: case XEN_DOMCTL_bind_pt_irq: case XEN_DOMCTL_unbind_pt_irq: - case XEN_DOMCTL_memory_mapping: case XEN_DOMCTL_ioport_mapping: case XEN_DOMCTL_mem_event_op: /* These have individual XSM hooks (drivers/passthrough/iommu.c) */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24: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 1XSFb1-0003ob-Fw; Fri, 12 Sep 2014 01:24:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFb0-0003oP-BH for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:18 +0000 Received: from [193.109.254.147:11521] by server-8.bemta-14.messagelabs.com id D2/CF-01875-14B42145; Fri, 12 Sep 2014 01:24:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410485055!15048639!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31179 invoked from network); 12 Sep 2014 01:24:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFax-0000EF-Q9 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFax-0000Kk-Nk for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:15 +0000 Date: Fri, 12 Sep 2014 01:24:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xsm/flask: handle XEN_DOMCTL_memory_mapping for all architectures X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e55fc3749d2ccda1359e50bfcb649e6ae5a5aae9 Author: Arianna Avanzini AuthorDate: Thu Sep 4 13:49:52 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:24:19 2014 +0100 xsm/flask: handle XEN_DOMCTL_memory_mapping for all architectures Currently, FLASK only handles the memory_mapping hypercall for the x86 architecture. As the DOMCTL's hook now is in common code and no more specific to x86, this commit lets the DOMCTL be handled also for other architectures. Signed-off-by: Arianna Avanzini Reviewed-by: Julien Grall Acked-by: Ian Campbell Acked-by: Daniel De Graaf Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Cc: Ian Jackson Cc: Andrew Cooper Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/xsm/flask/hooks.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 00efba1..df05566 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -575,6 +575,7 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_scheduler_op: case XEN_DOMCTL_irq_permission: case XEN_DOMCTL_iomem_permission: + case XEN_DOMCTL_memory_mapping: case XEN_DOMCTL_set_target: #ifdef CONFIG_X86 /* These have individual XSM hooks (arch/x86/domctl.c) */ @@ -582,7 +583,6 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_ioport_permission: case XEN_DOMCTL_bind_pt_irq: case XEN_DOMCTL_unbind_pt_irq: - case XEN_DOMCTL_memory_mapping: case XEN_DOMCTL_ioport_mapping: case XEN_DOMCTL_mem_event_op: /* These have individual XSM hooks (drivers/passthrough/iommu.c) */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24: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 1XSFbC-0003qT-KT; Fri, 12 Sep 2014 01:24:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbA-0003qC-Um for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:29 +0000 Received: from [193.109.254.147:11805] by server-2.bemta-14.messagelabs.com id 8D/11-07861-C4B42145; Fri, 12 Sep 2014 01:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410485066!15048650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31338 invoked from network); 12 Sep 2014 01:24:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFb7-0000EZ-Vw for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFb7-0000L8-U9 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:25 +0000 Date: Fri, 12 Sep 2014 01:24:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: explicitly grant access to needed I/O-memory ranges X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit abfb006f1ff4af1424e5b0d0589f0226377fda36 Author: Arianna Avanzini AuthorDate: Mon Sep 8 17:05:32 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:25:36 2014 +0100 tools/libxl: explicitly grant access to needed I/O-memory ranges This commit changes the existing libxl code to be sure to grant access permission to PCI-related I/O memory ranges, while setting up passthrough of PCI devices specified in the domain's configuration, and to VGA-related memory ranges, while setting up VGA passthrough (if gfx_passthru = 1 in the domain's configuration). As for the latter, the newly-added code does not replace any existing one, but instead matches the calls to xc_domain_memory_mapping() performed by QEMU on the path that is executed if gfx passthru is enabled and follows the registration of a new VGA controller (in register_vga_regions(), defined in hw/pt-graphics.c). In fact, VGA needs some extra memory ranges to be mapped with respect to PCI; QEMU expects that access to those memory ranges is implicitly granted when he calls the hypervisor with the function xc_domain_memory_mapping(): this commit calls iomem_permission for it when needed by checking the passthru PCI device's class. NOTE: the code added by this commit still does not verify if the passthru of the framebuffer area is being performed for the primary GPU, but only replicates the behavior of QEMU which is limited to performing the passthru for all PCI devices of VGA class. This commit is instrumental to the last one in the series, which will separate the functions of the iomem_permission and memory_mapping DOMCTLs, so that requesting an I/O-memory range will not imply that access to such a range is implicitly granted. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Jan Beulich Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- tools/libxl/libxl_create.c | 9 ++++ tools/libxl/libxl_internal.h | 2 + tools/libxl/libxl_pci.c | 91 ++++++++++++++++++++++++++++++++++------- 3 files changed, 86 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 57a0ece..b36c719 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1216,6 +1216,15 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, libxl__spawn_stub_dm(egc, &dcs->dmss); else libxl__spawn_local_dm(egc, &dcs->dmss.dm); + + /* + * Handle the domain's (and the related stubdomain's) access to + * the VGA framebuffer. + */ + ret = libxl__grant_vga_iomem_permission(gc, domid, d_config); + if ( ret ) + goto error_out; + return; } case LIBXL_DOMAIN_TYPE_PV: diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index fafef5a..03e9978 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -952,6 +952,8 @@ _hidden int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid); _hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); _hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scparams); +_hidden int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid, + libxl_domain_config *const d_config); typedef struct { uint32_t store_port; diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 38a9642..c4fd0e1 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -874,10 +874,13 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting) { libxl_ctx *ctx = libxl__gc_owner(gc); + libxl_domain_type type = libxl__domain_type(gc, domid); int rc, hvm = 0; - switch (libxl__domain_type(gc, domid)) { - case LIBXL_DOMAIN_TYPE_HVM: + if (type == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (type == LIBXL_DOMAIN_TYPE_HVM) { hvm = 1; if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) { @@ -895,8 +898,8 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i } if ( rc ) return ERROR_FAIL; - break; - case LIBXL_DOMAIN_TYPE_PV: + } + { char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); @@ -965,11 +968,8 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i return ERROR_FAIL; } } - break; - } - case LIBXL_DOMAIN_TYPE_INVALID: - return ERROR_FAIL; } + out: if (!libxl_is_stubdom(ctx, domid, NULL)) { rc = xc_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); @@ -1194,6 +1194,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, { libxl_ctx *ctx = libxl__gc_owner(gc); libxl_device_pci *assigned; + libxl_domain_type type = libxl__domain_type(gc, domid); int hvm = 0, rc, num; int stubdomid = 0; @@ -1209,8 +1210,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, } rc = ERROR_FAIL; - switch (libxl__domain_type(gc, domid)) { - case LIBXL_DOMAIN_TYPE_HVM: + if (type == LIBXL_DOMAIN_TYPE_HVM) { hvm = 1; if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) @@ -1231,8 +1231,8 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out_fail; } - break; - case LIBXL_DOMAIN_TYPE_PV: + } else if (type != LIBXL_DOMAIN_TYPE_PV) + abort(); { char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); @@ -1282,10 +1282,6 @@ skip1: } } fclose(f); - break; - } - default: - abort(); } out: /* don't do multiple resets while some functions are still passed through */ @@ -1463,6 +1459,69 @@ int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid) return 0; } +int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid, + libxl_domain_config *const d_config) +{ + int i, ret; + + if (!libxl_defbool_val(d_config->b_info.u.hvm.gfx_passthru)) + return 0; + + for (i = 0 ; i < d_config->num_pcidevs ; i++) { + uint64_t vga_iomem_start = 0xa0000 >> XC_PAGE_SHIFT; + uint32_t stubdom_domid; + libxl_device_pci *pcidev = &d_config->pcidevs[i]; + char *pci_device_class_path = + libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/class", + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func); + int read_items; + unsigned long pci_device_class; + + FILE *f = fopen(pci_device_class_path, "r"); + if (!f) { + LOGE(ERROR, + "pci device "PCI_BDF" does not have class attribute", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + continue; + } + read_items = fscanf(f, "0x%lx\n", &pci_device_class); + fclose(f); + if (read_items != 1) { + LOGE(ERROR, + "cannot read class of pci device "PCI_BDF, + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + continue; + } + if (pci_device_class != 0x030000) /* VGA class */ + continue; + + stubdom_domid = libxl_get_stubdom_id(CTX, domid); + ret = xc_domain_iomem_permission(CTX->xch, stubdom_domid, + vga_iomem_start, 0x20, 1); + if (ret < 0) { + LOGE(ERROR, + "failed to give stubdom%d access to iomem range " + "%"PRIx64"-%"PRIx64" for VGA passthru", + stubdom_domid, + vga_iomem_start, (vga_iomem_start + 0x20 - 1)); + return ret; + } + ret = xc_domain_iomem_permission(CTX->xch, domid, + vga_iomem_start, 0x20, 1); + if (ret < 0) { + LOGE(ERROR, + "failed to give dom%d access to iomem range " + "%"PRIx64"-%"PRIx64" for VGA passthru", + domid, vga_iomem_start, (vga_iomem_start + 0x20 - 1)); + return ret; + } + break; + } + + return 0; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24: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 1XSFbC-0003qT-KT; Fri, 12 Sep 2014 01:24:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbA-0003qC-Um for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:29 +0000 Received: from [193.109.254.147:11805] by server-2.bemta-14.messagelabs.com id 8D/11-07861-C4B42145; Fri, 12 Sep 2014 01:24:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410485066!15048650!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31338 invoked from network); 12 Sep 2014 01:24:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFb7-0000EZ-Vw for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFb7-0000L8-U9 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:25 +0000 Date: Fri, 12 Sep 2014 01:24:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: explicitly grant access to needed I/O-memory ranges X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit abfb006f1ff4af1424e5b0d0589f0226377fda36 Author: Arianna Avanzini AuthorDate: Mon Sep 8 17:05:32 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:25:36 2014 +0100 tools/libxl: explicitly grant access to needed I/O-memory ranges This commit changes the existing libxl code to be sure to grant access permission to PCI-related I/O memory ranges, while setting up passthrough of PCI devices specified in the domain's configuration, and to VGA-related memory ranges, while setting up VGA passthrough (if gfx_passthru = 1 in the domain's configuration). As for the latter, the newly-added code does not replace any existing one, but instead matches the calls to xc_domain_memory_mapping() performed by QEMU on the path that is executed if gfx passthru is enabled and follows the registration of a new VGA controller (in register_vga_regions(), defined in hw/pt-graphics.c). In fact, VGA needs some extra memory ranges to be mapped with respect to PCI; QEMU expects that access to those memory ranges is implicitly granted when he calls the hypervisor with the function xc_domain_memory_mapping(): this commit calls iomem_permission for it when needed by checking the passthru PCI device's class. NOTE: the code added by this commit still does not verify if the passthru of the framebuffer area is being performed for the primary GPU, but only replicates the behavior of QEMU which is limited to performing the passthru for all PCI devices of VGA class. This commit is instrumental to the last one in the series, which will separate the functions of the iomem_permission and memory_mapping DOMCTLs, so that requesting an I/O-memory range will not imply that access to such a range is implicitly granted. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Jan Beulich Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- tools/libxl/libxl_create.c | 9 ++++ tools/libxl/libxl_internal.h | 2 + tools/libxl/libxl_pci.c | 91 ++++++++++++++++++++++++++++++++++------- 3 files changed, 86 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 57a0ece..b36c719 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1216,6 +1216,15 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, libxl__spawn_stub_dm(egc, &dcs->dmss); else libxl__spawn_local_dm(egc, &dcs->dmss.dm); + + /* + * Handle the domain's (and the related stubdomain's) access to + * the VGA framebuffer. + */ + ret = libxl__grant_vga_iomem_permission(gc, domid, d_config); + if ( ret ) + goto error_out; + return; } case LIBXL_DOMAIN_TYPE_PV: diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index fafef5a..03e9978 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -952,6 +952,8 @@ _hidden int libxl__domain_cpupool(libxl__gc *gc, uint32_t domid); _hidden libxl_scheduler libxl__domain_scheduler(libxl__gc *gc, uint32_t domid); _hidden int libxl__sched_set_params(libxl__gc *gc, uint32_t domid, libxl_domain_sched_params *scparams); +_hidden int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid, + libxl_domain_config *const d_config); typedef struct { uint32_t store_port; diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 38a9642..c4fd0e1 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -874,10 +874,13 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, int starting) { libxl_ctx *ctx = libxl__gc_owner(gc); + libxl_domain_type type = libxl__domain_type(gc, domid); int rc, hvm = 0; - switch (libxl__domain_type(gc, domid)) { - case LIBXL_DOMAIN_TYPE_HVM: + if (type == LIBXL_DOMAIN_TYPE_INVALID) + return ERROR_FAIL; + + if (type == LIBXL_DOMAIN_TYPE_HVM) { hvm = 1; if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) { @@ -895,8 +898,8 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i } if ( rc ) return ERROR_FAIL; - break; - case LIBXL_DOMAIN_TYPE_PV: + } + { char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); @@ -965,11 +968,8 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i return ERROR_FAIL; } } - break; - } - case LIBXL_DOMAIN_TYPE_INVALID: - return ERROR_FAIL; } + out: if (!libxl_is_stubdom(ctx, domid, NULL)) { rc = xc_assign_device(ctx->xch, domid, pcidev_encode_bdf(pcidev)); @@ -1194,6 +1194,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, { libxl_ctx *ctx = libxl__gc_owner(gc); libxl_device_pci *assigned; + libxl_domain_type type = libxl__domain_type(gc, domid); int hvm = 0, rc, num; int stubdomid = 0; @@ -1209,8 +1210,7 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, } rc = ERROR_FAIL; - switch (libxl__domain_type(gc, domid)) { - case LIBXL_DOMAIN_TYPE_HVM: + if (type == LIBXL_DOMAIN_TYPE_HVM) { hvm = 1; if (libxl__wait_for_device_model_deprecated(gc, domid, "running", NULL, NULL, NULL) < 0) @@ -1231,8 +1231,8 @@ static int do_pci_remove(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out_fail; } - break; - case LIBXL_DOMAIN_TYPE_PV: + } else if (type != LIBXL_DOMAIN_TYPE_PV) + abort(); { char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); @@ -1282,10 +1282,6 @@ skip1: } } fclose(f); - break; - } - default: - abort(); } out: /* don't do multiple resets while some functions are still passed through */ @@ -1463,6 +1459,69 @@ int libxl__device_pci_destroy_all(libxl__gc *gc, uint32_t domid) return 0; } +int libxl__grant_vga_iomem_permission(libxl__gc *gc, const uint32_t domid, + libxl_domain_config *const d_config) +{ + int i, ret; + + if (!libxl_defbool_val(d_config->b_info.u.hvm.gfx_passthru)) + return 0; + + for (i = 0 ; i < d_config->num_pcidevs ; i++) { + uint64_t vga_iomem_start = 0xa0000 >> XC_PAGE_SHIFT; + uint32_t stubdom_domid; + libxl_device_pci *pcidev = &d_config->pcidevs[i]; + char *pci_device_class_path = + libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/class", + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func); + int read_items; + unsigned long pci_device_class; + + FILE *f = fopen(pci_device_class_path, "r"); + if (!f) { + LOGE(ERROR, + "pci device "PCI_BDF" does not have class attribute", + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + continue; + } + read_items = fscanf(f, "0x%lx\n", &pci_device_class); + fclose(f); + if (read_items != 1) { + LOGE(ERROR, + "cannot read class of pci device "PCI_BDF, + pcidev->domain, pcidev->bus, pcidev->dev, pcidev->func); + continue; + } + if (pci_device_class != 0x030000) /* VGA class */ + continue; + + stubdom_domid = libxl_get_stubdom_id(CTX, domid); + ret = xc_domain_iomem_permission(CTX->xch, stubdom_domid, + vga_iomem_start, 0x20, 1); + if (ret < 0) { + LOGE(ERROR, + "failed to give stubdom%d access to iomem range " + "%"PRIx64"-%"PRIx64" for VGA passthru", + stubdom_domid, + vga_iomem_start, (vga_iomem_start + 0x20 - 1)); + return ret; + } + ret = xc_domain_iomem_permission(CTX->xch, domid, + vga_iomem_start, 0x20, 1); + if (ret < 0) { + LOGE(ERROR, + "failed to give dom%d access to iomem range " + "%"PRIx64"-%"PRIx64" for VGA passthru", + domid, vga_iomem_start, (vga_iomem_start + 0x20 - 1)); + return ret; + } + break; + } + + return 0; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbM-0003s6-Oo; Fri, 12 Sep 2014 01:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbL-0003rj-5m for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:39 +0000 Received: from [193.109.254.147:18021] by server-6.bemta-14.messagelabs.com id AD/C1-01867-65B42145; Fri, 12 Sep 2014 01:24:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1410485076!15034400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 999 invoked from network); 12 Sep 2014 01:24:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbI-0000Eh-5J for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbI-0000LY-3O for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:36 +0000 Date: Fri, 12 Sep 2014 01:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: cleanup the do_pci_add() function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be7a8653d9f4fa564b809c6fdf79c810a8fbfeca Author: Arianna Avanzini AuthorDate: Mon Sep 8 17:05:33 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:25:44 2014 +0100 tools/libxl: cleanup the do_pci_add() function This function modifies the do_pci_add() function in libxl_pci.c by unindenting a code block whose condition was removed in the previous commit. The block was left as is to facilitate functional review of the previous commit; this commit cleans it up. This commit introduces no functional change. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Jan Beulich Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- tools/libxl/libxl_pci.c | 122 +++++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 61 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index c4fd0e1..c22767e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -875,7 +875,10 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i { libxl_ctx *ctx = libxl__gc_owner(gc); libxl_domain_type type = libxl__domain_type(gc, domid); - int rc, hvm = 0; + char *sysfs_path; + FILE *f; + unsigned long long start, end, flags, size; + int irq, i, rc, hvm = 0; if (type == LIBXL_DOMAIN_TYPE_INVALID) return ERROR_FAIL; @@ -900,73 +903,70 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i return ERROR_FAIL; } - { - char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); - FILE *f = fopen(sysfs_path, "r"); - unsigned long long start = 0, end = 0, flags = 0, size = 0; - int irq = 0; - int i; + sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); + f = fopen(sysfs_path, "r"); + start = end = flags = size = 0; + irq = 0; - if (f == NULL) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); - return ERROR_FAIL; - } - for (i = 0; i < PROC_PCI_NUM_RESOURCES; i++) { - if (fscanf(f, "0x%llx 0x%llx 0x%llx\n", &start, &end, &flags) != 3) - continue; - size = end - start + 1; - if (start) { - if (flags & PCI_BAR_IO) { - rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 1); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); - fclose(f); - return ERROR_FAIL; - } - } else { - rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, - (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 1); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); - fclose(f); - return ERROR_FAIL; - } + if (f == NULL) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); + return ERROR_FAIL; + } + for (i = 0; i < PROC_PCI_NUM_RESOURCES; i++) { + if (fscanf(f, "0x%llx 0x%llx 0x%llx\n", &start, &end, &flags) != 3) + continue; + size = end - start + 1; + if (start) { + if (flags & PCI_BAR_IO) { + rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 1); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); + fclose(f); + return ERROR_FAIL; + } + } else { + rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, + (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 1); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); + fclose(f); + return ERROR_FAIL; } } } - fclose(f); - sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); - f = fopen(sysfs_path, "r"); - if (f == NULL) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); - goto out; + } + fclose(f); + sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); + f = fopen(sysfs_path, "r"); + if (f == NULL) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); + goto out; + } + if ((fscanf(f, "%u", &irq) == 1) && irq) { + rc = xc_physdev_map_pirq(ctx->xch, domid, irq, &irq); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_physdev_map_pirq irq=%d", irq); + fclose(f); + return ERROR_FAIL; } - if ((fscanf(f, "%u", &irq) == 1) && irq) { - rc = xc_physdev_map_pirq(ctx->xch, domid, irq, &irq); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_physdev_map_pirq irq=%d", irq); - fclose(f); - return ERROR_FAIL; - } - rc = xc_domain_irq_permission(ctx->xch, domid, irq, 1); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_irq_permission irq=%d", irq); - fclose(f); - return ERROR_FAIL; - } + rc = xc_domain_irq_permission(ctx->xch, domid, irq, 1); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_irq_permission irq=%d", irq); + fclose(f); + return ERROR_FAIL; } - fclose(f); + } + fclose(f); - /* Don't restrict writes to the PCI config space from this VM */ - if (pcidev->permissive) { - if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/permissive", - pcidev) < 0 ) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Setting permissive for device"); - return ERROR_FAIL; - } + /* Don't restrict writes to the PCI config space from this VM */ + if (pcidev->permissive) { + if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/permissive", + pcidev) < 0 ) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Setting permissive for device"); + return ERROR_FAIL; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbM-0003s6-Oo; Fri, 12 Sep 2014 01:24:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbL-0003rj-5m for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:39 +0000 Received: from [193.109.254.147:18021] by server-6.bemta-14.messagelabs.com id AD/C1-01867-65B42145; Fri, 12 Sep 2014 01:24:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1410485076!15034400!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 999 invoked from network); 12 Sep 2014 01:24:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbI-0000Eh-5J for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbI-0000LY-3O for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:36 +0000 Date: Fri, 12 Sep 2014 01:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: cleanup the do_pci_add() function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be7a8653d9f4fa564b809c6fdf79c810a8fbfeca Author: Arianna Avanzini AuthorDate: Mon Sep 8 17:05:33 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:25:44 2014 +0100 tools/libxl: cleanup the do_pci_add() function This function modifies the do_pci_add() function in libxl_pci.c by unindenting a code block whose condition was removed in the previous commit. The block was left as is to facilitate functional review of the previous commit; this commit cleans it up. This commit introduces no functional change. Signed-off-by: Arianna Avanzini Acked-by: Ian Campbell Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Jan Beulich Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- tools/libxl/libxl_pci.c | 122 +++++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 61 deletions(-) diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index c4fd0e1..c22767e 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -875,7 +875,10 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i { libxl_ctx *ctx = libxl__gc_owner(gc); libxl_domain_type type = libxl__domain_type(gc, domid); - int rc, hvm = 0; + char *sysfs_path; + FILE *f; + unsigned long long start, end, flags, size; + int irq, i, rc, hvm = 0; if (type == LIBXL_DOMAIN_TYPE_INVALID) return ERROR_FAIL; @@ -900,73 +903,70 @@ static int do_pci_add(libxl__gc *gc, uint32_t domid, libxl_device_pci *pcidev, i return ERROR_FAIL; } - { - char *sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); - FILE *f = fopen(sysfs_path, "r"); - unsigned long long start = 0, end = 0, flags = 0, size = 0; - int irq = 0; - int i; + sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/resource", pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); + f = fopen(sysfs_path, "r"); + start = end = flags = size = 0; + irq = 0; - if (f == NULL) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); - return ERROR_FAIL; - } - for (i = 0; i < PROC_PCI_NUM_RESOURCES; i++) { - if (fscanf(f, "0x%llx 0x%llx 0x%llx\n", &start, &end, &flags) != 3) - continue; - size = end - start + 1; - if (start) { - if (flags & PCI_BAR_IO) { - rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 1); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); - fclose(f); - return ERROR_FAIL; - } - } else { - rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, - (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 1); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); - fclose(f); - return ERROR_FAIL; - } + if (f == NULL) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); + return ERROR_FAIL; + } + for (i = 0; i < PROC_PCI_NUM_RESOURCES; i++) { + if (fscanf(f, "0x%llx 0x%llx 0x%llx\n", &start, &end, &flags) != 3) + continue; + size = end - start + 1; + if (start) { + if (flags & PCI_BAR_IO) { + rc = xc_domain_ioport_permission(ctx->xch, domid, start, size, 1); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_ioport_permission error 0x%llx/0x%llx", start, size); + fclose(f); + return ERROR_FAIL; + } + } else { + rc = xc_domain_iomem_permission(ctx->xch, domid, start>>XC_PAGE_SHIFT, + (size+(XC_PAGE_SIZE-1))>>XC_PAGE_SHIFT, 1); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_iomem_permission error 0x%llx/0x%llx", start, size); + fclose(f); + return ERROR_FAIL; } } } - fclose(f); - sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); - f = fopen(sysfs_path, "r"); - if (f == NULL) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); - goto out; + } + fclose(f); + sysfs_path = libxl__sprintf(gc, SYSFS_PCI_DEV"/"PCI_BDF"/irq", pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); + f = fopen(sysfs_path, "r"); + if (f == NULL) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Couldn't open %s", sysfs_path); + goto out; + } + if ((fscanf(f, "%u", &irq) == 1) && irq) { + rc = xc_physdev_map_pirq(ctx->xch, domid, irq, &irq); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_physdev_map_pirq irq=%d", irq); + fclose(f); + return ERROR_FAIL; } - if ((fscanf(f, "%u", &irq) == 1) && irq) { - rc = xc_physdev_map_pirq(ctx->xch, domid, irq, &irq); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_physdev_map_pirq irq=%d", irq); - fclose(f); - return ERROR_FAIL; - } - rc = xc_domain_irq_permission(ctx->xch, domid, irq, 1); - if (rc < 0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_irq_permission irq=%d", irq); - fclose(f); - return ERROR_FAIL; - } + rc = xc_domain_irq_permission(ctx->xch, domid, irq, 1); + if (rc < 0) { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "Error: xc_domain_irq_permission irq=%d", irq); + fclose(f); + return ERROR_FAIL; } - fclose(f); + } + fclose(f); - /* Don't restrict writes to the PCI config space from this VM */ - if (pcidev->permissive) { - if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/permissive", - pcidev) < 0 ) { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, - "Setting permissive for device"); - return ERROR_FAIL; - } + /* Don't restrict writes to the PCI config space from this VM */ + if (pcidev->permissive) { + if ( sysfs_write_bdf(gc, SYSFS_PCIBACK_DRIVER"/permissive", + pcidev) < 0 ) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "Setting permissive for device"); + return ERROR_FAIL; } } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbW-0003td-Rf; Fri, 12 Sep 2014 01:24:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbV-0003tM-5R for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:49 +0000 Received: from [85.158.137.68:58605] by server-13.bemta-3.messagelabs.com id EF/0F-01569-06B42145; Fri, 12 Sep 2014 01:24:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1410485086!11573818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13021 invoked from network); 12 Sep 2014 01:24:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbS-0000En-Bh for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbS-0000MT-9D for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:46 +0000 Date: Fri, 12 Sep 2014 01:24:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/common: do not implicitly permit access to mapped I/O memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0561e1f01e87b777bcc47971e4ae1f420314f4a0 Author: Arianna Avanzini AuthorDate: Mon Sep 8 17:05:34 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:25:44 2014 +0100 xen/common: do not implicitly permit access to mapped I/O memory Currently, the XEN_DOMCTL_memory_mapping hypercall implicitly grants to a domain access permission to the I/O memory areas mapped in its guest address space. This conflicts with the presence of a specific hypercall (XEN_DOMCTL_iomem_permission) used to grant such a permission to a domain. This commit separates the functions of the two hypercalls by having only the latter be able to permit I/O memory access to a domain, and the former just performing the mapping after a permissions check on both the granting and the grantee domains. Signed-off-by: Arianna Avanzini Acked-by: Jan Beulich Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/common/domctl.c | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 222b140..1ad0729 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1031,7 +1031,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; ret = -EPERM; - if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) + if ( !iomem_access_permitted(current->domain, mfn, mfn_end) || + !iomem_access_permitted(d, mfn, mfn_end) ) break; ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); @@ -1044,40 +1045,23 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - ret = iomem_permit_access(d, mfn, mfn_end); - if ( !ret ) - { - ret = map_mmio_regions(d, gfn, nr_mfns, mfn); - if ( ret ) - { - printk(XENLOG_G_WARNING - "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", - d->domain_id, gfn, mfn, nr_mfns, ret); - if ( iomem_deny_access(d, mfn, mfn_end) && - is_hardware_domain(current->domain) ) - printk(XENLOG_ERR - "memory_map: failed to deny dom%d access to [%lx,%lx]\n", - d->domain_id, mfn, mfn_end); - } - } + ret = map_mmio_regions(d, gfn, nr_mfns, mfn); + if ( ret ) + printk(XENLOG_G_WARNING + "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", + d->domain_id, gfn, mfn, nr_mfns, ret); } else { - int rc = 0; - printk(XENLOG_G_INFO "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); - ret = iomem_deny_access(d, mfn, mfn_end); - if ( !ret ) - ret = rc; + ret = unmap_mmio_regions(d, gfn, nr_mfns, mfn); if ( ret && is_hardware_domain(current->domain) ) printk(XENLOG_ERR - "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", - ret, rc ? "removing" : "denying", d->domain_id, - mfn, mfn_end); + "memory_map: error %ld removing dom%d access to [%lx,%lx]\n", + ret, d->domain_id, mfn, mfn_end); } /* Do this unconditionally to cover errors on above failure paths. */ memory_type_changed(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:24:50 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:24:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbW-0003td-Rf; Fri, 12 Sep 2014 01:24:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbV-0003tM-5R for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:49 +0000 Received: from [85.158.137.68:58605] by server-13.bemta-3.messagelabs.com id EF/0F-01569-06B42145; Fri, 12 Sep 2014 01:24:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1410485086!11573818!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13021 invoked from network); 12 Sep 2014 01:24:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbS-0000En-Bh for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbS-0000MT-9D for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:46 +0000 Date: Fri, 12 Sep 2014 01:24:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/common: do not implicitly permit access to mapped I/O memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0561e1f01e87b777bcc47971e4ae1f420314f4a0 Author: Arianna Avanzini AuthorDate: Mon Sep 8 17:05:34 2014 +0200 Commit: Ian Campbell CommitDate: Tue Sep 9 13:25:44 2014 +0100 xen/common: do not implicitly permit access to mapped I/O memory Currently, the XEN_DOMCTL_memory_mapping hypercall implicitly grants to a domain access permission to the I/O memory areas mapped in its guest address space. This conflicts with the presence of a specific hypercall (XEN_DOMCTL_iomem_permission) used to grant such a permission to a domain. This commit separates the functions of the two hypercalls by having only the latter be able to permit I/O memory access to a domain, and the former just performing the mapping after a permissions check on both the granting and the grantee domains. Signed-off-by: Arianna Avanzini Acked-by: Jan Beulich Cc: Dario Faggioli Cc: Paolo Valente Cc: Stefano Stabellini Cc: Julien Grall Cc: Ian Campbell Cc: Ian Jackson Cc: Eric Trudeau Cc: Viktor Kleinik Cc: Andrii Tseglytskyi --- xen/common/domctl.c | 36 ++++++++++-------------------------- 1 files changed, 10 insertions(+), 26 deletions(-) diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 222b140..1ad0729 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1031,7 +1031,8 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) break; ret = -EPERM; - if ( !iomem_access_permitted(current->domain, mfn, mfn_end) ) + if ( !iomem_access_permitted(current->domain, mfn, mfn_end) || + !iomem_access_permitted(d, mfn, mfn_end) ) break; ret = xsm_iomem_mapping(XSM_HOOK, d, mfn, mfn_end, add); @@ -1044,40 +1045,23 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) "memory_map:add: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - ret = iomem_permit_access(d, mfn, mfn_end); - if ( !ret ) - { - ret = map_mmio_regions(d, gfn, nr_mfns, mfn); - if ( ret ) - { - printk(XENLOG_G_WARNING - "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", - d->domain_id, gfn, mfn, nr_mfns, ret); - if ( iomem_deny_access(d, mfn, mfn_end) && - is_hardware_domain(current->domain) ) - printk(XENLOG_ERR - "memory_map: failed to deny dom%d access to [%lx,%lx]\n", - d->domain_id, mfn, mfn_end); - } - } + ret = map_mmio_regions(d, gfn, nr_mfns, mfn); + if ( ret ) + printk(XENLOG_G_WARNING + "memory_map:fail: dom%d gfn=%lx mfn=%lx nr=%lx ret:%ld\n", + d->domain_id, gfn, mfn, nr_mfns, ret); } else { - int rc = 0; - printk(XENLOG_G_INFO "memory_map:remove: dom%d gfn=%lx mfn=%lx nr=%lx\n", d->domain_id, gfn, mfn, nr_mfns); - rc = unmap_mmio_regions(d, gfn, nr_mfns, mfn); - ret = iomem_deny_access(d, mfn, mfn_end); - if ( !ret ) - ret = rc; + ret = unmap_mmio_regions(d, gfn, nr_mfns, mfn); if ( ret && is_hardware_domain(current->domain) ) printk(XENLOG_ERR - "memory_map: error %ld %s dom%d access to [%lx,%lx]\n", - ret, rc ? "removing" : "denying", d->domain_id, - mfn, mfn_end); + "memory_map: error %ld removing dom%d access to [%lx,%lx]\n", + ret, d->domain_id, mfn, mfn_end); } /* Do this unconditionally to cover errors on above failure paths. */ memory_type_changed(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbg-0003v5-UR; Fri, 12 Sep 2014 01:25:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbf-0003ut-3X for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:59 +0000 Received: from [85.158.143.35:13116] by server-1.bemta-4.messagelabs.com id 6A/12-05872-A6B42145; Fri, 12 Sep 2014 01:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1410485096!8844968!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14679 invoked from network); 12 Sep 2014 01:24:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbc-0000Ew-Gz for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbc-0000Mp-F8 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:56 +0000 Date: Fri, 12 Sep 2014 01:24:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: check control block exists when using FIFO-based events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4e0cea6fced50e251453dfe52e1b9dde77a84f5 Author: David Vrabel AuthorDate: Tue Sep 9 15:25:58 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 15:25:58 2014 +0200 evtchn: check control block exists when using FIFO-based events When using the FIFO-based event channels, there are no checks for the existance of a control block when binding an event or moving it to a different VCPU. This is because events may be bound when the ABI is in 2-level mode (e.g., by the toolstack before the domain is started). The guest may trigger a Xen crash in evtchn_fifo_set_pending() if: a) the event is bound to a VCPU without a control block; or b) VCPU 0 does not have a control block. In case (a), Xen will crash when looking up the current queue. In (b), Xen will crash when looking up the old queue (which defaults to a queue on VCPU 0). By allocating all the per-VCPU structures when enabling the FIFO ABI, we can be sure that v->evtchn_fifo is always valid. EVTCHNOP_init_control_block for all the other CPUs need only map the shared control block. A single check in evtchn_fifo_set_pending() before accessing the control block fixes all cases where the guest has not initialized some control blocks. This is XSA-107. Reported-by: Vitaly Kuznetsov Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_fifo.c | 81 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 57 insertions(+), 24 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 51b4ff6..b81fae4 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -178,6 +178,18 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) bool_t linked = 0; /* + * Control block not mapped. The guest must not unmask an + * event until the control block is initialized, so we can + * just drop the event. + */ + if ( unlikely(!v->evtchn_fifo->control_block) ) + { + printk(XENLOG_G_WARNING + "%pv has no FIFO event channel control block\n", v); + goto done; + } + + /* * No locking around getting the queue. This may race with * changing the priority but we are allowed to signal the * event once on the old priority. @@ -385,36 +397,42 @@ static void init_queue(struct vcpu *v, struct evtchn_fifo_queue *q, { spin_lock_init(&q->lock); q->priority = i; - q->head = &v->evtchn_fifo->control_block->head[i]; } -static int setup_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +static int setup_control_block(struct vcpu *v) { - struct domain *d = v->domain; struct evtchn_fifo_vcpu *efv; - void *virt; unsigned int i; - int rc; - - if ( v->evtchn_fifo ) - return -EINVAL; efv = xzalloc(struct evtchn_fifo_vcpu); if ( !efv ) return -ENOMEM; - rc = map_guest_page(d, gfn, &virt); + for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) + init_queue(v, &efv->queue[i], i); + + v->evtchn_fifo = efv; + + return 0; +} + +static int map_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +{ + void *virt; + unsigned int i; + int rc; + + if ( v->evtchn_fifo->control_block ) + return -EINVAL; + + rc = map_guest_page(v->domain, gfn, &virt); if ( rc < 0 ) - { - xfree(efv); return rc; - } - v->evtchn_fifo = efv; v->evtchn_fifo->control_block = virt + offset; for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) - init_queue(v, &v->evtchn_fifo->queue[i], i); + v->evtchn_fifo->queue[i].head = &v->evtchn_fifo->control_block->head[i]; return 0; } @@ -509,28 +527,43 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) spin_lock(&d->event_lock); - rc = setup_control_block(v, gfn, offset); - /* * If this is the first control block, setup an empty event array * and switch to the fifo port ops. */ - if ( rc == 0 && !d->evtchn_fifo ) + if ( !d->evtchn_fifo ) { + struct vcpu *vcb; + + for_each_vcpu ( d, vcb ) { + rc = setup_control_block(vcb); + if ( rc < 0 ) + goto error; + } + rc = setup_event_array(d); if ( rc < 0 ) - cleanup_control_block(v); - else - { - d->evtchn_port_ops = &evtchn_port_ops_fifo; - d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; - setup_ports(d); - } + goto error; + + rc = map_control_block(v, gfn, offset); + if ( rc < 0 ) + goto error; + + d->evtchn_port_ops = &evtchn_port_ops_fifo; + d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; + setup_ports(d); } + else + rc = map_control_block(v, gfn, offset); spin_unlock(&d->event_lock); return rc; + + error: + evtchn_fifo_destroy(d); + spin_unlock(&d->event_lock); + return rc; } static int add_page_to_event_array(struct domain *d, unsigned long gfn) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:00 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbg-0003v5-UR; Fri, 12 Sep 2014 01:25:00 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbf-0003ut-3X for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:59 +0000 Received: from [85.158.143.35:13116] by server-1.bemta-4.messagelabs.com id 6A/12-05872-A6B42145; Fri, 12 Sep 2014 01:24:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1410485096!8844968!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14679 invoked from network); 12 Sep 2014 01:24:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:24:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbc-0000Ew-Gz for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbc-0000Mp-F8 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:24:56 +0000 Date: Fri, 12 Sep 2014 01:24:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: check control block exists when using FIFO-based events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4e0cea6fced50e251453dfe52e1b9dde77a84f5 Author: David Vrabel AuthorDate: Tue Sep 9 15:25:58 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 15:25:58 2014 +0200 evtchn: check control block exists when using FIFO-based events When using the FIFO-based event channels, there are no checks for the existance of a control block when binding an event or moving it to a different VCPU. This is because events may be bound when the ABI is in 2-level mode (e.g., by the toolstack before the domain is started). The guest may trigger a Xen crash in evtchn_fifo_set_pending() if: a) the event is bound to a VCPU without a control block; or b) VCPU 0 does not have a control block. In case (a), Xen will crash when looking up the current queue. In (b), Xen will crash when looking up the old queue (which defaults to a queue on VCPU 0). By allocating all the per-VCPU structures when enabling the FIFO ABI, we can be sure that v->evtchn_fifo is always valid. EVTCHNOP_init_control_block for all the other CPUs need only map the shared control block. A single check in evtchn_fifo_set_pending() before accessing the control block fixes all cases where the guest has not initialized some control blocks. This is XSA-107. Reported-by: Vitaly Kuznetsov Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_fifo.c | 81 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 57 insertions(+), 24 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 51b4ff6..b81fae4 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -178,6 +178,18 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) bool_t linked = 0; /* + * Control block not mapped. The guest must not unmask an + * event until the control block is initialized, so we can + * just drop the event. + */ + if ( unlikely(!v->evtchn_fifo->control_block) ) + { + printk(XENLOG_G_WARNING + "%pv has no FIFO event channel control block\n", v); + goto done; + } + + /* * No locking around getting the queue. This may race with * changing the priority but we are allowed to signal the * event once on the old priority. @@ -385,36 +397,42 @@ static void init_queue(struct vcpu *v, struct evtchn_fifo_queue *q, { spin_lock_init(&q->lock); q->priority = i; - q->head = &v->evtchn_fifo->control_block->head[i]; } -static int setup_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +static int setup_control_block(struct vcpu *v) { - struct domain *d = v->domain; struct evtchn_fifo_vcpu *efv; - void *virt; unsigned int i; - int rc; - - if ( v->evtchn_fifo ) - return -EINVAL; efv = xzalloc(struct evtchn_fifo_vcpu); if ( !efv ) return -ENOMEM; - rc = map_guest_page(d, gfn, &virt); + for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) + init_queue(v, &efv->queue[i], i); + + v->evtchn_fifo = efv; + + return 0; +} + +static int map_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +{ + void *virt; + unsigned int i; + int rc; + + if ( v->evtchn_fifo->control_block ) + return -EINVAL; + + rc = map_guest_page(v->domain, gfn, &virt); if ( rc < 0 ) - { - xfree(efv); return rc; - } - v->evtchn_fifo = efv; v->evtchn_fifo->control_block = virt + offset; for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) - init_queue(v, &v->evtchn_fifo->queue[i], i); + v->evtchn_fifo->queue[i].head = &v->evtchn_fifo->control_block->head[i]; return 0; } @@ -509,28 +527,43 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) spin_lock(&d->event_lock); - rc = setup_control_block(v, gfn, offset); - /* * If this is the first control block, setup an empty event array * and switch to the fifo port ops. */ - if ( rc == 0 && !d->evtchn_fifo ) + if ( !d->evtchn_fifo ) { + struct vcpu *vcb; + + for_each_vcpu ( d, vcb ) { + rc = setup_control_block(vcb); + if ( rc < 0 ) + goto error; + } + rc = setup_event_array(d); if ( rc < 0 ) - cleanup_control_block(v); - else - { - d->evtchn_port_ops = &evtchn_port_ops_fifo; - d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; - setup_ports(d); - } + goto error; + + rc = map_control_block(v, gfn, offset); + if ( rc < 0 ) + goto error; + + d->evtchn_port_ops = &evtchn_port_ops_fifo; + d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; + setup_ports(d); } + else + rc = map_control_block(v, gfn, offset); spin_unlock(&d->event_lock); return rc; + + error: + evtchn_fifo_destroy(d); + spin_unlock(&d->event_lock); + return rc; } static int add_page_to_event_array(struct domain *d, unsigned long gfn) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25: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 1XSFbs-0003wr-4H; Fri, 12 Sep 2014 01:25:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbq-0003wf-QQ for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:10 +0000 Received: from [193.109.254.147:19017] by server-14.bemta-14.messagelabs.com id 5B/A5-18345-67B42145; Fri, 12 Sep 2014 01:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1410485108!15049795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10466 invoked from network); 12 Sep 2014 01:25:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbm-0000FT-N6 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbm-0000NT-LN for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:06 +0000 Date: Fri, 12 Sep 2014 01:25:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, idle: add barriers to CLFLUSH workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48d32458bcd453e31b458bca868a079a6d0a38af Author: H. Peter Anvin AuthorDate: Tue Sep 9 18:09:08 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 18:09:08 2014 +0200 x86, idle: add barriers to CLFLUSH workaround ... since the documentation is explicit that CLFLUSH is only ordered with respect to MFENCE. Signed-off-by: H. Peter Anvin Signed-off-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index b05fb39..136c0b6 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -336,7 +336,11 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) s_time_t expires = per_cpu(timer_deadline, cpu); if ( boot_cpu_has(X86_FEATURE_CLFLUSH_MONITOR) ) + { + mb(); clflush((void *)&mwait_wakeup(cpu)); + mb(); + } __monitor((void *)&mwait_wakeup(cpu), 0, 0); smp_mb(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25: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 1XSFbs-0003wr-4H; Fri, 12 Sep 2014 01:25:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbq-0003wf-QQ for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:10 +0000 Received: from [193.109.254.147:19017] by server-14.bemta-14.messagelabs.com id 5B/A5-18345-67B42145; Fri, 12 Sep 2014 01:25:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1410485108!15049795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10466 invoked from network); 12 Sep 2014 01:25:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFbm-0000FT-N6 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFbm-0000NT-LN for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:06 +0000 Date: Fri, 12 Sep 2014 01:25:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, idle: add barriers to CLFLUSH workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 48d32458bcd453e31b458bca868a079a6d0a38af Author: H. Peter Anvin AuthorDate: Tue Sep 9 18:09:08 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 18:09:08 2014 +0200 x86, idle: add barriers to CLFLUSH workaround ... since the documentation is explicit that CLFLUSH is only ordered with respect to MFENCE. Signed-off-by: H. Peter Anvin Signed-off-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index b05fb39..136c0b6 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -336,7 +336,11 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) s_time_t expires = per_cpu(timer_deadline, cpu); if ( boot_cpu_has(X86_FEATURE_CLFLUSH_MONITOR) ) + { + mb(); clflush((void *)&mwait_wakeup(cpu)); + mb(); + } __monitor((void *)&mwait_wakeup(cpu), 0, 0); smp_mb(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFc3-0003yX-71; Fri, 12 Sep 2014 01:25:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFc1-0003y6-8V for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:21 +0000 Received: from [85.158.137.68:29348] by server-7.bemta-3.messagelabs.com id 57/2E-01084-08B42145; Fri, 12 Sep 2014 01:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1410485118!14022766!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32003 invoked from network); 12 Sep 2014 01:25:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFby-0000Fc-Lp for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFby-0000Nr-Kr for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:18 +0000 Date: Fri, 12 Sep 2014 01:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait-idle: disable Baytrail Core and Module C6 auto-demotion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 249735c48fb24cff44957f7d0bcb6cbf1f29fc4c Author: Len Brown AuthorDate: Tue Sep 9 18:10:21 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 18:10:21 2014 +0200 x86/mwait-idle: disable Baytrail Core and Module C6 auto-demotion Power efficiency improves on Baytrail (Intel Atom Processor E3000) when Linux disables C6 auto-demotion. Based on work by Srinidhi Kasagar . Signed-off-by: Len Brown Do the MSR writes on all CPUs rather than just the current one. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 11 +++++++++++ xen/include/asm-x86/msr-index.h | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index c2c8889..a4a779b 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -88,6 +88,7 @@ struct idle_cpu { * Indicate which enable bits to clear here. */ unsigned long auto_demotion_disable_flags; + bool_t byt_auto_demotion_disable_flag; bool_t disable_promotion_to_c1e; }; @@ -537,6 +538,12 @@ static void auto_demotion_disable(void *dummy) wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); } +static void byt_auto_demotion_disable(void *dummy) +{ + wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0); + wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0); +} + static void c1e_promotion_disable(void *dummy) { u64 msr_bits; @@ -569,6 +576,7 @@ static const struct idle_cpu idle_cpu_snb = { static const struct idle_cpu idle_cpu_byt = { .state_table = byt_cstates, .disable_promotion_to_c1e = 1, + .byt_auto_demotion_disable_flag = 1, }; static const struct idle_cpu idle_cpu_ivb = { @@ -767,6 +775,9 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, if (icpu->auto_demotion_disable_flags) on_selected_cpus(cpumask_of(cpu), auto_demotion_disable, NULL, 1); + if (icpu->byt_auto_demotion_disable_flag) + on_selected_cpus(cpumask_of(cpu), byt_auto_demotion_disable, NULL, 1); + if (icpu->disable_promotion_to_c1e) on_selected_cpus(cpumask_of(cpu), c1e_promotion_disable, NULL, 1); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 2056501..542222e 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -483,4 +483,7 @@ #define _MSR_MISC_FEATURES_CPUID_FAULTING 0 #define MSR_MISC_FEATURES_CPUID_FAULTING (1ULL << _MSR_MISC_FEATURES_CPUID_FAULTING) +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + #endif /* __ASM_MSR_INDEX_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFc3-0003yX-71; Fri, 12 Sep 2014 01:25:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFc1-0003y6-8V for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:21 +0000 Received: from [85.158.137.68:29348] by server-7.bemta-3.messagelabs.com id 57/2E-01084-08B42145; Fri, 12 Sep 2014 01:25:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1410485118!14022766!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32003 invoked from network); 12 Sep 2014 01:25:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFby-0000Fc-Lp for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFby-0000Nr-Kr for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:18 +0000 Date: Fri, 12 Sep 2014 01:25:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait-idle: disable Baytrail Core and Module C6 auto-demotion X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 249735c48fb24cff44957f7d0bcb6cbf1f29fc4c Author: Len Brown AuthorDate: Tue Sep 9 18:10:21 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 18:10:21 2014 +0200 x86/mwait-idle: disable Baytrail Core and Module C6 auto-demotion Power efficiency improves on Baytrail (Intel Atom Processor E3000) when Linux disables C6 auto-demotion. Based on work by Srinidhi Kasagar . Signed-off-by: Len Brown Do the MSR writes on all CPUs rather than just the current one. Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 11 +++++++++++ xen/include/asm-x86/msr-index.h | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index c2c8889..a4a779b 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -88,6 +88,7 @@ struct idle_cpu { * Indicate which enable bits to clear here. */ unsigned long auto_demotion_disable_flags; + bool_t byt_auto_demotion_disable_flag; bool_t disable_promotion_to_c1e; }; @@ -537,6 +538,12 @@ static void auto_demotion_disable(void *dummy) wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits); } +static void byt_auto_demotion_disable(void *dummy) +{ + wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0); + wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0); +} + static void c1e_promotion_disable(void *dummy) { u64 msr_bits; @@ -569,6 +576,7 @@ static const struct idle_cpu idle_cpu_snb = { static const struct idle_cpu idle_cpu_byt = { .state_table = byt_cstates, .disable_promotion_to_c1e = 1, + .byt_auto_demotion_disable_flag = 1, }; static const struct idle_cpu idle_cpu_ivb = { @@ -767,6 +775,9 @@ static int mwait_idle_cpu_init(struct notifier_block *nfb, if (icpu->auto_demotion_disable_flags) on_selected_cpus(cpumask_of(cpu), auto_demotion_disable, NULL, 1); + if (icpu->byt_auto_demotion_disable_flag) + on_selected_cpus(cpumask_of(cpu), byt_auto_demotion_disable, NULL, 1); + if (icpu->disable_promotion_to_c1e) on_selected_cpus(cpumask_of(cpu), c1e_promotion_disable, NULL, 1); diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 2056501..542222e 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -483,4 +483,7 @@ #define _MSR_MISC_FEATURES_CPUID_FAULTING 0 #define MSR_MISC_FEATURES_CPUID_FAULTING (1ULL << _MSR_MISC_FEATURES_CPUID_FAULTING) +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + #endif /* __ASM_MSR_INDEX_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25: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 1XSFcD-0003zy-9c; Fri, 12 Sep 2014 01:25:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcB-0003zf-9s for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:31 +0000 Received: from [85.158.143.35:16192] by server-2.bemta-4.messagelabs.com id 40/9B-04525-A8B42145; Fri, 12 Sep 2014 01:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1410485129!13271796!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18665 invoked from network); 12 Sep 2014 01:25:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFc8-0000Fk-QV for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFc8-0000OF-PH for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:28 +0000 Date: Fri, 12 Sep 2014 01:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait-idle: Broadwell support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c645b32ae1f4f4a0e9bd787cc7aab7e2a6e7593c Author: Len Brown AuthorDate: Tue Sep 9 18:11:10 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 18:11:10 2014 +0200 x86/mwait-idle: Broadwell support Broadwell (BDW) is similar to Haswell (HSW), the preceding processor generation. Currently, the only difference in their C-state tables is that PC3 max exit latency is 33usec on HSW and 40usec on BDW. Signed-off-by: Len Brown Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 60 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index a4a779b..6dd5822 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -398,6 +398,58 @@ static const struct cpuidle_state hsw_cstates[] = { {} }; +static const struct cpuidle_state bdw_cstates[] = { + { + .name = "C1-BDW", + .flags = MWAIT2flg(0x00), + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C1E-BDW", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { + .name = "C3-BDW", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 40, + .target_residency = 100, + }, + { + .name = "C6-BDW", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 133, + .target_residency = 400, + }, + { + .name = "C7s-BDW", + .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 166, + .target_residency = 500, + }, + { + .name = "C8-BDW", + .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 300, + .target_residency = 900, + }, + { + .name = "C9-BDW", + .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 600, + .target_residency = 1800, + }, + { + .name = "C10-BDW", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 2600, + .target_residency = 7700, + }, + {} +}; + static const struct cpuidle_state atom_cstates[] = { { .name = "C1E-ATM", @@ -594,6 +646,11 @@ static const struct idle_cpu idle_cpu_hsw = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_bdw = { + .state_table = bdw_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_avn = { .state_table = avn_cstates, .disable_promotion_to_c1e = 1, @@ -625,6 +682,9 @@ static struct intel_idle_id { ICPU(0x45, hsw), ICPU(0x46, hsw), ICPU(0x4d, avn), + ICPU(0x3d, bdw), + ICPU(0x4f, bdw), + ICPU(0x56, bdw), {} }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:33 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25: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 1XSFcD-0003zy-9c; Fri, 12 Sep 2014 01:25:33 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcB-0003zf-9s for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:31 +0000 Received: from [85.158.143.35:16192] by server-2.bemta-4.messagelabs.com id 40/9B-04525-A8B42145; Fri, 12 Sep 2014 01:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1410485129!13271796!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18665 invoked from network); 12 Sep 2014 01:25:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFc8-0000Fk-QV for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFc8-0000OF-PH for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:28 +0000 Date: Fri, 12 Sep 2014 01:25:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mwait-idle: Broadwell support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c645b32ae1f4f4a0e9bd787cc7aab7e2a6e7593c Author: Len Brown AuthorDate: Tue Sep 9 18:11:10 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 18:11:10 2014 +0200 x86/mwait-idle: Broadwell support Broadwell (BDW) is similar to Haswell (HSW), the preceding processor generation. Currently, the only difference in their C-state tables is that PC3 max exit latency is 33usec on HSW and 40usec on BDW. Signed-off-by: Len Brown Signed-off-by: Jan Beulich --- xen/arch/x86/cpu/mwait-idle.c | 60 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index a4a779b..6dd5822 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -398,6 +398,58 @@ static const struct cpuidle_state hsw_cstates[] = { {} }; +static const struct cpuidle_state bdw_cstates[] = { + { + .name = "C1-BDW", + .flags = MWAIT2flg(0x00), + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C1E-BDW", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { + .name = "C3-BDW", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 40, + .target_residency = 100, + }, + { + .name = "C6-BDW", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 133, + .target_residency = 400, + }, + { + .name = "C7s-BDW", + .flags = MWAIT2flg(0x32) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 166, + .target_residency = 500, + }, + { + .name = "C8-BDW", + .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 300, + .target_residency = 900, + }, + { + .name = "C9-BDW", + .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 600, + .target_residency = 1800, + }, + { + .name = "C10-BDW", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 2600, + .target_residency = 7700, + }, + {} +}; + static const struct cpuidle_state atom_cstates[] = { { .name = "C1E-ATM", @@ -594,6 +646,11 @@ static const struct idle_cpu idle_cpu_hsw = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_bdw = { + .state_table = bdw_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_avn = { .state_table = avn_cstates, .disable_promotion_to_c1e = 1, @@ -625,6 +682,9 @@ static struct intel_idle_id { ICPU(0x45, hsw), ICPU(0x46, hsw), ICPU(0x4d, avn), + ICPU(0x3d, bdw), + ICPU(0x4f, bdw), + ICPU(0x56, bdw), {} }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcN-00041X-Cd; Fri, 12 Sep 2014 01:25:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcL-00041H-N6 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:41 +0000 Received: from [85.158.143.35:16548] by server-2.bemta-4.messagelabs.com id 92/AB-04525-59B42145; Fri, 12 Sep 2014 01:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1410485139!12559483!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17667 invoked from network); 12 Sep 2014 01:25:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcI-0000Fq-Vw for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcI-0000Of-Ut for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:38 +0000 Date: Fri, 12 Sep 2014 01:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for the Odroid-XU board. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0bf8ddecb4df674a9df976f349c98691b2560721 Author: Suriyan Ramasami AuthorDate: Thu Sep 4 15:57:23 2014 -0700 Commit: Ian Campbell CommitDate: Wed Sep 10 14:38:21 2014 +0100 xen/arm: Add support for the Odroid-XU board. The Odroid-XU from hardkernel is an Exynos 5410 based board. This patch introduces a generic PLATFORM exynos5 which hopefully is applicable to the majority of exynos5 based SoCs. It currently has only been tested on an exynos5410 based (OdroidXU) board and hence that is the only board listed. Previously only the Arndale board, based on an exynos5250 was supported. It was the only exynos based platform that was supported and it was called exynos5. It has now been renamed to exynos5250. The Arndale currently is a separate platform mostly cause I do not have one to test and for the most part the code path for that board is preserved. To be specific it varies from the generic implementation as follows: 1. exynos5250 based specific DT mapping for CHIPID and PWM region. I believe mainline kernel's DTS for the arndale has those mappings already in place. 2. exynos5250 based cpu up code. It appears that exynos5250 already has the secondary core powered up and in wfe and hence a cpu_up_send_sgi suffices. Here too, I believe that the generic code path might be acceptable. Most of the code for the cpu bring up has been ported over from mainline linux, and hence should be generic enough for future exynos based SoCs. All reference to hardcoded memory locations have been avoided. They are now gleaned from the device tree. The existing SMP bringup code has been broken since 4557c2292854 "xen: arm: rewrite start of day page table and cpu bring up" which moved the arndale CPU kick from secure world to non-secure world without updating it to match the new environment. Specifically the sysram address remained hardcoded to the S sysram address and not the NS sysram address, this is now correctly taken from DT. Secondly the offset within the sysram where the start address is written is 0x1c for NS bringup, rather than 0x0 as it is in S bringup. Signed-off-by: Suriyan Ramasami Acked-by: Ian Campbell [ ijc -- updated commit log as discussed on list, plus reformatted slightly. s/exynos5XXXX/exynos5XXX/ in one error message ] --- xen/arch/arm/platforms/exynos5.c | 197 +++++++++++++++++++++++++++++-- xen/include/asm-arm/platforms/exynos5.h | 3 - 2 files changed, 184 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index b65c2c2..bc9ae15 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -23,18 +23,45 @@ #include #include #include +#include #include #include #include +#define EXYNOS_ARM_CORE0_CONFIG 0x2000 +#define EXYNOS_ARM_CORE_CONFIG(_nr) (0x80 * (_nr)) +#define EXYNOS_ARM_CORE_STATUS(_nr) (EXYNOS_ARM_CORE_CONFIG(_nr) + 0x4) +#define S5P_CORE_LOCAL_PWR_EN 0x3 + static int exynos5_init_time(void) { uint32_t reg; void __iomem *mct; + int rc; + struct dt_device_node *node; + u64 mct_base_addr; + u64 size; BUILD_BUG_ON(EXYNOS5_MCT_G_TCON >= PAGE_SIZE); - mct = ioremap_attr(EXYNOS5_MCT_BASE, PAGE_SIZE, PAGE_HYPERVISOR_NOCACHE); + node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-mct"); + if ( !node ) + { + dprintk(XENLOG_ERR, "samsung,exynos4210-mct missing in DT\n"); + return -ENXIO; + } + + rc = dt_device_get_address(node, 0, &mct_base_addr, &size); + if ( rc ) + { + dprintk(XENLOG_ERR, "Error in \"samsung,exynos4210-mct\"\n"); + return -ENXIO; + } + + dprintk(XENLOG_INFO, "mct_base_addr: %016llx size: %016llx\n", + mct_base_addr, size); + + mct = ioremap_attr(mct_base_addr, PAGE_SIZE, PAGE_HYPERVISOR_NOCACHE); if ( !mct ) { dprintk(XENLOG_ERR, "Unable to map MCT\n"); @@ -51,7 +78,7 @@ static int exynos5_init_time(void) } /* Additional mappings for dom0 (Not in the DTS) */ -static int exynos5_specific_mapping(struct domain *d) +static int exynos5250_specific_mapping(struct domain *d) { /* Map the chip ID */ map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), 1, @@ -67,8 +94,29 @@ static int exynos5_specific_mapping(struct domain *d) static int __init exynos5_smp_init(void) { void __iomem *sysram; + struct dt_device_node *node; + u64 sysram_ns_base_addr; + u64 size; + int rc; + + node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram-ns"); + if ( !node ) + { + dprintk(XENLOG_ERR, "samsung,exynos4210-sysram-ns missing in DT\n"); + return -ENXIO; + } - sysram = ioremap_nocache(S5P_PA_SYSRAM, PAGE_SIZE); + rc = dt_device_get_address(node, 0, &sysram_ns_base_addr, &size); + if ( rc ) + { + dprintk(XENLOG_ERR, "Error in \"samsung,exynos4210-sysram-ns\"\n"); + return -ENXIO; + } + + dprintk(XENLOG_INFO, "sysram_ns_base_addr: %016llx size: %016llx\n", + sysram_ns_base_addr, size); + + sysram = ioremap_nocache(sysram_ns_base_addr, PAGE_SIZE); if ( !sysram ) { dprintk(XENLOG_ERR, "Unable to map exynos5 MMIO\n"); @@ -77,20 +125,127 @@ static int __init exynos5_smp_init(void) printk("Set SYSRAM to %"PRIpaddr" (%p)\n", __pa(init_secondary), init_secondary); - writel(__pa(init_secondary), sysram); + writel(__pa(init_secondary), sysram + 0x1c); iounmap(sysram); return 0; } +static int exynos_cpu_power_state(void __iomem *power, int cpu) +{ + return __raw_readl(power + EXYNOS_ARM_CORE_STATUS(cpu)) & + S5P_CORE_LOCAL_PWR_EN; +} + +static void exynos_cpu_power_up(void __iomem *power, int cpu) +{ + __raw_writel(S5P_CORE_LOCAL_PWR_EN, + power + EXYNOS_ARM_CORE_CONFIG(cpu)); +} + +static int exynos5_cpu_power_up(void __iomem *power, int cpu) +{ + unsigned int timeout; + + if ( !exynos_cpu_power_state(power, cpu) ) + { + exynos_cpu_power_up(power, cpu); + timeout = 10; + + /* wait max 10 ms until cpu is on */ + while ( exynos_cpu_power_state(power, cpu) != S5P_CORE_LOCAL_PWR_EN ) + { + if ( timeout-- == 0 ) + break; + + mdelay(1); + } + + if ( timeout == 0 ) + { + dprintk(XENLOG_ERR, "CPU%d power enable failed", cpu); + return -ETIMEDOUT; + } + } + return 0; +} + +static int exynos5_get_pmu_base_addr(u64 *power_base_addr) { + u64 size; + struct dt_device_node *node; + int rc; + static const struct dt_device_match exynos_dt_pmu_matches[] __initconst = + { + DT_MATCH_COMPATIBLE("samsung,exynos5250-pmu"), + DT_MATCH_COMPATIBLE("samsung,exynos5410-pmu"), + DT_MATCH_COMPATIBLE("samsung,exynos5420-pmu"), + { /*sentinel*/ }, + }; + + node = dt_find_matching_node(NULL, exynos_dt_pmu_matches); + if ( !node ) + { + dprintk(XENLOG_ERR, "samsung,exynos5XXX-pmu missing in DT\n"); + return -ENXIO; + } + + rc = dt_device_get_address(node, 0, power_base_addr, &size); + if ( rc ) + { + dprintk(XENLOG_ERR, "Error in \"samsung,exynos5XXX-pmu\"\n"); + return -ENXIO; + } + + dprintk(XENLOG_DEBUG, "power_base_addr: %016llx size: %016llx\n", + *power_base_addr, size); + + return 0; +} + +static int exynos5_cpu_up(int cpu) +{ + u64 power_base_addr; + void __iomem *power; + int rc; + + rc = exynos5_get_pmu_base_addr(&power_base_addr); + if ( rc ) + return rc; + + power = ioremap_nocache(power_base_addr + + EXYNOS_ARM_CORE0_CONFIG, PAGE_SIZE); + if ( !power ) + { + dprintk(XENLOG_ERR, "Unable to map power MMIO\n"); + return -EFAULT; + } + + rc = exynos5_cpu_power_up(power, cpu); + if ( rc ) + { + iounmap(power); + return -ETIMEDOUT; + } + + iounmap(power); + + return cpu_up_send_sgi(cpu); +} + static void exynos5_reset(void) { + u64 power_base_addr; void __iomem *pmu; + int rc; BUILD_BUG_ON(EXYNOS5_SWRESET >= PAGE_SIZE); - pmu = ioremap_nocache(EXYNOS5_PA_PMU, PAGE_SIZE); + rc = exynos5_get_pmu_base_addr(&power_base_addr); + if ( rc ) + return; + + pmu = ioremap_nocache(power_base_addr, PAGE_SIZE); if ( !pmu ) { dprintk(XENLOG_ERR, "Unable to map PMU\n"); @@ -98,15 +253,10 @@ static void exynos5_reset(void) } writel(1, pmu + EXYNOS5_SWRESET); + iounmap(pmu); } -static const char * const exynos5_dt_compat[] __initconst = -{ - "samsung,exynos5250", - NULL -}; - static const struct dt_device_match exynos5_blacklist_dev[] __initconst = { /* Multi core Timer @@ -117,12 +267,33 @@ static const struct dt_device_match exynos5_blacklist_dev[] __initconst = { /* sentinel */ }, }; +static const char * const exynos5250_dt_compat[] __initconst = +{ + "samsung,exynos5250", + NULL +}; + +static const char * const exynos5_dt_compat[] __initconst = +{ + "samsung,exynos5410", + NULL +}; + +PLATFORM_START(exynos5250, "SAMSUNG EXYNOS5250") + .compatible = exynos5250_dt_compat, + .init_time = exynos5_init_time, + .specific_mapping = exynos5250_specific_mapping, + .smp_init = exynos5_smp_init, + .cpu_up = cpu_up_send_sgi, + .reset = exynos5_reset, + .blacklist_dev = exynos5_blacklist_dev, +PLATFORM_END + PLATFORM_START(exynos5, "SAMSUNG EXYNOS5") .compatible = exynos5_dt_compat, .init_time = exynos5_init_time, - .specific_mapping = exynos5_specific_mapping, .smp_init = exynos5_smp_init, - .cpu_up = cpu_up_send_sgi, + .cpu_up = exynos5_cpu_up, .reset = exynos5_reset, .blacklist_dev = exynos5_blacklist_dev, PLATFORM_END diff --git a/xen/include/asm-arm/platforms/exynos5.h b/xen/include/asm-arm/platforms/exynos5.h index ea941e7..c88455a 100644 --- a/xen/include/asm-arm/platforms/exynos5.h +++ b/xen/include/asm-arm/platforms/exynos5.h @@ -1,7 +1,6 @@ #ifndef __ASM_ARM_PLATFORMS_EXYNOS5_H #define __ASM_ARM_PLATFORMS_EXYNOS5_H -#define EXYNOS5_MCT_BASE 0x101c0000 #define EXYNOS5_MCT_G_TCON 0x240 /* Relative to MCT_BASE */ #define EXYNOS5_MCT_G_TCON_START (1 << 8) @@ -12,8 +11,6 @@ #define EXYNOS5_SWRESET 0x0400 /* Relative to PA_PMU */ -#define S5P_PA_SYSRAM 0x02020000 - #endif /* __ASM_ARM_PLATFORMS_EXYNOS5_H */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcN-00041X-Cd; Fri, 12 Sep 2014 01:25:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcL-00041H-N6 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:41 +0000 Received: from [85.158.143.35:16548] by server-2.bemta-4.messagelabs.com id 92/AB-04525-59B42145; Fri, 12 Sep 2014 01:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1410485139!12559483!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17667 invoked from network); 12 Sep 2014 01:25:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:40 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcI-0000Fq-Vw for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcI-0000Of-Ut for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:38 +0000 Date: Fri, 12 Sep 2014 01:25:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for the Odroid-XU board. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0bf8ddecb4df674a9df976f349c98691b2560721 Author: Suriyan Ramasami AuthorDate: Thu Sep 4 15:57:23 2014 -0700 Commit: Ian Campbell CommitDate: Wed Sep 10 14:38:21 2014 +0100 xen/arm: Add support for the Odroid-XU board. The Odroid-XU from hardkernel is an Exynos 5410 based board. This patch introduces a generic PLATFORM exynos5 which hopefully is applicable to the majority of exynos5 based SoCs. It currently has only been tested on an exynos5410 based (OdroidXU) board and hence that is the only board listed. Previously only the Arndale board, based on an exynos5250 was supported. It was the only exynos based platform that was supported and it was called exynos5. It has now been renamed to exynos5250. The Arndale currently is a separate platform mostly cause I do not have one to test and for the most part the code path for that board is preserved. To be specific it varies from the generic implementation as follows: 1. exynos5250 based specific DT mapping for CHIPID and PWM region. I believe mainline kernel's DTS for the arndale has those mappings already in place. 2. exynos5250 based cpu up code. It appears that exynos5250 already has the secondary core powered up and in wfe and hence a cpu_up_send_sgi suffices. Here too, I believe that the generic code path might be acceptable. Most of the code for the cpu bring up has been ported over from mainline linux, and hence should be generic enough for future exynos based SoCs. All reference to hardcoded memory locations have been avoided. They are now gleaned from the device tree. The existing SMP bringup code has been broken since 4557c2292854 "xen: arm: rewrite start of day page table and cpu bring up" which moved the arndale CPU kick from secure world to non-secure world without updating it to match the new environment. Specifically the sysram address remained hardcoded to the S sysram address and not the NS sysram address, this is now correctly taken from DT. Secondly the offset within the sysram where the start address is written is 0x1c for NS bringup, rather than 0x0 as it is in S bringup. Signed-off-by: Suriyan Ramasami Acked-by: Ian Campbell [ ijc -- updated commit log as discussed on list, plus reformatted slightly. s/exynos5XXXX/exynos5XXX/ in one error message ] --- xen/arch/arm/platforms/exynos5.c | 197 +++++++++++++++++++++++++++++-- xen/include/asm-arm/platforms/exynos5.h | 3 - 2 files changed, 184 insertions(+), 16 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index b65c2c2..bc9ae15 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -23,18 +23,45 @@ #include #include #include +#include #include #include #include +#define EXYNOS_ARM_CORE0_CONFIG 0x2000 +#define EXYNOS_ARM_CORE_CONFIG(_nr) (0x80 * (_nr)) +#define EXYNOS_ARM_CORE_STATUS(_nr) (EXYNOS_ARM_CORE_CONFIG(_nr) + 0x4) +#define S5P_CORE_LOCAL_PWR_EN 0x3 + static int exynos5_init_time(void) { uint32_t reg; void __iomem *mct; + int rc; + struct dt_device_node *node; + u64 mct_base_addr; + u64 size; BUILD_BUG_ON(EXYNOS5_MCT_G_TCON >= PAGE_SIZE); - mct = ioremap_attr(EXYNOS5_MCT_BASE, PAGE_SIZE, PAGE_HYPERVISOR_NOCACHE); + node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-mct"); + if ( !node ) + { + dprintk(XENLOG_ERR, "samsung,exynos4210-mct missing in DT\n"); + return -ENXIO; + } + + rc = dt_device_get_address(node, 0, &mct_base_addr, &size); + if ( rc ) + { + dprintk(XENLOG_ERR, "Error in \"samsung,exynos4210-mct\"\n"); + return -ENXIO; + } + + dprintk(XENLOG_INFO, "mct_base_addr: %016llx size: %016llx\n", + mct_base_addr, size); + + mct = ioremap_attr(mct_base_addr, PAGE_SIZE, PAGE_HYPERVISOR_NOCACHE); if ( !mct ) { dprintk(XENLOG_ERR, "Unable to map MCT\n"); @@ -51,7 +78,7 @@ static int exynos5_init_time(void) } /* Additional mappings for dom0 (Not in the DTS) */ -static int exynos5_specific_mapping(struct domain *d) +static int exynos5250_specific_mapping(struct domain *d) { /* Map the chip ID */ map_mmio_regions(d, paddr_to_pfn(EXYNOS5_PA_CHIPID), 1, @@ -67,8 +94,29 @@ static int exynos5_specific_mapping(struct domain *d) static int __init exynos5_smp_init(void) { void __iomem *sysram; + struct dt_device_node *node; + u64 sysram_ns_base_addr; + u64 size; + int rc; + + node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram-ns"); + if ( !node ) + { + dprintk(XENLOG_ERR, "samsung,exynos4210-sysram-ns missing in DT\n"); + return -ENXIO; + } - sysram = ioremap_nocache(S5P_PA_SYSRAM, PAGE_SIZE); + rc = dt_device_get_address(node, 0, &sysram_ns_base_addr, &size); + if ( rc ) + { + dprintk(XENLOG_ERR, "Error in \"samsung,exynos4210-sysram-ns\"\n"); + return -ENXIO; + } + + dprintk(XENLOG_INFO, "sysram_ns_base_addr: %016llx size: %016llx\n", + sysram_ns_base_addr, size); + + sysram = ioremap_nocache(sysram_ns_base_addr, PAGE_SIZE); if ( !sysram ) { dprintk(XENLOG_ERR, "Unable to map exynos5 MMIO\n"); @@ -77,20 +125,127 @@ static int __init exynos5_smp_init(void) printk("Set SYSRAM to %"PRIpaddr" (%p)\n", __pa(init_secondary), init_secondary); - writel(__pa(init_secondary), sysram); + writel(__pa(init_secondary), sysram + 0x1c); iounmap(sysram); return 0; } +static int exynos_cpu_power_state(void __iomem *power, int cpu) +{ + return __raw_readl(power + EXYNOS_ARM_CORE_STATUS(cpu)) & + S5P_CORE_LOCAL_PWR_EN; +} + +static void exynos_cpu_power_up(void __iomem *power, int cpu) +{ + __raw_writel(S5P_CORE_LOCAL_PWR_EN, + power + EXYNOS_ARM_CORE_CONFIG(cpu)); +} + +static int exynos5_cpu_power_up(void __iomem *power, int cpu) +{ + unsigned int timeout; + + if ( !exynos_cpu_power_state(power, cpu) ) + { + exynos_cpu_power_up(power, cpu); + timeout = 10; + + /* wait max 10 ms until cpu is on */ + while ( exynos_cpu_power_state(power, cpu) != S5P_CORE_LOCAL_PWR_EN ) + { + if ( timeout-- == 0 ) + break; + + mdelay(1); + } + + if ( timeout == 0 ) + { + dprintk(XENLOG_ERR, "CPU%d power enable failed", cpu); + return -ETIMEDOUT; + } + } + return 0; +} + +static int exynos5_get_pmu_base_addr(u64 *power_base_addr) { + u64 size; + struct dt_device_node *node; + int rc; + static const struct dt_device_match exynos_dt_pmu_matches[] __initconst = + { + DT_MATCH_COMPATIBLE("samsung,exynos5250-pmu"), + DT_MATCH_COMPATIBLE("samsung,exynos5410-pmu"), + DT_MATCH_COMPATIBLE("samsung,exynos5420-pmu"), + { /*sentinel*/ }, + }; + + node = dt_find_matching_node(NULL, exynos_dt_pmu_matches); + if ( !node ) + { + dprintk(XENLOG_ERR, "samsung,exynos5XXX-pmu missing in DT\n"); + return -ENXIO; + } + + rc = dt_device_get_address(node, 0, power_base_addr, &size); + if ( rc ) + { + dprintk(XENLOG_ERR, "Error in \"samsung,exynos5XXX-pmu\"\n"); + return -ENXIO; + } + + dprintk(XENLOG_DEBUG, "power_base_addr: %016llx size: %016llx\n", + *power_base_addr, size); + + return 0; +} + +static int exynos5_cpu_up(int cpu) +{ + u64 power_base_addr; + void __iomem *power; + int rc; + + rc = exynos5_get_pmu_base_addr(&power_base_addr); + if ( rc ) + return rc; + + power = ioremap_nocache(power_base_addr + + EXYNOS_ARM_CORE0_CONFIG, PAGE_SIZE); + if ( !power ) + { + dprintk(XENLOG_ERR, "Unable to map power MMIO\n"); + return -EFAULT; + } + + rc = exynos5_cpu_power_up(power, cpu); + if ( rc ) + { + iounmap(power); + return -ETIMEDOUT; + } + + iounmap(power); + + return cpu_up_send_sgi(cpu); +} + static void exynos5_reset(void) { + u64 power_base_addr; void __iomem *pmu; + int rc; BUILD_BUG_ON(EXYNOS5_SWRESET >= PAGE_SIZE); - pmu = ioremap_nocache(EXYNOS5_PA_PMU, PAGE_SIZE); + rc = exynos5_get_pmu_base_addr(&power_base_addr); + if ( rc ) + return; + + pmu = ioremap_nocache(power_base_addr, PAGE_SIZE); if ( !pmu ) { dprintk(XENLOG_ERR, "Unable to map PMU\n"); @@ -98,15 +253,10 @@ static void exynos5_reset(void) } writel(1, pmu + EXYNOS5_SWRESET); + iounmap(pmu); } -static const char * const exynos5_dt_compat[] __initconst = -{ - "samsung,exynos5250", - NULL -}; - static const struct dt_device_match exynos5_blacklist_dev[] __initconst = { /* Multi core Timer @@ -117,12 +267,33 @@ static const struct dt_device_match exynos5_blacklist_dev[] __initconst = { /* sentinel */ }, }; +static const char * const exynos5250_dt_compat[] __initconst = +{ + "samsung,exynos5250", + NULL +}; + +static const char * const exynos5_dt_compat[] __initconst = +{ + "samsung,exynos5410", + NULL +}; + +PLATFORM_START(exynos5250, "SAMSUNG EXYNOS5250") + .compatible = exynos5250_dt_compat, + .init_time = exynos5_init_time, + .specific_mapping = exynos5250_specific_mapping, + .smp_init = exynos5_smp_init, + .cpu_up = cpu_up_send_sgi, + .reset = exynos5_reset, + .blacklist_dev = exynos5_blacklist_dev, +PLATFORM_END + PLATFORM_START(exynos5, "SAMSUNG EXYNOS5") .compatible = exynos5_dt_compat, .init_time = exynos5_init_time, - .specific_mapping = exynos5_specific_mapping, .smp_init = exynos5_smp_init, - .cpu_up = cpu_up_send_sgi, + .cpu_up = exynos5_cpu_up, .reset = exynos5_reset, .blacklist_dev = exynos5_blacklist_dev, PLATFORM_END diff --git a/xen/include/asm-arm/platforms/exynos5.h b/xen/include/asm-arm/platforms/exynos5.h index ea941e7..c88455a 100644 --- a/xen/include/asm-arm/platforms/exynos5.h +++ b/xen/include/asm-arm/platforms/exynos5.h @@ -1,7 +1,6 @@ #ifndef __ASM_ARM_PLATFORMS_EXYNOS5_H #define __ASM_ARM_PLATFORMS_EXYNOS5_H -#define EXYNOS5_MCT_BASE 0x101c0000 #define EXYNOS5_MCT_G_TCON 0x240 /* Relative to MCT_BASE */ #define EXYNOS5_MCT_G_TCON_START (1 << 8) @@ -12,8 +11,6 @@ #define EXYNOS5_SWRESET 0x0400 /* Relative to PA_PMU */ -#define S5P_PA_SYSRAM 0x02020000 - #endif /* __ASM_ARM_PLATFORMS_EXYNOS5_H */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25: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 1XSFcX-00042q-FZ; Fri, 12 Sep 2014 01:25:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcV-00042Y-J7 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:51 +0000 Received: from [193.109.254.147:9323] by server-8.bemta-14.messagelabs.com id C4/60-01875-E9B42145; Fri, 12 Sep 2014 01:25:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1410485149!14940107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30358 invoked from network); 12 Sep 2014 01:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcT-0000Fw-51 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcT-0000Pm-3O for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:49 +0000 Date: Fri, 12 Sep 2014 01:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] linux_gntshr_munmap: munmap takes a length, not a page count X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f6b3ca54de7603d5042c2ba73c07fb23f135f8e Author: David Scott AuthorDate: Wed Sep 3 18:34:21 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 10 15:06:50 2014 +0100 linux_gntshr_munmap: munmap takes a length, not a page count This fixes a bug where if a client shares more than 1 page, the munmap call fails to clean up everything. A process which does a lot of sharing and unsharing can run out of resources. This patch also fixes in-tree callers of - xc_gntshr_munmap - xc_gnttab_munmap to supply page counts rather than lengths. Signed-off-by: David Scott Acked-by: Ian Campbell --- tools/libvchan/init.c | 8 ++++---- tools/libvchan/io.c | 4 ++-- tools/libxc/xc_linux_osdep.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index c080a1c..de10817 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -129,9 +129,9 @@ out: return ring_ref; out_unmap_left: if (pages_left) - xc_gntshr_munmap(ctrl->gntshr, ctrl->read.buffer, pages_left * PAGE_SIZE); + xc_gntshr_munmap(ctrl->gntshr, ctrl->read.buffer, pages_left); out_ring: - xc_gntshr_munmap(ctrl->gntshr, ring, PAGE_SIZE); + xc_gntshr_munmap(ctrl->gntshr, ring, 1); ring_ref = -1; ctrl->ring = NULL; ctrl->write.order = ctrl->read.order = 0; @@ -204,9 +204,9 @@ static int init_gnt_cli(struct libxenvchan *ctrl, int domain, uint32_t ring_ref) out_unmap_left: if (ctrl->write.order >= PAGE_SHIFT) xc_gnttab_munmap(ctrl->gnttab, ctrl->write.buffer, - 1 << ctrl->write.order); + 1 << (ctrl->write.order - PAGE_SHIFT)); out_unmap_ring: - xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, PAGE_SIZE); + xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, 1); ctrl->ring = 0; ctrl->write.order = ctrl->read.order = 0; rv = -1; diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 6e6e239..e66bc4e 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -365,10 +365,10 @@ void libxenvchan_close(struct libxenvchan *ctrl) if (ctrl->ring) { if (ctrl->is_server) { ctrl->ring->srv_live = 0; - xc_gntshr_munmap(ctrl->gntshr, ctrl->ring, PAGE_SIZE); + xc_gntshr_munmap(ctrl->gntshr, ctrl->ring, 1); } else { ctrl->ring->cli_live = 0; - xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, PAGE_SIZE); + xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, 1); } } if (ctrl->event) { diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 86bff3e..a19e4b6 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -847,7 +847,7 @@ static void *linux_gntshr_share_pages(xc_gntshr *xch, xc_osdep_handle h, static int linux_gntshr_munmap(xc_gntshr *xcg, xc_osdep_handle h, void *start_address, uint32_t count) { - return munmap(start_address, count); + return munmap(start_address, count * XC_PAGE_SIZE); } static struct xc_osdep_ops linux_gntshr_ops = { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:25:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:25: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 1XSFcX-00042q-FZ; Fri, 12 Sep 2014 01:25:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcV-00042Y-J7 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:51 +0000 Received: from [193.109.254.147:9323] by server-8.bemta-14.messagelabs.com id C4/60-01875-E9B42145; Fri, 12 Sep 2014 01:25:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1410485149!14940107!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30358 invoked from network); 12 Sep 2014 01:25:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:25:50 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcT-0000Fw-51 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcT-0000Pm-3O for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:49 +0000 Date: Fri, 12 Sep 2014 01:25:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] linux_gntshr_munmap: munmap takes a length, not a page count X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7f6b3ca54de7603d5042c2ba73c07fb23f135f8e Author: David Scott AuthorDate: Wed Sep 3 18:34:21 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 10 15:06:50 2014 +0100 linux_gntshr_munmap: munmap takes a length, not a page count This fixes a bug where if a client shares more than 1 page, the munmap call fails to clean up everything. A process which does a lot of sharing and unsharing can run out of resources. This patch also fixes in-tree callers of - xc_gntshr_munmap - xc_gnttab_munmap to supply page counts rather than lengths. Signed-off-by: David Scott Acked-by: Ian Campbell --- tools/libvchan/init.c | 8 ++++---- tools/libvchan/io.c | 4 ++-- tools/libxc/xc_linux_osdep.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index c080a1c..de10817 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -129,9 +129,9 @@ out: return ring_ref; out_unmap_left: if (pages_left) - xc_gntshr_munmap(ctrl->gntshr, ctrl->read.buffer, pages_left * PAGE_SIZE); + xc_gntshr_munmap(ctrl->gntshr, ctrl->read.buffer, pages_left); out_ring: - xc_gntshr_munmap(ctrl->gntshr, ring, PAGE_SIZE); + xc_gntshr_munmap(ctrl->gntshr, ring, 1); ring_ref = -1; ctrl->ring = NULL; ctrl->write.order = ctrl->read.order = 0; @@ -204,9 +204,9 @@ static int init_gnt_cli(struct libxenvchan *ctrl, int domain, uint32_t ring_ref) out_unmap_left: if (ctrl->write.order >= PAGE_SHIFT) xc_gnttab_munmap(ctrl->gnttab, ctrl->write.buffer, - 1 << ctrl->write.order); + 1 << (ctrl->write.order - PAGE_SHIFT)); out_unmap_ring: - xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, PAGE_SIZE); + xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, 1); ctrl->ring = 0; ctrl->write.order = ctrl->read.order = 0; rv = -1; diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 6e6e239..e66bc4e 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -365,10 +365,10 @@ void libxenvchan_close(struct libxenvchan *ctrl) if (ctrl->ring) { if (ctrl->is_server) { ctrl->ring->srv_live = 0; - xc_gntshr_munmap(ctrl->gntshr, ctrl->ring, PAGE_SIZE); + xc_gntshr_munmap(ctrl->gntshr, ctrl->ring, 1); } else { ctrl->ring->cli_live = 0; - xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, PAGE_SIZE); + xc_gnttab_munmap(ctrl->gnttab, ctrl->ring, 1); } } if (ctrl->event) { diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 86bff3e..a19e4b6 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -847,7 +847,7 @@ static void *linux_gntshr_share_pages(xc_gntshr *xch, xc_osdep_handle h, static int linux_gntshr_munmap(xc_gntshr *xcg, xc_osdep_handle h, void *start_address, uint32_t count) { - return munmap(start_address, count); + return munmap(start_address, count * XC_PAGE_SIZE); } static struct xc_osdep_ops linux_gntshr_ops = { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:26:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:26:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcg-00044b-Kg; Fri, 12 Sep 2014 01:26:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcf-00044Q-Mc for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:01 +0000 Received: from [85.158.139.211:30064] by server-16.bemta-5.messagelabs.com id 9E/F1-01029-9AB42145; Fri, 12 Sep 2014 01:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1410485159!13999560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17438 invoked from network); 12 Sep 2014 01:26:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcd-0000G5-9P for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcd-0000QB-7d for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:59 +0000 Date: Fri, 12 Sep 2014 01:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xc_cpuid_x86.c: Simplify masking conditions and remove redundant work X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f2620c82ddb262d0c2da649a820a31f6dc6e3e25 Author: Zhuo Song AuthorDate: Wed Sep 10 18:29:00 2014 +0800 Commit: Ian Campbell CommitDate: Wed Sep 10 15:07:02 2014 +0100 xc_cpuid_x86.c: Simplify masking conditions and remove redundant work * Since there would not be 32-bit hypervisor, we do not need hypervisor_is_64bit() again. * Remove xen_64bit from xc_cpuid_pv_policy(). * Move conditionals for LM/NX masking into architectural logic. * Since RDTSCP could be used for both 64-bit and 32-bit architectures, we do not need the tying to 64-bit in intel_xc_cpuid_policy(). * vmx_cpuid_intercept() has covered SYSCALL masking when vmexit and original is_64bit or is_pae could not cover whether guest OS is really in long mode or not. Here to drop the conditionals and leave it to vmexit handler to do the real work. Signed-off-by: Zhuo Song Reviewed-by: Jan Beulich [ ijc -- inserted missing ) to fix compile error ] --- tools/libxc/xc_cpuid_x86.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 6b81641..a18b1ff 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -34,13 +34,6 @@ #define DEF_MAX_INTELEXT 0x80000008u #define DEF_MAX_AMDEXT 0x8000001cu -static int hypervisor_is_64bit(xc_interface *xch) -{ - xen_capabilities_info_t xen_caps = ""; - return ((xc_version(xch, XENVER_capabilities, &xen_caps) == 0) && - (strstr(xen_caps, "x86_64") != NULL)); -} - static void cpuid(const unsigned int *input, unsigned int *regs) { unsigned int count = (input[1] == XEN_CPUID_INPUT_UNUSED) ? 0 : input[1]; @@ -95,13 +88,11 @@ static void amd_xc_cpuid_policy( break; case 0x80000001: { - int is_64bit = hypervisor_is_64bit(xch) && is_pae; - if ( !is_pae ) clear_bit(X86_FEATURE_PAE, regs[3]); /* Filter all other features according to a whitelist. */ - regs[2] &= ((is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0) | + regs[2] &= (bitmaskof(X86_FEATURE_LAHF_LM) | bitmaskof(X86_FEATURE_CMP_LEGACY) | (is_nestedhvm ? bitmaskof(X86_FEATURE_SVM) : 0) | bitmaskof(X86_FEATURE_CR8_LEGACY) | @@ -116,8 +107,8 @@ static void amd_xc_cpuid_policy( bitmaskof(X86_FEATURE_TBM) | bitmaskof(X86_FEATURE_DBEXT)); regs[3] &= (0x0183f3ff | /* features shared with 0x00000001:EDX */ - (is_pae ? bitmaskof(X86_FEATURE_NX) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_LM) : 0) | + bitmaskof(X86_FEATURE_NX) | + bitmaskof(X86_FEATURE_LM) | bitmaskof(X86_FEATURE_SYSCALL) | bitmaskof(X86_FEATURE_MP) | bitmaskof(X86_FEATURE_MMXEXT) | @@ -195,16 +186,14 @@ static void intel_xc_cpuid_policy( break; case 0x80000001: { - int is_64bit = hypervisor_is_64bit(xch) && is_pae; - /* Only a few features are advertised in Intel's 0x80000001. */ - regs[2] &= (is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0) | - bitmaskof(X86_FEATURE_3DNOWPREFETCH) | - bitmaskof(X86_FEATURE_ABM); - regs[3] &= ((is_pae ? bitmaskof(X86_FEATURE_NX) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_LM) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_SYSCALL) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_RDTSCP) : 0)); + regs[2] &= (bitmaskof(X86_FEATURE_LAHF_LM) | + bitmaskof(X86_FEATURE_3DNOWPREFETCH) | + bitmaskof(X86_FEATURE_ABM)); + regs[3] &= (bitmaskof(X86_FEATURE_NX) | + bitmaskof(X86_FEATURE_LM) | + bitmaskof(X86_FEATURE_SYSCALL) | + bitmaskof(X86_FEATURE_RDTSCP)); break; } @@ -391,7 +380,10 @@ static void xc_cpuid_hvm_policy( break; case 0x80000001: - if ( !is_pae ) { + if ( !is_pae ) + { + clear_bit(X86_FEATURE_LAHF_LM, regs[2]); + clear_bit(X86_FEATURE_LM, regs[3]); clear_bit(X86_FEATURE_NX, regs[3]); clear_bit(X86_FEATURE_PSE36, regs[3]); } @@ -442,7 +434,7 @@ static void xc_cpuid_pv_policy( { DECLARE_DOMCTL; unsigned int guest_width; - int guest_64bit, xen_64bit = hypervisor_is_64bit(xch); + int guest_64bit; char brand[13]; uint64_t xfeature_mask; @@ -474,7 +466,7 @@ static void xc_cpuid_pv_policy( switch ( input[0] ) { case 0x00000001: - if ( !xen_64bit || strstr(brand, "AMD") ) + if ( strstr(brand, "AMD") ) clear_bit(X86_FEATURE_SEP, regs[3]); clear_bit(X86_FEATURE_DS, regs[3]); clear_bit(X86_FEATURE_ACC, regs[3]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:26:02 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:26:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcg-00044b-Kg; Fri, 12 Sep 2014 01:26:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcf-00044Q-Mc for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:01 +0000 Received: from [85.158.139.211:30064] by server-16.bemta-5.messagelabs.com id 9E/F1-01029-9AB42145; Fri, 12 Sep 2014 01:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1410485159!13999560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17438 invoked from network); 12 Sep 2014 01:26:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:26:00 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcd-0000G5-9P for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcd-0000QB-7d for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:25:59 +0000 Date: Fri, 12 Sep 2014 01:25:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xc_cpuid_x86.c: Simplify masking conditions and remove redundant work X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f2620c82ddb262d0c2da649a820a31f6dc6e3e25 Author: Zhuo Song AuthorDate: Wed Sep 10 18:29:00 2014 +0800 Commit: Ian Campbell CommitDate: Wed Sep 10 15:07:02 2014 +0100 xc_cpuid_x86.c: Simplify masking conditions and remove redundant work * Since there would not be 32-bit hypervisor, we do not need hypervisor_is_64bit() again. * Remove xen_64bit from xc_cpuid_pv_policy(). * Move conditionals for LM/NX masking into architectural logic. * Since RDTSCP could be used for both 64-bit and 32-bit architectures, we do not need the tying to 64-bit in intel_xc_cpuid_policy(). * vmx_cpuid_intercept() has covered SYSCALL masking when vmexit and original is_64bit or is_pae could not cover whether guest OS is really in long mode or not. Here to drop the conditionals and leave it to vmexit handler to do the real work. Signed-off-by: Zhuo Song Reviewed-by: Jan Beulich [ ijc -- inserted missing ) to fix compile error ] --- tools/libxc/xc_cpuid_x86.c | 40 ++++++++++++++++------------------------ 1 files changed, 16 insertions(+), 24 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 6b81641..a18b1ff 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -34,13 +34,6 @@ #define DEF_MAX_INTELEXT 0x80000008u #define DEF_MAX_AMDEXT 0x8000001cu -static int hypervisor_is_64bit(xc_interface *xch) -{ - xen_capabilities_info_t xen_caps = ""; - return ((xc_version(xch, XENVER_capabilities, &xen_caps) == 0) && - (strstr(xen_caps, "x86_64") != NULL)); -} - static void cpuid(const unsigned int *input, unsigned int *regs) { unsigned int count = (input[1] == XEN_CPUID_INPUT_UNUSED) ? 0 : input[1]; @@ -95,13 +88,11 @@ static void amd_xc_cpuid_policy( break; case 0x80000001: { - int is_64bit = hypervisor_is_64bit(xch) && is_pae; - if ( !is_pae ) clear_bit(X86_FEATURE_PAE, regs[3]); /* Filter all other features according to a whitelist. */ - regs[2] &= ((is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0) | + regs[2] &= (bitmaskof(X86_FEATURE_LAHF_LM) | bitmaskof(X86_FEATURE_CMP_LEGACY) | (is_nestedhvm ? bitmaskof(X86_FEATURE_SVM) : 0) | bitmaskof(X86_FEATURE_CR8_LEGACY) | @@ -116,8 +107,8 @@ static void amd_xc_cpuid_policy( bitmaskof(X86_FEATURE_TBM) | bitmaskof(X86_FEATURE_DBEXT)); regs[3] &= (0x0183f3ff | /* features shared with 0x00000001:EDX */ - (is_pae ? bitmaskof(X86_FEATURE_NX) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_LM) : 0) | + bitmaskof(X86_FEATURE_NX) | + bitmaskof(X86_FEATURE_LM) | bitmaskof(X86_FEATURE_SYSCALL) | bitmaskof(X86_FEATURE_MP) | bitmaskof(X86_FEATURE_MMXEXT) | @@ -195,16 +186,14 @@ static void intel_xc_cpuid_policy( break; case 0x80000001: { - int is_64bit = hypervisor_is_64bit(xch) && is_pae; - /* Only a few features are advertised in Intel's 0x80000001. */ - regs[2] &= (is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0) | - bitmaskof(X86_FEATURE_3DNOWPREFETCH) | - bitmaskof(X86_FEATURE_ABM); - regs[3] &= ((is_pae ? bitmaskof(X86_FEATURE_NX) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_LM) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_SYSCALL) : 0) | - (is_64bit ? bitmaskof(X86_FEATURE_RDTSCP) : 0)); + regs[2] &= (bitmaskof(X86_FEATURE_LAHF_LM) | + bitmaskof(X86_FEATURE_3DNOWPREFETCH) | + bitmaskof(X86_FEATURE_ABM)); + regs[3] &= (bitmaskof(X86_FEATURE_NX) | + bitmaskof(X86_FEATURE_LM) | + bitmaskof(X86_FEATURE_SYSCALL) | + bitmaskof(X86_FEATURE_RDTSCP)); break; } @@ -391,7 +380,10 @@ static void xc_cpuid_hvm_policy( break; case 0x80000001: - if ( !is_pae ) { + if ( !is_pae ) + { + clear_bit(X86_FEATURE_LAHF_LM, regs[2]); + clear_bit(X86_FEATURE_LM, regs[3]); clear_bit(X86_FEATURE_NX, regs[3]); clear_bit(X86_FEATURE_PSE36, regs[3]); } @@ -442,7 +434,7 @@ static void xc_cpuid_pv_policy( { DECLARE_DOMCTL; unsigned int guest_width; - int guest_64bit, xen_64bit = hypervisor_is_64bit(xch); + int guest_64bit; char brand[13]; uint64_t xfeature_mask; @@ -474,7 +466,7 @@ static void xc_cpuid_pv_policy( switch ( input[0] ) { case 0x00000001: - if ( !xen_64bit || strstr(brand, "AMD") ) + if ( strstr(brand, "AMD") ) clear_bit(X86_FEATURE_SEP, regs[3]); clear_bit(X86_FEATURE_DS, regs[3]); clear_bit(X86_FEATURE_ACC, regs[3]); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:26:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:26: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 1XSFcq-00046G-Nb; Fri, 12 Sep 2014 01:26:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcp-000460-Lx for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:11 +0000 Received: from [85.158.143.35:4312] by server-1.bemta-4.messagelabs.com id 20/92-05872-3BB42145; Fri, 12 Sep 2014 01:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1410485169!13309497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27008 invoked from network); 12 Sep 2014 01:26:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcn-0000Ge-EE for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcn-0000Qj-DE for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:09 +0000 Date: Fri, 12 Sep 2014 01:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add missing dependency for xen-init-dom0 in Makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc6940baf2adb146a792193add484c6ec39105ca Author: Wei Liu AuthorDate: Wed Sep 10 16:43:16 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 10 16:55:28 2014 +0100 libxl: add missing dependency for xen-init-dom0 in Makefile Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 4bee4af..990414b 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -185,7 +185,7 @@ libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ - $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h + $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS) $(XEN_INIT_DOM0_OBJS): libxl.h $(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 01:26:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 01:26: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 1XSFcq-00046G-Nb; Fri, 12 Sep 2014 01:26:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcp-000460-Lx for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:11 +0000 Received: from [85.158.143.35:4312] by server-1.bemta-4.messagelabs.com id 20/92-05872-3BB42145; Fri, 12 Sep 2014 01:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1410485169!13309497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27008 invoked from network); 12 Sep 2014 01:26:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 01:26:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSFcn-0000Ge-EE for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSFcn-0000Qj-DE for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 01:26:09 +0000 Date: Fri, 12 Sep 2014 01:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add missing dependency for xen-init-dom0 in Makefile X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc6940baf2adb146a792193add484c6ec39105ca Author: Wei Liu AuthorDate: Wed Sep 10 16:43:16 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 10 16:55:28 2014 +0100 libxl: add missing dependency for xen-init-dom0 in Makefile Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 4bee4af..990414b 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -185,7 +185,7 @@ libxl_internal_json.h: _libxl_types_internal_json.h xl.h: _paths.h $(LIBXL_OBJS) $(LIBXL_TEST_OBJS) $(LIBXLU_OBJS) \ - $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS): libxl.h + $(XL_OBJS) $(TEST_PROG_OBJS) $(SAVE_HELPER_OBJS) $(XEN_INIT_DOM0_OBJS): libxl.h $(LIBXL_OBJS) $(LIBXL_TEST_OBJS): libxl_internal.h _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_type%.idl gentypes.py idl.py -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 20:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 20:00: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 1XSX14-00034Z-TZ; Fri, 12 Sep 2014 20:00:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX13-00034U-Pl for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:22 +0000 Received: from [85.158.137.68:26853] by server-3.bemta-3.messagelabs.com id D8/F2-22751-5D053145; Fri, 12 Sep 2014 20:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1410552019!14253404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14479 invoked from network); 12 Sep 2014 20:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 20:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX10-0005Hr-Tj for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSX10-0001ke-Ih for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:18 +0000 Date: Fri, 12 Sep 2014 20:00:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] evtchn: check control block exists when using FIFO-based events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be84c34e642f06107be8096b7e90dd0c86f13164 Author: David Vrabel AuthorDate: Tue Sep 9 15:31:37 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 15:31:37 2014 +0200 evtchn: check control block exists when using FIFO-based events When using the FIFO-based event channels, there are no checks for the existance of a control block when binding an event or moving it to a different VCPU. This is because events may be bound when the ABI is in 2-level mode (e.g., by the toolstack before the domain is started). The guest may trigger a Xen crash in evtchn_fifo_set_pending() if: a) the event is bound to a VCPU without a control block; or b) VCPU 0 does not have a control block. In case (a), Xen will crash when looking up the current queue. In (b), Xen will crash when looking up the old queue (which defaults to a queue on VCPU 0). By allocating all the per-VCPU structures when enabling the FIFO ABI, we can be sure that v->evtchn_fifo is always valid. EVTCHNOP_init_control_block for all the other CPUs need only map the shared control block. A single check in evtchn_fifo_set_pending() before accessing the control block fixes all cases where the guest has not initialized some control blocks. This is XSA-107. Reported-by: Vitaly Kuznetsov Signed-off-by: David Vrabel Reviewed-by: Jan Beulich master commit: a4e0cea6fced50e251453dfe52e1b9dde77a84f5 master date: 2014-09-09 15:25:58 +0200 --- xen/common/event_fifo.c | 82 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 58 insertions(+), 24 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 1fce3f1..e9c1fbe 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -178,6 +178,19 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) bool_t linked = 0; /* + * Control block not mapped. The guest must not unmask an + * event until the control block is initialized, so we can + * just drop the event. + */ + if ( unlikely(!v->evtchn_fifo->control_block) ) + { + printk(XENLOG_G_WARNING + "d%dv%d has no FIFO event channel control block\n", + d->domain_id, v->vcpu_id); + goto done; + } + + /* * No locking around getting the queue. This may race with * changing the priority but we are allowed to signal the * event once on the old priority. @@ -385,36 +398,42 @@ static void init_queue(struct vcpu *v, struct evtchn_fifo_queue *q, { spin_lock_init(&q->lock); q->priority = i; - q->head = &v->evtchn_fifo->control_block->head[i]; } -static int setup_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +static int setup_control_block(struct vcpu *v) { - struct domain *d = v->domain; struct evtchn_fifo_vcpu *efv; - void *virt; unsigned int i; - int rc; - - if ( v->evtchn_fifo ) - return -EINVAL; efv = xzalloc(struct evtchn_fifo_vcpu); if ( !efv ) return -ENOMEM; - rc = map_guest_page(d, gfn, &virt); + for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) + init_queue(v, &efv->queue[i], i); + + v->evtchn_fifo = efv; + + return 0; +} + +static int map_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +{ + void *virt; + unsigned int i; + int rc; + + if ( v->evtchn_fifo->control_block ) + return -EINVAL; + + rc = map_guest_page(v->domain, gfn, &virt); if ( rc < 0 ) - { - xfree(efv); return rc; - } - v->evtchn_fifo = efv; v->evtchn_fifo->control_block = virt + offset; for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) - init_queue(v, &v->evtchn_fifo->queue[i], i); + v->evtchn_fifo->queue[i].head = &v->evtchn_fifo->control_block->head[i]; return 0; } @@ -508,28 +527,43 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) spin_lock(&d->event_lock); - rc = setup_control_block(v, gfn, offset); - /* * If this is the first control block, setup an empty event array * and switch to the fifo port ops. */ - if ( rc == 0 && !d->evtchn_fifo ) + if ( !d->evtchn_fifo ) { + struct vcpu *vcb; + + for_each_vcpu ( d, vcb ) { + rc = setup_control_block(vcb); + if ( rc < 0 ) + goto error; + } + rc = setup_event_array(d); if ( rc < 0 ) - cleanup_control_block(v); - else - { - d->evtchn_port_ops = &evtchn_port_ops_fifo; - d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; - setup_ports(d); - } + goto error; + + rc = map_control_block(v, gfn, offset); + if ( rc < 0 ) + goto error; + + d->evtchn_port_ops = &evtchn_port_ops_fifo; + d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; + setup_ports(d); } + else + rc = map_control_block(v, gfn, offset); spin_unlock(&d->event_lock); return rc; + + error: + evtchn_fifo_destroy(d); + spin_unlock(&d->event_lock); + return rc; } static int add_page_to_event_array(struct domain *d, unsigned long gfn) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 20:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 20:00: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 1XSX0z-00034M-N1; Fri, 12 Sep 2014 20:00:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX0y-00034H-9v for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:16 +0000 Received: from [85.158.143.35:63872] by server-1.bemta-4.messagelabs.com id 90/5F-05872-FC053145; Fri, 12 Sep 2014 20:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1410552013!13488911!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1756 invoked from network); 12 Sep 2014 20:00:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 20:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX0q-0005Ho-C1 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSX0k-0001jb-Uo for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:03 +0000 Date: Fri, 12 Sep 2014 20:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.2-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 522c9dd4d1928e3ccd5757fc8cfc3b23e53dd73f Author: Jan Beulich AuthorDate: Tue Sep 9 15:30:54 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 15:30:54 2014 +0200 update Xen version to 4.4.2-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 134a8bd..301d8a1 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 20:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 20:00: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 1XSX0z-00034M-N1; Fri, 12 Sep 2014 20:00:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX0y-00034H-9v for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:16 +0000 Received: from [85.158.143.35:63872] by server-1.bemta-4.messagelabs.com id 90/5F-05872-FC053145; Fri, 12 Sep 2014 20:00:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1410552013!13488911!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1756 invoked from network); 12 Sep 2014 20:00:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 20:00:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX0q-0005Ho-C1 for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSX0k-0001jb-Uo for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:03 +0000 Date: Fri, 12 Sep 2014 20:00:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] update Xen version to 4.4.2-pre X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 522c9dd4d1928e3ccd5757fc8cfc3b23e53dd73f Author: Jan Beulich AuthorDate: Tue Sep 9 15:30:54 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 15:30:54 2014 +0200 update Xen version to 4.4.2-pre --- xen/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 134a8bd..301d8a1 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 4 -export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .2-pre$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 12 20:00:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Sep 2014 20:00: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 1XSX14-00034Z-TZ; Fri, 12 Sep 2014 20:00:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX13-00034U-Pl for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:22 +0000 Received: from [85.158.137.68:26853] by server-3.bemta-3.messagelabs.com id D8/F2-22751-5D053145; Fri, 12 Sep 2014 20:00:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1410552019!14253404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14479 invoked from network); 12 Sep 2014 20:00:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Sep 2014 20:00:20 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSX10-0005Hr-Tj for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSX10-0001ke-Ih for xen-changelog@lists.xensource.com; Fri, 12 Sep 2014 20:00:18 +0000 Date: Fri, 12 Sep 2014 20:00:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] evtchn: check control block exists when using FIFO-based events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit be84c34e642f06107be8096b7e90dd0c86f13164 Author: David Vrabel AuthorDate: Tue Sep 9 15:31:37 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 9 15:31:37 2014 +0200 evtchn: check control block exists when using FIFO-based events When using the FIFO-based event channels, there are no checks for the existance of a control block when binding an event or moving it to a different VCPU. This is because events may be bound when the ABI is in 2-level mode (e.g., by the toolstack before the domain is started). The guest may trigger a Xen crash in evtchn_fifo_set_pending() if: a) the event is bound to a VCPU without a control block; or b) VCPU 0 does not have a control block. In case (a), Xen will crash when looking up the current queue. In (b), Xen will crash when looking up the old queue (which defaults to a queue on VCPU 0). By allocating all the per-VCPU structures when enabling the FIFO ABI, we can be sure that v->evtchn_fifo is always valid. EVTCHNOP_init_control_block for all the other CPUs need only map the shared control block. A single check in evtchn_fifo_set_pending() before accessing the control block fixes all cases where the guest has not initialized some control blocks. This is XSA-107. Reported-by: Vitaly Kuznetsov Signed-off-by: David Vrabel Reviewed-by: Jan Beulich master commit: a4e0cea6fced50e251453dfe52e1b9dde77a84f5 master date: 2014-09-09 15:25:58 +0200 --- xen/common/event_fifo.c | 82 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 58 insertions(+), 24 deletions(-) diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index 1fce3f1..e9c1fbe 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -178,6 +178,19 @@ static void evtchn_fifo_set_pending(struct vcpu *v, struct evtchn *evtchn) bool_t linked = 0; /* + * Control block not mapped. The guest must not unmask an + * event until the control block is initialized, so we can + * just drop the event. + */ + if ( unlikely(!v->evtchn_fifo->control_block) ) + { + printk(XENLOG_G_WARNING + "d%dv%d has no FIFO event channel control block\n", + d->domain_id, v->vcpu_id); + goto done; + } + + /* * No locking around getting the queue. This may race with * changing the priority but we are allowed to signal the * event once on the old priority. @@ -385,36 +398,42 @@ static void init_queue(struct vcpu *v, struct evtchn_fifo_queue *q, { spin_lock_init(&q->lock); q->priority = i; - q->head = &v->evtchn_fifo->control_block->head[i]; } -static int setup_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +static int setup_control_block(struct vcpu *v) { - struct domain *d = v->domain; struct evtchn_fifo_vcpu *efv; - void *virt; unsigned int i; - int rc; - - if ( v->evtchn_fifo ) - return -EINVAL; efv = xzalloc(struct evtchn_fifo_vcpu); if ( !efv ) return -ENOMEM; - rc = map_guest_page(d, gfn, &virt); + for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) + init_queue(v, &efv->queue[i], i); + + v->evtchn_fifo = efv; + + return 0; +} + +static int map_control_block(struct vcpu *v, uint64_t gfn, uint32_t offset) +{ + void *virt; + unsigned int i; + int rc; + + if ( v->evtchn_fifo->control_block ) + return -EINVAL; + + rc = map_guest_page(v->domain, gfn, &virt); if ( rc < 0 ) - { - xfree(efv); return rc; - } - v->evtchn_fifo = efv; v->evtchn_fifo->control_block = virt + offset; for ( i = 0; i <= EVTCHN_FIFO_PRIORITY_MIN; i++ ) - init_queue(v, &v->evtchn_fifo->queue[i], i); + v->evtchn_fifo->queue[i].head = &v->evtchn_fifo->control_block->head[i]; return 0; } @@ -508,28 +527,43 @@ int evtchn_fifo_init_control(struct evtchn_init_control *init_control) spin_lock(&d->event_lock); - rc = setup_control_block(v, gfn, offset); - /* * If this is the first control block, setup an empty event array * and switch to the fifo port ops. */ - if ( rc == 0 && !d->evtchn_fifo ) + if ( !d->evtchn_fifo ) { + struct vcpu *vcb; + + for_each_vcpu ( d, vcb ) { + rc = setup_control_block(vcb); + if ( rc < 0 ) + goto error; + } + rc = setup_event_array(d); if ( rc < 0 ) - cleanup_control_block(v); - else - { - d->evtchn_port_ops = &evtchn_port_ops_fifo; - d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; - setup_ports(d); - } + goto error; + + rc = map_control_block(v, gfn, offset); + if ( rc < 0 ) + goto error; + + d->evtchn_port_ops = &evtchn_port_ops_fifo; + d->max_evtchns = EVTCHN_FIFO_NR_CHANNELS; + setup_ports(d); } + else + rc = map_control_block(v, gfn, offset); spin_unlock(&d->event_lock); return rc; + + error: + evtchn_fifo_destroy(d); + spin_unlock(&d->event_lock); + return rc; } static int add_page_to_event_array(struct domain *d, unsigned long gfn) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPJ-0007jt-HN; Sun, 14 Sep 2014 00:11:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPI-0007jl-D3 for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:08 +0000 Received: from [85.158.143.35:26553] by server-1.bemta-4.messagelabs.com id EA/BC-05872-B1DD4145; Sun, 14 Sep 2014 00:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1410653466!13621952!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 914 invoked from network); 14 Sep 2014 00:11:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPD-0006Pv-CW for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPD-0003fD-6B for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:03 +0000 Date: Sun, 14 Sep 2014 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Fix stray blank line from debug logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f7766cd097b793871c58ffda088d2309ad26804 Author: Andrew Cooper AuthorDate: Wed Sep 10 18:10:39 2014 +0100 Commit: Ian Campbell CommitDate: Thu Sep 11 11:32:30 2014 +0100 tools/libxl: Fix stray blank line from debug logging LOG() automatically adds a newline. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index b36c719..a5e185e 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -883,7 +883,7 @@ static void initiate_domain_create(libxl__egc *egc, } if (restore_fd >= 0) { - LOG(DEBUG, "restoring, not running bootloader\n"); + LOG(DEBUG, "restoring, not running bootloader"); domcreate_bootloader_done(egc, &dcs->bl, 0); } else { LOG(DEBUG, "running bootloader"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPJ-0007jt-HN; Sun, 14 Sep 2014 00:11:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPI-0007jl-D3 for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:08 +0000 Received: from [85.158.143.35:26553] by server-1.bemta-4.messagelabs.com id EA/BC-05872-B1DD4145; Sun, 14 Sep 2014 00:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1410653466!13621952!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 914 invoked from network); 14 Sep 2014 00:11:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPD-0006Pv-CW for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPD-0003fD-6B for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:03 +0000 Date: Sun, 14 Sep 2014 00:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxl: Fix stray blank line from debug logging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5f7766cd097b793871c58ffda088d2309ad26804 Author: Andrew Cooper AuthorDate: Wed Sep 10 18:10:39 2014 +0100 Commit: Ian Campbell CommitDate: Thu Sep 11 11:32:30 2014 +0100 tools/libxl: Fix stray blank line from debug logging LOG() automatically adds a newline. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index b36c719..a5e185e 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -883,7 +883,7 @@ static void initiate_domain_create(libxl__egc *egc, } if (restore_fd >= 0) { - LOG(DEBUG, "restoring, not running bootloader\n"); + LOG(DEBUG, "restoring, not running bootloader"); domcreate_bootloader_done(egc, &dcs->bl, 0); } else { LOG(DEBUG, "running bootloader"); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11: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 1XSxPT-0007kP-Ks; Sun, 14 Sep 2014 00:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPS-0007kE-HH for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:18 +0000 Received: from [85.158.143.35:26805] by server-1.bemta-4.messagelabs.com id F7/CC-05872-52DD4145; Sun, 14 Sep 2014 00:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1410653476!13584009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22584 invoked from network); 14 Sep 2014 00:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPQ-0006Py-6S for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPP-0003gK-NE for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:15 +0000 Date: Sun, 14 Sep 2014 00:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/[lib]xl: Correct use of init/dispose for libxl_domain_restore_params X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 220c8fe6ff09e28b9e5f3c9847749f3c3f0e96d6 Author: Andrew Cooper AuthorDate: Wed Sep 10 18:10:40 2014 +0100 Commit: Ian Campbell CommitDate: Thu Sep 11 11:32:30 2014 +0100 tools/[lib]xl: Correct use of init/dispose for libxl_domain_restore_params Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.h | 9 +++++++-- tools/libxl/xl_cmdimpl.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index dab3a67..5136d02 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -847,10 +847,15 @@ int static inline libxl_domain_create_restore_0x040200( LIBXL_EXTERNAL_CALLERS_ONLY { libxl_domain_restore_params params; - params.checkpointed_stream = 0; + int ret; - return libxl_domain_create_restore( + libxl_domain_restore_params_init(¶ms); + + ret = libxl_domain_create_restore( ctx, d_config, domid, restore_fd, ¶ms, ao_how, aop_console_how); + + libxl_domain_restore_params_dispose(¶ms); + return ret; } #define libxl_domain_create_restore libxl_domain_create_restore_0x040200 diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8a38077..26492fc 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2246,11 +2246,17 @@ start: if ( restoring ) { libxl_domain_restore_params params; + + libxl_domain_restore_params_init(¶ms); + params.checkpointed_stream = dom_info->checkpointed_stream; ret = libxl_domain_create_restore(ctx, &d_config, &domid, restore_fd, ¶ms, 0, autoconnect_console_how); + + libxl_domain_restore_params_dispose(¶ms); + /* * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11: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 1XSxPT-0007kP-Ks; Sun, 14 Sep 2014 00:11:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPS-0007kE-HH for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:18 +0000 Received: from [85.158.143.35:26805] by server-1.bemta-4.messagelabs.com id F7/CC-05872-52DD4145; Sun, 14 Sep 2014 00:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1410653476!13584009!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22584 invoked from network); 14 Sep 2014 00:11:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPQ-0006Py-6S for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPP-0003gK-NE for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:15 +0000 Date: Sun, 14 Sep 2014 00:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/[lib]xl: Correct use of init/dispose for libxl_domain_restore_params X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 220c8fe6ff09e28b9e5f3c9847749f3c3f0e96d6 Author: Andrew Cooper AuthorDate: Wed Sep 10 18:10:40 2014 +0100 Commit: Ian Campbell CommitDate: Thu Sep 11 11:32:30 2014 +0100 tools/[lib]xl: Correct use of init/dispose for libxl_domain_restore_params Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.h | 9 +++++++-- tools/libxl/xl_cmdimpl.c | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index dab3a67..5136d02 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -847,10 +847,15 @@ int static inline libxl_domain_create_restore_0x040200( LIBXL_EXTERNAL_CALLERS_ONLY { libxl_domain_restore_params params; - params.checkpointed_stream = 0; + int ret; - return libxl_domain_create_restore( + libxl_domain_restore_params_init(¶ms); + + ret = libxl_domain_create_restore( ctx, d_config, domid, restore_fd, ¶ms, ao_how, aop_console_how); + + libxl_domain_restore_params_dispose(¶ms); + return ret; } #define libxl_domain_create_restore libxl_domain_create_restore_0x040200 diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 8a38077..26492fc 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2246,11 +2246,17 @@ start: if ( restoring ) { libxl_domain_restore_params params; + + libxl_domain_restore_params_init(¶ms); + params.checkpointed_stream = dom_info->checkpointed_stream; ret = libxl_domain_create_restore(ctx, &d_config, &domid, restore_fd, ¶ms, 0, autoconnect_console_how); + + libxl_domain_restore_params_dispose(¶ms); + /* * On subsequent reboot etc we should create the domain, not * restore/migrate-receive it again. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPe-0007lu-Ng; Sun, 14 Sep 2014 00:11:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPd-0007ll-B3 for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:29 +0000 Received: from [193.109.254.147:2653] by server-6.bemta-14.messagelabs.com id 04/5A-01867-03DD4145; Sun, 14 Sep 2014 00:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1410653486!15276832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16042 invoked from network); 14 Sep 2014 00:11:27 -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; 14 Sep 2014 00:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPa-0006Q7-BB for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPa-0003gg-8q for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:26 +0000 Date: Sun, 14 Sep 2014 00:11:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/bitops: Add or() to the available bitmap operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89f5ca3b5f16a1418b1ae4b2e36a6453a1dce309 Author: Andrew Cooper AuthorDate: Wed Sep 10 18:10:42 2014 +0100 Commit: Ian Campbell CommitDate: Thu Sep 11 11:58:02 2014 +0100 libxc/bitops: Add or() to the available bitmap operations Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_bitops.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_bitops.h b/tools/libxc/xc_bitops.h index d8e0c16..dfce3b8 100644 --- a/tools/libxc/xc_bitops.h +++ b/tools/libxc/xc_bitops.h @@ -60,4 +60,12 @@ static inline int test_and_set_bit(int nr, unsigned long *addr) return oldbit; } +static inline void bitmap_or(unsigned long *dst, const unsigned long *other, + int nr_bits) +{ + int i, nr_longs = (bitmap_size(nr_bits) / sizeof(unsigned long)); + for ( i = 0; i < nr_longs; ++i ) + dst[i] |= other[i]; +} + #endif /* XC_BITOPS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPe-0007lu-Ng; Sun, 14 Sep 2014 00:11:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPd-0007ll-B3 for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:29 +0000 Received: from [193.109.254.147:2653] by server-6.bemta-14.messagelabs.com id 04/5A-01867-03DD4145; Sun, 14 Sep 2014 00:11:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1410653486!15276832!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16042 invoked from network); 14 Sep 2014 00:11:27 -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; 14 Sep 2014 00:11:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPa-0006Q7-BB for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPa-0003gg-8q for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:26 +0000 Date: Sun, 14 Sep 2014 00:11:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/bitops: Add or() to the available bitmap operations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89f5ca3b5f16a1418b1ae4b2e36a6453a1dce309 Author: Andrew Cooper AuthorDate: Wed Sep 10 18:10:42 2014 +0100 Commit: Ian Campbell CommitDate: Thu Sep 11 11:58:02 2014 +0100 libxc/bitops: Add or() to the available bitmap operations Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson Acked-by: Ian Campbell --- tools/libxc/xc_bitops.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_bitops.h b/tools/libxc/xc_bitops.h index d8e0c16..dfce3b8 100644 --- a/tools/libxc/xc_bitops.h +++ b/tools/libxc/xc_bitops.h @@ -60,4 +60,12 @@ static inline int test_and_set_bit(int nr, unsigned long *addr) return oldbit; } +static inline void bitmap_or(unsigned long *dst, const unsigned long *other, + int nr_bits) +{ + int i, nr_longs = (bitmap_size(nr_bits) / sizeof(unsigned long)); + for ( i = 0; i < nr_longs; ++i ) + dst[i] |= other[i]; +} + #endif /* XC_BITOPS_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPo-0007nG-Sk; Sun, 14 Sep 2014 00:11:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPn-0007n1-AG for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:39 +0000 Received: from [85.158.137.68:33602] by server-15.bemta-3.messagelabs.com id 82/72-01573-A3DD4145; Sun, 14 Sep 2014 00:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1410653496!14318719!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26881 invoked from network); 14 Sep 2014 00:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPk-0006QF-FR for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPk-0003h6-EC for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:36 +0000 Date: Sun, 14 Sep 2014 00:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: fix boot on arndale. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6baa3b58a1b066977ddc29c56b9b3cda123e70c6 Author: Ian Campbell AuthorDate: Thu Sep 11 13:55:08 2014 +0100 Commit: Ian Campbell CommitDate: Fri Sep 12 11:09:07 2014 +0100 xen: arm: fix boot on arndale. The differences between Arndale and the Odoid-XU are more interesting than first though, which results in 0bf8ddecb4df "xen/arm: Add support for the Odroid-XU board." breaking boot on arndale. Revert back to arndale compatible behaviour while we sort this out. Specifically we must (counterintuitively) use the regular (!ns) sysram and the correct offset is 0x0 and 0x1c. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/exynos5.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index bc9ae15..22a38f0 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -99,7 +99,7 @@ static int __init exynos5_smp_init(void) u64 size; int rc; - node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram-ns"); + node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram"); if ( !node ) { dprintk(XENLOG_ERR, "samsung,exynos4210-sysram-ns missing in DT\n"); @@ -125,7 +125,7 @@ static int __init exynos5_smp_init(void) printk("Set SYSRAM to %"PRIpaddr" (%p)\n", __pa(init_secondary), init_secondary); - writel(__pa(init_secondary), sysram + 0x1c); + writel(__pa(init_secondary), sysram); iounmap(sysram); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPo-0007nG-Sk; Sun, 14 Sep 2014 00:11:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPn-0007n1-AG for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:39 +0000 Received: from [85.158.137.68:33602] by server-15.bemta-3.messagelabs.com id 82/72-01573-A3DD4145; Sun, 14 Sep 2014 00:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1410653496!14318719!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26881 invoked from network); 14 Sep 2014 00:11:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPk-0006QF-FR for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPk-0003h6-EC for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:36 +0000 Date: Sun, 14 Sep 2014 00:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: fix boot on arndale. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6baa3b58a1b066977ddc29c56b9b3cda123e70c6 Author: Ian Campbell AuthorDate: Thu Sep 11 13:55:08 2014 +0100 Commit: Ian Campbell CommitDate: Fri Sep 12 11:09:07 2014 +0100 xen: arm: fix boot on arndale. The differences between Arndale and the Odoid-XU are more interesting than first though, which results in 0bf8ddecb4df "xen/arm: Add support for the Odroid-XU board." breaking boot on arndale. Revert back to arndale compatible behaviour while we sort this out. Specifically we must (counterintuitively) use the regular (!ns) sysram and the correct offset is 0x0 and 0x1c. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/platforms/exynos5.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index bc9ae15..22a38f0 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -99,7 +99,7 @@ static int __init exynos5_smp_init(void) u64 size; int rc; - node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram-ns"); + node = dt_find_compatible_node(NULL, NULL, "samsung,exynos4210-sysram"); if ( !node ) { dprintk(XENLOG_ERR, "samsung,exynos4210-sysram-ns missing in DT\n"); @@ -125,7 +125,7 @@ static int __init exynos5_smp_init(void) printk("Set SYSRAM to %"PRIpaddr" (%p)\n", __pa(init_secondary), init_secondary); - writel(__pa(init_secondary), sysram + 0x1c); + writel(__pa(init_secondary), sysram); iounmap(sysram); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPz-0007ox-23; Sun, 14 Sep 2014 00:11:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPx-0007oi-IU for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:49 +0000 Received: from [85.158.139.211:47874] by server-7.bemta-5.messagelabs.com id 20/0A-30869-44DD4145; Sun, 14 Sep 2014 00:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1410653507!14302345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29039 invoked from network); 14 Sep 2014 00:11:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPu-0006QL-SX for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPu-0003hS-Qu for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:46 +0000 Date: Sun, 14 Sep 2014 00:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/APIC: reduce self-IPI related code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d203b337fb2dcd148d2df850e25b67c792d4d0b Author: Jan Beulich AuthorDate: Fri Sep 12 13:48:37 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 12 13:48:37 2014 +0200 x86/APIC: reduce self-IPI related code send_IPI_self_{phys,flat}() were identical and send_IPI_self_x2apic() was misplaced and pointlessly (implictly) had a non-x2APIC code path. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/genapic/x2apic.c | 5 +++++ xen/arch/x86/smp.c | 12 +----------- xen/include/asm-x86/genapic.h | 11 ++++------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index b2cab03..9a3cfd9 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -92,6 +92,11 @@ static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask) return dest; } +static void send_IPI_self_x2apic(uint8_t vector) +{ + apic_wrmsr(APIC_SELF_IPI, vector); +} + static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int vector) { unsigned int cpu; diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 0433f30..06a833e 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -124,21 +124,11 @@ static void __default_send_IPI_shortcut(unsigned int shortcut, int vector, apic_write_around(APIC_ICR, cfg); } -void send_IPI_self_flat(int vector) +void send_IPI_self_legacy(uint8_t vector) { __default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL); } -void send_IPI_self_phys(int vector) -{ - __default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL); -} - -void send_IPI_self_x2apic(int vector) -{ - apic_write(APIC_SELF_IPI, vector); -} - void send_IPI_mask_flat(const cpumask_t *cpumask, int vector) { unsigned long mask = cpumask_bits(cpumask)[0]; diff --git a/xen/include/asm-x86/genapic.h b/xen/include/asm-x86/genapic.h index ad2a4fb..5496ab0 100644 --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -37,7 +37,7 @@ struct genapic { const cpumask_t *(*vector_allocation_cpumask)(int cpu); unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask); void (*send_IPI_mask)(const cpumask_t *mask, int vector); - void (*send_IPI_self)(int vector); + void (*send_IPI_self)(uint8_t vector); }; #define APICFUNC(x) .x = x @@ -52,12 +52,12 @@ extern const struct genapic *genapic; extern const struct genapic apic_default; const cpumask_t *target_cpus_all(void); +void send_IPI_self_legacy(uint8_t vector); void init_apic_ldr_flat(void); void clustered_apic_check_flat(void); unsigned int cpu_mask_to_apicid_flat(const cpumask_t *cpumask); void send_IPI_mask_flat(const cpumask_t *mask, int vector); -void send_IPI_self_flat(int vector); const cpumask_t *vector_allocation_cpumask_flat(int cpu); #define GENAPIC_FLAT \ .int_delivery_mode = dest_LowestPrio, \ @@ -68,13 +68,12 @@ const cpumask_t *vector_allocation_cpumask_flat(int cpu); .vector_allocation_cpumask = vector_allocation_cpumask_flat, \ .cpu_mask_to_apicid = cpu_mask_to_apicid_flat, \ .send_IPI_mask = send_IPI_mask_flat, \ - .send_IPI_self = send_IPI_self_flat + .send_IPI_self = send_IPI_self_legacy void init_apic_ldr_phys(void); void clustered_apic_check_phys(void); unsigned int cpu_mask_to_apicid_phys(const cpumask_t *cpumask); void send_IPI_mask_phys(const cpumask_t *mask, int vector); -void send_IPI_self_phys(int vector); const cpumask_t *vector_allocation_cpumask_phys(int cpu); #define GENAPIC_PHYS \ .int_delivery_mode = dest_Fixed, \ @@ -85,8 +84,6 @@ const cpumask_t *vector_allocation_cpumask_phys(int cpu); .vector_allocation_cpumask = vector_allocation_cpumask_phys, \ .cpu_mask_to_apicid = cpu_mask_to_apicid_phys, \ .send_IPI_mask = send_IPI_mask_phys, \ - .send_IPI_self = send_IPI_self_phys - -void send_IPI_self_x2apic(int vector); + .send_IPI_self = send_IPI_self_legacy #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Sep 14 00:11:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Sep 2014 00:11:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPz-0007ox-23; Sun, 14 Sep 2014 00:11:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPx-0007oi-IU for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:49 +0000 Received: from [85.158.139.211:47874] by server-7.bemta-5.messagelabs.com id 20/0A-30869-44DD4145; Sun, 14 Sep 2014 00:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1410653507!14302345!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29039 invoked from network); 14 Sep 2014 00:11:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 14 Sep 2014 00:11:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XSxPu-0006QL-SX for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XSxPu-0003hS-Qu for xen-changelog@lists.xensource.com; Sun, 14 Sep 2014 00:11:46 +0000 Date: Sun, 14 Sep 2014 00:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/APIC: reduce self-IPI related code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d203b337fb2dcd148d2df850e25b67c792d4d0b Author: Jan Beulich AuthorDate: Fri Sep 12 13:48:37 2014 +0200 Commit: Jan Beulich CommitDate: Fri Sep 12 13:48:37 2014 +0200 x86/APIC: reduce self-IPI related code send_IPI_self_{phys,flat}() were identical and send_IPI_self_x2apic() was misplaced and pointlessly (implictly) had a non-x2APIC code path. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/genapic/x2apic.c | 5 +++++ xen/arch/x86/smp.c | 12 +----------- xen/include/asm-x86/genapic.h | 11 ++++------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index b2cab03..9a3cfd9 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -92,6 +92,11 @@ static unsigned int cpu_mask_to_apicid_x2apic_cluster(const cpumask_t *cpumask) return dest; } +static void send_IPI_self_x2apic(uint8_t vector) +{ + apic_wrmsr(APIC_SELF_IPI, vector); +} + static void send_IPI_mask_x2apic_phys(const cpumask_t *cpumask, int vector) { unsigned int cpu; diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 0433f30..06a833e 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -124,21 +124,11 @@ static void __default_send_IPI_shortcut(unsigned int shortcut, int vector, apic_write_around(APIC_ICR, cfg); } -void send_IPI_self_flat(int vector) +void send_IPI_self_legacy(uint8_t vector) { __default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL); } -void send_IPI_self_phys(int vector) -{ - __default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL); -} - -void send_IPI_self_x2apic(int vector) -{ - apic_write(APIC_SELF_IPI, vector); -} - void send_IPI_mask_flat(const cpumask_t *cpumask, int vector) { unsigned long mask = cpumask_bits(cpumask)[0]; diff --git a/xen/include/asm-x86/genapic.h b/xen/include/asm-x86/genapic.h index ad2a4fb..5496ab0 100644 --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -37,7 +37,7 @@ struct genapic { const cpumask_t *(*vector_allocation_cpumask)(int cpu); unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask); void (*send_IPI_mask)(const cpumask_t *mask, int vector); - void (*send_IPI_self)(int vector); + void (*send_IPI_self)(uint8_t vector); }; #define APICFUNC(x) .x = x @@ -52,12 +52,12 @@ extern const struct genapic *genapic; extern const struct genapic apic_default; const cpumask_t *target_cpus_all(void); +void send_IPI_self_legacy(uint8_t vector); void init_apic_ldr_flat(void); void clustered_apic_check_flat(void); unsigned int cpu_mask_to_apicid_flat(const cpumask_t *cpumask); void send_IPI_mask_flat(const cpumask_t *mask, int vector); -void send_IPI_self_flat(int vector); const cpumask_t *vector_allocation_cpumask_flat(int cpu); #define GENAPIC_FLAT \ .int_delivery_mode = dest_LowestPrio, \ @@ -68,13 +68,12 @@ const cpumask_t *vector_allocation_cpumask_flat(int cpu); .vector_allocation_cpumask = vector_allocation_cpumask_flat, \ .cpu_mask_to_apicid = cpu_mask_to_apicid_flat, \ .send_IPI_mask = send_IPI_mask_flat, \ - .send_IPI_self = send_IPI_self_flat + .send_IPI_self = send_IPI_self_legacy void init_apic_ldr_phys(void); void clustered_apic_check_phys(void); unsigned int cpu_mask_to_apicid_phys(const cpumask_t *cpumask); void send_IPI_mask_phys(const cpumask_t *mask, int vector); -void send_IPI_self_phys(int vector); const cpumask_t *vector_allocation_cpumask_phys(int cpu); #define GENAPIC_PHYS \ .int_delivery_mode = dest_Fixed, \ @@ -85,8 +84,6 @@ const cpumask_t *vector_allocation_cpumask_phys(int cpu); .vector_allocation_cpumask = vector_allocation_cpumask_phys, \ .cpu_mask_to_apicid = cpu_mask_to_apicid_phys, \ .send_IPI_mask = send_IPI_mask_phys, \ - .send_IPI_self = send_IPI_self_phys - -void send_IPI_self_x2apic(int vector); + .send_IPI_self = send_IPI_self_legacy #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33: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 1XTzQz-0007r4-J0; Tue, 16 Sep 2014 20:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzQy-0007qr-6J for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:08 +0000 Received: from [85.158.139.211:23172] by server-1.bemta-5.messagelabs.com id D3/7D-17892-38E98145; Tue, 16 Sep 2014 20:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1410899585!10765549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16400 invoked from network); 16 Sep 2014 20:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzQs-0007At-Ud for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzQs-0007iZ-OI for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:02 +0000 Date: Tue, 16 Sep 2014 20:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Calculate irq rank from irq number X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cf5289622d03ea3af5d6ca7a3b325fa4ce0b286 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:43 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:55:56 2014 +0100 xen/arm: Calculate irq rank from irq number irq rank calculated is not generic and assumes hardware register size value which does not work for future GIC versions like V3. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini --- xen/arch/arm/vgic.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 1372ffc..c6e9479 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -31,6 +31,16 @@ #include #include +static inline struct vgic_irq_rank *vgic_get_rank(struct vcpu *v, int rank) +{ + if ( rank == 0 ) + return v->arch.vgic.private_irqs; + else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) + return &v->domain->arch.vgic.shared_irqs[rank - 1]; + else + return NULL; +} + /* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. @@ -40,17 +50,14 @@ struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, { int rank = REG_RANK_NR(b, (n >> s)); - if ( rank == 0 ) - return v->arch.vgic.private_irqs; - else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) - return &v->domain->arch.vgic.shared_irqs[rank - 1]; - else - return NULL; + return vgic_get_rank(v, rank); } struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { - return vgic_rank_offset(v, 8, irq, DABT_WORD); + int rank = irq/32; + + return vgic_get_rank(v, rank); } int domain_vgic_init(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33: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 1XTzQz-0007r4-J0; Tue, 16 Sep 2014 20:33:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzQy-0007qr-6J for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:08 +0000 Received: from [85.158.139.211:23172] by server-1.bemta-5.messagelabs.com id D3/7D-17892-38E98145; Tue, 16 Sep 2014 20:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1410899585!10765549!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16400 invoked from network); 16 Sep 2014 20:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzQs-0007At-Ud for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzQs-0007iZ-OI for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:02 +0000 Date: Tue, 16 Sep 2014 20:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Calculate irq rank from irq number X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5cf5289622d03ea3af5d6ca7a3b325fa4ce0b286 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:43 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:55:56 2014 +0100 xen/arm: Calculate irq rank from irq number irq rank calculated is not generic and assumes hardware register size value which does not work for future GIC versions like V3. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini --- xen/arch/arm/vgic.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 1372ffc..c6e9479 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -31,6 +31,16 @@ #include #include +static inline struct vgic_irq_rank *vgic_get_rank(struct vcpu *v, int rank) +{ + if ( rank == 0 ) + return v->arch.vgic.private_irqs; + else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) + return &v->domain->arch.vgic.shared_irqs[rank - 1]; + else + return NULL; +} + /* * Returns rank corresponding to a GICD_ register for * GICD_ with -bits-per-interrupt. @@ -40,17 +50,14 @@ struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, { int rank = REG_RANK_NR(b, (n >> s)); - if ( rank == 0 ) - return v->arch.vgic.private_irqs; - else if ( rank <= DOMAIN_NR_RANKS(v->domain) ) - return &v->domain->arch.vgic.shared_irqs[rank - 1]; - else - return NULL; + return vgic_get_rank(v, rank); } struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq) { - return vgic_rank_offset(v, 8, irq, DABT_WORD); + int rank = irq/32; + + return vgic_get_rank(v, rank); } int domain_vgic_init(struct domain *d) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzR9-0007sB-M5; Tue, 16 Sep 2014 20:33:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzR8-0007ry-Jx for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:18 +0000 Received: from [85.158.143.35:22118] by server-3.bemta-4.messagelabs.com id 6C/A4-06192-D8E98145; Tue, 16 Sep 2014 20:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1410899596!14204767!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24161 invoked from network); 16 Sep 2014 20:33:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzR5-0007Az-Rc for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzR5-0007jT-PJ for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:15 +0000 Date: Tue, 16 Sep 2014 20:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add vgic callback to read irq priority X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4218cde8870cd8a1178ee8eca56ca492a3629de1 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:44 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:55:56 2014 +0100 xen/arm: Add vgic callback to read irq priority Use callback in vgic driver to read priority for a given irq Signed-off-by: Vijaya Kumar K --- xen/arch/arm/vgic-v2.c | 12 ++++++++++++ xen/arch/arm/vgic.c | 2 +- xen/include/asm-arm/vgic.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 54751b6..e674192 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -521,6 +521,17 @@ static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) return v_target; } +static int vgic_v2_get_irq_priority(struct vcpu *v, unsigned int irq) +{ + int priority; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + + ASSERT(spin_is_locked(&rank->lock)); + priority = vgic_byte_read(rank->ipriority[(irq%32)/4], 0, irq % 4); + + return priority; +} + static int vgic_v2_vcpu_init(struct vcpu *v) { int i; @@ -555,6 +566,7 @@ static int vgic_v2_domain_init(struct domain *d) static const struct vgic_ops vgic_v2_ops = { .vcpu_init = vgic_v2_vcpu_init, .domain_init = vgic_v2_domain_init, + .get_irq_priority = vgic_v2_get_irq_priority, .get_target_vcpu = vgic_v2_get_target_vcpu, }; diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index c6e9479..d24990f 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -368,7 +368,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) bool_t running; vgic_lock_rank(v, rank, flags); - priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); + priority = v->domain->arch.vgic.handler->get_irq_priority(v, irq); vgic_unlock_rank(v, rank, flags); spin_lock_irqsave(&v->arch.vgic.lock, flags); diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 338ba03..a9f1943 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -96,6 +96,8 @@ struct vgic_ops { int (*vcpu_init)(struct vcpu *v); /* Domain specific initialization of vGIC */ int (*domain_init)(struct domain *d); + /* Get priority for a given irq stored in vgic structure */ + int (*get_irq_priority)(struct vcpu *v, unsigned int irq); /* Get the target vcpu for a given virq. The rank lock is already taken * when calling this. */ struct vcpu *(*get_target_vcpu)(struct vcpu *v, unsigned int irq); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzR9-0007sB-M5; Tue, 16 Sep 2014 20:33:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzR8-0007ry-Jx for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:18 +0000 Received: from [85.158.143.35:22118] by server-3.bemta-4.messagelabs.com id 6C/A4-06192-D8E98145; Tue, 16 Sep 2014 20:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1410899596!14204767!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24161 invoked from network); 16 Sep 2014 20:33:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzR5-0007Az-Rc for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzR5-0007jT-PJ for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:15 +0000 Date: Tue, 16 Sep 2014 20:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add vgic callback to read irq priority X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4218cde8870cd8a1178ee8eca56ca492a3629de1 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:44 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:55:56 2014 +0100 xen/arm: Add vgic callback to read irq priority Use callback in vgic driver to read priority for a given irq Signed-off-by: Vijaya Kumar K --- xen/arch/arm/vgic-v2.c | 12 ++++++++++++ xen/arch/arm/vgic.c | 2 +- xen/include/asm-arm/vgic.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index 54751b6..e674192 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -521,6 +521,17 @@ static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) return v_target; } +static int vgic_v2_get_irq_priority(struct vcpu *v, unsigned int irq) +{ + int priority; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + + ASSERT(spin_is_locked(&rank->lock)); + priority = vgic_byte_read(rank->ipriority[(irq%32)/4], 0, irq % 4); + + return priority; +} + static int vgic_v2_vcpu_init(struct vcpu *v) { int i; @@ -555,6 +566,7 @@ static int vgic_v2_domain_init(struct domain *d) static const struct vgic_ops vgic_v2_ops = { .vcpu_init = vgic_v2_vcpu_init, .domain_init = vgic_v2_domain_init, + .get_irq_priority = vgic_v2_get_irq_priority, .get_target_vcpu = vgic_v2_get_target_vcpu, }; diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index c6e9479..d24990f 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -368,7 +368,7 @@ void vgic_vcpu_inject_irq(struct vcpu *v, unsigned int irq) bool_t running; vgic_lock_rank(v, rank, flags); - priority = vgic_byte_read(rank->ipriority[REG_RANK_INDEX(8, irq, DABT_WORD)], 0, irq & 0x3); + priority = v->domain->arch.vgic.handler->get_irq_priority(v, irq); vgic_unlock_rank(v, rank, flags); spin_lock_irqsave(&v->arch.vgic.lock, flags); diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 338ba03..a9f1943 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -96,6 +96,8 @@ struct vgic_ops { int (*vcpu_init)(struct vcpu *v); /* Domain specific initialization of vGIC */ int (*domain_init)(struct domain *d); + /* Get priority for a given irq stored in vgic structure */ + int (*get_irq_priority)(struct vcpu *v, unsigned int irq); /* Get the target vcpu for a given virq. The rank lock is already taken * when calling this. */ struct vcpu *(*get_target_vcpu)(struct vcpu *v, unsigned int irq); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33: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 1XTzRL-0007tm-P0; Tue, 16 Sep 2014 20:33:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRK-0007td-Ew for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:30 +0000 Received: from [85.158.139.211:41825] by server-8.bemta-5.messagelabs.com id E9/53-22440-99E98145; Tue, 16 Sep 2014 20:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1410899606!14876652!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12943 invoked from network); 16 Sep 2014 20:33:27 -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; 16 Sep 2014 20:33:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRG-0007B5-1P for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRF-0007jp-W3 for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:26 +0000 Date: Tue, 16 Sep 2014 20:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for GIC v3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc183a0235e092bb0dd3cea97fc4ea55c490101e Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:45 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:55:56 2014 +0100 xen/arm: Add support for GIC v3 Add support for GIC v3 specification System register access(SRE) is enabled to access cpu and virtual interface registers based on kernel GICv3 driver. This patch adds only basic v3 support. Does not support Interrupt Translation support (ITS) Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/gic-v3.c | 1200 +++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/domain.h | 8 + xen/include/asm-arm/gic.h | 20 + xen/include/asm-arm/gic_v3_defs.h | 154 +++++ xen/include/asm-arm/processor.h | 13 + xen/include/asm-arm/sysregs.h | 53 ++ 7 files changed, 1449 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index c13206f..33765f6 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -11,6 +11,7 @@ obj-y += domctl.o obj-y += sysctl.o obj-y += domain_build.o obj-y += gic.o gic-v2.o +obj-$(CONFIG_ARM_64) += gic-v3.o obj-y += io.o obj-y += irq.o obj-y += kernel.o diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c new file mode 100644 index 0000000..6ccde02 --- /dev/null +++ b/xen/arch/arm/gic-v3.c @@ -0,0 +1,1200 @@ +/* + * xen/arch/arm/gic-v3.c + * + * ARM Generic Interrupt Controller support v3 version + * based on xen/arch/arm/gic-v2.c and kernel GICv3 driver + * + * Copyright (C) 2012,2013 - ARM Ltd + * Marc Zyngier + * + * Vijaya Kumar K , Cavium Inc + * ported to Xen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct rdist_region { + paddr_t base; + paddr_t size; + void __iomem *map_base; +}; + +/* Global state */ +static struct { + paddr_t dbase; /* Address of distributor registers */ + paddr_t dbase_size; + void __iomem *map_dbase; /* Mapped address of distributor registers */ + struct rdist_region *rdist_regions; + uint32_t rdist_stride; + unsigned int rdist_count; /* Number of rdist regions count */ + unsigned int nr_priorities; + spinlock_t lock; +} gicv3; + +static struct gic_info gicv3_info; + +/* per-cpu re-distributor base */ +static DEFINE_PER_CPU(void __iomem*, rbase); + +#define GICD (gicv3.map_dbase) +#define GICD_RDIST_BASE (this_cpu(rbase)) +#define GICD_RDIST_SGI_BASE (GICD_RDIST_BASE + SZ_64K) + +/* + * Saves all 16(Max) LR registers. Though number of LRs implemented + * is implementation specific. + */ +static inline void gicv3_save_lrs(struct vcpu *v) +{ + /* Fall through for all the cases */ + switch ( gicv3_info.nr_lrs ) + { + case 16: + v->arch.gic.v3.lr[15] = READ_SYSREG(ICH_LR15_EL2); + case 15: + v->arch.gic.v3.lr[14] = READ_SYSREG(ICH_LR14_EL2); + case 14: + v->arch.gic.v3.lr[13] = READ_SYSREG(ICH_LR13_EL2); + case 13: + v->arch.gic.v3.lr[12] = READ_SYSREG(ICH_LR12_EL2); + case 12: + v->arch.gic.v3.lr[11] = READ_SYSREG(ICH_LR11_EL2); + case 11: + v->arch.gic.v3.lr[10] = READ_SYSREG(ICH_LR10_EL2); + case 10: + v->arch.gic.v3.lr[9] = READ_SYSREG(ICH_LR9_EL2); + case 9: + v->arch.gic.v3.lr[8] = READ_SYSREG(ICH_LR8_EL2); + case 8: + v->arch.gic.v3.lr[7] = READ_SYSREG(ICH_LR7_EL2); + case 7: + v->arch.gic.v3.lr[6] = READ_SYSREG(ICH_LR6_EL2); + case 6: + v->arch.gic.v3.lr[5] = READ_SYSREG(ICH_LR5_EL2); + case 5: + v->arch.gic.v3.lr[4] = READ_SYSREG(ICH_LR4_EL2); + case 4: + v->arch.gic.v3.lr[3] = READ_SYSREG(ICH_LR3_EL2); + case 3: + v->arch.gic.v3.lr[2] = READ_SYSREG(ICH_LR2_EL2); + case 2: + v->arch.gic.v3.lr[1] = READ_SYSREG(ICH_LR1_EL2); + case 1: + v->arch.gic.v3.lr[0] = READ_SYSREG(ICH_LR0_EL2); + break; + default: + BUG(); + } +} + +/* + * Restores all 16(Max) LR registers. Though number of LRs implemented + * is implementation specific. + */ +static inline void gicv3_restore_lrs(const struct vcpu *v) +{ + /* Fall through for all the cases */ + switch ( gicv3_info.nr_lrs ) + { + case 16: + WRITE_SYSREG(v->arch.gic.v3.lr[15], ICH_LR15_EL2); + case 15: + WRITE_SYSREG(v->arch.gic.v3.lr[14], ICH_LR14_EL2); + case 14: + WRITE_SYSREG(v->arch.gic.v3.lr[13], ICH_LR13_EL2); + case 13: + WRITE_SYSREG(v->arch.gic.v3.lr[12], ICH_LR12_EL2); + case 12: + WRITE_SYSREG(v->arch.gic.v3.lr[11], ICH_LR11_EL2); + case 11: + WRITE_SYSREG(v->arch.gic.v3.lr[10], ICH_LR10_EL2); + case 10: + WRITE_SYSREG(v->arch.gic.v3.lr[9], ICH_LR9_EL2); + case 9: + WRITE_SYSREG(v->arch.gic.v3.lr[8], ICH_LR8_EL2); + case 8: + WRITE_SYSREG(v->arch.gic.v3.lr[7], ICH_LR7_EL2); + case 7: + WRITE_SYSREG(v->arch.gic.v3.lr[6], ICH_LR6_EL2); + case 6: + WRITE_SYSREG(v->arch.gic.v3.lr[5], ICH_LR5_EL2); + case 5: + WRITE_SYSREG(v->arch.gic.v3.lr[4], ICH_LR4_EL2); + case 4: + WRITE_SYSREG(v->arch.gic.v3.lr[3], ICH_LR3_EL2); + case 3: + WRITE_SYSREG(v->arch.gic.v3.lr[2], ICH_LR2_EL2); + case 2: + WRITE_SYSREG(v->arch.gic.v3.lr[1], ICH_LR1_EL2); + case 1: + WRITE_SYSREG(v->arch.gic.v3.lr[0], ICH_LR0_EL2); + break; + default: + BUG(); + } +} + +static uint64_t gicv3_ich_read_lr(int lr) +{ + switch ( lr ) + { + case 0: return READ_SYSREG(ICH_LR0_EL2); + case 1: return READ_SYSREG(ICH_LR1_EL2); + case 2: return READ_SYSREG(ICH_LR2_EL2); + case 3: return READ_SYSREG(ICH_LR3_EL2); + case 4: return READ_SYSREG(ICH_LR4_EL2); + case 5: return READ_SYSREG(ICH_LR5_EL2); + case 6: return READ_SYSREG(ICH_LR6_EL2); + case 7: return READ_SYSREG(ICH_LR7_EL2); + case 8: return READ_SYSREG(ICH_LR8_EL2); + case 9: return READ_SYSREG(ICH_LR9_EL2); + case 10: return READ_SYSREG(ICH_LR10_EL2); + case 11: return READ_SYSREG(ICH_LR11_EL2); + case 12: return READ_SYSREG(ICH_LR12_EL2); + case 13: return READ_SYSREG(ICH_LR13_EL2); + case 14: return READ_SYSREG(ICH_LR14_EL2); + case 15: return READ_SYSREG(ICH_LR15_EL2); + default: + BUG(); + } +} + +static void gicv3_ich_write_lr(int lr, uint64_t val) +{ + switch ( lr ) + { + case 0: + WRITE_SYSREG(val, ICH_LR0_EL2); + break; + case 1: + WRITE_SYSREG(val, ICH_LR1_EL2); + break; + case 2: + WRITE_SYSREG(val, ICH_LR2_EL2); + break; + case 3: + WRITE_SYSREG(val, ICH_LR3_EL2); + break; + case 4: + WRITE_SYSREG(val, ICH_LR4_EL2); + break; + case 5: + WRITE_SYSREG(val, ICH_LR5_EL2); + break; + case 6: + WRITE_SYSREG(val, ICH_LR6_EL2); + break; + case 7: + WRITE_SYSREG(val, ICH_LR7_EL2); + break; + case 8: + WRITE_SYSREG(val, ICH_LR8_EL2); + break; + case 9: + WRITE_SYSREG(val, ICH_LR9_EL2); + break; + case 10: + WRITE_SYSREG(val, ICH_LR10_EL2); + break; + case 11: + WRITE_SYSREG(val, ICH_LR11_EL2); + break; + case 12: + WRITE_SYSREG(val, ICH_LR12_EL2); + break; + case 13: + WRITE_SYSREG(val, ICH_LR13_EL2); + break; + case 14: + WRITE_SYSREG(val, ICH_LR14_EL2); + break; + case 15: + WRITE_SYSREG(val, ICH_LR15_EL2); + break; + default: + return; + } + isb(); +} + +/* + * System Register Enable (SRE). Enable to access CPU & Virtual + * interface registers as system registers in EL2 + */ +static void gicv3_enable_sre(void) +{ + uint32_t val; + + val = READ_SYSREG32(ICC_SRE_EL2); + val |= GICC_SRE_EL2_SRE | GICC_SRE_EL2_ENEL1; + + WRITE_SYSREG32(val, ICC_SRE_EL2); + isb(); +} + +/* Wait for completion of a distributor change */ +static void gicv3_do_wait_for_rwp(void __iomem *base) +{ + uint32_t val; + bool_t timeout = 0; + s_time_t deadline = NOW() + MILLISECS(1000); + + do { + val = readl_relaxed(base + GICD_CTLR); + if ( !(val & GICD_CTLR_RWP) ) + break; + if ( NOW() > deadline ) + { + timeout = 1; + break; + } + cpu_relax(); + udelay(1); + } while ( 1 ); + + if ( timeout ) + dprintk(XENLOG_ERR, "RWP timeout\n"); +} + +static void gicv3_dist_wait_for_rwp(void) +{ + gicv3_do_wait_for_rwp(GICD); +} + +static void gicv3_redist_wait_for_rwp(void) +{ + gicv3_do_wait_for_rwp(GICD_RDIST_BASE); +} + +static void gicv3_wait_for_rwp(int irq) +{ + if ( irq < NR_LOCAL_IRQS ) + gicv3_redist_wait_for_rwp(); + else + gicv3_dist_wait_for_rwp(); +} + +static unsigned int gicv3_get_cpu_from_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + cpu = cpumask_any(&possible_mask); + + return cpu; +} + +static void restore_aprn_regs(const union gic_state_data *d) +{ + /* Write APRn register based on number of priorities + platform has implemented */ + switch ( gicv3.nr_priorities ) + { + case 7: + WRITE_SYSREG32(d->v3.apr0[2], ICH_AP0R2_EL2); + WRITE_SYSREG32(d->v3.apr1[2], ICH_AP1R2_EL2); + /* Fall through */ + case 6: + WRITE_SYSREG32(d->v3.apr0[1], ICH_AP0R1_EL2); + WRITE_SYSREG32(d->v3.apr1[1], ICH_AP1R1_EL2); + /* Fall through */ + case 5: + WRITE_SYSREG32(d->v3.apr0[0], ICH_AP0R0_EL2); + WRITE_SYSREG32(d->v3.apr1[0], ICH_AP1R0_EL2); + break; + default: + BUG(); + } +} + +static void save_aprn_regs(union gic_state_data *d) +{ + /* Read APRn register based on number of priorities + platform has implemented */ + switch ( gicv3.nr_priorities ) + { + case 7: + d->v3.apr0[2] = READ_SYSREG32(ICH_AP0R2_EL2); + d->v3.apr1[2] = READ_SYSREG32(ICH_AP1R2_EL2); + /* Fall through */ + case 6: + d->v3.apr0[1] = READ_SYSREG32(ICH_AP0R1_EL2); + d->v3.apr1[1] = READ_SYSREG32(ICH_AP1R1_EL2); + /* Fall through */ + case 5: + d->v3.apr0[0] = READ_SYSREG32(ICH_AP0R0_EL2); + d->v3.apr1[0] = READ_SYSREG32(ICH_AP1R0_EL2); + break; + default: + BUG(); + } +} + +/* + * As per section 4.8.17 of the GICv3 spec following + * registers are save and restored on guest swap + */ +static void gicv3_save_state(struct vcpu *v) +{ + + /* No need for spinlocks here because interrupts are disabled around + * this call and it only accesses struct vcpu fields that cannot be + * accessed simultaneously by another pCPU. + * + * Make sure all stores to the GIC via the memory mapped interface + * are now visible to the system register interface + */ + dsb(sy); + gicv3_save_lrs(v); + save_aprn_regs(&v->arch.gic); + v->arch.gic.v3.vmcr = READ_SYSREG32(ICH_VMCR_EL2); + v->arch.gic.v3.sre_el1 = READ_SYSREG32(ICC_SRE_EL1); +} + +static void gicv3_restore_state(const struct vcpu *v) +{ + WRITE_SYSREG32(v->arch.gic.v3.sre_el1, ICC_SRE_EL1); + WRITE_SYSREG32(v->arch.gic.v3.vmcr, ICH_VMCR_EL2); + restore_aprn_regs(&v->arch.gic); + gicv3_restore_lrs(v); + + /* + * Make sure all stores are visible the GIC + */ + dsb(sy); +} + +static void gicv3_dump_state(const struct vcpu *v) +{ + int i; + + if ( v == current ) + { + for ( i = 0; i < gicv3_info.nr_lrs; i++ ) + printk(" HW_LR[%d]=%lx\n", i, gicv3_ich_read_lr(i)); + } + else + { + for ( i = 0; i < gicv3_info.nr_lrs; i++ ) + printk(" VCPU_LR[%d]=%lx\n", i, v->arch.gic.v3.lr[i]); + } +} + +static void gicv3_poke_irq(struct irq_desc *irqd, u32 offset) +{ + u32 mask = 1 << (irqd->irq % 32); + void __iomem *base; + + if ( irqd->irq < NR_GIC_LOCAL_IRQS ) + base = GICD_RDIST_SGI_BASE; + else + base = GICD; + + writel_relaxed(mask, base + offset + (irqd->irq / 32) * 4); + gicv3_wait_for_rwp(irqd->irq); +} + +static void gicv3_unmask_irq(struct irq_desc *irqd) +{ + gicv3_poke_irq(irqd, GICD_ISENABLER); +} + +static void gicv3_mask_irq(struct irq_desc *irqd) +{ + gicv3_poke_irq(irqd, GICD_ICENABLER); +} + +static void gicv3_eoi_irq(struct irq_desc *irqd) +{ + /* Lower the priority */ + WRITE_SYSREG32(irqd->irq, ICC_EOIR1_EL1); + isb(); +} + +static void gicv3_dir_irq(struct irq_desc *irqd) +{ + /* Deactivate */ + WRITE_SYSREG32(irqd->irq, ICC_DIR_EL1); + isb(); +} + +static unsigned int gicv3_read_irq(void) +{ + return READ_SYSREG32(ICC_IAR1_EL1); +} + +static inline uint64_t gicv3_mpidr_to_affinity(int cpu) +{ + uint64_t mpidr = cpu_logical_map(cpu); + return (MPIDR_AFFINITY_LEVEL(mpidr, 3) << 32 | + MPIDR_AFFINITY_LEVEL(mpidr, 2) << 16 | + MPIDR_AFFINITY_LEVEL(mpidr, 1) << 8 | + MPIDR_AFFINITY_LEVEL(mpidr, 0)); +} + +static void gicv3_set_irq_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + uint32_t cfg, edgebit; + uint64_t affinity; + void __iomem *base; + unsigned int cpu = gicv3_get_cpu_from_mask(cpu_mask); + unsigned int irq = desc->irq; + unsigned int type = desc->arch.type; + + /* SGI's are always edge-triggered not need to call GICD_ICFGR0 */ + ASSERT(irq >= NR_GIC_SGI); + + spin_lock(&gicv3.lock); + + if ( irq >= NR_GIC_LOCAL_IRQS) + base = GICD + GICD_ICFGR + (irq / 16) * 4; + else + base = GICD_RDIST_SGI_BASE + GICR_ICFGR1; + + cfg = readl_relaxed(base); + + edgebit = 2u << (2 * (irq % 16)); + if ( type & DT_IRQ_TYPE_LEVEL_MASK ) + cfg &= ~edgebit; + else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) + cfg |= edgebit; + + writel_relaxed(cfg, base); + + affinity = gicv3_mpidr_to_affinity(cpu); + /* Make sure we don't broadcast the interrupt */ + affinity &= ~GICD_IROUTER_SPI_MODE_ANY; + + if ( irq >= NR_GIC_LOCAL_IRQS ) + writeq_relaxed(affinity, (GICD + GICD_IROUTER + irq * 8)); + + /* Set priority */ + if ( irq < NR_GIC_LOCAL_IRQS ) + writeb_relaxed(priority, GICD_RDIST_SGI_BASE + GICR_IPRIORITYR0 + irq); + else + writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); + + spin_unlock(&gicv3.lock); +} + +static void __init gicv3_dist_init(void) +{ + uint32_t type; + uint32_t priority; + uint64_t affinity; + int i; + + /* Disable the distributor */ + writel_relaxed(0, GICD + GICD_CTLR); + + type = readl_relaxed(GICD + GICD_TYPER); + gicv3_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + + printk("GICv3: %d lines, (IID %8.8x).\n", + gicv3_info.nr_lines, readl_relaxed(GICD + GICD_IIDR)); + + /* Default all global IRQs to level, active low */ + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i += 16 ) + writel_relaxed(0, GICD + GICD_ICFGR + (i / 16) * 4); + + /* Default priority for global interrupts */ + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i += 4 ) + { + priority = (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ); + writel_relaxed(priority, GICD + GICD_IPRIORITYR + (i / 4) * 4); + } + + /* Disable all global interrupts */ + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i += 32 ) + writel_relaxed(0xffffffff, GICD + GICD_ICENABLER + (i / 32) * 4); + + gicv3_dist_wait_for_rwp(); + + /* Turn on the distributor */ + writel_relaxed(GICD_CTL_ENABLE | GICD_CTLR_ARE_NS | + GICD_CTLR_ENABLE_G1A | GICD_CTLR_ENABLE_G1, GICD + GICD_CTLR); + + /* Route all global IRQs to this CPU */ + affinity = gicv3_mpidr_to_affinity(smp_processor_id()); + /* Make sure we don't broadcast the interrupt */ + affinity &= ~GICD_IROUTER_SPI_MODE_ANY; + + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i++ ) + writeq_relaxed(affinity, GICD + GICD_IROUTER + i * 8); +} + +static int gicv3_enable_redist(void) +{ + uint32_t val; + bool_t timeout = 0; + s_time_t deadline = NOW() + MILLISECS(1000); + + /* Wake up this CPU redistributor */ + val = readl_relaxed(GICD_RDIST_BASE + GICR_WAKER); + val &= ~GICR_WAKER_ProcessorSleep; + writel_relaxed(val, GICD_RDIST_BASE + GICR_WAKER); + + do { + val = readl_relaxed(GICD_RDIST_BASE + GICR_WAKER); + if ( !(val & GICR_WAKER_ChildrenAsleep) ) + break; + if ( NOW() > deadline ) + { + timeout = 1; + break; + } + cpu_relax(); + udelay(1); + } while ( timeout ); + + if ( timeout ) + { + dprintk(XENLOG_ERR, "GICv3: Redist enable RWP timeout\n"); + return 1; + } + + return 0; +} + +static int __init gicv3_populate_rdist(void) +{ + int i; + uint32_t aff; + uint32_t reg; + uint64_t typer; + uint64_t mpidr = cpu_logical_map(smp_processor_id()); + + /* + * If we ever get a cluster of more than 16 CPUs, just scream. + */ + if ( (mpidr & 0xff) >= 16 ) + dprintk(XENLOG_WARNING, "GICv3:Cluster with more than 16's cpus\n"); + + /* + * Convert affinity to a 32bit value that can be matched to GICR_TYPER + * bits [63:32] + */ + aff = (MPIDR_AFFINITY_LEVEL(mpidr, 3) << 24 | + MPIDR_AFFINITY_LEVEL(mpidr, 2) << 16 | + MPIDR_AFFINITY_LEVEL(mpidr, 1) << 8 | + MPIDR_AFFINITY_LEVEL(mpidr, 0)); + + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + void __iomem *ptr = gicv3.rdist_regions[i].map_base; + + reg = readl_relaxed(ptr + GICR_PIDR2) & GICR_PIDR2_ARCH_REV_MASK; + if ( (reg >> GICR_PIDR2_ARCH_REV_SHIFT) != GICR_PIDR2_ARCH_GICV3 ) + { + dprintk(XENLOG_ERR, + "GICv3: No redistributor present @%"PRIpaddr"\n", + gicv3.rdist_regions[i].base); + break; + } + + do { + typer = readq_relaxed(ptr + GICR_TYPER); + + if ( (typer >> 32) == aff ) + { + this_cpu(rbase) = ptr; + printk("GICv3: CPU%d: Found redistributor in region %d @%p\n", + smp_processor_id(), i, ptr); + return 0; + } + if ( gicv3.rdist_stride ) + ptr += gicv3.rdist_stride; + else + { + ptr += SZ_64K * 2; + if ( typer & GICR_TYPER_VLPIS ) + ptr += SZ_64K * 2; /* Skip VLPI_base + reserved page */ + } + + } while ( !(typer & GICR_TYPER_LAST) ); + } + + dprintk(XENLOG_ERR, "GICv3: CPU%d: mpidr 0x%x has no re-distributor!\n", + smp_processor_id(), cpu_logical_map(smp_processor_id())); + + return -ENODEV; +} + +static int __cpuinit gicv3_cpu_init(void) +{ + int i; + uint32_t priority; + + /* Register ourselves with the rest of the world */ + if ( gicv3_populate_rdist() ) + return -ENODEV; + + if ( gicv3_enable_redist() ) + return -ENODEV; + + /* Set priority on PPI and SGI interrupts */ + priority = (GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | GIC_PRI_IPI << 8 | + GIC_PRI_IPI); + for (i = 0; i < NR_GIC_SGI; i += 4) + writel_relaxed(priority, + GICD_RDIST_SGI_BASE + GICR_IPRIORITYR0 + (i / 4) * 4); + + priority = (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | GIC_PRI_IRQ << 8 | + GIC_PRI_IRQ); + for (i = NR_GIC_SGI; i < NR_GIC_LOCAL_IRQS; i += 4) + writel_relaxed(priority, + GICD_RDIST_SGI_BASE + GICR_IPRIORITYR0 + (i / 4) * 4); + + /* + * Disable all PPI interrupts, ensure all SGI interrupts are + * enabled. + */ + writel_relaxed(0xffff0000, GICD_RDIST_SGI_BASE + GICR_ICENABLER0); + writel_relaxed(0x0000ffff, GICD_RDIST_SGI_BASE + GICR_ISENABLER0); + + gicv3_redist_wait_for_rwp(); + + /* Enable system registers */ + gicv3_enable_sre(); + + /* No priority grouping */ + WRITE_SYSREG32(0, ICC_BPR1_EL1); + + /* Set priority mask register */ + WRITE_SYSREG32(DEFAULT_PMR_VALUE, ICC_PMR_EL1); + + /* EOI drops priority too (mode 0) */ + WRITE_SYSREG32(GICC_CTLR_EL1_EOImode_drop, ICC_CTLR_EL1); + + /* Enable Group1 interrupts */ + WRITE_SYSREG32(1, ICC_IGRPEN1_EL1); + + /* Sync at once at the end of cpu interface configuration */ + isb(); + + return 0; +} + +static void gicv3_cpu_disable(void) +{ + WRITE_SYSREG32(0, ICC_CTLR_EL1); + isb(); +} + +static void __cpuinit gicv3_hyp_init(void) +{ + uint32_t vtr; + + vtr = READ_SYSREG32(ICH_VTR_EL2); + gicv3_info.nr_lrs = (vtr & GICH_VTR_NRLRGS) + 1; + gicv3.nr_priorities = ((vtr >> GICH_VTR_PRIBITS_SHIFT) & + GICH_VTR_PRIBITS_MASK) + 1; + + if ( !((gicv3.nr_priorities > 4) && (gicv3.nr_priorities < 8)) ) + panic("GICv3: Invalid number of priority bits\n"); + + WRITE_SYSREG32(GICH_VMCR_EOI | GICH_VMCR_VENG1, ICH_VMCR_EL2); + WRITE_SYSREG32(GICH_HCR_EN, ICH_HCR_EL2); +} + +/* Set up the per-CPU parts of the GIC for a secondary CPU */ +static int gicv3_secondary_cpu_init(void) +{ + int res; + + spin_lock(&gicv3.lock); + + res = gicv3_cpu_init(); + gicv3_hyp_init(); + + spin_unlock(&gicv3.lock); + + return res; +} + +static void __cpuinit gicv3_hyp_disable(void) +{ + uint32_t hcr; + + hcr = READ_SYSREG32(ICH_HCR_EL2); + hcr &= ~GICH_HCR_EN; + WRITE_SYSREG32(hcr, ICH_HCR_EL2); + isb(); +} + +static u16 gicv3_compute_target_list(int *base_cpu, const struct cpumask *mask, + uint64_t cluster_id) +{ + int cpu = *base_cpu; + uint64_t mpidr = cpu_logical_map(cpu); + u16 tlist = 0; + + while ( cpu < nr_cpu_ids ) + { + /* + * Assume that each cluster does not have more than 16 CPU's. + * Check is made during GICv3 initialization (gicv3_populate_rdist()) + * on mpidr value for this. So skip this check here. + */ + tlist |= 1 << (mpidr & 0xf); + + cpu = cpumask_next(cpu, mask); + if ( cpu == nr_cpu_ids ) + { + cpu--; + goto out; + } + + mpidr = cpu_logical_map(cpu); + if ( cluster_id != (mpidr & ~MPIDR_AFF0_MASK) ) { + cpu--; + goto out; + } + } +out: + *base_cpu = cpu; + + return tlist; +} + +static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, + const cpumask_t *cpumask) +{ + int cpu = 0; + uint64_t val; + + for_each_cpu(cpu, cpumask) + { + /* Mask lower 8 bits. It represent cpu in affinity level 0 */ + uint64_t cluster_id = cpu_logical_map(cpu) & ~MPIDR_AFF0_MASK; + u16 tlist; + + /* Get targetlist for the cluster to send SGI */ + tlist = gicv3_compute_target_list(&cpu, cpumask, cluster_id); + + /* + * Prepare affinity path of the cluster for which SGI is generated + * along with SGI number + */ + val = (MPIDR_AFFINITY_LEVEL(cluster_id, 3) << 48 | + MPIDR_AFFINITY_LEVEL(cluster_id, 2) << 32 | + sgi << 24 | + MPIDR_AFFINITY_LEVEL(cluster_id, 1) << 16 | + tlist); + + WRITE_SYSREG(val, ICC_SGI1R_EL1); + } + /* Force above writes to ICC_SGI1R_EL1 */ + isb(); +} + +/* Shut down the per-CPU GIC interface */ +static void gicv3_disable_interface(void) +{ + spin_lock(&gicv3.lock); + + gicv3_cpu_disable(); + gicv3_hyp_disable(); + + spin_unlock(&gicv3.lock); +} + +static void gicv3_update_lr(int lr, const struct pending_irq *p, + unsigned int state) +{ + uint64_t grp = GICH_LR_GRP1; + uint64_t val = 0; + + BUG_ON(lr >= gicv3_info.nr_lrs); + BUG_ON(lr < 0); + + val = (((uint64_t)state & 0x3) << GICH_LR_STATE_SHIFT) | grp; + val |= ((uint64_t)p->priority & 0xff) << GICH_LR_PRIORITY_SHIFT; + val |= ((uint64_t)p->irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT; + + if ( p->desc != NULL ) + val |= GICH_LR_HW | (((uint64_t)p->desc->irq & GICH_LR_PHYSICAL_MASK) + << GICH_LR_PHYSICAL_SHIFT); + + gicv3_ich_write_lr(lr, val); +} + +static void gicv3_clear_lr(int lr) +{ + gicv3_ich_write_lr(lr, 0); +} + +static void gicv3_read_lr(int lr, struct gic_lr *lr_reg) +{ + uint64_t lrv; + + lrv = gicv3_ich_read_lr(lr); + + lr_reg->pirq = (lrv >> GICH_LR_PHYSICAL_SHIFT) & GICH_LR_PHYSICAL_MASK; + lr_reg->virq = (lrv >> GICH_LR_VIRTUAL_SHIFT) & GICH_LR_VIRTUAL_MASK; + + lr_reg->priority = (lrv >> GICH_LR_PRIORITY_SHIFT) & GICH_LR_PRIORITY_MASK; + lr_reg->state = (lrv >> GICH_LR_STATE_SHIFT) & GICH_LR_STATE_MASK; + lr_reg->hw_status = (lrv >> GICH_LR_HW_SHIFT) & GICH_LR_HW_MASK; + lr_reg->grp = (lrv >> GICH_LR_GRP_SHIFT) & GICH_LR_GRP_MASK; +} + +static void gicv3_write_lr(int lr_reg, const struct gic_lr *lr) +{ + uint64_t lrv = 0; + + lrv = ( ((u64)(lr->pirq & GICH_LR_PHYSICAL_MASK) << GICH_LR_PHYSICAL_SHIFT)| + ((u64)(lr->virq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT) | + ((u64)(lr->priority & GICH_LR_PRIORITY_MASK) << GICH_LR_PRIORITY_SHIFT)| + ((u64)(lr->state & GICH_LR_STATE_MASK) << GICH_LR_STATE_SHIFT) | + ((u64)(lr->hw_status & GICH_LR_HW_MASK) << GICH_LR_HW_SHIFT) | + ((u64)(lr->grp & GICH_LR_GRP_MASK) << GICH_LR_GRP_SHIFT) ); + + gicv3_ich_write_lr(lr_reg, lrv); +} + +static int gicv_v3_init(struct domain *d) +{ + int i; + + /* + * Domain 0 gets the hardware address. + * Guests get the virtual platform layout. + */ + if ( is_hardware_domain(d) ) + { + d->arch.vgic.dbase = gicv3.dbase; + d->arch.vgic.dbase_size = gicv3.dbase_size; + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + d->arch.vgic.rbase[i] = gicv3.rdist_regions[i].base; + d->arch.vgic.rbase_size[i] = gicv3.rdist_regions[i].size; + } + d->arch.vgic.rdist_stride = gicv3.rdist_stride; + d->arch.vgic.rdist_count = gicv3.rdist_count; + } + else + d->arch.vgic.dbase = GUEST_GICD_BASE; + + d->arch.vgic.nr_lines = 0; + + return 0; +} + +static void gicv3_hcr_status(uint32_t flag, bool_t status) +{ + uint32_t hcr; + + hcr = READ_SYSREG32(ICH_HCR_EL2); + if ( status ) + WRITE_SYSREG32(hcr | flag, ICH_HCR_EL2); + else + WRITE_SYSREG32(hcr & (~flag), ICH_HCR_EL2); + isb(); +} + +static unsigned int gicv3_read_vmcr_priority(void) +{ + return ((READ_SYSREG32(ICH_VMCR_EL2) >> GICH_VMCR_PRIORITY_SHIFT) & + GICH_VMCR_PRIORITY_MASK); +} + +/* Only support reading GRP1 APRn registers */ +static unsigned int gicv3_read_apr(int apr_reg) +{ + switch ( apr_reg ) + { + case 0: + ASSERT(gicv3.nr_priorities > 4 && gicv3.nr_priorities < 8); + return READ_SYSREG32(ICH_AP1R0_EL2); + case 1: + ASSERT(gicv3.nr_priorities > 5 && gicv3.nr_priorities < 8); + return READ_SYSREG32(ICH_AP1R1_EL2); + case 2: + ASSERT(gicv3.nr_priorities > 6 && gicv3.nr_priorities < 8); + return READ_SYSREG32(ICH_AP1R2_EL2); + default: + BUG(); + } +} + +static void gicv3_irq_enable(struct irq_desc *desc) +{ + unsigned long flags; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv3.lock, flags); + clear_bit(_IRQ_DISABLED, &desc->status); + dsb(sy); + /* Enable routing */ + gicv3_unmask_irq(desc); + spin_unlock_irqrestore(&gicv3.lock, flags); +} + +static void gicv3_irq_disable(struct irq_desc *desc) +{ + unsigned long flags; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv3.lock, flags); + /* Disable routing */ + gicv3_mask_irq(desc); + set_bit(_IRQ_DISABLED, &desc->status); + spin_unlock_irqrestore(&gicv3.lock, flags); +} + +static unsigned int gicv3_irq_startup(struct irq_desc *desc) +{ + gicv3_irq_enable(desc); + + return 0; +} + +static void gicv3_irq_shutdown(struct irq_desc *desc) +{ + gicv3_irq_disable(desc); +} + +static void gicv3_irq_ack(struct irq_desc *desc) +{ + /* No ACK -- reading IAR has done this for us */ +} + +static void gicv3_host_irq_end(struct irq_desc *desc) +{ + /* Lower the priority */ + gicv3_eoi_irq(desc); + /* Deactivate */ + gicv3_dir_irq(desc); +} + +static void gicv3_guest_irq_end(struct irq_desc *desc) +{ + /* Lower the priority of the IRQ */ + gicv3_eoi_irq(desc); + /* Deactivation happens in maintenance interrupt / via GICV */ +} + +static void gicv3_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) +{ + unsigned int cpu; + uint64_t affinity; + + ASSERT(!cpumask_empty(mask)); + + spin_lock(&gicv3.lock); + + cpu = gicv3_get_cpu_from_mask(mask); + affinity = gicv3_mpidr_to_affinity(cpu); + /* Make sure we don't broadcast the interrupt */ + affinity &= ~GICD_IROUTER_SPI_MODE_ANY; + + if ( desc->irq >= NR_GIC_LOCAL_IRQS ) + writeq_relaxed(affinity, (GICD + GICD_IROUTER + desc->irq * 8)); + + spin_unlock(&gicv3.lock); +} + +static const hw_irq_controller gicv3_host_irq_type = { + .typename = "gic-v3", + .startup = gicv3_irq_startup, + .shutdown = gicv3_irq_shutdown, + .enable = gicv3_irq_enable, + .disable = gicv3_irq_disable, + .ack = gicv3_irq_ack, + .end = gicv3_host_irq_end, + .set_affinity = gicv3_irq_set_affinity, +}; + +static const hw_irq_controller gicv3_guest_irq_type = { + .typename = "gic-v3", + .startup = gicv3_irq_startup, + .shutdown = gicv3_irq_shutdown, + .enable = gicv3_irq_enable, + .disable = gicv3_irq_disable, + .ack = gicv3_irq_ack, + .end = gicv3_guest_irq_end, + .set_affinity = gicv3_irq_set_affinity, +}; + +static const struct gic_hw_operations gicv3_ops = { + .info = &gicv3_info, + .save_state = gicv3_save_state, + .restore_state = gicv3_restore_state, + .dump_state = gicv3_dump_state, + .gicv_setup = gicv_v3_init, + .gic_host_irq_type = &gicv3_host_irq_type, + .gic_guest_irq_type = &gicv3_guest_irq_type, + .eoi_irq = gicv3_eoi_irq, + .deactivate_irq = gicv3_dir_irq, + .read_irq = gicv3_read_irq, + .set_irq_properties = gicv3_set_irq_properties, + .send_SGI = gicv3_send_sgi, + .disable_interface = gicv3_disable_interface, + .update_lr = gicv3_update_lr, + .update_hcr_status = gicv3_hcr_status, + .clear_lr = gicv3_clear_lr, + .read_lr = gicv3_read_lr, + .write_lr = gicv3_write_lr, + .read_vmcr_priority = gicv3_read_vmcr_priority, + .read_apr = gicv3_read_apr, + .secondary_init = gicv3_secondary_cpu_init, +}; + +/* Set up the GIC */ +static int __init gicv3_init(struct dt_device_node *node, const void *data) +{ + struct rdist_region *rdist_regs; + int res, i; + uint32_t reg; + + dt_device_set_used_by(node, DOMID_XEN); + + res = dt_device_get_address(node, 0, &gicv3.dbase, &gicv3.dbase_size); + if ( res || !gicv3.dbase ) + panic("GICv3: Cannot find a valid distributor address"); + + if ( (gicv3.dbase & ~PAGE_MASK) || (gicv3.dbase_size & ~PAGE_MASK) ) + panic("GICv3: Found unaligned distributor address %"PRIpaddr"", + gicv3.dbase); + + gicv3.map_dbase = ioremap_nocache(gicv3.dbase, gicv3.dbase_size); + if ( !gicv3.map_dbase ) + panic("GICv3: Failed to ioremap for GIC distributor\n"); + + reg = readl_relaxed(GICD + GICD_PIDR2) & GICD_PIDR2_ARCH_REV_MASK; + if ( ((reg >> GICD_PIDR2_ARCH_REV_SHIFT) != GICD_PIDR2_ARCH_GICV3) ) + panic("GICv3: no distributor detected\n"); + + if ( !dt_property_read_u32(node, "#redistributor-regions", + &gicv3.rdist_count) ) + gicv3.rdist_count = 1; + + if ( gicv3.rdist_count > MAX_RDIST_COUNT ) + panic("GICv3: Number of redistributor regions is more than" + "%d (Increase MAX_RDIST_COUNT!!)\n", MAX_RDIST_COUNT); + + rdist_regs = xzalloc_array(struct rdist_region, gicv3.rdist_count); + if ( !rdist_regs ) + panic("GICv3: Failed to allocate memory for rdist regions\n"); + + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + uint64_t rdist_base, rdist_size; + + res = dt_device_get_address(node, 1 + i, &rdist_base, &rdist_size); + if ( res || !rdist_base ) + panic("GICv3: No rdist base found for region %d\n", i); + + rdist_regs[i].base = rdist_base; + rdist_regs[i].size = rdist_size; + } + + /* If stride is not set in dt. Set default to 2 * SZ_64K */ + if ( !dt_property_read_u32(node, "redistributor-stride", &gicv3.rdist_stride) ) + gicv3.rdist_stride = 0; + + gicv3.rdist_regions= rdist_regs; + + res = platform_get_irq(node, 0); + if ( res < 0 ) + panic("GICv3: Cannot find the maintenance IRQ"); + gicv3_info.maintenance_irq = res; + + /* Set the GIC as the primary interrupt controller */ + dt_interrupt_controller = node; + + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + /* map dbase & rdist regions */ + gicv3.rdist_regions[i].map_base = + ioremap_nocache(gicv3.rdist_regions[i].base, + gicv3.rdist_regions[i].size); + + if ( !gicv3.rdist_regions[i].map_base ) + panic("GICv3: Failed to ioremap rdist region for region %d\n", i); + } + + printk("GICv3 initialization:\n" + " gic_dist_addr=%"PRIpaddr"\n" + " gic_dist_size=%"PRIpaddr"\n" + " gic_dist_mapaddr=%p\n" + " gic_rdist_regions=%d\n" + " gic_rdist_stride=%x\n" + " gic_rdist_base=%"PRIpaddr"\n" + " gic_rdist_base_size=%"PRIpaddr"\n" + " gic_rdist_base_mapaddr=%p\n" + " gic_maintenance_irq=%u\n", + gicv3.dbase, gicv3.dbase_size, gicv3.map_dbase, gicv3.rdist_count, + gicv3.rdist_stride, gicv3.rdist_regions[0].base, + gicv3.rdist_regions[0].size, gicv3.rdist_regions[0].map_base, + gicv3_info.maintenance_irq); + + spin_lock_init(&gicv3.lock); + + spin_lock(&gicv3.lock); + + gicv3_dist_init(); + res = gicv3_cpu_init(); + gicv3_hyp_init(); + + gicv3_info.hw_version = GIC_V3; + /* Register hw ops*/ + register_gic_ops(&gicv3_ops); + + spin_unlock(&gicv3.lock); + + return res; +} + +static const char * const gicv3_dt_compat[] __initconst = +{ + DT_COMPAT_GIC_V3, + NULL +}; + +DT_DEVICE_START(gicv3, "GICv3", DEVICE_GIC) + .compatible = gicv3_dt_compat, + .init = gicv3_init, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 32d0554..787e93c 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -99,6 +99,14 @@ struct arch_domain /* Base address for guest GIC */ paddr_t dbase; /* Distributor base address */ paddr_t cbase; /* CPU base address */ +#ifdef CONFIG_ARM_64 + /* GIC V3 addressing */ + paddr_t dbase_size; /* Distributor base size */ + paddr_t rbase[MAX_RDIST_COUNT]; /* Re-Distributor base address */ + paddr_t rbase_size[MAX_RDIST_COUNT]; /* Re-Distributor size */ + uint32_t rdist_stride; /* Re-Distributor stride */ + int rdist_count; /* No. of Re-Distributors */ +#endif } vgic; struct vuart { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index a0c07bf..c4daf5b 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -18,6 +18,10 @@ #ifndef __ASM_ARM_GIC_H__ #define __ASM_ARM_GIC_H__ +#define NR_GIC_LOCAL_IRQS NR_LOCAL_IRQS +#define NR_GIC_SGI 16 +#define MAX_RDIST_COUNT 4 + #define GICD_CTLR (0x000) #define GICD_TYPER (0x004) #define GICD_IIDR (0x008) @@ -154,6 +158,20 @@ #define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7) +#define DT_COMPAT_GIC_V3 "arm,gic-v3" + +#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_V3) + +/* + * GICv3 registers that needs to be saved/restored + */ +struct gic_v3 { + uint32_t hcr, vmcr, sre_el1; + uint32_t apr0[4]; + uint32_t apr1[4]; + uint64_t lr[16]; +}; + /* * GICv2 register that needs to be saved/restored * on VCPU context switch @@ -170,6 +188,7 @@ struct gic_v2 { */ union gic_state_data { struct gic_v2 v2; + struct gic_v3 v3; }; /* @@ -189,6 +208,7 @@ struct gic_lr { enum gic_version { GIC_V2, + GIC_V3, }; extern enum gic_version gic_hw_version(void); diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h new file mode 100644 index 0000000..6c8ff26 --- /dev/null +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -0,0 +1,154 @@ +/* + * ARM Generic Interrupt Controller v3 definitions + * + * Vijaya Kumar K + * Copyright (c) 2014 Cavium Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASM_ARM_GIC_V3_DEFS_H__ +#define __ASM_ARM_GIC_V3_DEFS_H__ + +/* + * Additional registers defined in GIC v3. + * Common GICD registers are defined in gic.h + */ + +#define GICD_STATUSR (0x010) +#define GICD_SETSPI_NSR (0x040) +#define GICD_CLRSPI_NSR (0x048) +#define GICD_SETSPI_SR (0x050) +#define GICD_CLRSPI_SR (0x058) +#define GICD_IROUTER (0x6000) +#define GICD_IROUTER31 (0x60F8) +#define GICD_IROUTER32 (0x6100) +#define GICD_IROUTERN (0x7FF8) +#define GICD_PIDR0 (0xFFE0) +#define GICD_PIDR1 (0xFFE4) +#define GICD_PIDR2 (0xFFE8) +#define GICD_PIDR3 (0xFFEC) +#define GICD_PIDR4 (0xFFD0) +#define GICD_PIDR5 (0xFFD4) +#define GICD_PIDR7 (0xFFDC) + +#define GICC_SRE_EL2_SRE (1UL << 0) +#define GICC_SRE_EL2_DFB (1UL << 1) +#define GICC_SRE_EL2_DIB (1UL << 2) +#define GICC_SRE_EL2_ENEL1 (1UL << 3) + +#define GICD_CTLR_RWP (1UL << 31) +#define GICD_CTLR_ARE_NS (1U << 4) +#define GICD_CTLR_ENABLE_G1A (1U << 1) +#define GICD_CTLR_ENABLE_G1 (1U << 0) +#define GICD_IROUTER_SPI_MODE_ANY (1UL << 31) + +#define GICC_CTLR_EL1_EOImode_drop (1U << 1) + +#define GICR_WAKER_ProcessorSleep (1U << 1) +#define GICR_WAKER_ChildrenAsleep (1U << 2) + +#define GICD_PIDR2_ARCH_REV_MASK (0xf0) +#define GICD_PIDR2_ARCH_REV_SHIFT (0x4) +#define GICD_PIDR2_ARCH_GICV3 (0x3) + +#define GICR_PIDR2_ARCH_REV_MASK GICD_PIDR2_ARCH_REV_MASK +#define GICR_PIDR2_ARCH_REV_SHIFT GICD_PIDR2_ARCH_REV_SHIFT +#define GICR_PIDR2_ARCH_GICV3 GICD_PIDR2_ARCH_GICV3 + +#define GICR_SYNCR_NOT_BUSY 1 +/* + * Implementation defined value JEP106? + * use physical hw value for now + */ +#define GICV3_GICD_IIDR_VAL 0x34c +#define GICV3_GICR_IIDR_VAL GICV3_GICD_IIDR_VAL + +#define GICR_CTLR (0x0000) +#define GICR_IIDR (0x0004) +#define GICR_TYPER (0x0008) +#define GICR_STATUSR (0x0010) +#define GICR_WAKER (0x0014) +#define GICR_SETLPIR (0x0040) +#define GICR_CLRLPIR (0x0048) +#define GICR_PROPBASER (0x0070) +#define GICR_PENDBASER (0x0078) +#define GICR_INVLPIR (0x00A0) +#define GICR_INVALLR (0x00B0) +#define GICR_SYNCR (0x00C0) +#define GICR_MOVLPIR (0x100) +#define GICR_MOVALLR (0x0110) +#define GICR_PIDR0 GICD_PIDR0 +#define GICR_PIDR1 GICD_PIDR1 +#define GICR_PIDR2 GICD_PIDR2 +#define GICR_PIDR3 GICD_PIDR3 +#define GICR_PIDR4 GICD_PIDR4 +#define GICR_PIDR5 GICD_PIDR5 +#define GICR_PIDR7 GICD_PIDR7 + +/* GICR for SGI's & PPI's */ + +#define GICR_IGROUPR0 (0x0080) +#define GICR_IGRPMODR0 (0x0F80) +#define GICR_ISENABLER0 (0x0100) +#define GICR_ICENABLER0 (0x0180) +#define GICR_ISPENDR0 (0x0200) +#define GICR_ICPENDR0 (0x0280) +#define GICR_ISACTIVER0 (0x0300) +#define GICR_ICACTIVER0 (0x0380) +#define GICR_IPRIORITYR0 (0x0400) +#define GICR_IPRIORITYR7 (0x041C) +#define GICR_ICFGR0 (0x0C00) +#define GICR_ICFGR1 (0x0C04) +#define GICR_NSACR (0x0E00) + +#define GICR_TYPER_PLPIS (1U << 0) +#define GICR_TYPER_VLPIS (1U << 1) +#define GICR_TYPER_LAST (1U << 4) + +#define DEFAULT_PMR_VALUE 0xff + +#define GICH_VMCR_EOI (1 << 9) +#define GICH_VMCR_VENG1 (1 << 1) + +#define GICH_LR_VIRTUAL_MASK 0xffff +#define GICH_LR_VIRTUAL_SHIFT 0 +#define GICH_LR_PHYSICAL_MASK 0x3ff +#define GICH_LR_PHYSICAL_SHIFT 32 +#define GICH_LR_STATE_MASK 0x3 +#define GICH_LR_STATE_SHIFT 62 +#define GICH_LR_PRIORITY_MASK 0xff +#define GICH_LR_PRIORITY_SHIFT 48 +#define GICH_LR_HW_MASK 0x1 +#define GICH_LR_HW_SHIFT 61 +#define GICH_LR_GRP_MASK 0x1 +#define GICH_LR_GRP_SHIFT 60 +#define GICH_LR_MAINTENANCE_IRQ (1UL<<41) +#define GICH_LR_GRP1 (1UL<<60) +#define GICH_LR_HW (1UL<<61) + +#define GICH_VTR_NRLRGS 0x3f +#define GICH_VTR_PRIBITS_MASK 0x7 +#define GICH_VTR_PRIBITS_SHIFT 29 + +#define GICH_VMCR_PRIORITY_MASK 0xff +#define GICH_VMCR_PRIORITY_SHIFT 24 + +#endif /* __ASM_ARM_GIC_V3_DEFS_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/processor.h b/xen/include/asm-arm/processor.h index 0cc5b6d..a13c368 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -20,6 +20,19 @@ #define AFFINITY_MASK(level) ~((_AC(0x1,U) << ((level) * MPIDR_LEVEL_BITS)) - 1) +/* + * Macros to extract affinity level. picked from kernel + */ + +#define MPIDR_LEVEL_BITS_SHIFT 3 +#define MPIDR_LEVEL_MASK ((1 << MPIDR_LEVEL_BITS) - 1) + +#define MPIDR_LEVEL_SHIFT(level) \ + (((1 << level) >> 1) << MPIDR_LEVEL_BITS_SHIFT) + +#define MPIDR_AFFINITY_LEVEL(mpidr, level) \ + ((mpidr >> MPIDR_LEVEL_SHIFT(level)) & MPIDR_LEVEL_MASK) + /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE _AC(0x80000000,U) #define TTBCR_N_MASK _AC(0x07,U) diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index b00871c..b4616ac 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -100,6 +100,59 @@ #define HSR_SYSREG_CNTP_CTL_EL0 HSR_SYSREG(3,3,c14,c2,1) #define HSR_SYSREG_CNTP_TVAL_EL0 HSR_SYSREG(3,3,c14,c2,0) +/* + * GIC System register assembly aliases picked from kernel + */ +#define ICC_PMR_EL1 S3_0_C4_C6_0 +#define ICC_DIR_EL1 S3_0_C12_C11_1 +#define ICC_SGI1R_EL1 S3_0_C12_C11_5 +#define ICC_EOIR1_EL1 S3_0_C12_C12_1 +#define ICC_IAR1_EL1 S3_0_C12_C12_0 +#define ICC_BPR1_EL1 S3_0_C12_C12_3 +#define ICC_CTLR_EL1 S3_0_C12_C12_4 +#define ICC_SRE_EL1 S3_0_C12_C12_5 +#define ICC_IGRPEN1_EL1 S3_0_C12_C12_7 + +#define ICH_VSEIR_EL2 S3_4_C12_C9_4 +#define ICC_SRE_EL2 S3_4_C12_C9_5 +#define ICH_HCR_EL2 S3_4_C12_C11_0 +#define ICH_VTR_EL2 S3_4_C12_C11_1 +#define ICH_MISR_EL2 S3_4_C12_C11_2 +#define ICH_EISR_EL2 S3_4_C12_C11_3 +#define ICH_ELSR_EL2 S3_4_C12_C11_5 +#define ICH_VMCR_EL2 S3_4_C12_C11_7 + +#define __LR0_EL2(x) S3_4_C12_C12_ ## x +#define __LR8_EL2(x) S3_4_C12_C13_ ## x + +#define ICH_LR0_EL2 __LR0_EL2(0) +#define ICH_LR1_EL2 __LR0_EL2(1) +#define ICH_LR2_EL2 __LR0_EL2(2) +#define ICH_LR3_EL2 __LR0_EL2(3) +#define ICH_LR4_EL2 __LR0_EL2(4) +#define ICH_LR5_EL2 __LR0_EL2(5) +#define ICH_LR6_EL2 __LR0_EL2(6) +#define ICH_LR7_EL2 __LR0_EL2(7) +#define ICH_LR8_EL2 __LR8_EL2(0) +#define ICH_LR9_EL2 __LR8_EL2(1) +#define ICH_LR10_EL2 __LR8_EL2(2) +#define ICH_LR11_EL2 __LR8_EL2(3) +#define ICH_LR12_EL2 __LR8_EL2(4) +#define ICH_LR13_EL2 __LR8_EL2(5) +#define ICH_LR14_EL2 __LR8_EL2(6) +#define ICH_LR15_EL2 __LR8_EL2(7) + +#define __AP0Rx_EL2(x) S3_4_C12_C8_ ## x +#define ICH_AP0R0_EL2 __AP0Rx_EL2(0) +#define ICH_AP0R1_EL2 __AP0Rx_EL2(1) +#define ICH_AP0R2_EL2 __AP0Rx_EL2(2) +#define ICH_AP0R3_EL2 __AP0Rx_EL2(3) + +#define __AP1Rx_EL2(x) S3_4_C12_C9_ ## x +#define ICH_AP1R0_EL2 __AP1Rx_EL2(0) +#define ICH_AP1R1_EL2 __AP1Rx_EL2(1) +#define ICH_AP1R2_EL2 __AP1Rx_EL2(2) +#define ICH_AP1R3_EL2 __AP1Rx_EL2(3) #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33: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 1XTzRL-0007tm-P0; Tue, 16 Sep 2014 20:33:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRK-0007td-Ew for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:30 +0000 Received: from [85.158.139.211:41825] by server-8.bemta-5.messagelabs.com id E9/53-22440-99E98145; Tue, 16 Sep 2014 20:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1410899606!14876652!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12943 invoked from network); 16 Sep 2014 20:33:27 -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; 16 Sep 2014 20:33:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRG-0007B5-1P for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRF-0007jp-W3 for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:26 +0000 Date: Tue, 16 Sep 2014 20:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add support for GIC v3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc183a0235e092bb0dd3cea97fc4ea55c490101e Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:45 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:55:56 2014 +0100 xen/arm: Add support for GIC v3 Add support for GIC v3 specification System register access(SRE) is enabled to access cpu and virtual interface registers based on kernel GICv3 driver. This patch adds only basic v3 support. Does not support Interrupt Translation support (ITS) Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/gic-v3.c | 1200 +++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/domain.h | 8 + xen/include/asm-arm/gic.h | 20 + xen/include/asm-arm/gic_v3_defs.h | 154 +++++ xen/include/asm-arm/processor.h | 13 + xen/include/asm-arm/sysregs.h | 53 ++ 7 files changed, 1449 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index c13206f..33765f6 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -11,6 +11,7 @@ obj-y += domctl.o obj-y += sysctl.o obj-y += domain_build.o obj-y += gic.o gic-v2.o +obj-$(CONFIG_ARM_64) += gic-v3.o obj-y += io.o obj-y += irq.o obj-y += kernel.o diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c new file mode 100644 index 0000000..6ccde02 --- /dev/null +++ b/xen/arch/arm/gic-v3.c @@ -0,0 +1,1200 @@ +/* + * xen/arch/arm/gic-v3.c + * + * ARM Generic Interrupt Controller support v3 version + * based on xen/arch/arm/gic-v2.c and kernel GICv3 driver + * + * Copyright (C) 2012,2013 - ARM Ltd + * Marc Zyngier + * + * Vijaya Kumar K , Cavium Inc + * ported to Xen + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct rdist_region { + paddr_t base; + paddr_t size; + void __iomem *map_base; +}; + +/* Global state */ +static struct { + paddr_t dbase; /* Address of distributor registers */ + paddr_t dbase_size; + void __iomem *map_dbase; /* Mapped address of distributor registers */ + struct rdist_region *rdist_regions; + uint32_t rdist_stride; + unsigned int rdist_count; /* Number of rdist regions count */ + unsigned int nr_priorities; + spinlock_t lock; +} gicv3; + +static struct gic_info gicv3_info; + +/* per-cpu re-distributor base */ +static DEFINE_PER_CPU(void __iomem*, rbase); + +#define GICD (gicv3.map_dbase) +#define GICD_RDIST_BASE (this_cpu(rbase)) +#define GICD_RDIST_SGI_BASE (GICD_RDIST_BASE + SZ_64K) + +/* + * Saves all 16(Max) LR registers. Though number of LRs implemented + * is implementation specific. + */ +static inline void gicv3_save_lrs(struct vcpu *v) +{ + /* Fall through for all the cases */ + switch ( gicv3_info.nr_lrs ) + { + case 16: + v->arch.gic.v3.lr[15] = READ_SYSREG(ICH_LR15_EL2); + case 15: + v->arch.gic.v3.lr[14] = READ_SYSREG(ICH_LR14_EL2); + case 14: + v->arch.gic.v3.lr[13] = READ_SYSREG(ICH_LR13_EL2); + case 13: + v->arch.gic.v3.lr[12] = READ_SYSREG(ICH_LR12_EL2); + case 12: + v->arch.gic.v3.lr[11] = READ_SYSREG(ICH_LR11_EL2); + case 11: + v->arch.gic.v3.lr[10] = READ_SYSREG(ICH_LR10_EL2); + case 10: + v->arch.gic.v3.lr[9] = READ_SYSREG(ICH_LR9_EL2); + case 9: + v->arch.gic.v3.lr[8] = READ_SYSREG(ICH_LR8_EL2); + case 8: + v->arch.gic.v3.lr[7] = READ_SYSREG(ICH_LR7_EL2); + case 7: + v->arch.gic.v3.lr[6] = READ_SYSREG(ICH_LR6_EL2); + case 6: + v->arch.gic.v3.lr[5] = READ_SYSREG(ICH_LR5_EL2); + case 5: + v->arch.gic.v3.lr[4] = READ_SYSREG(ICH_LR4_EL2); + case 4: + v->arch.gic.v3.lr[3] = READ_SYSREG(ICH_LR3_EL2); + case 3: + v->arch.gic.v3.lr[2] = READ_SYSREG(ICH_LR2_EL2); + case 2: + v->arch.gic.v3.lr[1] = READ_SYSREG(ICH_LR1_EL2); + case 1: + v->arch.gic.v3.lr[0] = READ_SYSREG(ICH_LR0_EL2); + break; + default: + BUG(); + } +} + +/* + * Restores all 16(Max) LR registers. Though number of LRs implemented + * is implementation specific. + */ +static inline void gicv3_restore_lrs(const struct vcpu *v) +{ + /* Fall through for all the cases */ + switch ( gicv3_info.nr_lrs ) + { + case 16: + WRITE_SYSREG(v->arch.gic.v3.lr[15], ICH_LR15_EL2); + case 15: + WRITE_SYSREG(v->arch.gic.v3.lr[14], ICH_LR14_EL2); + case 14: + WRITE_SYSREG(v->arch.gic.v3.lr[13], ICH_LR13_EL2); + case 13: + WRITE_SYSREG(v->arch.gic.v3.lr[12], ICH_LR12_EL2); + case 12: + WRITE_SYSREG(v->arch.gic.v3.lr[11], ICH_LR11_EL2); + case 11: + WRITE_SYSREG(v->arch.gic.v3.lr[10], ICH_LR10_EL2); + case 10: + WRITE_SYSREG(v->arch.gic.v3.lr[9], ICH_LR9_EL2); + case 9: + WRITE_SYSREG(v->arch.gic.v3.lr[8], ICH_LR8_EL2); + case 8: + WRITE_SYSREG(v->arch.gic.v3.lr[7], ICH_LR7_EL2); + case 7: + WRITE_SYSREG(v->arch.gic.v3.lr[6], ICH_LR6_EL2); + case 6: + WRITE_SYSREG(v->arch.gic.v3.lr[5], ICH_LR5_EL2); + case 5: + WRITE_SYSREG(v->arch.gic.v3.lr[4], ICH_LR4_EL2); + case 4: + WRITE_SYSREG(v->arch.gic.v3.lr[3], ICH_LR3_EL2); + case 3: + WRITE_SYSREG(v->arch.gic.v3.lr[2], ICH_LR2_EL2); + case 2: + WRITE_SYSREG(v->arch.gic.v3.lr[1], ICH_LR1_EL2); + case 1: + WRITE_SYSREG(v->arch.gic.v3.lr[0], ICH_LR0_EL2); + break; + default: + BUG(); + } +} + +static uint64_t gicv3_ich_read_lr(int lr) +{ + switch ( lr ) + { + case 0: return READ_SYSREG(ICH_LR0_EL2); + case 1: return READ_SYSREG(ICH_LR1_EL2); + case 2: return READ_SYSREG(ICH_LR2_EL2); + case 3: return READ_SYSREG(ICH_LR3_EL2); + case 4: return READ_SYSREG(ICH_LR4_EL2); + case 5: return READ_SYSREG(ICH_LR5_EL2); + case 6: return READ_SYSREG(ICH_LR6_EL2); + case 7: return READ_SYSREG(ICH_LR7_EL2); + case 8: return READ_SYSREG(ICH_LR8_EL2); + case 9: return READ_SYSREG(ICH_LR9_EL2); + case 10: return READ_SYSREG(ICH_LR10_EL2); + case 11: return READ_SYSREG(ICH_LR11_EL2); + case 12: return READ_SYSREG(ICH_LR12_EL2); + case 13: return READ_SYSREG(ICH_LR13_EL2); + case 14: return READ_SYSREG(ICH_LR14_EL2); + case 15: return READ_SYSREG(ICH_LR15_EL2); + default: + BUG(); + } +} + +static void gicv3_ich_write_lr(int lr, uint64_t val) +{ + switch ( lr ) + { + case 0: + WRITE_SYSREG(val, ICH_LR0_EL2); + break; + case 1: + WRITE_SYSREG(val, ICH_LR1_EL2); + break; + case 2: + WRITE_SYSREG(val, ICH_LR2_EL2); + break; + case 3: + WRITE_SYSREG(val, ICH_LR3_EL2); + break; + case 4: + WRITE_SYSREG(val, ICH_LR4_EL2); + break; + case 5: + WRITE_SYSREG(val, ICH_LR5_EL2); + break; + case 6: + WRITE_SYSREG(val, ICH_LR6_EL2); + break; + case 7: + WRITE_SYSREG(val, ICH_LR7_EL2); + break; + case 8: + WRITE_SYSREG(val, ICH_LR8_EL2); + break; + case 9: + WRITE_SYSREG(val, ICH_LR9_EL2); + break; + case 10: + WRITE_SYSREG(val, ICH_LR10_EL2); + break; + case 11: + WRITE_SYSREG(val, ICH_LR11_EL2); + break; + case 12: + WRITE_SYSREG(val, ICH_LR12_EL2); + break; + case 13: + WRITE_SYSREG(val, ICH_LR13_EL2); + break; + case 14: + WRITE_SYSREG(val, ICH_LR14_EL2); + break; + case 15: + WRITE_SYSREG(val, ICH_LR15_EL2); + break; + default: + return; + } + isb(); +} + +/* + * System Register Enable (SRE). Enable to access CPU & Virtual + * interface registers as system registers in EL2 + */ +static void gicv3_enable_sre(void) +{ + uint32_t val; + + val = READ_SYSREG32(ICC_SRE_EL2); + val |= GICC_SRE_EL2_SRE | GICC_SRE_EL2_ENEL1; + + WRITE_SYSREG32(val, ICC_SRE_EL2); + isb(); +} + +/* Wait for completion of a distributor change */ +static void gicv3_do_wait_for_rwp(void __iomem *base) +{ + uint32_t val; + bool_t timeout = 0; + s_time_t deadline = NOW() + MILLISECS(1000); + + do { + val = readl_relaxed(base + GICD_CTLR); + if ( !(val & GICD_CTLR_RWP) ) + break; + if ( NOW() > deadline ) + { + timeout = 1; + break; + } + cpu_relax(); + udelay(1); + } while ( 1 ); + + if ( timeout ) + dprintk(XENLOG_ERR, "RWP timeout\n"); +} + +static void gicv3_dist_wait_for_rwp(void) +{ + gicv3_do_wait_for_rwp(GICD); +} + +static void gicv3_redist_wait_for_rwp(void) +{ + gicv3_do_wait_for_rwp(GICD_RDIST_BASE); +} + +static void gicv3_wait_for_rwp(int irq) +{ + if ( irq < NR_LOCAL_IRQS ) + gicv3_redist_wait_for_rwp(); + else + gicv3_dist_wait_for_rwp(); +} + +static unsigned int gicv3_get_cpu_from_mask(const cpumask_t *cpumask) +{ + unsigned int cpu; + cpumask_t possible_mask; + + cpumask_and(&possible_mask, cpumask, &cpu_possible_map); + cpu = cpumask_any(&possible_mask); + + return cpu; +} + +static void restore_aprn_regs(const union gic_state_data *d) +{ + /* Write APRn register based on number of priorities + platform has implemented */ + switch ( gicv3.nr_priorities ) + { + case 7: + WRITE_SYSREG32(d->v3.apr0[2], ICH_AP0R2_EL2); + WRITE_SYSREG32(d->v3.apr1[2], ICH_AP1R2_EL2); + /* Fall through */ + case 6: + WRITE_SYSREG32(d->v3.apr0[1], ICH_AP0R1_EL2); + WRITE_SYSREG32(d->v3.apr1[1], ICH_AP1R1_EL2); + /* Fall through */ + case 5: + WRITE_SYSREG32(d->v3.apr0[0], ICH_AP0R0_EL2); + WRITE_SYSREG32(d->v3.apr1[0], ICH_AP1R0_EL2); + break; + default: + BUG(); + } +} + +static void save_aprn_regs(union gic_state_data *d) +{ + /* Read APRn register based on number of priorities + platform has implemented */ + switch ( gicv3.nr_priorities ) + { + case 7: + d->v3.apr0[2] = READ_SYSREG32(ICH_AP0R2_EL2); + d->v3.apr1[2] = READ_SYSREG32(ICH_AP1R2_EL2); + /* Fall through */ + case 6: + d->v3.apr0[1] = READ_SYSREG32(ICH_AP0R1_EL2); + d->v3.apr1[1] = READ_SYSREG32(ICH_AP1R1_EL2); + /* Fall through */ + case 5: + d->v3.apr0[0] = READ_SYSREG32(ICH_AP0R0_EL2); + d->v3.apr1[0] = READ_SYSREG32(ICH_AP1R0_EL2); + break; + default: + BUG(); + } +} + +/* + * As per section 4.8.17 of the GICv3 spec following + * registers are save and restored on guest swap + */ +static void gicv3_save_state(struct vcpu *v) +{ + + /* No need for spinlocks here because interrupts are disabled around + * this call and it only accesses struct vcpu fields that cannot be + * accessed simultaneously by another pCPU. + * + * Make sure all stores to the GIC via the memory mapped interface + * are now visible to the system register interface + */ + dsb(sy); + gicv3_save_lrs(v); + save_aprn_regs(&v->arch.gic); + v->arch.gic.v3.vmcr = READ_SYSREG32(ICH_VMCR_EL2); + v->arch.gic.v3.sre_el1 = READ_SYSREG32(ICC_SRE_EL1); +} + +static void gicv3_restore_state(const struct vcpu *v) +{ + WRITE_SYSREG32(v->arch.gic.v3.sre_el1, ICC_SRE_EL1); + WRITE_SYSREG32(v->arch.gic.v3.vmcr, ICH_VMCR_EL2); + restore_aprn_regs(&v->arch.gic); + gicv3_restore_lrs(v); + + /* + * Make sure all stores are visible the GIC + */ + dsb(sy); +} + +static void gicv3_dump_state(const struct vcpu *v) +{ + int i; + + if ( v == current ) + { + for ( i = 0; i < gicv3_info.nr_lrs; i++ ) + printk(" HW_LR[%d]=%lx\n", i, gicv3_ich_read_lr(i)); + } + else + { + for ( i = 0; i < gicv3_info.nr_lrs; i++ ) + printk(" VCPU_LR[%d]=%lx\n", i, v->arch.gic.v3.lr[i]); + } +} + +static void gicv3_poke_irq(struct irq_desc *irqd, u32 offset) +{ + u32 mask = 1 << (irqd->irq % 32); + void __iomem *base; + + if ( irqd->irq < NR_GIC_LOCAL_IRQS ) + base = GICD_RDIST_SGI_BASE; + else + base = GICD; + + writel_relaxed(mask, base + offset + (irqd->irq / 32) * 4); + gicv3_wait_for_rwp(irqd->irq); +} + +static void gicv3_unmask_irq(struct irq_desc *irqd) +{ + gicv3_poke_irq(irqd, GICD_ISENABLER); +} + +static void gicv3_mask_irq(struct irq_desc *irqd) +{ + gicv3_poke_irq(irqd, GICD_ICENABLER); +} + +static void gicv3_eoi_irq(struct irq_desc *irqd) +{ + /* Lower the priority */ + WRITE_SYSREG32(irqd->irq, ICC_EOIR1_EL1); + isb(); +} + +static void gicv3_dir_irq(struct irq_desc *irqd) +{ + /* Deactivate */ + WRITE_SYSREG32(irqd->irq, ICC_DIR_EL1); + isb(); +} + +static unsigned int gicv3_read_irq(void) +{ + return READ_SYSREG32(ICC_IAR1_EL1); +} + +static inline uint64_t gicv3_mpidr_to_affinity(int cpu) +{ + uint64_t mpidr = cpu_logical_map(cpu); + return (MPIDR_AFFINITY_LEVEL(mpidr, 3) << 32 | + MPIDR_AFFINITY_LEVEL(mpidr, 2) << 16 | + MPIDR_AFFINITY_LEVEL(mpidr, 1) << 8 | + MPIDR_AFFINITY_LEVEL(mpidr, 0)); +} + +static void gicv3_set_irq_properties(struct irq_desc *desc, + const cpumask_t *cpu_mask, + unsigned int priority) +{ + uint32_t cfg, edgebit; + uint64_t affinity; + void __iomem *base; + unsigned int cpu = gicv3_get_cpu_from_mask(cpu_mask); + unsigned int irq = desc->irq; + unsigned int type = desc->arch.type; + + /* SGI's are always edge-triggered not need to call GICD_ICFGR0 */ + ASSERT(irq >= NR_GIC_SGI); + + spin_lock(&gicv3.lock); + + if ( irq >= NR_GIC_LOCAL_IRQS) + base = GICD + GICD_ICFGR + (irq / 16) * 4; + else + base = GICD_RDIST_SGI_BASE + GICR_ICFGR1; + + cfg = readl_relaxed(base); + + edgebit = 2u << (2 * (irq % 16)); + if ( type & DT_IRQ_TYPE_LEVEL_MASK ) + cfg &= ~edgebit; + else if ( type & DT_IRQ_TYPE_EDGE_BOTH ) + cfg |= edgebit; + + writel_relaxed(cfg, base); + + affinity = gicv3_mpidr_to_affinity(cpu); + /* Make sure we don't broadcast the interrupt */ + affinity &= ~GICD_IROUTER_SPI_MODE_ANY; + + if ( irq >= NR_GIC_LOCAL_IRQS ) + writeq_relaxed(affinity, (GICD + GICD_IROUTER + irq * 8)); + + /* Set priority */ + if ( irq < NR_GIC_LOCAL_IRQS ) + writeb_relaxed(priority, GICD_RDIST_SGI_BASE + GICR_IPRIORITYR0 + irq); + else + writeb_relaxed(priority, GICD + GICD_IPRIORITYR + irq); + + spin_unlock(&gicv3.lock); +} + +static void __init gicv3_dist_init(void) +{ + uint32_t type; + uint32_t priority; + uint64_t affinity; + int i; + + /* Disable the distributor */ + writel_relaxed(0, GICD + GICD_CTLR); + + type = readl_relaxed(GICD + GICD_TYPER); + gicv3_info.nr_lines = 32 * ((type & GICD_TYPE_LINES) + 1); + + printk("GICv3: %d lines, (IID %8.8x).\n", + gicv3_info.nr_lines, readl_relaxed(GICD + GICD_IIDR)); + + /* Default all global IRQs to level, active low */ + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i += 16 ) + writel_relaxed(0, GICD + GICD_ICFGR + (i / 16) * 4); + + /* Default priority for global interrupts */ + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i += 4 ) + { + priority = (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | + GIC_PRI_IRQ << 8 | GIC_PRI_IRQ); + writel_relaxed(priority, GICD + GICD_IPRIORITYR + (i / 4) * 4); + } + + /* Disable all global interrupts */ + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i += 32 ) + writel_relaxed(0xffffffff, GICD + GICD_ICENABLER + (i / 32) * 4); + + gicv3_dist_wait_for_rwp(); + + /* Turn on the distributor */ + writel_relaxed(GICD_CTL_ENABLE | GICD_CTLR_ARE_NS | + GICD_CTLR_ENABLE_G1A | GICD_CTLR_ENABLE_G1, GICD + GICD_CTLR); + + /* Route all global IRQs to this CPU */ + affinity = gicv3_mpidr_to_affinity(smp_processor_id()); + /* Make sure we don't broadcast the interrupt */ + affinity &= ~GICD_IROUTER_SPI_MODE_ANY; + + for ( i = NR_GIC_LOCAL_IRQS; i < gicv3_info.nr_lines; i++ ) + writeq_relaxed(affinity, GICD + GICD_IROUTER + i * 8); +} + +static int gicv3_enable_redist(void) +{ + uint32_t val; + bool_t timeout = 0; + s_time_t deadline = NOW() + MILLISECS(1000); + + /* Wake up this CPU redistributor */ + val = readl_relaxed(GICD_RDIST_BASE + GICR_WAKER); + val &= ~GICR_WAKER_ProcessorSleep; + writel_relaxed(val, GICD_RDIST_BASE + GICR_WAKER); + + do { + val = readl_relaxed(GICD_RDIST_BASE + GICR_WAKER); + if ( !(val & GICR_WAKER_ChildrenAsleep) ) + break; + if ( NOW() > deadline ) + { + timeout = 1; + break; + } + cpu_relax(); + udelay(1); + } while ( timeout ); + + if ( timeout ) + { + dprintk(XENLOG_ERR, "GICv3: Redist enable RWP timeout\n"); + return 1; + } + + return 0; +} + +static int __init gicv3_populate_rdist(void) +{ + int i; + uint32_t aff; + uint32_t reg; + uint64_t typer; + uint64_t mpidr = cpu_logical_map(smp_processor_id()); + + /* + * If we ever get a cluster of more than 16 CPUs, just scream. + */ + if ( (mpidr & 0xff) >= 16 ) + dprintk(XENLOG_WARNING, "GICv3:Cluster with more than 16's cpus\n"); + + /* + * Convert affinity to a 32bit value that can be matched to GICR_TYPER + * bits [63:32] + */ + aff = (MPIDR_AFFINITY_LEVEL(mpidr, 3) << 24 | + MPIDR_AFFINITY_LEVEL(mpidr, 2) << 16 | + MPIDR_AFFINITY_LEVEL(mpidr, 1) << 8 | + MPIDR_AFFINITY_LEVEL(mpidr, 0)); + + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + void __iomem *ptr = gicv3.rdist_regions[i].map_base; + + reg = readl_relaxed(ptr + GICR_PIDR2) & GICR_PIDR2_ARCH_REV_MASK; + if ( (reg >> GICR_PIDR2_ARCH_REV_SHIFT) != GICR_PIDR2_ARCH_GICV3 ) + { + dprintk(XENLOG_ERR, + "GICv3: No redistributor present @%"PRIpaddr"\n", + gicv3.rdist_regions[i].base); + break; + } + + do { + typer = readq_relaxed(ptr + GICR_TYPER); + + if ( (typer >> 32) == aff ) + { + this_cpu(rbase) = ptr; + printk("GICv3: CPU%d: Found redistributor in region %d @%p\n", + smp_processor_id(), i, ptr); + return 0; + } + if ( gicv3.rdist_stride ) + ptr += gicv3.rdist_stride; + else + { + ptr += SZ_64K * 2; + if ( typer & GICR_TYPER_VLPIS ) + ptr += SZ_64K * 2; /* Skip VLPI_base + reserved page */ + } + + } while ( !(typer & GICR_TYPER_LAST) ); + } + + dprintk(XENLOG_ERR, "GICv3: CPU%d: mpidr 0x%x has no re-distributor!\n", + smp_processor_id(), cpu_logical_map(smp_processor_id())); + + return -ENODEV; +} + +static int __cpuinit gicv3_cpu_init(void) +{ + int i; + uint32_t priority; + + /* Register ourselves with the rest of the world */ + if ( gicv3_populate_rdist() ) + return -ENODEV; + + if ( gicv3_enable_redist() ) + return -ENODEV; + + /* Set priority on PPI and SGI interrupts */ + priority = (GIC_PRI_IPI << 24 | GIC_PRI_IPI << 16 | GIC_PRI_IPI << 8 | + GIC_PRI_IPI); + for (i = 0; i < NR_GIC_SGI; i += 4) + writel_relaxed(priority, + GICD_RDIST_SGI_BASE + GICR_IPRIORITYR0 + (i / 4) * 4); + + priority = (GIC_PRI_IRQ << 24 | GIC_PRI_IRQ << 16 | GIC_PRI_IRQ << 8 | + GIC_PRI_IRQ); + for (i = NR_GIC_SGI; i < NR_GIC_LOCAL_IRQS; i += 4) + writel_relaxed(priority, + GICD_RDIST_SGI_BASE + GICR_IPRIORITYR0 + (i / 4) * 4); + + /* + * Disable all PPI interrupts, ensure all SGI interrupts are + * enabled. + */ + writel_relaxed(0xffff0000, GICD_RDIST_SGI_BASE + GICR_ICENABLER0); + writel_relaxed(0x0000ffff, GICD_RDIST_SGI_BASE + GICR_ISENABLER0); + + gicv3_redist_wait_for_rwp(); + + /* Enable system registers */ + gicv3_enable_sre(); + + /* No priority grouping */ + WRITE_SYSREG32(0, ICC_BPR1_EL1); + + /* Set priority mask register */ + WRITE_SYSREG32(DEFAULT_PMR_VALUE, ICC_PMR_EL1); + + /* EOI drops priority too (mode 0) */ + WRITE_SYSREG32(GICC_CTLR_EL1_EOImode_drop, ICC_CTLR_EL1); + + /* Enable Group1 interrupts */ + WRITE_SYSREG32(1, ICC_IGRPEN1_EL1); + + /* Sync at once at the end of cpu interface configuration */ + isb(); + + return 0; +} + +static void gicv3_cpu_disable(void) +{ + WRITE_SYSREG32(0, ICC_CTLR_EL1); + isb(); +} + +static void __cpuinit gicv3_hyp_init(void) +{ + uint32_t vtr; + + vtr = READ_SYSREG32(ICH_VTR_EL2); + gicv3_info.nr_lrs = (vtr & GICH_VTR_NRLRGS) + 1; + gicv3.nr_priorities = ((vtr >> GICH_VTR_PRIBITS_SHIFT) & + GICH_VTR_PRIBITS_MASK) + 1; + + if ( !((gicv3.nr_priorities > 4) && (gicv3.nr_priorities < 8)) ) + panic("GICv3: Invalid number of priority bits\n"); + + WRITE_SYSREG32(GICH_VMCR_EOI | GICH_VMCR_VENG1, ICH_VMCR_EL2); + WRITE_SYSREG32(GICH_HCR_EN, ICH_HCR_EL2); +} + +/* Set up the per-CPU parts of the GIC for a secondary CPU */ +static int gicv3_secondary_cpu_init(void) +{ + int res; + + spin_lock(&gicv3.lock); + + res = gicv3_cpu_init(); + gicv3_hyp_init(); + + spin_unlock(&gicv3.lock); + + return res; +} + +static void __cpuinit gicv3_hyp_disable(void) +{ + uint32_t hcr; + + hcr = READ_SYSREG32(ICH_HCR_EL2); + hcr &= ~GICH_HCR_EN; + WRITE_SYSREG32(hcr, ICH_HCR_EL2); + isb(); +} + +static u16 gicv3_compute_target_list(int *base_cpu, const struct cpumask *mask, + uint64_t cluster_id) +{ + int cpu = *base_cpu; + uint64_t mpidr = cpu_logical_map(cpu); + u16 tlist = 0; + + while ( cpu < nr_cpu_ids ) + { + /* + * Assume that each cluster does not have more than 16 CPU's. + * Check is made during GICv3 initialization (gicv3_populate_rdist()) + * on mpidr value for this. So skip this check here. + */ + tlist |= 1 << (mpidr & 0xf); + + cpu = cpumask_next(cpu, mask); + if ( cpu == nr_cpu_ids ) + { + cpu--; + goto out; + } + + mpidr = cpu_logical_map(cpu); + if ( cluster_id != (mpidr & ~MPIDR_AFF0_MASK) ) { + cpu--; + goto out; + } + } +out: + *base_cpu = cpu; + + return tlist; +} + +static void gicv3_send_sgi(enum gic_sgi sgi, enum gic_sgi_mode mode, + const cpumask_t *cpumask) +{ + int cpu = 0; + uint64_t val; + + for_each_cpu(cpu, cpumask) + { + /* Mask lower 8 bits. It represent cpu in affinity level 0 */ + uint64_t cluster_id = cpu_logical_map(cpu) & ~MPIDR_AFF0_MASK; + u16 tlist; + + /* Get targetlist for the cluster to send SGI */ + tlist = gicv3_compute_target_list(&cpu, cpumask, cluster_id); + + /* + * Prepare affinity path of the cluster for which SGI is generated + * along with SGI number + */ + val = (MPIDR_AFFINITY_LEVEL(cluster_id, 3) << 48 | + MPIDR_AFFINITY_LEVEL(cluster_id, 2) << 32 | + sgi << 24 | + MPIDR_AFFINITY_LEVEL(cluster_id, 1) << 16 | + tlist); + + WRITE_SYSREG(val, ICC_SGI1R_EL1); + } + /* Force above writes to ICC_SGI1R_EL1 */ + isb(); +} + +/* Shut down the per-CPU GIC interface */ +static void gicv3_disable_interface(void) +{ + spin_lock(&gicv3.lock); + + gicv3_cpu_disable(); + gicv3_hyp_disable(); + + spin_unlock(&gicv3.lock); +} + +static void gicv3_update_lr(int lr, const struct pending_irq *p, + unsigned int state) +{ + uint64_t grp = GICH_LR_GRP1; + uint64_t val = 0; + + BUG_ON(lr >= gicv3_info.nr_lrs); + BUG_ON(lr < 0); + + val = (((uint64_t)state & 0x3) << GICH_LR_STATE_SHIFT) | grp; + val |= ((uint64_t)p->priority & 0xff) << GICH_LR_PRIORITY_SHIFT; + val |= ((uint64_t)p->irq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT; + + if ( p->desc != NULL ) + val |= GICH_LR_HW | (((uint64_t)p->desc->irq & GICH_LR_PHYSICAL_MASK) + << GICH_LR_PHYSICAL_SHIFT); + + gicv3_ich_write_lr(lr, val); +} + +static void gicv3_clear_lr(int lr) +{ + gicv3_ich_write_lr(lr, 0); +} + +static void gicv3_read_lr(int lr, struct gic_lr *lr_reg) +{ + uint64_t lrv; + + lrv = gicv3_ich_read_lr(lr); + + lr_reg->pirq = (lrv >> GICH_LR_PHYSICAL_SHIFT) & GICH_LR_PHYSICAL_MASK; + lr_reg->virq = (lrv >> GICH_LR_VIRTUAL_SHIFT) & GICH_LR_VIRTUAL_MASK; + + lr_reg->priority = (lrv >> GICH_LR_PRIORITY_SHIFT) & GICH_LR_PRIORITY_MASK; + lr_reg->state = (lrv >> GICH_LR_STATE_SHIFT) & GICH_LR_STATE_MASK; + lr_reg->hw_status = (lrv >> GICH_LR_HW_SHIFT) & GICH_LR_HW_MASK; + lr_reg->grp = (lrv >> GICH_LR_GRP_SHIFT) & GICH_LR_GRP_MASK; +} + +static void gicv3_write_lr(int lr_reg, const struct gic_lr *lr) +{ + uint64_t lrv = 0; + + lrv = ( ((u64)(lr->pirq & GICH_LR_PHYSICAL_MASK) << GICH_LR_PHYSICAL_SHIFT)| + ((u64)(lr->virq & GICH_LR_VIRTUAL_MASK) << GICH_LR_VIRTUAL_SHIFT) | + ((u64)(lr->priority & GICH_LR_PRIORITY_MASK) << GICH_LR_PRIORITY_SHIFT)| + ((u64)(lr->state & GICH_LR_STATE_MASK) << GICH_LR_STATE_SHIFT) | + ((u64)(lr->hw_status & GICH_LR_HW_MASK) << GICH_LR_HW_SHIFT) | + ((u64)(lr->grp & GICH_LR_GRP_MASK) << GICH_LR_GRP_SHIFT) ); + + gicv3_ich_write_lr(lr_reg, lrv); +} + +static int gicv_v3_init(struct domain *d) +{ + int i; + + /* + * Domain 0 gets the hardware address. + * Guests get the virtual platform layout. + */ + if ( is_hardware_domain(d) ) + { + d->arch.vgic.dbase = gicv3.dbase; + d->arch.vgic.dbase_size = gicv3.dbase_size; + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + d->arch.vgic.rbase[i] = gicv3.rdist_regions[i].base; + d->arch.vgic.rbase_size[i] = gicv3.rdist_regions[i].size; + } + d->arch.vgic.rdist_stride = gicv3.rdist_stride; + d->arch.vgic.rdist_count = gicv3.rdist_count; + } + else + d->arch.vgic.dbase = GUEST_GICD_BASE; + + d->arch.vgic.nr_lines = 0; + + return 0; +} + +static void gicv3_hcr_status(uint32_t flag, bool_t status) +{ + uint32_t hcr; + + hcr = READ_SYSREG32(ICH_HCR_EL2); + if ( status ) + WRITE_SYSREG32(hcr | flag, ICH_HCR_EL2); + else + WRITE_SYSREG32(hcr & (~flag), ICH_HCR_EL2); + isb(); +} + +static unsigned int gicv3_read_vmcr_priority(void) +{ + return ((READ_SYSREG32(ICH_VMCR_EL2) >> GICH_VMCR_PRIORITY_SHIFT) & + GICH_VMCR_PRIORITY_MASK); +} + +/* Only support reading GRP1 APRn registers */ +static unsigned int gicv3_read_apr(int apr_reg) +{ + switch ( apr_reg ) + { + case 0: + ASSERT(gicv3.nr_priorities > 4 && gicv3.nr_priorities < 8); + return READ_SYSREG32(ICH_AP1R0_EL2); + case 1: + ASSERT(gicv3.nr_priorities > 5 && gicv3.nr_priorities < 8); + return READ_SYSREG32(ICH_AP1R1_EL2); + case 2: + ASSERT(gicv3.nr_priorities > 6 && gicv3.nr_priorities < 8); + return READ_SYSREG32(ICH_AP1R2_EL2); + default: + BUG(); + } +} + +static void gicv3_irq_enable(struct irq_desc *desc) +{ + unsigned long flags; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv3.lock, flags); + clear_bit(_IRQ_DISABLED, &desc->status); + dsb(sy); + /* Enable routing */ + gicv3_unmask_irq(desc); + spin_unlock_irqrestore(&gicv3.lock, flags); +} + +static void gicv3_irq_disable(struct irq_desc *desc) +{ + unsigned long flags; + + ASSERT(spin_is_locked(&desc->lock)); + + spin_lock_irqsave(&gicv3.lock, flags); + /* Disable routing */ + gicv3_mask_irq(desc); + set_bit(_IRQ_DISABLED, &desc->status); + spin_unlock_irqrestore(&gicv3.lock, flags); +} + +static unsigned int gicv3_irq_startup(struct irq_desc *desc) +{ + gicv3_irq_enable(desc); + + return 0; +} + +static void gicv3_irq_shutdown(struct irq_desc *desc) +{ + gicv3_irq_disable(desc); +} + +static void gicv3_irq_ack(struct irq_desc *desc) +{ + /* No ACK -- reading IAR has done this for us */ +} + +static void gicv3_host_irq_end(struct irq_desc *desc) +{ + /* Lower the priority */ + gicv3_eoi_irq(desc); + /* Deactivate */ + gicv3_dir_irq(desc); +} + +static void gicv3_guest_irq_end(struct irq_desc *desc) +{ + /* Lower the priority of the IRQ */ + gicv3_eoi_irq(desc); + /* Deactivation happens in maintenance interrupt / via GICV */ +} + +static void gicv3_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) +{ + unsigned int cpu; + uint64_t affinity; + + ASSERT(!cpumask_empty(mask)); + + spin_lock(&gicv3.lock); + + cpu = gicv3_get_cpu_from_mask(mask); + affinity = gicv3_mpidr_to_affinity(cpu); + /* Make sure we don't broadcast the interrupt */ + affinity &= ~GICD_IROUTER_SPI_MODE_ANY; + + if ( desc->irq >= NR_GIC_LOCAL_IRQS ) + writeq_relaxed(affinity, (GICD + GICD_IROUTER + desc->irq * 8)); + + spin_unlock(&gicv3.lock); +} + +static const hw_irq_controller gicv3_host_irq_type = { + .typename = "gic-v3", + .startup = gicv3_irq_startup, + .shutdown = gicv3_irq_shutdown, + .enable = gicv3_irq_enable, + .disable = gicv3_irq_disable, + .ack = gicv3_irq_ack, + .end = gicv3_host_irq_end, + .set_affinity = gicv3_irq_set_affinity, +}; + +static const hw_irq_controller gicv3_guest_irq_type = { + .typename = "gic-v3", + .startup = gicv3_irq_startup, + .shutdown = gicv3_irq_shutdown, + .enable = gicv3_irq_enable, + .disable = gicv3_irq_disable, + .ack = gicv3_irq_ack, + .end = gicv3_guest_irq_end, + .set_affinity = gicv3_irq_set_affinity, +}; + +static const struct gic_hw_operations gicv3_ops = { + .info = &gicv3_info, + .save_state = gicv3_save_state, + .restore_state = gicv3_restore_state, + .dump_state = gicv3_dump_state, + .gicv_setup = gicv_v3_init, + .gic_host_irq_type = &gicv3_host_irq_type, + .gic_guest_irq_type = &gicv3_guest_irq_type, + .eoi_irq = gicv3_eoi_irq, + .deactivate_irq = gicv3_dir_irq, + .read_irq = gicv3_read_irq, + .set_irq_properties = gicv3_set_irq_properties, + .send_SGI = gicv3_send_sgi, + .disable_interface = gicv3_disable_interface, + .update_lr = gicv3_update_lr, + .update_hcr_status = gicv3_hcr_status, + .clear_lr = gicv3_clear_lr, + .read_lr = gicv3_read_lr, + .write_lr = gicv3_write_lr, + .read_vmcr_priority = gicv3_read_vmcr_priority, + .read_apr = gicv3_read_apr, + .secondary_init = gicv3_secondary_cpu_init, +}; + +/* Set up the GIC */ +static int __init gicv3_init(struct dt_device_node *node, const void *data) +{ + struct rdist_region *rdist_regs; + int res, i; + uint32_t reg; + + dt_device_set_used_by(node, DOMID_XEN); + + res = dt_device_get_address(node, 0, &gicv3.dbase, &gicv3.dbase_size); + if ( res || !gicv3.dbase ) + panic("GICv3: Cannot find a valid distributor address"); + + if ( (gicv3.dbase & ~PAGE_MASK) || (gicv3.dbase_size & ~PAGE_MASK) ) + panic("GICv3: Found unaligned distributor address %"PRIpaddr"", + gicv3.dbase); + + gicv3.map_dbase = ioremap_nocache(gicv3.dbase, gicv3.dbase_size); + if ( !gicv3.map_dbase ) + panic("GICv3: Failed to ioremap for GIC distributor\n"); + + reg = readl_relaxed(GICD + GICD_PIDR2) & GICD_PIDR2_ARCH_REV_MASK; + if ( ((reg >> GICD_PIDR2_ARCH_REV_SHIFT) != GICD_PIDR2_ARCH_GICV3) ) + panic("GICv3: no distributor detected\n"); + + if ( !dt_property_read_u32(node, "#redistributor-regions", + &gicv3.rdist_count) ) + gicv3.rdist_count = 1; + + if ( gicv3.rdist_count > MAX_RDIST_COUNT ) + panic("GICv3: Number of redistributor regions is more than" + "%d (Increase MAX_RDIST_COUNT!!)\n", MAX_RDIST_COUNT); + + rdist_regs = xzalloc_array(struct rdist_region, gicv3.rdist_count); + if ( !rdist_regs ) + panic("GICv3: Failed to allocate memory for rdist regions\n"); + + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + uint64_t rdist_base, rdist_size; + + res = dt_device_get_address(node, 1 + i, &rdist_base, &rdist_size); + if ( res || !rdist_base ) + panic("GICv3: No rdist base found for region %d\n", i); + + rdist_regs[i].base = rdist_base; + rdist_regs[i].size = rdist_size; + } + + /* If stride is not set in dt. Set default to 2 * SZ_64K */ + if ( !dt_property_read_u32(node, "redistributor-stride", &gicv3.rdist_stride) ) + gicv3.rdist_stride = 0; + + gicv3.rdist_regions= rdist_regs; + + res = platform_get_irq(node, 0); + if ( res < 0 ) + panic("GICv3: Cannot find the maintenance IRQ"); + gicv3_info.maintenance_irq = res; + + /* Set the GIC as the primary interrupt controller */ + dt_interrupt_controller = node; + + for ( i = 0; i < gicv3.rdist_count; i++ ) + { + /* map dbase & rdist regions */ + gicv3.rdist_regions[i].map_base = + ioremap_nocache(gicv3.rdist_regions[i].base, + gicv3.rdist_regions[i].size); + + if ( !gicv3.rdist_regions[i].map_base ) + panic("GICv3: Failed to ioremap rdist region for region %d\n", i); + } + + printk("GICv3 initialization:\n" + " gic_dist_addr=%"PRIpaddr"\n" + " gic_dist_size=%"PRIpaddr"\n" + " gic_dist_mapaddr=%p\n" + " gic_rdist_regions=%d\n" + " gic_rdist_stride=%x\n" + " gic_rdist_base=%"PRIpaddr"\n" + " gic_rdist_base_size=%"PRIpaddr"\n" + " gic_rdist_base_mapaddr=%p\n" + " gic_maintenance_irq=%u\n", + gicv3.dbase, gicv3.dbase_size, gicv3.map_dbase, gicv3.rdist_count, + gicv3.rdist_stride, gicv3.rdist_regions[0].base, + gicv3.rdist_regions[0].size, gicv3.rdist_regions[0].map_base, + gicv3_info.maintenance_irq); + + spin_lock_init(&gicv3.lock); + + spin_lock(&gicv3.lock); + + gicv3_dist_init(); + res = gicv3_cpu_init(); + gicv3_hyp_init(); + + gicv3_info.hw_version = GIC_V3; + /* Register hw ops*/ + register_gic_ops(&gicv3_ops); + + spin_unlock(&gicv3.lock); + + return res; +} + +static const char * const gicv3_dt_compat[] __initconst = +{ + DT_COMPAT_GIC_V3, + NULL +}; + +DT_DEVICE_START(gicv3, "GICv3", DEVICE_GIC) + .compatible = gicv3_dt_compat, + .init = gicv3_init, +DT_DEVICE_END + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 32d0554..787e93c 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -99,6 +99,14 @@ struct arch_domain /* Base address for guest GIC */ paddr_t dbase; /* Distributor base address */ paddr_t cbase; /* CPU base address */ +#ifdef CONFIG_ARM_64 + /* GIC V3 addressing */ + paddr_t dbase_size; /* Distributor base size */ + paddr_t rbase[MAX_RDIST_COUNT]; /* Re-Distributor base address */ + paddr_t rbase_size[MAX_RDIST_COUNT]; /* Re-Distributor size */ + uint32_t rdist_stride; /* Re-Distributor stride */ + int rdist_count; /* No. of Re-Distributors */ +#endif } vgic; struct vuart { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index a0c07bf..c4daf5b 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -18,6 +18,10 @@ #ifndef __ASM_ARM_GIC_H__ #define __ASM_ARM_GIC_H__ +#define NR_GIC_LOCAL_IRQS NR_LOCAL_IRQS +#define NR_GIC_SGI 16 +#define MAX_RDIST_COUNT 4 + #define GICD_CTLR (0x000) #define GICD_TYPER (0x004) #define GICD_IIDR (0x008) @@ -154,6 +158,20 @@ #define DT_MATCH_GIC_V2 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A15), \ DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_CORTEX_A7) +#define DT_COMPAT_GIC_V3 "arm,gic-v3" + +#define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE(DT_COMPAT_GIC_V3) + +/* + * GICv3 registers that needs to be saved/restored + */ +struct gic_v3 { + uint32_t hcr, vmcr, sre_el1; + uint32_t apr0[4]; + uint32_t apr1[4]; + uint64_t lr[16]; +}; + /* * GICv2 register that needs to be saved/restored * on VCPU context switch @@ -170,6 +188,7 @@ struct gic_v2 { */ union gic_state_data { struct gic_v2 v2; + struct gic_v3 v3; }; /* @@ -189,6 +208,7 @@ struct gic_lr { enum gic_version { GIC_V2, + GIC_V3, }; extern enum gic_version gic_hw_version(void); diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h new file mode 100644 index 0000000..6c8ff26 --- /dev/null +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -0,0 +1,154 @@ +/* + * ARM Generic Interrupt Controller v3 definitions + * + * Vijaya Kumar K + * Copyright (c) 2014 Cavium Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __ASM_ARM_GIC_V3_DEFS_H__ +#define __ASM_ARM_GIC_V3_DEFS_H__ + +/* + * Additional registers defined in GIC v3. + * Common GICD registers are defined in gic.h + */ + +#define GICD_STATUSR (0x010) +#define GICD_SETSPI_NSR (0x040) +#define GICD_CLRSPI_NSR (0x048) +#define GICD_SETSPI_SR (0x050) +#define GICD_CLRSPI_SR (0x058) +#define GICD_IROUTER (0x6000) +#define GICD_IROUTER31 (0x60F8) +#define GICD_IROUTER32 (0x6100) +#define GICD_IROUTERN (0x7FF8) +#define GICD_PIDR0 (0xFFE0) +#define GICD_PIDR1 (0xFFE4) +#define GICD_PIDR2 (0xFFE8) +#define GICD_PIDR3 (0xFFEC) +#define GICD_PIDR4 (0xFFD0) +#define GICD_PIDR5 (0xFFD4) +#define GICD_PIDR7 (0xFFDC) + +#define GICC_SRE_EL2_SRE (1UL << 0) +#define GICC_SRE_EL2_DFB (1UL << 1) +#define GICC_SRE_EL2_DIB (1UL << 2) +#define GICC_SRE_EL2_ENEL1 (1UL << 3) + +#define GICD_CTLR_RWP (1UL << 31) +#define GICD_CTLR_ARE_NS (1U << 4) +#define GICD_CTLR_ENABLE_G1A (1U << 1) +#define GICD_CTLR_ENABLE_G1 (1U << 0) +#define GICD_IROUTER_SPI_MODE_ANY (1UL << 31) + +#define GICC_CTLR_EL1_EOImode_drop (1U << 1) + +#define GICR_WAKER_ProcessorSleep (1U << 1) +#define GICR_WAKER_ChildrenAsleep (1U << 2) + +#define GICD_PIDR2_ARCH_REV_MASK (0xf0) +#define GICD_PIDR2_ARCH_REV_SHIFT (0x4) +#define GICD_PIDR2_ARCH_GICV3 (0x3) + +#define GICR_PIDR2_ARCH_REV_MASK GICD_PIDR2_ARCH_REV_MASK +#define GICR_PIDR2_ARCH_REV_SHIFT GICD_PIDR2_ARCH_REV_SHIFT +#define GICR_PIDR2_ARCH_GICV3 GICD_PIDR2_ARCH_GICV3 + +#define GICR_SYNCR_NOT_BUSY 1 +/* + * Implementation defined value JEP106? + * use physical hw value for now + */ +#define GICV3_GICD_IIDR_VAL 0x34c +#define GICV3_GICR_IIDR_VAL GICV3_GICD_IIDR_VAL + +#define GICR_CTLR (0x0000) +#define GICR_IIDR (0x0004) +#define GICR_TYPER (0x0008) +#define GICR_STATUSR (0x0010) +#define GICR_WAKER (0x0014) +#define GICR_SETLPIR (0x0040) +#define GICR_CLRLPIR (0x0048) +#define GICR_PROPBASER (0x0070) +#define GICR_PENDBASER (0x0078) +#define GICR_INVLPIR (0x00A0) +#define GICR_INVALLR (0x00B0) +#define GICR_SYNCR (0x00C0) +#define GICR_MOVLPIR (0x100) +#define GICR_MOVALLR (0x0110) +#define GICR_PIDR0 GICD_PIDR0 +#define GICR_PIDR1 GICD_PIDR1 +#define GICR_PIDR2 GICD_PIDR2 +#define GICR_PIDR3 GICD_PIDR3 +#define GICR_PIDR4 GICD_PIDR4 +#define GICR_PIDR5 GICD_PIDR5 +#define GICR_PIDR7 GICD_PIDR7 + +/* GICR for SGI's & PPI's */ + +#define GICR_IGROUPR0 (0x0080) +#define GICR_IGRPMODR0 (0x0F80) +#define GICR_ISENABLER0 (0x0100) +#define GICR_ICENABLER0 (0x0180) +#define GICR_ISPENDR0 (0x0200) +#define GICR_ICPENDR0 (0x0280) +#define GICR_ISACTIVER0 (0x0300) +#define GICR_ICACTIVER0 (0x0380) +#define GICR_IPRIORITYR0 (0x0400) +#define GICR_IPRIORITYR7 (0x041C) +#define GICR_ICFGR0 (0x0C00) +#define GICR_ICFGR1 (0x0C04) +#define GICR_NSACR (0x0E00) + +#define GICR_TYPER_PLPIS (1U << 0) +#define GICR_TYPER_VLPIS (1U << 1) +#define GICR_TYPER_LAST (1U << 4) + +#define DEFAULT_PMR_VALUE 0xff + +#define GICH_VMCR_EOI (1 << 9) +#define GICH_VMCR_VENG1 (1 << 1) + +#define GICH_LR_VIRTUAL_MASK 0xffff +#define GICH_LR_VIRTUAL_SHIFT 0 +#define GICH_LR_PHYSICAL_MASK 0x3ff +#define GICH_LR_PHYSICAL_SHIFT 32 +#define GICH_LR_STATE_MASK 0x3 +#define GICH_LR_STATE_SHIFT 62 +#define GICH_LR_PRIORITY_MASK 0xff +#define GICH_LR_PRIORITY_SHIFT 48 +#define GICH_LR_HW_MASK 0x1 +#define GICH_LR_HW_SHIFT 61 +#define GICH_LR_GRP_MASK 0x1 +#define GICH_LR_GRP_SHIFT 60 +#define GICH_LR_MAINTENANCE_IRQ (1UL<<41) +#define GICH_LR_GRP1 (1UL<<60) +#define GICH_LR_HW (1UL<<61) + +#define GICH_VTR_NRLRGS 0x3f +#define GICH_VTR_PRIBITS_MASK 0x7 +#define GICH_VTR_PRIBITS_SHIFT 29 + +#define GICH_VMCR_PRIORITY_MASK 0xff +#define GICH_VMCR_PRIORITY_SHIFT 24 + +#endif /* __ASM_ARM_GIC_V3_DEFS_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/processor.h b/xen/include/asm-arm/processor.h index 0cc5b6d..a13c368 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -20,6 +20,19 @@ #define AFFINITY_MASK(level) ~((_AC(0x1,U) << ((level) * MPIDR_LEVEL_BITS)) - 1) +/* + * Macros to extract affinity level. picked from kernel + */ + +#define MPIDR_LEVEL_BITS_SHIFT 3 +#define MPIDR_LEVEL_MASK ((1 << MPIDR_LEVEL_BITS) - 1) + +#define MPIDR_LEVEL_SHIFT(level) \ + (((1 << level) >> 1) << MPIDR_LEVEL_BITS_SHIFT) + +#define MPIDR_AFFINITY_LEVEL(mpidr, level) \ + ((mpidr >> MPIDR_LEVEL_SHIFT(level)) & MPIDR_LEVEL_MASK) + /* TTBCR Translation Table Base Control Register */ #define TTBCR_EAE _AC(0x80000000,U) #define TTBCR_N_MASK _AC(0x07,U) diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index b00871c..b4616ac 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -100,6 +100,59 @@ #define HSR_SYSREG_CNTP_CTL_EL0 HSR_SYSREG(3,3,c14,c2,1) #define HSR_SYSREG_CNTP_TVAL_EL0 HSR_SYSREG(3,3,c14,c2,0) +/* + * GIC System register assembly aliases picked from kernel + */ +#define ICC_PMR_EL1 S3_0_C4_C6_0 +#define ICC_DIR_EL1 S3_0_C12_C11_1 +#define ICC_SGI1R_EL1 S3_0_C12_C11_5 +#define ICC_EOIR1_EL1 S3_0_C12_C12_1 +#define ICC_IAR1_EL1 S3_0_C12_C12_0 +#define ICC_BPR1_EL1 S3_0_C12_C12_3 +#define ICC_CTLR_EL1 S3_0_C12_C12_4 +#define ICC_SRE_EL1 S3_0_C12_C12_5 +#define ICC_IGRPEN1_EL1 S3_0_C12_C12_7 + +#define ICH_VSEIR_EL2 S3_4_C12_C9_4 +#define ICC_SRE_EL2 S3_4_C12_C9_5 +#define ICH_HCR_EL2 S3_4_C12_C11_0 +#define ICH_VTR_EL2 S3_4_C12_C11_1 +#define ICH_MISR_EL2 S3_4_C12_C11_2 +#define ICH_EISR_EL2 S3_4_C12_C11_3 +#define ICH_ELSR_EL2 S3_4_C12_C11_5 +#define ICH_VMCR_EL2 S3_4_C12_C11_7 + +#define __LR0_EL2(x) S3_4_C12_C12_ ## x +#define __LR8_EL2(x) S3_4_C12_C13_ ## x + +#define ICH_LR0_EL2 __LR0_EL2(0) +#define ICH_LR1_EL2 __LR0_EL2(1) +#define ICH_LR2_EL2 __LR0_EL2(2) +#define ICH_LR3_EL2 __LR0_EL2(3) +#define ICH_LR4_EL2 __LR0_EL2(4) +#define ICH_LR5_EL2 __LR0_EL2(5) +#define ICH_LR6_EL2 __LR0_EL2(6) +#define ICH_LR7_EL2 __LR0_EL2(7) +#define ICH_LR8_EL2 __LR8_EL2(0) +#define ICH_LR9_EL2 __LR8_EL2(1) +#define ICH_LR10_EL2 __LR8_EL2(2) +#define ICH_LR11_EL2 __LR8_EL2(3) +#define ICH_LR12_EL2 __LR8_EL2(4) +#define ICH_LR13_EL2 __LR8_EL2(5) +#define ICH_LR14_EL2 __LR8_EL2(6) +#define ICH_LR15_EL2 __LR8_EL2(7) + +#define __AP0Rx_EL2(x) S3_4_C12_C8_ ## x +#define ICH_AP0R0_EL2 __AP0Rx_EL2(0) +#define ICH_AP0R1_EL2 __AP0Rx_EL2(1) +#define ICH_AP0R2_EL2 __AP0Rx_EL2(2) +#define ICH_AP0R3_EL2 __AP0Rx_EL2(3) + +#define __AP1Rx_EL2(x) S3_4_C12_C9_ ## x +#define ICH_AP1R0_EL2 __AP1Rx_EL2(0) +#define ICH_AP1R1_EL2 __AP1Rx_EL2(1) +#define ICH_AP1R2_EL2 __AP1Rx_EL2(2) +#define ICH_AP1R3_EL2 __AP1Rx_EL2(3) #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33: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 1XTzRW-0007vV-0C; Tue, 16 Sep 2014 20:33:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRU-0007vB-2g for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:40 +0000 Received: from [85.158.143.35:22944] by server-2.bemta-4.messagelabs.com id 8D/BA-04525-3AE98145; Tue, 16 Sep 2014 20:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1410899616!13923863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14327 invoked from network); 16 Sep 2014 20:33:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRQ-0007BD-67 for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRQ-0007kF-4t for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:36 +0000 Date: Tue, 16 Sep 2014 20:33:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add virtual GICv3 support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 73b9bdfd2adab8ed0cea91d3e4470b0d1bf76591 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:46 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:30 2014 +0100 xen/arm: Add virtual GICv3 support Add virtual GICv3 driver support. Also, with this patch vgic_irq_rank structure is modified to hold GICv2 GICD_TARGET and GICv3 GICD_ROUTER registers under union. This patch adds only basic GICv3 support. Does not support Interrupt Translation support (ITS) Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/vgic-v2.c | 23 +- xen/arch/arm/vgic-v3.c | 953 ++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic.c | 6 + xen/include/asm-arm/vgic.h | 18 +- 5 files changed, 988 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 33765f6..e557cac 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -29,6 +29,7 @@ obj-y += smp.o obj-y += shutdown.o obj-y += traps.o obj-y += vgic.o vgic-v2.o +obj-$(CONFIG_ARM_64) += vgic-v3.o obj-y += vtimer.o obj-y += vuart.o obj-y += hvm.o diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index e674192..ad7e661 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -132,10 +132,9 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)]; + *r = rank->v2.itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)]; if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank, flags); @@ -390,7 +389,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct vcpu *v_target, *v_old; new_target = i % 8; - old_target_mask = vgic_byte_read(rank->itargets[REG_RANK_INDEX(8, + old_target_mask = vgic_byte_read(rank->v2.itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)], 0, i/8); old_target = find_first_bit(&old_target_mask, 8); @@ -404,11 +403,11 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) i += 8 - new_target; } if ( dabt.size == DABT_WORD ) - rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = target; + rank->v2.itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)] = target; else - vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, - gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); + vgic_byte_write(&rank->v2.itargets[REG_RANK_INDEX(8, + gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); vgic_unlock_rank(v, rank, flags); return 1; } @@ -511,7 +510,7 @@ static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); ASSERT(spin_is_locked(&rank->lock)); - target = vgic_byte_read(rank->itargets[(irq%32)/4], 0, irq % 4); + target = vgic_byte_read(rank->v2.itargets[(irq%32)/4], 0, irq % 4); /* 1-N SPI should be delivered as pending to all the vcpus in the * mask, but here we just return the first vcpu for simplicity and * because it would be too slow to do otherwise. */ @@ -538,7 +537,7 @@ static int vgic_v2_vcpu_init(struct vcpu *v) /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) - v->arch.vgic.private_irqs->itargets[i] = + v->arch.vgic.private_irqs->v2.itargets[i] = (1<<(v->vcpu_id+0)) | (1<<(v->vcpu_id+8)) | (1<<(v->vcpu_id+16)) @@ -553,8 +552,8 @@ static int vgic_v2_domain_init(struct domain *d) /* By default deliver to CPU0 */ for ( i = 0; i < DOMAIN_NR_RANKS(d); i++ ) - memset(d->arch.vgic.shared_irqs[i].itargets, 0x1, - sizeof(d->arch.vgic.shared_irqs[i].itargets)); + memset(d->arch.vgic.shared_irqs[i].v2.itargets, 0x1, + sizeof(d->arch.vgic.shared_irqs[i].v2.itargets)); /* We rely on gicv_setup() to initialize dbase(vGIC distributor base) */ register_mmio_handler(d, &vgic_v2_distr_mmio_handler, d->arch.vgic.dbase, diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c new file mode 100644 index 0000000..71299f4 --- /dev/null +++ b/xen/arch/arm/vgic-v3.c @@ -0,0 +1,953 @@ +/* + * xen/arch/arm/vgic-v3.c + * + * ARM Virtual Generic Interrupt Controller v3 support + * based on xen/arch/arm/vgic.c + * + * Vijaya Kumar K + * Copyright (c) 2014 Cavium Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* GICD_PIDRn register values for ARM implementations */ +#define GICV3_GICD_PIDR0 0x92 +#define GICV3_GICD_PIDR1 0xb4 +#define GICV3_GICD_PIDR2 0x3b +#define GICV3_GICD_PIDR4 0x04 + +/* GICR_PIDRn register values for ARM implementations */ +#define GICV3_GICR_PIDR0 0x93 +#define GICV3_GICR_PIDR1 GICV3_GICD_PIDR1 +#define GICV3_GICR_PIDR2 GICV3_GICD_PIDR2 +#define GICV3_GICR_PIDR4 GICV3_GICD_PIDR4 + +static struct vcpu *vgic_v3_get_target_vcpu(struct vcpu *v, unsigned int irq) +{ + /* TODO: Return vcpu0 always */ + return v->domain->vcpu[0]; +} + +static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + uint64_t aff; + + switch ( gicr_reg ) + { + case GICR_CTLR: + /* We have not implemented LPI's, read zero */ + goto read_as_zero; + case GICR_IIDR: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_IIDR_VAL; + return 1; + case GICR_TYPER: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + /* TBD: Update processor id in [23:8] when ITS support is added */ + aff = (MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 3) << 56 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 2) << 48 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 1) << 40 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 0) << 32); + *r = aff; + return 1; + case GICR_STATUSR: + /* Not implemented */ + goto read_as_zero; + case GICR_WAKER: + /* Power management is not implemented */ + goto read_as_zero; + case GICR_SETLPIR: + /* WO. Read as zero */ + goto read_as_zero_64; + case GICR_CLRLPIR: + /* WO. Read as zero */ + goto read_as_zero_64; + case GICR_PROPBASER: + /* LPI's not implemented */ + goto read_as_zero_64; + case GICR_PENDBASER: + /* LPI's not implemented */ + goto read_as_zero_64; + case GICR_INVLPIR: + /* WO. Read as zero */ + goto read_as_zero_64; + case GICR_INVALLR: + /* WO. Read as zero */ + goto read_as_zero_64; + return 0; + case GICR_SYNCR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* RO . But when read it always returns busy bito bit[0] */ + *r = GICR_SYNCR_NOT_BUSY; + return 1; + case GICR_MOVLPIR: + /* WO Read as zero */ + goto read_as_zero_64; + case GICR_MOVALLR: + /* WO Read as zero */ + goto read_as_zero_64; + case GICR_PIDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR0; + return 1; + case GICR_PIDR1: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR1; + return 1; + case GICR_PIDR2: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR2; + return 1; + case GICR_PIDR3: + /* Manufacture/customer defined */ + goto read_as_zero; + case GICR_PIDR4: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR4; + return 1; + case GICR_PIDR5 ... GICR_PIDR7: + /* Reserved0 */ + goto read_as_zero; + default: + printk("vGICv3: vGICR: read r%d offset %#08x\n not found", + dabt.reg, gicr_reg); + return 0; + } +bad_width: + printk("vGICv3: vGICR: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicr_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + *r = 0; + return 1; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + + switch ( gicr_reg ) + { + case GICR_CTLR: + /* LPI's not implemented */ + goto write_ignore; + case GICR_IIDR: + /* RO */ + goto write_ignore; + case GICR_TYPER: + /* RO */ + goto write_ignore_64; + case GICR_STATUSR: + /* Not implemented */ + goto write_ignore; + case GICR_WAKER: + /* Power mgmt not implemented */ + goto write_ignore; + case GICR_SETLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_CLRLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_PROPBASER: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_PENDBASER: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_INVLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_INVALLR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_SYNCR: + /* RO */ + goto write_ignore; + case GICR_MOVLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_MOVALLR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_PIDR7... GICR_PIDR0: + /* RO */ + goto write_ignore; + default: + printk("vGICR: write r%d offset %#08x\n not found", dabt.reg, gicr_reg); + return 0; + } +bad_width: + printk("vGICR: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicr_reg); + domain_crash_synchronous(); + return 0; + +write_ignore_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + return 1; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, + uint32_t reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + + switch ( reg ) + { + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->ienable; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->ienable; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = vgic_byte_read(rank->ipend, dabt.sign, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = vgic_byte_read(rank->ipend, dabt.sign, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->iactive; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->iactive; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + + vgic_lock_rank(v, rank, flags); + *r = rank->ipriority[REG_RANK_INDEX(8, reg - GICD_IPRIORITYR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) + *r = vgic_byte_read(*r, dabt.sign, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICFGR ... GICD_ICFGRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->icfg[REG_RANK_INDEX(2, reg - GICD_ICFGR, DABT_WORD)]; + vgic_unlock_rank(v, rank, flags); + return 1; + default: + printk("vGICv3: vGICD/vGICR: unhandled read r%d offset %#08x\n", + dabt.reg, reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, + "vGICv3: vGICD/vGICR: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, reg); + domain_crash_synchronous(); + return 0; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, + uint32_t reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + uint32_t tr; + unsigned long flags; + + switch ( reg ) + { + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + tr = rank->ienable; + rank->ienable |= *r; + vgic_unlock_rank(v, rank, flags); + /* The irq number is extracted from offset. so shift by register size */ + vgic_enable_irqs(v, (*r) & (~tr), (reg - GICD_ISENABLER) >> DABT_WORD); + return 1; + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + tr = rank->ienable; + rank->ienable &= ~*r; + vgic_unlock_rank(v, rank, flags); + /* The irq number is extracted from offset. so shift by register size */ + vgic_disable_irqs(v, (*r) & tr, (reg - GICD_ICENABLER) >> DABT_WORD); + return 1; + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->ipend = *r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->ipend &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + if ( dabt.size == DABT_WORD ) + rank->ipriority[REG_RANK_INDEX(8, reg - GICD_IPRIORITYR, + DABT_WORD)] = *r; + else + vgic_byte_write(&rank->ipriority[REG_RANK_INDEX(8, + reg - GICD_IPRIORITYR, DABT_WORD)], *r, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICFGR: /* Restricted to configure SGIs */ + goto write_ignore; + case GICD_ICFGR + 4 ... GICD_ICFGRN: /* PPI + SPIs */ + /* ICFGR1 for PPI's, which is implementation defined + if ICFGR1 is programmable or not. We chose to program */ + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->icfg[REG_RANK_INDEX(2, reg - GICD_ICFGR, DABT_WORD)] = *r; + vgic_unlock_rank(v, rank, flags); + return 1; + default: + printk("vGICv3: vGICD/vGICR: unhandled write r%d " + "=%"PRIregister" offset %#08x\n", dabt.reg, *r, reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, + "vGICv3: vGICD/vGICR: bad write width %d r%d=%"PRIregister" " + "offset %#08x\n", dabt.size, dabt.reg, *r, reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + + switch ( gicr_reg ) + { + case GICR_IGRPMODR0: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + case GICR_IGROUPR0: + case GICR_ISENABLER0: + case GICR_ICENABLER0: + case GICR_ISACTIVER0: + case GICR_ICACTIVER0: + case GICR_IPRIORITYR0...GICR_IPRIORITYR7: + case GICR_ICFGR0... GICR_ICFGR1: + /* + * Above registers offset are common with GICD. + * So handle in common with GICD handling + */ + return __vgic_v3_distr_common_mmio_read(v, info, gicr_reg); + case GICR_ISPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISPENDR0, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->pendsgi; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_ICPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ICPENDR0, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->pendsgi; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_NSACR: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; + default: + printk("vGICv3: vGICR: read r%d offset %#08x\n not found", + dabt.reg, gicr_reg); + return 0; + } +bad_width: + printk("vGICv3: vGICR: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicr_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + + switch ( gicr_reg ) + { + case GICR_IGRPMODR0: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + case GICR_IGROUPR0: + case GICR_ISENABLER0: + case GICR_ICENABLER0: + case GICR_ISACTIVER0: + case GICR_ICACTIVER0: + case GICR_ICFGR1: + case GICR_IPRIORITYR0...GICR_IPRIORITYR7: + /* + * Above registers offset are common with GICD. + * So handle common with GICD handling + */ + return __vgic_v3_distr_common_mmio_write(v, info, gicr_reg); + case GICR_ISPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + /* TODO: we just store the SGI pending status. Handle it properly */ + rank->pendsgi |= *r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_ICPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + /* TODO: we just store the SGI pending status. Handle it properly */ + rank->pendsgi &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_NSACR: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + default: + printk("vGICv3: vGICR SGI: write r%d offset %#08x\n not found", + dabt.reg, gicr_reg); + return 0; + } + +bad_width: + printk("vGICR SGI: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicr_reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + uint32_t offset; + + if ( v->domain->arch.vgic.rdist_stride != 0 ) + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + else + /* If stride is not set. Default 128K */ + offset = info->gpa & (SZ_128K - 1); + + if ( offset < SZ_64K ) + return __vgic_v3_rdistr_rd_mmio_read(v, info, offset); + else if ( (offset >= SZ_64K) && (offset < 2 * SZ_64K) ) + return vgic_v3_rdistr_sgi_mmio_read(v, info, (offset - SZ_64K)); + else + gdprintk(XENLOG_WARNING, + "vGICv3: vGICR: unknown gpa read address %"PRIpaddr"\n", + info->gpa); + + return 0; +} + +static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + uint32_t offset; + + if ( v->domain->arch.vgic.rdist_stride != 0 ) + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + else + /* If stride is not set. Default 128K */ + offset = info->gpa & (SZ_128K - 1); + + if ( offset < SZ_64K ) + return __vgic_v3_rdistr_rd_mmio_write(v, info, offset); + else if ( (offset >= SZ_64K) && (offset < 2 * SZ_64K) ) + return vgic_v3_rdistr_sgi_mmio_write(v, info, (offset - SZ_64K)); + else + gdprintk(XENLOG_WARNING, + "vGICV3: vGICR: unknown gpa write address %"PRIpaddr"\n", + info->gpa); + + return 0; +} + +static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + vgic_lock(v); + *r = v->domain->arch.vgic.ctlr; + vgic_unlock(v); + return 1; + case GICD_TYPER: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* No secure world support for guests. */ + *r = (((v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) | + ((v->domain->arch.vgic.nr_lines / 32) & GICD_TYPE_LINES)); + return 1; + case GICD_STATUSR: + /* + * Optional, Not implemented for now. + * Update to support guest debugging. + */ + goto read_as_zero; + case GICD_IIDR: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_IIDR_VAL; + return 1; + case 0x020 ... 0x03c: + case 0xc000 ... 0xffcc: + /* Implementation defined -- read as zero */ + goto read_as_zero; + case GICD_IGROUPR ... GICD_IGROUPRN: + case GICD_ISENABLER ... GICD_ISENABLERN: + case GICD_ICENABLER ... GICD_ICENABLERN: + case GICD_ISPENDR ... GICD_ISPENDRN: + case GICD_ICPENDR ... GICD_ICPENDRN: + case GICD_ISACTIVER ... GICD_ISACTIVERN: + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + case GICD_ICFGR ... GICD_ICFGRN: + /* + * Above all register are common with GICR and GICD + * Manage in common + */ + return __vgic_v3_distr_common_mmio_read(v, info, gicd_reg); + case GICD_IROUTER ... GICD_IROUTER31: + /* SGI/PPI is RES0 */ + goto read_as_zero_64; + case GICD_IROUTER32 ... GICD_IROUTERN: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 64, gicd_reg - GICD_IROUTER, + DABT_DOUBLE_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + case GICD_SGIR: + /* Read as ICH_SGIR system register with SRE set. So ignore */ + goto read_as_zero; + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + /* Replaced with GICR_ICPENDR0. So ignore write */ + goto read_as_zero; + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + /* Replaced with GICR_ISPENDR0. So ignore write */ + goto read_as_zero; + case GICD_PIDR0: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR0; + return 1; + case GICD_PIDR1: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR1; + return 1; + case GICD_PIDR2: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR2; + return 1; + case GICD_PIDR3: + /* GICv3 identification value. Manufacturer/Customer defined */ + goto read_as_zero; + case GICD_PIDR4: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR4; + return 1; + case GICD_PIDR5 ... GICD_PIDR7: + /* Reserved0 */ + goto read_as_zero; + case 0x00c: + case 0x044: + case 0x04c: + case 0x05c ... 0x07c: + case 0xf30 ... 0x5fcc: + case 0x8000 ... 0xbfcc: + /* These are reserved register addresses */ + printk("vGICv3: vGICD: read unknown 0x00c .. 0xfcc r%d offset %#08x\n", + dabt.reg, gicd_reg); + goto read_as_zero; + default: + printk("vGICv3: vGICD: unhandled read r%d offset %#08x\n", + dabt.reg, gicd_reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, "vGICv3: vGICD: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicd_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + *r = 0; + return 1; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* Ignore all but the enable bit */ + v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + return 1; + case GICD_TYPER: + /* RO -- write ignored */ + goto write_ignore; + case GICD_IIDR: + /* RO -- write ignored */ + goto write_ignore; + case GICD_STATUSR: + /* RO -- write ignored */ + goto write_ignore; + case GICD_SETSPI_NSR: + /* Message based SPI is not implemented */ + goto write_ignore; + case GICD_CLRSPI_NSR: + /* Message based SPI is not implemented */ + goto write_ignore; + case GICD_SETSPI_SR: + /* Message based SPI is not implemented */ + goto write_ignore; + case GICD_CLRSPI_SR: + /* Message based SPI is not implemented */ + goto write_ignore; + case 0x020 ... 0x03c: + case 0xc000 ... 0xffcc: + /* Implementation defined -- write ignored */ + printk("vGICv3: vGICD: write unknown 0x020 - 0x03c r%d offset %#08x\n", + dabt.reg, gicd_reg); + goto write_ignore; + case GICD_IGROUPR ... GICD_IGROUPRN: + case GICD_ISENABLER ... GICD_ISENABLERN: + case GICD_ICENABLER ... GICD_ICENABLERN: + case GICD_ISPENDR ... GICD_ISPENDRN: + case GICD_ICPENDR ... GICD_ICPENDRN: + case GICD_ISACTIVER ... GICD_ISACTIVERN: + case GICD_ICACTIVER ... GICD_ICACTIVERN: + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + case GICD_ICFGR ... GICD_ICFGRN: + /* Above registers are common with GICR and GICD + * Manage in common */ + return __vgic_v3_distr_common_mmio_write(v, info, gicd_reg); + case GICD_IROUTER ... GICD_IROUTER31: + /* SGI/PPI is RES0 */ + goto write_ignore_64; + case GICD_IROUTER32 ... GICD_IROUTERN: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 64, gicd_reg - GICD_IROUTER, + DABT_DOUBLE_WORD); + if ( rank == NULL ) goto write_ignore_64; + if ( *r ) + { + /* TODO: Ignored. We don't support irq delivery for vcpu != 0 */ + gdprintk(XENLOG_DEBUG, + "SPI delivery to secondary cpus not supported\n"); + goto write_ignore_64; + } + vgic_lock_rank(v, rank, flags); + rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)] = *r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + case GICD_SGIR: + /* it is accessed as system register in GICv3 */ + goto write_ignore; + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + /* Replaced with GICR_ICPENDR0. So ignore write */ + if ( dabt.size != DABT_WORD ) goto bad_width; + return 0; + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + /* Replaced with GICR_ISPENDR0. So ignore write */ + if ( dabt.size != DABT_WORD ) goto bad_width; + return 0; + case GICD_PIDR7... GICD_PIDR0: + /* RO -- write ignore */ + goto write_ignore; + case 0x00c: + case 0x044: + case 0x04c: + case 0x05c ... 0x07c: + case 0xf30 ... 0x5fcc: + case 0x8000 ... 0xbfcc: + /* Reserved register addresses */ + printk("vGICv3: vGICD: write unknown 0x00c 0xfcc r%d offset %#08x\n", + dabt.reg, gicd_reg); + goto write_ignore; + default: + printk("vGICv3: vGICD: unhandled write r%d=%"PRIregister" " + "offset %#08x\n", dabt.reg, *r, gicd_reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, + "VGICv3: vGICD: bad write width %d r%d=%"PRIregister" " + "offset %#08x\n", dabt.size, dabt.reg, *r, gicd_reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; + +write_ignore_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + return 1; +} + +static const struct mmio_handler_ops vgic_rdistr_mmio_handler = { + .read_handler = vgic_v3_rdistr_mmio_read, + .write_handler = vgic_v3_rdistr_mmio_write, +}; + +static const struct mmio_handler_ops vgic_distr_mmio_handler = { + .read_handler = vgic_v3_distr_mmio_read, + .write_handler = vgic_v3_distr_mmio_write, +}; + +static int vgic_v3_get_irq_priority(struct vcpu *v, unsigned int irq) +{ + int priority; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + + ASSERT(spin_is_locked(&rank->lock)); + priority = vgic_byte_read(rank->ipriority[(irq%32)/4], 0, irq % 4); + + return priority; +} + +static int vgic_v3_vcpu_init(struct vcpu *v) +{ + int i; + uint64_t affinity; + + /* For SGI and PPI the target is always this CPU */ + affinity = (MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 3) << 32 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 2) << 16 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 1) << 8 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 0)); + + for ( i = 0 ; i < 32 ; i++ ) + v->arch.vgic.private_irqs->v3.irouter[i] = affinity; + + return 0; +} + +static int vgic_v3_domain_init(struct domain *d) +{ + int i; + + /* We rely on gicv init to get dbase and size */ + register_mmio_handler(d, &vgic_distr_mmio_handler, d->arch.vgic.dbase, + d->arch.vgic.dbase_size); + + /* + * Register mmio handler per redistributor region but not for + * every sgi rdist region which is per core. + * The redistributor region encompasses per core sgi region. + */ + for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) + register_mmio_handler(d, &vgic_rdistr_mmio_handler, + d->arch.vgic.rbase[i], d->arch.vgic.rbase_size[i]); + + return 0; +} + +static const struct vgic_ops v3_ops = { + .vcpu_init = vgic_v3_vcpu_init, + .domain_init = vgic_v3_domain_init, + .get_irq_priority = vgic_v3_get_irq_priority, + .get_target_vcpu = vgic_v3_get_target_vcpu, +}; + +int vgic_v3_init(struct domain *d) +{ + register_vgic_ops(d, &v3_ops); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index d24990f..4f392b5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -76,6 +76,12 @@ int domain_vgic_init(struct domain *d) switch ( gic_hw_version() ) { +#ifdef CONFIG_ARM_64 + case GIC_V3: + if ( vgic_v3_init(d) ) + return -ENODEV; + break; +#endif case GIC_V2: if ( vgic_v2_init(d) ) return -ENODEV; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index a9f1943..632d528 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -88,7 +88,14 @@ struct vgic_irq_rank { uint32_t ienable, iactive, ipend, pendsgi; uint32_t icfg[2]; uint32_t ipriority[8]; - uint32_t itargets[8]; + union { + struct { + uint32_t itargets[8]; + }v2; + struct { + uint64_t irouter[32]; + }v3; + }; }; struct vgic_ops { @@ -120,6 +127,14 @@ static inline int REG_RANK_NR(int b, uint32_t n) { switch ( b ) { + /* + * IRQ ranks are of size 32. So n cannot be shifted beyond 5 for 32 + * and above. For 64-bit n is already shifted DBAT_DOUBLE_WORD + * by the caller + */ + case 64: + case 32: return n >> 5; + case 16: return n >> 4; case 8: return n >> 3; case 4: return n >> 2; case 2: return n >> 1; @@ -172,6 +187,7 @@ extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); int vgic_v2_init(struct domain *d); +int vgic_v3_init(struct domain *d); extern int vcpu_vgic_free(struct vcpu *v); extern int vgic_to_sgi(struct vcpu *v, register_t sgir, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:42 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33: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 1XTzRW-0007vV-0C; Tue, 16 Sep 2014 20:33:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRU-0007vB-2g for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:40 +0000 Received: from [85.158.143.35:22944] by server-2.bemta-4.messagelabs.com id 8D/BA-04525-3AE98145; Tue, 16 Sep 2014 20:33:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1410899616!13923863!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14327 invoked from network); 16 Sep 2014 20:33:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRQ-0007BD-67 for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRQ-0007kF-4t for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:36 +0000 Date: Tue, 16 Sep 2014 20:33:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Add virtual GICv3 support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 73b9bdfd2adab8ed0cea91d3e4470b0d1bf76591 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:46 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:30 2014 +0100 xen/arm: Add virtual GICv3 support Add virtual GICv3 driver support. Also, with this patch vgic_irq_rank structure is modified to hold GICv2 GICD_TARGET and GICv3 GICD_ROUTER registers under union. This patch adds only basic GICv3 support. Does not support Interrupt Translation support (ITS) Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini --- xen/arch/arm/Makefile | 1 + xen/arch/arm/vgic-v2.c | 23 +- xen/arch/arm/vgic-v3.c | 953 ++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic.c | 6 + xen/include/asm-arm/vgic.h | 18 +- 5 files changed, 988 insertions(+), 13 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 33765f6..e557cac 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -29,6 +29,7 @@ obj-y += smp.o obj-y += shutdown.o obj-y += traps.o obj-y += vgic.o vgic-v2.o +obj-$(CONFIG_ARM_64) += vgic-v3.o obj-y += vtimer.o obj-y += vuart.o obj-y += hvm.o diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c index e674192..ad7e661 100644 --- a/xen/arch/arm/vgic-v2.c +++ b/xen/arch/arm/vgic-v2.c @@ -132,10 +132,9 @@ static int vgic_v2_distr_mmio_read(struct vcpu *v, mmio_info_t *info) if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; rank = vgic_rank_offset(v, 8, gicd_reg - GICD_ITARGETSR, DABT_WORD); if ( rank == NULL) goto read_as_zero; - vgic_lock_rank(v, rank, flags); - *r = rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)]; + *r = rank->v2.itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)]; if ( dabt.size == DABT_BYTE ) *r = vgic_byte_read(*r, dabt.sign, gicd_reg); vgic_unlock_rank(v, rank, flags); @@ -390,7 +389,7 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) struct vcpu *v_target, *v_old; new_target = i % 8; - old_target_mask = vgic_byte_read(rank->itargets[REG_RANK_INDEX(8, + old_target_mask = vgic_byte_read(rank->v2.itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, DABT_WORD)], 0, i/8); old_target = find_first_bit(&old_target_mask, 8); @@ -404,11 +403,11 @@ static int vgic_v2_distr_mmio_write(struct vcpu *v, mmio_info_t *info) i += 8 - new_target; } if ( dabt.size == DABT_WORD ) - rank->itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, - DABT_WORD)] = target; + rank->v2.itargets[REG_RANK_INDEX(8, gicd_reg - GICD_ITARGETSR, + DABT_WORD)] = target; else - vgic_byte_write(&rank->itargets[REG_RANK_INDEX(8, - gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); + vgic_byte_write(&rank->v2.itargets[REG_RANK_INDEX(8, + gicd_reg - GICD_ITARGETSR, DABT_WORD)], target, gicd_reg); vgic_unlock_rank(v, rank, flags); return 1; } @@ -511,7 +510,7 @@ static struct vcpu *vgic_v2_get_target_vcpu(struct vcpu *v, unsigned int irq) struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); ASSERT(spin_is_locked(&rank->lock)); - target = vgic_byte_read(rank->itargets[(irq%32)/4], 0, irq % 4); + target = vgic_byte_read(rank->v2.itargets[(irq%32)/4], 0, irq % 4); /* 1-N SPI should be delivered as pending to all the vcpus in the * mask, but here we just return the first vcpu for simplicity and * because it would be too slow to do otherwise. */ @@ -538,7 +537,7 @@ static int vgic_v2_vcpu_init(struct vcpu *v) /* For SGI and PPI the target is always this CPU */ for ( i = 0 ; i < 8 ; i++ ) - v->arch.vgic.private_irqs->itargets[i] = + v->arch.vgic.private_irqs->v2.itargets[i] = (1<<(v->vcpu_id+0)) | (1<<(v->vcpu_id+8)) | (1<<(v->vcpu_id+16)) @@ -553,8 +552,8 @@ static int vgic_v2_domain_init(struct domain *d) /* By default deliver to CPU0 */ for ( i = 0; i < DOMAIN_NR_RANKS(d); i++ ) - memset(d->arch.vgic.shared_irqs[i].itargets, 0x1, - sizeof(d->arch.vgic.shared_irqs[i].itargets)); + memset(d->arch.vgic.shared_irqs[i].v2.itargets, 0x1, + sizeof(d->arch.vgic.shared_irqs[i].v2.itargets)); /* We rely on gicv_setup() to initialize dbase(vGIC distributor base) */ register_mmio_handler(d, &vgic_v2_distr_mmio_handler, d->arch.vgic.dbase, diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c new file mode 100644 index 0000000..71299f4 --- /dev/null +++ b/xen/arch/arm/vgic-v3.c @@ -0,0 +1,953 @@ +/* + * xen/arch/arm/vgic-v3.c + * + * ARM Virtual Generic Interrupt Controller v3 support + * based on xen/arch/arm/vgic.c + * + * Vijaya Kumar K + * Copyright (c) 2014 Cavium Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* GICD_PIDRn register values for ARM implementations */ +#define GICV3_GICD_PIDR0 0x92 +#define GICV3_GICD_PIDR1 0xb4 +#define GICV3_GICD_PIDR2 0x3b +#define GICV3_GICD_PIDR4 0x04 + +/* GICR_PIDRn register values for ARM implementations */ +#define GICV3_GICR_PIDR0 0x93 +#define GICV3_GICR_PIDR1 GICV3_GICD_PIDR1 +#define GICV3_GICR_PIDR2 GICV3_GICD_PIDR2 +#define GICV3_GICR_PIDR4 GICV3_GICD_PIDR4 + +static struct vcpu *vgic_v3_get_target_vcpu(struct vcpu *v, unsigned int irq) +{ + /* TODO: Return vcpu0 always */ + return v->domain->vcpu[0]; +} + +static int __vgic_v3_rdistr_rd_mmio_read(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + uint64_t aff; + + switch ( gicr_reg ) + { + case GICR_CTLR: + /* We have not implemented LPI's, read zero */ + goto read_as_zero; + case GICR_IIDR: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_IIDR_VAL; + return 1; + case GICR_TYPER: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + /* TBD: Update processor id in [23:8] when ITS support is added */ + aff = (MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 3) << 56 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 2) << 48 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 1) << 40 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 0) << 32); + *r = aff; + return 1; + case GICR_STATUSR: + /* Not implemented */ + goto read_as_zero; + case GICR_WAKER: + /* Power management is not implemented */ + goto read_as_zero; + case GICR_SETLPIR: + /* WO. Read as zero */ + goto read_as_zero_64; + case GICR_CLRLPIR: + /* WO. Read as zero */ + goto read_as_zero_64; + case GICR_PROPBASER: + /* LPI's not implemented */ + goto read_as_zero_64; + case GICR_PENDBASER: + /* LPI's not implemented */ + goto read_as_zero_64; + case GICR_INVLPIR: + /* WO. Read as zero */ + goto read_as_zero_64; + case GICR_INVALLR: + /* WO. Read as zero */ + goto read_as_zero_64; + return 0; + case GICR_SYNCR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* RO . But when read it always returns busy bito bit[0] */ + *r = GICR_SYNCR_NOT_BUSY; + return 1; + case GICR_MOVLPIR: + /* WO Read as zero */ + goto read_as_zero_64; + case GICR_MOVALLR: + /* WO Read as zero */ + goto read_as_zero_64; + case GICR_PIDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR0; + return 1; + case GICR_PIDR1: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR1; + return 1; + case GICR_PIDR2: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR2; + return 1; + case GICR_PIDR3: + /* Manufacture/customer defined */ + goto read_as_zero; + case GICR_PIDR4: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICR_PIDR4; + return 1; + case GICR_PIDR5 ... GICR_PIDR7: + /* Reserved0 */ + goto read_as_zero; + default: + printk("vGICv3: vGICR: read r%d offset %#08x\n not found", + dabt.reg, gicr_reg); + return 0; + } +bad_width: + printk("vGICv3: vGICR: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicr_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + *r = 0; + return 1; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int __vgic_v3_rdistr_rd_mmio_write(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + + switch ( gicr_reg ) + { + case GICR_CTLR: + /* LPI's not implemented */ + goto write_ignore; + case GICR_IIDR: + /* RO */ + goto write_ignore; + case GICR_TYPER: + /* RO */ + goto write_ignore_64; + case GICR_STATUSR: + /* Not implemented */ + goto write_ignore; + case GICR_WAKER: + /* Power mgmt not implemented */ + goto write_ignore; + case GICR_SETLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_CLRLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_PROPBASER: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_PENDBASER: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_INVLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_INVALLR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_SYNCR: + /* RO */ + goto write_ignore; + case GICR_MOVLPIR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_MOVALLR: + /* LPI is not implemented */ + goto write_ignore_64; + case GICR_PIDR7... GICR_PIDR0: + /* RO */ + goto write_ignore; + default: + printk("vGICR: write r%d offset %#08x\n not found", dabt.reg, gicr_reg); + return 0; + } +bad_width: + printk("vGICR: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicr_reg); + domain_crash_synchronous(); + return 0; + +write_ignore_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + return 1; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static int __vgic_v3_distr_common_mmio_read(struct vcpu *v, mmio_info_t *info, + uint32_t reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + + switch ( reg ) + { + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->ienable; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->ienable; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = vgic_byte_read(rank->ipend, dabt.sign, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = vgic_byte_read(rank->ipend, dabt.sign, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->iactive; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->iactive; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + + vgic_lock_rank(v, rank, flags); + *r = rank->ipriority[REG_RANK_INDEX(8, reg - GICD_IPRIORITYR, + DABT_WORD)]; + if ( dabt.size == DABT_BYTE ) + *r = vgic_byte_read(*r, dabt.sign, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICFGR ... GICD_ICFGRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->icfg[REG_RANK_INDEX(2, reg - GICD_ICFGR, DABT_WORD)]; + vgic_unlock_rank(v, rank, flags); + return 1; + default: + printk("vGICv3: vGICD/vGICR: unhandled read r%d offset %#08x\n", + dabt.reg, reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, + "vGICv3: vGICD/vGICR: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, reg); + domain_crash_synchronous(); + return 0; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int __vgic_v3_distr_common_mmio_write(struct vcpu *v, mmio_info_t *info, + uint32_t reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + uint32_t tr; + unsigned long flags; + + switch ( reg ) + { + case GICD_IGROUPR ... GICD_IGROUPRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + case GICD_ISENABLER ... GICD_ISENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISENABLER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + tr = rank->ienable; + rank->ienable |= *r; + vgic_unlock_rank(v, rank, flags); + /* The irq number is extracted from offset. so shift by register size */ + vgic_enable_irqs(v, (*r) & (~tr), (reg - GICD_ISENABLER) >> DABT_WORD); + return 1; + case GICD_ICENABLER ... GICD_ICENABLERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICENABLER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + tr = rank->ienable; + rank->ienable &= ~*r; + vgic_unlock_rank(v, rank, flags); + /* The irq number is extracted from offset. so shift by register size */ + vgic_disable_irqs(v, (*r) & tr, (reg - GICD_ICENABLER) >> DABT_WORD); + return 1; + case GICD_ISPENDR ... GICD_ISPENDRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->ipend = *r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICPENDR ... GICD_ICPENDRN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICPENDR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->ipend &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ISACTIVER ... GICD_ISACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ISACTIVER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICACTIVER ... GICD_ICACTIVERN: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, reg - GICD_ICACTIVER, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->iactive &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + if ( dabt.size != DABT_BYTE && dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 8, reg - GICD_IPRIORITYR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + if ( dabt.size == DABT_WORD ) + rank->ipriority[REG_RANK_INDEX(8, reg - GICD_IPRIORITYR, + DABT_WORD)] = *r; + else + vgic_byte_write(&rank->ipriority[REG_RANK_INDEX(8, + reg - GICD_IPRIORITYR, DABT_WORD)], *r, reg); + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_ICFGR: /* Restricted to configure SGIs */ + goto write_ignore; + case GICD_ICFGR + 4 ... GICD_ICFGRN: /* PPI + SPIs */ + /* ICFGR1 for PPI's, which is implementation defined + if ICFGR1 is programmable or not. We chose to program */ + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 2, reg - GICD_ICFGR, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + rank->icfg[REG_RANK_INDEX(2, reg - GICD_ICFGR, DABT_WORD)] = *r; + vgic_unlock_rank(v, rank, flags); + return 1; + default: + printk("vGICv3: vGICD/vGICR: unhandled write r%d " + "=%"PRIregister" offset %#08x\n", dabt.reg, *r, reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, + "vGICv3: vGICD/vGICR: bad write width %d r%d=%"PRIregister" " + "offset %#08x\n", dabt.size, dabt.reg, *r, reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static int vgic_v3_rdistr_sgi_mmio_read(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + + switch ( gicr_reg ) + { + case GICR_IGRPMODR0: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + case GICR_IGROUPR0: + case GICR_ISENABLER0: + case GICR_ICENABLER0: + case GICR_ISACTIVER0: + case GICR_ICACTIVER0: + case GICR_IPRIORITYR0...GICR_IPRIORITYR7: + case GICR_ICFGR0... GICR_ICFGR1: + /* + * Above registers offset are common with GICD. + * So handle in common with GICD handling + */ + return __vgic_v3_distr_common_mmio_read(v, info, gicr_reg); + case GICR_ISPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISPENDR0, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->pendsgi; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_ICPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ICPENDR0, DABT_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->pendsgi; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_NSACR: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; + default: + printk("vGICv3: vGICR: read r%d offset %#08x\n not found", + dabt.reg, gicr_reg); + return 0; + } +bad_width: + printk("vGICv3: vGICR: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicr_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int vgic_v3_rdistr_sgi_mmio_write(struct vcpu *v, mmio_info_t *info, + uint32_t gicr_reg) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + + switch ( gicr_reg ) + { + case GICR_IGRPMODR0: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + case GICR_IGROUPR0: + case GICR_ISENABLER0: + case GICR_ICENABLER0: + case GICR_ISACTIVER0: + case GICR_ICACTIVER0: + case GICR_ICFGR1: + case GICR_IPRIORITYR0...GICR_IPRIORITYR7: + /* + * Above registers offset are common with GICD. + * So handle common with GICD handling + */ + return __vgic_v3_distr_common_mmio_write(v, info, gicr_reg); + case GICR_ISPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + /* TODO: we just store the SGI pending status. Handle it properly */ + rank->pendsgi |= *r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_ICPENDR0: + if ( dabt.size != DABT_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 1, gicr_reg - GICR_ISACTIVER0, DABT_WORD); + if ( rank == NULL ) goto write_ignore; + vgic_lock_rank(v, rank, flags); + /* TODO: we just store the SGI pending status. Handle it properly */ + rank->pendsgi &= ~*r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICR_NSACR: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + default: + printk("vGICv3: vGICR SGI: write r%d offset %#08x\n not found", + dabt.reg, gicr_reg); + return 0; + } + +bad_width: + printk("vGICR SGI: bad write width %d r%d=%"PRIregister" offset %#08x\n", + dabt.size, dabt.reg, *r, gicr_reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; +} + +static int vgic_v3_rdistr_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + uint32_t offset; + + if ( v->domain->arch.vgic.rdist_stride != 0 ) + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + else + /* If stride is not set. Default 128K */ + offset = info->gpa & (SZ_128K - 1); + + if ( offset < SZ_64K ) + return __vgic_v3_rdistr_rd_mmio_read(v, info, offset); + else if ( (offset >= SZ_64K) && (offset < 2 * SZ_64K) ) + return vgic_v3_rdistr_sgi_mmio_read(v, info, (offset - SZ_64K)); + else + gdprintk(XENLOG_WARNING, + "vGICv3: vGICR: unknown gpa read address %"PRIpaddr"\n", + info->gpa); + + return 0; +} + +static int vgic_v3_rdistr_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + uint32_t offset; + + if ( v->domain->arch.vgic.rdist_stride != 0 ) + offset = info->gpa & (v->domain->arch.vgic.rdist_stride - 1); + else + /* If stride is not set. Default 128K */ + offset = info->gpa & (SZ_128K - 1); + + if ( offset < SZ_64K ) + return __vgic_v3_rdistr_rd_mmio_write(v, info, offset); + else if ( (offset >= SZ_64K) && (offset < 2 * SZ_64K) ) + return vgic_v3_rdistr_sgi_mmio_write(v, info, (offset - SZ_64K)); + else + gdprintk(XENLOG_WARNING, + "vGICV3: vGICR: unknown gpa write address %"PRIpaddr"\n", + info->gpa); + + return 0; +} + +static int vgic_v3_distr_mmio_read(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + vgic_lock(v); + *r = v->domain->arch.vgic.ctlr; + vgic_unlock(v); + return 1; + case GICD_TYPER: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* No secure world support for guests. */ + *r = (((v->domain->max_vcpus << 5) & GICD_TYPE_CPUS ) | + ((v->domain->arch.vgic.nr_lines / 32) & GICD_TYPE_LINES)); + return 1; + case GICD_STATUSR: + /* + * Optional, Not implemented for now. + * Update to support guest debugging. + */ + goto read_as_zero; + case GICD_IIDR: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_IIDR_VAL; + return 1; + case 0x020 ... 0x03c: + case 0xc000 ... 0xffcc: + /* Implementation defined -- read as zero */ + goto read_as_zero; + case GICD_IGROUPR ... GICD_IGROUPRN: + case GICD_ISENABLER ... GICD_ISENABLERN: + case GICD_ICENABLER ... GICD_ICENABLERN: + case GICD_ISPENDR ... GICD_ISPENDRN: + case GICD_ICPENDR ... GICD_ICPENDRN: + case GICD_ISACTIVER ... GICD_ISACTIVERN: + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + case GICD_ICFGR ... GICD_ICFGRN: + /* + * Above all register are common with GICR and GICD + * Manage in common + */ + return __vgic_v3_distr_common_mmio_read(v, info, gicd_reg); + case GICD_IROUTER ... GICD_IROUTER31: + /* SGI/PPI is RES0 */ + goto read_as_zero_64; + case GICD_IROUTER32 ... GICD_IROUTERN: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 64, gicd_reg - GICD_IROUTER, + DABT_DOUBLE_WORD); + if ( rank == NULL ) goto read_as_zero; + vgic_lock_rank(v, rank, flags); + *r = rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)]; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, read zero */ + goto read_as_zero; + case GICD_SGIR: + /* Read as ICH_SGIR system register with SRE set. So ignore */ + goto read_as_zero; + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + /* Replaced with GICR_ICPENDR0. So ignore write */ + goto read_as_zero; + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + /* Replaced with GICR_ISPENDR0. So ignore write */ + goto read_as_zero; + case GICD_PIDR0: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR0; + return 1; + case GICD_PIDR1: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR1; + return 1; + case GICD_PIDR2: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR2; + return 1; + case GICD_PIDR3: + /* GICv3 identification value. Manufacturer/Customer defined */ + goto read_as_zero; + case GICD_PIDR4: + /* GICv3 identification value */ + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = GICV3_GICD_PIDR4; + return 1; + case GICD_PIDR5 ... GICD_PIDR7: + /* Reserved0 */ + goto read_as_zero; + case 0x00c: + case 0x044: + case 0x04c: + case 0x05c ... 0x07c: + case 0xf30 ... 0x5fcc: + case 0x8000 ... 0xbfcc: + /* These are reserved register addresses */ + printk("vGICv3: vGICD: read unknown 0x00c .. 0xfcc r%d offset %#08x\n", + dabt.reg, gicd_reg); + goto read_as_zero; + default: + printk("vGICv3: vGICD: unhandled read r%d offset %#08x\n", + dabt.reg, gicd_reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, "vGICv3: vGICD: bad read width %d r%d offset %#08x\n", + dabt.size, dabt.reg, gicd_reg); + domain_crash_synchronous(); + return 0; + +read_as_zero_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + *r = 0; + return 1; + +read_as_zero: + if ( dabt.size != DABT_WORD ) goto bad_width; + *r = 0; + return 1; +} + +static int vgic_v3_distr_mmio_write(struct vcpu *v, mmio_info_t *info) +{ + struct hsr_dabt dabt = info->dabt; + struct cpu_user_regs *regs = guest_cpu_user_regs(); + register_t *r = select_user_reg(regs, dabt.reg); + struct vgic_irq_rank *rank; + unsigned long flags; + int gicd_reg = (int)(info->gpa - v->domain->arch.vgic.dbase); + + switch ( gicd_reg ) + { + case GICD_CTLR: + if ( dabt.size != DABT_WORD ) goto bad_width; + /* Ignore all but the enable bit */ + v->domain->arch.vgic.ctlr = (*r) & GICD_CTL_ENABLE; + return 1; + case GICD_TYPER: + /* RO -- write ignored */ + goto write_ignore; + case GICD_IIDR: + /* RO -- write ignored */ + goto write_ignore; + case GICD_STATUSR: + /* RO -- write ignored */ + goto write_ignore; + case GICD_SETSPI_NSR: + /* Message based SPI is not implemented */ + goto write_ignore; + case GICD_CLRSPI_NSR: + /* Message based SPI is not implemented */ + goto write_ignore; + case GICD_SETSPI_SR: + /* Message based SPI is not implemented */ + goto write_ignore; + case GICD_CLRSPI_SR: + /* Message based SPI is not implemented */ + goto write_ignore; + case 0x020 ... 0x03c: + case 0xc000 ... 0xffcc: + /* Implementation defined -- write ignored */ + printk("vGICv3: vGICD: write unknown 0x020 - 0x03c r%d offset %#08x\n", + dabt.reg, gicd_reg); + goto write_ignore; + case GICD_IGROUPR ... GICD_IGROUPRN: + case GICD_ISENABLER ... GICD_ISENABLERN: + case GICD_ICENABLER ... GICD_ICENABLERN: + case GICD_ISPENDR ... GICD_ISPENDRN: + case GICD_ICPENDR ... GICD_ICPENDRN: + case GICD_ISACTIVER ... GICD_ISACTIVERN: + case GICD_ICACTIVER ... GICD_ICACTIVERN: + case GICD_IPRIORITYR ... GICD_IPRIORITYRN: + case GICD_ICFGR ... GICD_ICFGRN: + /* Above registers are common with GICR and GICD + * Manage in common */ + return __vgic_v3_distr_common_mmio_write(v, info, gicd_reg); + case GICD_IROUTER ... GICD_IROUTER31: + /* SGI/PPI is RES0 */ + goto write_ignore_64; + case GICD_IROUTER32 ... GICD_IROUTERN: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + rank = vgic_rank_offset(v, 64, gicd_reg - GICD_IROUTER, + DABT_DOUBLE_WORD); + if ( rank == NULL ) goto write_ignore_64; + if ( *r ) + { + /* TODO: Ignored. We don't support irq delivery for vcpu != 0 */ + gdprintk(XENLOG_DEBUG, + "SPI delivery to secondary cpus not supported\n"); + goto write_ignore_64; + } + vgic_lock_rank(v, rank, flags); + rank->v3.irouter[REG_RANK_INDEX(64, + (gicd_reg - GICD_IROUTER), DABT_DOUBLE_WORD)] = *r; + vgic_unlock_rank(v, rank, flags); + return 1; + case GICD_NSACR ... GICD_NSACRN: + /* We do not implement security extensions for guests, write ignore */ + goto write_ignore; + case GICD_SGIR: + /* it is accessed as system register in GICv3 */ + goto write_ignore; + case GICD_CPENDSGIR ... GICD_CPENDSGIRN: + /* Replaced with GICR_ICPENDR0. So ignore write */ + if ( dabt.size != DABT_WORD ) goto bad_width; + return 0; + case GICD_SPENDSGIR ... GICD_SPENDSGIRN: + /* Replaced with GICR_ISPENDR0. So ignore write */ + if ( dabt.size != DABT_WORD ) goto bad_width; + return 0; + case GICD_PIDR7... GICD_PIDR0: + /* RO -- write ignore */ + goto write_ignore; + case 0x00c: + case 0x044: + case 0x04c: + case 0x05c ... 0x07c: + case 0xf30 ... 0x5fcc: + case 0x8000 ... 0xbfcc: + /* Reserved register addresses */ + printk("vGICv3: vGICD: write unknown 0x00c 0xfcc r%d offset %#08x\n", + dabt.reg, gicd_reg); + goto write_ignore; + default: + printk("vGICv3: vGICD: unhandled write r%d=%"PRIregister" " + "offset %#08x\n", dabt.reg, *r, gicd_reg); + return 0; + } + +bad_width: + dprintk(XENLOG_ERR, + "VGICv3: vGICD: bad write width %d r%d=%"PRIregister" " + "offset %#08x\n", dabt.size, dabt.reg, *r, gicd_reg); + domain_crash_synchronous(); + return 0; + +write_ignore: + if ( dabt.size != DABT_WORD ) goto bad_width; + return 1; + +write_ignore_64: + if ( dabt.size != DABT_DOUBLE_WORD ) goto bad_width; + return 1; +} + +static const struct mmio_handler_ops vgic_rdistr_mmio_handler = { + .read_handler = vgic_v3_rdistr_mmio_read, + .write_handler = vgic_v3_rdistr_mmio_write, +}; + +static const struct mmio_handler_ops vgic_distr_mmio_handler = { + .read_handler = vgic_v3_distr_mmio_read, + .write_handler = vgic_v3_distr_mmio_write, +}; + +static int vgic_v3_get_irq_priority(struct vcpu *v, unsigned int irq) +{ + int priority; + struct vgic_irq_rank *rank = vgic_rank_irq(v, irq); + + ASSERT(spin_is_locked(&rank->lock)); + priority = vgic_byte_read(rank->ipriority[(irq%32)/4], 0, irq % 4); + + return priority; +} + +static int vgic_v3_vcpu_init(struct vcpu *v) +{ + int i; + uint64_t affinity; + + /* For SGI and PPI the target is always this CPU */ + affinity = (MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 3) << 32 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 2) << 16 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 1) << 8 | + MPIDR_AFFINITY_LEVEL(v->arch.vmpidr, 0)); + + for ( i = 0 ; i < 32 ; i++ ) + v->arch.vgic.private_irqs->v3.irouter[i] = affinity; + + return 0; +} + +static int vgic_v3_domain_init(struct domain *d) +{ + int i; + + /* We rely on gicv init to get dbase and size */ + register_mmio_handler(d, &vgic_distr_mmio_handler, d->arch.vgic.dbase, + d->arch.vgic.dbase_size); + + /* + * Register mmio handler per redistributor region but not for + * every sgi rdist region which is per core. + * The redistributor region encompasses per core sgi region. + */ + for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) + register_mmio_handler(d, &vgic_rdistr_mmio_handler, + d->arch.vgic.rbase[i], d->arch.vgic.rbase_size[i]); + + return 0; +} + +static const struct vgic_ops v3_ops = { + .vcpu_init = vgic_v3_vcpu_init, + .domain_init = vgic_v3_domain_init, + .get_irq_priority = vgic_v3_get_irq_priority, + .get_target_vcpu = vgic_v3_get_target_vcpu, +}; + +int vgic_v3_init(struct domain *d) +{ + register_vgic_ops(d, &v3_ops); + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index d24990f..4f392b5 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -76,6 +76,12 @@ int domain_vgic_init(struct domain *d) switch ( gic_hw_version() ) { +#ifdef CONFIG_ARM_64 + case GIC_V3: + if ( vgic_v3_init(d) ) + return -ENODEV; + break; +#endif case GIC_V2: if ( vgic_v2_init(d) ) return -ENODEV; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index a9f1943..632d528 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -88,7 +88,14 @@ struct vgic_irq_rank { uint32_t ienable, iactive, ipend, pendsgi; uint32_t icfg[2]; uint32_t ipriority[8]; - uint32_t itargets[8]; + union { + struct { + uint32_t itargets[8]; + }v2; + struct { + uint64_t irouter[32]; + }v3; + }; }; struct vgic_ops { @@ -120,6 +127,14 @@ static inline int REG_RANK_NR(int b, uint32_t n) { switch ( b ) { + /* + * IRQ ranks are of size 32. So n cannot be shifted beyond 5 for 32 + * and above. For 64-bit n is already shifted DBAT_DOUBLE_WORD + * by the caller + */ + case 64: + case 32: return n >> 5; + case 16: return n >> 4; case 8: return n >> 3; case 4: return n >> 2; case 2: return n >> 1; @@ -172,6 +187,7 @@ extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); int vgic_v2_init(struct domain *d); +int vgic_v3_init(struct domain *d); extern int vcpu_vgic_free(struct vcpu *v); extern int vgic_to_sgi(struct vcpu *v, register_t sgir, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRf-0007xN-65; Tue, 16 Sep 2014 20:33:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRd-0007x5-Uz for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:50 +0000 Received: from [193.109.254.147:62010] by server-8.bemta-14.messagelabs.com id D1/88-01875-DAE98145; Tue, 16 Sep 2014 20:33:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1410899626!15972876!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9586 invoked from network); 16 Sep 2014 20:33:47 -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; 16 Sep 2014 20:33:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRa-0007BJ-BM for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRa-0007ke-9q for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:46 +0000 Date: Tue, 16 Sep 2014 20:33:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Update Dom0 GIC dt node with GICv3 information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5dd422c656c6781a4703bb5b681d558d7c199996 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:47 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:42 2014 +0100 xen/arm: Update Dom0 GIC dt node with GICv3 information Update GIC device tree node for DOM0 with GICv3 information. GIC hw specfic device tree information is moved to respective GIC driver. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 47 +------------------------- xen/arch/arm/gic-v2.c | 51 ++++++++++++++++++++++++++++ xen/arch/arm/gic-v3.c | 78 +++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/gic.c | 6 +++ xen/include/asm-arm/gic.h | 4 ++ 5 files changed, 141 insertions(+), 45 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 2d316dd..90abc3a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -777,9 +777,6 @@ static int make_gic_node(const struct domain *d, void *fdt, const struct dt_device_node *node) { const struct dt_device_node *gic = dt_interrupt_controller; - const void *compatible = NULL; - u32 len; - __be32 *new_cells, *tmp; int res = 0; /* @@ -794,48 +791,7 @@ static int make_gic_node(const struct domain *d, void *fdt, DPRINT("Create gic node\n"); - compatible = dt_get_property(gic, "compatible", &len); - if ( !compatible ) - { - dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); - return -FDT_ERR_XEN(ENOENT); - } - - res = fdt_begin_node(fdt, "interrupt-controller"); - if ( res ) - return res; - - res = fdt_property(fdt, "compatible", compatible, len); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#interrupt-cells", 3); - if ( res ) - return res; - - res = fdt_property(fdt, "interrupt-controller", NULL, 0); - - if ( res ) - return res; - - len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); - len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ - new_cells = xzalloc_bytes(len); - if ( new_cells == NULL ) - return -FDT_ERR_XEN(ENOMEM); - - tmp = new_cells; - DPRINT(" Set Distributor Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - d->arch.vgic.dbase, d->arch.vgic.dbase + PAGE_SIZE - 1); - dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); - - DPRINT(" Set Cpu Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - d->arch.vgic.cbase, d->arch.vgic.cbase + (PAGE_SIZE * 2) - 1); - dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); - - res = fdt_property(fdt, "reg", new_cells, len); - xfree(new_cells); - + res = gic_make_node(d, node, fdt); if ( res ) return res; @@ -1058,6 +1014,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, static const struct dt_device_match gic_matches[] __initconst = { DT_MATCH_GIC_V2, + DT_MATCH_GIC_V3, { /* sentinel */ }, }; static const struct dt_device_match timer_matches[] __initconst = diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 78ad4de..f053b5d 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -585,6 +586,55 @@ static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_m spin_unlock(&gicv2.lock); } +static int gicv2_make_dt_node(const struct domain *d, + const struct dt_device_node *node, void *fdt) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + u32 len; + __be32 *new_cells, *tmp; + int res = 0; + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + + if ( res ) + return res; + + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ + new_cells = xzalloc_bytes(len); + if ( new_cells == NULL ) + return -FDT_ERR_XEN(ENOMEM); + + tmp = new_cells; + dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); + dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); + + res = fdt_property(fdt, "reg", new_cells, len); + xfree(new_cells); + + return res; +} + /* XXX different for level vs edge */ static hw_irq_controller gicv2_host_irq_type = { .typename = "gic-v2", @@ -630,6 +680,7 @@ const static struct gic_hw_operations gicv2_ops = { .write_lr = gicv2_write_lr, .read_vmcr_priority = gicv2_read_vmcr_priority, .read_apr = gicv2_read_apr, + .make_dt_node = gicv2_make_dt_node, }; /* Set up the GIC */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 6ccde02..ca450f9 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -1027,6 +1028,82 @@ static void gicv3_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) spin_unlock(&gicv3.lock); } +static int gicv3_make_dt_node(const struct domain *d, + const struct dt_device_node *node, void *fdt) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + uint32_t len; + __be32 *new_cells, *tmp; + uint32_t rd_stride = 0; + uint32_t rd_count = 0; + + int i, res = 0; + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + if ( res ) + return res; + + res = dt_property_read_u32(gic, "redistributor-stride", &rd_stride); + if ( !res ) + rd_stride = 0; + + res = dt_property_read_u32(gic, "#redistributor-regions", &rd_count); + if ( !res ) + rd_count = 1; + + res = fdt_property_cell(fdt, "redistributor-stride", rd_stride); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#redistributor-regions", rd_count); + if ( res ) + return res; + + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + /* + * GIC has two memory regions: Distributor + rdist regions + * CPU interface and virtual cpu interfaces accessesed as System registers + * So cells are created only for Distributor and rdist regions + */ + len = len * (d->arch.vgic.rdist_count + 1); + new_cells = xzalloc_bytes(len); + if ( new_cells == NULL ) + return -FDT_ERR_XEN(ENOMEM); + + tmp = new_cells; + + dt_set_range(&tmp, node, d->arch.vgic.dbase, d->arch.vgic.dbase_size); + + for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) + dt_set_range(&tmp, node, d->arch.vgic.rbase[i], + d->arch.vgic.rbase_size[i]); + + res = fdt_property(fdt, "reg", new_cells, len); + xfree(new_cells); + + return res; +} + static const hw_irq_controller gicv3_host_irq_type = { .typename = "gic-v3", .startup = gicv3_irq_startup, @@ -1071,6 +1148,7 @@ static const struct gic_hw_operations gicv3_ops = { .read_vmcr_priority = gicv3_read_vmcr_priority, .read_apr = gicv3_read_apr, .secondary_init = gicv3_secondary_cpu_init, + .make_dt_node = gicv3_make_dt_node, }; /* Set up the GIC */ diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 6611ba0..70d10d6 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -625,6 +625,12 @@ void __cpuinit init_maintenance_interrupt(void) "irq-maintenance", NULL); } +int gic_make_node(const struct domain *d,const struct dt_device_node *node, + void *fdt) +{ + return gic_hw_ops->make_dt_node(d, node, fdt); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index c4daf5b..51a0a26 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -336,9 +336,13 @@ struct gic_hw_operations { unsigned int (*read_apr)(int apr_reg); /* Secondary CPU init */ int (*secondary_init)(void); + int (*make_dt_node)(const struct domain *d, + const struct dt_device_node *node, void *fdt); }; void register_gic_ops(const struct gic_hw_operations *ops); +int gic_make_node(const struct domain *d,const struct dt_device_node *node, + void *fdt); #endif /* __ASSEMBLY__ */ #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:33:51 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:33:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRf-0007xN-65; Tue, 16 Sep 2014 20:33:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRd-0007x5-Uz for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:50 +0000 Received: from [193.109.254.147:62010] by server-8.bemta-14.messagelabs.com id D1/88-01875-DAE98145; Tue, 16 Sep 2014 20:33:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1410899626!15972876!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9586 invoked from network); 16 Sep 2014 20:33:47 -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; 16 Sep 2014 20:33:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRa-0007BJ-BM for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRa-0007ke-9q for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:46 +0000 Date: Tue, 16 Sep 2014 20:33:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Update Dom0 GIC dt node with GICv3 information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5dd422c656c6781a4703bb5b681d558d7c199996 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:47 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:42 2014 +0100 xen/arm: Update Dom0 GIC dt node with GICv3 information Update GIC device tree node for DOM0 with GICv3 information. GIC hw specfic device tree information is moved to respective GIC driver. Signed-off-by: Vijaya Kumar K Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 47 +------------------------- xen/arch/arm/gic-v2.c | 51 ++++++++++++++++++++++++++++ xen/arch/arm/gic-v3.c | 78 +++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/gic.c | 6 +++ xen/include/asm-arm/gic.h | 4 ++ 5 files changed, 141 insertions(+), 45 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 2d316dd..90abc3a 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -777,9 +777,6 @@ static int make_gic_node(const struct domain *d, void *fdt, const struct dt_device_node *node) { const struct dt_device_node *gic = dt_interrupt_controller; - const void *compatible = NULL; - u32 len; - __be32 *new_cells, *tmp; int res = 0; /* @@ -794,48 +791,7 @@ static int make_gic_node(const struct domain *d, void *fdt, DPRINT("Create gic node\n"); - compatible = dt_get_property(gic, "compatible", &len); - if ( !compatible ) - { - dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); - return -FDT_ERR_XEN(ENOENT); - } - - res = fdt_begin_node(fdt, "interrupt-controller"); - if ( res ) - return res; - - res = fdt_property(fdt, "compatible", compatible, len); - if ( res ) - return res; - - res = fdt_property_cell(fdt, "#interrupt-cells", 3); - if ( res ) - return res; - - res = fdt_property(fdt, "interrupt-controller", NULL, 0); - - if ( res ) - return res; - - len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); - len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ - new_cells = xzalloc_bytes(len); - if ( new_cells == NULL ) - return -FDT_ERR_XEN(ENOMEM); - - tmp = new_cells; - DPRINT(" Set Distributor Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - d->arch.vgic.dbase, d->arch.vgic.dbase + PAGE_SIZE - 1); - dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); - - DPRINT(" Set Cpu Base 0x%"PRIpaddr"-0x%"PRIpaddr"\n", - d->arch.vgic.cbase, d->arch.vgic.cbase + (PAGE_SIZE * 2) - 1); - dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); - - res = fdt_property(fdt, "reg", new_cells, len); - xfree(new_cells); - + res = gic_make_node(d, node, fdt); if ( res ) return res; @@ -1058,6 +1014,7 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, static const struct dt_device_match gic_matches[] __initconst = { DT_MATCH_GIC_V2, + DT_MATCH_GIC_V3, { /* sentinel */ }, }; static const struct dt_device_match timer_matches[] __initconst = diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 78ad4de..f053b5d 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -585,6 +586,55 @@ static void gicv2_irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_m spin_unlock(&gicv2.lock); } +static int gicv2_make_dt_node(const struct domain *d, + const struct dt_device_node *node, void *fdt) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + u32 len; + __be32 *new_cells, *tmp; + int res = 0; + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + + if ( res ) + return res; + + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + len *= 2; /* GIC has two memory regions: Distributor + CPU interface */ + new_cells = xzalloc_bytes(len); + if ( new_cells == NULL ) + return -FDT_ERR_XEN(ENOMEM); + + tmp = new_cells; + dt_set_range(&tmp, node, d->arch.vgic.dbase, PAGE_SIZE); + dt_set_range(&tmp, node, d->arch.vgic.cbase, PAGE_SIZE * 2); + + res = fdt_property(fdt, "reg", new_cells, len); + xfree(new_cells); + + return res; +} + /* XXX different for level vs edge */ static hw_irq_controller gicv2_host_irq_type = { .typename = "gic-v2", @@ -630,6 +680,7 @@ const static struct gic_hw_operations gicv2_ops = { .write_lr = gicv2_write_lr, .read_vmcr_priority = gicv2_read_vmcr_priority, .read_apr = gicv2_read_apr, + .make_dt_node = gicv2_make_dt_node, }; /* Set up the GIC */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 6ccde02..ca450f9 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -1027,6 +1028,82 @@ static void gicv3_irq_set_affinity(struct irq_desc *desc, const cpumask_t *mask) spin_unlock(&gicv3.lock); } +static int gicv3_make_dt_node(const struct domain *d, + const struct dt_device_node *node, void *fdt) +{ + const struct dt_device_node *gic = dt_interrupt_controller; + const void *compatible = NULL; + uint32_t len; + __be32 *new_cells, *tmp; + uint32_t rd_stride = 0; + uint32_t rd_count = 0; + + int i, res = 0; + + compatible = dt_get_property(gic, "compatible", &len); + if ( !compatible ) + { + dprintk(XENLOG_ERR, "Can't find compatible property for the gic node\n"); + return -FDT_ERR_XEN(ENOENT); + } + + res = fdt_begin_node(fdt, "interrupt-controller"); + if ( res ) + return res; + + res = fdt_property(fdt, "compatible", compatible, len); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#interrupt-cells", 3); + if ( res ) + return res; + + res = fdt_property(fdt, "interrupt-controller", NULL, 0); + if ( res ) + return res; + + res = dt_property_read_u32(gic, "redistributor-stride", &rd_stride); + if ( !res ) + rd_stride = 0; + + res = dt_property_read_u32(gic, "#redistributor-regions", &rd_count); + if ( !res ) + rd_count = 1; + + res = fdt_property_cell(fdt, "redistributor-stride", rd_stride); + if ( res ) + return res; + + res = fdt_property_cell(fdt, "#redistributor-regions", rd_count); + if ( res ) + return res; + + len = dt_cells_to_size(dt_n_addr_cells(node) + dt_n_size_cells(node)); + /* + * GIC has two memory regions: Distributor + rdist regions + * CPU interface and virtual cpu interfaces accessesed as System registers + * So cells are created only for Distributor and rdist regions + */ + len = len * (d->arch.vgic.rdist_count + 1); + new_cells = xzalloc_bytes(len); + if ( new_cells == NULL ) + return -FDT_ERR_XEN(ENOMEM); + + tmp = new_cells; + + dt_set_range(&tmp, node, d->arch.vgic.dbase, d->arch.vgic.dbase_size); + + for ( i = 0; i < d->arch.vgic.rdist_count; i++ ) + dt_set_range(&tmp, node, d->arch.vgic.rbase[i], + d->arch.vgic.rbase_size[i]); + + res = fdt_property(fdt, "reg", new_cells, len); + xfree(new_cells); + + return res; +} + static const hw_irq_controller gicv3_host_irq_type = { .typename = "gic-v3", .startup = gicv3_irq_startup, @@ -1071,6 +1148,7 @@ static const struct gic_hw_operations gicv3_ops = { .read_vmcr_priority = gicv3_read_vmcr_priority, .read_apr = gicv3_read_apr, .secondary_init = gicv3_secondary_cpu_init, + .make_dt_node = gicv3_make_dt_node, }; /* Set up the GIC */ diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 6611ba0..70d10d6 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -625,6 +625,12 @@ void __cpuinit init_maintenance_interrupt(void) "irq-maintenance", NULL); } +int gic_make_node(const struct domain *d,const struct dt_device_node *node, + void *fdt) +{ + return gic_hw_ops->make_dt_node(d, node, fdt); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index c4daf5b..51a0a26 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -336,9 +336,13 @@ struct gic_hw_operations { unsigned int (*read_apr)(int apr_reg); /* Secondary CPU init */ int (*secondary_init)(void); + int (*make_dt_node)(const struct domain *d, + const struct dt_device_node *node, void *fdt); }; void register_gic_ops(const struct gic_hw_operations *ops); +int gic_make_node(const struct domain *d,const struct dt_device_node *node, + void *fdt); #endif /* __ASSEMBLY__ */ #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:34:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:34: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 1XTzRp-0007yz-8z; Tue, 16 Sep 2014 20:34:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRn-0007yd-RQ for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:00 +0000 Received: from [85.158.137.68:11725] by server-15.bemta-3.messagelabs.com id FE/20-01573-6BE98145; Tue, 16 Sep 2014 20:33:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1410899636!14923041!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31284 invoked from network); 16 Sep 2014 20:33:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRk-0007BS-MR for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRk-0007l1-FD for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:56 +0000 Date: Tue, 16 Sep 2014 20:33:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: add SGI handling for GICv3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 114f47459d0ce5ba4a49ae760113ceb5b6731876 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:48 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:42 2014 +0100 xen/arm: add SGI handling for GICv3 In ARMv8, write to ICC_SGI1R_EL1 register raises trap to EL2. Handle the trap and inject SGI to vcpu. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 15 ++++++++++ xen/arch/arm/vgic-v3.c | 54 +++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic.c | 9 ++++++ xen/include/asm-arm/gic_v3_defs.h | 7 +++++ xen/include/asm-arm/sysregs.h | 3 ++ xen/include/asm-arm/vgic.h | 3 ++ 6 files changed, 91 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 019991f..25fa8a0 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -41,6 +41,7 @@ #include "decode.h" #include "vtimer.h" #include +#include /* The base of the stack must always be double-word aligned, which means * that both the kernel half of struct cpu_user_regs (which is pushed in @@ -1743,6 +1744,20 @@ static void do_sysreg(struct cpu_user_regs *regs, domain_crash_synchronous(); } break; + case HSR_SYSREG_ICC_SGI1R_EL1: + if ( !vgic_emulate(regs, hsr) ) + { + dprintk(XENLOG_WARNING, + "failed emulation of sysreg ICC_SGI1R_EL1 access\n"); + inject_undef64_exception(regs, hsr.len); + } + break; + case HSR_SYSREG_ICC_SGI0R_EL1: + case HSR_SYSREG_ICC_ASGI1R_EL1: + /* TBD: Implement to support secure grp0/1 SGI forwarding */ + dprintk(XENLOG_WARNING, + "Emulation of sysreg ICC_SGI0R_EL1/ASGI1R_EL1 not supported\n"); + inject_undef64_exception(regs, hsr.len); default: bad_sysreg: { diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 71299f4..c65a56a 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -871,6 +871,59 @@ write_ignore_64: return 1; } +static int vgic_v3_to_sgi(struct vcpu *v, register_t sgir) +{ + int virq; + int irqmode; + enum gic_sgi_mode sgi_mode; + unsigned long vcpu_mask = 0; + + irqmode = (sgir >> ICH_SGI_IRQMODE_SHIFT) & ICH_SGI_IRQMODE_MASK; + virq = (sgir >> ICH_SGI_IRQ_SHIFT ) & ICH_SGI_IRQ_MASK; + /* SGI's are injected at Rdist level 0. ignoring affinity 1, 2, 3 */ + vcpu_mask = sgir & ICH_SGI_TARGETLIST_MASK; + + /* Map GIC sgi value to enum value */ + switch ( irqmode ) + { + case ICH_SGI_TARGET_LIST: + sgi_mode = SGI_TARGET_LIST; + break; + case ICH_SGI_TARGET_OTHERS: + sgi_mode = SGI_TARGET_OTHERS; + break; + default: + gdprintk(XENLOG_WARNING, "Wrong irq mode in SGI1R_EL1 register\n"); + return 0; + } + + return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_mask); +} + +static int vgic_v3_emulate_sysreg(struct cpu_user_regs *regs, union hsr hsr) +{ + struct vcpu *v = current; + struct hsr_sysreg sysreg = hsr.sysreg; + register_t *r = select_user_reg(regs, sysreg.reg); + + ASSERT (hsr.ec == HSR_EC_SYSREG); + + switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) + { + case HSR_SYSREG_ICC_SGI1R_EL1: + /* WO */ + if ( !sysreg.read ) + return vgic_v3_to_sgi(v, *r); + else + { + gdprintk(XENLOG_WARNING, "Reading SGI1R_EL1 - WO register\n"); + return 0; + } + default: + return 0; + } +} + static const struct mmio_handler_ops vgic_rdistr_mmio_handler = { .read_handler = vgic_v3_rdistr_mmio_read, .write_handler = vgic_v3_rdistr_mmio_write, @@ -934,6 +987,7 @@ static const struct vgic_ops v3_ops = { .domain_init = vgic_v3_domain_init, .get_irq_priority = vgic_v3_get_irq_priority, .get_target_vcpu = vgic_v3_get_target_vcpu, + .emulate_sysreg = vgic_v3_emulate_sysreg, }; int vgic_v3_init(struct domain *d) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 4f392b5..97061ce 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -435,6 +435,15 @@ void arch_evtchn_inject(struct vcpu *v) vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); } +int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr) +{ + struct vcpu *v = current; + + ASSERT(v->domain->arch.vgic.handler->emulate_sysreg != NULL); + + return v->domain->arch.vgic.handler->emulate_sysreg(regs, hsr); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h index 6c8ff26..13adb53 100644 --- a/xen/include/asm-arm/gic_v3_defs.h +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -142,6 +142,13 @@ #define GICH_VMCR_PRIORITY_MASK 0xff #define GICH_VMCR_PRIORITY_SHIFT 24 +#define ICH_SGI_IRQMODE_SHIFT 40 +#define ICH_SGI_IRQMODE_MASK 0x1 +#define ICH_SGI_TARGET_OTHERS 1 +#define ICH_SGI_TARGET_LIST 0 +#define ICH_SGI_IRQ_SHIFT 24 +#define ICH_SGI_IRQ_MASK 0xf +#define ICH_SGI_TARGETLIST_MASK 0xffff #endif /* __ASM_ARM_GIC_V3_DEFS_H__ */ /* diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index b4616ac..169b7ac 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -78,6 +78,9 @@ #define HSR_SYSREG_PMINTENCLR_EL1 HSR_SYSREG(3,0,c9,c14,2) #define HSR_SYSREG_MAIR_EL1 HSR_SYSREG(3,0,c10,c2,0) #define HSR_SYSREG_AMAIR_EL1 HSR_SYSREG(3,0,c10,c3,0) +#define HSR_SYSREG_ICC_SGI1R_EL1 HSR_SYSREG(3,0,c12,c11,5) +#define HSR_SYSREG_ICC_ASGI1R_EL1 HSR_SYSREG(3,1,c12,c11,6) +#define HSR_SYSREG_ICC_SGI0R_EL1 HSR_SYSREG(3,2,c12,c11,7) #define HSR_SYSREG_CONTEXTIDR_EL1 HSR_SYSREG(3,0,c13,c0,1) #define HSR_SYSREG_PMCR_EL0 HSR_SYSREG(3,3,c9,c12,0) diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 632d528..5160f17 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -108,6 +108,8 @@ struct vgic_ops { /* Get the target vcpu for a given virq. The rank lock is already taken * when calling this. */ struct vcpu *(*get_target_vcpu)(struct vcpu *v, unsigned int irq); + /* vGIC sysreg emulation */ + int (*emulate_sysreg)(struct cpu_user_regs *regs, union hsr hsr); }; /* Number of ranks of interrupt registers for a domain */ @@ -183,6 +185,7 @@ extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); extern struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq); +extern int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr); extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:34:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:34: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 1XTzRp-0007yz-8z; Tue, 16 Sep 2014 20:34:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRn-0007yd-RQ for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:00 +0000 Received: from [85.158.137.68:11725] by server-15.bemta-3.messagelabs.com id FE/20-01573-6BE98145; Tue, 16 Sep 2014 20:33:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1410899636!14923041!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31284 invoked from network); 16 Sep 2014 20:33:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:33:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRk-0007BS-MR for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRk-0007l1-FD for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:33:56 +0000 Date: Tue, 16 Sep 2014 20:33:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: add SGI handling for GICv3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 114f47459d0ce5ba4a49ae760113ceb5b6731876 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:48 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:42 2014 +0100 xen/arm: add SGI handling for GICv3 In ARMv8, write to ICC_SGI1R_EL1 register raises trap to EL2. Handle the trap and inject SGI to vcpu. Signed-off-by: Vijaya Kumar K Acked-by: Stefano Stabellini Acked-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/traps.c | 15 ++++++++++ xen/arch/arm/vgic-v3.c | 54 +++++++++++++++++++++++++++++++++++++ xen/arch/arm/vgic.c | 9 ++++++ xen/include/asm-arm/gic_v3_defs.h | 7 +++++ xen/include/asm-arm/sysregs.h | 3 ++ xen/include/asm-arm/vgic.h | 3 ++ 6 files changed, 91 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 019991f..25fa8a0 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -41,6 +41,7 @@ #include "decode.h" #include "vtimer.h" #include +#include /* The base of the stack must always be double-word aligned, which means * that both the kernel half of struct cpu_user_regs (which is pushed in @@ -1743,6 +1744,20 @@ static void do_sysreg(struct cpu_user_regs *regs, domain_crash_synchronous(); } break; + case HSR_SYSREG_ICC_SGI1R_EL1: + if ( !vgic_emulate(regs, hsr) ) + { + dprintk(XENLOG_WARNING, + "failed emulation of sysreg ICC_SGI1R_EL1 access\n"); + inject_undef64_exception(regs, hsr.len); + } + break; + case HSR_SYSREG_ICC_SGI0R_EL1: + case HSR_SYSREG_ICC_ASGI1R_EL1: + /* TBD: Implement to support secure grp0/1 SGI forwarding */ + dprintk(XENLOG_WARNING, + "Emulation of sysreg ICC_SGI0R_EL1/ASGI1R_EL1 not supported\n"); + inject_undef64_exception(regs, hsr.len); default: bad_sysreg: { diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c index 71299f4..c65a56a 100644 --- a/xen/arch/arm/vgic-v3.c +++ b/xen/arch/arm/vgic-v3.c @@ -871,6 +871,59 @@ write_ignore_64: return 1; } +static int vgic_v3_to_sgi(struct vcpu *v, register_t sgir) +{ + int virq; + int irqmode; + enum gic_sgi_mode sgi_mode; + unsigned long vcpu_mask = 0; + + irqmode = (sgir >> ICH_SGI_IRQMODE_SHIFT) & ICH_SGI_IRQMODE_MASK; + virq = (sgir >> ICH_SGI_IRQ_SHIFT ) & ICH_SGI_IRQ_MASK; + /* SGI's are injected at Rdist level 0. ignoring affinity 1, 2, 3 */ + vcpu_mask = sgir & ICH_SGI_TARGETLIST_MASK; + + /* Map GIC sgi value to enum value */ + switch ( irqmode ) + { + case ICH_SGI_TARGET_LIST: + sgi_mode = SGI_TARGET_LIST; + break; + case ICH_SGI_TARGET_OTHERS: + sgi_mode = SGI_TARGET_OTHERS; + break; + default: + gdprintk(XENLOG_WARNING, "Wrong irq mode in SGI1R_EL1 register\n"); + return 0; + } + + return vgic_to_sgi(v, sgir, sgi_mode, virq, vcpu_mask); +} + +static int vgic_v3_emulate_sysreg(struct cpu_user_regs *regs, union hsr hsr) +{ + struct vcpu *v = current; + struct hsr_sysreg sysreg = hsr.sysreg; + register_t *r = select_user_reg(regs, sysreg.reg); + + ASSERT (hsr.ec == HSR_EC_SYSREG); + + switch ( hsr.bits & HSR_SYSREG_REGS_MASK ) + { + case HSR_SYSREG_ICC_SGI1R_EL1: + /* WO */ + if ( !sysreg.read ) + return vgic_v3_to_sgi(v, *r); + else + { + gdprintk(XENLOG_WARNING, "Reading SGI1R_EL1 - WO register\n"); + return 0; + } + default: + return 0; + } +} + static const struct mmio_handler_ops vgic_rdistr_mmio_handler = { .read_handler = vgic_v3_rdistr_mmio_read, .write_handler = vgic_v3_rdistr_mmio_write, @@ -934,6 +987,7 @@ static const struct vgic_ops v3_ops = { .domain_init = vgic_v3_domain_init, .get_irq_priority = vgic_v3_get_irq_priority, .get_target_vcpu = vgic_v3_get_target_vcpu, + .emulate_sysreg = vgic_v3_emulate_sysreg, }; int vgic_v3_init(struct domain *d) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 4f392b5..97061ce 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -435,6 +435,15 @@ void arch_evtchn_inject(struct vcpu *v) vgic_vcpu_inject_irq(v, v->domain->arch.evtchn_irq); } +int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr) +{ + struct vcpu *v = current; + + ASSERT(v->domain->arch.vgic.handler->emulate_sysreg != NULL); + + return v->domain->arch.vgic.handler->emulate_sysreg(regs, hsr); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/gic_v3_defs.h b/xen/include/asm-arm/gic_v3_defs.h index 6c8ff26..13adb53 100644 --- a/xen/include/asm-arm/gic_v3_defs.h +++ b/xen/include/asm-arm/gic_v3_defs.h @@ -142,6 +142,13 @@ #define GICH_VMCR_PRIORITY_MASK 0xff #define GICH_VMCR_PRIORITY_SHIFT 24 +#define ICH_SGI_IRQMODE_SHIFT 40 +#define ICH_SGI_IRQMODE_MASK 0x1 +#define ICH_SGI_TARGET_OTHERS 1 +#define ICH_SGI_TARGET_LIST 0 +#define ICH_SGI_IRQ_SHIFT 24 +#define ICH_SGI_IRQ_MASK 0xf +#define ICH_SGI_TARGETLIST_MASK 0xffff #endif /* __ASM_ARM_GIC_V3_DEFS_H__ */ /* diff --git a/xen/include/asm-arm/sysregs.h b/xen/include/asm-arm/sysregs.h index b4616ac..169b7ac 100644 --- a/xen/include/asm-arm/sysregs.h +++ b/xen/include/asm-arm/sysregs.h @@ -78,6 +78,9 @@ #define HSR_SYSREG_PMINTENCLR_EL1 HSR_SYSREG(3,0,c9,c14,2) #define HSR_SYSREG_MAIR_EL1 HSR_SYSREG(3,0,c10,c2,0) #define HSR_SYSREG_AMAIR_EL1 HSR_SYSREG(3,0,c10,c3,0) +#define HSR_SYSREG_ICC_SGI1R_EL1 HSR_SYSREG(3,0,c12,c11,5) +#define HSR_SYSREG_ICC_ASGI1R_EL1 HSR_SYSREG(3,1,c12,c11,6) +#define HSR_SYSREG_ICC_SGI0R_EL1 HSR_SYSREG(3,2,c12,c11,7) #define HSR_SYSREG_CONTEXTIDR_EL1 HSR_SYSREG(3,0,c13,c0,1) #define HSR_SYSREG_PMCR_EL0 HSR_SYSREG(3,3,c9,c12,0) diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 632d528..5160f17 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -108,6 +108,8 @@ struct vgic_ops { /* Get the target vcpu for a given virq. The rank lock is already taken * when calling this. */ struct vcpu *(*get_target_vcpu)(struct vcpu *v, unsigned int irq); + /* vGIC sysreg emulation */ + int (*emulate_sysreg)(struct cpu_user_regs *regs, union hsr hsr); }; /* Number of ranks of interrupt registers for a domain */ @@ -183,6 +185,7 @@ extern void vgic_clear_pending_irqs(struct vcpu *v); extern struct pending_irq *irq_to_pending(struct vcpu *v, unsigned int irq); extern struct vgic_irq_rank *vgic_rank_offset(struct vcpu *v, int b, int n, int s); extern struct vgic_irq_rank *vgic_rank_irq(struct vcpu *v, unsigned int irq); +extern int vgic_emulate(struct cpu_user_regs *regs, union hsr hsr); extern void vgic_disable_irqs(struct vcpu *v, uint32_t r, int n); extern void vgic_enable_irqs(struct vcpu *v, uint32_t r, int n); extern void register_vgic_ops(struct domain *d, const struct vgic_ops *ops); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:34:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:34:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzSG-00081u-Cv; Tue, 16 Sep 2014 20:34:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzSE-00081X-GS for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:26 +0000 Received: from [193.109.254.147:21416] by server-13.bemta-14.messagelabs.com id DF/81-19311-1DE98145; Tue, 16 Sep 2014 20:34:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410899647!15978759!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23402 invoked from network); 16 Sep 2014 20:34:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:34:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRu-0007C1-SY for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRu-0007lb-Pr for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:06 +0000 Date: Tue, 16 Sep 2014 20:34:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: check for GICv3 platform support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff512a29052a6e44bbc703a58ef419d1e6333cd5 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:49 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:42 2014 +0100 xen/arm: check for GICv3 platform support ID_AA64PFR0_EL1 register provides information about GIC support. Check for this register in GICv3 driver. Also print GICv3 support information in boot log Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 7 +++++++ xen/arch/arm/setup.c | 5 +++-- xen/include/asm-arm/cpufeature.h | 1 + xen/include/asm-arm/processor.h | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index ca450f9..91161a2 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -39,6 +39,7 @@ #include #include #include +#include struct rdist_region { paddr_t base; @@ -1158,6 +1159,12 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) int res, i; uint32_t reg; + if ( !cpu_has_gicv3 ) + { + dprintk(XENLOG_ERR, "GICv3: driver requires system register support\n"); + return -ENODEV; + } + dt_device_set_used_by(node, DOMID_XEN); res = dt_device_get_address(node, 0, &gicv3.dbase, &gicv3.dbase_size); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 446b4dc..025349e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -103,9 +103,10 @@ static void __init processor_id(void) cpu_has_el2_32 ? "64+32" : cpu_has_el2_64 ? "64" : "No", cpu_has_el1_32 ? "64+32" : cpu_has_el1_64 ? "64" : "No", cpu_has_el0_32 ? "64+32" : cpu_has_el0_64 ? "64" : "No"); - printk(" Extensions:%s%s\n", + printk(" Extensions:%s%s%s\n", cpu_has_fp ? " FloatingPoint" : "", - cpu_has_simd ? " AdvancedSIMD" : ""); + cpu_has_simd ? " AdvancedSIMD" : "", + cpu_has_gicv3 ? " GICv3-SysReg" : ""); printk(" Debug Features: %016"PRIx64" %016"PRIx64"\n", boot_cpu_data.dbg64.bits[0], boot_cpu_data.dbg64.bits[1]); diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 1d2c9c7..aec9173 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -15,6 +15,7 @@ #define cpu_has_el3_64 (boot_cpu_feature64(el3) >= 1) #define cpu_has_fp (boot_cpu_feature64(fp) == 0) #define cpu_has_simd (boot_cpu_feature64(simd) == 0) +#define cpu_has_gicv3 (boot_cpu_feature64(gic) == 1) #endif #define cpu_feature32(c, feat) ((c)->pfr32.feat) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index a13c368..4aab823 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -190,8 +190,8 @@ struct cpuinfo_arm { unsigned long el3:4; unsigned long fp:4; /* Floating Point */ unsigned long simd:4; /* Advanced SIMD */ - unsigned long __res0:8; - + unsigned long gic:4; /* GIC support */ + unsigned long __res0:4; unsigned long __res1; }; } pfr64; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 16 20:34:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Sep 2014 20:34:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzSG-00081u-Cv; Tue, 16 Sep 2014 20:34:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzSE-00081X-GS for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:26 +0000 Received: from [193.109.254.147:21416] by server-13.bemta-14.messagelabs.com id DF/81-19311-1DE98145; Tue, 16 Sep 2014 20:34:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1410899647!15978759!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23402 invoked from network); 16 Sep 2014 20:34:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Sep 2014 20:34:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XTzRu-0007C1-SY for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XTzRu-0007lb-Pr for xen-changelog@lists.xensource.com; Tue, 16 Sep 2014 20:34:06 +0000 Date: Tue, 16 Sep 2014 20:34:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: check for GICv3 platform support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff512a29052a6e44bbc703a58ef419d1e6333cd5 Author: Vijaya Kumar K AuthorDate: Fri Sep 12 16:39:49 2014 +0530 Commit: Ian Campbell CommitDate: Mon Sep 15 22:56:42 2014 +0100 xen/arm: check for GICv3 platform support ID_AA64PFR0_EL1 register provides information about GIC support. Check for this register in GICv3 driver. Also print GICv3 support information in boot log Signed-off-by: Vijaya Kumar K Acked-by: Ian Campbell --- xen/arch/arm/gic-v3.c | 7 +++++++ xen/arch/arm/setup.c | 5 +++-- xen/include/asm-arm/cpufeature.h | 1 + xen/include/asm-arm/processor.h | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index ca450f9..91161a2 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -39,6 +39,7 @@ #include #include #include +#include struct rdist_region { paddr_t base; @@ -1158,6 +1159,12 @@ static int __init gicv3_init(struct dt_device_node *node, const void *data) int res, i; uint32_t reg; + if ( !cpu_has_gicv3 ) + { + dprintk(XENLOG_ERR, "GICv3: driver requires system register support\n"); + return -ENODEV; + } + dt_device_set_used_by(node, DOMID_XEN); res = dt_device_get_address(node, 0, &gicv3.dbase, &gicv3.dbase_size); diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 446b4dc..025349e 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -103,9 +103,10 @@ static void __init processor_id(void) cpu_has_el2_32 ? "64+32" : cpu_has_el2_64 ? "64" : "No", cpu_has_el1_32 ? "64+32" : cpu_has_el1_64 ? "64" : "No", cpu_has_el0_32 ? "64+32" : cpu_has_el0_64 ? "64" : "No"); - printk(" Extensions:%s%s\n", + printk(" Extensions:%s%s%s\n", cpu_has_fp ? " FloatingPoint" : "", - cpu_has_simd ? " AdvancedSIMD" : ""); + cpu_has_simd ? " AdvancedSIMD" : "", + cpu_has_gicv3 ? " GICv3-SysReg" : ""); printk(" Debug Features: %016"PRIx64" %016"PRIx64"\n", boot_cpu_data.dbg64.bits[0], boot_cpu_data.dbg64.bits[1]); diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 1d2c9c7..aec9173 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -15,6 +15,7 @@ #define cpu_has_el3_64 (boot_cpu_feature64(el3) >= 1) #define cpu_has_fp (boot_cpu_feature64(fp) == 0) #define cpu_has_simd (boot_cpu_feature64(simd) == 0) +#define cpu_has_gicv3 (boot_cpu_feature64(gic) == 1) #endif #define cpu_feature32(c, feat) ((c)->pfr32.feat) diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index a13c368..4aab823 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -190,8 +190,8 @@ struct cpuinfo_arm { unsigned long el3:4; unsigned long fp:4; /* Floating Point */ unsigned long simd:4; /* Advanced SIMD */ - unsigned long __res0:8; - + unsigned long gic:4; /* GIC support */ + unsigned long __res0:4; unsigned long __res1; }; } pfr64; -- generated by git-patchbot for /home/xen/git/xen.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 Sep 17 08:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Sep 2014 08: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 1XUAV5-0007Tx-Sz; Wed, 17 Sep 2014 08:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAV4-0007Tp-B8 for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:06 +0000 Received: from [85.158.139.211:25066] by server-4.bemta-5.messagelabs.com id DF/74-10551-DA449145; Wed, 17 Sep 2014 08:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1410942123!14953347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3782 invoked from network); 17 Sep 2014 08:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2014 08:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAV1-0005Xl-It for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUAV1-00061f-DI for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:03 +0000 Date: Wed, 17 Sep 2014 08:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough: streamline _hvm_dirq_assist() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fb75513e25e9a135df3fd92b35ad749ec7cf7cb Author: Jan Beulich AuthorDate: Tue Sep 16 13:56:45 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 16 13:56:45 2014 +0200 passthrough: streamline _hvm_dirq_assist() The loop inside this function was calling two functions with loop- invariable arguments which clearly don't need calling more than once: send_guest_pirq() and __msi_pirq_eoi(). After moving these out of the loop it further became apparent that folding the hvm_pci_msi_assert() helper into the main function can further help readability. In the course of this I noticed that __hvm_dpci_eoi() called hvm_pci_intx_deassert() unconditionally, whereas hvm_pci_intx_assert() (correctly) got called only when !hvm_domain_use_pirq(), so the former is being made conditional now too. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/drivers/passthrough/io.c | 50 ++++++++++++++++++----------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index ef75b94..4cd32b5 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -513,45 +513,39 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_pci_msi_assert( - struct domain *d, struct hvm_pirq_dpci *pirq_dpci) -{ - struct pirq *pirq = dpci_pirq(pirq_dpci); - - if ( hvm_domain_use_pirq(d, pirq) ) - send_guest_pirq(d, pirq); - else - vmsi_deliver_pirq(d, pirq_dpci); -} - static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, void *arg) { if ( test_and_clear_bool(pirq_dpci->masked) ) { + struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; + if ( hvm_domain_use_pirq(d, pirq) ) + { + send_guest_pirq(d, pirq); + + if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) + return 0; + } + if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) { - hvm_pci_msi_assert(d, pirq_dpci); + vmsi_deliver_pirq(d, pirq_dpci); return 0; } list_for_each_entry ( digl, &pirq_dpci->digl_list, list ) { - struct pirq *info = dpci_pirq(pirq_dpci); - - if ( hvm_domain_use_pirq(d, info) ) - send_guest_pirq(d, info); - else - hvm_pci_intx_assert(d, digl->device, digl->intx); + hvm_pci_intx_assert(d, digl->device, digl->intx); pirq_dpci->pending++; + } - if ( pirq_dpci->flags & HVM_IRQ_DPCI_TRANSLATE ) - { - /* for translated MSI to INTx interrupt, eoi as early as possible */ - __msi_pirq_eoi(pirq_dpci); - } + if ( pirq_dpci->flags & HVM_IRQ_DPCI_TRANSLATE ) + { + /* for translated MSI to INTx interrupt, eoi as early as possible */ + __msi_pirq_eoi(pirq_dpci); + return 0; } /* @@ -561,8 +555,8 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, * guest will never deal with the irq, then the physical interrupt line * will never be deasserted. */ - if ( pt_irq_need_timer(pirq_dpci->flags) ) - set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); + ASSERT(pt_irq_need_timer(pirq_dpci->flags)); + set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); } return 0; @@ -583,12 +577,12 @@ static void __hvm_dpci_eoi(struct domain *d, const struct hvm_girq_dpci_mapping *girq, const union vioapic_redir_entry *ent) { - struct pirq *pirq; + struct pirq *pirq = pirq_info(d, girq->machine_gsi); struct hvm_pirq_dpci *pirq_dpci; - hvm_pci_intx_deassert(d, girq->device, girq->intx); + if ( !hvm_domain_use_pirq(d, pirq) ) + hvm_pci_intx_deassert(d, girq->device, girq->intx); - pirq = pirq_info(d, girq->machine_gsi); pirq_dpci = pirq_dpci(pirq); /* -- generated by git-patchbot for /home/xen/git/xen.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 Sep 17 08:22:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Sep 2014 08: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 1XUAV5-0007Tx-Sz; Wed, 17 Sep 2014 08:22:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAV4-0007Tp-B8 for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:06 +0000 Received: from [85.158.139.211:25066] by server-4.bemta-5.messagelabs.com id DF/74-10551-DA449145; Wed, 17 Sep 2014 08:22:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1410942123!14953347!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3782 invoked from network); 17 Sep 2014 08:22:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2014 08:22:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAV1-0005Xl-It for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUAV1-00061f-DI for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:03 +0000 Date: Wed, 17 Sep 2014 08:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] passthrough: streamline _hvm_dirq_assist() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fb75513e25e9a135df3fd92b35ad749ec7cf7cb Author: Jan Beulich AuthorDate: Tue Sep 16 13:56:45 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 16 13:56:45 2014 +0200 passthrough: streamline _hvm_dirq_assist() The loop inside this function was calling two functions with loop- invariable arguments which clearly don't need calling more than once: send_guest_pirq() and __msi_pirq_eoi(). After moving these out of the loop it further became apparent that folding the hvm_pci_msi_assert() helper into the main function can further help readability. In the course of this I noticed that __hvm_dpci_eoi() called hvm_pci_intx_deassert() unconditionally, whereas hvm_pci_intx_assert() (correctly) got called only when !hvm_domain_use_pirq(), so the former is being made conditional now too. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/drivers/passthrough/io.c | 50 ++++++++++++++++++----------------------- 1 files changed, 22 insertions(+), 28 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index ef75b94..4cd32b5 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -513,45 +513,39 @@ void hvm_dpci_msi_eoi(struct domain *d, int vector) spin_unlock(&d->event_lock); } -static void hvm_pci_msi_assert( - struct domain *d, struct hvm_pirq_dpci *pirq_dpci) -{ - struct pirq *pirq = dpci_pirq(pirq_dpci); - - if ( hvm_domain_use_pirq(d, pirq) ) - send_guest_pirq(d, pirq); - else - vmsi_deliver_pirq(d, pirq_dpci); -} - static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, void *arg) { if ( test_and_clear_bool(pirq_dpci->masked) ) { + struct pirq *pirq = dpci_pirq(pirq_dpci); const struct dev_intx_gsi_link *digl; + if ( hvm_domain_use_pirq(d, pirq) ) + { + send_guest_pirq(d, pirq); + + if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) + return 0; + } + if ( pirq_dpci->flags & HVM_IRQ_DPCI_GUEST_MSI ) { - hvm_pci_msi_assert(d, pirq_dpci); + vmsi_deliver_pirq(d, pirq_dpci); return 0; } list_for_each_entry ( digl, &pirq_dpci->digl_list, list ) { - struct pirq *info = dpci_pirq(pirq_dpci); - - if ( hvm_domain_use_pirq(d, info) ) - send_guest_pirq(d, info); - else - hvm_pci_intx_assert(d, digl->device, digl->intx); + hvm_pci_intx_assert(d, digl->device, digl->intx); pirq_dpci->pending++; + } - if ( pirq_dpci->flags & HVM_IRQ_DPCI_TRANSLATE ) - { - /* for translated MSI to INTx interrupt, eoi as early as possible */ - __msi_pirq_eoi(pirq_dpci); - } + if ( pirq_dpci->flags & HVM_IRQ_DPCI_TRANSLATE ) + { + /* for translated MSI to INTx interrupt, eoi as early as possible */ + __msi_pirq_eoi(pirq_dpci); + return 0; } /* @@ -561,8 +555,8 @@ static int _hvm_dirq_assist(struct domain *d, struct hvm_pirq_dpci *pirq_dpci, * guest will never deal with the irq, then the physical interrupt line * will never be deasserted. */ - if ( pt_irq_need_timer(pirq_dpci->flags) ) - set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); + ASSERT(pt_irq_need_timer(pirq_dpci->flags)); + set_timer(&pirq_dpci->timer, NOW() + PT_IRQ_TIME_OUT); } return 0; @@ -583,12 +577,12 @@ static void __hvm_dpci_eoi(struct domain *d, const struct hvm_girq_dpci_mapping *girq, const union vioapic_redir_entry *ent) { - struct pirq *pirq; + struct pirq *pirq = pirq_info(d, girq->machine_gsi); struct hvm_pirq_dpci *pirq_dpci; - hvm_pci_intx_deassert(d, girq->device, girq->intx); + if ( !hvm_domain_use_pirq(d, pirq) ) + hvm_pci_intx_deassert(d, girq->device, girq->intx); - pirq = pirq_info(d, girq->machine_gsi); pirq_dpci = pirq_dpci(pirq); /* -- generated by git-patchbot for /home/xen/git/xen.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 Sep 17 08:22:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Sep 2014 08:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVH-0007Ux-19; Wed, 17 Sep 2014 08:22:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVF-0007Un-Hu for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:17 +0000 Received: from [193.109.254.147:26617] by server-14.bemta-14.messagelabs.com id 54/93-18345-8B449145; Wed, 17 Sep 2014 08:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1410942134!16082596!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25612 invoked from network); 17 Sep 2014 08:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2014 08:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVB-0005Xo-Sd for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUAVB-00062Z-Lt for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:13 +0000 Date: Wed, 17 Sep 2014 08:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: show page walk when create_bounce_frame() encounters a fault X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d268f6ae2d191cc945f3492e8797fa8444877c10 Author: Jan Beulich AuthorDate: Tue Sep 16 13:57:44 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 16 13:57:44 2014 +0200 x86: show page walk when create_bounce_frame() encounters a fault ... getting the native code in sync with the compat mode one. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_64/entry.S | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 42835d0..ade555b 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -442,19 +442,30 @@ UNLIKELY_START(z, create_bounce_frame_bad_bounce_ip) __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) movq %rax,UREGS_rip+8(%rsp) ret - _ASM_EXTABLE(.Lft2, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft3, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft4, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft5, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft6, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft7, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft8, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft9, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft10, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft11, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft12, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft13, dom_crash_sync_extable) - + _ASM_EXTABLE(.Lft2, domain_crash_page_fault_32) + _ASM_EXTABLE(.Lft3, domain_crash_page_fault_24) + _ASM_EXTABLE(.Lft4, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft5, domain_crash_page_fault_16) + _ASM_EXTABLE(.Lft6, domain_crash_page_fault) + _ASM_EXTABLE(.Lft7, domain_crash_page_fault) + _ASM_EXTABLE(.Lft8, domain_crash_page_fault_24) + _ASM_EXTABLE(.Lft9, domain_crash_page_fault_16) + _ASM_EXTABLE(.Lft10, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft11, domain_crash_page_fault) + _ASM_EXTABLE(.Lft12, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft13, domain_crash_page_fault) + +domain_crash_page_fault_32: + addq $8,%rsi +domain_crash_page_fault_24: + addq $8,%rsi +domain_crash_page_fault_16: + addq $8,%rsi +domain_crash_page_fault_8: + addq $8,%rsi +domain_crash_page_fault: + movq %rsi,%rdi + call show_page_walk ENTRY(dom_crash_sync_extable) # Get out of the guest-save area of the stack. GET_STACK_BASE(%rax) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 17 08:22:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Sep 2014 08:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVH-0007Ux-19; Wed, 17 Sep 2014 08:22:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVF-0007Un-Hu for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:17 +0000 Received: from [193.109.254.147:26617] by server-14.bemta-14.messagelabs.com id 54/93-18345-8B449145; Wed, 17 Sep 2014 08:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1410942134!16082596!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25612 invoked from network); 17 Sep 2014 08:22:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2014 08:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVB-0005Xo-Sd for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUAVB-00062Z-Lt for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:13 +0000 Date: Wed, 17 Sep 2014 08:22:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: show page walk when create_bounce_frame() encounters a fault X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d268f6ae2d191cc945f3492e8797fa8444877c10 Author: Jan Beulich AuthorDate: Tue Sep 16 13:57:44 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 16 13:57:44 2014 +0200 x86: show page walk when create_bounce_frame() encounters a fault ... getting the native code in sync with the compat mode one. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/x86_64/entry.S | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 42835d0..ade555b 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -442,19 +442,30 @@ UNLIKELY_START(z, create_bounce_frame_bad_bounce_ip) __UNLIKELY_END(create_bounce_frame_bad_bounce_ip) movq %rax,UREGS_rip+8(%rsp) ret - _ASM_EXTABLE(.Lft2, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft3, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft4, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft5, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft6, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft7, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft8, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft9, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft10, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft11, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft12, dom_crash_sync_extable) - _ASM_EXTABLE(.Lft13, dom_crash_sync_extable) - + _ASM_EXTABLE(.Lft2, domain_crash_page_fault_32) + _ASM_EXTABLE(.Lft3, domain_crash_page_fault_24) + _ASM_EXTABLE(.Lft4, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft5, domain_crash_page_fault_16) + _ASM_EXTABLE(.Lft6, domain_crash_page_fault) + _ASM_EXTABLE(.Lft7, domain_crash_page_fault) + _ASM_EXTABLE(.Lft8, domain_crash_page_fault_24) + _ASM_EXTABLE(.Lft9, domain_crash_page_fault_16) + _ASM_EXTABLE(.Lft10, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft11, domain_crash_page_fault) + _ASM_EXTABLE(.Lft12, domain_crash_page_fault_8) + _ASM_EXTABLE(.Lft13, domain_crash_page_fault) + +domain_crash_page_fault_32: + addq $8,%rsi +domain_crash_page_fault_24: + addq $8,%rsi +domain_crash_page_fault_16: + addq $8,%rsi +domain_crash_page_fault_8: + addq $8,%rsi +domain_crash_page_fault: + movq %rsi,%rdi + call show_page_walk ENTRY(dom_crash_sync_extable) # Get out of the guest-save area of the stack. GET_STACK_BASE(%rax) -- generated by git-patchbot for /home/xen/git/xen.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 Sep 17 08:22:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Sep 2014 08:22:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVR-0007WI-3m; Wed, 17 Sep 2014 08:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVP-0007Vz-Ht for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:27 +0000 Received: from [85.158.137.68:36280] by server-17.bemta-3.messagelabs.com id AE/B3-01689-1C449145; Wed, 17 Sep 2014 08:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1410942144!14352193!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9500 invoked from network); 17 Sep 2014 08:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2014 08:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVM-0005Xx-1K for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUAVL-00062v-Vw for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:24 +0000 Date: Wed, 17 Sep 2014 08:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: don't unintentionally leave x2APIC MSR intercepts disabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72af6f455ac6afcd46d9a556f90349f2397507e8 Author: Jan Beulich AuthorDate: Tue Sep 16 13:58:20 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 16 13:58:20 2014 +0200 VMX: don't unintentionally leave x2APIC MSR intercepts disabled These should be re-enabled in particular when the virtualized APIC transitions to HW-disabled state. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 26b1ad5..d3e7ac9 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2167,6 +2167,7 @@ void vmx_vlapic_msr_changed(struct vcpu *v) { int virtualize_x2apic_mode; struct vlapic *vlapic = vcpu_vlapic(v); + unsigned int msr; virtualize_x2apic_mode = ( (cpu_has_vmx_apic_reg_virt || cpu_has_vmx_virtual_intr_delivery) && @@ -2183,8 +2184,6 @@ void vmx_vlapic_msr_changed(struct vcpu *v) if ( !vlapic_hw_disabled(vlapic) && (vlapic_base_address(vlapic) == APIC_DEFAULT_PHYS_BASE) ) { - unsigned int msr; - if ( virtualize_x2apic_mode && vlapic_x2apic_mode(vlapic) ) { v->arch.hvm_vmx.secondary_exec_control |= @@ -2213,15 +2212,15 @@ void vmx_vlapic_msr_changed(struct vcpu *v) } } else - { v->arch.hvm_vmx.secondary_exec_control |= SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; - for ( msr = MSR_IA32_APICBASE_MSR; - msr <= MSR_IA32_APICBASE_MSR + 0xff; msr++ ) - vmx_enable_intercept_for_msr(v, msr, - MSR_TYPE_R | MSR_TYPE_W); - } } + if ( !(v->arch.hvm_vmx.secondary_exec_control & + SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE) ) + for ( msr = MSR_IA32_APICBASE_MSR; + msr <= MSR_IA32_APICBASE_MSR + 0xff; msr++ ) + vmx_enable_intercept_for_msr(v, msr, MSR_TYPE_R | MSR_TYPE_W); + vmx_update_secondary_exec_control(v); vmx_vmcs_exit(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 17 08:22:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 17 Sep 2014 08:22:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVR-0007WI-3m; Wed, 17 Sep 2014 08:22:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVP-0007Vz-Ht for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:27 +0000 Received: from [85.158.137.68:36280] by server-17.bemta-3.messagelabs.com id AE/B3-01689-1C449145; Wed, 17 Sep 2014 08:22:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1410942144!14352193!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9500 invoked from network); 17 Sep 2014 08:22:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Sep 2014 08:22:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUAVM-0005Xx-1K for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUAVL-00062v-Vw for xen-changelog@lists.xensource.com; Wed, 17 Sep 2014 08:22:24 +0000 Date: Wed, 17 Sep 2014 08:22:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: don't unintentionally leave x2APIC MSR intercepts disabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 72af6f455ac6afcd46d9a556f90349f2397507e8 Author: Jan Beulich AuthorDate: Tue Sep 16 13:58:20 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 16 13:58:20 2014 +0200 VMX: don't unintentionally leave x2APIC MSR intercepts disabled These should be re-enabled in particular when the virtualized APIC transitions to HW-disabled state. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 26b1ad5..d3e7ac9 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2167,6 +2167,7 @@ void vmx_vlapic_msr_changed(struct vcpu *v) { int virtualize_x2apic_mode; struct vlapic *vlapic = vcpu_vlapic(v); + unsigned int msr; virtualize_x2apic_mode = ( (cpu_has_vmx_apic_reg_virt || cpu_has_vmx_virtual_intr_delivery) && @@ -2183,8 +2184,6 @@ void vmx_vlapic_msr_changed(struct vcpu *v) if ( !vlapic_hw_disabled(vlapic) && (vlapic_base_address(vlapic) == APIC_DEFAULT_PHYS_BASE) ) { - unsigned int msr; - if ( virtualize_x2apic_mode && vlapic_x2apic_mode(vlapic) ) { v->arch.hvm_vmx.secondary_exec_control |= @@ -2213,15 +2212,15 @@ void vmx_vlapic_msr_changed(struct vcpu *v) } } else - { v->arch.hvm_vmx.secondary_exec_control |= SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES; - for ( msr = MSR_IA32_APICBASE_MSR; - msr <= MSR_IA32_APICBASE_MSR + 0xff; msr++ ) - vmx_enable_intercept_for_msr(v, msr, - MSR_TYPE_R | MSR_TYPE_W); - } } + if ( !(v->arch.hvm_vmx.secondary_exec_control & + SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE) ) + for ( msr = MSR_IA32_APICBASE_MSR; + msr <= MSR_IA32_APICBASE_MSR + 0xff; msr++ ) + vmx_enable_intercept_for_msr(v, msr, MSR_TYPE_R | MSR_TYPE_W); + vmx_update_secondary_exec_control(v); vmx_vmcs_exit(v); } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzJ-0003tK-F8; Fri, 19 Sep 2014 05:44:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzI-0003tE-E0 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:08 +0000 Received: from [85.158.143.35:18884] by server-1.bemta-4.messagelabs.com id 65/3B-05872-7A2CB145; Fri, 19 Sep 2014 05:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1411105446!11784872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11952 invoked from network); 19 Sep 2014 05:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzE-0000Sj-LS for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzE-0005xW-Ij for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:04 +0000 Date: Fri, 19 Sep 2014 05:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: rework domain userdata file lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a788fe0cd8bcb51ef167fc451f837066362d8c82 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:11 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:58:29 2014 +0100 libxl: rework domain userdata file lock The lock introduced in d2cd9d4f ("libxl: functions to lock / unlock libxl userdata store") has a bug that can leak the lock file when domain destruction races with other functions that try to get hold of the lock. There are several issues: 1. The lock is released too early with libxl__userdata_destroyall deletes everything in userdata store, including the lock file. 2. The check of domain existence is only done at the beginning of lock function, by the time the lock is acquired, the domain might have been gone already. The effect of this two issues is we can run into such situation: Process 1 Process 2 domain destruction # LOCK FUNCTION # LOCK FUNCTION check domain existence check domain existence acquire lock (file created) # LOCK FUNCTION destroy all files (lock file deleted, lock released) acquire lock (file created) # LOCK FUNCTION destroy domain # UNLOCK (close fd only) [ lock file leaked ] Fix this problem by deploying following changes: 1. Unlink lock file in unlock function. 2. Modify libxl__userdata_destroyall to not delete domain-userdata-lock, so that the lock remains held until unlock function is called. 3. Check domain still exists when the lock is acquired, unlock if domain is already gone. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_create.c | 2 +- tools/libxl/libxl_dom.c | 10 +++++++--- tools/libxl/libxl_internal.c | 30 +++++++++++++++++++++--------- tools/libxl/libxl_internal.h | 9 +++++++-- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ad3495a..3b2d104 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1530,7 +1530,7 @@ static void devices_destroy_cb(libxl__egc *egc, uint32_t domid = dis->domid; char *dom_path; char *vm_path; - libxl__carefd *lock = NULL; + libxl__domain_userdata_lock *lock = NULL; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a5e185e..8b82584 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1404,7 +1404,7 @@ static void domcreate_complete(libxl__egc *egc, rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); if (!rc) { - libxl__carefd *lock; + libxl__domain_userdata_lock *lock; /* Note that we hold CTX lock at this point so only need to * take data store lock diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 0dfdb08..02384ac 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1857,8 +1857,12 @@ void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid) if (r) LOGE(ERROR, "glob failed for %s", pattern); + /* Note: don't delete domain-userdata-lock, it will be handled by + * unlock function. + */ for (i=0; ipath = libxl__strdup(NOGC, lockfile); + while (true) { libxl__carefd_begin(); fd = open(lockfile, O_RDWR|O_CREAT, 0666); if (fd < 0) LOGE(ERROR, "cannot open lockfile %s, errno=%d", lockfile, errno); - carefd = libxl__carefd_opened(CTX, fd); + lock->lock_carefd = libxl__carefd_opened(CTX, fd); if (fd < 0) goto out; /* Lock the file in exclusive mode, wait indefinitely to @@ -434,20 +438,28 @@ libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid) break; } - libxl__carefd_close(carefd); + libxl__carefd_close(lock->lock_carefd); } - return carefd; + /* Check the domain is still there, if not we should release the + * lock and clean up. + */ + if (libxl_domain_info(CTX, NULL, domid)) + goto out; + + return lock; out: - if (carefd) libxl__carefd_close(carefd); + if (lock) libxl__unlock_domain_userdata(lock); return NULL; } -void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd) +void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock) { - /* Simply closing the file descriptor releases the lock */ - libxl__carefd_close(lock_carefd); + if (lock->path) unlink(lock->path); + if (lock->lock_carefd) libxl__carefd_close(lock->lock_carefd); + free(lock->path); + free(lock); } int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 03e9978..aa18e74 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3241,8 +3241,13 @@ static inline int libxl__key_value_list_is_empty(libxl_key_value_list *pkvl) int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); /* Portability note: a proper flock(2) implementation is required */ -libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); -void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd); +typedef struct { + libxl__carefd *lock_carefd; + char *path; /* path of the lock file itself */ +} libxl__domain_userdata_lock; +libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, + uint32_t domid); +void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock); /* * Retrieve / store domain configuration from / to libxl private -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzJ-0003tK-F8; Fri, 19 Sep 2014 05:44:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzI-0003tE-E0 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:08 +0000 Received: from [85.158.143.35:18884] by server-1.bemta-4.messagelabs.com id 65/3B-05872-7A2CB145; Fri, 19 Sep 2014 05:44:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1411105446!11784872!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11952 invoked from network); 19 Sep 2014 05:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzE-0000Sj-LS for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzE-0005xW-Ij for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:04 +0000 Date: Fri, 19 Sep 2014 05:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: rework domain userdata file lock X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a788fe0cd8bcb51ef167fc451f837066362d8c82 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:11 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:58:29 2014 +0100 libxl: rework domain userdata file lock The lock introduced in d2cd9d4f ("libxl: functions to lock / unlock libxl userdata store") has a bug that can leak the lock file when domain destruction races with other functions that try to get hold of the lock. There are several issues: 1. The lock is released too early with libxl__userdata_destroyall deletes everything in userdata store, including the lock file. 2. The check of domain existence is only done at the beginning of lock function, by the time the lock is acquired, the domain might have been gone already. The effect of this two issues is we can run into such situation: Process 1 Process 2 domain destruction # LOCK FUNCTION # LOCK FUNCTION check domain existence check domain existence acquire lock (file created) # LOCK FUNCTION destroy all files (lock file deleted, lock released) acquire lock (file created) # LOCK FUNCTION destroy domain # UNLOCK (close fd only) [ lock file leaked ] Fix this problem by deploying following changes: 1. Unlink lock file in unlock function. 2. Modify libxl__userdata_destroyall to not delete domain-userdata-lock, so that the lock remains held until unlock function is called. 3. Check domain still exists when the lock is acquired, unlock if domain is already gone. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_create.c | 2 +- tools/libxl/libxl_dom.c | 10 +++++++--- tools/libxl/libxl_internal.c | 30 +++++++++++++++++++++--------- tools/libxl/libxl_internal.h | 9 +++++++-- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index ad3495a..3b2d104 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1530,7 +1530,7 @@ static void devices_destroy_cb(libxl__egc *egc, uint32_t domid = dis->domid; char *dom_path; char *vm_path; - libxl__carefd *lock = NULL; + libxl__domain_userdata_lock *lock = NULL; dom_path = libxl__xs_get_dompath(gc, domid); if (!dom_path) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a5e185e..8b82584 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1404,7 +1404,7 @@ static void domcreate_complete(libxl__egc *egc, rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); if (!rc) { - libxl__carefd *lock; + libxl__domain_userdata_lock *lock; /* Note that we hold CTX lock at this point so only need to * take data store lock diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 0dfdb08..02384ac 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1857,8 +1857,12 @@ void libxl__userdata_destroyall(libxl__gc *gc, uint32_t domid) if (r) LOGE(ERROR, "glob failed for %s", pattern); + /* Note: don't delete domain-userdata-lock, it will be handled by + * unlock function. + */ for (i=0; ipath = libxl__strdup(NOGC, lockfile); + while (true) { libxl__carefd_begin(); fd = open(lockfile, O_RDWR|O_CREAT, 0666); if (fd < 0) LOGE(ERROR, "cannot open lockfile %s, errno=%d", lockfile, errno); - carefd = libxl__carefd_opened(CTX, fd); + lock->lock_carefd = libxl__carefd_opened(CTX, fd); if (fd < 0) goto out; /* Lock the file in exclusive mode, wait indefinitely to @@ -434,20 +438,28 @@ libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid) break; } - libxl__carefd_close(carefd); + libxl__carefd_close(lock->lock_carefd); } - return carefd; + /* Check the domain is still there, if not we should release the + * lock and clean up. + */ + if (libxl_domain_info(CTX, NULL, domid)) + goto out; + + return lock; out: - if (carefd) libxl__carefd_close(carefd); + if (lock) libxl__unlock_domain_userdata(lock); return NULL; } -void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd) +void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock) { - /* Simply closing the file descriptor releases the lock */ - libxl__carefd_close(lock_carefd); + if (lock->path) unlink(lock->path); + if (lock->lock_carefd) libxl__carefd_close(lock->lock_carefd); + free(lock->path); + free(lock); } int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 03e9978..aa18e74 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3241,8 +3241,13 @@ static inline int libxl__key_value_list_is_empty(libxl_key_value_list *pkvl) int libxl__cpuid_policy_is_empty(libxl_cpuid_policy_list *pl); /* Portability note: a proper flock(2) implementation is required */ -libxl__carefd *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); -void libxl__unlock_domain_userdata(libxl__carefd *lock_carefd); +typedef struct { + libxl__carefd *lock_carefd; + char *path; /* path of the lock file itself */ +} libxl__domain_userdata_lock; +libxl__domain_userdata_lock *libxl__lock_domain_userdata(libxl__gc *gc, + uint32_t domid); +void libxl__unlock_domain_userdata(libxl__domain_userdata_lock *lock); /* * Retrieve / store domain configuration from / to libxl private -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:44: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 1XUqzV-0003uA-Hr; Fri, 19 Sep 2014 05:44:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzT-0003u0-JM for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:19 +0000 Received: from [85.158.139.211:48579] by server-2.bemta-5.messagelabs.com id CD/A5-31832-2B2CB145; Fri, 19 Sep 2014 05:44:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1411105456!10113517!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13623 invoked from network); 19 Sep 2014 05:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzQ-0000Sm-1z for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzQ-0005xu-0U for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:16 +0000 Date: Fri, 19 Sep 2014 05:44:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: synchronise configuration when we hotplug a device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4197d3abbb3055d3798254eb7ba239bfb5824360 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:12 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:10 2014 +0100 libxl: synchronise configuration when we hotplug a device We update JSON version first, then write to xenstore, so that we maintain the following invariant: any device which is present in xenstore has a corresponding entry in JSON. The workflow is as followed: lock json config read json config update in-memory json config with new entry, replacing any stale entry for loop open xs transaction check device existence, abort if it exists write in-memory json config to disk commit xs transaction end for loop unlock json config Please see comment in libxl_internal.h for correctness proof. As those routines are called both during domain creation and device hotplug, we add a flag to indicate whether we need to update JSON config. This flag is only set to true when we hotplug a device. We cannot update JSON config during domain creation as JSON config is committed to disk only when domain creation finishes. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 96 +++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 130 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_pci.c | 24 ++++++++ 3 files changed, 250 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3b2d104..e5d4891 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1894,6 +1894,13 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, libxl__device *device; int rc; xs_transaction_t t = XBT_NULL; + libxl_domain_config d_config; + libxl_device_vtpm vtpm_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_vtpm_init(&vtpm_saved); + libxl_device_vtpm_copy(CTX, &vtpm_saved, vtpm); rc = libxl__device_vtpm_setdefault(gc, vtpm); if (rc) goto out; @@ -1908,6 +1915,8 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, } } + libxl__update_config_vtpm(gc, &vtpm_saved, vtpm); + GCNEW(device); rc = libxl__device_from_vtpm(gc, domid, vtpm, device); if ( rc != 0 ) goto out; @@ -1933,6 +1942,19 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, "handle"); flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); + if (aodev->update_json) { + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(vtpm, vtpms, domid, &vtpm_saved, COMPARE_DEVID, &d_config); + } + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -1946,6 +1968,11 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, goto out; } + if (aodev->update_json) { + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), @@ -1965,6 +1992,9 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, rc = 0; out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_vtpm_dispose(&vtpm_saved); + libxl_domain_config_dispose(&d_config); aodev->rc = rc; if(rc) aodev->callback(egc, aodev); return; @@ -2197,6 +2227,13 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, int rc; libxl_ctx *ctx = gc->owner; xs_transaction_t t = XBT_NULL; + libxl_domain_config d_config; + libxl_device_disk disk_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_disk_init(&disk_saved); + libxl_device_disk_copy(ctx, &disk_saved, disk); libxl_domain_type type = libxl__domain_type(gc, domid); if (type == LIBXL_DOMAIN_TYPE_INVALID) { @@ -2204,6 +2241,26 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, goto out; } + /* + * get_vdev != NULL -> local attach + * get_vdev == NULL -> block attach + * + * We don't care about local attach state because it's only + * intermediate state. + */ + if (!get_vdev && aodev->update_json) { + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(disk, disks, domid, &disk_saved, COMPARE_DISK, &d_config); + } + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -2356,6 +2413,11 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, } } + if (!get_vdev && aodev->update_json) { + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), libxl__xs_kvs_of_flexarray(gc, front, front->count), @@ -2374,6 +2436,9 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_disk_dispose(&disk_saved); + libxl_domain_config_dispose(&d_config); aodev->rc = rc; if (rc) aodev->callback(egc, aodev); return; @@ -3030,6 +3095,13 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl__device *device; int rc; xs_transaction_t t = XBT_NULL; + libxl_domain_config d_config; + libxl_device_nic nic_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_nic_init(&nic_saved); + libxl_device_nic_copy(CTX, &nic_saved, nic); rc = libxl__device_nic_setdefault(gc, nic, domid); if (rc) goto out; @@ -3044,6 +3116,8 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, } } + libxl__update_config_nic(gc, &nic_saved, nic); + GCNEW(device); rc = libxl__device_from_nic(gc, domid, nic, device); if ( rc != 0 ) goto out; @@ -3101,6 +3175,19 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nic->mac))); + if (aodev->update_json) { + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(nic, nics, domid, &nic_saved, COMPARE_DEVID, &d_config); + } + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -3114,6 +3201,11 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, goto out; } + if (aodev->update_json) { + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), @@ -3133,6 +3225,9 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, rc = 0; out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_nic_dispose(&nic_saved); + libxl_domain_config_dispose(&d_config); aodev->rc = rc; if (rc) aodev->callback(egc, aodev); return; @@ -3686,6 +3781,7 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) GCNEW(aodev); \ libxl__prepare_ao_device(ao, aodev); \ aodev->callback = device_addrm_aocomplete; \ + aodev->update_json = true; \ libxl__device_##type##_add(egc, domid, type, aodev); \ \ return AO_INPROGRESS; \ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index aa18e74..f61673c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2148,6 +2148,8 @@ struct libxl__ao_device { int num_exec; /* for calling hotplug scripts */ libxl__async_exec_state aes; + /* If we need to update JSON config */ + bool update_json; }; /* @@ -2273,6 +2275,77 @@ struct libxl__multidev { * * Once finished, aodev->callback will be executed. */ +/* + * As of Xen 4.5 we maintain various infomation, including hotplug + * device information, in JSON files, so that we can use this JSON + * file as a template to reconstruct domain configuration. + * + * In essense there are now two views of device state, one is xenstore, + * the other is JSON file. We use xenstore as primary reference. + * + * Here we maintain one invariant: every device in xenstore must have + * an entry in JSON file. + * + * All device hotplug routines should comply to following pattern: + * lock json config (json_lock) + * read json config + * update in-memory json config with new entry, replacing + * any stale entry + * for loop -- xs transaction + * open xs transaction + * check device existence, abort if it exists + * write in-memory json config to disk + * commit xs transaction + * end for loop + * unlock json config + * + * Device removal routines are not touched. + * + * Here is the proof that we always maintain that invariant and we + * don't leak files during interaction of hotplug thread and other + * threads / processes. + * + * # Safe against parallel add + * + * When another thread / process tries to add same device, it's + * blocked by json_lock. The loser of two threads will bail at + * existence check, so that we don't overwrite anything. + * + * # Safe against domain destruction + * + * If the thread / process trying to destroy domain loses the race, it's + * blocked by json_lock. If the hotplug thread is loser, it bails at + * acquiring lock because lock acquisition function checks existence of + * the domain. + * + * # Safe against parallel removal + * + * When another thread / process tries to remove a device, it's _NOT_ + * blocked by json_lock, but xenstore transaction can help maintain + * invariant. The removal threads either a) sees that device in + * xenstore, b) doesn't see that device in xenstore. + * + * In a), it sees that device in xenstore. At that point hotplug is + * already finished (both JSON and xenstore changes committed). So that + * device can be safely removed. JSON entry is left untouched and + * becomes stale, but this is a valid state -- next time when a + * device with same identifier gets added, the stale entry gets + * overwritten. + * + * In b), it doesn't see that device in xenstore, but it will commence + * anyway. Eventually a forcibly removal is initiated, which will forcely + * remove xenstore entry. + * + * If hotplug threads creates xenstore entry (therefore JSON entry as + * well) before force removal, that xenstore entry is removed. We're + * left with JSON stale entry but not xenstore entry, which is a valid + * state. + * + * If hotplug thread has not created xenstore entry when the removal + * is committed, we're obviously safe. Hotplug thread will add in + * xenstore entry afterwards. We have both JSON and xenstore entry, + * it's a valid state. + */ _hidden void libxl__device_disk_add(libxl__egc *egc, uint32_t domid, libxl_device_disk *disk, libxl__ao_device *aodev); @@ -3280,6 +3353,63 @@ static inline void libxl__update_config_vtpm(libxl__gc *gc, libxl_uuid_copy(CTX, &dst->uuid, &src->uuid); } +/* Macros used to compare device identifier. Returns true if the two + * devices have same identifier. */ +#define COMPARE_DEVID(a, b) ((a)->devid == (b)->devid) +#define COMPARE_DISK(a, b) (!strcmp((a)->vdev, (b)->vdev)) +#define COMPARE_PCI(a, b) ((a)->func == (b)->func && \ + (a)->bus == (b)->bus && \ + (a)->dev == (b)->dev) + +/* DEVICE_ADD + * + * Add a device in libxl_domain_config structure + * + * It takes 6 parameters: + * type: the type of the device, say nic, vtpm, disk, pci etc + * ptr: pointer to the start of the array, the array must be + * of type libxl_device_#type + * domid: domain id of target domain + * dev: the device that is to be added / removed / updated + * compare: the COMPARE_* macro used to compare @dev's identifier to + * those in the array pointed to by @ptr + * d_config: pointer to template domain config + * + * For most device types (nic, vtpm), the array pointer @ptr can be + * derived from @type, pci device being the exception, hence we need + * to have @ptr. + * + * If there is already a device with the same identifier in d_config, + * that entry is updated. + */ +#define DEVICE_ADD(type, ptr, domid, dev, compare, d_config) \ + ({ \ + int DA_x; \ + libxl_device_##type *DA_p = NULL; \ + \ + /* Check for existing device */ \ + for (DA_x = 0; DA_x < (d_config)->num_##ptr; DA_x++) { \ + if (compare(&(d_config)->ptr[DA_x], (dev))) { \ + DA_p = &(d_config)->ptr[DA_x]; \ + break; \ + } \ + } \ + \ + if (!DA_p) { \ + (d_config)->ptr = \ + libxl__realloc(NOGC, (d_config)->ptr, \ + ((d_config)->num_##ptr + 1) * \ + sizeof(libxl_device_##type)); \ + DA_p = &(d_config)->ptr[(d_config)->num_##ptr]; \ + (d_config)->num_##ptr++; \ + } else { \ + libxl_device_##type##_dispose(DA_p); \ + } \ + \ + libxl_device_##type##_init(DA_p); \ + libxl_device_##type##_copy(CTX, DA_p, (dev)); \ + }) + #endif /* diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index c22767e..9f40100 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -126,6 +126,13 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d xs_transaction_t t; libxl__device *device; int rc; + libxl_domain_config d_config; + libxl_device_pci pcidev_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_pci_init(&pcidev_saved); + libxl_device_pci_copy(CTX, &pcidev_saved, pcidev); be_path = libxl__sprintf(gc, "%s/backend/pci/%d/0", libxl__xs_get_dompath(gc, 0), domid); num_devs = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/num_devs", be_path)); @@ -153,6 +160,17 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d GCNEW(device); libxl__device_from_pcidev(gc, domid, pcidev, device); + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(pci, pcidevs, domid, &pcidev_saved, COMPARE_PCI, &d_config); + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -165,6 +183,9 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d goto out; } + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + libxl__xs_writev(gc, t, be_path, libxl__xs_kvs_of_flexarray(gc, back, back->count)); @@ -175,6 +196,9 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_pci_dispose(&pcidev_saved); + libxl_domain_config_dispose(&d_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:44: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 1XUqzV-0003uA-Hr; Fri, 19 Sep 2014 05:44:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzT-0003u0-JM for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:19 +0000 Received: from [85.158.139.211:48579] by server-2.bemta-5.messagelabs.com id CD/A5-31832-2B2CB145; Fri, 19 Sep 2014 05:44:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1411105456!10113517!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13623 invoked from network); 19 Sep 2014 05:44:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzQ-0000Sm-1z for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzQ-0005xu-0U for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:16 +0000 Date: Fri, 19 Sep 2014 05:44:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: synchronise configuration when we hotplug a device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4197d3abbb3055d3798254eb7ba239bfb5824360 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:12 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:10 2014 +0100 libxl: synchronise configuration when we hotplug a device We update JSON version first, then write to xenstore, so that we maintain the following invariant: any device which is present in xenstore has a corresponding entry in JSON. The workflow is as followed: lock json config read json config update in-memory json config with new entry, replacing any stale entry for loop open xs transaction check device existence, abort if it exists write in-memory json config to disk commit xs transaction end for loop unlock json config Please see comment in libxl_internal.h for correctness proof. As those routines are called both during domain creation and device hotplug, we add a flag to indicate whether we need to update JSON config. This flag is only set to true when we hotplug a device. We cannot update JSON config during domain creation as JSON config is committed to disk only when domain creation finishes. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 96 +++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.h | 130 ++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl_pci.c | 24 ++++++++ 3 files changed, 250 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 3b2d104..e5d4891 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1894,6 +1894,13 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, libxl__device *device; int rc; xs_transaction_t t = XBT_NULL; + libxl_domain_config d_config; + libxl_device_vtpm vtpm_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_vtpm_init(&vtpm_saved); + libxl_device_vtpm_copy(CTX, &vtpm_saved, vtpm); rc = libxl__device_vtpm_setdefault(gc, vtpm); if (rc) goto out; @@ -1908,6 +1915,8 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, } } + libxl__update_config_vtpm(gc, &vtpm_saved, vtpm); + GCNEW(device); rc = libxl__device_from_vtpm(gc, domid, vtpm, device); if ( rc != 0 ) goto out; @@ -1933,6 +1942,19 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, "handle"); flexarray_append(front, GCSPRINTF("%d", vtpm->devid)); + if (aodev->update_json) { + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(vtpm, vtpms, domid, &vtpm_saved, COMPARE_DEVID, &d_config); + } + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -1946,6 +1968,11 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, goto out; } + if (aodev->update_json) { + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), @@ -1965,6 +1992,9 @@ void libxl__device_vtpm_add(libxl__egc *egc, uint32_t domid, rc = 0; out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_vtpm_dispose(&vtpm_saved); + libxl_domain_config_dispose(&d_config); aodev->rc = rc; if(rc) aodev->callback(egc, aodev); return; @@ -2197,6 +2227,13 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, int rc; libxl_ctx *ctx = gc->owner; xs_transaction_t t = XBT_NULL; + libxl_domain_config d_config; + libxl_device_disk disk_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_disk_init(&disk_saved); + libxl_device_disk_copy(ctx, &disk_saved, disk); libxl_domain_type type = libxl__domain_type(gc, domid); if (type == LIBXL_DOMAIN_TYPE_INVALID) { @@ -2204,6 +2241,26 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, goto out; } + /* + * get_vdev != NULL -> local attach + * get_vdev == NULL -> block attach + * + * We don't care about local attach state because it's only + * intermediate state. + */ + if (!get_vdev && aodev->update_json) { + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(disk, disks, domid, &disk_saved, COMPARE_DISK, &d_config); + } + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -2356,6 +2413,11 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, } } + if (!get_vdev && aodev->update_json) { + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), libxl__xs_kvs_of_flexarray(gc, front, front->count), @@ -2374,6 +2436,9 @@ static void device_disk_add(libxl__egc *egc, uint32_t domid, out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_disk_dispose(&disk_saved); + libxl_domain_config_dispose(&d_config); aodev->rc = rc; if (rc) aodev->callback(egc, aodev); return; @@ -3030,6 +3095,13 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl__device *device; int rc; xs_transaction_t t = XBT_NULL; + libxl_domain_config d_config; + libxl_device_nic nic_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_nic_init(&nic_saved); + libxl_device_nic_copy(CTX, &nic_saved, nic); rc = libxl__device_nic_setdefault(gc, nic, domid); if (rc) goto out; @@ -3044,6 +3116,8 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, } } + libxl__update_config_nic(gc, &nic_saved, nic); + GCNEW(device); rc = libxl__device_from_nic(gc, domid, nic, device); if ( rc != 0 ) goto out; @@ -3101,6 +3175,19 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, flexarray_append(front, libxl__sprintf(gc, LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nic->mac))); + if (aodev->update_json) { + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(nic, nics, domid, &nic_saved, COMPARE_DEVID, &d_config); + } + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -3114,6 +3201,11 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, goto out; } + if (aodev->update_json) { + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + } + libxl__device_generic_add(gc, t, device, libxl__xs_kvs_of_flexarray(gc, back, back->count), @@ -3133,6 +3225,9 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, rc = 0; out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_nic_dispose(&nic_saved); + libxl_domain_config_dispose(&d_config); aodev->rc = rc; if (rc) aodev->callback(egc, aodev); return; @@ -3686,6 +3781,7 @@ DEFINE_DEVICE_REMOVE(vtpm, destroy, 1) GCNEW(aodev); \ libxl__prepare_ao_device(ao, aodev); \ aodev->callback = device_addrm_aocomplete; \ + aodev->update_json = true; \ libxl__device_##type##_add(egc, domid, type, aodev); \ \ return AO_INPROGRESS; \ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index aa18e74..f61673c 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2148,6 +2148,8 @@ struct libxl__ao_device { int num_exec; /* for calling hotplug scripts */ libxl__async_exec_state aes; + /* If we need to update JSON config */ + bool update_json; }; /* @@ -2273,6 +2275,77 @@ struct libxl__multidev { * * Once finished, aodev->callback will be executed. */ +/* + * As of Xen 4.5 we maintain various infomation, including hotplug + * device information, in JSON files, so that we can use this JSON + * file as a template to reconstruct domain configuration. + * + * In essense there are now two views of device state, one is xenstore, + * the other is JSON file. We use xenstore as primary reference. + * + * Here we maintain one invariant: every device in xenstore must have + * an entry in JSON file. + * + * All device hotplug routines should comply to following pattern: + * lock json config (json_lock) + * read json config + * update in-memory json config with new entry, replacing + * any stale entry + * for loop -- xs transaction + * open xs transaction + * check device existence, abort if it exists + * write in-memory json config to disk + * commit xs transaction + * end for loop + * unlock json config + * + * Device removal routines are not touched. + * + * Here is the proof that we always maintain that invariant and we + * don't leak files during interaction of hotplug thread and other + * threads / processes. + * + * # Safe against parallel add + * + * When another thread / process tries to add same device, it's + * blocked by json_lock. The loser of two threads will bail at + * existence check, so that we don't overwrite anything. + * + * # Safe against domain destruction + * + * If the thread / process trying to destroy domain loses the race, it's + * blocked by json_lock. If the hotplug thread is loser, it bails at + * acquiring lock because lock acquisition function checks existence of + * the domain. + * + * # Safe against parallel removal + * + * When another thread / process tries to remove a device, it's _NOT_ + * blocked by json_lock, but xenstore transaction can help maintain + * invariant. The removal threads either a) sees that device in + * xenstore, b) doesn't see that device in xenstore. + * + * In a), it sees that device in xenstore. At that point hotplug is + * already finished (both JSON and xenstore changes committed). So that + * device can be safely removed. JSON entry is left untouched and + * becomes stale, but this is a valid state -- next time when a + * device with same identifier gets added, the stale entry gets + * overwritten. + * + * In b), it doesn't see that device in xenstore, but it will commence + * anyway. Eventually a forcibly removal is initiated, which will forcely + * remove xenstore entry. + * + * If hotplug threads creates xenstore entry (therefore JSON entry as + * well) before force removal, that xenstore entry is removed. We're + * left with JSON stale entry but not xenstore entry, which is a valid + * state. + * + * If hotplug thread has not created xenstore entry when the removal + * is committed, we're obviously safe. Hotplug thread will add in + * xenstore entry afterwards. We have both JSON and xenstore entry, + * it's a valid state. + */ _hidden void libxl__device_disk_add(libxl__egc *egc, uint32_t domid, libxl_device_disk *disk, libxl__ao_device *aodev); @@ -3280,6 +3353,63 @@ static inline void libxl__update_config_vtpm(libxl__gc *gc, libxl_uuid_copy(CTX, &dst->uuid, &src->uuid); } +/* Macros used to compare device identifier. Returns true if the two + * devices have same identifier. */ +#define COMPARE_DEVID(a, b) ((a)->devid == (b)->devid) +#define COMPARE_DISK(a, b) (!strcmp((a)->vdev, (b)->vdev)) +#define COMPARE_PCI(a, b) ((a)->func == (b)->func && \ + (a)->bus == (b)->bus && \ + (a)->dev == (b)->dev) + +/* DEVICE_ADD + * + * Add a device in libxl_domain_config structure + * + * It takes 6 parameters: + * type: the type of the device, say nic, vtpm, disk, pci etc + * ptr: pointer to the start of the array, the array must be + * of type libxl_device_#type + * domid: domain id of target domain + * dev: the device that is to be added / removed / updated + * compare: the COMPARE_* macro used to compare @dev's identifier to + * those in the array pointed to by @ptr + * d_config: pointer to template domain config + * + * For most device types (nic, vtpm), the array pointer @ptr can be + * derived from @type, pci device being the exception, hence we need + * to have @ptr. + * + * If there is already a device with the same identifier in d_config, + * that entry is updated. + */ +#define DEVICE_ADD(type, ptr, domid, dev, compare, d_config) \ + ({ \ + int DA_x; \ + libxl_device_##type *DA_p = NULL; \ + \ + /* Check for existing device */ \ + for (DA_x = 0; DA_x < (d_config)->num_##ptr; DA_x++) { \ + if (compare(&(d_config)->ptr[DA_x], (dev))) { \ + DA_p = &(d_config)->ptr[DA_x]; \ + break; \ + } \ + } \ + \ + if (!DA_p) { \ + (d_config)->ptr = \ + libxl__realloc(NOGC, (d_config)->ptr, \ + ((d_config)->num_##ptr + 1) * \ + sizeof(libxl_device_##type)); \ + DA_p = &(d_config)->ptr[(d_config)->num_##ptr]; \ + (d_config)->num_##ptr++; \ + } else { \ + libxl_device_##type##_dispose(DA_p); \ + } \ + \ + libxl_device_##type##_init(DA_p); \ + libxl_device_##type##_copy(CTX, DA_p, (dev)); \ + }) + #endif /* diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index c22767e..9f40100 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -126,6 +126,13 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d xs_transaction_t t; libxl__device *device; int rc; + libxl_domain_config d_config; + libxl_device_pci pcidev_saved; + libxl__domain_userdata_lock *lock = NULL; + + libxl_domain_config_init(&d_config); + libxl_device_pci_init(&pcidev_saved); + libxl_device_pci_copy(CTX, &pcidev_saved, pcidev); be_path = libxl__sprintf(gc, "%s/backend/pci/%d/0", libxl__xs_get_dompath(gc, 0), domid); num_devs = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/num_devs", be_path)); @@ -153,6 +160,17 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d GCNEW(device); libxl__device_from_pcidev(gc, domid, pcidev, device); + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + DEVICE_ADD(pci, pcidevs, domid, &pcidev_saved, COMPARE_PCI, &d_config); + for (;;) { rc = libxl__xs_transaction_start(gc, &t); if (rc) goto out; @@ -165,6 +183,9 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d goto out; } + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + libxl__xs_writev(gc, t, be_path, libxl__xs_kvs_of_flexarray(gc, back, back->count)); @@ -175,6 +196,9 @@ static int libxl__device_pci_add_xenstore(libxl__gc *gc, uint32_t domid, libxl_d out: libxl__xs_transaction_abort(gc, &t); + if (lock) libxl__unlock_domain_userdata(lock); + libxl_device_pci_dispose(&pcidev_saved); + libxl_domain_config_dispose(&d_config); return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqze-0003vG-Ko; Fri, 19 Sep 2014 05:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzd-0003v5-7j for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:29 +0000 Received: from [85.158.139.211:61256] by server-14.bemta-5.messagelabs.com id 1D/88-12422-CB2CB145; Fri, 19 Sep 2014 05:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1411105466!15471676!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30185 invoked from network); 19 Sep 2014 05:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqza-0000Sv-AU for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqza-0005yG-7J for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:26 +0000 Date: Fri, 19 Sep 2014 05:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make libxl_cd_insert "eject" + "insert" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 577314768b430107845023d7e489ed0dd53892ad Author: Wei Liu AuthorDate: Tue Sep 16 11:01:13 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:22 2014 +0100 libxl: make libxl_cd_insert "eject" + "insert" We introduce an intermediate empty state when inserting media into CDROM. The scheme works like this: lock json config write empty state to xenstore for (;;) { write user supplied disk to JSON write disk information to xenstore } unlock json config Bear in mind that all steps can fail. With the proposed scheme, we now know, if xenstore is empty, then CDROM should be considered empty; otherwise we should use JSON version of CDROM configuration. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 119 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 98 insertions(+), 21 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e5d4891..89f4ce0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2664,14 +2664,26 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, { AO_CREATE(ctx, domid, ao_how); int num = 0, i; - libxl_device_disk *disks = NULL; + libxl_device_disk *disks = NULL, disk_saved, disk_empty; + libxl_domain_config d_config; int rc, dm_ver; - libxl__device device; const char * path; char * tmp; + libxl__domain_userdata_lock *lock = NULL; + xs_transaction_t t = XBT_NULL; + flexarray_t *insert = NULL, *empty = NULL; - flexarray_t *insert = NULL; + libxl_domain_config_init(&d_config); + libxl_device_disk_init(&disk_empty); + libxl_device_disk_init(&disk_saved); + libxl_device_disk_copy(ctx, &disk_saved, disk); + + disk_empty.format = LIBXL_DISK_FORMAT_EMPTY; + disk_empty.vdev = libxl__strdup(NOGC, disk->vdev); + disk_empty.pdev_path = libxl__strdup(NOGC, ""); + disk_empty.is_cdrom = 1; + libxl__device_disk_setdefault(gc, &disk_empty); libxl_domain_type type = libxl__domain_type(gc, domid); if (type == LIBXL_DOMAIN_TYPE_INVALID) { @@ -2723,24 +2735,8 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, rc = libxl__device_from_disk(gc, domid, disk, &device); if (rc) goto out; - if (dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - rc = libxl__qmp_insert_cdrom(gc, domid, disk); - if (rc) goto out; - } - path = libxl__device_backend_path(gc, &device); - /* Sanity check: make sure the backend exists before writing here */ - tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", path)); - if (!tmp) - { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", - libxl__sprintf(gc, "%s/frontend", path)); - rc = ERROR_FAIL; - goto out; - } - - insert = flexarray_make(gc, 4, 1); flexarray_append_pair(insert, "type", @@ -2753,19 +2749,100 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, else flexarray_append_pair(insert, "params", ""); - rc = libxl__xs_writev_atonce(gc, path, - libxl__xs_kvs_of_flexarray(gc, insert, insert->count)); + empty = flexarray_make(gc, 4, 1); + flexarray_append_pair(empty, "type", + libxl__device_disk_string_of_backend(disk->backend)); + flexarray_append_pair(empty, "params", ""); + + /* Note: CTX lock is already held at this point so lock hierarchy + * is maintained. + */ + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + /* We need to eject the original image first. This is implemented + * by inserting empty media. JSON is not updated. + */ + if (dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + rc = libxl__qmp_insert_cdrom(gc, domid, &disk_empty); + if (rc) goto out; + } + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + /* Sanity check: make sure the backend exists before writing here */ + tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", path)); + if (!tmp) + { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", + libxl__sprintf(gc, "%s/frontend", path)); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__xs_writev(gc, t, path, + libxl__xs_kvs_of_flexarray(gc, empty, empty->count)); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; + DEVICE_ADD(disk, disks, domid, &disk_saved, COMPARE_DISK, &d_config); + + if (dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + rc = libxl__qmp_insert_cdrom(gc, domid, disk); + if (rc) goto out; + } + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + /* Sanity check: make sure the backend exists before writing here */ + tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", path)); + if (!tmp) + { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", + libxl__sprintf(gc, "%s/frontend", path)); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + rc = libxl__xs_writev(gc, t, path, + libxl__xs_kvs_of_flexarray(gc, insert, insert->count)); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } + /* success, no actual async */ libxl__ao_complete(egc, ao, 0); rc = 0; out: + libxl__xs_transaction_abort(gc, &t); for (i = 0; i < num; i++) libxl_device_disk_dispose(&disks[i]); free(disks); + libxl_device_disk_dispose(&disk_empty); + libxl_device_disk_dispose(&disk_saved); + libxl_domain_config_dispose(&d_config); + + if (lock) libxl__unlock_domain_userdata(lock); if (rc) return AO_ABORT(rc); return AO_INPROGRESS; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:44:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqze-0003vG-Ko; Fri, 19 Sep 2014 05:44:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzd-0003v5-7j for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:29 +0000 Received: from [85.158.139.211:61256] by server-14.bemta-5.messagelabs.com id 1D/88-12422-CB2CB145; Fri, 19 Sep 2014 05:44:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1411105466!15471676!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30185 invoked from network); 19 Sep 2014 05:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqza-0000Sv-AU for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqza-0005yG-7J for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:26 +0000 Date: Fri, 19 Sep 2014 05:44:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: make libxl_cd_insert "eject" + "insert" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 577314768b430107845023d7e489ed0dd53892ad Author: Wei Liu AuthorDate: Tue Sep 16 11:01:13 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:22 2014 +0100 libxl: make libxl_cd_insert "eject" + "insert" We introduce an intermediate empty state when inserting media into CDROM. The scheme works like this: lock json config write empty state to xenstore for (;;) { write user supplied disk to JSON write disk information to xenstore } unlock json config Bear in mind that all steps can fail. With the proposed scheme, we now know, if xenstore is empty, then CDROM should be considered empty; otherwise we should use JSON version of CDROM configuration. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 119 ++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 98 insertions(+), 21 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index e5d4891..89f4ce0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2664,14 +2664,26 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, { AO_CREATE(ctx, domid, ao_how); int num = 0, i; - libxl_device_disk *disks = NULL; + libxl_device_disk *disks = NULL, disk_saved, disk_empty; + libxl_domain_config d_config; int rc, dm_ver; - libxl__device device; const char * path; char * tmp; + libxl__domain_userdata_lock *lock = NULL; + xs_transaction_t t = XBT_NULL; + flexarray_t *insert = NULL, *empty = NULL; - flexarray_t *insert = NULL; + libxl_domain_config_init(&d_config); + libxl_device_disk_init(&disk_empty); + libxl_device_disk_init(&disk_saved); + libxl_device_disk_copy(ctx, &disk_saved, disk); + + disk_empty.format = LIBXL_DISK_FORMAT_EMPTY; + disk_empty.vdev = libxl__strdup(NOGC, disk->vdev); + disk_empty.pdev_path = libxl__strdup(NOGC, ""); + disk_empty.is_cdrom = 1; + libxl__device_disk_setdefault(gc, &disk_empty); libxl_domain_type type = libxl__domain_type(gc, domid); if (type == LIBXL_DOMAIN_TYPE_INVALID) { @@ -2723,24 +2735,8 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, rc = libxl__device_from_disk(gc, domid, disk, &device); if (rc) goto out; - if (dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { - rc = libxl__qmp_insert_cdrom(gc, domid, disk); - if (rc) goto out; - } - path = libxl__device_backend_path(gc, &device); - /* Sanity check: make sure the backend exists before writing here */ - tmp = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, "%s/frontend", path)); - if (!tmp) - { - LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", - libxl__sprintf(gc, "%s/frontend", path)); - rc = ERROR_FAIL; - goto out; - } - - insert = flexarray_make(gc, 4, 1); flexarray_append_pair(insert, "type", @@ -2753,19 +2749,100 @@ int libxl_cdrom_insert(libxl_ctx *ctx, uint32_t domid, libxl_device_disk *disk, else flexarray_append_pair(insert, "params", ""); - rc = libxl__xs_writev_atonce(gc, path, - libxl__xs_kvs_of_flexarray(gc, insert, insert->count)); + empty = flexarray_make(gc, 4, 1); + flexarray_append_pair(empty, "type", + libxl__device_disk_string_of_backend(disk->backend)); + flexarray_append_pair(empty, "params", ""); + + /* Note: CTX lock is already held at this point so lock hierarchy + * is maintained. + */ + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + /* We need to eject the original image first. This is implemented + * by inserting empty media. JSON is not updated. + */ + if (dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + rc = libxl__qmp_insert_cdrom(gc, domid, &disk_empty); + if (rc) goto out; + } + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + /* Sanity check: make sure the backend exists before writing here */ + tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", path)); + if (!tmp) + { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", + libxl__sprintf(gc, "%s/frontend", path)); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__xs_writev(gc, t, path, + libxl__xs_kvs_of_flexarray(gc, empty, empty->count)); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, &d_config); if (rc) goto out; + DEVICE_ADD(disk, disks, domid, &disk_saved, COMPARE_DISK, &d_config); + + if (dm_ver == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + rc = libxl__qmp_insert_cdrom(gc, domid, disk); + if (rc) goto out; + } + + for (;;) { + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + /* Sanity check: make sure the backend exists before writing here */ + tmp = libxl__xs_read(gc, t, libxl__sprintf(gc, "%s/frontend", path)); + if (!tmp) + { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, "Internal error: %s does not exist", + libxl__sprintf(gc, "%s/frontend", path)); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__set_domain_configuration(gc, domid, &d_config); + if (rc) goto out; + + rc = libxl__xs_writev(gc, t, path, + libxl__xs_kvs_of_flexarray(gc, insert, insert->count)); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc < 0) goto out; + } + /* success, no actual async */ libxl__ao_complete(egc, ao, 0); rc = 0; out: + libxl__xs_transaction_abort(gc, &t); for (i = 0; i < num; i++) libxl_device_disk_dispose(&disks[i]); free(disks); + libxl_device_disk_dispose(&disk_empty); + libxl_device_disk_dispose(&disk_saved); + libxl_domain_config_dispose(&d_config); + + if (lock) libxl__unlock_domain_userdata(lock); if (rc) return AO_ABORT(rc); return AO_INPROGRESS; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUqzo-0003x8-PK; Fri, 19 Sep 2014 05:44:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzn-0003wt-4a for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:39 +0000 Received: from [193.109.254.147:15159] by server-1.bemta-14.messagelabs.com id 05/4F-24760-6C2CB145; Fri, 19 Sep 2014 05:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1411105476!11718962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31377 invoked from network); 19 Sep 2014 05:44:37 -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; 19 Sep 2014 05:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzk-0000T3-IX for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzk-0005zP-FR for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:36 +0000 Date: Fri, 19 Sep 2014 05:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: refactor libxl_get_memory_target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c0e7d1032363beb308c8ad11ce6c107cf047e26 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:14 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:33 2014 +0100 libxl: refactor libxl_get_memory_target Introduce a helper function which can return both "target" node and "static-max" node of a domain. Reimplement libxl_get_memory_target using this helper. libxl__fill_dom0_memory_info is adjusted as well. This helper will be used in later patch. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 87 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 70 insertions(+), 17 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 89f4ce0..c809be7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4256,7 +4256,8 @@ out: return rc; } -static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb) +static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, + uint32_t *max_memkb) { int rc; libxl_dominfo info; @@ -4290,6 +4291,17 @@ retry_transaction: } } + if (staticmax) { + *max_memkb = strtoul(staticmax, &endptr, 10); + if (*endptr != '\0') { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "invalid memory static-max %s from %s\n", + staticmax, max_path); + rc = ERROR_FAIL; + goto out; + } + } + rc = libxl_domain_info(ctx, &info, 0); if (rc < 0) goto out; @@ -4303,9 +4315,11 @@ retry_transaction: (uint32_t) info.current_memkb); *target_memkb = (uint32_t) info.current_memkb; } - if (staticmax == NULL) + if (staticmax == NULL) { libxl__xs_write(gc, t, max_path, "%"PRIu32, - (uint32_t) info.max_memkb); + (uint32_t) info.max_memkb); + *max_memkb = (uint32_t) info.max_memkb; + } if (freememslack == NULL) { free_mem_slack_kb = (uint32_t) (PAGE_TO_MEMKB(physinfo.total_pages) - @@ -4336,12 +4350,12 @@ static int libxl__get_free_memory_slack(libxl__gc *gc, uint32_t *free_mem_slack) int rc; char *free_mem_slack_path = "/local/domain/0/memory/freemem-slack"; char *free_mem_slack_s, *endptr; - uint32_t target_memkb; + uint32_t target_memkb, max_memkb; retry: free_mem_slack_s = libxl__xs_read(gc, XBT_NULL, free_mem_slack_path); if (!free_mem_slack_s) { - rc = libxl__fill_dom0_memory_info(gc, &target_memkb); + rc = libxl__fill_dom0_memory_info(gc, &target_memkb, &max_memkb); if (rc < 0) return rc; goto retry; @@ -4364,6 +4378,7 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int rc = 1, abort_transaction = 0; uint32_t memorykb = 0, videoram = 0; uint32_t current_target_memkb = 0, new_target_memkb = 0; + uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); xc_domaininfo_t info; @@ -4379,7 +4394,8 @@ retry_transaction: if (!target && !domid) { if (!xs_transaction_end(ctx->xsh, t, 1)) goto out_no_transaction; - rc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb); + rc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb, + ¤t_max_memkb); if (rc < 0) goto out_no_transaction; goto retry_transaction; @@ -4494,38 +4510,75 @@ out_no_transaction: return rc; } -int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t *out_target) +/* out_target_memkb and out_max_memkb can be NULL */ +static int libxl__get_memory_target(libxl__gc *gc, uint32_t domid, + uint32_t *out_target_memkb, + uint32_t *out_max_memkb) { - GC_INIT(ctx); - int rc = 1; - char *target = NULL, *endptr = NULL; + int rc; + char *target = NULL, *static_max = NULL, *endptr = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); - uint32_t target_memkb; + uint32_t target_memkb, max_memkb; target = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, - "%s/memory/target", dompath)); - if (!target && !domid) { - rc = libxl__fill_dom0_memory_info(gc, &target_memkb); + "%s/memory/target", dompath)); + static_max = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, + "%s/memory/static-max", dompath)); + + rc = ERROR_FAIL; + if ((!target || !static_max) && !domid) { + rc = libxl__fill_dom0_memory_info(gc, &target_memkb, + &max_memkb); if (rc < 0) goto out; } else if (!target) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "cannot get target memory info from %s/memory/target\n", dompath); goto out; + } else if (!static_max) { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, + "cannot get target memory info from %s/memory/static-max\n", + dompath); + goto out; } else { target_memkb = strtoul(target, &endptr, 10); if (*endptr != '\0') { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "invalid memory target %s from %s/memory/target\n", target, dompath); goto out; } + max_memkb = strtoul(static_max, &endptr, 10); + if (*endptr != '\0') { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, + "invalid memory target %s from %s/memory/static-max\n", + static_max, dompath); + goto out; + } + } - *out_target = target_memkb; + + if (out_target_memkb) + *out_target_memkb = target_memkb; + + if (out_max_memkb) + *out_max_memkb = max_memkb; + rc = 0; out: + return rc; +} + +int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, + uint32_t *out_target) +{ + GC_INIT(ctx); + int rc; + + rc = libxl__get_memory_target(gc, domid, out_target, NULL); + GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:41 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUqzo-0003x8-PK; Fri, 19 Sep 2014 05:44:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzn-0003wt-4a for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:39 +0000 Received: from [193.109.254.147:15159] by server-1.bemta-14.messagelabs.com id 05/4F-24760-6C2CB145; Fri, 19 Sep 2014 05:44:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1411105476!11718962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31377 invoked from network); 19 Sep 2014 05:44:37 -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; 19 Sep 2014 05:44:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzk-0000T3-IX for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzk-0005zP-FR for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:36 +0000 Date: Fri, 19 Sep 2014 05:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: refactor libxl_get_memory_target X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c0e7d1032363beb308c8ad11ce6c107cf047e26 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:14 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:33 2014 +0100 libxl: refactor libxl_get_memory_target Introduce a helper function which can return both "target" node and "static-max" node of a domain. Reimplement libxl_get_memory_target using this helper. libxl__fill_dom0_memory_info is adjusted as well. This helper will be used in later patch. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 87 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 70 insertions(+), 17 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 89f4ce0..c809be7 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4256,7 +4256,8 @@ out: return rc; } -static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb) +static int libxl__fill_dom0_memory_info(libxl__gc *gc, uint32_t *target_memkb, + uint32_t *max_memkb) { int rc; libxl_dominfo info; @@ -4290,6 +4291,17 @@ retry_transaction: } } + if (staticmax) { + *max_memkb = strtoul(staticmax, &endptr, 10); + if (*endptr != '\0') { + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + "invalid memory static-max %s from %s\n", + staticmax, max_path); + rc = ERROR_FAIL; + goto out; + } + } + rc = libxl_domain_info(ctx, &info, 0); if (rc < 0) goto out; @@ -4303,9 +4315,11 @@ retry_transaction: (uint32_t) info.current_memkb); *target_memkb = (uint32_t) info.current_memkb; } - if (staticmax == NULL) + if (staticmax == NULL) { libxl__xs_write(gc, t, max_path, "%"PRIu32, - (uint32_t) info.max_memkb); + (uint32_t) info.max_memkb); + *max_memkb = (uint32_t) info.max_memkb; + } if (freememslack == NULL) { free_mem_slack_kb = (uint32_t) (PAGE_TO_MEMKB(physinfo.total_pages) - @@ -4336,12 +4350,12 @@ static int libxl__get_free_memory_slack(libxl__gc *gc, uint32_t *free_mem_slack) int rc; char *free_mem_slack_path = "/local/domain/0/memory/freemem-slack"; char *free_mem_slack_s, *endptr; - uint32_t target_memkb; + uint32_t target_memkb, max_memkb; retry: free_mem_slack_s = libxl__xs_read(gc, XBT_NULL, free_mem_slack_path); if (!free_mem_slack_s) { - rc = libxl__fill_dom0_memory_info(gc, &target_memkb); + rc = libxl__fill_dom0_memory_info(gc, &target_memkb, &max_memkb); if (rc < 0) return rc; goto retry; @@ -4364,6 +4378,7 @@ int libxl_set_memory_target(libxl_ctx *ctx, uint32_t domid, int rc = 1, abort_transaction = 0; uint32_t memorykb = 0, videoram = 0; uint32_t current_target_memkb = 0, new_target_memkb = 0; + uint32_t current_max_memkb = 0; char *memmax, *endptr, *videoram_s = NULL, *target = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); xc_domaininfo_t info; @@ -4379,7 +4394,8 @@ retry_transaction: if (!target && !domid) { if (!xs_transaction_end(ctx->xsh, t, 1)) goto out_no_transaction; - rc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb); + rc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb, + ¤t_max_memkb); if (rc < 0) goto out_no_transaction; goto retry_transaction; @@ -4494,38 +4510,75 @@ out_no_transaction: return rc; } -int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, uint32_t *out_target) +/* out_target_memkb and out_max_memkb can be NULL */ +static int libxl__get_memory_target(libxl__gc *gc, uint32_t domid, + uint32_t *out_target_memkb, + uint32_t *out_max_memkb) { - GC_INIT(ctx); - int rc = 1; - char *target = NULL, *endptr = NULL; + int rc; + char *target = NULL, *static_max = NULL, *endptr = NULL; char *dompath = libxl__xs_get_dompath(gc, domid); - uint32_t target_memkb; + uint32_t target_memkb, max_memkb; target = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, - "%s/memory/target", dompath)); - if (!target && !domid) { - rc = libxl__fill_dom0_memory_info(gc, &target_memkb); + "%s/memory/target", dompath)); + static_max = libxl__xs_read(gc, XBT_NULL, libxl__sprintf(gc, + "%s/memory/static-max", dompath)); + + rc = ERROR_FAIL; + if ((!target || !static_max) && !domid) { + rc = libxl__fill_dom0_memory_info(gc, &target_memkb, + &max_memkb); if (rc < 0) goto out; } else if (!target) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "cannot get target memory info from %s/memory/target\n", dompath); goto out; + } else if (!static_max) { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, + "cannot get target memory info from %s/memory/static-max\n", + dompath); + goto out; } else { target_memkb = strtoul(target, &endptr, 10); if (*endptr != '\0') { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, "invalid memory target %s from %s/memory/target\n", target, dompath); goto out; } + max_memkb = strtoul(static_max, &endptr, 10); + if (*endptr != '\0') { + LIBXL__LOG_ERRNO(CTX, LIBXL__LOG_ERROR, + "invalid memory target %s from %s/memory/static-max\n", + static_max, dompath); + goto out; + } + } - *out_target = target_memkb; + + if (out_target_memkb) + *out_target_memkb = target_memkb; + + if (out_max_memkb) + *out_max_memkb = max_memkb; + rc = 0; out: + return rc; +} + +int libxl_get_memory_target(libxl_ctx *ctx, uint32_t domid, + uint32_t *out_target) +{ + GC_INIT(ctx); + int rc; + + rc = libxl__get_memory_target(gc, domid, out_target, NULL); + GC_FREE; return rc; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUqzz-0003ym-T9; Fri, 19 Sep 2014 05: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 1XUqzy-0003yT-1P for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:50 +0000 Received: from [85.158.139.211:4476] by server-15.bemta-5.messagelabs.com id 05/AB-12002-0D2CB145; Fri, 19 Sep 2014 05:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1411105486!7863755!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10965 invoked from network); 19 Sep 2014 05:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzu-0000T9-OJ for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzu-0005zm-NQ for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:46 +0000 Date: Fri, 19 Sep 2014 05:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce libxl_retrieve_domain_configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d5550ffc56e72a40c231cead3594403405f2e7e Author: Wei Liu AuthorDate: Tue Sep 16 11:01:15 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:48 2014 +0100 libxl: introduce libxl_retrieve_domain_configuration Introduce a new public API to return domain configuration. This returned configuration can be used to rebuild a domain. Note that this configuration only describes the configuration necessary to reproduce the guest visible state and does not necessarily include specific decisions made by the toolstack regarding its current incarnation (e.g. disk backend) unless they were specified by the application when the domain was created. With this approach we can preserve what user has provided in the original configuration as well as valuable information from xenstore. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 16 +++++ 2 files changed, 201 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c809be7..f796da8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6129,6 +6129,191 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src) for (i = 0; i < 6; i++) (*dst)[i] = (*src)[i]; } + +int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, + libxl_domain_config *d_config) +{ + GC_INIT(ctx); + int rc; + libxl__domain_userdata_lock *lock = NULL; + + CTX_LOCK; + + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, d_config); + if (rc) { + LOG(ERROR, "fail to get domain configuration for domain %d", domid); + rc = ERROR_FAIL; + goto out; + } + + /* Domain name */ + { + char *domname; + domname = libxl_domid_to_name(ctx, domid); + if (!domname) { + LOG(ERROR, "fail to get domain name for domain %d", domid); + goto out; + } + free(d_config->c_info.name); + d_config->c_info.name = domname; /* steals allocation */ + } + + /* Domain UUID */ + { + libxl_dominfo info; + rc = libxl_domain_info(ctx, &info, domid); + if (rc) { + LOG(ERROR, "fail to get domain info for domain %d", domid); + goto out; + } + libxl_uuid_copy(ctx, &d_config->c_info.uuid, &info.uuid); + } + + /* Memory limits: + * + * Currently there are three memory limits: + * 1. "target" in xenstore (originally memory= in config file) + * 2. "static-max" in xenstore (originally maxmem= in config file) + * 3. "max_memkb" in hypervisor + * + * The third one is not visible and currently managed by + * toolstack. In order to rebuild a domain we only need to have + * "target" and "static-max". + */ + { + uint32_t target_memkb = 0, max_memkb = 0; + + /* "target" */ + rc = libxl__get_memory_target(gc, domid, &target_memkb, &max_memkb); + if (rc) { + LOG(ERROR, "fail to get memory target for domain %d", domid); + goto out; + } + /* Target memory in xenstore is different from what user has + * asked for. The difference is video_memkb. See + * libxl_set_memory_target. + */ + d_config->b_info.target_memkb = target_memkb + + d_config->b_info.video_memkb; + + d_config->b_info.max_memkb = max_memkb; + } + + /* Devices: disk, nic, vtpm, pcidev etc. */ + + /* The MERGE macro implements following logic: + * 0. retrieve JSON (done by now) + * 1. retrieve list of device from xenstore + * 2. use xenstore entries as primary reference and compare JSON + * entries with them. + * a. if a device is present in xenstore and in JSON, merge the + * two views. + * b. if a device is not present in xenstore but in JSON, delete + * it from the result. + * c. it's impossible to have an entry present in xenstore but + * not in JSON, because we maintain an invariant that every + * entry in xenstore must have a corresponding entry in JSON. + * 3. "merge" operates on "src" and "dst". "src" points to the + * entry retrieved from xenstore while "dst" points to the entry + * retrieve from JSON. + */ +#define MERGE(type, ptr, compare, merge) \ + do { \ + libxl_device_##type *p = NULL; \ + int i, j, num; \ + \ + p = libxl_device_##type##_list(CTX, domid, &num); \ + if (p == NULL) { \ + LOG(DEBUG, \ + "no %s from xenstore for domain %d", \ + #type, domid); \ + } \ + \ + for (i = 0; i < d_config->num_##ptr; i++) { \ + libxl_device_##type *q = &d_config->ptr[i]; \ + for (j = 0; j < num; j++) { \ + if (compare(&p[j], q)) \ + break; \ + } \ + \ + if (j < num) { /* found in xenstore */ \ + libxl_device_##type *dst, *src; \ + dst = q; \ + src = &p[j]; \ + merge; \ + } else { /* not found in xenstore */ \ + LOG(WARN, \ + "Device present in JSON but not in xenstore, ignored"); \ + \ + libxl_device_##type##_dispose(q); \ + \ + for (j = i; j < d_config->num_##ptr - 1; j++) \ + memcpy(&d_config->ptr[j], &d_config->ptr[j+1], \ + sizeof(libxl_device_##type)); \ + \ + d_config->ptr = \ + libxl__realloc(NOGC, d_config->ptr, \ + sizeof(libxl_device_##type) * \ + (d_config->num_##ptr - 1)); \ + \ + /* rewind counters */ \ + d_config->num_##ptr--; \ + i--; \ + } \ + } \ + \ + for (i = 0; i < num; i++) \ + libxl_device_##type##_dispose(&p[i]); \ + free(p); \ + } while (0); + + MERGE(nic, nics, COMPARE_DEVID, {}); + + MERGE(vtpm, vtpms, COMPARE_DEVID, {}); + + MERGE(pci, pcidevs, COMPARE_PCI, {}); + + /* Take care of removable device. We maintain invariant in the + * insert / remove operation so that: + * 1. if xenstore is "empty" while JSON is not, the result + * is "empty" + * 2. if xenstore has a different media than JSON, use the + * one in JSON + * 3. if xenstore and JSON have the same media, well, you + * know the answer :-) + * + * Currently there is only one removable device -- CDROM. + * Look for libxl_cdrom_insert for reference. + */ + MERGE(disk, disks, COMPARE_DISK, { + if (src->removable) { + if (!src->pdev_path || *src->pdev_path == '\0') { + /* 1, no media in drive */ + free(dst->pdev_path); + dst->pdev_path = libxl__strdup(NOGC, ""); + dst->format = LIBXL_DISK_FORMAT_EMPTY; + } else { + /* 2 and 3, use JSON, no need to touch anything */ + ; + } + } + }); + +#undef MERGE + +out: + if (lock) libxl__unlock_domain_userdata(lock); + CTX_UNLOCK; + GC_FREE; + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 5136d02..3bee659 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -368,6 +368,14 @@ typedef struct libxl__ctx libxl_ctx; #endif #endif +/* LIBXL_HAVE_RETRIEVE_DOMAIN_CONFIGURATION + * + * If this is defined we have libxl_retrieve_domain_configuration which + * returns the current configuration of a domain, which can be used to + * rebuild a domain. + */ +#define LIBXL_HAVE_RETRIEVE_DOMAIN_CONFIGURATION 1 + /* * LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS * @@ -870,6 +878,14 @@ int static inline libxl_domain_create_restore_0x040200( void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); +/* + * Retrieve domain configuration and filled it in d_config. The + * returned configuration can be used to rebuild a domain. It only + * works with DomU. + */ +int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, + libxl_domain_config *d_config); + int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, /* LIBXL_SUSPEND_* */ const libxl_asyncop_how *ao_how) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:44:52 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUqzz-0003ym-T9; Fri, 19 Sep 2014 05: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 1XUqzy-0003yT-1P for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:50 +0000 Received: from [85.158.139.211:4476] by server-15.bemta-5.messagelabs.com id 05/AB-12002-0D2CB145; Fri, 19 Sep 2014 05:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1411105486!7863755!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10965 invoked from network); 19 Sep 2014 05:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUqzu-0000T9-OJ for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUqzu-0005zm-NQ for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:46 +0000 Date: Fri, 19 Sep 2014 05:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce libxl_retrieve_domain_configuration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9d5550ffc56e72a40c231cead3594403405f2e7e Author: Wei Liu AuthorDate: Tue Sep 16 11:01:15 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 19:59:48 2014 +0100 libxl: introduce libxl_retrieve_domain_configuration Introduce a new public API to return domain configuration. This returned configuration can be used to rebuild a domain. Note that this configuration only describes the configuration necessary to reproduce the guest visible state and does not necessarily include specific decisions made by the toolstack regarding its current incarnation (e.g. disk backend) unless they were specified by the application when the domain was created. With this approach we can preserve what user has provided in the original configuration as well as valuable information from xenstore. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.c | 185 +++++++++++++++++++++++++++++++++++++++++++++++++++ tools/libxl/libxl.h | 16 +++++ 2 files changed, 201 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c809be7..f796da8 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -6129,6 +6129,191 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src) for (i = 0; i < 6; i++) (*dst)[i] = (*src)[i]; } + +int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, + libxl_domain_config *d_config) +{ + GC_INIT(ctx); + int rc; + libxl__domain_userdata_lock *lock = NULL; + + CTX_LOCK; + + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + rc = libxl__get_domain_configuration(gc, domid, d_config); + if (rc) { + LOG(ERROR, "fail to get domain configuration for domain %d", domid); + rc = ERROR_FAIL; + goto out; + } + + /* Domain name */ + { + char *domname; + domname = libxl_domid_to_name(ctx, domid); + if (!domname) { + LOG(ERROR, "fail to get domain name for domain %d", domid); + goto out; + } + free(d_config->c_info.name); + d_config->c_info.name = domname; /* steals allocation */ + } + + /* Domain UUID */ + { + libxl_dominfo info; + rc = libxl_domain_info(ctx, &info, domid); + if (rc) { + LOG(ERROR, "fail to get domain info for domain %d", domid); + goto out; + } + libxl_uuid_copy(ctx, &d_config->c_info.uuid, &info.uuid); + } + + /* Memory limits: + * + * Currently there are three memory limits: + * 1. "target" in xenstore (originally memory= in config file) + * 2. "static-max" in xenstore (originally maxmem= in config file) + * 3. "max_memkb" in hypervisor + * + * The third one is not visible and currently managed by + * toolstack. In order to rebuild a domain we only need to have + * "target" and "static-max". + */ + { + uint32_t target_memkb = 0, max_memkb = 0; + + /* "target" */ + rc = libxl__get_memory_target(gc, domid, &target_memkb, &max_memkb); + if (rc) { + LOG(ERROR, "fail to get memory target for domain %d", domid); + goto out; + } + /* Target memory in xenstore is different from what user has + * asked for. The difference is video_memkb. See + * libxl_set_memory_target. + */ + d_config->b_info.target_memkb = target_memkb + + d_config->b_info.video_memkb; + + d_config->b_info.max_memkb = max_memkb; + } + + /* Devices: disk, nic, vtpm, pcidev etc. */ + + /* The MERGE macro implements following logic: + * 0. retrieve JSON (done by now) + * 1. retrieve list of device from xenstore + * 2. use xenstore entries as primary reference and compare JSON + * entries with them. + * a. if a device is present in xenstore and in JSON, merge the + * two views. + * b. if a device is not present in xenstore but in JSON, delete + * it from the result. + * c. it's impossible to have an entry present in xenstore but + * not in JSON, because we maintain an invariant that every + * entry in xenstore must have a corresponding entry in JSON. + * 3. "merge" operates on "src" and "dst". "src" points to the + * entry retrieved from xenstore while "dst" points to the entry + * retrieve from JSON. + */ +#define MERGE(type, ptr, compare, merge) \ + do { \ + libxl_device_##type *p = NULL; \ + int i, j, num; \ + \ + p = libxl_device_##type##_list(CTX, domid, &num); \ + if (p == NULL) { \ + LOG(DEBUG, \ + "no %s from xenstore for domain %d", \ + #type, domid); \ + } \ + \ + for (i = 0; i < d_config->num_##ptr; i++) { \ + libxl_device_##type *q = &d_config->ptr[i]; \ + for (j = 0; j < num; j++) { \ + if (compare(&p[j], q)) \ + break; \ + } \ + \ + if (j < num) { /* found in xenstore */ \ + libxl_device_##type *dst, *src; \ + dst = q; \ + src = &p[j]; \ + merge; \ + } else { /* not found in xenstore */ \ + LOG(WARN, \ + "Device present in JSON but not in xenstore, ignored"); \ + \ + libxl_device_##type##_dispose(q); \ + \ + for (j = i; j < d_config->num_##ptr - 1; j++) \ + memcpy(&d_config->ptr[j], &d_config->ptr[j+1], \ + sizeof(libxl_device_##type)); \ + \ + d_config->ptr = \ + libxl__realloc(NOGC, d_config->ptr, \ + sizeof(libxl_device_##type) * \ + (d_config->num_##ptr - 1)); \ + \ + /* rewind counters */ \ + d_config->num_##ptr--; \ + i--; \ + } \ + } \ + \ + for (i = 0; i < num; i++) \ + libxl_device_##type##_dispose(&p[i]); \ + free(p); \ + } while (0); + + MERGE(nic, nics, COMPARE_DEVID, {}); + + MERGE(vtpm, vtpms, COMPARE_DEVID, {}); + + MERGE(pci, pcidevs, COMPARE_PCI, {}); + + /* Take care of removable device. We maintain invariant in the + * insert / remove operation so that: + * 1. if xenstore is "empty" while JSON is not, the result + * is "empty" + * 2. if xenstore has a different media than JSON, use the + * one in JSON + * 3. if xenstore and JSON have the same media, well, you + * know the answer :-) + * + * Currently there is only one removable device -- CDROM. + * Look for libxl_cdrom_insert for reference. + */ + MERGE(disk, disks, COMPARE_DISK, { + if (src->removable) { + if (!src->pdev_path || *src->pdev_path == '\0') { + /* 1, no media in drive */ + free(dst->pdev_path); + dst->pdev_path = libxl__strdup(NOGC, ""); + dst->format = LIBXL_DISK_FORMAT_EMPTY; + } else { + /* 2 and 3, use JSON, no need to touch anything */ + ; + } + } + }); + +#undef MERGE + +out: + if (lock) libxl__unlock_domain_userdata(lock); + CTX_UNLOCK; + GC_FREE; + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 5136d02..3bee659 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -368,6 +368,14 @@ typedef struct libxl__ctx libxl_ctx; #endif #endif +/* LIBXL_HAVE_RETRIEVE_DOMAIN_CONFIGURATION + * + * If this is defined we have libxl_retrieve_domain_configuration which + * returns the current configuration of a domain, which can be used to + * rebuild a domain. + */ +#define LIBXL_HAVE_RETRIEVE_DOMAIN_CONFIGURATION 1 + /* * LIBXL_HAVE_BUILDINFO_VCPU_AFFINITY_ARRAYS * @@ -870,6 +878,14 @@ int static inline libxl_domain_create_restore_0x040200( void libxl_domain_config_init(libxl_domain_config *d_config); void libxl_domain_config_dispose(libxl_domain_config *d_config); +/* + * Retrieve domain configuration and filled it in d_config. The + * returned configuration can be used to rebuild a domain. It only + * works with DomU. + */ +int libxl_retrieve_domain_configuration(libxl_ctx *ctx, uint32_t domid, + libxl_domain_config *d_config); + int libxl_domain_suspend(libxl_ctx *ctx, uint32_t domid, int fd, int flags, /* LIBXL_SUSPEND_* */ const libxl_asyncop_how *ao_how) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45: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 1XUr09-00040Q-0r; Fri, 19 Sep 2014 05:45:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr07-000404-Al for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:59 +0000 Received: from [85.158.143.35:23395] by server-1.bemta-4.messagelabs.com id 4A/EB-05872-AD2CB145; Fri, 19 Sep 2014 05:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1411105497!11785021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16080 invoked from network); 19 Sep 2014 05:44:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr04-0000TI-Vr for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr04-000608-Tv for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:56 +0000 Date: Fri, 19 Sep 2014 05:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce libxl_userdata_unlink X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12ebbe2bae28c0e170e76f61ade65b980ae36b55 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:16 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:00:00 2014 +0100 libxl: introduce libxl_userdata_unlink This will be used in later patch for xl to remove its "xl" userdata file. Both CTX lock and userdata lock are taken in this API. CTX lock is taken to maintain locking hierarchy, but it also has a side effect to protect against R-M-W by other threads. Userdata lock is used to protect against domain destruction. In general application should not rely on these internal locks to protect its own userdata files. It should deploys its own lock if it cares. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 3bee659..bc68cac 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -67,6 +67,13 @@ * the same $(XEN_VERSION) (e.g. throughout a major release). */ +/* LIBXL_HAVE_USERDATA_UNLINK + * + * If it is defined, libxl has a library function called + * libxl_userdata_unlink. + */ +#define LIBXL_HAVE_USERDATA_UNLINK 1 + /* LIBXL_HAVE_CPUPOOL_QUALIFIER_TO_CPUPOOLID * * If this is defined, libxl has a library function called @@ -1268,6 +1275,9 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, * data_r and datalen_r may be 0. * On error return, *data_r and *datalen_r are undefined. */ +int libxl_userdata_unlink(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid); + int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 02384ac..ce0c4ac 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2016,6 +2016,32 @@ out: return rc; } +int libxl_userdata_unlink(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid) +{ + GC_INIT(ctx); + int rc; + + libxl__domain_userdata_lock *lock; + const char *filename; + + CTX_LOCK; + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + filename = libxl__userdata_path(gc, domid, userdata_userid, "d"); + if (unlink(filename)) rc = ERROR_FAIL; + + libxl__unlock_domain_userdata(lock); +out: + CTX_UNLOCK; + GC_FREE; + return rc; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:01 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45: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 1XUr09-00040Q-0r; Fri, 19 Sep 2014 05:45:01 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr07-000404-Al for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:59 +0000 Received: from [85.158.143.35:23395] by server-1.bemta-4.messagelabs.com id 4A/EB-05872-AD2CB145; Fri, 19 Sep 2014 05:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1411105497!11785021!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16080 invoked from network); 19 Sep 2014 05:44:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:44:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr04-0000TI-Vr for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr04-000608-Tv for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:44:56 +0000 Date: Fri, 19 Sep 2014 05:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: introduce libxl_userdata_unlink X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12ebbe2bae28c0e170e76f61ade65b980ae36b55 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:16 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:00:00 2014 +0100 libxl: introduce libxl_userdata_unlink This will be used in later patch for xl to remove its "xl" userdata file. Both CTX lock and userdata lock are taken in this API. CTX lock is taken to maintain locking hierarchy, but it also has a side effect to protect against R-M-W by other threads. Userdata lock is used to protect against domain destruction. In general application should not rely on these internal locks to protect its own userdata files. It should deploys its own lock if it cares. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_dom.c | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 3bee659..bc68cac 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -67,6 +67,13 @@ * the same $(XEN_VERSION) (e.g. throughout a major release). */ +/* LIBXL_HAVE_USERDATA_UNLINK + * + * If it is defined, libxl has a library function called + * libxl_userdata_unlink. + */ +#define LIBXL_HAVE_USERDATA_UNLINK 1 + /* LIBXL_HAVE_CPUPOOL_QUALIFIER_TO_CPUPOOLID * * If this is defined, libxl has a library function called @@ -1268,6 +1275,9 @@ int libxl_userdata_retrieve(libxl_ctx *ctx, uint32_t domid, * data_r and datalen_r may be 0. * On error return, *data_r and *datalen_r are undefined. */ +int libxl_userdata_unlink(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid); + int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo); int libxl_set_vcpuaffinity(libxl_ctx *ctx, uint32_t domid, uint32_t vcpuid, diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 02384ac..ce0c4ac 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -2016,6 +2016,32 @@ out: return rc; } +int libxl_userdata_unlink(libxl_ctx *ctx, uint32_t domid, + const char *userdata_userid) +{ + GC_INIT(ctx); + int rc; + + libxl__domain_userdata_lock *lock; + const char *filename; + + CTX_LOCK; + lock = libxl__lock_domain_userdata(gc, domid); + if (!lock) { + rc = ERROR_LOCK_FAIL; + goto out; + } + + filename = libxl__userdata_path(gc, domid, userdata_userid, "d"); + if (unlink(filename)) rc = ERROR_FAIL; + + libxl__unlock_domain_userdata(lock); +out: + CTX_UNLOCK; + GC_FREE; + return rc; +} + /* * Local variables: * mode: C -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUr0T-00042j-Od; Fri, 19 Sep 2014 05: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 1XUr0S-00042b-K6 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:20 +0000 Received: from [85.158.139.211:5920] by server-6.bemta-5.messagelabs.com id EB/B3-06284-FE2CB145; Fri, 19 Sep 2014 05:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1411105517!15383791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30390 invoked from network); 19 Sep 2014 05:45:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0K-0000UG-H3 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0F-00060u-5u for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:07 +0000 Date: Fri, 19 Sep 2014 05:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: use libxl_retrieve_domain_configuration and JSON format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6afc7063afe06f4609fb2d18fde28f3b54e995e Author: Wei Liu AuthorDate: Tue Sep 16 11:01:17 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:00:00 2014 +0100 xl: use libxl_retrieve_domain_configuration and JSON format Before this change, xl stores domain configuration in "xl" format, which is in fact a verbatim copy of user supplied domain config. Now libxl provides a new API to retrieve domain configuration, switch to that new API, store configuration in JSON format. Tests done so far (xl.{new,old} denotes xl with{,out} "libxl-json" support): 1. xl.new create then xl.new save, hexdump saved file: domain config saved in JSON format 2. xl.new create, xl.new save then xl.old restore: failed on mandatory flag check 3. xl.new create, xl.new save then xl.new restore: succeeded 4. xl.old create, xl.old save then xl.new restore: succeeded 5. xl.new create then local migrate, receiving end xl.new: succeeded 6. xl.old create then local migrate, receiving end xl.new: succeeded Note that "xl" config is still supported and handled when restarting a domain. "xl" config file takes precedence over "libxl-json" in that case, so that user who uses "config-update" to store new config file won't have regression. All other scenarios (migration, domain listing etc.) now use the new API. Lastly, print out warning when users invoke "config-update" to discourage them from using this command. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 5 ++ tools/libxl/xl_cmdimpl.c | 124 ++++++++++++++++++++++++++++----------------- tools/libxl/xl_cmdtable.c | 4 +- 3 files changed, 85 insertions(+), 48 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 9d1c2a5..f1e95db 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -187,6 +187,11 @@ immediate effect but will be applied when the guest is next restarted. This command is useful to ensure that runtime modifications made to the guest will be preserved when the guest is restarted. +Since Xen 4.5 xl has improved capabilities to handle dynamic domain +configuration changes and will preserve any changes made a runtime +when necessary. Therefore it should not normally be necessary to use +this command any more. + I has to be an absolute path to a file. B diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 26492fc..f8d226b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -107,6 +107,8 @@ static const char migrate_report[]= * from target to source */ +#define XL_MANDATORY_FLAG_JSON (1U << 0) /* config data is in JSON format */ +#define XL_MANDATORY_FLAG_ALL (XL_MANDATORY_FLAG_JSON) struct save_file_header { char magic[32]; /* savefileheader_magic */ /* All uint32_ts are in domain's byte order. */ @@ -1778,21 +1780,41 @@ skip_vfb: } static void reload_domain_config(uint32_t domid, - uint8_t **config_data, int *config_len) + libxl_domain_config *d_config) { + int rc; uint8_t *t_data; int ret, t_len; + libxl_domain_config d_config_new; + /* In case user has used "config-update" to store a new config + * file. + */ ret = libxl_userdata_retrieve(ctx, domid, "xl", &t_data, &t_len); - if (ret) { - LOG("failed to retrieve guest configuration (rc=%d). " - "reusing old configuration", ret); + if (ret && errno != ENOENT) { + LOG("\"xl\" configuration found but failed to load\n"); + } + if (t_len > 0) { + LOG("\"xl\" configuration found, using it\n"); + libxl_domain_config_dispose(d_config); + parse_config_data("", (const char *)t_data, + t_len, d_config); + free(t_data); + libxl_userdata_unlink(ctx, domid, "xl"); return; } - free(*config_data); - *config_data = t_data; - *config_len = t_len; + libxl_domain_config_init(&d_config_new); + rc = libxl_retrieve_domain_configuration(ctx, domid, &d_config_new); + if (rc) { + LOG("failed to retrieve guest configuration (rc=%d). " + "reusing old configuration", rc); + libxl_domain_config_dispose(&d_config_new); + } else { + libxl_domain_config_dispose(d_config); + /* Steal allocations */ + memcpy(d_config, &d_config_new, sizeof(libxl_domain_config)); + } } /* Returns 1 if domain should be restarted, @@ -1800,7 +1822,6 @@ static void reload_domain_config(uint32_t domid, * Can update r_domid if domain is destroyed etc */ static int handle_domain_death(uint32_t *r_domid, libxl_event *event, - uint8_t **config_data, int *config_len, libxl_domain_config *d_config) { @@ -1858,13 +1879,12 @@ static int handle_domain_death(uint32_t *r_domid, break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME: - reload_domain_config(*r_domid, config_data, config_len); + reload_domain_config(*r_domid, d_config); restart = 2; break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART: - reload_domain_config(*r_domid, config_data, config_len); - + reload_domain_config(*r_domid, d_config); restart = 1; /* fall-through */ case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: @@ -2061,6 +2081,7 @@ static uint32_t create_domain(struct domain_create *dom_info) const char *config_source = NULL; const char *restore_source = NULL; int migrate_fd = dom_info->migrate_fd; + bool config_in_json; int i; int need_daemon = daemonize; @@ -2115,7 +2136,7 @@ static uint32_t create_domain(struct domain_create *dom_info) restore_source, hdr.mandatory_flags, hdr.optional_flags, hdr.optional_data_len); - badflags = hdr.mandatory_flags & ~( 0 /* none understood yet */ ); + badflags = hdr.mandatory_flags & ~XL_MANDATORY_FLAG_ALL; if (badflags) { fprintf(stderr, "Savefile has mandatory flag(s) 0x%"PRIx32" " "which are not supported; need newer xl\n", @@ -2143,7 +2164,9 @@ static uint32_t create_domain(struct domain_create *dom_info) optdata_here = optdata_begin; if (OPTDATA_LEFT) { - fprintf(stderr, " Savefile contains xl domain config\n"); + fprintf(stderr, " Savefile contains xl domain config%s\n", + !!(hdr.mandatory_flags & XL_MANDATORY_FLAG_JSON) + ? " in JSON format" : ""); WITH_OPTDATA(4, { memcpy(u32buf.b, optdata_here, 4); config_len = u32buf.u32; @@ -2183,6 +2206,7 @@ static uint32_t create_domain(struct domain_create *dom_info) extra_config); } config_source=config_file; + config_in_json = false; } else { if (!config_data) { fprintf(stderr, "Config file not specified and" @@ -2190,12 +2214,18 @@ static uint32_t create_domain(struct domain_create *dom_info) return ERROR_INVAL; } config_source = ""; + config_in_json = !!(hdr.mandatory_flags & XL_MANDATORY_FLAG_JSON); } if (!dom_info->quiet) printf("Parsing config from %s\n", config_source); - parse_config_data(config_source, config_data, config_len, &d_config); + if (config_in_json) { + libxl_domain_config_from_json(ctx, &d_config, + (const char *)config_data); + } else { + parse_config_data(config_source, config_data, config_len, &d_config); + } if (migrate_fd >= 0) { if (d_config.c_info.name) { @@ -2269,14 +2299,6 @@ start: if ( ret ) goto error_out; - ret = libxl_userdata_store(ctx, domid, "xl", - config_data, config_len); - if (ret) { - perror("cannot save config file"); - ret = ERROR_FAIL; - goto error_out; - } - release_lock(); if (!paused) @@ -2333,9 +2355,7 @@ start: LOG("Domain %d has shut down, reason code %d 0x%x", domid, event->u.domain_shutdown.shutdown_reason, event->u.domain_shutdown.shutdown_reason); - switch (handle_domain_death(&domid, event, - (uint8_t **)&config_data, &config_len, - &d_config)) { + switch (handle_domain_death(&domid, event, &d_config)) { case 2: if (!preserve_domain(&domid, event, &d_config)) { /* If we fail then exit leaving the old domain in place. */ @@ -2372,12 +2392,6 @@ start: d_config.c_info.name = strdup(common_domname); } - /* Reparse the configuration in case it has changed */ - libxl_domain_config_dispose(&d_config); - libxl_domain_config_init(&d_config); - parse_config_data(config_source, config_data, config_len, - &d_config); - /* * XXX FIXME: If this sleep is not there then domain * re-creation fails sometimes. @@ -3156,9 +3170,7 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) { libxl_domain_config d_config; - char *config_source; - uint8_t *data; - int i, len, rc; + int i, rc; yajl_gen hand = NULL; yajl_gen_status s; @@ -3179,24 +3191,18 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) s = yajl_gen_status_ok; for (i = 0; i < nb_domain; i++) { + libxl_domain_config_init(&d_config); /* no detailed info available on dom0 */ if (info[i].domid == 0) continue; - rc = libxl_userdata_retrieve(ctx, info[i].domid, "xl", &data, &len); + rc = libxl_retrieve_domain_configuration(ctx, info[i].domid, &d_config); if (rc) continue; - if (len == 0) - continue; - CHK_SYSCALL(asprintf(&config_source, "", info[i].domid)); - libxl_domain_config_init(&d_config); - parse_config_data(config_source, (char *)data, len, &d_config); if (default_output_format == OUTPUT_FORMAT_JSON) s = printf_info_one_json(hand, info[i].domid, &d_config); else printf_info_sexp(info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); - free(data); - free(config_source); if (s != yajl_gen_status_ok) goto out; } @@ -3381,22 +3387,41 @@ static void save_domain_core_begin(uint32_t domid, int *config_len_r) { int rc; + libxl_domain_config d_config; + char *config_c = 0; /* configuration file in optional data: */ + libxl_domain_config_init(&d_config); + if (override_config_file) { void *config_v = 0; rc = libxl_read_file_contents(ctx, override_config_file, &config_v, config_len_r); - *config_data_r = config_v; + if (rc) { + fprintf(stderr, "unable to read overridden config file\n"); + exit(2); + } + parse_config_data(override_config_file, config_v, *config_len_r, + &d_config); + free(config_v); } else { - rc = libxl_userdata_retrieve(ctx, domid, "xl", - config_data_r, config_len_r); + rc = libxl_retrieve_domain_configuration(ctx, domid, &d_config); + if (rc) { + fprintf(stderr, "unable to retrieve domain configuration\n"); + exit(2); + } } - if (rc) { - fputs("Unable to get config file\n",stderr); + + config_c = libxl_domain_config_to_json(ctx, &d_config); + if (!config_c) { + fprintf(stderr, "unable to convert config file to JSON\n"); exit(2); } + *config_data_r = (uint8_t *)config_c; + *config_len_r = strlen(config_c) + 1; /* including trailing '\0' */ + + libxl_domain_config_dispose(&d_config); } static void save_domain_core_writeconfig(int fd, const char *source, @@ -3424,6 +3449,8 @@ static void save_domain_core_writeconfig(int fd, const char *source, u32buf.u32 = config_len; ADD_OPTDATA(u32buf.b, 4); ADD_OPTDATA(config_data, config_len); + if (config_len) + hdr.mandatory_flags |= XL_MANDATORY_FLAG_JSON; /* that's the optional data */ @@ -4433,6 +4460,9 @@ int main_config_update(int argc, char **argv) exit(1); } + fprintf(stderr, "WARNING: xl now has better capability to manage domain configuration, " + "avoid using this command when possible\n"); + domid = find_domain(argv[1]); argc--; argv++; diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 7b7fa92..35f02c4 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -38,7 +38,9 @@ struct cmd_spec cmd_table[] = { { "config-update", &main_config_update, 1, 1, "Update a running domain's saved configuration, used when rebuilding " - "the domain after reboot", + "the domain after reboot.\n" + "WARNING: xl now has better capability to manage domain configuration, " + "avoid using this command when possible", " [options] [vars]", "-h Print this help.\n" "-f FILE, --defconfig=FILE\n Use the given configuration file.\n" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:22 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUr0T-00042j-Od; Fri, 19 Sep 2014 05: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 1XUr0S-00042b-K6 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:20 +0000 Received: from [85.158.139.211:5920] by server-6.bemta-5.messagelabs.com id EB/B3-06284-FE2CB145; Fri, 19 Sep 2014 05:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1411105517!15383791!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30390 invoked from network); 19 Sep 2014 05:45:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:45:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0K-0000UG-H3 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0F-00060u-5u for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:07 +0000 Date: Fri, 19 Sep 2014 05:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: use libxl_retrieve_domain_configuration and JSON format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6afc7063afe06f4609fb2d18fde28f3b54e995e Author: Wei Liu AuthorDate: Tue Sep 16 11:01:17 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:00:00 2014 +0100 xl: use libxl_retrieve_domain_configuration and JSON format Before this change, xl stores domain configuration in "xl" format, which is in fact a verbatim copy of user supplied domain config. Now libxl provides a new API to retrieve domain configuration, switch to that new API, store configuration in JSON format. Tests done so far (xl.{new,old} denotes xl with{,out} "libxl-json" support): 1. xl.new create then xl.new save, hexdump saved file: domain config saved in JSON format 2. xl.new create, xl.new save then xl.old restore: failed on mandatory flag check 3. xl.new create, xl.new save then xl.new restore: succeeded 4. xl.old create, xl.old save then xl.new restore: succeeded 5. xl.new create then local migrate, receiving end xl.new: succeeded 6. xl.old create then local migrate, receiving end xl.new: succeeded Note that "xl" config is still supported and handled when restarting a domain. "xl" config file takes precedence over "libxl-json" in that case, so that user who uses "config-update" to store new config file won't have regression. All other scenarios (migration, domain listing etc.) now use the new API. Lastly, print out warning when users invoke "config-update" to discourage them from using this command. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- docs/man/xl.pod.1 | 5 ++ tools/libxl/xl_cmdimpl.c | 124 ++++++++++++++++++++++++++++----------------- tools/libxl/xl_cmdtable.c | 4 +- 3 files changed, 85 insertions(+), 48 deletions(-) diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 9d1c2a5..f1e95db 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -187,6 +187,11 @@ immediate effect but will be applied when the guest is next restarted. This command is useful to ensure that runtime modifications made to the guest will be preserved when the guest is restarted. +Since Xen 4.5 xl has improved capabilities to handle dynamic domain +configuration changes and will preserve any changes made a runtime +when necessary. Therefore it should not normally be necessary to use +this command any more. + I has to be an absolute path to a file. B diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 26492fc..f8d226b 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -107,6 +107,8 @@ static const char migrate_report[]= * from target to source */ +#define XL_MANDATORY_FLAG_JSON (1U << 0) /* config data is in JSON format */ +#define XL_MANDATORY_FLAG_ALL (XL_MANDATORY_FLAG_JSON) struct save_file_header { char magic[32]; /* savefileheader_magic */ /* All uint32_ts are in domain's byte order. */ @@ -1778,21 +1780,41 @@ skip_vfb: } static void reload_domain_config(uint32_t domid, - uint8_t **config_data, int *config_len) + libxl_domain_config *d_config) { + int rc; uint8_t *t_data; int ret, t_len; + libxl_domain_config d_config_new; + /* In case user has used "config-update" to store a new config + * file. + */ ret = libxl_userdata_retrieve(ctx, domid, "xl", &t_data, &t_len); - if (ret) { - LOG("failed to retrieve guest configuration (rc=%d). " - "reusing old configuration", ret); + if (ret && errno != ENOENT) { + LOG("\"xl\" configuration found but failed to load\n"); + } + if (t_len > 0) { + LOG("\"xl\" configuration found, using it\n"); + libxl_domain_config_dispose(d_config); + parse_config_data("", (const char *)t_data, + t_len, d_config); + free(t_data); + libxl_userdata_unlink(ctx, domid, "xl"); return; } - free(*config_data); - *config_data = t_data; - *config_len = t_len; + libxl_domain_config_init(&d_config_new); + rc = libxl_retrieve_domain_configuration(ctx, domid, &d_config_new); + if (rc) { + LOG("failed to retrieve guest configuration (rc=%d). " + "reusing old configuration", rc); + libxl_domain_config_dispose(&d_config_new); + } else { + libxl_domain_config_dispose(d_config); + /* Steal allocations */ + memcpy(d_config, &d_config_new, sizeof(libxl_domain_config)); + } } /* Returns 1 if domain should be restarted, @@ -1800,7 +1822,6 @@ static void reload_domain_config(uint32_t domid, * Can update r_domid if domain is destroyed etc */ static int handle_domain_death(uint32_t *r_domid, libxl_event *event, - uint8_t **config_data, int *config_len, libxl_domain_config *d_config) { @@ -1858,13 +1879,12 @@ static int handle_domain_death(uint32_t *r_domid, break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART_RENAME: - reload_domain_config(*r_domid, config_data, config_len); + reload_domain_config(*r_domid, d_config); restart = 2; break; case LIBXL_ACTION_ON_SHUTDOWN_RESTART: - reload_domain_config(*r_domid, config_data, config_len); - + reload_domain_config(*r_domid, d_config); restart = 1; /* fall-through */ case LIBXL_ACTION_ON_SHUTDOWN_DESTROY: @@ -2061,6 +2081,7 @@ static uint32_t create_domain(struct domain_create *dom_info) const char *config_source = NULL; const char *restore_source = NULL; int migrate_fd = dom_info->migrate_fd; + bool config_in_json; int i; int need_daemon = daemonize; @@ -2115,7 +2136,7 @@ static uint32_t create_domain(struct domain_create *dom_info) restore_source, hdr.mandatory_flags, hdr.optional_flags, hdr.optional_data_len); - badflags = hdr.mandatory_flags & ~( 0 /* none understood yet */ ); + badflags = hdr.mandatory_flags & ~XL_MANDATORY_FLAG_ALL; if (badflags) { fprintf(stderr, "Savefile has mandatory flag(s) 0x%"PRIx32" " "which are not supported; need newer xl\n", @@ -2143,7 +2164,9 @@ static uint32_t create_domain(struct domain_create *dom_info) optdata_here = optdata_begin; if (OPTDATA_LEFT) { - fprintf(stderr, " Savefile contains xl domain config\n"); + fprintf(stderr, " Savefile contains xl domain config%s\n", + !!(hdr.mandatory_flags & XL_MANDATORY_FLAG_JSON) + ? " in JSON format" : ""); WITH_OPTDATA(4, { memcpy(u32buf.b, optdata_here, 4); config_len = u32buf.u32; @@ -2183,6 +2206,7 @@ static uint32_t create_domain(struct domain_create *dom_info) extra_config); } config_source=config_file; + config_in_json = false; } else { if (!config_data) { fprintf(stderr, "Config file not specified and" @@ -2190,12 +2214,18 @@ static uint32_t create_domain(struct domain_create *dom_info) return ERROR_INVAL; } config_source = ""; + config_in_json = !!(hdr.mandatory_flags & XL_MANDATORY_FLAG_JSON); } if (!dom_info->quiet) printf("Parsing config from %s\n", config_source); - parse_config_data(config_source, config_data, config_len, &d_config); + if (config_in_json) { + libxl_domain_config_from_json(ctx, &d_config, + (const char *)config_data); + } else { + parse_config_data(config_source, config_data, config_len, &d_config); + } if (migrate_fd >= 0) { if (d_config.c_info.name) { @@ -2269,14 +2299,6 @@ start: if ( ret ) goto error_out; - ret = libxl_userdata_store(ctx, domid, "xl", - config_data, config_len); - if (ret) { - perror("cannot save config file"); - ret = ERROR_FAIL; - goto error_out; - } - release_lock(); if (!paused) @@ -2333,9 +2355,7 @@ start: LOG("Domain %d has shut down, reason code %d 0x%x", domid, event->u.domain_shutdown.shutdown_reason, event->u.domain_shutdown.shutdown_reason); - switch (handle_domain_death(&domid, event, - (uint8_t **)&config_data, &config_len, - &d_config)) { + switch (handle_domain_death(&domid, event, &d_config)) { case 2: if (!preserve_domain(&domid, event, &d_config)) { /* If we fail then exit leaving the old domain in place. */ @@ -2372,12 +2392,6 @@ start: d_config.c_info.name = strdup(common_domname); } - /* Reparse the configuration in case it has changed */ - libxl_domain_config_dispose(&d_config); - libxl_domain_config_init(&d_config); - parse_config_data(config_source, config_data, config_len, - &d_config); - /* * XXX FIXME: If this sleep is not there then domain * re-creation fails sometimes. @@ -3156,9 +3170,7 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) { libxl_domain_config d_config; - char *config_source; - uint8_t *data; - int i, len, rc; + int i, rc; yajl_gen hand = NULL; yajl_gen_status s; @@ -3179,24 +3191,18 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) s = yajl_gen_status_ok; for (i = 0; i < nb_domain; i++) { + libxl_domain_config_init(&d_config); /* no detailed info available on dom0 */ if (info[i].domid == 0) continue; - rc = libxl_userdata_retrieve(ctx, info[i].domid, "xl", &data, &len); + rc = libxl_retrieve_domain_configuration(ctx, info[i].domid, &d_config); if (rc) continue; - if (len == 0) - continue; - CHK_SYSCALL(asprintf(&config_source, "", info[i].domid)); - libxl_domain_config_init(&d_config); - parse_config_data(config_source, (char *)data, len, &d_config); if (default_output_format == OUTPUT_FORMAT_JSON) s = printf_info_one_json(hand, info[i].domid, &d_config); else printf_info_sexp(info[i].domid, &d_config); libxl_domain_config_dispose(&d_config); - free(data); - free(config_source); if (s != yajl_gen_status_ok) goto out; } @@ -3381,22 +3387,41 @@ static void save_domain_core_begin(uint32_t domid, int *config_len_r) { int rc; + libxl_domain_config d_config; + char *config_c = 0; /* configuration file in optional data: */ + libxl_domain_config_init(&d_config); + if (override_config_file) { void *config_v = 0; rc = libxl_read_file_contents(ctx, override_config_file, &config_v, config_len_r); - *config_data_r = config_v; + if (rc) { + fprintf(stderr, "unable to read overridden config file\n"); + exit(2); + } + parse_config_data(override_config_file, config_v, *config_len_r, + &d_config); + free(config_v); } else { - rc = libxl_userdata_retrieve(ctx, domid, "xl", - config_data_r, config_len_r); + rc = libxl_retrieve_domain_configuration(ctx, domid, &d_config); + if (rc) { + fprintf(stderr, "unable to retrieve domain configuration\n"); + exit(2); + } } - if (rc) { - fputs("Unable to get config file\n",stderr); + + config_c = libxl_domain_config_to_json(ctx, &d_config); + if (!config_c) { + fprintf(stderr, "unable to convert config file to JSON\n"); exit(2); } + *config_data_r = (uint8_t *)config_c; + *config_len_r = strlen(config_c) + 1; /* including trailing '\0' */ + + libxl_domain_config_dispose(&d_config); } static void save_domain_core_writeconfig(int fd, const char *source, @@ -3424,6 +3449,8 @@ static void save_domain_core_writeconfig(int fd, const char *source, u32buf.u32 = config_len; ADD_OPTDATA(u32buf.b, 4); ADD_OPTDATA(config_data, config_len); + if (config_len) + hdr.mandatory_flags |= XL_MANDATORY_FLAG_JSON; /* that's the optional data */ @@ -4433,6 +4460,9 @@ int main_config_update(int argc, char **argv) exit(1); } + fprintf(stderr, "WARNING: xl now has better capability to manage domain configuration, " + "avoid using this command when possible\n"); + domid = find_domain(argv[1]); argc--; argv++; diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 7b7fa92..35f02c4 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -38,7 +38,9 @@ struct cmd_spec cmd_table[] = { { "config-update", &main_config_update, 1, 1, "Update a running domain's saved configuration, used when rebuilding " - "the domain after reboot", + "the domain after reboot.\n" + "WARNING: xl now has better capability to manage domain configuration, " + "avoid using this command when possible", " [options] [vars]", "-h Print this help.\n" "-f FILE, --defconfig=FILE\n Use the given configuration file.\n" -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45: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 1XUr0Y-00043u-T2; Fri, 19 Sep 2014 05:45:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0X-00043f-JO for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:25 +0000 Received: from [85.158.137.68:53284] by server-15.bemta-3.messagelabs.com id 94/F9-01573-4F2CB145; Fri, 19 Sep 2014 05:45:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1411105523!15511051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19426 invoked from network); 19 Sep 2014 05:45:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:45:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0U-0000UM-Mr for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0U-00061I-M0 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:22 +0000 Date: Fri, 19 Sep 2014 05:45:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: long output of "list" command now contains Dom0 information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fc4efcd3defde429bb048f89decb2ffd96d1c11 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:18 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:00:00 2014 +0100 xl: long output of "list" command now contains Dom0 information As we've already generated a JSON config for Dom0, print that out when requested. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f8d226b..698b3bc 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3192,9 +3192,6 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) for (i = 0; i < nb_domain; i++) { libxl_domain_config_init(&d_config); - /* no detailed info available on dom0 */ - if (info[i].domid == 0) - continue; rc = libxl_retrieve_domain_configuration(ctx, info[i].domid, &d_config); if (rc) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:26 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45: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 1XUr0Y-00043u-T2; Fri, 19 Sep 2014 05:45:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0X-00043f-JO for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:25 +0000 Received: from [85.158.137.68:53284] by server-15.bemta-3.messagelabs.com id 94/F9-01573-4F2CB145; Fri, 19 Sep 2014 05:45:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1411105523!15511051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19426 invoked from network); 19 Sep 2014 05:45:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:45:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0U-0000UM-Mr for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0U-00061I-M0 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:22 +0000 Date: Fri, 19 Sep 2014 05:45:22 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: long output of "list" command now contains Dom0 information X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fc4efcd3defde429bb048f89decb2ffd96d1c11 Author: Wei Liu AuthorDate: Tue Sep 16 11:01:18 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:00:00 2014 +0100 xl: long output of "list" command now contains Dom0 information As we've already generated a JSON config for Dom0, print that out when requested. Signed-off-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index f8d226b..698b3bc 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -3192,9 +3192,6 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) for (i = 0; i < nb_domain; i++) { libxl_domain_config_init(&d_config); - /* no detailed info available on dom0 */ - if (info[i].domid == 0) - continue; rc = libxl_retrieve_domain_configuration(ctx, info[i].domid, &d_config); if (rc) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUr0i-00045j-Vs; Fri, 19 Sep 2014 05:45:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0h-00045R-Ar for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:35 +0000 Received: from [85.158.143.35:4121] by server-2.bemta-4.messagelabs.com id E8/4C-04525-EF2CB145; Fri, 19 Sep 2014 05:45:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1411105533!11841029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 808 invoked from network); 19 Sep 2014 05:45:34 -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; 19 Sep 2014 05:45:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0e-0000UX-Sc for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0e-00061g-Rd for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:32 +0000 Date: Fri, 19 Sep 2014 05:45:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8315ea4f0657dcd7f0bc5bec1328c522b0ceb83 Merge: 5fc4efcd3defde429bb048f89decb2ffd96d1c11 72af6f455ac6afcd46d9a556f90349f2397507e8 Author: Ian Campbell AuthorDate: Wed Sep 17 20:15:28 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:15:28 2014 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/hvm/vmx/vmx.c | 15 ++++++------ xen/arch/x86/x86_64/entry.S | 35 +++++++++++++++++++---------- xen/drivers/passthrough/io.c | 50 ++++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 48 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05: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 1XUr0i-00045j-Vs; Fri, 19 Sep 2014 05:45:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0h-00045R-Ar for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:35 +0000 Received: from [85.158.143.35:4121] by server-2.bemta-4.messagelabs.com id E8/4C-04525-EF2CB145; Fri, 19 Sep 2014 05:45:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1411105533!11841029!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 808 invoked from network); 19 Sep 2014 05:45:34 -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; 19 Sep 2014 05:45:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0e-0000UX-Sc for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0e-00061g-Rd for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:32 +0000 Date: Fri, 19 Sep 2014 05:45:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f8315ea4f0657dcd7f0bc5bec1328c522b0ceb83 Merge: 5fc4efcd3defde429bb048f89decb2ffd96d1c11 72af6f455ac6afcd46d9a556f90349f2397507e8 Author: Ian Campbell AuthorDate: Wed Sep 17 20:15:28 2014 +0100 Commit: Ian Campbell CommitDate: Wed Sep 17 20:15:28 2014 +0100 Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging xen/arch/x86/hvm/vmx/vmx.c | 15 ++++++------ xen/arch/x86/x86_64/entry.S | 35 +++++++++++++++++++---------- xen/drivers/passthrough/io.c | 50 ++++++++++++++++++----------------------- 3 files changed, 52 insertions(+), 48 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0t-00047P-2k; Fri, 19 Sep 2014 05:45:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0r-000476-Az for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:45 +0000 Received: from [85.158.143.35:4610] by server-2.bemta-4.messagelabs.com id 18/6C-04525-803CB145; Fri, 19 Sep 2014 05:45:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1411105543!4509996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17866 invoked from network); 19 Sep 2014 05:45:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:45:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0p-0000Ud-1c for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0p-00062b-0J for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:43 +0000 Date: Fri, 19 Sep 2014 05:45:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: fix conversion macro of p2m_access to XENMEM_access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 233cfb99fdc915b968d27add80dd2dd3be53aa15 Author: Tamas K Lengyel AuthorDate: Thu Sep 18 11:41:03 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 11:41:03 2014 +0200 x86/p2m: fix conversion macro of p2m_access to XENMEM_access Signed-off-by: Tamas K Lengyel Acked-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/mm/p2m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 32776c3..cbffafb 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1526,7 +1526,7 @@ int p2m_get_mem_access(struct domain *d, unsigned long pfn, mfn_t mfn; static const xenmem_access_t memaccess[] = { -#define ACCESS(ac) [XENMEM_access_##ac] = XENMEM_access_##ac +#define ACCESS(ac) [p2m_access_##ac] = XENMEM_access_##ac ACCESS(n), ACCESS(r), ACCESS(w), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0t-00047P-2k; Fri, 19 Sep 2014 05:45:47 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0r-000476-Az for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:45 +0000 Received: from [85.158.143.35:4610] by server-2.bemta-4.messagelabs.com id 18/6C-04525-803CB145; Fri, 19 Sep 2014 05:45:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1411105543!4509996!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17866 invoked from network); 19 Sep 2014 05:45:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 05:45:44 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0p-0000Ud-1c for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0p-00062b-0J for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:43 +0000 Date: Fri, 19 Sep 2014 05:45:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/p2m: fix conversion macro of p2m_access to XENMEM_access X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 233cfb99fdc915b968d27add80dd2dd3be53aa15 Author: Tamas K Lengyel AuthorDate: Thu Sep 18 11:41:03 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 11:41:03 2014 +0200 x86/p2m: fix conversion macro of p2m_access to XENMEM_access Signed-off-by: Tamas K Lengyel Acked-by: Tim Deegan Reviewed-by: Jan Beulich --- xen/arch/x86/mm/p2m.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 32776c3..cbffafb 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1526,7 +1526,7 @@ int p2m_get_mem_access(struct domain *d, unsigned long pfn, mfn_t mfn; static const xenmem_access_t memaccess[] = { -#define ACCESS(ac) [XENMEM_access_##ac] = XENMEM_access_##ac +#define ACCESS(ac) [p2m_access_##ac] = XENMEM_access_##ac ACCESS(n), ACCESS(r), ACCESS(w), -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr13-000490-5o; Fri, 19 Sep 2014 05:45:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr11-00048l-GR for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:55 +0000 Received: from [85.158.143.35:28298] by server-3.bemta-4.messagelabs.com id CB/3C-06192-213CB145; Fri, 19 Sep 2014 05:45:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1411105553!11841077!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1869 invoked from network); 19 Sep 2014 05:45:54 -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; 19 Sep 2014 05:45:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0z-0000Um-80 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0z-00062x-6U for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:53 +0000 Date: Fri, 19 Sep 2014 05:45:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: always set pending event injection when loading VMC[BS] state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a10e2385a7409a4f88248d09a80a03b2bdaca76 Author: Wen Congyang AuthorDate: Thu Sep 18 12:08:45 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 12:08:45 2014 +0200 x86/hvm: always set pending event injection when loading VMC[BS] state In colo mode, secondary vm is running, so VM_ENTRY_INTR_INFO may valid before restoring vmcs. If there is no pending event after restoring vm, we should clear it. Signed-off-by: Wen Congyang Also clear pending software exceptions. Copy the fix to SVM as well. Signed-off-by: Tim Deegan Acked-by: Kevin Tian Acked-by: Aravind Gopalakrishnan --- xen/arch/x86/hvm/svm/svm.c | 13 ++++++------- xen/arch/x86/hvm/vmx/vmx.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index b5188e6..5d404ce 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -321,17 +321,16 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c) vmcb_set_h_cr3(vmcb, pagetable_get_paddr(p2m_get_pagetable(p2m))); } - if ( c->pending_valid ) + if ( c->pending_valid && + hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) { gdprintk(XENLOG_INFO, "Re-injecting %#"PRIx32", %#"PRIx32"\n", c->pending_event, c->error_code); - - if ( hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) - { - vmcb->eventinj.bytes = c->pending_event; - vmcb->eventinj.fields.errorcode = c->error_code; - } + vmcb->eventinj.bytes = c->pending_event; + vmcb->eventinj.fields.errorcode = c->error_code; } + else + vmcb->eventinj.bytes = 0; vmcb->cleanbits.bytes = 0; paging_update_paging_modes(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d3e7ac9..61b923f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -510,23 +510,22 @@ static int vmx_vmcs_restore(struct vcpu *v, struct hvm_hw_cpu *c) __vmwrite(GUEST_DR7, c->dr7); - vmx_vmcs_exit(v); - - paging_update_paging_modes(v); - - if ( c->pending_valid ) + if ( c->pending_valid && + hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) { gdprintk(XENLOG_INFO, "Re-injecting %#"PRIx32", %#"PRIx32"\n", c->pending_event, c->error_code); - - if ( hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) - { - vmx_vmcs_enter(v); - __vmwrite(VM_ENTRY_INTR_INFO, c->pending_event); - __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, c->error_code); - vmx_vmcs_exit(v); - } + __vmwrite(VM_ENTRY_INTR_INFO, c->pending_event); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, c->error_code); + } + else + { + __vmwrite(VM_ENTRY_INTR_INFO, 0); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, 0); } + vmx_vmcs_exit(v); + + paging_update_paging_modes(v); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 05:45:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 05:45:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr13-000490-5o; Fri, 19 Sep 2014 05:45:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr11-00048l-GR for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:55 +0000 Received: from [85.158.143.35:28298] by server-3.bemta-4.messagelabs.com id CB/3C-06192-213CB145; Fri, 19 Sep 2014 05:45:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1411105553!11841077!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1869 invoked from network); 19 Sep 2014 05:45:54 -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; 19 Sep 2014 05:45:54 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XUr0z-0000Um-80 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XUr0z-00062x-6U for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 05:45:53 +0000 Date: Fri, 19 Sep 2014 05:45:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: always set pending event injection when loading VMC[BS] state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6a10e2385a7409a4f88248d09a80a03b2bdaca76 Author: Wen Congyang AuthorDate: Thu Sep 18 12:08:45 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 12:08:45 2014 +0200 x86/hvm: always set pending event injection when loading VMC[BS] state In colo mode, secondary vm is running, so VM_ENTRY_INTR_INFO may valid before restoring vmcs. If there is no pending event after restoring vm, we should clear it. Signed-off-by: Wen Congyang Also clear pending software exceptions. Copy the fix to SVM as well. Signed-off-by: Tim Deegan Acked-by: Kevin Tian Acked-by: Aravind Gopalakrishnan --- xen/arch/x86/hvm/svm/svm.c | 13 ++++++------- xen/arch/x86/hvm/vmx/vmx.c | 25 ++++++++++++------------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index b5188e6..5d404ce 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -321,17 +321,16 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c) vmcb_set_h_cr3(vmcb, pagetable_get_paddr(p2m_get_pagetable(p2m))); } - if ( c->pending_valid ) + if ( c->pending_valid && + hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) { gdprintk(XENLOG_INFO, "Re-injecting %#"PRIx32", %#"PRIx32"\n", c->pending_event, c->error_code); - - if ( hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) - { - vmcb->eventinj.bytes = c->pending_event; - vmcb->eventinj.fields.errorcode = c->error_code; - } + vmcb->eventinj.bytes = c->pending_event; + vmcb->eventinj.fields.errorcode = c->error_code; } + else + vmcb->eventinj.bytes = 0; vmcb->cleanbits.bytes = 0; paging_update_paging_modes(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index d3e7ac9..61b923f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -510,23 +510,22 @@ static int vmx_vmcs_restore(struct vcpu *v, struct hvm_hw_cpu *c) __vmwrite(GUEST_DR7, c->dr7); - vmx_vmcs_exit(v); - - paging_update_paging_modes(v); - - if ( c->pending_valid ) + if ( c->pending_valid && + hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) { gdprintk(XENLOG_INFO, "Re-injecting %#"PRIx32", %#"PRIx32"\n", c->pending_event, c->error_code); - - if ( hvm_event_needs_reinjection(c->pending_type, c->pending_vector) ) - { - vmx_vmcs_enter(v); - __vmwrite(VM_ENTRY_INTR_INFO, c->pending_event); - __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, c->error_code); - vmx_vmcs_exit(v); - } + __vmwrite(VM_ENTRY_INTR_INFO, c->pending_event); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, c->error_code); + } + else + { + __vmwrite(VM_ENTRY_INTR_INFO, 0); + __vmwrite(VM_ENTRY_EXCEPTION_ERROR_CODE, 0); } + vmx_vmcs_exit(v); + + paging_update_paging_modes(v); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46A-0000z6-8R; Fri, 19 Sep 2014 19:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV469-0000yz-LK for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:05 +0000 Received: from [85.158.143.35:12906] by server-1.bemta-4.messagelabs.com id C9/98-05872-5878C145; Fri, 19 Sep 2014 19:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1411155843!11930701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26932 invoked from network); 19 Sep 2014 19:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV467-0001nf-4j for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV467-0000Kj-0D for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:03 +0000 Date: Fri, 19 Sep 2014 19:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: suppress event check IPI to MWAITing CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9a727a813e9b25003e433b3dc3fa47e621f9e238 Author: Jan Beulich AuthorDate: Thu Sep 18 14:43:49 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:43:49 2014 +0200 x86: suppress event check IPI to MWAITing CPUs Mass wakeups (via vlapic_ipi()) can take enormous amounts of time, especially when many of the remote pCPU-s are in deep C-states. For 64-vCPU Windows Server 2012 R2 guests on Ivybridge hardware, accumulated times of over 2ms were observed (average 1.1ms). Considering that Windows broadcasts IPIs from its timer interrupt, which at least at certain times can run at 1kHz, it is clear that this can't result in good guest behavior. In fact, on said hardware guests with significantly beyond 40 vCPU-s simply hung when e.g. ServerManager gets started. Recognizing that writes to softirq_pending() already have the effect of waking remote CPUs from MWAITing (due to being co-located on the same cache line with mwait_wakeup()), we can avoid sending IPIs to CPUs we know are in a (deep) C-state entered via MWAIT. With this, average broadcast times for a 64-vCPU guest went down to a measured maximum of 255us (which is still quite a lot). One aspect worth noting is that cpumask_raise_softirq() gets brought in sync here with cpu_raise_softirq() in that now both don't attempt to raise a self-IPI on the processing CPU. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/acpi/cpu_idle.c | 12 +++++++++++- xen/common/softirq.c | 9 ++++++--- xen/include/asm-arm/softirq.h | 2 ++ xen/include/asm-x86/softirq.h | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 136c0b6..f72719c 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -330,6 +330,16 @@ void cpuidle_wakeup_mwait(cpumask_t *mask) cpumask_andnot(mask, mask, &target); } +bool_t arch_skip_send_event_check(unsigned int cpu) +{ + /* + * This relies on softirq_pending() and mwait_wakeup() to access data + * on the same cache line. + */ + smp_mb(); + return !!cpumask_test_cpu(cpu, &cpuidle_mwait_flags); +} + void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) { unsigned int cpu = smp_processor_id(); @@ -349,7 +359,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) * Timer deadline passing is the event on which we will be woken via * cpuidle_mwait_wakeup. So check it now that the location is armed. */ - if ( expires > NOW() || expires == 0 ) + if ( (expires > NOW() || expires == 0) && !softirq_pending(cpu) ) { cpumask_set_cpu(cpu, &cpuidle_mwait_flags); __mwait(eax, ecx); diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 195f8ff..ea86671 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -70,12 +70,14 @@ void open_softirq(int nr, softirq_handler handler) void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) { - int cpu; + unsigned int cpu, this_cpu = smp_processor_id(); cpumask_t send_mask; cpumask_clear(&send_mask); for_each_cpu(cpu, mask) - if ( !test_and_set_bit(nr, &softirq_pending(cpu)) ) + if ( !test_and_set_bit(nr, &softirq_pending(cpu)) && + cpu != this_cpu && + !arch_skip_send_event_check(cpu) ) cpumask_set_cpu(cpu, &send_mask); smp_send_event_check_mask(&send_mask); @@ -84,7 +86,8 @@ void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) void cpu_raise_softirq(unsigned int cpu, unsigned int nr) { if ( !test_and_set_bit(nr, &softirq_pending(cpu)) - && (cpu != smp_processor_id()) ) + && (cpu != smp_processor_id()) + && !arch_skip_send_event_check(cpu) ) smp_send_event_check_cpu(cpu); } diff --git a/xen/include/asm-arm/softirq.h b/xen/include/asm-arm/softirq.h index 35e578a..976e0eb 100644 --- a/xen/include/asm-arm/softirq.h +++ b/xen/include/asm-arm/softirq.h @@ -3,6 +3,8 @@ #define NR_ARCH_SOFTIRQS 0 +#define arch_skip_send_event_check(cpu) 0 + #endif /* __ASM_SOFTIRQ_H__ */ /* * Local variables: diff --git a/xen/include/asm-x86/softirq.h b/xen/include/asm-x86/softirq.h index 9d8e2e1..7225dea 100644 --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -9,4 +9,6 @@ #define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) #define NR_ARCH_SOFTIRQS 5 +bool_t arch_skip_send_event_check(unsigned int cpu); + #endif /* __ASM_SOFTIRQ_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46A-0000z6-8R; Fri, 19 Sep 2014 19:44:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV469-0000yz-LK for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:05 +0000 Received: from [85.158.143.35:12906] by server-1.bemta-4.messagelabs.com id C9/98-05872-5878C145; Fri, 19 Sep 2014 19:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1411155843!11930701!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26932 invoked from network); 19 Sep 2014 19:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV467-0001nf-4j for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV467-0000Kj-0D for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:03 +0000 Date: Fri, 19 Sep 2014 19:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: suppress event check IPI to MWAITing CPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9a727a813e9b25003e433b3dc3fa47e621f9e238 Author: Jan Beulich AuthorDate: Thu Sep 18 14:43:49 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:43:49 2014 +0200 x86: suppress event check IPI to MWAITing CPUs Mass wakeups (via vlapic_ipi()) can take enormous amounts of time, especially when many of the remote pCPU-s are in deep C-states. For 64-vCPU Windows Server 2012 R2 guests on Ivybridge hardware, accumulated times of over 2ms were observed (average 1.1ms). Considering that Windows broadcasts IPIs from its timer interrupt, which at least at certain times can run at 1kHz, it is clear that this can't result in good guest behavior. In fact, on said hardware guests with significantly beyond 40 vCPU-s simply hung when e.g. ServerManager gets started. Recognizing that writes to softirq_pending() already have the effect of waking remote CPUs from MWAITing (due to being co-located on the same cache line with mwait_wakeup()), we can avoid sending IPIs to CPUs we know are in a (deep) C-state entered via MWAIT. With this, average broadcast times for a 64-vCPU guest went down to a measured maximum of 255us (which is still quite a lot). One aspect worth noting is that cpumask_raise_softirq() gets brought in sync here with cpu_raise_softirq() in that now both don't attempt to raise a self-IPI on the processing CPU. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/acpi/cpu_idle.c | 12 +++++++++++- xen/common/softirq.c | 9 ++++++--- xen/include/asm-arm/softirq.h | 2 ++ xen/include/asm-x86/softirq.h | 2 ++ 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 136c0b6..f72719c 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -330,6 +330,16 @@ void cpuidle_wakeup_mwait(cpumask_t *mask) cpumask_andnot(mask, mask, &target); } +bool_t arch_skip_send_event_check(unsigned int cpu) +{ + /* + * This relies on softirq_pending() and mwait_wakeup() to access data + * on the same cache line. + */ + smp_mb(); + return !!cpumask_test_cpu(cpu, &cpuidle_mwait_flags); +} + void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) { unsigned int cpu = smp_processor_id(); @@ -349,7 +359,7 @@ void mwait_idle_with_hints(unsigned int eax, unsigned int ecx) * Timer deadline passing is the event on which we will be woken via * cpuidle_mwait_wakeup. So check it now that the location is armed. */ - if ( expires > NOW() || expires == 0 ) + if ( (expires > NOW() || expires == 0) && !softirq_pending(cpu) ) { cpumask_set_cpu(cpu, &cpuidle_mwait_flags); __mwait(eax, ecx); diff --git a/xen/common/softirq.c b/xen/common/softirq.c index 195f8ff..ea86671 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -70,12 +70,14 @@ void open_softirq(int nr, softirq_handler handler) void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) { - int cpu; + unsigned int cpu, this_cpu = smp_processor_id(); cpumask_t send_mask; cpumask_clear(&send_mask); for_each_cpu(cpu, mask) - if ( !test_and_set_bit(nr, &softirq_pending(cpu)) ) + if ( !test_and_set_bit(nr, &softirq_pending(cpu)) && + cpu != this_cpu && + !arch_skip_send_event_check(cpu) ) cpumask_set_cpu(cpu, &send_mask); smp_send_event_check_mask(&send_mask); @@ -84,7 +86,8 @@ void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) void cpu_raise_softirq(unsigned int cpu, unsigned int nr) { if ( !test_and_set_bit(nr, &softirq_pending(cpu)) - && (cpu != smp_processor_id()) ) + && (cpu != smp_processor_id()) + && !arch_skip_send_event_check(cpu) ) smp_send_event_check_cpu(cpu); } diff --git a/xen/include/asm-arm/softirq.h b/xen/include/asm-arm/softirq.h index 35e578a..976e0eb 100644 --- a/xen/include/asm-arm/softirq.h +++ b/xen/include/asm-arm/softirq.h @@ -3,6 +3,8 @@ #define NR_ARCH_SOFTIRQS 0 +#define arch_skip_send_event_check(cpu) 0 + #endif /* __ASM_SOFTIRQ_H__ */ /* * Local variables: diff --git a/xen/include/asm-x86/softirq.h b/xen/include/asm-x86/softirq.h index 9d8e2e1..7225dea 100644 --- a/xen/include/asm-x86/softirq.h +++ b/xen/include/asm-x86/softirq.h @@ -9,4 +9,6 @@ #define PCI_SERR_SOFTIRQ (NR_COMMON_SOFTIRQS + 4) #define NR_ARCH_SOFTIRQS 5 +bool_t arch_skip_send_event_check(unsigned int cpu); + #endif /* __ASM_SOFTIRQ_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44: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 1XV46L-00010L-B4; Fri, 19 Sep 2014 19:44:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46K-00010A-4r for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:16 +0000 Received: from [85.158.143.35:13229] by server-1.bemta-4.messagelabs.com id 6A/A8-05872-F878C145; Fri, 19 Sep 2014 19:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1411155853!8548108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6072 invoked from network); 19 Sep 2014 19:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46H-0001nj-9i for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46H-0000L9-8O for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:13 +0000 Date: Fri, 19 Sep 2014 19:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: batch vCPU wakeups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c47c316d99b3b570d0bb968b99331e6714ef1df7 Author: Jan Beulich AuthorDate: Thu Sep 18 14:44:58 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:44:58 2014 +0200 x86/HVM: batch vCPU wakeups Mass wakeups (via vlapic_ipi()) can take enormous amounts of time, especially when many of the remote pCPU-s are in deep C-states. For 64-vCPU Windows Server 2012 R2 guests on Ivybridge hardware, accumulated times of over 2ms were observed (average 1.1ms). Considering that Windows broadcasts IPIs from its timer interrupt, which at least at certain times can run at 1kHz, it is clear that this can't result in good guest behavior. In fact, on said hardware guests with significantly beyond 40 vCPU-s simply hung when e.g. ServerManager gets started. This isn't just helping to reduce the number of ICR writes when the host APICs run in clustered mode, it also reduces them by suppressing the sends altogether when - by the time cpu_raise_softirq_batch_finish() is reached - the remote CPU already managed to handle the softirq. Plus - when using MONITOR/MWAIT - the update of softirq_pending(cpu), being on the monitored cache line - should make the remote CPU wake up ahead of the ICR being sent, allowing the wait-for-ICR-idle latencies to be reduced (perhaps to a large part due to overlapping the wakeups of multiple CPUs). With this alone (i.e. without the IPI avoidance patch in place), average broadcast times for a 64-vCPU guest went down to a measured maximum of 310us. With that other patch in place, improvements aren't as clear anymore (short term averages only went down from 255us to 250us, which clearly is within the error range of the measurements), but longer term an improvement of the averages is still visible. Depending on hardware, long term maxima were observed to go down quite a bit (on aforementioned hardware), while they were seen to go up again on a (single core) Nehalem (where instead the improvement on the average values was more visible). Of course this necessarily increases the latencies for the remote CPU wakeup at least slightly. To weigh between the effects, the condition to enable batching in vlapic_ipi() may need further tuning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/vlapic.c | 26 +++++++++++++++++++++++ xen/common/softirq.c | 51 ++++++++++++++++++++++++++++++++++++++------ xen/include/xen/softirq.h | 3 ++ 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index cd7e872..47c4eaa 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -409,6 +409,26 @@ void vlapic_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) hvm_dpci_msi_eoi(current->domain, vector); } +static bool_t is_multicast_dest(struct vlapic *vlapic, unsigned int short_hand, + uint32_t dest, bool_t dest_mode) +{ + if ( vlapic_domain(vlapic)->max_vcpus <= 2 ) + return 0; + + if ( short_hand ) + return short_hand != APIC_DEST_SELF; + + if ( vlapic_x2apic_mode(vlapic) ) + return dest_mode ? hweight16(dest) > 1 : dest == 0xffffffff; + + if ( dest_mode ) + return hweight8(dest & + GET_xAPIC_DEST_FIELD(vlapic_get_reg(vlapic, + APIC_DFR))) > 1; + + return dest == 0xff; +} + void vlapic_ipi( struct vlapic *vlapic, uint32_t icr_low, uint32_t icr_high) { @@ -447,12 +467,18 @@ void vlapic_ipi( default: { struct vcpu *v; + bool_t batch = is_multicast_dest(vlapic, short_hand, dest, dest_mode); + + if ( batch ) + cpu_raise_softirq_batch_begin(); for_each_vcpu ( vlapic_domain(vlapic), v ) { if ( vlapic_match_dest(vcpu_vlapic(v), vlapic, short_hand, dest, dest_mode) ) vlapic_accept_irq(v, icr_low); } + if ( batch ) + cpu_raise_softirq_batch_finish(); break; } } diff --git a/xen/common/softirq.c b/xen/common/softirq.c index ea86671..22e417a 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -23,6 +23,9 @@ irq_cpustat_t irq_stat[NR_CPUS]; static softirq_handler softirq_handlers[NR_SOFTIRQS]; +static DEFINE_PER_CPU(cpumask_t, batch_mask); +static DEFINE_PER_CPU(unsigned int, batching); + static void __do_softirq(unsigned long ignore_mask) { unsigned int i, cpu; @@ -71,24 +74,58 @@ void open_softirq(int nr, softirq_handler handler) void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) { unsigned int cpu, this_cpu = smp_processor_id(); - cpumask_t send_mask; + cpumask_t send_mask, *raise_mask; + + if ( !per_cpu(batching, this_cpu) || in_irq() ) + { + cpumask_clear(&send_mask); + raise_mask = &send_mask; + } + else + raise_mask = &per_cpu(batch_mask, this_cpu); - cpumask_clear(&send_mask); for_each_cpu(cpu, mask) if ( !test_and_set_bit(nr, &softirq_pending(cpu)) && cpu != this_cpu && !arch_skip_send_event_check(cpu) ) - cpumask_set_cpu(cpu, &send_mask); + cpumask_set_cpu(cpu, raise_mask); - smp_send_event_check_mask(&send_mask); + if ( raise_mask == &send_mask ) + smp_send_event_check_mask(raise_mask); } void cpu_raise_softirq(unsigned int cpu, unsigned int nr) { - if ( !test_and_set_bit(nr, &softirq_pending(cpu)) - && (cpu != smp_processor_id()) - && !arch_skip_send_event_check(cpu) ) + unsigned int this_cpu = smp_processor_id(); + + if ( test_and_set_bit(nr, &softirq_pending(cpu)) + || (cpu == this_cpu) + || arch_skip_send_event_check(cpu) ) + return; + + if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); + else + set_bit(nr, &per_cpu(batch_mask, this_cpu)); +} + +void cpu_raise_softirq_batch_begin(void) +{ + ++this_cpu(batching); +} + +void cpu_raise_softirq_batch_finish(void) +{ + unsigned int cpu, this_cpu = smp_processor_id(); + cpumask_t *mask = &per_cpu(batch_mask, this_cpu); + + ASSERT(per_cpu(batching, this_cpu)); + for_each_cpu ( cpu, mask ) + if ( !softirq_pending(cpu) ) + cpumask_clear_cpu(cpu, mask); + smp_send_event_check_mask(mask); + cpumask_clear(mask); + --per_cpu(batching, this_cpu); } void raise_softirq(unsigned int nr) diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index 0c0d481..0895a16 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -30,6 +30,9 @@ void cpumask_raise_softirq(const cpumask_t *, unsigned int nr); void cpu_raise_softirq(unsigned int cpu, unsigned int nr); void raise_softirq(unsigned int nr); +void cpu_raise_softirq_batch_begin(void); +void cpu_raise_softirq_batch_finish(void); + /* * Process pending softirqs on this CPU. This should be called periodically * when performing work that prevents softirqs from running in a timely manner. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44: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 1XV46L-00010L-B4; Fri, 19 Sep 2014 19:44:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46K-00010A-4r for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:16 +0000 Received: from [85.158.143.35:13229] by server-1.bemta-4.messagelabs.com id 6A/A8-05872-F878C145; Fri, 19 Sep 2014 19:44:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1411155853!8548108!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6072 invoked from network); 19 Sep 2014 19:44:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46H-0001nj-9i for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46H-0000L9-8O for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:13 +0000 Date: Fri, 19 Sep 2014 19:44:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: batch vCPU wakeups X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c47c316d99b3b570d0bb968b99331e6714ef1df7 Author: Jan Beulich AuthorDate: Thu Sep 18 14:44:58 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:44:58 2014 +0200 x86/HVM: batch vCPU wakeups Mass wakeups (via vlapic_ipi()) can take enormous amounts of time, especially when many of the remote pCPU-s are in deep C-states. For 64-vCPU Windows Server 2012 R2 guests on Ivybridge hardware, accumulated times of over 2ms were observed (average 1.1ms). Considering that Windows broadcasts IPIs from its timer interrupt, which at least at certain times can run at 1kHz, it is clear that this can't result in good guest behavior. In fact, on said hardware guests with significantly beyond 40 vCPU-s simply hung when e.g. ServerManager gets started. This isn't just helping to reduce the number of ICR writes when the host APICs run in clustered mode, it also reduces them by suppressing the sends altogether when - by the time cpu_raise_softirq_batch_finish() is reached - the remote CPU already managed to handle the softirq. Plus - when using MONITOR/MWAIT - the update of softirq_pending(cpu), being on the monitored cache line - should make the remote CPU wake up ahead of the ICR being sent, allowing the wait-for-ICR-idle latencies to be reduced (perhaps to a large part due to overlapping the wakeups of multiple CPUs). With this alone (i.e. without the IPI avoidance patch in place), average broadcast times for a 64-vCPU guest went down to a measured maximum of 310us. With that other patch in place, improvements aren't as clear anymore (short term averages only went down from 255us to 250us, which clearly is within the error range of the measurements), but longer term an improvement of the averages is still visible. Depending on hardware, long term maxima were observed to go down quite a bit (on aforementioned hardware), while they were seen to go up again on a (single core) Nehalem (where instead the improvement on the average values was more visible). Of course this necessarily increases the latencies for the remote CPU wakeup at least slightly. To weigh between the effects, the condition to enable batching in vlapic_ipi() may need further tuning. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/vlapic.c | 26 +++++++++++++++++++++++ xen/common/softirq.c | 51 ++++++++++++++++++++++++++++++++++++++------ xen/include/xen/softirq.h | 3 ++ 3 files changed, 73 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index cd7e872..47c4eaa 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -409,6 +409,26 @@ void vlapic_handle_EOI_induced_exit(struct vlapic *vlapic, int vector) hvm_dpci_msi_eoi(current->domain, vector); } +static bool_t is_multicast_dest(struct vlapic *vlapic, unsigned int short_hand, + uint32_t dest, bool_t dest_mode) +{ + if ( vlapic_domain(vlapic)->max_vcpus <= 2 ) + return 0; + + if ( short_hand ) + return short_hand != APIC_DEST_SELF; + + if ( vlapic_x2apic_mode(vlapic) ) + return dest_mode ? hweight16(dest) > 1 : dest == 0xffffffff; + + if ( dest_mode ) + return hweight8(dest & + GET_xAPIC_DEST_FIELD(vlapic_get_reg(vlapic, + APIC_DFR))) > 1; + + return dest == 0xff; +} + void vlapic_ipi( struct vlapic *vlapic, uint32_t icr_low, uint32_t icr_high) { @@ -447,12 +467,18 @@ void vlapic_ipi( default: { struct vcpu *v; + bool_t batch = is_multicast_dest(vlapic, short_hand, dest, dest_mode); + + if ( batch ) + cpu_raise_softirq_batch_begin(); for_each_vcpu ( vlapic_domain(vlapic), v ) { if ( vlapic_match_dest(vcpu_vlapic(v), vlapic, short_hand, dest, dest_mode) ) vlapic_accept_irq(v, icr_low); } + if ( batch ) + cpu_raise_softirq_batch_finish(); break; } } diff --git a/xen/common/softirq.c b/xen/common/softirq.c index ea86671..22e417a 100644 --- a/xen/common/softirq.c +++ b/xen/common/softirq.c @@ -23,6 +23,9 @@ irq_cpustat_t irq_stat[NR_CPUS]; static softirq_handler softirq_handlers[NR_SOFTIRQS]; +static DEFINE_PER_CPU(cpumask_t, batch_mask); +static DEFINE_PER_CPU(unsigned int, batching); + static void __do_softirq(unsigned long ignore_mask) { unsigned int i, cpu; @@ -71,24 +74,58 @@ void open_softirq(int nr, softirq_handler handler) void cpumask_raise_softirq(const cpumask_t *mask, unsigned int nr) { unsigned int cpu, this_cpu = smp_processor_id(); - cpumask_t send_mask; + cpumask_t send_mask, *raise_mask; + + if ( !per_cpu(batching, this_cpu) || in_irq() ) + { + cpumask_clear(&send_mask); + raise_mask = &send_mask; + } + else + raise_mask = &per_cpu(batch_mask, this_cpu); - cpumask_clear(&send_mask); for_each_cpu(cpu, mask) if ( !test_and_set_bit(nr, &softirq_pending(cpu)) && cpu != this_cpu && !arch_skip_send_event_check(cpu) ) - cpumask_set_cpu(cpu, &send_mask); + cpumask_set_cpu(cpu, raise_mask); - smp_send_event_check_mask(&send_mask); + if ( raise_mask == &send_mask ) + smp_send_event_check_mask(raise_mask); } void cpu_raise_softirq(unsigned int cpu, unsigned int nr) { - if ( !test_and_set_bit(nr, &softirq_pending(cpu)) - && (cpu != smp_processor_id()) - && !arch_skip_send_event_check(cpu) ) + unsigned int this_cpu = smp_processor_id(); + + if ( test_and_set_bit(nr, &softirq_pending(cpu)) + || (cpu == this_cpu) + || arch_skip_send_event_check(cpu) ) + return; + + if ( !per_cpu(batching, this_cpu) || in_irq() ) smp_send_event_check_cpu(cpu); + else + set_bit(nr, &per_cpu(batch_mask, this_cpu)); +} + +void cpu_raise_softirq_batch_begin(void) +{ + ++this_cpu(batching); +} + +void cpu_raise_softirq_batch_finish(void) +{ + unsigned int cpu, this_cpu = smp_processor_id(); + cpumask_t *mask = &per_cpu(batch_mask, this_cpu); + + ASSERT(per_cpu(batching, this_cpu)); + for_each_cpu ( cpu, mask ) + if ( !softirq_pending(cpu) ) + cpumask_clear_cpu(cpu, mask); + smp_send_event_check_mask(mask); + cpumask_clear(mask); + --per_cpu(batching, this_cpu); } void raise_softirq(unsigned int nr) diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index 0c0d481..0895a16 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -30,6 +30,9 @@ void cpumask_raise_softirq(const cpumask_t *, unsigned int nr); void cpu_raise_softirq(unsigned int cpu, unsigned int nr); void raise_softirq(unsigned int nr); +void cpu_raise_softirq_batch_begin(void); +void cpu_raise_softirq_batch_finish(void); + /* * Process pending softirqs on this CPU. This should be called periodically * when performing work that prevents softirqs from running in a timely manner. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46W-00014L-E6; Fri, 19 Sep 2014 19:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46U-00013z-Uh for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:27 +0000 Received: from [85.158.139.211:30783] by server-10.bemta-5.messagelabs.com id 4D/D1-19806-A978C145; Fri, 19 Sep 2014 19:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1411155864!8047252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23333 invoked from network); 19 Sep 2014 19:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46R-0001nr-Lh for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46R-0000LV-DU for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:23 +0000 Date: Fri, 19 Sep 2014 19:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: emulate with no writes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ae69fc45c815c32ae0fd6edb2bc159fd9d8a559 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:53:52 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:53:52 2014 +0200 x86/HVM: emulate with no writes Added support for emulating an instruction with no memory writes. Additionally, introduced hvm_emulate_one_full(), which inspects possible return values from the hvm_emulate_one() functions (EXCEPTION, UNHANDLEABLE) and acts on them. Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 175 ++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/hvm/emulate.h | 5 + 2 files changed, 177 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 86cf432..6ab06e0 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -690,6 +690,94 @@ static int hvmemul_write( return X86EMUL_OKAY; } +static int hvmemul_write_discard( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + /* Discarding the write. */ + return X86EMUL_OKAY; +} + +static int hvmemul_rep_ins_discard( + uint16_t src_port, + enum x86_segment dst_seg, + unsigned long dst_offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_rep_movs_discard( + enum x86_segment src_seg, + unsigned long src_offset, + enum x86_segment dst_seg, + unsigned long dst_offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_rep_outs_discard( + enum x86_segment src_seg, + unsigned long src_offset, + uint16_t dst_port, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_cmpxchg_discard( + enum x86_segment seg, + unsigned long offset, + void *p_old, + void *p_new, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_read_io_discard( + unsigned int port, + unsigned int bytes, + unsigned long *val, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_write_io_discard( + unsigned int port, + unsigned int bytes, + unsigned long val, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_write_msr_discard( + unsigned long reg, + uint64_t val, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_wbinvd_discard( + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + static int hvmemul_cmpxchg( enum x86_segment seg, unsigned long offset, @@ -1140,8 +1228,33 @@ static const struct x86_emulate_ops hvm_emulate_ops = { .invlpg = hvmemul_invlpg }; -int hvm_emulate_one( - struct hvm_emulate_ctxt *hvmemul_ctxt) +static const struct x86_emulate_ops hvm_emulate_ops_no_write = { + .read = hvmemul_read, + .insn_fetch = hvmemul_insn_fetch, + .write = hvmemul_write_discard, + .cmpxchg = hvmemul_cmpxchg_discard, + .rep_ins = hvmemul_rep_ins_discard, + .rep_outs = hvmemul_rep_outs_discard, + .rep_movs = hvmemul_rep_movs_discard, + .read_segment = hvmemul_read_segment, + .write_segment = hvmemul_write_segment, + .read_io = hvmemul_read_io_discard, + .write_io = hvmemul_write_io_discard, + .read_cr = hvmemul_read_cr, + .write_cr = hvmemul_write_cr, + .read_msr = hvmemul_read_msr, + .write_msr = hvmemul_write_msr_discard, + .wbinvd = hvmemul_wbinvd_discard, + .cpuid = hvmemul_cpuid, + .inject_hw_exception = hvmemul_inject_hw_exception, + .inject_sw_interrupt = hvmemul_inject_sw_interrupt, + .get_fpu = hvmemul_get_fpu, + .put_fpu = hvmemul_put_fpu, + .invlpg = hvmemul_invlpg +}; + +static int _hvm_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt, + const struct x86_emulate_ops *ops) { struct cpu_user_regs *regs = hvmemul_ctxt->ctxt.regs; struct vcpu *curr = current; @@ -1193,7 +1306,7 @@ int hvm_emulate_one( vio->mmio_retrying = vio->mmio_retry; vio->mmio_retry = 0; - rc = x86_emulate(&hvmemul_ctxt->ctxt, &hvm_emulate_ops); + rc = x86_emulate(&hvmemul_ctxt->ctxt, ops); if ( rc == X86EMUL_OKAY && vio->mmio_retry ) rc = X86EMUL_RETRY; @@ -1241,6 +1354,62 @@ int hvm_emulate_one( return X86EMUL_OKAY; } +int hvm_emulate_one( + struct hvm_emulate_ctxt *hvmemul_ctxt) +{ + return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops); +} + +int hvm_emulate_one_no_write( + struct hvm_emulate_ctxt *hvmemul_ctxt) +{ + return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops_no_write); +} + +void hvm_mem_event_emulate_one(bool_t nowrite, unsigned int trapnr, + unsigned int errcode) +{ + struct hvm_emulate_ctxt ctx = {{ 0 }}; + int rc; + + hvm_emulate_prepare(&ctx, guest_cpu_user_regs()); + + if ( nowrite ) + rc = hvm_emulate_one_no_write(&ctx); + else + rc = hvm_emulate_one(&ctx); + + switch ( rc ) + { + case X86EMUL_RETRY: + /* + * This function is called when handling an EPT-related mem_event + * reply. As such, nothing else needs to be done here, since simply + * returning makes the current instruction cause a page fault again, + * consistent with X86EMUL_RETRY. + */ + return; + case X86EMUL_UNHANDLEABLE: + gdprintk(XENLOG_DEBUG, "Emulation failed @ %04x:%lx: " + "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", + hvmemul_get_seg_reg(x86_seg_cs, &ctx)->sel, + ctx.insn_buf_eip, + ctx.insn_buf[0], ctx.insn_buf[1], + ctx.insn_buf[2], ctx.insn_buf[3], + ctx.insn_buf[4], ctx.insn_buf[5], + ctx.insn_buf[6], ctx.insn_buf[7], + ctx.insn_buf[8], ctx.insn_buf[9]); + hvm_inject_hw_exception(trapnr, errcode); + break; + case X86EMUL_EXCEPTION: + if ( ctx.exn_pending ) + hvm_inject_hw_exception(ctx.exn_vector, ctx.exn_error_code); + break; + } + + hvm_emulate_writeback(&ctx); +} + void hvm_emulate_prepare( struct hvm_emulate_ctxt *hvmemul_ctxt, struct cpu_user_regs *regs) diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 00a06cc..efff97e 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -37,6 +37,11 @@ struct hvm_emulate_ctxt { int hvm_emulate_one( struct hvm_emulate_ctxt *hvmemul_ctxt); +int hvm_emulate_one_no_write( + struct hvm_emulate_ctxt *hvmemul_ctxt); +void hvm_mem_event_emulate_one(bool_t nowrite, + unsigned int trapnr, + unsigned int errcode); void hvm_emulate_prepare( struct hvm_emulate_ctxt *hvmemul_ctxt, struct cpu_user_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46W-00014L-E6; Fri, 19 Sep 2014 19:44:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46U-00013z-Uh for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:27 +0000 Received: from [85.158.139.211:30783] by server-10.bemta-5.messagelabs.com id 4D/D1-19806-A978C145; Fri, 19 Sep 2014 19:44:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1411155864!8047252!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23333 invoked from network); 19 Sep 2014 19:44:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46R-0001nr-Lh for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46R-0000LV-DU for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:23 +0000 Date: Fri, 19 Sep 2014 19:44:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: emulate with no writes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ae69fc45c815c32ae0fd6edb2bc159fd9d8a559 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:53:52 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:53:52 2014 +0200 x86/HVM: emulate with no writes Added support for emulating an instruction with no memory writes. Additionally, introduced hvm_emulate_one_full(), which inspects possible return values from the hvm_emulate_one() functions (EXCEPTION, UNHANDLEABLE) and acts on them. Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 175 ++++++++++++++++++++++++++++++++++++- xen/include/asm-x86/hvm/emulate.h | 5 + 2 files changed, 177 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 86cf432..6ab06e0 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -690,6 +690,94 @@ static int hvmemul_write( return X86EMUL_OKAY; } +static int hvmemul_write_discard( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + /* Discarding the write. */ + return X86EMUL_OKAY; +} + +static int hvmemul_rep_ins_discard( + uint16_t src_port, + enum x86_segment dst_seg, + unsigned long dst_offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_rep_movs_discard( + enum x86_segment src_seg, + unsigned long src_offset, + enum x86_segment dst_seg, + unsigned long dst_offset, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_rep_outs_discard( + enum x86_segment src_seg, + unsigned long src_offset, + uint16_t dst_port, + unsigned int bytes_per_rep, + unsigned long *reps, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_cmpxchg_discard( + enum x86_segment seg, + unsigned long offset, + void *p_old, + void *p_new, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_read_io_discard( + unsigned int port, + unsigned int bytes, + unsigned long *val, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_write_io_discard( + unsigned int port, + unsigned int bytes, + unsigned long val, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_write_msr_discard( + unsigned long reg, + uint64_t val, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + +static int hvmemul_wbinvd_discard( + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_OKAY; +} + static int hvmemul_cmpxchg( enum x86_segment seg, unsigned long offset, @@ -1140,8 +1228,33 @@ static const struct x86_emulate_ops hvm_emulate_ops = { .invlpg = hvmemul_invlpg }; -int hvm_emulate_one( - struct hvm_emulate_ctxt *hvmemul_ctxt) +static const struct x86_emulate_ops hvm_emulate_ops_no_write = { + .read = hvmemul_read, + .insn_fetch = hvmemul_insn_fetch, + .write = hvmemul_write_discard, + .cmpxchg = hvmemul_cmpxchg_discard, + .rep_ins = hvmemul_rep_ins_discard, + .rep_outs = hvmemul_rep_outs_discard, + .rep_movs = hvmemul_rep_movs_discard, + .read_segment = hvmemul_read_segment, + .write_segment = hvmemul_write_segment, + .read_io = hvmemul_read_io_discard, + .write_io = hvmemul_write_io_discard, + .read_cr = hvmemul_read_cr, + .write_cr = hvmemul_write_cr, + .read_msr = hvmemul_read_msr, + .write_msr = hvmemul_write_msr_discard, + .wbinvd = hvmemul_wbinvd_discard, + .cpuid = hvmemul_cpuid, + .inject_hw_exception = hvmemul_inject_hw_exception, + .inject_sw_interrupt = hvmemul_inject_sw_interrupt, + .get_fpu = hvmemul_get_fpu, + .put_fpu = hvmemul_put_fpu, + .invlpg = hvmemul_invlpg +}; + +static int _hvm_emulate_one(struct hvm_emulate_ctxt *hvmemul_ctxt, + const struct x86_emulate_ops *ops) { struct cpu_user_regs *regs = hvmemul_ctxt->ctxt.regs; struct vcpu *curr = current; @@ -1193,7 +1306,7 @@ int hvm_emulate_one( vio->mmio_retrying = vio->mmio_retry; vio->mmio_retry = 0; - rc = x86_emulate(&hvmemul_ctxt->ctxt, &hvm_emulate_ops); + rc = x86_emulate(&hvmemul_ctxt->ctxt, ops); if ( rc == X86EMUL_OKAY && vio->mmio_retry ) rc = X86EMUL_RETRY; @@ -1241,6 +1354,62 @@ int hvm_emulate_one( return X86EMUL_OKAY; } +int hvm_emulate_one( + struct hvm_emulate_ctxt *hvmemul_ctxt) +{ + return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops); +} + +int hvm_emulate_one_no_write( + struct hvm_emulate_ctxt *hvmemul_ctxt) +{ + return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops_no_write); +} + +void hvm_mem_event_emulate_one(bool_t nowrite, unsigned int trapnr, + unsigned int errcode) +{ + struct hvm_emulate_ctxt ctx = {{ 0 }}; + int rc; + + hvm_emulate_prepare(&ctx, guest_cpu_user_regs()); + + if ( nowrite ) + rc = hvm_emulate_one_no_write(&ctx); + else + rc = hvm_emulate_one(&ctx); + + switch ( rc ) + { + case X86EMUL_RETRY: + /* + * This function is called when handling an EPT-related mem_event + * reply. As such, nothing else needs to be done here, since simply + * returning makes the current instruction cause a page fault again, + * consistent with X86EMUL_RETRY. + */ + return; + case X86EMUL_UNHANDLEABLE: + gdprintk(XENLOG_DEBUG, "Emulation failed @ %04x:%lx: " + "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n", + hvmemul_get_seg_reg(x86_seg_cs, &ctx)->sel, + ctx.insn_buf_eip, + ctx.insn_buf[0], ctx.insn_buf[1], + ctx.insn_buf[2], ctx.insn_buf[3], + ctx.insn_buf[4], ctx.insn_buf[5], + ctx.insn_buf[6], ctx.insn_buf[7], + ctx.insn_buf[8], ctx.insn_buf[9]); + hvm_inject_hw_exception(trapnr, errcode); + break; + case X86EMUL_EXCEPTION: + if ( ctx.exn_pending ) + hvm_inject_hw_exception(ctx.exn_vector, ctx.exn_error_code); + break; + } + + hvm_emulate_writeback(&ctx); +} + void hvm_emulate_prepare( struct hvm_emulate_ctxt *hvmemul_ctxt, struct cpu_user_regs *regs) diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 00a06cc..efff97e 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -37,6 +37,11 @@ struct hvm_emulate_ctxt { int hvm_emulate_one( struct hvm_emulate_ctxt *hvmemul_ctxt); +int hvm_emulate_one_no_write( + struct hvm_emulate_ctxt *hvmemul_ctxt); +void hvm_mem_event_emulate_one(bool_t nowrite, + unsigned int trapnr, + unsigned int errcode); void hvm_emulate_prepare( struct hvm_emulate_ctxt *hvmemul_ctxt, struct cpu_user_regs *regs); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46f-00016q-Gt; Fri, 19 Sep 2014 19:44:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46e-00016e-D9 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:36 +0000 Received: from [85.158.143.35:13898] by server-2.bemta-4.messagelabs.com id 27/8B-04525-3A78C145; Fri, 19 Sep 2014 19:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1411155874!11959318!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7806 invoked from network); 19 Sep 2014 19:44:35 -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; 19 Sep 2014 19:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46b-0001nz-RG for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46b-0000Lv-QB for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:33 +0000 Date: Fri, 19 Sep 2014 19:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: optimize introspection access to guest state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9eb81d8bcb393fd2280bc6bc2d36fafa251fd9c0 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:54:58 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:54:58 2014 +0200 x86: optimize introspection access to guest state Speed optimization for introspection purposes: a handful of registers are sent along with each mem_event. This requires enlargement of the mem_event_request / mem_event_response stuctures, and additional code to fill in relevant values. Since the EPT event processing code needs more data than CR3 or MSR event processors, hvm_mem_event_fill_regs() fills in less data than p2m_mem_event_fill_regs(), in order to avoid overhead. Struct hvm_hw_cpu has been considered instead of the custom struct mem_event_regs_st, but its size would cause quick filling up of the mem_event ring buffer. Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 33 +++++++++++++++++++++++ xen/arch/x86/mm/p2m.c | 57 ++++++++++++++++++++++++++++++++++++++++ xen/include/public/mem_event.h | 39 +++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8d905d3..bb45593 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6149,6 +6149,38 @@ int hvm_debug_op(struct vcpu *v, int32_t op) return rc; } +static void hvm_mem_event_fill_regs(mem_event_request_t *req) +{ + const struct cpu_user_regs *regs = guest_cpu_user_regs(); + const struct vcpu *curr = current; + + req->x86_regs.rax = regs->eax; + req->x86_regs.rcx = regs->ecx; + req->x86_regs.rdx = regs->edx; + req->x86_regs.rbx = regs->ebx; + req->x86_regs.rsp = regs->esp; + req->x86_regs.rbp = regs->ebp; + req->x86_regs.rsi = regs->esi; + req->x86_regs.rdi = regs->edi; + + req->x86_regs.r8 = regs->r8; + req->x86_regs.r9 = regs->r9; + req->x86_regs.r10 = regs->r10; + req->x86_regs.r11 = regs->r11; + req->x86_regs.r12 = regs->r12; + req->x86_regs.r13 = regs->r13; + req->x86_regs.r14 = regs->r14; + req->x86_regs.r15 = regs->r15; + + req->x86_regs.rflags = regs->eflags; + req->x86_regs.rip = regs->eip; + + req->x86_regs.msr_efer = curr->arch.hvm_vcpu.guest_efer; + req->x86_regs.cr0 = curr->arch.hvm_vcpu.guest_cr[0]; + req->x86_regs.cr3 = curr->arch.hvm_vcpu.guest_cr[3]; + req->x86_regs.cr4 = curr->arch.hvm_vcpu.guest_cr[4]; +} + static int hvm_memory_event_traps(long p, uint32_t reason, unsigned long value, unsigned long old, bool_t gla_valid, unsigned long gla) @@ -6193,6 +6225,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, req.gla = old; } + hvm_mem_event_fill_regs(&req); mem_event_put_request(d, &d->mem_event->access, &req); return 1; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index cbffafb..7587797 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1327,6 +1327,61 @@ void p2m_mem_paging_resume(struct domain *d) } } +static void p2m_mem_event_fill_regs(mem_event_request_t *req) +{ + const struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct segment_register seg; + struct hvm_hw_cpu ctxt; + struct vcpu *curr = current; + + /* Architecture-specific vmcs/vmcb bits */ + hvm_funcs.save_cpu_ctxt(curr, &ctxt); + + req->x86_regs.rax = regs->eax; + req->x86_regs.rcx = regs->ecx; + req->x86_regs.rdx = regs->edx; + req->x86_regs.rbx = regs->ebx; + req->x86_regs.rsp = regs->esp; + req->x86_regs.rbp = regs->ebp; + req->x86_regs.rsi = regs->esi; + req->x86_regs.rdi = regs->edi; + + req->x86_regs.r8 = regs->r8; + req->x86_regs.r9 = regs->r9; + req->x86_regs.r10 = regs->r10; + req->x86_regs.r11 = regs->r11; + req->x86_regs.r12 = regs->r12; + req->x86_regs.r13 = regs->r13; + req->x86_regs.r14 = regs->r14; + req->x86_regs.r15 = regs->r15; + + req->x86_regs.rflags = regs->eflags; + req->x86_regs.rip = regs->eip; + + req->x86_regs.dr7 = curr->arch.debugreg[7]; + req->x86_regs.cr0 = ctxt.cr0; + req->x86_regs.cr2 = ctxt.cr2; + req->x86_regs.cr3 = ctxt.cr3; + req->x86_regs.cr4 = ctxt.cr4; + + req->x86_regs.sysenter_cs = ctxt.sysenter_cs; + req->x86_regs.sysenter_esp = ctxt.sysenter_esp; + req->x86_regs.sysenter_eip = ctxt.sysenter_eip; + + req->x86_regs.msr_efer = ctxt.msr_efer; + req->x86_regs.msr_star = ctxt.msr_star; + req->x86_regs.msr_lstar = ctxt.msr_lstar; + + hvm_get_segment_register(curr, x86_seg_fs, &seg); + req->x86_regs.fs_base = seg.base; + + hvm_get_segment_register(curr, x86_seg_gs, &seg); + req->x86_regs.gs_base = seg.base; + + hvm_get_segment_register(curr, x86_seg_cs, &seg); + req->x86_regs.cs_arbytes = seg.attr.bytes; +} + bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, struct npfec npfec, mem_event_request_t **req_ptr) @@ -1417,6 +1472,8 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, req->access_w = npfec.write_access; req->access_x = npfec.insn_fetch; req->vcpu_id = v->vcpu_id; + + p2m_mem_event_fill_regs(req); } /* Pause the current VCPU */ diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index fc12697..d3dd9c6 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -48,6 +48,44 @@ #define MEM_EVENT_REASON_MSR 7 /* MSR was hit: gfn is MSR value, gla is MSR address; does NOT honour HVMPME_onchangeonly */ +/* Using a custom struct (not hvm_hw_cpu) so as to not fill + * the mem_event ring buffer too quickly. */ +struct mem_event_regs_x86 { + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rbx; + uint64_t rsp; + uint64_t rbp; + uint64_t rsi; + uint64_t rdi; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + uint64_t rflags; + uint64_t dr7; + uint64_t rip; + uint64_t cr0; + uint64_t cr2; + uint64_t cr3; + uint64_t cr4; + uint64_t sysenter_cs; + uint64_t sysenter_esp; + uint64_t sysenter_eip; + uint64_t msr_efer; + uint64_t msr_star; + uint64_t msr_lstar; + uint64_t fs_base; + uint64_t gs_base; + uint32_t cs_arbytes; + uint32_t _pad; +}; + typedef struct mem_event_st { uint32_t flags; uint32_t vcpu_id; @@ -67,6 +105,7 @@ typedef struct mem_event_st { uint16_t available:10; uint16_t reason; + struct mem_event_regs_x86 x86_regs; } mem_event_request_t, mem_event_response_t; DEFINE_RING_TYPES(mem_event, mem_event_request_t, mem_event_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 Fri Sep 19 19:44:37 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46f-00016q-Gt; Fri, 19 Sep 2014 19:44:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46e-00016e-D9 for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:36 +0000 Received: from [85.158.143.35:13898] by server-2.bemta-4.messagelabs.com id 27/8B-04525-3A78C145; Fri, 19 Sep 2014 19:44:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1411155874!11959318!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7806 invoked from network); 19 Sep 2014 19:44:35 -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; 19 Sep 2014 19:44:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46b-0001nz-RG for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46b-0000Lv-QB for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:33 +0000 Date: Fri, 19 Sep 2014 19:44:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: optimize introspection access to guest state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9eb81d8bcb393fd2280bc6bc2d36fafa251fd9c0 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:54:58 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:54:58 2014 +0200 x86: optimize introspection access to guest state Speed optimization for introspection purposes: a handful of registers are sent along with each mem_event. This requires enlargement of the mem_event_request / mem_event_response stuctures, and additional code to fill in relevant values. Since the EPT event processing code needs more data than CR3 or MSR event processors, hvm_mem_event_fill_regs() fills in less data than p2m_mem_event_fill_regs(), in order to avoid overhead. Struct hvm_hw_cpu has been considered instead of the custom struct mem_event_regs_st, but its size would cause quick filling up of the mem_event ring buffer. Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Tim Deegan --- xen/arch/x86/hvm/hvm.c | 33 +++++++++++++++++++++++ xen/arch/x86/mm/p2m.c | 57 ++++++++++++++++++++++++++++++++++++++++ xen/include/public/mem_event.h | 39 +++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8d905d3..bb45593 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -6149,6 +6149,38 @@ int hvm_debug_op(struct vcpu *v, int32_t op) return rc; } +static void hvm_mem_event_fill_regs(mem_event_request_t *req) +{ + const struct cpu_user_regs *regs = guest_cpu_user_regs(); + const struct vcpu *curr = current; + + req->x86_regs.rax = regs->eax; + req->x86_regs.rcx = regs->ecx; + req->x86_regs.rdx = regs->edx; + req->x86_regs.rbx = regs->ebx; + req->x86_regs.rsp = regs->esp; + req->x86_regs.rbp = regs->ebp; + req->x86_regs.rsi = regs->esi; + req->x86_regs.rdi = regs->edi; + + req->x86_regs.r8 = regs->r8; + req->x86_regs.r9 = regs->r9; + req->x86_regs.r10 = regs->r10; + req->x86_regs.r11 = regs->r11; + req->x86_regs.r12 = regs->r12; + req->x86_regs.r13 = regs->r13; + req->x86_regs.r14 = regs->r14; + req->x86_regs.r15 = regs->r15; + + req->x86_regs.rflags = regs->eflags; + req->x86_regs.rip = regs->eip; + + req->x86_regs.msr_efer = curr->arch.hvm_vcpu.guest_efer; + req->x86_regs.cr0 = curr->arch.hvm_vcpu.guest_cr[0]; + req->x86_regs.cr3 = curr->arch.hvm_vcpu.guest_cr[3]; + req->x86_regs.cr4 = curr->arch.hvm_vcpu.guest_cr[4]; +} + static int hvm_memory_event_traps(long p, uint32_t reason, unsigned long value, unsigned long old, bool_t gla_valid, unsigned long gla) @@ -6193,6 +6225,7 @@ static int hvm_memory_event_traps(long p, uint32_t reason, req.gla = old; } + hvm_mem_event_fill_regs(&req); mem_event_put_request(d, &d->mem_event->access, &req); return 1; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index cbffafb..7587797 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1327,6 +1327,61 @@ void p2m_mem_paging_resume(struct domain *d) } } +static void p2m_mem_event_fill_regs(mem_event_request_t *req) +{ + const struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct segment_register seg; + struct hvm_hw_cpu ctxt; + struct vcpu *curr = current; + + /* Architecture-specific vmcs/vmcb bits */ + hvm_funcs.save_cpu_ctxt(curr, &ctxt); + + req->x86_regs.rax = regs->eax; + req->x86_regs.rcx = regs->ecx; + req->x86_regs.rdx = regs->edx; + req->x86_regs.rbx = regs->ebx; + req->x86_regs.rsp = regs->esp; + req->x86_regs.rbp = regs->ebp; + req->x86_regs.rsi = regs->esi; + req->x86_regs.rdi = regs->edi; + + req->x86_regs.r8 = regs->r8; + req->x86_regs.r9 = regs->r9; + req->x86_regs.r10 = regs->r10; + req->x86_regs.r11 = regs->r11; + req->x86_regs.r12 = regs->r12; + req->x86_regs.r13 = regs->r13; + req->x86_regs.r14 = regs->r14; + req->x86_regs.r15 = regs->r15; + + req->x86_regs.rflags = regs->eflags; + req->x86_regs.rip = regs->eip; + + req->x86_regs.dr7 = curr->arch.debugreg[7]; + req->x86_regs.cr0 = ctxt.cr0; + req->x86_regs.cr2 = ctxt.cr2; + req->x86_regs.cr3 = ctxt.cr3; + req->x86_regs.cr4 = ctxt.cr4; + + req->x86_regs.sysenter_cs = ctxt.sysenter_cs; + req->x86_regs.sysenter_esp = ctxt.sysenter_esp; + req->x86_regs.sysenter_eip = ctxt.sysenter_eip; + + req->x86_regs.msr_efer = ctxt.msr_efer; + req->x86_regs.msr_star = ctxt.msr_star; + req->x86_regs.msr_lstar = ctxt.msr_lstar; + + hvm_get_segment_register(curr, x86_seg_fs, &seg); + req->x86_regs.fs_base = seg.base; + + hvm_get_segment_register(curr, x86_seg_gs, &seg); + req->x86_regs.gs_base = seg.base; + + hvm_get_segment_register(curr, x86_seg_cs, &seg); + req->x86_regs.cs_arbytes = seg.attr.bytes; +} + bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, struct npfec npfec, mem_event_request_t **req_ptr) @@ -1417,6 +1472,8 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, req->access_w = npfec.write_access; req->access_x = npfec.insn_fetch; req->vcpu_id = v->vcpu_id; + + p2m_mem_event_fill_regs(req); } /* Pause the current VCPU */ diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index fc12697..d3dd9c6 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -48,6 +48,44 @@ #define MEM_EVENT_REASON_MSR 7 /* MSR was hit: gfn is MSR value, gla is MSR address; does NOT honour HVMPME_onchangeonly */ +/* Using a custom struct (not hvm_hw_cpu) so as to not fill + * the mem_event ring buffer too quickly. */ +struct mem_event_regs_x86 { + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rbx; + uint64_t rsp; + uint64_t rbp; + uint64_t rsi; + uint64_t rdi; + uint64_t r8; + uint64_t r9; + uint64_t r10; + uint64_t r11; + uint64_t r12; + uint64_t r13; + uint64_t r14; + uint64_t r15; + uint64_t rflags; + uint64_t dr7; + uint64_t rip; + uint64_t cr0; + uint64_t cr2; + uint64_t cr3; + uint64_t cr4; + uint64_t sysenter_cs; + uint64_t sysenter_esp; + uint64_t sysenter_eip; + uint64_t msr_efer; + uint64_t msr_star; + uint64_t msr_lstar; + uint64_t fs_base; + uint64_t gs_base; + uint32_t cs_arbytes; + uint32_t _pad; +}; + typedef struct mem_event_st { uint32_t flags; uint32_t vcpu_id; @@ -67,6 +105,7 @@ typedef struct mem_event_st { uint16_t available:10; uint16_t reason; + struct mem_event_regs_x86 x86_regs; } mem_event_request_t, mem_event_response_t; DEFINE_RING_TYPES(mem_event, mem_event_request_t, mem_event_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 Fri Sep 19 19:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46q-0001CH-NV; Fri, 19 Sep 2014 19:44:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46p-00019g-1o for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:47 +0000 Received: from [85.158.143.35:16242] by server-1.bemta-4.messagelabs.com id B3/F8-05872-EA78C145; Fri, 19 Sep 2014 19:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1411155884!12007234!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9238 invoked from network); 19 Sep 2014 19:44:45 -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; 19 Sep 2014 19:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46m-0001o5-0R for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46l-0000Mn-Vc for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:43 +0000 Date: Fri, 19 Sep 2014 19:44:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, libxc: force-enable relevant MSR events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9b160a10cf730123c6c2eff1034825ce11181c85 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:56:43 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:56:43 2014 +0200 x86, libxc: force-enable relevant MSR events Vmx_disable_intercept_for_msr() will now refuse to disable interception of MSRs needed for memory introspection. It is not possible to gate this on mem_access being active for the domain, since by the time mem_access does become active the interception for the interesting MSRs has already been disabled (vmx_disable_intercept_for_msr() runs very early on). Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Kevin Tian Acked-by: Tim Deegan --- tools/libxc/xc_mem_access.c | 10 +++++++++- tools/libxc/xc_mem_event.c | 7 +++++-- tools/libxc/xc_private.h | 2 +- tools/libxc/xenctrl.h | 2 ++ xen/arch/x86/hvm/vmx/vmcs.c | 25 +++++++++++++++++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 13 +++++++++++++ xen/arch/x86/mm/mem_event.c | 11 +++++++++++ xen/include/asm-x86/hvm/domain.h | 1 + xen/include/asm-x86/hvm/hvm.h | 2 ++ xen/include/asm-x86/hvm/vmx/vmcs.h | 7 +++++++ xen/include/public/domctl.h | 7 ++++--- 11 files changed, 80 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_mem_access.c b/tools/libxc/xc_mem_access.c index 461f0e9..55d0e9f 100644 --- a/tools/libxc/xc_mem_access.c +++ b/tools/libxc/xc_mem_access.c @@ -26,7 +26,15 @@ void *xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port) { - return xc_mem_event_enable(xch, domain_id, HVM_PARAM_ACCESS_RING_PFN, port); + return xc_mem_event_enable(xch, domain_id, HVM_PARAM_ACCESS_RING_PFN, + port, 0); +} + +void *xc_mem_access_enable_introspection(xc_interface *xch, domid_t domain_id, + uint32_t *port) +{ + return xc_mem_event_enable(xch, domain_id, HVM_PARAM_ACCESS_RING_PFN, + port, 1); } int xc_mem_access_disable(xc_interface *xch, domid_t domain_id) diff --git a/tools/libxc/xc_mem_event.c b/tools/libxc/xc_mem_event.c index faf1cc6..8c0be4e 100644 --- a/tools/libxc/xc_mem_event.c +++ b/tools/libxc/xc_mem_event.c @@ -57,7 +57,7 @@ int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, } void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, - uint32_t *port) + uint32_t *port, int enable_introspection) { void *ring_page = NULL; uint64_t pfn; @@ -120,7 +120,10 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, break; case HVM_PARAM_ACCESS_RING_PFN: - op = XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE; + if ( enable_introspection ) + op = XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION; + else + op = XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE; mode = XEN_DOMCTL_MEM_EVENT_OP_ACCESS; break; diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index c50a7c9..94df688 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -381,6 +381,6 @@ int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, * param can be HVM_PARAM_PAGING/ACCESS/SHARING_RING_PFN */ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, - uint32_t *port); + uint32_t *port, int enable_introspection); #endif /* __XC_PRIVATE_H__ */ diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 1c8aa42..514b241 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -2273,6 +2273,8 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, * Caller has to unmap this page when done. */ void *xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); +void *xc_mem_access_enable_introspection(xc_interface *xch, domid_t domain_id, + uint32_t *port); int xc_mem_access_disable(xc_interface *xch, domid_t domain_id); int xc_mem_access_resume(xc_interface *xch, domid_t domain_id); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4a4f4e1..fc1f882 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -39,6 +39,7 @@ #include #include #include +#include static bool_t __read_mostly opt_vpid_enabled = 1; boolean_param("vpid", opt_vpid_enabled); @@ -71,6 +72,18 @@ u32 vmx_vmexit_control __read_mostly; u32 vmx_vmentry_control __read_mostly; u64 vmx_ept_vpid_cap __read_mostly; +const u32 vmx_introspection_force_enabled_msrs[] = { + MSR_IA32_SYSENTER_EIP, + MSR_IA32_SYSENTER_ESP, + MSR_IA32_SYSENTER_CS, + MSR_IA32_MC0_CTL, + MSR_STAR, + MSR_LSTAR +}; + +const unsigned int vmx_introspection_force_enabled_msrs_size = + ARRAY_SIZE(vmx_introspection_force_enabled_msrs); + static DEFINE_PER_CPU_READ_MOSTLY(struct vmcs_struct *, vmxon_region); static DEFINE_PER_CPU(struct vmcs_struct *, current_vmcs); static DEFINE_PER_CPU(struct list_head, active_vmcs_list); @@ -695,11 +708,23 @@ static void vmx_set_host_env(struct vcpu *v) void vmx_disable_intercept_for_msr(struct vcpu *v, u32 msr, int type) { unsigned long *msr_bitmap = v->arch.hvm_vmx.msr_bitmap; + struct domain *d = v->domain; /* VMX MSR bitmap supported? */ if ( msr_bitmap == NULL ) return; + if ( unlikely(d->arch.hvm_domain.introspection_enabled) && + mem_event_check_ring(&d->mem_event->access) ) + { + unsigned int i; + + /* Filter out MSR-s needed for memory introspection */ + for ( i = 0; i < vmx_introspection_force_enabled_msrs_size; i++ ) + if ( msr == vmx_introspection_force_enabled_msrs[i] ) + return; + } + /* * See Intel PRM Vol. 3, 20.6.9 (MSR-Bitmap Address). Early manuals * have the write-low and read-high bitmap offsets the wrong way round. diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 61b923f..84119ed 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1682,6 +1682,18 @@ void vmx_hypervisor_cpuid_leaf(uint32_t sub_idx, *eax |= XEN_HVM_CPUID_X2APIC_VIRT; } +static void vmx_enable_msr_exit_interception(struct domain *d) +{ + struct vcpu *v; + unsigned int i; + + /* Enable interception for MSRs needed for memory introspection. */ + for_each_vcpu ( d, v ) + for ( i = 0; i < vmx_introspection_force_enabled_msrs_size; i++ ) + vmx_enable_intercept_for_msr(v, vmx_introspection_force_enabled_msrs[i], + MSR_TYPE_W); +} + static struct hvm_function_table __initdata vmx_function_table = { .name = "VMX", .cpu_up_prepare = vmx_cpu_up_prepare, @@ -1740,6 +1752,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .handle_eoi = vmx_handle_eoi, .nhvm_hap_walk_L1_p2m = nvmx_hap_walk_L1_p2m, .hypervisor_cpuid_leaf = vmx_hypervisor_cpuid_leaf, + .enable_msr_exit_interception = vmx_enable_msr_exit_interception, }; const struct hvm_function_table * __init start_vmx(void) diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index ba7e71e..fdd5ff6 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -587,6 +587,7 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, switch( mec->op ) { case XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE: + case XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION: { rc = -ENODEV; /* Only HAP is supported */ @@ -600,13 +601,23 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, rc = mem_event_enable(d, mec, med, _VPF_mem_access, HVM_PARAM_ACCESS_RING_PFN, mem_access_notification); + + if ( mec->op != XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE && + rc == 0 && hvm_funcs.enable_msr_exit_interception ) + { + d->arch.hvm_domain.introspection_enabled = 1; + hvm_funcs.enable_msr_exit_interception(d); + } } break; case XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE: { if ( med->ring_page ) + { rc = mem_event_disable(d, med); + d->arch.hvm_domain.introspection_enabled = 0; + } } break; diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 291a2e0..30d4aa3 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -134,6 +134,7 @@ struct hvm_domain { bool_t mem_sharing_enabled; bool_t qemu_mapcache_invalidate; bool_t is_s3_suspended; + bool_t introspection_enabled; /* * TSC value that VCPUs use to calculate their tsc_offset value. diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 1123857..121d053 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -205,6 +205,8 @@ struct hvm_function_table { void (*hypervisor_cpuid_leaf)(uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); + + void (*enable_msr_exit_interception)(struct domain *d); }; extern struct hvm_function_table hvm_funcs; diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 215d93c..6a99dca 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -471,6 +471,13 @@ enum vmcs_field { HOST_RIP = 0x00006c16, }; +/* + * A set of MSR-s that need to be enabled for memory introspection + * to work. + */ +extern const u32 vmx_introspection_force_enabled_msrs[]; +extern const unsigned int vmx_introspection_force_enabled_msrs_size; + #define VMCS_VPID_WIDTH 16 #define MSR_TYPE_R 1 diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 69a8b44..cfa39b3 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -773,10 +773,11 @@ struct xen_domctl_gdbsx_domstatus { * ENODEV - host lacks HAP support (EPT/NPT) or HAP is disabled in guest * EBUSY - guest has or had access enabled, ring buffer still active */ -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION 2 /* * Sharing ENOMEM helper. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46q-0001CH-NV; Fri, 19 Sep 2014 19:44:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46p-00019g-1o for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:47 +0000 Received: from [85.158.143.35:16242] by server-1.bemta-4.messagelabs.com id B3/F8-05872-EA78C145; Fri, 19 Sep 2014 19:44:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1411155884!12007234!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9238 invoked from network); 19 Sep 2014 19:44:45 -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; 19 Sep 2014 19:44:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46m-0001o5-0R for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46l-0000Mn-Vc for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:43 +0000 Date: Fri, 19 Sep 2014 19:44:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86, libxc: force-enable relevant MSR events X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9b160a10cf730123c6c2eff1034825ce11181c85 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:56:43 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:56:43 2014 +0200 x86, libxc: force-enable relevant MSR events Vmx_disable_intercept_for_msr() will now refuse to disable interception of MSRs needed for memory introspection. It is not possible to gate this on mem_access being active for the domain, since by the time mem_access does become active the interception for the interesting MSRs has already been disabled (vmx_disable_intercept_for_msr() runs very early on). Signed-off-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Ian Campbell Acked-by: Kevin Tian Acked-by: Tim Deegan --- tools/libxc/xc_mem_access.c | 10 +++++++++- tools/libxc/xc_mem_event.c | 7 +++++-- tools/libxc/xc_private.h | 2 +- tools/libxc/xenctrl.h | 2 ++ xen/arch/x86/hvm/vmx/vmcs.c | 25 +++++++++++++++++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 13 +++++++++++++ xen/arch/x86/mm/mem_event.c | 11 +++++++++++ xen/include/asm-x86/hvm/domain.h | 1 + xen/include/asm-x86/hvm/hvm.h | 2 ++ xen/include/asm-x86/hvm/vmx/vmcs.h | 7 +++++++ xen/include/public/domctl.h | 7 ++++--- 11 files changed, 80 insertions(+), 7 deletions(-) diff --git a/tools/libxc/xc_mem_access.c b/tools/libxc/xc_mem_access.c index 461f0e9..55d0e9f 100644 --- a/tools/libxc/xc_mem_access.c +++ b/tools/libxc/xc_mem_access.c @@ -26,7 +26,15 @@ void *xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port) { - return xc_mem_event_enable(xch, domain_id, HVM_PARAM_ACCESS_RING_PFN, port); + return xc_mem_event_enable(xch, domain_id, HVM_PARAM_ACCESS_RING_PFN, + port, 0); +} + +void *xc_mem_access_enable_introspection(xc_interface *xch, domid_t domain_id, + uint32_t *port) +{ + return xc_mem_event_enable(xch, domain_id, HVM_PARAM_ACCESS_RING_PFN, + port, 1); } int xc_mem_access_disable(xc_interface *xch, domid_t domain_id) diff --git a/tools/libxc/xc_mem_event.c b/tools/libxc/xc_mem_event.c index faf1cc6..8c0be4e 100644 --- a/tools/libxc/xc_mem_event.c +++ b/tools/libxc/xc_mem_event.c @@ -57,7 +57,7 @@ int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, } void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, - uint32_t *port) + uint32_t *port, int enable_introspection) { void *ring_page = NULL; uint64_t pfn; @@ -120,7 +120,10 @@ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, break; case HVM_PARAM_ACCESS_RING_PFN: - op = XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE; + if ( enable_introspection ) + op = XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION; + else + op = XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE; mode = XEN_DOMCTL_MEM_EVENT_OP_ACCESS; break; diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index c50a7c9..94df688 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -381,6 +381,6 @@ int xc_mem_event_memop(xc_interface *xch, domid_t domain_id, * param can be HVM_PARAM_PAGING/ACCESS/SHARING_RING_PFN */ void *xc_mem_event_enable(xc_interface *xch, domid_t domain_id, int param, - uint32_t *port); + uint32_t *port, int enable_introspection); #endif /* __XC_PRIVATE_H__ */ diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index 1c8aa42..514b241 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -2273,6 +2273,8 @@ int xc_mem_paging_load(xc_interface *xch, domid_t domain_id, * Caller has to unmap this page when done. */ void *xc_mem_access_enable(xc_interface *xch, domid_t domain_id, uint32_t *port); +void *xc_mem_access_enable_introspection(xc_interface *xch, domid_t domain_id, + uint32_t *port); int xc_mem_access_disable(xc_interface *xch, domid_t domain_id); int xc_mem_access_resume(xc_interface *xch, domid_t domain_id); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4a4f4e1..fc1f882 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -39,6 +39,7 @@ #include #include #include +#include static bool_t __read_mostly opt_vpid_enabled = 1; boolean_param("vpid", opt_vpid_enabled); @@ -71,6 +72,18 @@ u32 vmx_vmexit_control __read_mostly; u32 vmx_vmentry_control __read_mostly; u64 vmx_ept_vpid_cap __read_mostly; +const u32 vmx_introspection_force_enabled_msrs[] = { + MSR_IA32_SYSENTER_EIP, + MSR_IA32_SYSENTER_ESP, + MSR_IA32_SYSENTER_CS, + MSR_IA32_MC0_CTL, + MSR_STAR, + MSR_LSTAR +}; + +const unsigned int vmx_introspection_force_enabled_msrs_size = + ARRAY_SIZE(vmx_introspection_force_enabled_msrs); + static DEFINE_PER_CPU_READ_MOSTLY(struct vmcs_struct *, vmxon_region); static DEFINE_PER_CPU(struct vmcs_struct *, current_vmcs); static DEFINE_PER_CPU(struct list_head, active_vmcs_list); @@ -695,11 +708,23 @@ static void vmx_set_host_env(struct vcpu *v) void vmx_disable_intercept_for_msr(struct vcpu *v, u32 msr, int type) { unsigned long *msr_bitmap = v->arch.hvm_vmx.msr_bitmap; + struct domain *d = v->domain; /* VMX MSR bitmap supported? */ if ( msr_bitmap == NULL ) return; + if ( unlikely(d->arch.hvm_domain.introspection_enabled) && + mem_event_check_ring(&d->mem_event->access) ) + { + unsigned int i; + + /* Filter out MSR-s needed for memory introspection */ + for ( i = 0; i < vmx_introspection_force_enabled_msrs_size; i++ ) + if ( msr == vmx_introspection_force_enabled_msrs[i] ) + return; + } + /* * See Intel PRM Vol. 3, 20.6.9 (MSR-Bitmap Address). Early manuals * have the write-low and read-high bitmap offsets the wrong way round. diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 61b923f..84119ed 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1682,6 +1682,18 @@ void vmx_hypervisor_cpuid_leaf(uint32_t sub_idx, *eax |= XEN_HVM_CPUID_X2APIC_VIRT; } +static void vmx_enable_msr_exit_interception(struct domain *d) +{ + struct vcpu *v; + unsigned int i; + + /* Enable interception for MSRs needed for memory introspection. */ + for_each_vcpu ( d, v ) + for ( i = 0; i < vmx_introspection_force_enabled_msrs_size; i++ ) + vmx_enable_intercept_for_msr(v, vmx_introspection_force_enabled_msrs[i], + MSR_TYPE_W); +} + static struct hvm_function_table __initdata vmx_function_table = { .name = "VMX", .cpu_up_prepare = vmx_cpu_up_prepare, @@ -1740,6 +1752,7 @@ static struct hvm_function_table __initdata vmx_function_table = { .handle_eoi = vmx_handle_eoi, .nhvm_hap_walk_L1_p2m = nvmx_hap_walk_L1_p2m, .hypervisor_cpuid_leaf = vmx_hypervisor_cpuid_leaf, + .enable_msr_exit_interception = vmx_enable_msr_exit_interception, }; const struct hvm_function_table * __init start_vmx(void) diff --git a/xen/arch/x86/mm/mem_event.c b/xen/arch/x86/mm/mem_event.c index ba7e71e..fdd5ff6 100644 --- a/xen/arch/x86/mm/mem_event.c +++ b/xen/arch/x86/mm/mem_event.c @@ -587,6 +587,7 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, switch( mec->op ) { case XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE: + case XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION: { rc = -ENODEV; /* Only HAP is supported */ @@ -600,13 +601,23 @@ int mem_event_domctl(struct domain *d, xen_domctl_mem_event_op_t *mec, rc = mem_event_enable(d, mec, med, _VPF_mem_access, HVM_PARAM_ACCESS_RING_PFN, mem_access_notification); + + if ( mec->op != XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE && + rc == 0 && hvm_funcs.enable_msr_exit_interception ) + { + d->arch.hvm_domain.introspection_enabled = 1; + hvm_funcs.enable_msr_exit_interception(d); + } } break; case XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE: { if ( med->ring_page ) + { rc = mem_event_disable(d, med); + d->arch.hvm_domain.introspection_enabled = 0; + } } break; diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 291a2e0..30d4aa3 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -134,6 +134,7 @@ struct hvm_domain { bool_t mem_sharing_enabled; bool_t qemu_mapcache_invalidate; bool_t is_s3_suspended; + bool_t introspection_enabled; /* * TSC value that VCPUs use to calculate their tsc_offset value. diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 1123857..121d053 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -205,6 +205,8 @@ struct hvm_function_table { void (*hypervisor_cpuid_leaf)(uint32_t sub_idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx); + + void (*enable_msr_exit_interception)(struct domain *d); }; extern struct hvm_function_table hvm_funcs; diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 215d93c..6a99dca 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -471,6 +471,13 @@ enum vmcs_field { HOST_RIP = 0x00006c16, }; +/* + * A set of MSR-s that need to be enabled for memory introspection + * to work. + */ +extern const u32 vmx_introspection_force_enabled_msrs[]; +extern const unsigned int vmx_introspection_force_enabled_msrs_size; + #define VMCS_VPID_WIDTH 16 #define MSR_TYPE_R 1 diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 69a8b44..cfa39b3 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -773,10 +773,11 @@ struct xen_domctl_gdbsx_domstatus { * ENODEV - host lacks HAP support (EPT/NPT) or HAP is disabled in guest * EBUSY - guest has or had access enabled, ring buffer still active */ -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS 2 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 -#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE 0 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_DISABLE 1 +#define XEN_DOMCTL_MEM_EVENT_OP_ACCESS_ENABLE_INTROSPECTION 2 /* * Sharing ENOMEM helper. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46z-0001GZ-QF; Fri, 19 Sep 2014 19:44:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46y-0001Fd-RJ for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:57 +0000 Received: from [85.158.137.68:62326] by server-10.bemta-3.messagelabs.com id 4C/FE-01456-8B78C145; Fri, 19 Sep 2014 19:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1411155894!10928767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15542 invoked from network); 19 Sep 2014 19:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46w-0001oE-5K for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46w-0000N9-4K for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:54 +0000 Date: Fri, 19 Sep 2014 19:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: handle resumed instruction based on previous mem_event reply X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e71f2d7418dfdcf6356e4be8e9311ea607a1877 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:57:45 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:57:45 2014 +0200 x86: handle resumed instruction based on previous mem_event reply In a scenario where a page fault that triggered a mem_event occured, p2m_mem_access_check() will now be able to either 1) emulate the current instruction, or 2) emulate it, but don't allow it to perform any writes. Signed-off-by: Razvan Cojocaru Acked-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 3 ++ xen/arch/x86/mm/p2m.c | 75 ++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/domain.h | 11 ++++++ xen/include/public/mem_event.h | 21 ++++++++--- 4 files changed, 105 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f7e0e78..7b1dfe6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -415,6 +415,9 @@ int vcpu_initialise(struct vcpu *v) v->arch.flags = TF_kernel_mode; + /* By default, do not emulate */ + v->arch.mem_event.emulate_flags = 0; + rc = mapcache_vcpu_init(v); if ( rc ) return rc; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 7587797..54859c8 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1395,6 +1395,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, p2m_access_t p2ma; mem_event_request_t *req; int rc; + unsigned long eip = guest_cpu_user_regs()->eip; /* First, handle rx2rw conversion automatically. * These calls to p2m->set_entry() must succeed: we have the gfn @@ -1448,6 +1449,30 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, } } + /* The previous mem_event reply does not match the current state. */ + if ( v->arch.mem_event.gpa != gpa || v->arch.mem_event.eip != eip ) + { + /* Don't emulate the current instruction, send a new mem_event. */ + v->arch.mem_event.emulate_flags = 0; + + /* + * Make sure to mark the current state to match it again against + * the new mem_event about to be sent. + */ + v->arch.mem_event.gpa = gpa; + v->arch.mem_event.eip = eip; + } + + if ( v->arch.mem_event.emulate_flags ) + { + hvm_mem_event_emulate_one((v->arch.mem_event.emulate_flags & + MEM_EVENT_FLAG_EMULATE_NOWRITE) != 0, + TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + + v->arch.mem_event.emulate_flags = 0; + return 1; + } + *req_ptr = NULL; req = xzalloc(mem_event_request_t); if ( req ) @@ -1502,6 +1527,56 @@ void p2m_mem_access_resume(struct domain *d) v = d->vcpu[rsp.vcpu_id]; + /* Mark vcpu for skipping one instruction upon rescheduling. */ + if ( rsp.flags & MEM_EVENT_FLAG_EMULATE ) + { + xenmem_access_t access; + bool_t violation = 1; + + if ( p2m_get_mem_access(d, rsp.gfn, &access) == 0 ) + { + switch ( access ) + { + case XENMEM_access_n: + case XENMEM_access_n2rwx: + default: + violation = rsp.access_r || rsp.access_w || rsp.access_x; + break; + + case XENMEM_access_r: + violation = rsp.access_w || rsp.access_x; + break; + + case XENMEM_access_w: + violation = rsp.access_r || rsp.access_x; + break; + + case XENMEM_access_x: + violation = rsp.access_r || rsp.access_w; + break; + + case XENMEM_access_rx: + case XENMEM_access_rx2rw: + violation = rsp.access_w; + break; + + case XENMEM_access_wx: + violation = rsp.access_r; + break; + + case XENMEM_access_rw: + violation = rsp.access_x; + break; + + case XENMEM_access_rwx: + violation = 0; + break; + } + } + + v->arch.mem_event.emulate_flags = violation ? rsp.flags : 0; + } + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) mem_event_vcpu_unpause(v); diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 8fc5a45..7abe1b3 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -459,6 +459,17 @@ struct arch_vcpu /* A secondary copy of the vcpu time info. */ XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; + + /* + * Should we emulate the next matching instruction on VCPU resume + * after a mem_event? + */ + struct { + uint32_t emulate_flags; + unsigned long gpa; + unsigned long eip; + } mem_event; + } __cacheline_aligned; smap_check_policy_t smap_policy_change(struct vcpu *v, diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index d3dd9c6..599f9e8 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -31,11 +31,22 @@ #include "io/ring.h" /* Memory event flags */ -#define MEM_EVENT_FLAG_VCPU_PAUSED (1 << 0) -#define MEM_EVENT_FLAG_DROP_PAGE (1 << 1) -#define MEM_EVENT_FLAG_EVICT_FAIL (1 << 2) -#define MEM_EVENT_FLAG_FOREIGN (1 << 3) -#define MEM_EVENT_FLAG_DUMMY (1 << 4) +#define MEM_EVENT_FLAG_VCPU_PAUSED (1 << 0) +#define MEM_EVENT_FLAG_DROP_PAGE (1 << 1) +#define MEM_EVENT_FLAG_EVICT_FAIL (1 << 2) +#define MEM_EVENT_FLAG_FOREIGN (1 << 3) +#define MEM_EVENT_FLAG_DUMMY (1 << 4) +/* + * Emulate the fault-causing instruction (if set in the event response flags). + * This will allow the guest to continue execution without lifting the page + * access restrictions. + */ +#define MEM_EVENT_FLAG_EMULATE (1 << 5) +/* + * Same as MEM_EVENT_FLAG_EMULATE, but with write operations or operations + * potentially having side effects (like memory mapped or port I/O) disabled. + */ +#define MEM_EVENT_FLAG_EMULATE_NOWRITE (1 << 6) /* Reasons for the memory event request */ #define MEM_EVENT_REASON_UNKNOWN 0 /* typical reason */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:44:57 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:44:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46z-0001GZ-QF; Fri, 19 Sep 2014 19:44:57 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46y-0001Fd-RJ for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:57 +0000 Received: from [85.158.137.68:62326] by server-10.bemta-3.messagelabs.com id 4C/FE-01456-8B78C145; Fri, 19 Sep 2014 19:44:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1411155894!10928767!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15542 invoked from network); 19 Sep 2014 19:44:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:44:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV46w-0001oE-5K for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV46w-0000N9-4K for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:44:54 +0000 Date: Fri, 19 Sep 2014 19:44:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: handle resumed instruction based on previous mem_event reply X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e71f2d7418dfdcf6356e4be8e9311ea607a1877 Author: Razvan Cojocaru AuthorDate: Thu Sep 18 14:57:45 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 14:57:45 2014 +0200 x86: handle resumed instruction based on previous mem_event reply In a scenario where a page fault that triggered a mem_event occured, p2m_mem_access_check() will now be able to either 1) emulate the current instruction, or 2) emulate it, but don't allow it to perform any writes. Signed-off-by: Razvan Cojocaru Acked-by: Tim Deegan Acked-by: Jan Beulich --- xen/arch/x86/domain.c | 3 ++ xen/arch/x86/mm/p2m.c | 75 ++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/domain.h | 11 ++++++ xen/include/public/mem_event.h | 21 ++++++++--- 4 files changed, 105 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f7e0e78..7b1dfe6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -415,6 +415,9 @@ int vcpu_initialise(struct vcpu *v) v->arch.flags = TF_kernel_mode; + /* By default, do not emulate */ + v->arch.mem_event.emulate_flags = 0; + rc = mapcache_vcpu_init(v); if ( rc ) return rc; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 7587797..54859c8 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1395,6 +1395,7 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, p2m_access_t p2ma; mem_event_request_t *req; int rc; + unsigned long eip = guest_cpu_user_regs()->eip; /* First, handle rx2rw conversion automatically. * These calls to p2m->set_entry() must succeed: we have the gfn @@ -1448,6 +1449,30 @@ bool_t p2m_mem_access_check(paddr_t gpa, unsigned long gla, } } + /* The previous mem_event reply does not match the current state. */ + if ( v->arch.mem_event.gpa != gpa || v->arch.mem_event.eip != eip ) + { + /* Don't emulate the current instruction, send a new mem_event. */ + v->arch.mem_event.emulate_flags = 0; + + /* + * Make sure to mark the current state to match it again against + * the new mem_event about to be sent. + */ + v->arch.mem_event.gpa = gpa; + v->arch.mem_event.eip = eip; + } + + if ( v->arch.mem_event.emulate_flags ) + { + hvm_mem_event_emulate_one((v->arch.mem_event.emulate_flags & + MEM_EVENT_FLAG_EMULATE_NOWRITE) != 0, + TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + + v->arch.mem_event.emulate_flags = 0; + return 1; + } + *req_ptr = NULL; req = xzalloc(mem_event_request_t); if ( req ) @@ -1502,6 +1527,56 @@ void p2m_mem_access_resume(struct domain *d) v = d->vcpu[rsp.vcpu_id]; + /* Mark vcpu for skipping one instruction upon rescheduling. */ + if ( rsp.flags & MEM_EVENT_FLAG_EMULATE ) + { + xenmem_access_t access; + bool_t violation = 1; + + if ( p2m_get_mem_access(d, rsp.gfn, &access) == 0 ) + { + switch ( access ) + { + case XENMEM_access_n: + case XENMEM_access_n2rwx: + default: + violation = rsp.access_r || rsp.access_w || rsp.access_x; + break; + + case XENMEM_access_r: + violation = rsp.access_w || rsp.access_x; + break; + + case XENMEM_access_w: + violation = rsp.access_r || rsp.access_x; + break; + + case XENMEM_access_x: + violation = rsp.access_r || rsp.access_w; + break; + + case XENMEM_access_rx: + case XENMEM_access_rx2rw: + violation = rsp.access_w; + break; + + case XENMEM_access_wx: + violation = rsp.access_r; + break; + + case XENMEM_access_rw: + violation = rsp.access_x; + break; + + case XENMEM_access_rwx: + violation = 0; + break; + } + } + + v->arch.mem_event.emulate_flags = violation ? rsp.flags : 0; + } + /* Unpause domain */ if ( rsp.flags & MEM_EVENT_FLAG_VCPU_PAUSED ) mem_event_vcpu_unpause(v); diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 8fc5a45..7abe1b3 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -459,6 +459,17 @@ struct arch_vcpu /* A secondary copy of the vcpu time info. */ XEN_GUEST_HANDLE(vcpu_time_info_t) time_info_guest; + + /* + * Should we emulate the next matching instruction on VCPU resume + * after a mem_event? + */ + struct { + uint32_t emulate_flags; + unsigned long gpa; + unsigned long eip; + } mem_event; + } __cacheline_aligned; smap_check_policy_t smap_policy_change(struct vcpu *v, diff --git a/xen/include/public/mem_event.h b/xen/include/public/mem_event.h index d3dd9c6..599f9e8 100644 --- a/xen/include/public/mem_event.h +++ b/xen/include/public/mem_event.h @@ -31,11 +31,22 @@ #include "io/ring.h" /* Memory event flags */ -#define MEM_EVENT_FLAG_VCPU_PAUSED (1 << 0) -#define MEM_EVENT_FLAG_DROP_PAGE (1 << 1) -#define MEM_EVENT_FLAG_EVICT_FAIL (1 << 2) -#define MEM_EVENT_FLAG_FOREIGN (1 << 3) -#define MEM_EVENT_FLAG_DUMMY (1 << 4) +#define MEM_EVENT_FLAG_VCPU_PAUSED (1 << 0) +#define MEM_EVENT_FLAG_DROP_PAGE (1 << 1) +#define MEM_EVENT_FLAG_EVICT_FAIL (1 << 2) +#define MEM_EVENT_FLAG_FOREIGN (1 << 3) +#define MEM_EVENT_FLAG_DUMMY (1 << 4) +/* + * Emulate the fault-causing instruction (if set in the event response flags). + * This will allow the guest to continue execution without lifting the page + * access restrictions. + */ +#define MEM_EVENT_FLAG_EMULATE (1 << 5) +/* + * Same as MEM_EVENT_FLAG_EMULATE, but with write operations or operations + * potentially having side effects (like memory mapped or port I/O) disabled. + */ +#define MEM_EVENT_FLAG_EMULATE_NOWRITE (1 << 6) /* Reasons for the memory event request */ #define MEM_EVENT_REASON_UNKNOWN 0 /* typical reason */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:45:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:45: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 1XV47G-0001Qh-UA; Fri, 19 Sep 2014 19:45:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV47F-0001QU-5C for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:45:13 +0000 Received: from [85.158.137.68:62882] by server-6.bemta-3.messagelabs.com id FB/D7-29521-8C78C145; Fri, 19 Sep 2014 19:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1411155909!10860449!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 615 invoked from network); 19 Sep 2014 19:45:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:45:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV476-0001pE-Im for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV476-0000Ni-GR for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:45:04 +0000 Date: Fri, 19 Sep 2014 19:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: suppress UR signaling for further desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e2331d271cc0882e4013c8f20398c46c35f90a1 Author: Jan Beulich AuthorDate: Thu Sep 18 15:03:22 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 15:03:22 2014 +0200 VT-d: suppress UR signaling for further desktop chipsets This extends commit d6cb14b34f ("VT-d: suppress UR signaling for desktop chipsets") as per the finally obtained list of affected chipsets from Intel. Also pad the IDs we had listed there before to full 4 hex digits. This is CVE-2013-3495 / XSA-59. Signed-off-by: Jan Beulich Acked-by: Yang Zhang --- xen/drivers/passthrough/vtd/quirks.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index c23c89e..839dc45 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -466,10 +466,12 @@ void pci_vtd_quirk(const struct pci_dev *pdev) action, seg, bus, dev, func); break; - case 0x100: case 0x104: case 0x108: /* Sandybridge */ - case 0x150: case 0x154: case 0x158: /* Ivybridge */ - case 0xa04: /* Haswell ULT */ - case 0xc00: case 0xc04: case 0xc08: /* Haswell */ + case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ + case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ + case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ + case 0x0a04: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 19 19:45:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 19 Sep 2014 19:45: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 1XV47G-0001Qh-UA; Fri, 19 Sep 2014 19:45:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV47F-0001QU-5C for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:45:13 +0000 Received: from [85.158.137.68:62882] by server-6.bemta-3.messagelabs.com id FB/D7-29521-8C78C145; Fri, 19 Sep 2014 19:45:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1411155909!10860449!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 615 invoked from network); 19 Sep 2014 19:45:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 19 Sep 2014 19:45:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XV476-0001pE-Im for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:45:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XV476-0000Ni-GR for xen-changelog@lists.xensource.com; Fri, 19 Sep 2014 19:45:04 +0000 Date: Fri, 19 Sep 2014 19:45:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: suppress UR signaling for further desktop chipsets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3e2331d271cc0882e4013c8f20398c46c35f90a1 Author: Jan Beulich AuthorDate: Thu Sep 18 15:03:22 2014 +0200 Commit: Jan Beulich CommitDate: Thu Sep 18 15:03:22 2014 +0200 VT-d: suppress UR signaling for further desktop chipsets This extends commit d6cb14b34f ("VT-d: suppress UR signaling for desktop chipsets") as per the finally obtained list of affected chipsets from Intel. Also pad the IDs we had listed there before to full 4 hex digits. This is CVE-2013-3495 / XSA-59. Signed-off-by: Jan Beulich Acked-by: Yang Zhang --- xen/drivers/passthrough/vtd/quirks.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index c23c89e..839dc45 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -466,10 +466,12 @@ void pci_vtd_quirk(const struct pci_dev *pdev) action, seg, bus, dev, func); break; - case 0x100: case 0x104: case 0x108: /* Sandybridge */ - case 0x150: case 0x154: case 0x158: /* Ivybridge */ - case 0xa04: /* Haswell ULT */ - case 0xc00: case 0xc04: case 0xc08: /* Haswell */ + case 0x0040: case 0x0044: case 0x0048: /* Nehalem/Westmere */ + case 0x0100: case 0x0104: case 0x0108: /* Sandybridge */ + case 0x0150: case 0x0154: case 0x0158: /* Ivybridge */ + case 0x0a04: /* Haswell ULT */ + case 0x0c00: case 0x0c04: case 0x0c08: /* Haswell */ + case 0x1600: case 0x1604: case 0x1608: /* Broadwell */ bar = pci_conf_read32(seg, bus, dev, func, 0x6c); bar = (bar << 32) | pci_conf_read32(seg, bus, dev, func, 0x68); pa = bar & 0x7ffffff000UL; /* bits 12...38 */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 13:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 13:11: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 1XWPs7-00080C-EI; Tue, 23 Sep 2014 13:11:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWPs5-0007zp-S4 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 13:11:10 +0000 Received: from [85.158.137.68:65347] by server-7.bemta-3.messagelabs.com id 7C/01-01084-C6171245; Tue, 23 Sep 2014 13:11:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1411477865!11537536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25771 invoked from network); 23 Sep 2014 13:11:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 13:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWPry-0007xt-5g for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 13:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWPrx-0003Pt-Tc for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 13:11:02 +0000 Date: Tue, 23 Sep 2014 13:11:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad: -I tools/libxc/include and tools/xenstore/include X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58fac0693d8ad591add917e939011fe069720b0c Author: Stefano Stabellini AuthorDate: Fri Aug 1 16:32:18 2014 +0100 Commit: Ian Jackson CommitDate: Tue Sep 23 13:55:52 2014 +0100 qemu-xen-trad: -I tools/libxc/include and tools/xenstore/include The public libxc and xenstore headers have been moved to tools/libxc/include and tools/xenstore/include respectively: change the Makefiles accordingly. --- Makefile | 4 ++-- xen-hooks.mak | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ed9b28a..0fbec99 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,9 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a recurse-all: $(SUBDIR_RULES) -CPPFLAGS += -I$(XEN_ROOT)/tools/libxc +CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib -CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS += -I$(XEN_ROOT)/tools/include tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c diff --git a/xen-hooks.mak b/xen-hooks.mak index b91400e..bc7f1f1 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,5 +1,5 @@ -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include +CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS+= -I$(XEN_ROOT)/tools/include SSE2 := $(call cc-option,-msse2,) -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 13:11:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 13:11: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 1XWPs7-00080C-EI; Tue, 23 Sep 2014 13:11:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWPs5-0007zp-S4 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 13:11:10 +0000 Received: from [85.158.137.68:65347] by server-7.bemta-3.messagelabs.com id 7C/01-01084-C6171245; Tue, 23 Sep 2014 13:11:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1411477865!11537536!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25771 invoked from network); 23 Sep 2014 13:11:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 13:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWPry-0007xt-5g for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 13:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWPrx-0003Pt-Tc for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 13:11:02 +0000 Date: Tue, 23 Sep 2014 13:11:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-unstable] qemu-xen-trad: -I tools/libxc/include and tools/xenstore/include X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58fac0693d8ad591add917e939011fe069720b0c Author: Stefano Stabellini AuthorDate: Fri Aug 1 16:32:18 2014 +0100 Commit: Ian Jackson CommitDate: Tue Sep 23 13:55:52 2014 +0100 qemu-xen-trad: -I tools/libxc/include and tools/xenstore/include The public libxc and xenstore headers have been moved to tools/libxc/include and tools/xenstore/include respectively: change the Makefiles accordingly. --- Makefile | 4 ++-- xen-hooks.mak | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ed9b28a..0fbec99 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,9 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a recurse-all: $(SUBDIR_RULES) -CPPFLAGS += -I$(XEN_ROOT)/tools/libxc +CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib -CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS += -I$(XEN_ROOT)/tools/include tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c diff --git a/xen-hooks.mak b/xen-hooks.mak index b91400e..bc7f1f1 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,5 +1,5 @@ -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include +CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS+= -I$(XEN_ROOT)/tools/include SSE2 := $(call cc-option,-msse2,) -- generated by git-patchbot for /home/xen/git/qemu-xen-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTN3-0005dK-Nf; Tue, 23 Sep 2014 16:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTN1-0005d4-QS for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:20 +0000 Received: from [85.158.143.35:15180] by server-1.bemta-4.messagelabs.com id 99/DA-05872-7F5A1245; Tue, 23 Sep 2014 16:55:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1411491315!12703171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2251 invoked from network); 23 Sep 2014 16:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMx-0002UD-GX for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTMx-0002wq-DI for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:15 +0000 Date: Tue, 23 Sep 2014 16:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update libfdt to v1.4.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 d198fbe6cfe6feaa85259da984a221d841f8355a Author: Roy Franz AuthorDate: Thu Sep 18 15:50:05 2014 -0700 Commit: Ian Campbell CommitDate: Mon Sep 22 11:58:01 2014 +0100 Update libfdt to v1.4.0 Update libfdt to v1.4.0 of libfdt taken from git://git.jdl.com/software/dtc.git Xen changes to libfdt_env.h carried over from existing libfdt (v1.3.0) This update provides the fdt_create_empty_tree() function used by the ARM EFI boot code. Signed-off-by: Roy Franz Acked-by: Ian Campbell --- xen/common/libfdt/Makefile.libfdt | 4 +- xen/common/libfdt/fdt.c | 30 ++++- xen/common/libfdt/fdt_empty_tree.c | 84 +++++++++ xen/common/libfdt/fdt_ro.c | 7 +- xen/common/libfdt/fdt_rw.c | 31 ++++- xen/common/libfdt/fdt_sw.c | 4 +- xen/common/libfdt/fdt_wip.c | 2 +- xen/common/libfdt/version.lds | 6 + xen/include/xen/libfdt/fdt.h | 93 ++++++++--- xen/include/xen/libfdt/libfdt.h | 315 +++++++++++++++++++++++++++++++++-- xen/include/xen/libfdt/libfdt_env.h | 4 + 11 files changed, 529 insertions(+), 51 deletions(-) diff --git a/xen/common/libfdt/Makefile.libfdt b/xen/common/libfdt/Makefile.libfdt index d55a6f8..91126c0 100644 --- a/xen/common/libfdt/Makefile.libfdt +++ b/xen/common/libfdt/Makefile.libfdt @@ -4,7 +4,7 @@ # be easily embeddable into other systems of Makefiles. # LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 -LIBFDT_INCLUDES = fdt.h libfdt.h +LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h LIBFDT_VERSION = version.lds -LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c +LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) diff --git a/xen/common/libfdt/fdt.c b/xen/common/libfdt/fdt.c index e56833a..2ce6a44 100644 --- a/xen/common/libfdt/fdt.c +++ b/xen/common/libfdt/fdt.c @@ -92,7 +92,7 @@ const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len) uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) { - const uint32_t *tagp, *lenp; + const fdt32_t *tagp, *lenp; uint32_t tag; int offset = startoffset; const char *p; @@ -198,6 +198,34 @@ int fdt_next_node(const void *fdt, int offset, int *depth) return offset; } +int fdt_first_subnode(const void *fdt, int offset) +{ + int depth = 0; + + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth != 1) + return -FDT_ERR_NOTFOUND; + + return offset; +} + +int fdt_next_subnode(const void *fdt, int offset) +{ + int depth = 1; + + /* + * With respect to the parent, the depth of the next subnode will be + * the same as the last. + */ + do { + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth < 1) + return -FDT_ERR_NOTFOUND; + } while (depth > 1); + + return offset; +} + const char *_fdt_find_string(const char *strtab, int tabsize, const char *s) { int len = strlen(s) + 1; diff --git a/xen/common/libfdt/fdt_empty_tree.c b/xen/common/libfdt/fdt_empty_tree.c new file mode 100644 index 0000000..f72d13b --- /dev/null +++ b/xen/common/libfdt/fdt_empty_tree.c @@ -0,0 +1,84 @@ +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2012 David Gibson, IBM Corporation. + * + * libfdt is dual licensed: you can use it either under the terms of + * the GPL, or the BSD license, at your option. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * Alternatively, + * + * b) Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include "libfdt_env.h" + +#include +#include + +#include "libfdt_internal.h" + +int fdt_create_empty_tree(void *buf, int bufsize) +{ + int err; + + err = fdt_create(buf, bufsize); + if (err) + return err; + + err = fdt_finish_reservemap(buf); + if (err) + return err; + + err = fdt_begin_node(buf, ""); + if (err) + return err; + + err = fdt_end_node(buf); + if (err) + return err; + + err = fdt_finish(buf); + if (err) + return err; + + return fdt_open_into(buf, buf, bufsize); +} + diff --git a/xen/common/libfdt/fdt_ro.c b/xen/common/libfdt/fdt_ro.c index 02b6d68..50007f6 100644 --- a/xen/common/libfdt/fdt_ro.c +++ b/xen/common/libfdt/fdt_ro.c @@ -322,7 +322,7 @@ const void *fdt_getprop(const void *fdt, int nodeoffset, uint32_t fdt_get_phandle(const void *fdt, int nodeoffset) { - const uint32_t *php; + const fdt32_t *php; int len; /* FIXME: This is a bit sub-optimal, since we potentially scan @@ -515,8 +515,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle) return offset; /* error from fdt_next_node() */ } -static int _fdt_stringlist_contains(const char *strlist, int listlen, - const char *str) +int fdt_stringlist_contains(const char *strlist, int listlen, const char *str) { int len = strlen(str); const char *p; @@ -542,7 +541,7 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset, prop = fdt_getprop(fdt, nodeoffset, "compatible", &len); if (!prop) return len; - if (_fdt_stringlist_contains(prop, len, compatible)) + if (fdt_stringlist_contains(prop, len, compatible)) return 0; else return 1; diff --git a/xen/common/libfdt/fdt_rw.c b/xen/common/libfdt/fdt_rw.c index 994037b..fdba618 100644 --- a/xen/common/libfdt/fdt_rw.c +++ b/xen/common/libfdt/fdt_rw.c @@ -289,6 +289,33 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, return 0; } +int fdt_appendprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len) +{ + struct fdt_property *prop; + int err, oldlen, newlen; + + FDT_RW_CHECK_HEADER(fdt); + + prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen); + if (prop) { + newlen = len + oldlen; + err = _fdt_splice_struct(fdt, prop->data, + FDT_TAGALIGN(oldlen), + FDT_TAGALIGN(newlen)); + if (err) + return err; + prop->len = cpu_to_fdt32(newlen); + memcpy(prop->data + oldlen, val, len); + } else { + err = _fdt_add_property(fdt, nodeoffset, name, len, &prop); + if (err) + return err; + memcpy(prop->data, val, len); + } + return 0; +} + int fdt_delprop(void *fdt, int nodeoffset, const char *name) { struct fdt_property *prop; @@ -312,7 +339,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, int nodelen; int err; uint32_t tag; - uint32_t *endtag; + fdt32_t *endtag; FDT_RW_CHECK_HEADER(fdt); @@ -339,7 +366,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE); memset(nh->name, 0, FDT_TAGALIGN(namelen+1)); memcpy(nh->name, name, namelen); - endtag = (uint32_t *)((char *)nh + nodelen - FDT_TAGSIZE); + endtag = (fdt32_t *)((char *)nh + nodelen - FDT_TAGSIZE); *endtag = cpu_to_fdt32(FDT_END_NODE); return offset; diff --git a/xen/common/libfdt/fdt_sw.c b/xen/common/libfdt/fdt_sw.c index 55ebebf..f422754 100644 --- a/xen/common/libfdt/fdt_sw.c +++ b/xen/common/libfdt/fdt_sw.c @@ -153,7 +153,7 @@ int fdt_begin_node(void *fdt, const char *name) int fdt_end_node(void *fdt) { - uint32_t *en; + fdt32_t *en; FDT_SW_CHECK_HEADER(fdt); @@ -213,7 +213,7 @@ int fdt_property(void *fdt, const char *name, const void *val, int len) int fdt_finish(void *fdt) { char *p = (char *)fdt; - uint32_t *end; + fdt32_t *end; int oldstroffset, newstroffset; uint32_t tag; int offset, nextoffset; diff --git a/xen/common/libfdt/fdt_wip.c b/xen/common/libfdt/fdt_wip.c index 6025fa1..c5bbb68 100644 --- a/xen/common/libfdt/fdt_wip.c +++ b/xen/common/libfdt/fdt_wip.c @@ -74,7 +74,7 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, static void _fdt_nop_region(void *start, int len) { - uint32_t *p; + fdt32_t *p; for (p = start; (char *)p < ((char *)start + len); p++) *p = cpu_to_fdt32(FDT_NOP); diff --git a/xen/common/libfdt/version.lds b/xen/common/libfdt/version.lds index 3c3994e..80b322b 100644 --- a/xen/common/libfdt/version.lds +++ b/xen/common/libfdt/version.lds @@ -48,6 +48,12 @@ LIBFDT_1.2 { fdt_strerror; fdt_offset_ptr; fdt_next_tag; + fdt_appendprop; + fdt_create_empty_tree; + fdt_first_property_offset; + fdt_get_property_by_offset; + fdt_getprop_by_offset; + fdt_next_property_offset; local: *; diff --git a/xen/include/xen/libfdt/fdt.h b/xen/include/xen/libfdt/fdt.h index 48ccfd9..526aedb 100644 --- a/xen/include/xen/libfdt/fdt.h +++ b/xen/include/xen/libfdt/fdt.h @@ -1,48 +1,99 @@ #ifndef _FDT_H #define _FDT_H +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2006 David Gibson, IBM Corporation. + * Copyright 2012 Kim Phillips, Freescale Semiconductor. + * + * libfdt is dual licensed: you can use it either under the terms of + * the GPL, or the BSD license, at your option. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * Alternatively, + * + * b) Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef __ASSEMBLY__ struct fdt_header { - uint32_t magic; /* magic word FDT_MAGIC */ - uint32_t totalsize; /* total size of DT block */ - uint32_t off_dt_struct; /* offset to structure */ - uint32_t off_dt_strings; /* offset to strings */ - uint32_t off_mem_rsvmap; /* offset to memory reserve map */ - uint32_t version; /* format version */ - uint32_t last_comp_version; /* last compatible version */ + fdt32_t magic; /* magic word FDT_MAGIC */ + fdt32_t totalsize; /* total size of DT block */ + fdt32_t off_dt_struct; /* offset to structure */ + fdt32_t off_dt_strings; /* offset to strings */ + fdt32_t off_mem_rsvmap; /* offset to memory reserve map */ + fdt32_t version; /* format version */ + fdt32_t last_comp_version; /* last compatible version */ /* version 2 fields below */ - uint32_t boot_cpuid_phys; /* Which physical CPU id we're + fdt32_t boot_cpuid_phys; /* Which physical CPU id we're booting on */ /* version 3 fields below */ - uint32_t size_dt_strings; /* size of the strings block */ + fdt32_t size_dt_strings; /* size of the strings block */ /* version 17 fields below */ - uint32_t size_dt_struct; /* size of the structure block */ + fdt32_t size_dt_struct; /* size of the structure block */ }; struct fdt_reserve_entry { - uint64_t address; - uint64_t size; + fdt64_t address; + fdt64_t size; }; struct fdt_node_header { - uint32_t tag; + fdt32_t tag; char name[0]; }; struct fdt_property { - uint32_t tag; - uint32_t len; - uint32_t nameoff; + fdt32_t tag; + fdt32_t len; + fdt32_t nameoff; char data[0]; }; #endif /* !__ASSEMBLY */ #define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */ -#define FDT_TAGSIZE sizeof(uint32_t) +#define FDT_TAGSIZE sizeof(fdt32_t) #define FDT_BEGIN_NODE 0x1 /* Start node: full name */ #define FDT_END_NODE 0x2 /* End node */ @@ -51,10 +102,10 @@ struct fdt_property { #define FDT_NOP 0x4 /* nop */ #define FDT_END 0x9 -#define FDT_V1_SIZE (7*sizeof(uint32_t)) -#define FDT_V2_SIZE (FDT_V1_SIZE + sizeof(uint32_t)) -#define FDT_V3_SIZE (FDT_V2_SIZE + sizeof(uint32_t)) +#define FDT_V1_SIZE (7*sizeof(fdt32_t)) +#define FDT_V2_SIZE (FDT_V1_SIZE + sizeof(fdt32_t)) +#define FDT_V3_SIZE (FDT_V2_SIZE + sizeof(fdt32_t)) #define FDT_V16_SIZE FDT_V3_SIZE -#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(uint32_t)) +#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) #endif /* _FDT_H */ diff --git a/xen/include/xen/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h index 6086047..37349f1 100644 --- a/xen/include/xen/libfdt/libfdt.h +++ b/xen/include/xen/libfdt/libfdt.h @@ -136,6 +136,28 @@ uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset); int fdt_next_node(const void *fdt, int offset, int *depth); +/** + * fdt_first_subnode() - get offset of first direct subnode + * + * @fdt: FDT blob + * @offset: Offset of node to check + * @return offset of first subnode, or -FDT_ERR_NOTFOUND if there is none + */ +int fdt_first_subnode(const void *fdt, int offset); + +/** + * fdt_next_subnode() - get offset of next direct subnode + * + * After first calling fdt_first_subnode(), call this function repeatedly to + * get direct subnodes of a parent node. + * + * @fdt: FDT blob + * @offset: Offset of previous subnode + * @return offset of next subnode, or -FDT_ERR_NOTFOUND if there are no more + * subnodes + */ +int fdt_next_subnode(const void *fdt, int offset); + /**********************************************************************/ /* General functions */ /**********************************************************************/ @@ -582,7 +604,7 @@ const char *fdt_get_alias_namelen(const void *fdt, * value of the property named 'name' in the node /aliases. * * returns: - * a pointer to the expansion of the alias named 'name', of it exists + * a pointer to the expansion of the alias named 'name', if it exists * NULL, if the given alias or the /aliases node does not exist */ const char *fdt_get_alias(const void *fdt, const char *name); @@ -816,6 +838,20 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset, int fdt_node_offset_by_compatible(const void *fdt, int startoffset, const char *compatible); +/** + * fdt_stringlist_contains - check a string list property for a string + * @strlist: Property containing a list of strings to check + * @listlen: Length of property + * @str: String to search for + * + * This is a utility function provided for convenience. The list contains + * one or more strings, each terminated by \0, as is found in a device tree + * "compatible" property. + * + * @return: 1 if the string is found in the list, 0 not found, or invalid list + */ +int fdt_stringlist_contains(const char *strlist, int listlen, const char *str); + /**********************************************************************/ /* Write-in-place functions */ /**********************************************************************/ @@ -852,17 +888,17 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, const void *val, int len); /** - * fdt_setprop_inplace_cell - change the value of a single-cell property + * fdt_setprop_inplace_u32 - change the value of a 32-bit integer property * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to change * @name: name of the property to change - * @val: cell (32-bit integer) value to replace the property with + * @val: 32-bit integer value to replace the property with * - * fdt_setprop_inplace_cell() replaces the value of a given property - * with the 32-bit integer cell value in val, converting val to - * big-endian if necessary. This function cannot change the size of a - * property, and so will only work if the property already exists and - * has length 4. + * fdt_setprop_inplace_u32() replaces the value of a given property + * with the 32-bit integer value in val, converting val to big-endian + * if necessary. This function cannot change the size of a property, + * and so will only work if the property already exists and has length + * 4. * * This function will alter only the bytes in the blob which contain * the given property value, and will not alter or move any other part @@ -871,7 +907,42 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, * returns: * 0, on success * -FDT_ERR_NOSPACE, if the property's length is not equal to 4 - * -FDT_ERR_NOTFOUND, node does not have the named property + * -FDT_ERR_NOTFOUND, node does not have the named property + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_setprop_inplace_u32(void *fdt, int nodeoffset, + const char *name, uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_setprop_inplace(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_inplace_u64 - change the value of a 64-bit integer property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 64-bit integer value to replace the property with + * + * fdt_setprop_inplace_u64() replaces the value of a given property + * with the 64-bit integer value in val, converting val to big-endian + * if necessary. This function cannot change the size of a property, + * and so will only work if the property already exists and has length + * 8. + * + * This function will alter only the bytes in the blob which contain + * the given property value, and will not alter or move any other part + * of the tree. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, if the property's length is not equal to 8 + * -FDT_ERR_NOTFOUND, node does not have the named property * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag * -FDT_ERR_BADMAGIC, * -FDT_ERR_BADVERSION, @@ -879,11 +950,22 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, * -FDT_ERR_BADSTRUCTURE, * -FDT_ERR_TRUNCATED, standard meanings */ +static inline int fdt_setprop_inplace_u64(void *fdt, int nodeoffset, + const char *name, uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_setprop_inplace(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_inplace_cell - change the value of a single-cell property + * + * This is an alternative name for fdt_setprop_inplace_u32() + */ static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset, const char *name, uint32_t val) { - val = cpu_to_fdt32(val); - return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val)); + return fdt_setprop_inplace_u32(fdt, nodeoffset, name, val); } /** @@ -945,10 +1027,19 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size); int fdt_finish_reservemap(void *fdt); int fdt_begin_node(void *fdt, const char *name); int fdt_property(void *fdt, const char *name, const void *val, int len); +static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_property(fdt, name, &tmp, sizeof(tmp)); +} +static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_property(fdt, name, &tmp, sizeof(tmp)); +} static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val) { - val = cpu_to_fdt32(val); - return fdt_property(fdt, name, &val, sizeof(val)); + return fdt_property_u32(fdt, name, val); } #define fdt_property_string(fdt, name, str) \ fdt_property(fdt, name, str, strlen(str)+1) @@ -959,6 +1050,7 @@ int fdt_finish(void *fdt); /* Read-write functions */ /**********************************************************************/ +int fdt_create_empty_tree(void *buf, int bufsize); int fdt_open_into(const void *fdt, void *buf, int bufsize); int fdt_pack(void *fdt); @@ -1068,14 +1160,14 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, const void *val, int len); /** - * fdt_setprop_cell - set a property to a single cell value + * fdt_setprop_u32 - set a property to a 32-bit integer * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to change * @name: name of the property to change * @val: 32-bit integer value for the property (native endian) * - * fdt_setprop_cell() sets the value of the named property in the - * given node to the given cell value (converting to big-endian if + * fdt_setprop_u32() sets the value of the named property in the given + * node to the given 32-bit integer value (converting to big-endian if * necessary), or creates a new property with that value if it does * not already exist. * @@ -1095,11 +1187,57 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, * -FDT_ERR_BADLAYOUT, * -FDT_ERR_TRUNCATED, standard meanings */ +static inline int fdt_setprop_u32(void *fdt, int nodeoffset, const char *name, + uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_u64 - set a property to a 64-bit integer + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 64-bit integer value for the property (native endian) + * + * fdt_setprop_u64() sets the value of the named property in the given + * node to the given 64-bit integer value (converting to big-endian if + * necessary), or creates a new property with that value if it does + * not already exist. + * + * This function may insert or delete data from the blob, and will + * therefore change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_setprop_u64(void *fdt, int nodeoffset, const char *name, + uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_cell - set a property to a single cell value + * + * This is an alternative name for fdt_setprop_u32() + */ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name, uint32_t val) { - val = cpu_to_fdt32(val); - return fdt_setprop(fdt, nodeoffset, name, &val, sizeof(val)); + return fdt_setprop_u32(fdt, nodeoffset, name, val); } /** @@ -1134,6 +1272,147 @@ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name, fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) /** + * fdt_appendprop - append to or create a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to append to + * @val: pointer to data to append to the property value + * @len: length of the data to append to the property value + * + * fdt_appendprop() appends the value to the named property in the + * given node, creating the property if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +int fdt_appendprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len); + +/** + * fdt_appendprop_u32 - append a 32-bit integer value to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 32-bit integer value to append to the property (native endian) + * + * fdt_appendprop_u32() appends the given 32-bit integer value + * (converting to big-endian if necessary) to the value of the named + * property in the given node, or creates a new property with that + * value if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_appendprop_u32(void *fdt, int nodeoffset, + const char *name, uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_appendprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_appendprop_u64 - append a 64-bit integer value to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 64-bit integer value to append to the property (native endian) + * + * fdt_appendprop_u64() appends the given 64-bit integer value + * (converting to big-endian if necessary) to the value of the named + * property in the given node, or creates a new property with that + * value if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_appendprop_u64(void *fdt, int nodeoffset, + const char *name, uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_appendprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_appendprop_cell - append a single cell value to a property + * + * This is an alternative name for fdt_appendprop_u32() + */ +static inline int fdt_appendprop_cell(void *fdt, int nodeoffset, + const char *name, uint32_t val) +{ + return fdt_appendprop_u32(fdt, nodeoffset, name, val); +} + +/** + * fdt_appendprop_string - append a string to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @str: string value to append to the property + * + * fdt_appendprop_string() appends the given string to the value of + * the named property in the given node, or creates a new property + * with that value if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +#define fdt_appendprop_string(fdt, nodeoffset, name, str) \ + fdt_appendprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) + +/** * fdt_delprop - delete a property * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to nop diff --git a/xen/include/xen/libfdt/libfdt_env.h b/xen/include/xen/libfdt/libfdt_env.h index 2f1b03c..89a794b 100644 --- a/xen/include/xen/libfdt/libfdt_env.h +++ b/xen/include/xen/libfdt/libfdt_env.h @@ -6,6 +6,10 @@ #include #include +typedef uint16_t fdt16_t; +typedef uint32_t fdt32_t; +typedef uint64_t fdt64_t; + #define fdt16_to_cpu(x) be16_to_cpu(x) #define cpu_to_fdt16(x) cpu_to_be16(x) #define fdt32_to_cpu(x) be32_to_cpu(x) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTN3-0005dK-Nf; Tue, 23 Sep 2014 16:55:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTN1-0005d4-QS for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:20 +0000 Received: from [85.158.143.35:15180] by server-1.bemta-4.messagelabs.com id 99/DA-05872-7F5A1245; Tue, 23 Sep 2014 16:55:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1411491315!12703171!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2251 invoked from network); 23 Sep 2014 16:55:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMx-0002UD-GX for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTMx-0002wq-DI for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:15 +0000 Date: Tue, 23 Sep 2014 16:55:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Update libfdt to v1.4.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 d198fbe6cfe6feaa85259da984a221d841f8355a Author: Roy Franz AuthorDate: Thu Sep 18 15:50:05 2014 -0700 Commit: Ian Campbell CommitDate: Mon Sep 22 11:58:01 2014 +0100 Update libfdt to v1.4.0 Update libfdt to v1.4.0 of libfdt taken from git://git.jdl.com/software/dtc.git Xen changes to libfdt_env.h carried over from existing libfdt (v1.3.0) This update provides the fdt_create_empty_tree() function used by the ARM EFI boot code. Signed-off-by: Roy Franz Acked-by: Ian Campbell --- xen/common/libfdt/Makefile.libfdt | 4 +- xen/common/libfdt/fdt.c | 30 ++++- xen/common/libfdt/fdt_empty_tree.c | 84 +++++++++ xen/common/libfdt/fdt_ro.c | 7 +- xen/common/libfdt/fdt_rw.c | 31 ++++- xen/common/libfdt/fdt_sw.c | 4 +- xen/common/libfdt/fdt_wip.c | 2 +- xen/common/libfdt/version.lds | 6 + xen/include/xen/libfdt/fdt.h | 93 ++++++++--- xen/include/xen/libfdt/libfdt.h | 315 +++++++++++++++++++++++++++++++++-- xen/include/xen/libfdt/libfdt_env.h | 4 + 11 files changed, 529 insertions(+), 51 deletions(-) diff --git a/xen/common/libfdt/Makefile.libfdt b/xen/common/libfdt/Makefile.libfdt index d55a6f8..91126c0 100644 --- a/xen/common/libfdt/Makefile.libfdt +++ b/xen/common/libfdt/Makefile.libfdt @@ -4,7 +4,7 @@ # be easily embeddable into other systems of Makefiles. # LIBFDT_soname = libfdt.$(SHAREDLIB_EXT).1 -LIBFDT_INCLUDES = fdt.h libfdt.h +LIBFDT_INCLUDES = fdt.h libfdt.h libfdt_env.h LIBFDT_VERSION = version.lds -LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c +LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c fdt_empty_tree.c LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o) diff --git a/xen/common/libfdt/fdt.c b/xen/common/libfdt/fdt.c index e56833a..2ce6a44 100644 --- a/xen/common/libfdt/fdt.c +++ b/xen/common/libfdt/fdt.c @@ -92,7 +92,7 @@ const void *fdt_offset_ptr(const void *fdt, int offset, unsigned int len) uint32_t fdt_next_tag(const void *fdt, int startoffset, int *nextoffset) { - const uint32_t *tagp, *lenp; + const fdt32_t *tagp, *lenp; uint32_t tag; int offset = startoffset; const char *p; @@ -198,6 +198,34 @@ int fdt_next_node(const void *fdt, int offset, int *depth) return offset; } +int fdt_first_subnode(const void *fdt, int offset) +{ + int depth = 0; + + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth != 1) + return -FDT_ERR_NOTFOUND; + + return offset; +} + +int fdt_next_subnode(const void *fdt, int offset) +{ + int depth = 1; + + /* + * With respect to the parent, the depth of the next subnode will be + * the same as the last. + */ + do { + offset = fdt_next_node(fdt, offset, &depth); + if (offset < 0 || depth < 1) + return -FDT_ERR_NOTFOUND; + } while (depth > 1); + + return offset; +} + const char *_fdt_find_string(const char *strtab, int tabsize, const char *s) { int len = strlen(s) + 1; diff --git a/xen/common/libfdt/fdt_empty_tree.c b/xen/common/libfdt/fdt_empty_tree.c new file mode 100644 index 0000000..f72d13b --- /dev/null +++ b/xen/common/libfdt/fdt_empty_tree.c @@ -0,0 +1,84 @@ +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2012 David Gibson, IBM Corporation. + * + * libfdt is dual licensed: you can use it either under the terms of + * the GPL, or the BSD license, at your option. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * Alternatively, + * + * b) Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include "libfdt_env.h" + +#include +#include + +#include "libfdt_internal.h" + +int fdt_create_empty_tree(void *buf, int bufsize) +{ + int err; + + err = fdt_create(buf, bufsize); + if (err) + return err; + + err = fdt_finish_reservemap(buf); + if (err) + return err; + + err = fdt_begin_node(buf, ""); + if (err) + return err; + + err = fdt_end_node(buf); + if (err) + return err; + + err = fdt_finish(buf); + if (err) + return err; + + return fdt_open_into(buf, buf, bufsize); +} + diff --git a/xen/common/libfdt/fdt_ro.c b/xen/common/libfdt/fdt_ro.c index 02b6d68..50007f6 100644 --- a/xen/common/libfdt/fdt_ro.c +++ b/xen/common/libfdt/fdt_ro.c @@ -322,7 +322,7 @@ const void *fdt_getprop(const void *fdt, int nodeoffset, uint32_t fdt_get_phandle(const void *fdt, int nodeoffset) { - const uint32_t *php; + const fdt32_t *php; int len; /* FIXME: This is a bit sub-optimal, since we potentially scan @@ -515,8 +515,7 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle) return offset; /* error from fdt_next_node() */ } -static int _fdt_stringlist_contains(const char *strlist, int listlen, - const char *str) +int fdt_stringlist_contains(const char *strlist, int listlen, const char *str) { int len = strlen(str); const char *p; @@ -542,7 +541,7 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset, prop = fdt_getprop(fdt, nodeoffset, "compatible", &len); if (!prop) return len; - if (_fdt_stringlist_contains(prop, len, compatible)) + if (fdt_stringlist_contains(prop, len, compatible)) return 0; else return 1; diff --git a/xen/common/libfdt/fdt_rw.c b/xen/common/libfdt/fdt_rw.c index 994037b..fdba618 100644 --- a/xen/common/libfdt/fdt_rw.c +++ b/xen/common/libfdt/fdt_rw.c @@ -289,6 +289,33 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, return 0; } +int fdt_appendprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len) +{ + struct fdt_property *prop; + int err, oldlen, newlen; + + FDT_RW_CHECK_HEADER(fdt); + + prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen); + if (prop) { + newlen = len + oldlen; + err = _fdt_splice_struct(fdt, prop->data, + FDT_TAGALIGN(oldlen), + FDT_TAGALIGN(newlen)); + if (err) + return err; + prop->len = cpu_to_fdt32(newlen); + memcpy(prop->data + oldlen, val, len); + } else { + err = _fdt_add_property(fdt, nodeoffset, name, len, &prop); + if (err) + return err; + memcpy(prop->data, val, len); + } + return 0; +} + int fdt_delprop(void *fdt, int nodeoffset, const char *name) { struct fdt_property *prop; @@ -312,7 +339,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, int nodelen; int err; uint32_t tag; - uint32_t *endtag; + fdt32_t *endtag; FDT_RW_CHECK_HEADER(fdt); @@ -339,7 +366,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset, nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE); memset(nh->name, 0, FDT_TAGALIGN(namelen+1)); memcpy(nh->name, name, namelen); - endtag = (uint32_t *)((char *)nh + nodelen - FDT_TAGSIZE); + endtag = (fdt32_t *)((char *)nh + nodelen - FDT_TAGSIZE); *endtag = cpu_to_fdt32(FDT_END_NODE); return offset; diff --git a/xen/common/libfdt/fdt_sw.c b/xen/common/libfdt/fdt_sw.c index 55ebebf..f422754 100644 --- a/xen/common/libfdt/fdt_sw.c +++ b/xen/common/libfdt/fdt_sw.c @@ -153,7 +153,7 @@ int fdt_begin_node(void *fdt, const char *name) int fdt_end_node(void *fdt) { - uint32_t *en; + fdt32_t *en; FDT_SW_CHECK_HEADER(fdt); @@ -213,7 +213,7 @@ int fdt_property(void *fdt, const char *name, const void *val, int len) int fdt_finish(void *fdt) { char *p = (char *)fdt; - uint32_t *end; + fdt32_t *end; int oldstroffset, newstroffset; uint32_t tag; int offset, nextoffset; diff --git a/xen/common/libfdt/fdt_wip.c b/xen/common/libfdt/fdt_wip.c index 6025fa1..c5bbb68 100644 --- a/xen/common/libfdt/fdt_wip.c +++ b/xen/common/libfdt/fdt_wip.c @@ -74,7 +74,7 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, static void _fdt_nop_region(void *start, int len) { - uint32_t *p; + fdt32_t *p; for (p = start; (char *)p < ((char *)start + len); p++) *p = cpu_to_fdt32(FDT_NOP); diff --git a/xen/common/libfdt/version.lds b/xen/common/libfdt/version.lds index 3c3994e..80b322b 100644 --- a/xen/common/libfdt/version.lds +++ b/xen/common/libfdt/version.lds @@ -48,6 +48,12 @@ LIBFDT_1.2 { fdt_strerror; fdt_offset_ptr; fdt_next_tag; + fdt_appendprop; + fdt_create_empty_tree; + fdt_first_property_offset; + fdt_get_property_by_offset; + fdt_getprop_by_offset; + fdt_next_property_offset; local: *; diff --git a/xen/include/xen/libfdt/fdt.h b/xen/include/xen/libfdt/fdt.h index 48ccfd9..526aedb 100644 --- a/xen/include/xen/libfdt/fdt.h +++ b/xen/include/xen/libfdt/fdt.h @@ -1,48 +1,99 @@ #ifndef _FDT_H #define _FDT_H +/* + * libfdt - Flat Device Tree manipulation + * Copyright (C) 2006 David Gibson, IBM Corporation. + * Copyright 2012 Kim Phillips, Freescale Semiconductor. + * + * libfdt is dual licensed: you can use it either under the terms of + * the GPL, or the BSD license, at your option. + * + * a) This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this library; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + * + * Alternatively, + * + * b) Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * 1. Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ #ifndef __ASSEMBLY__ struct fdt_header { - uint32_t magic; /* magic word FDT_MAGIC */ - uint32_t totalsize; /* total size of DT block */ - uint32_t off_dt_struct; /* offset to structure */ - uint32_t off_dt_strings; /* offset to strings */ - uint32_t off_mem_rsvmap; /* offset to memory reserve map */ - uint32_t version; /* format version */ - uint32_t last_comp_version; /* last compatible version */ + fdt32_t magic; /* magic word FDT_MAGIC */ + fdt32_t totalsize; /* total size of DT block */ + fdt32_t off_dt_struct; /* offset to structure */ + fdt32_t off_dt_strings; /* offset to strings */ + fdt32_t off_mem_rsvmap; /* offset to memory reserve map */ + fdt32_t version; /* format version */ + fdt32_t last_comp_version; /* last compatible version */ /* version 2 fields below */ - uint32_t boot_cpuid_phys; /* Which physical CPU id we're + fdt32_t boot_cpuid_phys; /* Which physical CPU id we're booting on */ /* version 3 fields below */ - uint32_t size_dt_strings; /* size of the strings block */ + fdt32_t size_dt_strings; /* size of the strings block */ /* version 17 fields below */ - uint32_t size_dt_struct; /* size of the structure block */ + fdt32_t size_dt_struct; /* size of the structure block */ }; struct fdt_reserve_entry { - uint64_t address; - uint64_t size; + fdt64_t address; + fdt64_t size; }; struct fdt_node_header { - uint32_t tag; + fdt32_t tag; char name[0]; }; struct fdt_property { - uint32_t tag; - uint32_t len; - uint32_t nameoff; + fdt32_t tag; + fdt32_t len; + fdt32_t nameoff; char data[0]; }; #endif /* !__ASSEMBLY */ #define FDT_MAGIC 0xd00dfeed /* 4: version, 4: total size */ -#define FDT_TAGSIZE sizeof(uint32_t) +#define FDT_TAGSIZE sizeof(fdt32_t) #define FDT_BEGIN_NODE 0x1 /* Start node: full name */ #define FDT_END_NODE 0x2 /* End node */ @@ -51,10 +102,10 @@ struct fdt_property { #define FDT_NOP 0x4 /* nop */ #define FDT_END 0x9 -#define FDT_V1_SIZE (7*sizeof(uint32_t)) -#define FDT_V2_SIZE (FDT_V1_SIZE + sizeof(uint32_t)) -#define FDT_V3_SIZE (FDT_V2_SIZE + sizeof(uint32_t)) +#define FDT_V1_SIZE (7*sizeof(fdt32_t)) +#define FDT_V2_SIZE (FDT_V1_SIZE + sizeof(fdt32_t)) +#define FDT_V3_SIZE (FDT_V2_SIZE + sizeof(fdt32_t)) #define FDT_V16_SIZE FDT_V3_SIZE -#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(uint32_t)) +#define FDT_V17_SIZE (FDT_V16_SIZE + sizeof(fdt32_t)) #endif /* _FDT_H */ diff --git a/xen/include/xen/libfdt/libfdt.h b/xen/include/xen/libfdt/libfdt.h index 6086047..37349f1 100644 --- a/xen/include/xen/libfdt/libfdt.h +++ b/xen/include/xen/libfdt/libfdt.h @@ -136,6 +136,28 @@ uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset); int fdt_next_node(const void *fdt, int offset, int *depth); +/** + * fdt_first_subnode() - get offset of first direct subnode + * + * @fdt: FDT blob + * @offset: Offset of node to check + * @return offset of first subnode, or -FDT_ERR_NOTFOUND if there is none + */ +int fdt_first_subnode(const void *fdt, int offset); + +/** + * fdt_next_subnode() - get offset of next direct subnode + * + * After first calling fdt_first_subnode(), call this function repeatedly to + * get direct subnodes of a parent node. + * + * @fdt: FDT blob + * @offset: Offset of previous subnode + * @return offset of next subnode, or -FDT_ERR_NOTFOUND if there are no more + * subnodes + */ +int fdt_next_subnode(const void *fdt, int offset); + /**********************************************************************/ /* General functions */ /**********************************************************************/ @@ -582,7 +604,7 @@ const char *fdt_get_alias_namelen(const void *fdt, * value of the property named 'name' in the node /aliases. * * returns: - * a pointer to the expansion of the alias named 'name', of it exists + * a pointer to the expansion of the alias named 'name', if it exists * NULL, if the given alias or the /aliases node does not exist */ const char *fdt_get_alias(const void *fdt, const char *name); @@ -816,6 +838,20 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset, int fdt_node_offset_by_compatible(const void *fdt, int startoffset, const char *compatible); +/** + * fdt_stringlist_contains - check a string list property for a string + * @strlist: Property containing a list of strings to check + * @listlen: Length of property + * @str: String to search for + * + * This is a utility function provided for convenience. The list contains + * one or more strings, each terminated by \0, as is found in a device tree + * "compatible" property. + * + * @return: 1 if the string is found in the list, 0 not found, or invalid list + */ +int fdt_stringlist_contains(const char *strlist, int listlen, const char *str); + /**********************************************************************/ /* Write-in-place functions */ /**********************************************************************/ @@ -852,17 +888,17 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, const void *val, int len); /** - * fdt_setprop_inplace_cell - change the value of a single-cell property + * fdt_setprop_inplace_u32 - change the value of a 32-bit integer property * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to change * @name: name of the property to change - * @val: cell (32-bit integer) value to replace the property with + * @val: 32-bit integer value to replace the property with * - * fdt_setprop_inplace_cell() replaces the value of a given property - * with the 32-bit integer cell value in val, converting val to - * big-endian if necessary. This function cannot change the size of a - * property, and so will only work if the property already exists and - * has length 4. + * fdt_setprop_inplace_u32() replaces the value of a given property + * with the 32-bit integer value in val, converting val to big-endian + * if necessary. This function cannot change the size of a property, + * and so will only work if the property already exists and has length + * 4. * * This function will alter only the bytes in the blob which contain * the given property value, and will not alter or move any other part @@ -871,7 +907,42 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, * returns: * 0, on success * -FDT_ERR_NOSPACE, if the property's length is not equal to 4 - * -FDT_ERR_NOTFOUND, node does not have the named property + * -FDT_ERR_NOTFOUND, node does not have the named property + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_setprop_inplace_u32(void *fdt, int nodeoffset, + const char *name, uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_setprop_inplace(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_inplace_u64 - change the value of a 64-bit integer property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 64-bit integer value to replace the property with + * + * fdt_setprop_inplace_u64() replaces the value of a given property + * with the 64-bit integer value in val, converting val to big-endian + * if necessary. This function cannot change the size of a property, + * and so will only work if the property already exists and has length + * 8. + * + * This function will alter only the bytes in the blob which contain + * the given property value, and will not alter or move any other part + * of the tree. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, if the property's length is not equal to 8 + * -FDT_ERR_NOTFOUND, node does not have the named property * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag * -FDT_ERR_BADMAGIC, * -FDT_ERR_BADVERSION, @@ -879,11 +950,22 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name, * -FDT_ERR_BADSTRUCTURE, * -FDT_ERR_TRUNCATED, standard meanings */ +static inline int fdt_setprop_inplace_u64(void *fdt, int nodeoffset, + const char *name, uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_setprop_inplace(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_inplace_cell - change the value of a single-cell property + * + * This is an alternative name for fdt_setprop_inplace_u32() + */ static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset, const char *name, uint32_t val) { - val = cpu_to_fdt32(val); - return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val)); + return fdt_setprop_inplace_u32(fdt, nodeoffset, name, val); } /** @@ -945,10 +1027,19 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size); int fdt_finish_reservemap(void *fdt); int fdt_begin_node(void *fdt, const char *name); int fdt_property(void *fdt, const char *name, const void *val, int len); +static inline int fdt_property_u32(void *fdt, const char *name, uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_property(fdt, name, &tmp, sizeof(tmp)); +} +static inline int fdt_property_u64(void *fdt, const char *name, uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_property(fdt, name, &tmp, sizeof(tmp)); +} static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val) { - val = cpu_to_fdt32(val); - return fdt_property(fdt, name, &val, sizeof(val)); + return fdt_property_u32(fdt, name, val); } #define fdt_property_string(fdt, name, str) \ fdt_property(fdt, name, str, strlen(str)+1) @@ -959,6 +1050,7 @@ int fdt_finish(void *fdt); /* Read-write functions */ /**********************************************************************/ +int fdt_create_empty_tree(void *buf, int bufsize); int fdt_open_into(const void *fdt, void *buf, int bufsize); int fdt_pack(void *fdt); @@ -1068,14 +1160,14 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, const void *val, int len); /** - * fdt_setprop_cell - set a property to a single cell value + * fdt_setprop_u32 - set a property to a 32-bit integer * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to change * @name: name of the property to change * @val: 32-bit integer value for the property (native endian) * - * fdt_setprop_cell() sets the value of the named property in the - * given node to the given cell value (converting to big-endian if + * fdt_setprop_u32() sets the value of the named property in the given + * node to the given 32-bit integer value (converting to big-endian if * necessary), or creates a new property with that value if it does * not already exist. * @@ -1095,11 +1187,57 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, * -FDT_ERR_BADLAYOUT, * -FDT_ERR_TRUNCATED, standard meanings */ +static inline int fdt_setprop_u32(void *fdt, int nodeoffset, const char *name, + uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_u64 - set a property to a 64-bit integer + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 64-bit integer value for the property (native endian) + * + * fdt_setprop_u64() sets the value of the named property in the given + * node to the given 64-bit integer value (converting to big-endian if + * necessary), or creates a new property with that value if it does + * not already exist. + * + * This function may insert or delete data from the blob, and will + * therefore change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_setprop_u64(void *fdt, int nodeoffset, const char *name, + uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_setprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_setprop_cell - set a property to a single cell value + * + * This is an alternative name for fdt_setprop_u32() + */ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name, uint32_t val) { - val = cpu_to_fdt32(val); - return fdt_setprop(fdt, nodeoffset, name, &val, sizeof(val)); + return fdt_setprop_u32(fdt, nodeoffset, name, val); } /** @@ -1134,6 +1272,147 @@ static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name, fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) /** + * fdt_appendprop - append to or create a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to append to + * @val: pointer to data to append to the property value + * @len: length of the data to append to the property value + * + * fdt_appendprop() appends the value to the named property in the + * given node, creating the property if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +int fdt_appendprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len); + +/** + * fdt_appendprop_u32 - append a 32-bit integer value to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 32-bit integer value to append to the property (native endian) + * + * fdt_appendprop_u32() appends the given 32-bit integer value + * (converting to big-endian if necessary) to the value of the named + * property in the given node, or creates a new property with that + * value if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_appendprop_u32(void *fdt, int nodeoffset, + const char *name, uint32_t val) +{ + fdt32_t tmp = cpu_to_fdt32(val); + return fdt_appendprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_appendprop_u64 - append a 64-bit integer value to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @val: 64-bit integer value to append to the property (native endian) + * + * fdt_appendprop_u64() appends the given 64-bit integer value + * (converting to big-endian if necessary) to the value of the named + * property in the given node, or creates a new property with that + * value if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +static inline int fdt_appendprop_u64(void *fdt, int nodeoffset, + const char *name, uint64_t val) +{ + fdt64_t tmp = cpu_to_fdt64(val); + return fdt_appendprop(fdt, nodeoffset, name, &tmp, sizeof(tmp)); +} + +/** + * fdt_appendprop_cell - append a single cell value to a property + * + * This is an alternative name for fdt_appendprop_u32() + */ +static inline int fdt_appendprop_cell(void *fdt, int nodeoffset, + const char *name, uint32_t val) +{ + return fdt_appendprop_u32(fdt, nodeoffset, name, val); +} + +/** + * fdt_appendprop_string - append a string to a property + * @fdt: pointer to the device tree blob + * @nodeoffset: offset of the node whose property to change + * @name: name of the property to change + * @str: string value to append to the property + * + * fdt_appendprop_string() appends the given string to the value of + * the named property in the given node, or creates a new property + * with that value if it does not already exist. + * + * This function may insert data into the blob, and will therefore + * change the offsets of some existing nodes. + * + * returns: + * 0, on success + * -FDT_ERR_NOSPACE, there is insufficient free space in the blob to + * contain the new property value + * -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_BADMAGIC, + * -FDT_ERR_BADVERSION, + * -FDT_ERR_BADSTATE, + * -FDT_ERR_BADSTRUCTURE, + * -FDT_ERR_BADLAYOUT, + * -FDT_ERR_TRUNCATED, standard meanings + */ +#define fdt_appendprop_string(fdt, nodeoffset, name, str) \ + fdt_appendprop((fdt), (nodeoffset), (name), (str), strlen(str)+1) + +/** * fdt_delprop - delete a property * @fdt: pointer to the device tree blob * @nodeoffset: offset of the node whose property to nop diff --git a/xen/include/xen/libfdt/libfdt_env.h b/xen/include/xen/libfdt/libfdt_env.h index 2f1b03c..89a794b 100644 --- a/xen/include/xen/libfdt/libfdt_env.h +++ b/xen/include/xen/libfdt/libfdt_env.h @@ -6,6 +6,10 @@ #include #include +typedef uint16_t fdt16_t; +typedef uint32_t fdt32_t; +typedef uint64_t fdt64_t; + #define fdt16_to_cpu(x) be16_to_cpu(x) #define cpu_to_fdt16(x) cpu_to_be16(x) #define fdt32_to_cpu(x) be32_to_cpu(x) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMy-0005ck-Kl; Tue, 23 Sep 2014 16:55:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMx-0005cE-5C for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:15 +0000 Received: from [85.158.139.211:7515] by server-7.bemta-5.messagelabs.com id A0/A1-30869-1F5A1245; Tue, 23 Sep 2014 16:55:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1411491310!8168794!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4662 invoked from network); 23 Sep 2014 16:55:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMl-0002UA-98 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTMl-0002wS-3Y for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:03 +0000 Date: Tue, 23 Sep 2014 16:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] add arm64 cache flushing code from linux v3.16 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e97883eea45c6188506f8ca21fe9f3b095f6a27 Author: Roy Franz AuthorDate: Thu Sep 18 15:50:04 2014 -0700 Commit: Ian Campbell CommitDate: Mon Sep 22 11:57:16 2014 +0100 add arm64 cache flushing code from linux v3.16 __flush_dcache_all added from arch/arm64/mm/cache.S, with helper macros from arch/arm64/include/asm/assembler.h, from v3.16. The cache flushing is required when transitioning from EFI code that runs with cache enable to Xen startup code which expects the cache to be disabled. Signed-off-by: Roy Franz Acked-by: Ian Campbell [ ijc -- removed indent on ENTRY() and dropped the entry point label which duplicates the one from the macro. ] --- xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/cache.S | 99 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index d2d5875..c7243f5 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -7,5 +7,6 @@ obj-y += domain.o obj-y += vfp.o obj-y += smpboot.o obj-y += domctl.o +obj-y += cache.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S new file mode 100644 index 0000000..a445cbf --- /dev/null +++ b/xen/arch/arm/arm64/cache.S @@ -0,0 +1,99 @@ +/* + * Cache maintenance + * + * Copyright (C) 2001 Deep Blue Solutions Ltd. + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 1996-2000 Russell King + * Copyright (C) 2012 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * Enable and disable interrupts. + */ + .macro disable_irq + msr daifset, #2 + .endm + + .macro enable_irq + msr daifclr, #2 + .endm + +/* + * Save/disable and restore interrupts. + */ + .macro save_and_disable_irqs, olddaif + mrs \olddaif, daif + disable_irq + .endm + + .macro restore_irqs, olddaif + msr daif, \olddaif + .endm + +/* + * __flush_dcache_all() + * + * Flush the whole D-cache. + * + * Corrupted registers: x0-x7, x9-x11 + */ +ENTRY(__flush_dcache_all) + dmb sy // ensure ordering with previous memory accesses + mrs x0, clidr_el1 // read clidr + and x3, x0, #0x7000000 // extract loc from clidr + lsr x3, x3, #23 // left align loc bit field + cbz x3, finished // if loc is 0, then no need to clean + mov x10, #0 // start clean at cache level 0 +loop1: + add x2, x10, x10, lsr #1 // work out 3x current cache level + lsr x1, x0, x2 // extract cache type bits from clidr + and x1, x1, #7 // mask of the bits for current cache only + cmp x1, #2 // see what cache we have at this level + b.lt skip // skip if no cache, or just i-cache + save_and_disable_irqs x9 // make CSSELR and CCSIDR access atomic + msr csselr_el1, x10 // select current cache level in csselr + isb // isb to sych the new cssr&csidr + mrs x1, ccsidr_el1 // read the new ccsidr + restore_irqs x9 + and x2, x1, #7 // extract the length of the cache lines + add x2, x2, #4 // add 4 (line length offset) + mov x4, #0x3ff + and x4, x4, x1, lsr #3 // find maximum number on the way size + clz w5, w4 // find bit position of way size increment + mov x7, #0x7fff + and x7, x7, x1, lsr #13 // extract max number of the index size +loop2: + mov x9, x4 // create working copy of max way size +loop3: + lsl x6, x9, x5 + orr x11, x10, x6 // factor way and cache number into x11 + lsl x6, x7, x2 + orr x11, x11, x6 // factor index number into x11 + dc cisw, x11 // clean & invalidate by set/way + subs x9, x9, #1 // decrement the way + b.ge loop3 + subs x7, x7, #1 // decrement the index + b.ge loop2 +skip: + add x10, x10, #2 // increment cache number + cmp x3, x10 + b.gt loop1 +finished: + mov x10, #0 // swith back to cache level 0 + msr csselr_el1, x10 // select current cache level in csselr + dsb sy + isb + ret +ENDPROC(__flush_dcache_all) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMy-0005ck-Kl; Tue, 23 Sep 2014 16:55:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMx-0005cE-5C for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:15 +0000 Received: from [85.158.139.211:7515] by server-7.bemta-5.messagelabs.com id A0/A1-30869-1F5A1245; Tue, 23 Sep 2014 16:55:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1411491310!8168794!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4662 invoked from network); 23 Sep 2014 16:55:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:11 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTMl-0002UA-98 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTMl-0002wS-3Y for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:03 +0000 Date: Tue, 23 Sep 2014 16:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] add arm64 cache flushing code from linux v3.16 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9e97883eea45c6188506f8ca21fe9f3b095f6a27 Author: Roy Franz AuthorDate: Thu Sep 18 15:50:04 2014 -0700 Commit: Ian Campbell CommitDate: Mon Sep 22 11:57:16 2014 +0100 add arm64 cache flushing code from linux v3.16 __flush_dcache_all added from arch/arm64/mm/cache.S, with helper macros from arch/arm64/include/asm/assembler.h, from v3.16. The cache flushing is required when transitioning from EFI code that runs with cache enable to Xen startup code which expects the cache to be disabled. Signed-off-by: Roy Franz Acked-by: Ian Campbell [ ijc -- removed indent on ENTRY() and dropped the entry point label which duplicates the one from the macro. ] --- xen/arch/arm/arm64/Makefile | 1 + xen/arch/arm/arm64/cache.S | 99 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile index d2d5875..c7243f5 100644 --- a/xen/arch/arm/arm64/Makefile +++ b/xen/arch/arm/arm64/Makefile @@ -7,5 +7,6 @@ obj-y += domain.o obj-y += vfp.o obj-y += smpboot.o obj-y += domctl.o +obj-y += cache.o obj-$(EARLY_PRINTK) += debug.o diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S new file mode 100644 index 0000000..a445cbf --- /dev/null +++ b/xen/arch/arm/arm64/cache.S @@ -0,0 +1,99 @@ +/* + * Cache maintenance + * + * Copyright (C) 2001 Deep Blue Solutions Ltd. + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 1996-2000 Russell King + * Copyright (C) 2012 ARM Ltd. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * Enable and disable interrupts. + */ + .macro disable_irq + msr daifset, #2 + .endm + + .macro enable_irq + msr daifclr, #2 + .endm + +/* + * Save/disable and restore interrupts. + */ + .macro save_and_disable_irqs, olddaif + mrs \olddaif, daif + disable_irq + .endm + + .macro restore_irqs, olddaif + msr daif, \olddaif + .endm + +/* + * __flush_dcache_all() + * + * Flush the whole D-cache. + * + * Corrupted registers: x0-x7, x9-x11 + */ +ENTRY(__flush_dcache_all) + dmb sy // ensure ordering with previous memory accesses + mrs x0, clidr_el1 // read clidr + and x3, x0, #0x7000000 // extract loc from clidr + lsr x3, x3, #23 // left align loc bit field + cbz x3, finished // if loc is 0, then no need to clean + mov x10, #0 // start clean at cache level 0 +loop1: + add x2, x10, x10, lsr #1 // work out 3x current cache level + lsr x1, x0, x2 // extract cache type bits from clidr + and x1, x1, #7 // mask of the bits for current cache only + cmp x1, #2 // see what cache we have at this level + b.lt skip // skip if no cache, or just i-cache + save_and_disable_irqs x9 // make CSSELR and CCSIDR access atomic + msr csselr_el1, x10 // select current cache level in csselr + isb // isb to sych the new cssr&csidr + mrs x1, ccsidr_el1 // read the new ccsidr + restore_irqs x9 + and x2, x1, #7 // extract the length of the cache lines + add x2, x2, #4 // add 4 (line length offset) + mov x4, #0x3ff + and x4, x4, x1, lsr #3 // find maximum number on the way size + clz w5, w4 // find bit position of way size increment + mov x7, #0x7fff + and x7, x7, x1, lsr #13 // extract max number of the index size +loop2: + mov x9, x4 // create working copy of max way size +loop3: + lsl x6, x9, x5 + orr x11, x10, x6 // factor way and cache number into x11 + lsl x6, x7, x2 + orr x11, x11, x6 // factor index number into x11 + dc cisw, x11 // clean & invalidate by set/way + subs x9, x9, #1 // decrement the way + b.ge loop3 + subs x7, x7, #1 // decrement the index + b.ge loop2 +skip: + add x10, x10, #2 // increment cache number + cmp x3, x10 + b.gt loop1 +finished: + mov x10, #0 // swith back to cache level 0 + msr csselr_el1, x10 // select current cache level in csselr + dsb sy + isb + ret +ENDPROC(__flush_dcache_all) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNA-0005f9-T0; Tue, 23 Sep 2014 16:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNA-0005eU-98 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:28 +0000 Received: from [85.158.143.35:24392] by server-1.bemta-4.messagelabs.com id 5F/0B-05872-FF5A1245; Tue, 23 Sep 2014 16:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1411491325!12703203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3344 invoked from network); 23 Sep 2014 16:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTN7-0002UG-M3 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTN7-0002xi-JZ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:25 +0000 Date: Tue, 23 Sep 2014 16:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxc: restore: copy the correct page to memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 035a72faf29eb691542f3fdb7cb347b323c72800 Author: Hong Tao AuthorDate: Mon Sep 22 13:59:13 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:18:15 2014 +0100 tools: libxc: restore: copy the correct page to memory apply_batch() only handles MAX_BATCH_SIZE pages at one time. If there is some bogus/unmapped/allocate-only/broken page, we will skip it. So when we call apply_batch() again, the first page's index is curbatch - invalid_pages. invalid_pages stores the number of bogus/unmapped/allocate-only/broken pages we have found. In many cases, invalid_pages is 0, so we don't catch this error. Signed-off-by: Hong Tao Signed-off-by: Wen Congyang Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b9a56d5..bec716c 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1106,7 +1106,7 @@ static int pagebuf_get(xc_interface *xch, struct restore_ctx *ctx, static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, xen_pfn_t* region_mfn, unsigned long* pfn_type, int pae_extended_cr3, struct xc_mmu* mmu, - pagebuf_t* pagebuf, int curbatch) + pagebuf_t* pagebuf, int curbatch, int *invalid_pages) { int i, j, curpage, nr_mfns; int k, scount; @@ -1121,6 +1121,12 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, struct domain_info_context *dinfo = &ctx->dinfo; int* pfn_err = NULL; int rc = -1; + int local_invalid_pages = 0; + /* We have handled curbatch pages before this batch, and there are + * *invalid_pages pages that are not in pagebuf->pages. So the first + * page for this page is (curbatch - *invalid_pages) page. + */ + int first_page = curbatch - *invalid_pages; unsigned long mfn, pfn, pagetype; @@ -1293,10 +1299,13 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, pfn = pagebuf->pfn_types[i + curbatch] & ~XEN_DOMCTL_PFINFO_LTAB_MASK; pagetype = pagebuf->pfn_types[i + curbatch] & XEN_DOMCTL_PFINFO_LTAB_MASK; - if ( pagetype == XEN_DOMCTL_PFINFO_XTAB + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || pagetype == XEN_DOMCTL_PFINFO_XALLOC) + { + local_invalid_pages++; /* a bogus/unmapped/allocate-only page: skip it */ continue; + } if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) { @@ -1306,6 +1315,8 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, "dom=%d, pfn=%lx\n", dom, pfn); goto err_mapped; } + + local_invalid_pages++; continue; } @@ -1344,7 +1355,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, } } else - memcpy(page, pagebuf->pages + (curpage + curbatch) * PAGE_SIZE, + memcpy(page, pagebuf->pages + (first_page + curpage) * PAGE_SIZE, PAGE_SIZE); pagetype &= XEN_DOMCTL_PFINFO_LTABTYPE_MASK; @@ -1418,6 +1429,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, } /* end of 'batch' for loop */ rc = nraces; + *invalid_pages += local_invalid_pages; err_mapped: munmap(region_base, j*PAGE_SIZE); @@ -1621,7 +1633,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, loadpages: for ( ; ; ) { - int j, curbatch; + int j, curbatch, invalid_pages; xc_report_progress_step(xch, n, dinfo->p2m_size); @@ -1665,11 +1677,13 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, /* break pagebuf into batches */ curbatch = 0; + invalid_pages = 0; while ( curbatch < j ) { int brc; brc = apply_batch(xch, dom, ctx, region_mfn, pfn_type, - pae_extended_cr3, mmu, &pagebuf, curbatch); + pae_extended_cr3, mmu, &pagebuf, curbatch, + &invalid_pages); if ( brc < 0 ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNA-0005f9-T0; Tue, 23 Sep 2014 16:55:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNA-0005eU-98 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:28 +0000 Received: from [85.158.143.35:24392] by server-1.bemta-4.messagelabs.com id 5F/0B-05872-FF5A1245; Tue, 23 Sep 2014 16:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1411491325!12703203!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3344 invoked from network); 23 Sep 2014 16:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTN7-0002UG-M3 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTN7-0002xi-JZ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:25 +0000 Date: Tue, 23 Sep 2014 16:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxc: restore: copy the correct page to memory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 035a72faf29eb691542f3fdb7cb347b323c72800 Author: Hong Tao AuthorDate: Mon Sep 22 13:59:13 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:18:15 2014 +0100 tools: libxc: restore: copy the correct page to memory apply_batch() only handles MAX_BATCH_SIZE pages at one time. If there is some bogus/unmapped/allocate-only/broken page, we will skip it. So when we call apply_batch() again, the first page's index is curbatch - invalid_pages. invalid_pages stores the number of bogus/unmapped/allocate-only/broken pages we have found. In many cases, invalid_pages is 0, so we don't catch this error. Signed-off-by: Hong Tao Signed-off-by: Wen Congyang Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index b9a56d5..bec716c 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1106,7 +1106,7 @@ static int pagebuf_get(xc_interface *xch, struct restore_ctx *ctx, static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, xen_pfn_t* region_mfn, unsigned long* pfn_type, int pae_extended_cr3, struct xc_mmu* mmu, - pagebuf_t* pagebuf, int curbatch) + pagebuf_t* pagebuf, int curbatch, int *invalid_pages) { int i, j, curpage, nr_mfns; int k, scount; @@ -1121,6 +1121,12 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, struct domain_info_context *dinfo = &ctx->dinfo; int* pfn_err = NULL; int rc = -1; + int local_invalid_pages = 0; + /* We have handled curbatch pages before this batch, and there are + * *invalid_pages pages that are not in pagebuf->pages. So the first + * page for this page is (curbatch - *invalid_pages) page. + */ + int first_page = curbatch - *invalid_pages; unsigned long mfn, pfn, pagetype; @@ -1293,10 +1299,13 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, pfn = pagebuf->pfn_types[i + curbatch] & ~XEN_DOMCTL_PFINFO_LTAB_MASK; pagetype = pagebuf->pfn_types[i + curbatch] & XEN_DOMCTL_PFINFO_LTAB_MASK; - if ( pagetype == XEN_DOMCTL_PFINFO_XTAB + if ( pagetype == XEN_DOMCTL_PFINFO_XTAB || pagetype == XEN_DOMCTL_PFINFO_XALLOC) + { + local_invalid_pages++; /* a bogus/unmapped/allocate-only page: skip it */ continue; + } if ( pagetype == XEN_DOMCTL_PFINFO_BROKEN ) { @@ -1306,6 +1315,8 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, "dom=%d, pfn=%lx\n", dom, pfn); goto err_mapped; } + + local_invalid_pages++; continue; } @@ -1344,7 +1355,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, } } else - memcpy(page, pagebuf->pages + (curpage + curbatch) * PAGE_SIZE, + memcpy(page, pagebuf->pages + (first_page + curpage) * PAGE_SIZE, PAGE_SIZE); pagetype &= XEN_DOMCTL_PFINFO_LTABTYPE_MASK; @@ -1418,6 +1429,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, } /* end of 'batch' for loop */ rc = nraces; + *invalid_pages += local_invalid_pages; err_mapped: munmap(region_base, j*PAGE_SIZE); @@ -1621,7 +1633,7 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, loadpages: for ( ; ; ) { - int j, curbatch; + int j, curbatch, invalid_pages; xc_report_progress_step(xch, n, dinfo->p2m_size); @@ -1665,11 +1677,13 @@ int xc_domain_restore(xc_interface *xch, int io_fd, uint32_t dom, /* break pagebuf into batches */ curbatch = 0; + invalid_pages = 0; while ( curbatch < j ) { int brc; brc = apply_batch(xch, dom, ctx, region_mfn, pfn_type, - pae_extended_cr3, mmu, &pagebuf, curbatch); + pae_extended_cr3, mmu, &pagebuf, curbatch, + &invalid_pages); if ( brc < 0 ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNL-0005he-0S; Tue, 23 Sep 2014 16:55:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNK-0005hO-1b for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:38 +0000 Received: from [85.158.143.35:20225] by server-1.bemta-4.messagelabs.com id AD/3B-05872-906A1245; Tue, 23 Sep 2014 16:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1411491336!12691970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23555 invoked from network); 23 Sep 2014 16:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNH-0002UX-Rw for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNH-0002y8-Pa for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:35 +0000 Date: Tue, 23 Sep 2014 16:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxc: restore: csum the correct 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 3460eeb3fc2811efcf2e8ac13a0882ab72ef92bc Author: Wen Congyang AuthorDate: Mon Sep 22 13:59:14 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:18:19 2014 +0100 tools: libxc: restore: csum the correct page In verify mode, we map the guest memory, and the guest page is region_base + i * PAGE_SIZE. So we should csum page (region_base + i * PAGE_SIZE), not (region_base + (i+curbatch) * PAGE_SIZE) Signed-off-by: Wen Congyang Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index bec716c..fb4ddfc 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1405,7 +1405,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, DPRINTF("************** pfn=%lx type=%lx gotcs=%08lx " "actualcs=%08lx\n", pfn, pagebuf->pfn_types[pfn], - csum_page(region_base + (i + curbatch)*PAGE_SIZE), + csum_page(region_base + i * PAGE_SIZE), csum_page(buf)); for ( v = 0; v < 4; v++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNL-0005he-0S; Tue, 23 Sep 2014 16:55:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNK-0005hO-1b for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:38 +0000 Received: from [85.158.143.35:20225] by server-1.bemta-4.messagelabs.com id AD/3B-05872-906A1245; Tue, 23 Sep 2014 16:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1411491336!12691970!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23555 invoked from network); 23 Sep 2014 16:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNH-0002UX-Rw for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNH-0002y8-Pa for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:35 +0000 Date: Tue, 23 Sep 2014 16:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxc: restore: csum the correct 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 3460eeb3fc2811efcf2e8ac13a0882ab72ef92bc Author: Wen Congyang AuthorDate: Mon Sep 22 13:59:14 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:18:19 2014 +0100 tools: libxc: restore: csum the correct page In verify mode, we map the guest memory, and the guest page is region_base + i * PAGE_SIZE. So we should csum page (region_base + i * PAGE_SIZE), not (region_base + (i+curbatch) * PAGE_SIZE) Signed-off-by: Wen Congyang Acked-by: Ian Campbell --- tools/libxc/xc_domain_restore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_domain_restore.c b/tools/libxc/xc_domain_restore.c index bec716c..fb4ddfc 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1405,7 +1405,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, DPRINTF("************** pfn=%lx type=%lx gotcs=%08lx " "actualcs=%08lx\n", pfn, pagebuf->pfn_types[pfn], - csum_page(region_base + (i + curbatch)*PAGE_SIZE), + csum_page(region_base + i * PAGE_SIZE), csum_page(buf)); for ( v = 0; v < 4; v++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55: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 1XWTNV-0005jj-35; Tue, 23 Sep 2014 16:55:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNU-0005jS-Df for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:48 +0000 Received: from [193.109.254.147:16359] by server-4.bemta-14.messagelabs.com id C3/87-01677-316A1245; Tue, 23 Sep 2014 16:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1411491346!12520086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23899 invoked from network); 23 Sep 2014 16:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNS-0002Ub-0n for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNR-0002yU-VE for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:45 +0000 Date: Tue, 23 Sep 2014 16:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: pass correct file to qemu if we use blktap2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16529572dfa4968ef073f57ffda58f304d354ce0 Author: Wen Congyang AuthorDate: Mon Sep 22 13:59:15 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:19:04 2014 +0100 tools: libxl: pass correct file to qemu if we use blktap2 If we use blktap2, the correct file should be blktap device not the pdev_path. Signed-off-by: Wen Congyang Cc: Shriram Rajagopalan Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 103cbca..fbc82fd 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -718,6 +718,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__device_disk_dev_number(disks[i].vdev, &disk, &part); const char *format = qemu_disk_format_string(disks[i].format); char *drive; + const char *pdev_path; if (dev_number == -1) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "unable to determine" @@ -747,6 +748,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, continue; } + if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) + pdev_path = libxl__blktap_devpath(gc, disks[i].pdev_path, + disks[i].format); + else + pdev_path = disks[i].pdev_path; + /* * Explicit sd disks are passed through as is. * @@ -756,11 +763,11 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (strncmp(disks[i].vdev, "sd", 2) == 0) drive = libxl__sprintf (gc, "file=%s,if=scsi,bus=0,unit=%d,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + pdev_path, disk, format); else if (disk < 4) drive = libxl__sprintf (gc, "file=%s,if=ide,index=%d,media=disk,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + pdev_path, disk, format); else continue; /* Do not emulate this disk */ } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55: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 1XWTNV-0005jj-35; Tue, 23 Sep 2014 16:55:49 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNU-0005jS-Df for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:48 +0000 Received: from [193.109.254.147:16359] by server-4.bemta-14.messagelabs.com id C3/87-01677-316A1245; Tue, 23 Sep 2014 16:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1411491346!12520086!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23899 invoked from network); 23 Sep 2014 16:55:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:47 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNS-0002Ub-0n for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNR-0002yU-VE for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:45 +0000 Date: Tue, 23 Sep 2014 16:55:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: pass correct file to qemu if we use blktap2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 16529572dfa4968ef073f57ffda58f304d354ce0 Author: Wen Congyang AuthorDate: Mon Sep 22 13:59:15 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:19:04 2014 +0100 tools: libxl: pass correct file to qemu if we use blktap2 If we use blktap2, the correct file should be blktap device not the pdev_path. Signed-off-by: Wen Congyang Cc: Shriram Rajagopalan Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 103cbca..fbc82fd 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -718,6 +718,7 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, libxl__device_disk_dev_number(disks[i].vdev, &disk, &part); const char *format = qemu_disk_format_string(disks[i].format); char *drive; + const char *pdev_path; if (dev_number == -1) { LIBXL__LOG(ctx, LIBXL__LOG_WARNING, "unable to determine" @@ -747,6 +748,12 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, continue; } + if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) + pdev_path = libxl__blktap_devpath(gc, disks[i].pdev_path, + disks[i].format); + else + pdev_path = disks[i].pdev_path; + /* * Explicit sd disks are passed through as is. * @@ -756,11 +763,11 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (strncmp(disks[i].vdev, "sd", 2) == 0) drive = libxl__sprintf (gc, "file=%s,if=scsi,bus=0,unit=%d,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + pdev_path, disk, format); else if (disk < 4) drive = libxl__sprintf (gc, "file=%s,if=ide,index=%d,media=disk,format=%s,cache=writeback", - disks[i].pdev_path, disk, format); + pdev_path, disk, format); else continue; /* Do not emulate this disk */ } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNf-0005lq-5i; Tue, 23 Sep 2014 16:55:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNe-0005lY-Gq for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:58 +0000 Received: from [193.109.254.147:16950] by server-12.bemta-14.messagelabs.com id FC/9B-01461-D16A1245; Tue, 23 Sep 2014 16:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1411491356!12564975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3091 invoked from network); 23 Sep 2014 16:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNc-0002Uj-6q for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNc-0002yv-5I for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:56 +0000 Date: Tue, 23 Sep 2014 16:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: read nictype from xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 498da5bf3d41e1155c98e9cff3090b114d837fc9 Author: Wen Congyang AuthorDate: Mon Sep 22 13:59:16 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:19:54 2014 +0100 tools: libxl: read nictype from xenstore We need to use nictype to get default vifname. Signed-off-by: Wen Congyang Acked-by: Ian Campbell --- tools/libxl/libxl.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f796da8..77672d0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3348,7 +3348,13 @@ static int libxl__device_nic_from_xs_be(libxl__gc *gc, nic->script = READ_BACKEND(NOGC, "script"); /* vif_ioemu nics use the same xenstore entries as vif interfaces */ - nic->nictype = LIBXL_NIC_TYPE_VIF; + tmp = READ_BACKEND(gc, "type"); + if (tmp) { + rc = libxl_nic_type_from_string(tmp, &nic->nictype); + if (rc) goto out; + } else { + nic->nictype = LIBXL_NIC_TYPE_VIF; + } nic->model = NULL; /* XXX Only for TYPE_IOEMU */ nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNf-0005lq-5i; Tue, 23 Sep 2014 16:55:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNe-0005lY-Gq for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:58 +0000 Received: from [193.109.254.147:16950] by server-12.bemta-14.messagelabs.com id FC/9B-01461-D16A1245; Tue, 23 Sep 2014 16:55:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1411491356!12564975!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3091 invoked from network); 23 Sep 2014 16:55:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:55:57 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNc-0002Uj-6q for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNc-0002yv-5I for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:55:56 +0000 Date: Tue, 23 Sep 2014 16:55:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: libxl: read nictype from xenstore X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 498da5bf3d41e1155c98e9cff3090b114d837fc9 Author: Wen Congyang AuthorDate: Mon Sep 22 13:59:16 2014 +0800 Commit: Ian Campbell CommitDate: Mon Sep 22 15:19:54 2014 +0100 tools: libxl: read nictype from xenstore We need to use nictype to get default vifname. Signed-off-by: Wen Congyang Acked-by: Ian Campbell --- tools/libxl/libxl.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f796da8..77672d0 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -3348,7 +3348,13 @@ static int libxl__device_nic_from_xs_be(libxl__gc *gc, nic->script = READ_BACKEND(NOGC, "script"); /* vif_ioemu nics use the same xenstore entries as vif interfaces */ - nic->nictype = LIBXL_NIC_TYPE_VIF; + tmp = READ_BACKEND(gc, "type"); + if (tmp) { + rc = libxl_nic_type_from_string(tmp, &nic->nictype); + if (rc) goto out; + } else { + nic->nictype = LIBXL_NIC_TYPE_VIF; + } nic->model = NULL; /* XXX Only for TYPE_IOEMU */ nic->ifname = NULL; /* XXX Only for TYPE_IOEMU */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNq-0005oM-8d; Tue, 23 Sep 2014 16:56:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNo-0005o3-Mp for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:08 +0000 Received: from [193.109.254.147:36172] by server-4.bemta-14.messagelabs.com id BC/C7-01677-826A1245; Tue, 23 Sep 2014 16:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1411491366!9226609!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32730 invoked from network); 23 Sep 2014 16:56:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNm-0002VO-C5 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNm-0002zb-AO for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:06 +0000 Date: Tue, 23 Sep 2014 16:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename p2m->first_level to p2m->root. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1171aa90994d1570757217a103c8f649a4480dcb Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:47 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:31 2014 +0100 xen: arm: rename p2m->first_level to p2m->root. This was previously part of Vijaya's "xen/arm: Add 4-level page table for stage 2 translation" but is split out here to make that patch easier to read. I went with ->root rather than ->root_level as the original did. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Cc: Vijaya Kumar K --- xen/arch/arm/p2m.c | 24 ++++++++++++------------ xen/drivers/passthrough/arm/smmu.c | 2 +- xen/include/asm-arm/p2m.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index a7dcdf5..8061e06 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -12,8 +12,8 @@ #include /* First level P2M is 2 consecutive pages */ -#define P2M_FIRST_ORDER 1 -#define P2M_FIRST_ENTRIES (LPAE_ENTRIES<first_level, page_to_mfn(p2m->first_level)); + p2m->root, page_to_mfn(p2m->root)); - first = __map_domain_page(p2m->first_level); + first = __map_domain_page(p2m->root); dump_pt_walk(first, addr); unmap_domain_page(first); } @@ -141,10 +141,10 @@ static lpae_t *p2m_map_first(struct p2m_domain *p2m, paddr_t addr) { struct page_info *page; - if ( first_linear_offset(addr) >= P2M_FIRST_ENTRIES ) + if ( first_linear_offset(addr) >= P2M_ROOT_ENTRIES ) return NULL; - page = p2m->first_level + p2m_first_level_index(addr); + page = p2m->root + p2m_first_level_index(addr); return __map_domain_page(page); } @@ -958,7 +958,7 @@ int p2m_alloc_table(struct domain *d) struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page; - page = alloc_domheap_pages(NULL, P2M_FIRST_ORDER, 0); + page = alloc_domheap_pages(NULL, P2M_ROOT_ORDER, 0); if ( page == NULL ) return -ENOMEM; @@ -968,9 +968,9 @@ int p2m_alloc_table(struct domain *d) clear_and_clean_page(page); clear_and_clean_page(page + 1); - p2m->first_level = page; + p2m->root = page; - d->arch.vttbr = page_to_maddr(p2m->first_level) + d->arch.vttbr = page_to_maddr(p2m->root) | ((uint64_t)p2m->vmid&0xff)<<48; /* Make sure that all TLBs corresponding to the new VMID are flushed @@ -1047,9 +1047,9 @@ void p2m_teardown(struct domain *d) while ( (pg = page_list_remove_head(&p2m->pages)) ) free_domheap_page(pg); - free_domheap_pages(p2m->first_level, P2M_FIRST_ORDER); + free_domheap_pages(p2m->root, P2M_ROOT_ORDER); - p2m->first_level = NULL; + p2m->root = NULL; p2m_free_vmid(d); @@ -1073,7 +1073,7 @@ int p2m_init(struct domain *d) d->arch.vttbr = 0; - p2m->first_level = NULL; + p2m->root = NULL; p2m->max_mapped_gfn = 0; p2m->lowest_mapped_gfn = ULONG_MAX; diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 21b4572..3cbd206 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -937,7 +937,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain_cfg *cfg) paddr_t p2maddr; ASSERT(cfg->domain != NULL); - p2maddr = page_to_maddr(cfg->domain->arch.p2m.first_level); + p2maddr = page_to_maddr(cfg->domain->arch.p2m.root); gr1_base = SMMU_GR1(smmu); cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 97cbae4..5bf7946 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -20,7 +20,7 @@ struct p2m_domain { struct page_list_head pages; /* Root of p2m page tables, 2 contiguous pages */ - struct page_info *first_level; + struct page_info *root; /* Current VMID in use */ uint8_t vmid; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNq-0005oM-8d; Tue, 23 Sep 2014 16:56:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNo-0005o3-Mp for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:08 +0000 Received: from [193.109.254.147:36172] by server-4.bemta-14.messagelabs.com id BC/C7-01677-826A1245; Tue, 23 Sep 2014 16:56:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1411491366!9226609!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32730 invoked from network); 23 Sep 2014 16:56:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:56:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNm-0002VO-C5 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNm-0002zb-AO for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:06 +0000 Date: Tue, 23 Sep 2014 16:56:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: rename p2m->first_level to p2m->root. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1171aa90994d1570757217a103c8f649a4480dcb Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:47 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:31 2014 +0100 xen: arm: rename p2m->first_level to p2m->root. This was previously part of Vijaya's "xen/arm: Add 4-level page table for stage 2 translation" but is split out here to make that patch easier to read. I went with ->root rather than ->root_level as the original did. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall Cc: Vijaya Kumar K --- xen/arch/arm/p2m.c | 24 ++++++++++++------------ xen/drivers/passthrough/arm/smmu.c | 2 +- xen/include/asm-arm/p2m.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index a7dcdf5..8061e06 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -12,8 +12,8 @@ #include /* First level P2M is 2 consecutive pages */ -#define P2M_FIRST_ORDER 1 -#define P2M_FIRST_ENTRIES (LPAE_ENTRIES<first_level, page_to_mfn(p2m->first_level)); + p2m->root, page_to_mfn(p2m->root)); - first = __map_domain_page(p2m->first_level); + first = __map_domain_page(p2m->root); dump_pt_walk(first, addr); unmap_domain_page(first); } @@ -141,10 +141,10 @@ static lpae_t *p2m_map_first(struct p2m_domain *p2m, paddr_t addr) { struct page_info *page; - if ( first_linear_offset(addr) >= P2M_FIRST_ENTRIES ) + if ( first_linear_offset(addr) >= P2M_ROOT_ENTRIES ) return NULL; - page = p2m->first_level + p2m_first_level_index(addr); + page = p2m->root + p2m_first_level_index(addr); return __map_domain_page(page); } @@ -958,7 +958,7 @@ int p2m_alloc_table(struct domain *d) struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page; - page = alloc_domheap_pages(NULL, P2M_FIRST_ORDER, 0); + page = alloc_domheap_pages(NULL, P2M_ROOT_ORDER, 0); if ( page == NULL ) return -ENOMEM; @@ -968,9 +968,9 @@ int p2m_alloc_table(struct domain *d) clear_and_clean_page(page); clear_and_clean_page(page + 1); - p2m->first_level = page; + p2m->root = page; - d->arch.vttbr = page_to_maddr(p2m->first_level) + d->arch.vttbr = page_to_maddr(p2m->root) | ((uint64_t)p2m->vmid&0xff)<<48; /* Make sure that all TLBs corresponding to the new VMID are flushed @@ -1047,9 +1047,9 @@ void p2m_teardown(struct domain *d) while ( (pg = page_list_remove_head(&p2m->pages)) ) free_domheap_page(pg); - free_domheap_pages(p2m->first_level, P2M_FIRST_ORDER); + free_domheap_pages(p2m->root, P2M_ROOT_ORDER); - p2m->first_level = NULL; + p2m->root = NULL; p2m_free_vmid(d); @@ -1073,7 +1073,7 @@ int p2m_init(struct domain *d) d->arch.vttbr = 0; - p2m->first_level = NULL; + p2m->root = NULL; p2m->max_mapped_gfn = 0; p2m->lowest_mapped_gfn = ULONG_MAX; diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index 21b4572..3cbd206 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -937,7 +937,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain_cfg *cfg) paddr_t p2maddr; ASSERT(cfg->domain != NULL); - p2maddr = page_to_maddr(cfg->domain->arch.p2m.first_level); + p2maddr = page_to_maddr(cfg->domain->arch.p2m.root); gr1_base = SMMU_GR1(smmu); cb_base = SMMU_CB_BASE(smmu) + SMMU_CB(smmu, cfg->cbndx); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 97cbae4..5bf7946 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -20,7 +20,7 @@ struct p2m_domain { struct page_list_head pages; /* Root of p2m page tables, 2 contiguous pages */ - struct page_info *first_level; + struct page_info *root; /* Current VMID in use */ uint8_t vmid; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTO0-0005qU-BI; Tue, 23 Sep 2014 16:56:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNz-0005qD-3w for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:19 +0000 Received: from [85.158.139.211:8131] by server-2.bemta-5.messagelabs.com id 21/47-31832-236A1245; Tue, 23 Sep 2014 16:56:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1411491376!6303915!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8666 invoked from network); 23 Sep 2014 16:56:17 -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; 23 Sep 2014 16:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNw-0002VR-Gd for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNw-000300-FR for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:16 +0000 Date: Tue, 23 Sep 2014 16:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Implement variable levels in dump_pt_walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fa6e9abfb11c360e1f09707f6762975231d1ae1 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:48 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:43 2014 +0100 xen: arm: Implement variable levels in dump_pt_walk This allows us to correctly dump 64-bit hypervisor addresses, which use a 4 level table. It also paves the way for boot-time selection of the number of levels to use in the p2m, which is required to support both 40-bit and 48-bit systems. To support multiple levels it is convenient to recast the page table walk as a loop over the levels instead of the current open coding. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/mm.c | 61 ++++++++++++++++++++++++++++---------------- xen/arch/arm/p2m.c | 4 ++- xen/include/asm-arm/page.h | 2 +- 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0a243b0..207264e 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -84,10 +84,12 @@ lpae_t boot_third[LPAE_ENTRIES] __attribute__((__aligned__(4096))); */ #ifdef CONFIG_ARM_64 +#define HYP_PT_ROOT_LEVEL 0 lpae_t xen_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t xen_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #define THIS_CPU_PGTABLE xen_pgtable #else +#define HYP_PT_ROOT_LEVEL 1 /* Per-CPU pagetable pages */ /* xen_pgtable == root of the trie (zeroeth level on 64-bit, first on 32-bit) */ static DEFINE_PER_CPU(lpae_t *, xen_pgtable); @@ -165,34 +167,49 @@ static inline void check_memory_layout_alignment_constraints(void) { #endif } -void dump_pt_walk(lpae_t *first, paddr_t addr) +void dump_pt_walk(lpae_t *root, paddr_t addr, + unsigned int root_level) { - lpae_t *second = NULL, *third = NULL; + static const char *level_strs[4] = { "0TH", "1ST", "2ND", "3RD" }; + const unsigned int offsets[4] = { + zeroeth_table_offset(addr), + first_table_offset(addr), + second_table_offset(addr), + third_table_offset(addr) + }; + lpae_t pte, *mappings[4] = { 0, }; + unsigned int level; + + BUG_ON(!root); +#ifdef CONFIG_ARM_32 + BUG_ON(root_level < 1); +#endif + BUG_ON(root_level > 3); - if ( first_table_offset(addr) >= LPAE_ENTRIES ) - return; + mappings[root_level] = root; + + for ( level = root_level; ; level++ ) + { + if ( offsets[level] > LPAE_ENTRIES ) + break; - printk("1ST[0x%x] = 0x%"PRIpaddr"\n", first_table_offset(addr), - first[first_table_offset(addr)].bits); - if ( !first[first_table_offset(addr)].walk.valid || - !first[first_table_offset(addr)].walk.table ) - goto done; + pte = mappings[level][offsets[level]]; - second = map_domain_page(first[first_table_offset(addr)].walk.base); - printk("2ND[0x%x] = 0x%"PRIpaddr"\n", second_table_offset(addr), - second[second_table_offset(addr)].bits); - if ( !second[second_table_offset(addr)].walk.valid || - !second[second_table_offset(addr)].walk.table ) - goto done; + printk("%s[0x%x] = 0x%"PRIpaddr"\n", + level_strs[level], offsets[level], pte.bits); - third = map_domain_page(second[second_table_offset(addr)].walk.base); - printk("3RD[0x%x] = 0x%"PRIpaddr"\n", third_table_offset(addr), - third[third_table_offset(addr)].bits); + if ( level == 3 || !pte.walk.valid || !pte.walk.table ) + break; -done: - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); + mappings[level+1] = map_domain_page(pte.walk.base); + } + /* mappings[root_level] is provided by the caller so don't unmap that */ + do + { + unmap_domain_page(mappings[level]); + } + while ( level-- > root_level ); } void dump_hyp_walk(vaddr_t addr) @@ -208,7 +225,7 @@ void dump_hyp_walk(vaddr_t addr) BUG_ON( (lpae_t *)(unsigned long)(ttbr - phys_offset) != pgtable ); else BUG_ON( virt_to_maddr(pgtable) != ttbr ); - dump_pt_walk(pgtable, addr); + dump_pt_walk(pgtable, addr, HYP_PT_ROOT_LEVEL); } /* Map a 4k page in a fixmap entry */ diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8061e06..660d4c5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -11,6 +11,8 @@ #include #include +#define P2M_ROOT_LEVEL 1 + /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 #define P2M_ROOT_ENTRIES (LPAE_ENTRIES<root, page_to_mfn(p2m->root)); first = __map_domain_page(p2m->root); - dump_pt_walk(first, addr); + dump_pt_walk(first, addr, P2M_ROOT_LEVEL); unmap_domain_page(first); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 739038a..4c21863 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -352,7 +352,7 @@ static inline void flush_xen_data_tlb_range_va(unsigned long va, void flush_page_to_ram(unsigned long mfn); /* Print a walk of an arbitrary page table */ -void dump_pt_walk(lpae_t *table, paddr_t addr); +void dump_pt_walk(lpae_t *table, paddr_t addr, unsigned int root_level); /* Print a walk of the hypervisor's page tables for a virtual addr. */ extern void dump_hyp_walk(vaddr_t addr); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTO0-0005qU-BI; Tue, 23 Sep 2014 16:56:20 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNz-0005qD-3w for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:19 +0000 Received: from [85.158.139.211:8131] by server-2.bemta-5.messagelabs.com id 21/47-31832-236A1245; Tue, 23 Sep 2014 16:56:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1411491376!6303915!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8666 invoked from network); 23 Sep 2014 16:56:17 -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; 23 Sep 2014 16:56:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTNw-0002VR-Gd for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTNw-000300-FR for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:16 +0000 Date: Tue, 23 Sep 2014 16:56:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Implement variable levels in dump_pt_walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5fa6e9abfb11c360e1f09707f6762975231d1ae1 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:48 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:43 2014 +0100 xen: arm: Implement variable levels in dump_pt_walk This allows us to correctly dump 64-bit hypervisor addresses, which use a 4 level table. It also paves the way for boot-time selection of the number of levels to use in the p2m, which is required to support both 40-bit and 48-bit systems. To support multiple levels it is convenient to recast the page table walk as a loop over the levels instead of the current open coding. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/mm.c | 61 ++++++++++++++++++++++++++++---------------- xen/arch/arm/p2m.c | 4 ++- xen/include/asm-arm/page.h | 2 +- 3 files changed, 43 insertions(+), 24 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0a243b0..207264e 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -84,10 +84,12 @@ lpae_t boot_third[LPAE_ENTRIES] __attribute__((__aligned__(4096))); */ #ifdef CONFIG_ARM_64 +#define HYP_PT_ROOT_LEVEL 0 lpae_t xen_pgtable[LPAE_ENTRIES] __attribute__((__aligned__(4096))); lpae_t xen_first[LPAE_ENTRIES] __attribute__((__aligned__(4096))); #define THIS_CPU_PGTABLE xen_pgtable #else +#define HYP_PT_ROOT_LEVEL 1 /* Per-CPU pagetable pages */ /* xen_pgtable == root of the trie (zeroeth level on 64-bit, first on 32-bit) */ static DEFINE_PER_CPU(lpae_t *, xen_pgtable); @@ -165,34 +167,49 @@ static inline void check_memory_layout_alignment_constraints(void) { #endif } -void dump_pt_walk(lpae_t *first, paddr_t addr) +void dump_pt_walk(lpae_t *root, paddr_t addr, + unsigned int root_level) { - lpae_t *second = NULL, *third = NULL; + static const char *level_strs[4] = { "0TH", "1ST", "2ND", "3RD" }; + const unsigned int offsets[4] = { + zeroeth_table_offset(addr), + first_table_offset(addr), + second_table_offset(addr), + third_table_offset(addr) + }; + lpae_t pte, *mappings[4] = { 0, }; + unsigned int level; + + BUG_ON(!root); +#ifdef CONFIG_ARM_32 + BUG_ON(root_level < 1); +#endif + BUG_ON(root_level > 3); - if ( first_table_offset(addr) >= LPAE_ENTRIES ) - return; + mappings[root_level] = root; + + for ( level = root_level; ; level++ ) + { + if ( offsets[level] > LPAE_ENTRIES ) + break; - printk("1ST[0x%x] = 0x%"PRIpaddr"\n", first_table_offset(addr), - first[first_table_offset(addr)].bits); - if ( !first[first_table_offset(addr)].walk.valid || - !first[first_table_offset(addr)].walk.table ) - goto done; + pte = mappings[level][offsets[level]]; - second = map_domain_page(first[first_table_offset(addr)].walk.base); - printk("2ND[0x%x] = 0x%"PRIpaddr"\n", second_table_offset(addr), - second[second_table_offset(addr)].bits); - if ( !second[second_table_offset(addr)].walk.valid || - !second[second_table_offset(addr)].walk.table ) - goto done; + printk("%s[0x%x] = 0x%"PRIpaddr"\n", + level_strs[level], offsets[level], pte.bits); - third = map_domain_page(second[second_table_offset(addr)].walk.base); - printk("3RD[0x%x] = 0x%"PRIpaddr"\n", third_table_offset(addr), - third[third_table_offset(addr)].bits); + if ( level == 3 || !pte.walk.valid || !pte.walk.table ) + break; -done: - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); + mappings[level+1] = map_domain_page(pte.walk.base); + } + /* mappings[root_level] is provided by the caller so don't unmap that */ + do + { + unmap_domain_page(mappings[level]); + } + while ( level-- > root_level ); } void dump_hyp_walk(vaddr_t addr) @@ -208,7 +225,7 @@ void dump_hyp_walk(vaddr_t addr) BUG_ON( (lpae_t *)(unsigned long)(ttbr - phys_offset) != pgtable ); else BUG_ON( virt_to_maddr(pgtable) != ttbr ); - dump_pt_walk(pgtable, addr); + dump_pt_walk(pgtable, addr, HYP_PT_ROOT_LEVEL); } /* Map a 4k page in a fixmap entry */ diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 8061e06..660d4c5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -11,6 +11,8 @@ #include #include +#define P2M_ROOT_LEVEL 1 + /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 #define P2M_ROOT_ENTRIES (LPAE_ENTRIES<root, page_to_mfn(p2m->root)); first = __map_domain_page(p2m->root); - dump_pt_walk(first, addr); + dump_pt_walk(first, addr, P2M_ROOT_LEVEL); unmap_domain_page(first); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 739038a..4c21863 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -352,7 +352,7 @@ static inline void flush_xen_data_tlb_range_va(unsigned long va, void flush_page_to_ram(unsigned long mfn); /* Print a walk of an arbitrary page table */ -void dump_pt_walk(lpae_t *table, paddr_t addr); +void dump_pt_walk(lpae_t *table, paddr_t addr, unsigned int root_level); /* Print a walk of the hypervisor's page tables for a virtual addr. */ extern void dump_hyp_walk(vaddr_t addr); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOB-0005sp-Fl; Tue, 23 Sep 2014 16:56:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTO9-0005sS-MJ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:29 +0000 Received: from [85.158.137.68:50177] by server-5.bemta-3.messagelabs.com id 91/DC-30889-C36A1245; Tue, 23 Sep 2014 16:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1411491386!11567166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14691 invoked from network); 23 Sep 2014 16:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTO6-0002Va-ME for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTO6-000315-KJ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:26 +0000 Date: Tue, 23 Sep 2014 16:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle concatenated root tables in dump_pt_walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9b1d360da5e46dbbfbc3975dba9e87adcb090ac Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:49 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:54 2014 +0100 xen: arm: handle concatenated root tables in dump_pt_walk ARM allows for the concatenation of pages at the root of a p2m (but not a regular page table) in order to support a larger IPA space than the number of levels in the P2M would normally support. We use this to support 40-bit guest addresses. Previously we were unable to dump IPAs which were outside the first page of the root. To fix this we adjust dump_pt_walk to take the machine address of the page table root instead of expecting the caller to have mapped it. This allows the walker code to select the correct page to map. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/mm.c | 47 +++++++++++++++++++++++++++++-------------- xen/arch/arm/p2m.c | 13 ++--------- xen/include/asm-arm/page.h | 16 +++++++++++++- 3 files changed, 49 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 207264e..0294fa8 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -167,33 +167,53 @@ static inline void check_memory_layout_alignment_constraints(void) { #endif } -void dump_pt_walk(lpae_t *root, paddr_t addr, - unsigned int root_level) +void dump_pt_walk(paddr_t ttbr, paddr_t addr, + unsigned int root_level, + unsigned int nr_root_tables) { static const char *level_strs[4] = { "0TH", "1ST", "2ND", "3RD" }; + const unsigned long root_pfn = paddr_to_pfn(ttbr); const unsigned int offsets[4] = { zeroeth_table_offset(addr), first_table_offset(addr), second_table_offset(addr), third_table_offset(addr) }; - lpae_t pte, *mappings[4] = { 0, }; - unsigned int level; + lpae_t pte, *mapping; + unsigned int level, root_table; - BUG_ON(!root); #ifdef CONFIG_ARM_32 BUG_ON(root_level < 1); #endif BUG_ON(root_level > 3); - mappings[root_level] = root; + if ( nr_root_tables > 1 ) + { + /* + * Concatenated root-level tables. The table number will be + * the offset at the previous level. It is not possible to + * concatenate a level-0 root. + */ + BUG_ON(root_level == 0); + root_table = offsets[root_level - 1]; + printk("Using concatenated root table %u\n", root_table); + if ( root_table >= nr_root_tables ) + { + printk("Invalid root table offset\n"); + return; + } + } + else + root_table = 0; + + mapping = map_domain_page(root_pfn + root_table); for ( level = root_level; ; level++ ) { if ( offsets[level] > LPAE_ENTRIES ) break; - pte = mappings[level][offsets[level]]; + pte = mapping[offsets[level]]; printk("%s[0x%x] = 0x%"PRIpaddr"\n", level_strs[level], offsets[level], pte.bits); @@ -201,15 +221,12 @@ void dump_pt_walk(lpae_t *root, paddr_t addr, if ( level == 3 || !pte.walk.valid || !pte.walk.table ) break; - mappings[level+1] = map_domain_page(pte.walk.base); + /* For next iteration */ + unmap_domain_page(mapping); + mapping = map_domain_page(pte.walk.base); } - /* mappings[root_level] is provided by the caller so don't unmap that */ - do - { - unmap_domain_page(mappings[level]); - } - while ( level-- > root_level ); + unmap_domain_page(mapping); } void dump_hyp_walk(vaddr_t addr) @@ -225,7 +242,7 @@ void dump_hyp_walk(vaddr_t addr) BUG_ON( (lpae_t *)(unsigned long)(ttbr - phys_offset) != pgtable ); else BUG_ON( virt_to_maddr(pgtable) != ttbr ); - dump_pt_walk(pgtable, addr, HYP_PT_ROOT_LEVEL); + dump_pt_walk(ttbr, addr, HYP_PT_ROOT_LEVEL, 1); } /* Map a 4k page in a fixmap entry */ diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 660d4c5..fa64aa5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -16,6 +16,7 @@ /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 #define P2M_ROOT_ENTRIES (LPAE_ENTRIES<arch.p2m; - lpae_t *first; printk("dom%d IPA 0x%"PRIpaddr"\n", d->domain_id, addr); - if ( first_linear_offset(addr) > LPAE_ENTRIES ) - { - printk("Cannot dump addresses in second of first level pages...\n"); - return; - } - printk("P2M @ %p mfn:0x%lx\n", p2m->root, page_to_mfn(p2m->root)); - first = __map_domain_page(p2m->root); - dump_pt_walk(first, addr, P2M_ROOT_LEVEL); - unmap_domain_page(first); + dump_pt_walk(page_to_maddr(p2m->root), addr, + P2M_ROOT_LEVEL, P2M_ROOT_PAGES); } static void p2m_load_VTTBR(struct domain *d) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 4c21863..773822f 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -351,8 +351,20 @@ static inline void flush_xen_data_tlb_range_va(unsigned long va, /* Flush the dcache for an entire page. */ void flush_page_to_ram(unsigned long mfn); -/* Print a walk of an arbitrary page table */ -void dump_pt_walk(lpae_t *table, paddr_t addr, unsigned int root_level); +/* + * Print a walk of a page table or p2m + * + * ttbr is the base address register (TTBR0_EL2 or VTTBR_EL2) + * addr is the PA or IPA to translate + * root_level is the starting level of the page table + * (e.g. TCR_EL2.SL0 or VTCR_EL2.SL0 ) + * nr_root_tables is the number of concatenated tables at the root. + * this can only be != 1 for P2M walks starting at the first or + * subsequent level. + */ +void dump_pt_walk(paddr_t ttbr, paddr_t addr, + unsigned int root_level, + unsigned int nr_root_tables); /* Print a walk of the hypervisor's page tables for a virtual addr. */ extern void dump_hyp_walk(vaddr_t addr); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:36 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOB-0005sp-Fl; Tue, 23 Sep 2014 16:56:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTO9-0005sS-MJ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:29 +0000 Received: from [85.158.137.68:50177] by server-5.bemta-3.messagelabs.com id 91/DC-30889-C36A1245; Tue, 23 Sep 2014 16:56:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1411491386!11567166!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14691 invoked from network); 23 Sep 2014 16:56:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:56:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTO6-0002Va-ME for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTO6-000315-KJ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:26 +0000 Date: Tue, 23 Sep 2014 16:56:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle concatenated root tables in dump_pt_walk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9b1d360da5e46dbbfbc3975dba9e87adcb090ac Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:49 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:54 2014 +0100 xen: arm: handle concatenated root tables in dump_pt_walk ARM allows for the concatenation of pages at the root of a p2m (but not a regular page table) in order to support a larger IPA space than the number of levels in the P2M would normally support. We use this to support 40-bit guest addresses. Previously we were unable to dump IPAs which were outside the first page of the root. To fix this we adjust dump_pt_walk to take the machine address of the page table root instead of expecting the caller to have mapped it. This allows the walker code to select the correct page to map. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/mm.c | 47 +++++++++++++++++++++++++++++-------------- xen/arch/arm/p2m.c | 13 ++--------- xen/include/asm-arm/page.h | 16 +++++++++++++- 3 files changed, 49 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 207264e..0294fa8 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -167,33 +167,53 @@ static inline void check_memory_layout_alignment_constraints(void) { #endif } -void dump_pt_walk(lpae_t *root, paddr_t addr, - unsigned int root_level) +void dump_pt_walk(paddr_t ttbr, paddr_t addr, + unsigned int root_level, + unsigned int nr_root_tables) { static const char *level_strs[4] = { "0TH", "1ST", "2ND", "3RD" }; + const unsigned long root_pfn = paddr_to_pfn(ttbr); const unsigned int offsets[4] = { zeroeth_table_offset(addr), first_table_offset(addr), second_table_offset(addr), third_table_offset(addr) }; - lpae_t pte, *mappings[4] = { 0, }; - unsigned int level; + lpae_t pte, *mapping; + unsigned int level, root_table; - BUG_ON(!root); #ifdef CONFIG_ARM_32 BUG_ON(root_level < 1); #endif BUG_ON(root_level > 3); - mappings[root_level] = root; + if ( nr_root_tables > 1 ) + { + /* + * Concatenated root-level tables. The table number will be + * the offset at the previous level. It is not possible to + * concatenate a level-0 root. + */ + BUG_ON(root_level == 0); + root_table = offsets[root_level - 1]; + printk("Using concatenated root table %u\n", root_table); + if ( root_table >= nr_root_tables ) + { + printk("Invalid root table offset\n"); + return; + } + } + else + root_table = 0; + + mapping = map_domain_page(root_pfn + root_table); for ( level = root_level; ; level++ ) { if ( offsets[level] > LPAE_ENTRIES ) break; - pte = mappings[level][offsets[level]]; + pte = mapping[offsets[level]]; printk("%s[0x%x] = 0x%"PRIpaddr"\n", level_strs[level], offsets[level], pte.bits); @@ -201,15 +221,12 @@ void dump_pt_walk(lpae_t *root, paddr_t addr, if ( level == 3 || !pte.walk.valid || !pte.walk.table ) break; - mappings[level+1] = map_domain_page(pte.walk.base); + /* For next iteration */ + unmap_domain_page(mapping); + mapping = map_domain_page(pte.walk.base); } - /* mappings[root_level] is provided by the caller so don't unmap that */ - do - { - unmap_domain_page(mappings[level]); - } - while ( level-- > root_level ); + unmap_domain_page(mapping); } void dump_hyp_walk(vaddr_t addr) @@ -225,7 +242,7 @@ void dump_hyp_walk(vaddr_t addr) BUG_ON( (lpae_t *)(unsigned long)(ttbr - phys_offset) != pgtable ); else BUG_ON( virt_to_maddr(pgtable) != ttbr ); - dump_pt_walk(pgtable, addr, HYP_PT_ROOT_LEVEL); + dump_pt_walk(ttbr, addr, HYP_PT_ROOT_LEVEL, 1); } /* Map a 4k page in a fixmap entry */ diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 660d4c5..fa64aa5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -16,6 +16,7 @@ /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 #define P2M_ROOT_ENTRIES (LPAE_ENTRIES<arch.p2m; - lpae_t *first; printk("dom%d IPA 0x%"PRIpaddr"\n", d->domain_id, addr); - if ( first_linear_offset(addr) > LPAE_ENTRIES ) - { - printk("Cannot dump addresses in second of first level pages...\n"); - return; - } - printk("P2M @ %p mfn:0x%lx\n", p2m->root, page_to_mfn(p2m->root)); - first = __map_domain_page(p2m->root); - dump_pt_walk(first, addr, P2M_ROOT_LEVEL); - unmap_domain_page(first); + dump_pt_walk(page_to_maddr(p2m->root), addr, + P2M_ROOT_LEVEL, P2M_ROOT_PAGES); } static void p2m_load_VTTBR(struct domain *d) diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 4c21863..773822f 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -351,8 +351,20 @@ static inline void flush_xen_data_tlb_range_va(unsigned long va, /* Flush the dcache for an entire page. */ void flush_page_to_ram(unsigned long mfn); -/* Print a walk of an arbitrary page table */ -void dump_pt_walk(lpae_t *table, paddr_t addr, unsigned int root_level); +/* + * Print a walk of a page table or p2m + * + * ttbr is the base address register (TTBR0_EL2 or VTTBR_EL2) + * addr is the PA or IPA to translate + * root_level is the starting level of the page table + * (e.g. TCR_EL2.SL0 or VTCR_EL2.SL0 ) + * nr_root_tables is the number of concatenated tables at the root. + * this can only be != 1 for P2M walks starting at the first or + * subsequent level. + */ +void dump_pt_walk(paddr_t ttbr, paddr_t addr, + unsigned int root_level, + unsigned int nr_root_tables); /* Print a walk of the hypervisor's page tables for a virtual addr. */ extern void dump_hyp_walk(vaddr_t addr); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOK-0005ul-Ib; Tue, 23 Sep 2014 16:56:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOJ-0005uW-5f for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:39 +0000 Received: from [193.109.254.147:50965] by server-7.bemta-14.messagelabs.com id 8B/A4-13362-646A1245; Tue, 23 Sep 2014 16:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1411491397!12564477!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11851 invoked from network); 23 Sep 2014 16:56:37 -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; 23 Sep 2014 16:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOG-0002Vf-Rl for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOG-00031V-Qk for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:36 +0000 Date: Tue, 23 Sep 2014 16:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move setup_virt_paging to p2m.[ch] from mm.[ch] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0994a4b6d6afc23019dbafaa326acb70416a2dc Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:50 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:54 2014 +0100 xen: arm: move setup_virt_paging to p2m.[ch] from mm.[ch] This file is where most of the P2M logic lives and this function will eventually need to poke at some internals, so move it. This is pure code motion. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/mm.c | 18 ------------------ xen/arch/arm/p2m.c | 18 ++++++++++++++++++ xen/include/asm-arm/mm.h | 2 -- xen/include/asm-arm/p2m.h | 3 +++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0294fa8..5cd4e99 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -411,24 +411,6 @@ void __init arch_init_memory(void) BUG_ON(IS_ERR(dom_cow)); } -void __cpuinit setup_virt_paging(void) -{ - /* Setup Stage 2 address translation */ - /* SH0=11 (Inner-shareable) - * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) - * SL0=01 (Level-1) - * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) - * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) - * PS=010 == 40 bits - */ -#ifdef CONFIG_ARM_32 - WRITE_SYSREG32(0x80003558, VTCR_EL2); -#else - WRITE_SYSREG32(0x80023558, VTCR_EL2); -#endif - isb(); -} - static inline lpae_t pte_of_xenaddr(vaddr_t va) { paddr_t ma = va + phys_offset; diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index fa64aa5..a1fef0f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1138,6 +1138,24 @@ err: return page; } +void __cpuinit setup_virt_paging(void) +{ + /* Setup Stage 2 address translation */ + /* SH0=11 (Inner-shareable) + * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) + * SL0=01 (Level-1) + * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) + * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) + * PS=010 == 40 bits + */ +#ifdef CONFIG_ARM_32 + WRITE_SYSREG32(0x80003558, VTCR_EL2); +#else + WRITE_SYSREG32(0x80023558, VTCR_EL2); +#endif + isb(); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 9fa80a4..840a805 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -155,8 +155,6 @@ extern void remove_early_mappings(void); extern int __cpuinit init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ extern void __cpuinit mmu_init_secondary_cpu(void); -/* Second stage paging setup, to be called on all CPUs */ -extern void __cpuinit setup_virt_paging(void); /* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. * Base must be 32MB aligned and size a multiple of 32MB. */ extern void setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 5bf7946..999f20a 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -72,6 +72,9 @@ typedef enum { /* Initialise vmid allocator */ void p2m_vmid_allocator_init(void); +/* Second stage paging setup, to be called on all CPUs */ +void __cpuinit setup_virt_paging(void); + /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:40 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOK-0005ul-Ib; Tue, 23 Sep 2014 16:56:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOJ-0005uW-5f for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:39 +0000 Received: from [193.109.254.147:50965] by server-7.bemta-14.messagelabs.com id 8B/A4-13362-646A1245; Tue, 23 Sep 2014 16:56:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1411491397!12564477!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11851 invoked from network); 23 Sep 2014 16:56:37 -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; 23 Sep 2014 16:56:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOG-0002Vf-Rl for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOG-00031V-Qk for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:36 +0000 Date: Tue, 23 Sep 2014 16:56:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: move setup_virt_paging to p2m.[ch] from mm.[ch] X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0994a4b6d6afc23019dbafaa326acb70416a2dc Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:50 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:54 2014 +0100 xen: arm: move setup_virt_paging to p2m.[ch] from mm.[ch] This file is where most of the P2M logic lives and this function will eventually need to poke at some internals, so move it. This is pure code motion. Signed-off-by: Ian Campbell Acked-by: Julien Grall --- xen/arch/arm/mm.c | 18 ------------------ xen/arch/arm/p2m.c | 18 ++++++++++++++++++ xen/include/asm-arm/mm.h | 2 -- xen/include/asm-arm/p2m.h | 3 +++ 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 0294fa8..5cd4e99 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -411,24 +411,6 @@ void __init arch_init_memory(void) BUG_ON(IS_ERR(dom_cow)); } -void __cpuinit setup_virt_paging(void) -{ - /* Setup Stage 2 address translation */ - /* SH0=11 (Inner-shareable) - * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) - * SL0=01 (Level-1) - * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) - * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) - * PS=010 == 40 bits - */ -#ifdef CONFIG_ARM_32 - WRITE_SYSREG32(0x80003558, VTCR_EL2); -#else - WRITE_SYSREG32(0x80023558, VTCR_EL2); -#endif - isb(); -} - static inline lpae_t pte_of_xenaddr(vaddr_t va) { paddr_t ma = va + phys_offset; diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index fa64aa5..a1fef0f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1138,6 +1138,24 @@ err: return page; } +void __cpuinit setup_virt_paging(void) +{ + /* Setup Stage 2 address translation */ + /* SH0=11 (Inner-shareable) + * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) + * SL0=01 (Level-1) + * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) + * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) + * PS=010 == 40 bits + */ +#ifdef CONFIG_ARM_32 + WRITE_SYSREG32(0x80003558, VTCR_EL2); +#else + WRITE_SYSREG32(0x80023558, VTCR_EL2); +#endif + isb(); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 9fa80a4..840a805 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -155,8 +155,6 @@ extern void remove_early_mappings(void); extern int __cpuinit init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ extern void __cpuinit mmu_init_secondary_cpu(void); -/* Second stage paging setup, to be called on all CPUs */ -extern void __cpuinit setup_virt_paging(void); /* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. * Base must be 32MB aligned and size a multiple of 32MB. */ extern void setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 5bf7946..999f20a 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -72,6 +72,9 @@ typedef enum { /* Initialise vmid allocator */ void p2m_vmid_allocator_init(void); +/* Second stage paging setup, to be called on all CPUs */ +void __cpuinit setup_virt_paging(void); + /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56: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 1XWTOU-0005x8-Lu; Tue, 23 Sep 2014 16:56:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOT-0005wm-B0 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:49 +0000 Received: from [85.158.143.35:32153] by server-2.bemta-4.messagelabs.com id A6/39-04525-056A1245; Tue, 23 Sep 2014 16:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1411491407!12682625!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10503 invoked from network); 23 Sep 2014 16:56:48 -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; 23 Sep 2014 16:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOR-0002Vq-0E for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOQ-00031r-VV for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:46 +0000 Date: Tue, 23 Sep 2014 16:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Defer setting of VTCR_EL2 until after CPUs are up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67784ca4f9b15b55f075ebef76005af6e2b724b1 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:51 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:54 2014 +0100 xen: arm: Defer setting of VTCR_EL2 until after CPUs are up Currently we retain the hardcoded values but soon we will want to calculate the correct values based upon the CPU properties common to all processors, which are only available once they are all up. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 18 ++++++++++++++---- xen/arch/arm/setup.c | 4 ++-- xen/arch/arm/smpboot.c | 2 -- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index a1fef0f..e953ca3 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1138,8 +1138,17 @@ err: return page; } -void __cpuinit setup_virt_paging(void) +static void __init setup_virt_paging_one(void *data) { + unsigned long val = (unsigned long)data; + WRITE_SYSREG32(val, VTCR_EL2); + isb(); +} + +void __init setup_virt_paging(void) +{ + unsigned long val; + /* Setup Stage 2 address translation */ /* SH0=11 (Inner-shareable) * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) @@ -1149,11 +1158,12 @@ void __cpuinit setup_virt_paging(void) * PS=010 == 40 bits */ #ifdef CONFIG_ARM_32 - WRITE_SYSREG32(0x80003558, VTCR_EL2); + val = 0x80003558; #else - WRITE_SYSREG32(0x80023558, VTCR_EL2); + val = 0x80023558; #endif - isb(); + setup_virt_paging_one((void *)val); + smp_call_function(setup_virt_paging_one, (void *)val, 1); } /* diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 025349e..8844720 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -789,8 +789,6 @@ void __init start_xen(unsigned long boot_phys_offset, gic_init(); - setup_virt_paging(); - p2m_vmid_allocator_init(); softirq_init(); @@ -837,6 +835,8 @@ void __init start_xen(unsigned long boot_phys_offset, printk("Brought up %ld CPUs\n", (long)num_online_cpus()); /* TODO: smp_cpus_done(); */ + setup_virt_paging(); + do_initcalls(); /* Create initial domain 0. */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index cf149da..ee395a1 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -279,8 +279,6 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, init_traps(); - setup_virt_paging(); - mmu_init_secondary_cpu(); gic_init_secondary_cpu(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:56:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:56: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 1XWTOU-0005x8-Lu; Tue, 23 Sep 2014 16:56:50 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOT-0005wm-B0 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:49 +0000 Received: from [85.158.143.35:32153] by server-2.bemta-4.messagelabs.com id A6/39-04525-056A1245; Tue, 23 Sep 2014 16:56:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1411491407!12682625!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10503 invoked from network); 23 Sep 2014 16:56:48 -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; 23 Sep 2014 16:56:48 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOR-0002Vq-0E for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOQ-00031r-VV for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:46 +0000 Date: Tue, 23 Sep 2014 16:56:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Defer setting of VTCR_EL2 until after CPUs are up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 67784ca4f9b15b55f075ebef76005af6e2b724b1 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:51 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:54 2014 +0100 xen: arm: Defer setting of VTCR_EL2 until after CPUs are up Currently we retain the hardcoded values but soon we will want to calculate the correct values based upon the CPU properties common to all processors, which are only available once they are all up. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 18 ++++++++++++++---- xen/arch/arm/setup.c | 4 ++-- xen/arch/arm/smpboot.c | 2 -- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index a1fef0f..e953ca3 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1138,8 +1138,17 @@ err: return page; } -void __cpuinit setup_virt_paging(void) +static void __init setup_virt_paging_one(void *data) { + unsigned long val = (unsigned long)data; + WRITE_SYSREG32(val, VTCR_EL2); + isb(); +} + +void __init setup_virt_paging(void) +{ + unsigned long val; + /* Setup Stage 2 address translation */ /* SH0=11 (Inner-shareable) * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) @@ -1149,11 +1158,12 @@ void __cpuinit setup_virt_paging(void) * PS=010 == 40 bits */ #ifdef CONFIG_ARM_32 - WRITE_SYSREG32(0x80003558, VTCR_EL2); + val = 0x80003558; #else - WRITE_SYSREG32(0x80023558, VTCR_EL2); + val = 0x80023558; #endif - isb(); + setup_virt_paging_one((void *)val); + smp_call_function(setup_virt_paging_one, (void *)val, 1); } /* diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 025349e..8844720 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -789,8 +789,6 @@ void __init start_xen(unsigned long boot_phys_offset, gic_init(); - setup_virt_paging(); - p2m_vmid_allocator_init(); softirq_init(); @@ -837,6 +835,8 @@ void __init start_xen(unsigned long boot_phys_offset, printk("Brought up %ld CPUs\n", (long)num_online_cpus()); /* TODO: smp_cpus_done(); */ + setup_virt_paging(); + do_initcalls(); /* Create initial domain 0. */ diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index cf149da..ee395a1 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -279,8 +279,6 @@ void __cpuinit start_secondary(unsigned long boot_phys_offset, init_traps(); - setup_virt_paging(); - mmu_init_secondary_cpu(); gic_init_secondary_cpu(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTOe-000604-8B; Tue, 23 Sep 2014 16:57:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOd-0005zd-FQ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:59 +0000 Received: from [193.109.254.147:32231] by server-16.bemta-14.messagelabs.com id 37/40-16990-A56A1245; Tue, 23 Sep 2014 16:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1411491417!12564210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6433 invoked from network); 23 Sep 2014 16:56:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOb-0002W5-4m for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOb-00032D-2r for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:57 +0000 Date: Tue, 23 Sep 2014 16:56:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle variable p2m levels in p2m_lookup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58f0fd88225a3ff1b87d54316a40a9a5f7c6af57 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:52 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: handle variable p2m levels in p2m_lookup This paves the way for boot-time selection of the number of levels to use in the p2m, which is required to support both 40-bit and 48-bit systems. For now the starting level remains a compile time constant. Implemented by turning the linear sequence of lookups into a loop. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 73 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 47 insertions(+), 26 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index e953ca3..eac3ce4 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -153,56 +153,77 @@ static lpae_t *p2m_map_first(struct p2m_domain *p2m, paddr_t addr) paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) { struct p2m_domain *p2m = &d->arch.p2m; - lpae_t pte, *first = NULL, *second = NULL, *third = NULL; + const unsigned int offsets[4] = { + zeroeth_table_offset(paddr), + first_table_offset(paddr), + second_table_offset(paddr), + third_table_offset(paddr) + }; + const paddr_t masks[4] = { + ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK + }; + lpae_t pte, *map; paddr_t maddr = INVALID_PADDR; - paddr_t mask; + paddr_t mask = 0; p2m_type_t _t; + unsigned int level, root_table; + + BUILD_BUG_ON(THIRD_MASK != PAGE_MASK); /* Allow t to be NULL */ t = t ?: &_t; *t = p2m_invalid; + if ( P2M_ROOT_PAGES > 1 ) + { + /* + * Concatenated root-level tables. The table number will be + * the offset at the previous level. It is not possible to + * concatenate a level-0 root. + */ + ASSERT(P2M_ROOT_LEVEL > 0); + root_table = offsets[P2M_ROOT_LEVEL - 1]; + if ( root_table >= P2M_ROOT_PAGES ) + goto err; + } + else + root_table = 0; + spin_lock(&p2m->lock); - first = p2m_map_first(p2m, paddr); - if ( !first ) - goto err; + map = __map_domain_page(p2m->root + root_table); - mask = FIRST_MASK; - pte = first[first_table_offset(paddr)]; - if ( !p2m_table(pte) ) - goto done; + for ( level = P2M_ROOT_LEVEL ; level < 4 ; level++ ) + { + mask = masks[level]; - mask = SECOND_MASK; - second = map_domain_page(pte.p2m.base); - pte = second[second_table_offset(paddr)]; - if ( !p2m_table(pte) ) - goto done; + pte = map[offsets[level]]; - mask = THIRD_MASK; + if ( level == 3 && !p2m_table(pte) ) + /* Invalid, clobber the pte */ + pte.bits = 0; + if ( level == 3 || !p2m_table(pte) ) + /* Done */ + break; - BUILD_BUG_ON(THIRD_MASK != PAGE_MASK); + ASSERT(level < 3); - third = map_domain_page(pte.p2m.base); - pte = third[third_table_offset(paddr)]; + /* Map for next level */ + unmap_domain_page(map); + map = map_domain_page(pte.p2m.base); + } - /* This bit must be one in the level 3 entry */ - if ( !p2m_table(pte) ) - pte.bits = 0; + unmap_domain_page(map); -done: if ( p2m_valid(pte) ) { + ASSERT(mask); ASSERT(pte.p2m.type != p2m_invalid); maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask); *t = pte.p2m.type; } - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); - if (first) unmap_domain_page(first); - err: spin_unlock(&p2m->lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:03 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTOe-000604-8B; Tue, 23 Sep 2014 16:57:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOd-0005zd-FQ for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:59 +0000 Received: from [193.109.254.147:32231] by server-16.bemta-14.messagelabs.com id 37/40-16990-A56A1245; Tue, 23 Sep 2014 16:56:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1411491417!12564210!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6433 invoked from network); 23 Sep 2014 16:56:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:56:58 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOb-0002W5-4m for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOb-00032D-2r for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:56:57 +0000 Date: Tue, 23 Sep 2014 16:56:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle variable p2m levels in p2m_lookup X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 58f0fd88225a3ff1b87d54316a40a9a5f7c6af57 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:52 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: handle variable p2m levels in p2m_lookup This paves the way for boot-time selection of the number of levels to use in the p2m, which is required to support both 40-bit and 48-bit systems. For now the starting level remains a compile time constant. Implemented by turning the linear sequence of lookups into a loop. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 73 +++++++++++++++++++++++++++++++++------------------ 1 files changed, 47 insertions(+), 26 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index e953ca3..eac3ce4 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -153,56 +153,77 @@ static lpae_t *p2m_map_first(struct p2m_domain *p2m, paddr_t addr) paddr_t p2m_lookup(struct domain *d, paddr_t paddr, p2m_type_t *t) { struct p2m_domain *p2m = &d->arch.p2m; - lpae_t pte, *first = NULL, *second = NULL, *third = NULL; + const unsigned int offsets[4] = { + zeroeth_table_offset(paddr), + first_table_offset(paddr), + second_table_offset(paddr), + third_table_offset(paddr) + }; + const paddr_t masks[4] = { + ZEROETH_MASK, FIRST_MASK, SECOND_MASK, THIRD_MASK + }; + lpae_t pte, *map; paddr_t maddr = INVALID_PADDR; - paddr_t mask; + paddr_t mask = 0; p2m_type_t _t; + unsigned int level, root_table; + + BUILD_BUG_ON(THIRD_MASK != PAGE_MASK); /* Allow t to be NULL */ t = t ?: &_t; *t = p2m_invalid; + if ( P2M_ROOT_PAGES > 1 ) + { + /* + * Concatenated root-level tables. The table number will be + * the offset at the previous level. It is not possible to + * concatenate a level-0 root. + */ + ASSERT(P2M_ROOT_LEVEL > 0); + root_table = offsets[P2M_ROOT_LEVEL - 1]; + if ( root_table >= P2M_ROOT_PAGES ) + goto err; + } + else + root_table = 0; + spin_lock(&p2m->lock); - first = p2m_map_first(p2m, paddr); - if ( !first ) - goto err; + map = __map_domain_page(p2m->root + root_table); - mask = FIRST_MASK; - pte = first[first_table_offset(paddr)]; - if ( !p2m_table(pte) ) - goto done; + for ( level = P2M_ROOT_LEVEL ; level < 4 ; level++ ) + { + mask = masks[level]; - mask = SECOND_MASK; - second = map_domain_page(pte.p2m.base); - pte = second[second_table_offset(paddr)]; - if ( !p2m_table(pte) ) - goto done; + pte = map[offsets[level]]; - mask = THIRD_MASK; + if ( level == 3 && !p2m_table(pte) ) + /* Invalid, clobber the pte */ + pte.bits = 0; + if ( level == 3 || !p2m_table(pte) ) + /* Done */ + break; - BUILD_BUG_ON(THIRD_MASK != PAGE_MASK); + ASSERT(level < 3); - third = map_domain_page(pte.p2m.base); - pte = third[third_table_offset(paddr)]; + /* Map for next level */ + unmap_domain_page(map); + map = map_domain_page(pte.p2m.base); + } - /* This bit must be one in the level 3 entry */ - if ( !p2m_table(pte) ) - pte.bits = 0; + unmap_domain_page(map); -done: if ( p2m_valid(pte) ) { + ASSERT(mask); ASSERT(pte.p2m.type != p2m_invalid); maddr = (pte.bits & PADDR_MASK & mask) | (paddr & ~mask); *t = pte.p2m.type; } - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); - if (first) unmap_domain_page(first); - err: spin_unlock(&p2m->lock); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTOp-00062t-BN; Tue, 23 Sep 2014 16:57:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOo-00062X-1y for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:10 +0000 Received: from [193.109.254.147:45459] by server-15.bemta-14.messagelabs.com id C4/57-30948-566A1245; Tue, 23 Sep 2014 16:57:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1411491427!12555634!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20068 invoked from network); 23 Sep 2014 16:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOl-0002We-A4 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOl-00032k-8C for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:07 +0000 Date: Tue, 23 Sep 2014 16:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle variable p2m levels in apply_p2m_changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 82985d75968d3cde645a283adab902c7a096dc79 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:53 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: handle variable p2m levels in apply_p2m_changes As with previous changes this involves conversion from a linear series of lookups into a loop over the levels. Signed-off-by: Ian Campbell Cc: Arianna Avanzini Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 167 +++++++++++++++++++++++----------------------------- 1 files changed, 73 insertions(+), 94 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index eac3ce4..2eb553a 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -15,7 +15,6 @@ /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 -#define P2M_ROOT_ENTRIES (LPAE_ENTRIES<domain); } -static int p2m_first_level_index(paddr_t addr) -{ - /* - * 1st pages are concatenated so zeroeth offset gives us the - * index of the 1st page - */ - return zeroeth_table_offset(addr); -} - -/* - * Map whichever of the first pages contain addr. The caller should - * then use first_table_offset as an index. - */ -static lpae_t *p2m_map_first(struct p2m_domain *p2m, paddr_t addr) -{ - struct page_info *page; - - if ( first_linear_offset(addr) >= P2M_ROOT_ENTRIES ) - return NULL; - - page = p2m->root + p2m_first_level_index(addr); - - return __map_domain_page(page); -} - /* * Lookup the MFN corresponding to a domain's PFN. * @@ -733,13 +707,12 @@ static int apply_p2m_changes(struct domain *d, { int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; - lpae_t *first = NULL, *second = NULL, *third = NULL; + lpae_t *mappings[4] = { NULL, }; paddr_t addr, orig_maddr = maddr; unsigned int level = 0; - unsigned long cur_first_page = ~0, - cur_first_offset = ~0, - cur_second_offset = ~0; - unsigned long count = 0; + unsigned int cur_root_table = ~0; + unsigned int cur_offset[4] = { ~0, }; + unsigned int count = 0; bool_t flush = false; bool_t flush_pt; @@ -751,9 +724,21 @@ static int apply_p2m_changes(struct domain *d, spin_lock(&p2m->lock); + /* Static mapping. P2M_ROOT_PAGES > 1 are handled below */ + if ( P2M_ROOT_PAGES == 1 ) + mappings[P2M_ROOT_LEVEL] = __map_domain_page(p2m->root); + addr = start_gpaddr; while ( addr < end_gpaddr ) { + int root_table; + const unsigned int offsets[4] = { + zeroeth_table_offset(addr), + first_table_offset(addr), + second_table_offset(addr), + third_table_offset(addr) + }; + /* * Arbitrarily, preempt every 512 operations or 8192 nops. * 512*P2M_ONE_PROGRESS == 8192*P2M_ONE_PROGRESS_NOP == 0x2000 @@ -773,76 +758,67 @@ static int apply_p2m_changes(struct domain *d, count = 0; } - if ( cur_first_page != p2m_first_level_index(addr) ) + if ( P2M_ROOT_PAGES > 1 ) { - if ( first ) unmap_domain_page(first); - first = p2m_map_first(p2m, addr); - if ( !first ) + int i; + /* + * Concatenated root-level tables. The table number will be the + * offset at the previous level. It is not possible to concatenate + * a level-0 root. + */ + ASSERT(P2M_ROOT_LEVEL > 0); + root_table = offsets[P2M_ROOT_LEVEL - 1]; + if ( root_table >= P2M_ROOT_PAGES ) { rc = -EINVAL; goto out; } - cur_first_page = p2m_first_level_index(addr); - /* Any mapping further down is now invalid */ - cur_first_offset = cur_second_offset = ~0; - } - - /* We only use a 3 level p2m at the moment, so no level 0, - * current hardware doesn't support super page mappings at - * level 0 anyway */ - - level = 1; - ret = apply_one_level(d, &first[first_table_offset(addr)], - level, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - count += ret; - if ( ret != P2M_ONE_DESCEND ) continue; - - BUG_ON(!p2m_valid(first[first_table_offset(addr)])); - if ( cur_first_offset != first_table_offset(addr) ) - { - if (second) unmap_domain_page(second); - second = map_domain_page(first[first_table_offset(addr)].p2m.base); - cur_first_offset = first_table_offset(addr); - /* Any mapping further down is now invalid */ - cur_second_offset = ~0; + if ( cur_root_table != root_table ) + { + if ( mappings[P2M_ROOT_LEVEL] ) + unmap_domain_page(mappings[P2M_ROOT_LEVEL]); + mappings[P2M_ROOT_LEVEL] = + __map_domain_page(p2m->root + root_table); + cur_root_table = root_table; + /* Any mapping further down is now invalid */ + for ( i = P2M_ROOT_LEVEL; i < 4; i++ ) + cur_offset[i] = ~0; + } } - /* else: second already valid */ - - level = 2; - ret = apply_one_level(d,&second[second_table_offset(addr)], - level, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - count += ret; - if ( ret != P2M_ONE_DESCEND ) continue; - BUG_ON(!p2m_valid(second[second_table_offset(addr)])); - - if ( cur_second_offset != second_table_offset(addr) ) + for ( level = P2M_ROOT_LEVEL; level < 4; level++ ) { - /* map third level */ - if (third) unmap_domain_page(third); - third = map_domain_page(second[second_table_offset(addr)].p2m.base); - cur_second_offset = second_table_offset(addr); + unsigned offset = offsets[level]; + lpae_t *entry = &mappings[level][offset]; + + ret = apply_one_level(d, entry, + level, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + count += ret; + /* L3 had better have done something! We cannot descend any further */ + BUG_ON(level == 3 && ret == P2M_ONE_DESCEND); + if ( ret != P2M_ONE_DESCEND ) break; + + BUG_ON(!p2m_valid(*entry)); + + if ( cur_offset[level] != offset ) + { + /* Update mapping for next level */ + int i; + if ( mappings[level+1] ) + unmap_domain_page(mappings[level+1]); + mappings[level+1] = map_domain_page(entry->p2m.base); + cur_offset[level] = offset; + /* Any mapping further down is now invalid */ + for ( i = level+1; i < 4; i++ ) + cur_offset[i] = ~0; + } + /* else: next level already valid */ } - - level = 3; - ret = apply_one_level(d, &third[third_table_offset(addr)], - level, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - /* L3 had better have done something! We cannot descend any further */ - BUG_ON(ret == P2M_ONE_DESCEND); - count += ret; } if ( flush ) @@ -866,9 +842,6 @@ static int apply_p2m_changes(struct domain *d, rc = 0; out: - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); - if (first) unmap_domain_page(first); if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && addr != start_gpaddr ) { @@ -884,6 +857,12 @@ out: mattr, p2m_invalid); } + for ( level = P2M_ROOT_LEVEL; level < 4; level ++ ) + { + if ( mappings[level] ) + unmap_domain_page(mappings[level]); + } + spin_unlock(&p2m->lock); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTOp-00062t-BN; Tue, 23 Sep 2014 16:57:11 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOo-00062X-1y for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:10 +0000 Received: from [193.109.254.147:45459] by server-15.bemta-14.messagelabs.com id C4/57-30948-566A1245; Tue, 23 Sep 2014 16:57:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1411491427!12555634!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20068 invoked from network); 23 Sep 2014 16:57:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOl-0002We-A4 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOl-00032k-8C for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:07 +0000 Date: Tue, 23 Sep 2014 16:57:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: handle variable p2m levels in apply_p2m_changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 82985d75968d3cde645a283adab902c7a096dc79 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:53 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: handle variable p2m levels in apply_p2m_changes As with previous changes this involves conversion from a linear series of lookups into a loop over the levels. Signed-off-by: Ian Campbell Cc: Arianna Avanzini Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 167 +++++++++++++++++++++++----------------------------- 1 files changed, 73 insertions(+), 94 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index eac3ce4..2eb553a 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -15,7 +15,6 @@ /* First level P2M is 2 consecutive pages */ #define P2M_ROOT_ORDER 1 -#define P2M_ROOT_ENTRIES (LPAE_ENTRIES<domain); } -static int p2m_first_level_index(paddr_t addr) -{ - /* - * 1st pages are concatenated so zeroeth offset gives us the - * index of the 1st page - */ - return zeroeth_table_offset(addr); -} - -/* - * Map whichever of the first pages contain addr. The caller should - * then use first_table_offset as an index. - */ -static lpae_t *p2m_map_first(struct p2m_domain *p2m, paddr_t addr) -{ - struct page_info *page; - - if ( first_linear_offset(addr) >= P2M_ROOT_ENTRIES ) - return NULL; - - page = p2m->root + p2m_first_level_index(addr); - - return __map_domain_page(page); -} - /* * Lookup the MFN corresponding to a domain's PFN. * @@ -733,13 +707,12 @@ static int apply_p2m_changes(struct domain *d, { int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; - lpae_t *first = NULL, *second = NULL, *third = NULL; + lpae_t *mappings[4] = { NULL, }; paddr_t addr, orig_maddr = maddr; unsigned int level = 0; - unsigned long cur_first_page = ~0, - cur_first_offset = ~0, - cur_second_offset = ~0; - unsigned long count = 0; + unsigned int cur_root_table = ~0; + unsigned int cur_offset[4] = { ~0, }; + unsigned int count = 0; bool_t flush = false; bool_t flush_pt; @@ -751,9 +724,21 @@ static int apply_p2m_changes(struct domain *d, spin_lock(&p2m->lock); + /* Static mapping. P2M_ROOT_PAGES > 1 are handled below */ + if ( P2M_ROOT_PAGES == 1 ) + mappings[P2M_ROOT_LEVEL] = __map_domain_page(p2m->root); + addr = start_gpaddr; while ( addr < end_gpaddr ) { + int root_table; + const unsigned int offsets[4] = { + zeroeth_table_offset(addr), + first_table_offset(addr), + second_table_offset(addr), + third_table_offset(addr) + }; + /* * Arbitrarily, preempt every 512 operations or 8192 nops. * 512*P2M_ONE_PROGRESS == 8192*P2M_ONE_PROGRESS_NOP == 0x2000 @@ -773,76 +758,67 @@ static int apply_p2m_changes(struct domain *d, count = 0; } - if ( cur_first_page != p2m_first_level_index(addr) ) + if ( P2M_ROOT_PAGES > 1 ) { - if ( first ) unmap_domain_page(first); - first = p2m_map_first(p2m, addr); - if ( !first ) + int i; + /* + * Concatenated root-level tables. The table number will be the + * offset at the previous level. It is not possible to concatenate + * a level-0 root. + */ + ASSERT(P2M_ROOT_LEVEL > 0); + root_table = offsets[P2M_ROOT_LEVEL - 1]; + if ( root_table >= P2M_ROOT_PAGES ) { rc = -EINVAL; goto out; } - cur_first_page = p2m_first_level_index(addr); - /* Any mapping further down is now invalid */ - cur_first_offset = cur_second_offset = ~0; - } - - /* We only use a 3 level p2m at the moment, so no level 0, - * current hardware doesn't support super page mappings at - * level 0 anyway */ - - level = 1; - ret = apply_one_level(d, &first[first_table_offset(addr)], - level, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - count += ret; - if ( ret != P2M_ONE_DESCEND ) continue; - - BUG_ON(!p2m_valid(first[first_table_offset(addr)])); - if ( cur_first_offset != first_table_offset(addr) ) - { - if (second) unmap_domain_page(second); - second = map_domain_page(first[first_table_offset(addr)].p2m.base); - cur_first_offset = first_table_offset(addr); - /* Any mapping further down is now invalid */ - cur_second_offset = ~0; + if ( cur_root_table != root_table ) + { + if ( mappings[P2M_ROOT_LEVEL] ) + unmap_domain_page(mappings[P2M_ROOT_LEVEL]); + mappings[P2M_ROOT_LEVEL] = + __map_domain_page(p2m->root + root_table); + cur_root_table = root_table; + /* Any mapping further down is now invalid */ + for ( i = P2M_ROOT_LEVEL; i < 4; i++ ) + cur_offset[i] = ~0; + } } - /* else: second already valid */ - - level = 2; - ret = apply_one_level(d,&second[second_table_offset(addr)], - level, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - count += ret; - if ( ret != P2M_ONE_DESCEND ) continue; - BUG_ON(!p2m_valid(second[second_table_offset(addr)])); - - if ( cur_second_offset != second_table_offset(addr) ) + for ( level = P2M_ROOT_LEVEL; level < 4; level++ ) { - /* map third level */ - if (third) unmap_domain_page(third); - third = map_domain_page(second[second_table_offset(addr)].p2m.base); - cur_second_offset = second_table_offset(addr); + unsigned offset = offsets[level]; + lpae_t *entry = &mappings[level][offset]; + + ret = apply_one_level(d, entry, + level, flush_pt, op, + start_gpaddr, end_gpaddr, + &addr, &maddr, &flush, + mattr, t); + if ( ret < 0 ) { rc = ret ; goto out; } + count += ret; + /* L3 had better have done something! We cannot descend any further */ + BUG_ON(level == 3 && ret == P2M_ONE_DESCEND); + if ( ret != P2M_ONE_DESCEND ) break; + + BUG_ON(!p2m_valid(*entry)); + + if ( cur_offset[level] != offset ) + { + /* Update mapping for next level */ + int i; + if ( mappings[level+1] ) + unmap_domain_page(mappings[level+1]); + mappings[level+1] = map_domain_page(entry->p2m.base); + cur_offset[level] = offset; + /* Any mapping further down is now invalid */ + for ( i = level+1; i < 4; i++ ) + cur_offset[i] = ~0; + } + /* else: next level already valid */ } - - level = 3; - ret = apply_one_level(d, &third[third_table_offset(addr)], - level, flush_pt, op, - start_gpaddr, end_gpaddr, - &addr, &maddr, &flush, - mattr, t); - if ( ret < 0 ) { rc = ret ; goto out; } - /* L3 had better have done something! We cannot descend any further */ - BUG_ON(ret == P2M_ONE_DESCEND); - count += ret; } if ( flush ) @@ -866,9 +842,6 @@ static int apply_p2m_changes(struct domain *d, rc = 0; out: - if (third) unmap_domain_page(third); - if (second) unmap_domain_page(second); - if (first) unmap_domain_page(first); if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && addr != start_gpaddr ) { @@ -884,6 +857,12 @@ out: mattr, p2m_invalid); } + for ( level = P2M_ROOT_LEVEL; level < 4; level ++ ) + { + if ( mappings[level] ) + unmap_domain_page(mappings[level]); + } + spin_unlock(&p2m->lock); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTOz-00065F-GD; Tue, 23 Sep 2014 16:57:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOx-00064n-Us for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:20 +0000 Received: from [85.158.143.35:34750] by server-1.bemta-4.messagelabs.com id 5F/EC-05872-F66A1245; Tue, 23 Sep 2014 16:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1411491437!12721918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30947 invoked from network); 23 Sep 2014 16:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOv-0002Wi-EN for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOv-000339-DI for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:17 +0000 Date: Tue, 23 Sep 2014 16:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: support for up to 48-bit physical addressing on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edec983d9e551681d292df5b5049c9b8721fb716 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:54 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: support for up to 48-bit physical addressing on arm64 This only affects Xen's own stage one paging. - Use symbolic names for TCR bits for clarity. - Update PADDR_BITS - Base field of LPAE PT structs is now 36 bits (and therefore unsigned long long for arm32 compatibility) - TCR_EL2.PS is set from ID_AA64MMFR0_EL1.PASize. - Provide decode of ID_AA64MMFR0_EL1 in CPU info Parts of this are derived from "xen/arm: Add 4-level page table for stage 2 translation" by Vijaya Kumar K. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm64/head.S | 10 +++++-- xen/include/asm-arm/page.h | 16 ++++++++----- xen/include/asm-arm/processor.h | 48 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 65 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 16d76f4..5c0263e 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -227,7 +227,7 @@ cpu_init_done: * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 32-bit address space goes through this table. */ - ldr r0, =0x80003500 + ldr r0, =(TCR_RES1|TCR_SH0_IS|TCR_ORGN0_WBWA|TCR_IRGN0_WBWA|TCR_T0SZ(0)) mcr CP32(r0, HTCR) /* Set up the HSCTLR: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 43b5e72..d22af1c 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -224,13 +224,17 @@ skip_bss: ldr x0, =MAIRVAL msr mair_el2, x0 - /* Set up the HTCR: - * PASize -- 40 bits / 1TB + /* Set up TCR_EL2: + * PS -- Based on ID_AA64MMFR0_EL1.PARange * Top byte is used * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 64-bit address space goes through this table. */ - ldr x0, =0x80823500 + ldr x0, =(TCR_RES1|TCR_SH0_IS|TCR_ORGN0_WBWA|TCR_IRGN0_WBWA|TCR_T0SZ(0)) + /* ID_AA64MMFR0_EL1[3:0] (PARange) corresponds to TCR_EL2[18:16] (PS) */ + mrs x1, ID_AA64MMFR0_EL1 + bfi x0, x1, #16, #3 + msr tcr_el2, x0 /* Set up the SCTLR_EL2: diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 773822f..d758b61 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -6,7 +6,11 @@ #include #include +#ifdef CONFIG_ARM_64 +#define PADDR_BITS 48 +#else #define PADDR_BITS 40 +#endif #define PADDR_MASK ((1ULL << PADDR_BITS)-1) #define VADDR_BITS 32 @@ -114,8 +118,8 @@ typedef struct __packed { unsigned long ng:1; /* Not-Global */ /* The base address must be appropriately aligned for Block entries */ - unsigned long base:28; /* Base address of block or next table */ - unsigned long sbz:12; /* Must be zero */ + unsigned long long base:36; /* Base address of block or next table */ + unsigned long sbz:4; /* Must be zero */ /* These seven bits are only used in Block entries and are ignored * in Table entries. */ @@ -149,8 +153,8 @@ typedef struct __packed { unsigned long sbz4:1; /* The base address must be appropriately aligned for Block entries */ - unsigned long base:28; /* Base address of block or next table */ - unsigned long sbz3:12; + unsigned long long base:36; /* Base address of block or next table */ + unsigned long sbz3:4; /* These seven bits are only used in Block entries and are ignored * in Table entries. */ @@ -174,9 +178,9 @@ typedef struct __packed { unsigned long pad2:10; /* The base address must be appropriately aligned for Block entries */ - unsigned long base:28; /* Base address of block or next table */ + unsigned long long base:36; /* Base address of block or next table */ - unsigned long pad1:24; + unsigned long pad1:16; } lpae_walk_t; typedef union { diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 4aab823..17f61fe 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -100,6 +100,41 @@ #define HCR_SWIO (_AC(1,UL)<<1) /* Set/Way Invalidation Override */ #define HCR_VM (_AC(1,UL)<<0) /* Virtual MMU Enable */ +/* TCR: Stage 1 Translation Control */ + +#define TCR_T0SZ(x) ((x)<<0) + +#define TCR_IRGN0_NC (_AC(0x0,UL)<<8) +#define TCR_IRGN0_WBWA (_AC(0x1,UL)<<8) +#define TCR_IRGN0_WT (_AC(0x2,UL)<<8) +#define TCR_IRGN0_WB (_AC(0x3,UL)<<8) + +#define TCR_ORGN0_NC (_AC(0x0,UL)<<10) +#define TCR_ORGN0_WBWA (_AC(0x1,UL)<<10) +#define TCR_ORGN0_WT (_AC(0x2,UL)<<10) +#define TCR_ORGN0_WB (_AC(0x3,UL)<<10) + +#define TCR_SH0_NS (_AC(0x0,UL)<<12) +#define TCR_SH0_OS (_AC(0x2,UL)<<12) +#define TCR_SH0_IS (_AC(0x3,UL)<<12) + +#define TCR_TG0_4K (_AC(0x0,UL)<<14) +#define TCR_TG0_64K (_AC(0x1,UL)<<14) +#define TCR_TG0_16K (_AC(0x2,UL)<<14) + +#ifdef CONFIG_ARM_64 + +#define TCR_PS(x) ((x)<<16) +#define TCR_TBI (_AC(0x1,UL)<<20) + +#define TCR_RES1 (_AC(1,UL)<<31|_AC(1,UL)<<23) + +#else + +#define TCR_RES1 (_AC(1,UL)<<31) + +#endif + /* HCPTR Hyp. Coprocessor Trap Register */ #define HCPTR_TTA ((_AC(1,U)<<20)) /* Trap trace registers */ #define HCPTR_CP(x) ((_AC(1,U)<<(x))) /* Trap Coprocessor x */ @@ -204,8 +239,19 @@ struct cpuinfo_arm { uint64_t bits[2]; } aux64; - struct { + union { uint64_t bits[2]; + struct { + unsigned long pa_range:4; + unsigned long asid_bits:4; + unsigned long bigend:4; + unsigned long secure_ns:4; + unsigned long bigend_el0:4; + unsigned long tgranule_16K:4; + unsigned long tgranule_64K:4; + unsigned long tgranule_4K:4; + unsigned long __res0:32; + }; } mm64; struct { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTOz-00065F-GD; Tue, 23 Sep 2014 16:57:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOx-00064n-Us for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:20 +0000 Received: from [85.158.143.35:34750] by server-1.bemta-4.messagelabs.com id 5F/EC-05872-F66A1245; Tue, 23 Sep 2014 16:57:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1411491437!12721918!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30947 invoked from network); 23 Sep 2014 16:57:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:18 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTOv-0002Wi-EN for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTOv-000339-DI for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:17 +0000 Date: Tue, 23 Sep 2014 16:57:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: support for up to 48-bit physical addressing on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit edec983d9e551681d292df5b5049c9b8721fb716 Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:54 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: support for up to 48-bit physical addressing on arm64 This only affects Xen's own stage one paging. - Use symbolic names for TCR bits for clarity. - Update PADDR_BITS - Base field of LPAE PT structs is now 36 bits (and therefore unsigned long long for arm32 compatibility) - TCR_EL2.PS is set from ID_AA64MMFR0_EL1.PASize. - Provide decode of ID_AA64MMFR0_EL1 in CPU info Parts of this are derived from "xen/arm: Add 4-level page table for stage 2 translation" by Vijaya Kumar K. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/arm32/head.S | 2 +- xen/arch/arm/arm64/head.S | 10 +++++-- xen/include/asm-arm/page.h | 16 ++++++++----- xen/include/asm-arm/processor.h | 48 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 65 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/arm32/head.S b/xen/arch/arm/arm32/head.S index 16d76f4..5c0263e 100644 --- a/xen/arch/arm/arm32/head.S +++ b/xen/arch/arm/arm32/head.S @@ -227,7 +227,7 @@ cpu_init_done: * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 32-bit address space goes through this table. */ - ldr r0, =0x80003500 + ldr r0, =(TCR_RES1|TCR_SH0_IS|TCR_ORGN0_WBWA|TCR_IRGN0_WBWA|TCR_T0SZ(0)) mcr CP32(r0, HTCR) /* Set up the HSCTLR: diff --git a/xen/arch/arm/arm64/head.S b/xen/arch/arm/arm64/head.S index 43b5e72..d22af1c 100644 --- a/xen/arch/arm/arm64/head.S +++ b/xen/arch/arm/arm64/head.S @@ -224,13 +224,17 @@ skip_bss: ldr x0, =MAIRVAL msr mair_el2, x0 - /* Set up the HTCR: - * PASize -- 40 bits / 1TB + /* Set up TCR_EL2: + * PS -- Based on ID_AA64MMFR0_EL1.PARange * Top byte is used * PT walks use Inner-Shareable accesses, * PT walks are write-back, write-allocate in both cache levels, * Full 64-bit address space goes through this table. */ - ldr x0, =0x80823500 + ldr x0, =(TCR_RES1|TCR_SH0_IS|TCR_ORGN0_WBWA|TCR_IRGN0_WBWA|TCR_T0SZ(0)) + /* ID_AA64MMFR0_EL1[3:0] (PARange) corresponds to TCR_EL2[18:16] (PS) */ + mrs x1, ID_AA64MMFR0_EL1 + bfi x0, x1, #16, #3 + msr tcr_el2, x0 /* Set up the SCTLR_EL2: diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 773822f..d758b61 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -6,7 +6,11 @@ #include #include +#ifdef CONFIG_ARM_64 +#define PADDR_BITS 48 +#else #define PADDR_BITS 40 +#endif #define PADDR_MASK ((1ULL << PADDR_BITS)-1) #define VADDR_BITS 32 @@ -114,8 +118,8 @@ typedef struct __packed { unsigned long ng:1; /* Not-Global */ /* The base address must be appropriately aligned for Block entries */ - unsigned long base:28; /* Base address of block or next table */ - unsigned long sbz:12; /* Must be zero */ + unsigned long long base:36; /* Base address of block or next table */ + unsigned long sbz:4; /* Must be zero */ /* These seven bits are only used in Block entries and are ignored * in Table entries. */ @@ -149,8 +153,8 @@ typedef struct __packed { unsigned long sbz4:1; /* The base address must be appropriately aligned for Block entries */ - unsigned long base:28; /* Base address of block or next table */ - unsigned long sbz3:12; + unsigned long long base:36; /* Base address of block or next table */ + unsigned long sbz3:4; /* These seven bits are only used in Block entries and are ignored * in Table entries. */ @@ -174,9 +178,9 @@ typedef struct __packed { unsigned long pad2:10; /* The base address must be appropriately aligned for Block entries */ - unsigned long base:28; /* Base address of block or next table */ + unsigned long long base:36; /* Base address of block or next table */ - unsigned long pad1:24; + unsigned long pad1:16; } lpae_walk_t; typedef union { diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 4aab823..17f61fe 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -100,6 +100,41 @@ #define HCR_SWIO (_AC(1,UL)<<1) /* Set/Way Invalidation Override */ #define HCR_VM (_AC(1,UL)<<0) /* Virtual MMU Enable */ +/* TCR: Stage 1 Translation Control */ + +#define TCR_T0SZ(x) ((x)<<0) + +#define TCR_IRGN0_NC (_AC(0x0,UL)<<8) +#define TCR_IRGN0_WBWA (_AC(0x1,UL)<<8) +#define TCR_IRGN0_WT (_AC(0x2,UL)<<8) +#define TCR_IRGN0_WB (_AC(0x3,UL)<<8) + +#define TCR_ORGN0_NC (_AC(0x0,UL)<<10) +#define TCR_ORGN0_WBWA (_AC(0x1,UL)<<10) +#define TCR_ORGN0_WT (_AC(0x2,UL)<<10) +#define TCR_ORGN0_WB (_AC(0x3,UL)<<10) + +#define TCR_SH0_NS (_AC(0x0,UL)<<12) +#define TCR_SH0_OS (_AC(0x2,UL)<<12) +#define TCR_SH0_IS (_AC(0x3,UL)<<12) + +#define TCR_TG0_4K (_AC(0x0,UL)<<14) +#define TCR_TG0_64K (_AC(0x1,UL)<<14) +#define TCR_TG0_16K (_AC(0x2,UL)<<14) + +#ifdef CONFIG_ARM_64 + +#define TCR_PS(x) ((x)<<16) +#define TCR_TBI (_AC(0x1,UL)<<20) + +#define TCR_RES1 (_AC(1,UL)<<31|_AC(1,UL)<<23) + +#else + +#define TCR_RES1 (_AC(1,UL)<<31) + +#endif + /* HCPTR Hyp. Coprocessor Trap Register */ #define HCPTR_TTA ((_AC(1,U)<<20)) /* Trap trace registers */ #define HCPTR_CP(x) ((_AC(1,U)<<(x))) /* Trap Coprocessor x */ @@ -204,8 +239,19 @@ struct cpuinfo_arm { uint64_t bits[2]; } aux64; - struct { + union { uint64_t bits[2]; + struct { + unsigned long pa_range:4; + unsigned long asid_bits:4; + unsigned long bigend:4; + unsigned long secure_ns:4; + unsigned long bigend_el0:4; + unsigned long tgranule_16K:4; + unsigned long tgranule_64K:4; + unsigned long tgranule_4K:4; + unsigned long __res0:32; + }; } mm64; struct { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTP9-00067U-J4; Tue, 23 Sep 2014 16:57:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTP8-00067A-B6 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:30 +0000 Received: from [85.158.143.35:35370] by server-3.bemta-4.messagelabs.com id F2/60-06192-976A1245; Tue, 23 Sep 2014 16:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1411491447!4682579!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3086 invoked from network); 23 Sep 2014 16:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTP5-0002Wo-JU for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTP5-000341-Ho for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:27 +0000 Date: Tue, 23 Sep 2014 16:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: support for up to 48-bit IPA addressing on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c92a2aaf8c681efea9a3125e63d45b2d0083abf Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:55 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: support for up to 48-bit IPA addressing on arm64 Currently we support only 40-bits. This is insufficient on systems where peripherals which need to be 1:1 mapped to dom0 are above the 40-bit limit. Unfortunately the hardware requirements are such that this means that the number of levels in the P2M is not static and must vary with the number of implemented physical address bits. This is described in ARM DDI 0487A.b Table D4-5. In short there is no single p2m configuration which supports everything from 40- to 48- bits. For example a system which supports up to 40-bit addressing will only support 3 level p2m (maximum SL0 is 1 == 3 levels), requiring a concatenated page table root consisting of two pages to make the full 40-bits of addressing. A maximum of 16 pages can be concatenated meaning that a 3 level p2m can only support up to 43-bit addresses. Therefore support for 48-bit addressing requires SL0==2 (4 levels of paging). After the previous patches our various p2m lookup and manipulation functions already support starting at arbitrary level and with arbitrary root concatenation. All that remains is to determine the correct settings from ID_AA64MMFR0_EL1.PARange for which we use a lookup table. As well as supporting 44 and 48 bit addressing we can also reduce the order of the first level for systems which support only 32 or 36 physical address bits, saving a page. Systems with 42-bits are an interesting case, since they only support 3 levels of paging, implying that 8 pages are required at the root level. So far I am not aware of any systems with peripheral located so high up (the only 42-bit system I've seen has nothing above 40-bits), so such systems remain configured for 40-bit IPA with a pair of pages at the root of the p2m. Switching to symbolic names for the VTCR_EL2 bits as we go improves the clarity of the result. Parts of this are derived from "xen/arm: Add 4-level page table for stage 2 translation" by Vijaya Kumar K. arm32 remains with the static 3-level, 2 page root configuration. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 84 +++++++++++++++++++++++++++++++-------- xen/include/asm-arm/p2m.h | 2 +- xen/include/asm-arm/processor.h | 32 +++++++++++++++ 3 files changed, 100 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 2eb553a..4dccf7b 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -11,10 +11,17 @@ #include #include -#define P2M_ROOT_LEVEL 1 +#ifdef CONFIG_ARM_64 +static unsigned int __read_mostly p2m_root_order; +static unsigned int __read_mostly p2m_root_level; +#define P2M_ROOT_ORDER p2m_root_order +#define P2M_ROOT_LEVEL p2m_root_level +#else +/* First level P2M is alway 2 consecutive pages */ +#define P2M_ROOT_LEVEL 1 +#define P2M_ROOT_ORDER 1 +#endif -/* First level P2M is 2 consecutive pages */ -#define P2M_ROOT_ORDER 1 #define P2M_ROOT_PAGES (1<root + root_table); + ASSERT(P2M_ROOT_LEVEL < 4); + for ( level = P2M_ROOT_LEVEL ; level < 4 ; level++ ) { mask = masks[level]; @@ -952,6 +961,7 @@ int p2m_alloc_table(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page; + unsigned int i; page = alloc_domheap_pages(NULL, P2M_ROOT_ORDER, 0); if ( page == NULL ) @@ -960,8 +970,8 @@ int p2m_alloc_table(struct domain *d) spin_lock(&p2m->lock); /* Clear both first level pages */ - clear_and_clean_page(page); - clear_and_clean_page(page + 1); + for ( i = 0; i < P2M_ROOT_PAGES; i++ ) + clear_and_clean_page(page + i); p2m->root = page; @@ -1147,21 +1157,61 @@ static void __init setup_virt_paging_one(void *data) void __init setup_virt_paging(void) { - unsigned long val; - /* Setup Stage 2 address translation */ - /* SH0=11 (Inner-shareable) - * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) - * SL0=01 (Level-1) - * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) - * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) - * PS=010 == 40 bits - */ + unsigned long val = VTCR_RES1|VTCR_SH0_IS|VTCR_ORGN0_WBWA|VTCR_IRGN0_WBWA; + #ifdef CONFIG_ARM_32 - val = 0x80003558; -#else - val = 0x80023558; + printk("P2M: 40-bit IPA\n"); + val |= VTCR_T0SZ(0x18); /* 40 bit IPA */ +#else /* CONFIG_ARM_64 */ + const struct { + unsigned int pabits; /* Physical Address Size */ + unsigned int t0sz; /* Desired T0SZ, minimum in comment */ + unsigned int root_order; /* Page order of the root of the p2m */ + unsigned int sl0; /* Desired SL0, maximum in comment */ + } pa_range_info[] = { + /* T0SZ minimum and SL0 maximum from ARM DDI 0487A.b Table D4-5 */ + /* PA size, t0sz(min), root-order, sl0(max) */ + [0] = { 32, 32/*32*/, 0, 1 }, + [1] = { 36, 28/*28*/, 0, 1 }, + [2] = { 40, 24/*24*/, 1, 1 }, + [3] = { 42, 24/*22*/, 1, 1 }, + [4] = { 44, 20/*20*/, 0, 2 }, + [5] = { 48, 16/*16*/, 0, 2 }, + [6] = { 0 }, /* Invalid */ + [7] = { 0 } /* Invalid */ + }; + + unsigned int cpu; + unsigned int pa_range = 0x10; /* Larger than any possible value */ + + for_each_online_cpu ( cpu ) + { + const struct cpuinfo_arm *info = &cpu_data[cpu]; + if ( info->mm64.pa_range < pa_range ) + pa_range = info->mm64.pa_range; + } + + /* pa_range is 4 bits, but the defined encodings are only 3 bits */ + if ( pa_range&0x8 || !pa_range_info[pa_range].pabits ) + panic("Unknown encoding of ID_AA64MMFR0_EL1.PARange %x\n", pa_range); + + val |= VTCR_PS(pa_range); + val |= VTCR_TG0_4K; + val |= VTCR_SL0(pa_range_info[pa_range].sl0); + val |= VTCR_T0SZ(pa_range_info[pa_range].t0sz); + + p2m_root_order = pa_range_info[pa_range].root_order; + p2m_root_level = 2 - pa_range_info[pa_range].sl0; + + printk("P2M: %d-bit IPA with %d-bit PA\n", + 64 - pa_range_info[pa_range].t0sz, + pa_range_info[pa_range].pabits); #endif + printk("P2M: %d levels with order-%d root, VTCR 0x%lx\n", + 4 - P2M_ROOT_LEVEL, P2M_ROOT_ORDER, val); + /* It is not allowed to concatenate a level zero root */ + BUG_ON( P2M_ROOT_LEVEL == 0 && P2M_ROOT_ORDER > 0 ); setup_virt_paging_one((void *)val); smp_call_function(setup_virt_paging_one, (void *)val, 1); } diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 999f20a..faf14d3 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -19,7 +19,7 @@ struct p2m_domain { /* Pages used to construct the p2m */ struct page_list_head pages; - /* Root of p2m page tables, 2 contiguous pages */ + /* The root of the p2m tree. May be concatenated */ struct page_info *root; /* Current VMID in use */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 17f61fe..07a421c 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -135,6 +135,38 @@ #endif +/* VTCR: Stage 2 Translation Control */ + +#define VTCR_T0SZ(x) ((x)<<0) + +#define VTCR_SL0(x) ((x)<<6) + +#define VTCR_IRGN0_NC (_AC(0x0,UL)<<8) +#define VTCR_IRGN0_WBWA (_AC(0x1,UL)<<8) +#define VTCR_IRGN0_WT (_AC(0x2,UL)<<8) +#define VTCR_IRGN0_WB (_AC(0x3,UL)<<8) + +#define VTCR_ORGN0_NC (_AC(0x0,UL)<<10) +#define VTCR_ORGN0_WBWA (_AC(0x1,UL)<<10) +#define VTCR_ORGN0_WT (_AC(0x2,UL)<<10) +#define VTCR_ORGN0_WB (_AC(0x3,UL)<<10) + +#define VTCR_SH0_NS (_AC(0x0,UL)<<12) +#define VTCR_SH0_OS (_AC(0x2,UL)<<12) +#define VTCR_SH0_IS (_AC(0x3,UL)<<12) + +#ifdef CONFIG_ARM_64 + +#define VTCR_TG0_4K (_AC(0x0,UL)<<14) +#define VTCR_TG0_64K (_AC(0x1,UL)<<14) +#define VTCR_TG0_16K (_AC(0x2,UL)<<14) + +#define VTCR_PS(x) ((x)<<16) + +#endif + +#define VTCR_RES1 (_AC(1,UL)<<31) + /* HCPTR Hyp. Coprocessor Trap Register */ #define HCPTR_TTA ((_AC(1,U)<<20)) /* Trap trace registers */ #define HCPTR_CP(x) ((_AC(1,U)<<(x))) /* Trap Coprocessor x */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:34 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTP9-00067U-J4; Tue, 23 Sep 2014 16:57:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTP8-00067A-B6 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:30 +0000 Received: from [85.158.143.35:35370] by server-3.bemta-4.messagelabs.com id F2/60-06192-976A1245; Tue, 23 Sep 2014 16:57:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1411491447!4682579!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3086 invoked from network); 23 Sep 2014 16:57:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:28 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTP5-0002Wo-JU for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTP5-000341-Ho for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:27 +0000 Date: Tue, 23 Sep 2014 16:57:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: support for up to 48-bit IPA addressing on arm64 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c92a2aaf8c681efea9a3125e63d45b2d0083abf Author: Ian Campbell AuthorDate: Thu Sep 18 01:09:55 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 16:44:55 2014 +0100 xen: arm: support for up to 48-bit IPA addressing on arm64 Currently we support only 40-bits. This is insufficient on systems where peripherals which need to be 1:1 mapped to dom0 are above the 40-bit limit. Unfortunately the hardware requirements are such that this means that the number of levels in the P2M is not static and must vary with the number of implemented physical address bits. This is described in ARM DDI 0487A.b Table D4-5. In short there is no single p2m configuration which supports everything from 40- to 48- bits. For example a system which supports up to 40-bit addressing will only support 3 level p2m (maximum SL0 is 1 == 3 levels), requiring a concatenated page table root consisting of two pages to make the full 40-bits of addressing. A maximum of 16 pages can be concatenated meaning that a 3 level p2m can only support up to 43-bit addresses. Therefore support for 48-bit addressing requires SL0==2 (4 levels of paging). After the previous patches our various p2m lookup and manipulation functions already support starting at arbitrary level and with arbitrary root concatenation. All that remains is to determine the correct settings from ID_AA64MMFR0_EL1.PARange for which we use a lookup table. As well as supporting 44 and 48 bit addressing we can also reduce the order of the first level for systems which support only 32 or 36 physical address bits, saving a page. Systems with 42-bits are an interesting case, since they only support 3 levels of paging, implying that 8 pages are required at the root level. So far I am not aware of any systems with peripheral located so high up (the only 42-bit system I've seen has nothing above 40-bits), so such systems remain configured for 40-bit IPA with a pair of pages at the root of the p2m. Switching to symbolic names for the VTCR_EL2 bits as we go improves the clarity of the result. Parts of this are derived from "xen/arm: Add 4-level page table for stage 2 translation" by Vijaya Kumar K. arm32 remains with the static 3-level, 2 page root configuration. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 84 +++++++++++++++++++++++++++++++-------- xen/include/asm-arm/p2m.h | 2 +- xen/include/asm-arm/processor.h | 32 +++++++++++++++ 3 files changed, 100 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 2eb553a..4dccf7b 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -11,10 +11,17 @@ #include #include -#define P2M_ROOT_LEVEL 1 +#ifdef CONFIG_ARM_64 +static unsigned int __read_mostly p2m_root_order; +static unsigned int __read_mostly p2m_root_level; +#define P2M_ROOT_ORDER p2m_root_order +#define P2M_ROOT_LEVEL p2m_root_level +#else +/* First level P2M is alway 2 consecutive pages */ +#define P2M_ROOT_LEVEL 1 +#define P2M_ROOT_ORDER 1 +#endif -/* First level P2M is 2 consecutive pages */ -#define P2M_ROOT_ORDER 1 #define P2M_ROOT_PAGES (1<root + root_table); + ASSERT(P2M_ROOT_LEVEL < 4); + for ( level = P2M_ROOT_LEVEL ; level < 4 ; level++ ) { mask = masks[level]; @@ -952,6 +961,7 @@ int p2m_alloc_table(struct domain *d) { struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page; + unsigned int i; page = alloc_domheap_pages(NULL, P2M_ROOT_ORDER, 0); if ( page == NULL ) @@ -960,8 +970,8 @@ int p2m_alloc_table(struct domain *d) spin_lock(&p2m->lock); /* Clear both first level pages */ - clear_and_clean_page(page); - clear_and_clean_page(page + 1); + for ( i = 0; i < P2M_ROOT_PAGES; i++ ) + clear_and_clean_page(page + i); p2m->root = page; @@ -1147,21 +1157,61 @@ static void __init setup_virt_paging_one(void *data) void __init setup_virt_paging(void) { - unsigned long val; - /* Setup Stage 2 address translation */ - /* SH0=11 (Inner-shareable) - * ORGN0=IRGN0=01 (Normal memory, Write-Back Write-Allocate Cacheable) - * SL0=01 (Level-1) - * ARVv7: T0SZ=(1)1000 = -8 (32-(-8) = 40 bit physical addresses) - * ARMv8: T0SZ=01 1000 = 24 (64-24 = 40 bit physical addresses) - * PS=010 == 40 bits - */ + unsigned long val = VTCR_RES1|VTCR_SH0_IS|VTCR_ORGN0_WBWA|VTCR_IRGN0_WBWA; + #ifdef CONFIG_ARM_32 - val = 0x80003558; -#else - val = 0x80023558; + printk("P2M: 40-bit IPA\n"); + val |= VTCR_T0SZ(0x18); /* 40 bit IPA */ +#else /* CONFIG_ARM_64 */ + const struct { + unsigned int pabits; /* Physical Address Size */ + unsigned int t0sz; /* Desired T0SZ, minimum in comment */ + unsigned int root_order; /* Page order of the root of the p2m */ + unsigned int sl0; /* Desired SL0, maximum in comment */ + } pa_range_info[] = { + /* T0SZ minimum and SL0 maximum from ARM DDI 0487A.b Table D4-5 */ + /* PA size, t0sz(min), root-order, sl0(max) */ + [0] = { 32, 32/*32*/, 0, 1 }, + [1] = { 36, 28/*28*/, 0, 1 }, + [2] = { 40, 24/*24*/, 1, 1 }, + [3] = { 42, 24/*22*/, 1, 1 }, + [4] = { 44, 20/*20*/, 0, 2 }, + [5] = { 48, 16/*16*/, 0, 2 }, + [6] = { 0 }, /* Invalid */ + [7] = { 0 } /* Invalid */ + }; + + unsigned int cpu; + unsigned int pa_range = 0x10; /* Larger than any possible value */ + + for_each_online_cpu ( cpu ) + { + const struct cpuinfo_arm *info = &cpu_data[cpu]; + if ( info->mm64.pa_range < pa_range ) + pa_range = info->mm64.pa_range; + } + + /* pa_range is 4 bits, but the defined encodings are only 3 bits */ + if ( pa_range&0x8 || !pa_range_info[pa_range].pabits ) + panic("Unknown encoding of ID_AA64MMFR0_EL1.PARange %x\n", pa_range); + + val |= VTCR_PS(pa_range); + val |= VTCR_TG0_4K; + val |= VTCR_SL0(pa_range_info[pa_range].sl0); + val |= VTCR_T0SZ(pa_range_info[pa_range].t0sz); + + p2m_root_order = pa_range_info[pa_range].root_order; + p2m_root_level = 2 - pa_range_info[pa_range].sl0; + + printk("P2M: %d-bit IPA with %d-bit PA\n", + 64 - pa_range_info[pa_range].t0sz, + pa_range_info[pa_range].pabits); #endif + printk("P2M: %d levels with order-%d root, VTCR 0x%lx\n", + 4 - P2M_ROOT_LEVEL, P2M_ROOT_ORDER, val); + /* It is not allowed to concatenate a level zero root */ + BUG_ON( P2M_ROOT_LEVEL == 0 && P2M_ROOT_ORDER > 0 ); setup_virt_paging_one((void *)val); smp_call_function(setup_virt_paging_one, (void *)val, 1); } diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 999f20a..faf14d3 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -19,7 +19,7 @@ struct p2m_domain { /* Pages used to construct the p2m */ struct page_list_head pages; - /* Root of p2m page tables, 2 contiguous pages */ + /* The root of the p2m tree. May be concatenated */ struct page_info *root; /* Current VMID in use */ diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 17f61fe..07a421c 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -135,6 +135,38 @@ #endif +/* VTCR: Stage 2 Translation Control */ + +#define VTCR_T0SZ(x) ((x)<<0) + +#define VTCR_SL0(x) ((x)<<6) + +#define VTCR_IRGN0_NC (_AC(0x0,UL)<<8) +#define VTCR_IRGN0_WBWA (_AC(0x1,UL)<<8) +#define VTCR_IRGN0_WT (_AC(0x2,UL)<<8) +#define VTCR_IRGN0_WB (_AC(0x3,UL)<<8) + +#define VTCR_ORGN0_NC (_AC(0x0,UL)<<10) +#define VTCR_ORGN0_WBWA (_AC(0x1,UL)<<10) +#define VTCR_ORGN0_WT (_AC(0x2,UL)<<10) +#define VTCR_ORGN0_WB (_AC(0x3,UL)<<10) + +#define VTCR_SH0_NS (_AC(0x0,UL)<<12) +#define VTCR_SH0_OS (_AC(0x2,UL)<<12) +#define VTCR_SH0_IS (_AC(0x3,UL)<<12) + +#ifdef CONFIG_ARM_64 + +#define VTCR_TG0_4K (_AC(0x0,UL)<<14) +#define VTCR_TG0_64K (_AC(0x1,UL)<<14) +#define VTCR_TG0_16K (_AC(0x2,UL)<<14) + +#define VTCR_PS(x) ((x)<<16) + +#endif + +#define VTCR_RES1 (_AC(1,UL)<<31) + /* HCPTR Hyp. Coprocessor Trap Register */ #define HCPTR_TTA ((_AC(1,U)<<20)) /* Trap trace registers */ #define HCPTR_CP(x) ((_AC(1,U)<<(x))) /* Trap Coprocessor x */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPJ-00069c-Lw; Tue, 23 Sep 2014 16:57:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPI-00069O-M6 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:40 +0000 Received: from [85.158.143.35:36004] by server-1.bemta-4.messagelabs.com id F9/3D-05872-486A1245; Tue, 23 Sep 2014 16:57:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1411491457!12749157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13382 invoked from network); 23 Sep 2014 16:57:38 -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; 23 Sep 2014 16:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPF-0002Wy-Pm for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTPF-00034X-OV for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:37 +0000 Date: Tue, 23 Sep 2014 16:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: refactor physical address space compression support into common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e028cedcae2edafb6ba176ec1e8c269346be05bc Author: Ian Campbell AuthorDate: Wed Sep 17 22:21:01 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 17:02:08 2014 +0100 xen: refactor physical address space compression support into common code The "pdx compression" functionality will be useful on ARM as well. Move the code to common code+header and introduce HAS_PDX to control when it is built. L2_PAGETABLE_SHIFT is x86 specific, so introduce PDX_GROUP_SHIFT to abstract it out. ARM has no need for superpage compression (yet?) and lacks SUPERPAGE_SHIFT so those functions (spage_to_mfn et al) are not moved. No affect on x86 and no change for ARM (yet). Signed-off-by: Ian Campbell Acked-by: Jan Beulich --- xen/Rules.mk | 1 + xen/arch/x86/Rules.mk | 1 + xen/arch/x86/mm.c | 3 - xen/arch/x86/setup.c | 10 ---- xen/arch/x86/x86_64/mm.c | 53 -------------------- xen/common/Makefile | 1 + xen/common/pdx.c | 99 +++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/mm.h | 4 +- xen/include/asm-x86/page.h | 2 - xen/include/asm-x86/x86_64/page.h | 25 +--------- xen/include/xen/pdx.h | 47 +++++++++++++++++ 11 files changed, 152 insertions(+), 94 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b49f3c8..e2f9e36 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,6 +59,7 @@ CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE CFLAGS-$(HAS_PCI) += -DHAS_PCI CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS +CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 576985e..6775cb5 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -12,6 +12,7 @@ HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y HAS_GDBSX := y +HAS_PDX := y xenoprof := y # diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d23cb3f..5b3f06f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -147,9 +147,6 @@ struct domain *dom_xen, *dom_io, *dom_cow; unsigned long max_page; unsigned long total_pages; -unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( - (FRAMETABLE_NR + PDX_GROUP_COUNT - 1) / PDX_GROUP_COUNT)] = { [0] = 1 }; - bool_t __read_mostly machine_to_phys_mapping_valid = 0; struct rangeset *__read_mostly mmio_ro_ranges; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6a814cd..8c8b91f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -392,16 +392,6 @@ static void __init setup_max_pdx(unsigned long top_page) max_page = pdx_to_pfn(max_pdx - 1) + 1; } -void set_pdx_range(unsigned long smfn, unsigned long emfn) -{ - unsigned long idx, eidx; - - idx = pfn_to_pdx(smfn) / PDX_GROUP_COUNT; - eidx = (pfn_to_pdx(emfn - 1) + PDX_GROUP_COUNT) / PDX_GROUP_COUNT; - for ( ; idx < eidx; ++idx ) - __set_bit(idx, pdx_group_valid); -} - /* A temporary copy of the e820 map that we can mess with during bootstrap. */ static struct e820map __initdata boot_e820; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 4937f9a..09817fc 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -40,15 +40,6 @@ #include #include -/* Parameters for PFN/MADDR compression. */ -unsigned long __read_mostly max_pdx; -unsigned long __read_mostly pfn_pdx_bottom_mask = ~0UL; -unsigned long __read_mostly ma_va_bottom_mask = ~0UL; -unsigned long __read_mostly pfn_top_mask = 0; -unsigned long __read_mostly ma_top_mask = 0; -unsigned long __read_mostly pfn_hole_mask = 0; -unsigned int __read_mostly pfn_pdx_hole_shift = 0; - unsigned int __read_mostly m2p_compat_vstart = __HYPERVISOR_COMPAT_VIRT_START; /* Enough page directories to map into the bottom 1GB. */ @@ -59,14 +50,6 @@ l2_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) l2_pgentry_t *compat_idle_pg_table_l2; -int __mfn_valid(unsigned long mfn) -{ - return likely(mfn < max_page) && - likely(!(mfn & pfn_hole_mask)) && - likely(test_bit(pfn_to_pdx(mfn) / PDX_GROUP_COUNT, - pdx_group_valid)); -} - void *do_page_walk(struct vcpu *v, unsigned long addr) { unsigned long mfn = pagetable_get_pfn(v->arch.guest_table); @@ -119,42 +102,6 @@ void *do_page_walk(struct vcpu *v, unsigned long addr) return map_domain_page(mfn) + (addr & ~PAGE_MASK); } -void __init pfn_pdx_hole_setup(unsigned long mask) -{ - unsigned int i, j, bottom_shift = 0, hole_shift = 0; - - /* - * We skip the first MAX_ORDER bits, as we never want to compress them. - * This guarantees that page-pointer arithmetic remains valid within - * contiguous aligned ranges of 2^MAX_ORDER pages. Among others, our - * buddy allocator relies on this assumption. - */ - for ( j = MAX_ORDER-1; ; ) - { - i = find_next_zero_bit(&mask, BITS_PER_LONG, j); - j = find_next_bit(&mask, BITS_PER_LONG, i); - if ( j >= BITS_PER_LONG ) - break; - if ( j - i > hole_shift ) - { - hole_shift = j - i; - bottom_shift = i; - } - } - if ( !hole_shift ) - return; - - printk(KERN_INFO "PFN compression on bits %u...%u\n", - bottom_shift, bottom_shift + hole_shift - 1); - - pfn_pdx_hole_shift = hole_shift; - pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; - ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; - pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; - pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); - ma_top_mask = pfn_top_mask << PAGE_SHIFT; -} - /* * Allocate page table pages for m2p table */ diff --git a/xen/common/Makefile b/xen/common/Makefile index 3683ae3..f7d10f0 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -51,6 +51,7 @@ obj-y += tmem_xen.o obj-y += radix-tree.o obj-y += rbtree.o obj-y += lzo.o +obj-$(HAS_PDX) += pdx.o obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo unlz4 earlycpio,$(n).init.o) diff --git a/xen/common/pdx.c b/xen/common/pdx.c new file mode 100644 index 0000000..11349a7 --- /dev/null +++ b/xen/common/pdx.c @@ -0,0 +1,99 @@ +/****************************************************************************** + * Original code extracted from arch/x86/x86_64/mm.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include + +/* Parameters for PFN/MADDR compression. */ +unsigned long __read_mostly max_pdx; +unsigned long __read_mostly pfn_pdx_bottom_mask = ~0UL; +unsigned long __read_mostly ma_va_bottom_mask = ~0UL; +unsigned long __read_mostly pfn_top_mask = 0; +unsigned long __read_mostly ma_top_mask = 0; +unsigned long __read_mostly pfn_hole_mask = 0; +unsigned int __read_mostly pfn_pdx_hole_shift = 0; + +unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( + (FRAMETABLE_NR + PDX_GROUP_COUNT - 1) / PDX_GROUP_COUNT)] = { [0] = 1 }; + +int __mfn_valid(unsigned long mfn) +{ + return likely(mfn < max_page) && + likely(!(mfn & pfn_hole_mask)) && + likely(test_bit(pfn_to_pdx(mfn) / PDX_GROUP_COUNT, + pdx_group_valid)); +} + +void set_pdx_range(unsigned long smfn, unsigned long emfn) +{ + unsigned long idx, eidx; + + idx = pfn_to_pdx(smfn) / PDX_GROUP_COUNT; + eidx = (pfn_to_pdx(emfn - 1) + PDX_GROUP_COUNT) / PDX_GROUP_COUNT; + + for ( ; idx < eidx; ++idx ) + __set_bit(idx, pdx_group_valid); +} + +void __init pfn_pdx_hole_setup(unsigned long mask) +{ + unsigned int i, j, bottom_shift = 0, hole_shift = 0; + + /* + * We skip the first MAX_ORDER bits, as we never want to compress them. + * This guarantees that page-pointer arithmetic remains valid within + * contiguous aligned ranges of 2^MAX_ORDER pages. Among others, our + * buddy allocator relies on this assumption. + */ + for ( j = MAX_ORDER-1; ; ) + { + i = find_next_zero_bit(&mask, BITS_PER_LONG, j); + j = find_next_bit(&mask, BITS_PER_LONG, i); + if ( j >= BITS_PER_LONG ) + break; + if ( j - i > hole_shift ) + { + hole_shift = j - i; + bottom_shift = i; + } + } + if ( !hole_shift ) + return; + + printk(KERN_INFO "PFN compression on bits %u...%u\n", + bottom_shift, bottom_shift + hole_shift - 1); + + pfn_pdx_hole_shift = hole_shift; + pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; + ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; + pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; + pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); + ma_top_mask = pfn_top_mask << PAGE_SHIFT; +} + + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 7b85865..746bcf1 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -280,9 +280,7 @@ extern unsigned long max_page; extern unsigned long total_pages; void init_frametable(void); -#define PDX_GROUP_COUNT ((1 << L2_PAGETABLE_SHIFT) / \ - (sizeof(*frame_table) & -sizeof(*frame_table))) -extern unsigned long pdx_group_valid[]; +#define PDX_GROUP_SHIFT L2_PAGETABLE_SHIFT /* Convert between Xen-heap virtual addresses and page-info structures. */ static inline struct page_info *__virt_to_page(const void *v) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index ccc268d..9aa780e 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -334,8 +334,6 @@ void *alloc_xen_pagetable(void); void free_xen_pagetable(void *v); l1_pgentry_t *virt_to_xen_l1e(unsigned long v); -extern void set_pdx_range(unsigned long smfn, unsigned long emfn); - /* Convert between PAT/PCD/PWT embedded in PTE flags and 3-bit cacheattr. */ static inline uint32_t pte_flags_to_cacheattr(uint32_t flags) { diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 3eee5b5..1d54587 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -35,17 +35,10 @@ #include #include -extern unsigned long xen_virt_end; +#include -extern unsigned long max_pdx; -extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; -extern unsigned int pfn_pdx_hole_shift; -extern unsigned long pfn_hole_mask; -extern unsigned long pfn_top_mask, ma_top_mask; -extern void pfn_pdx_hole_setup(unsigned long); +extern unsigned long xen_virt_end; -#define page_to_pdx(pg) ((pg) - frame_table) -#define pdx_to_page(pdx) (frame_table + (pdx)) #define spage_to_pdx(spg) (((spg) - spage_table)<<(SUPERPAGE_SHIFT-PAGE_SHIFT)) #define pdx_to_spage(pdx) (spage_table + ((pdx)>>(SUPERPAGE_SHIFT-PAGE_SHIFT))) /* @@ -57,20 +50,6 @@ extern void pfn_pdx_hole_setup(unsigned long); #define pdx_to_virt(pdx) ((void *)(DIRECTMAP_VIRT_START + \ ((unsigned long)(pdx) << PAGE_SHIFT))) -extern int __mfn_valid(unsigned long mfn); - -static inline unsigned long pfn_to_pdx(unsigned long pfn) -{ - return (pfn & pfn_pdx_bottom_mask) | - ((pfn & pfn_top_mask) >> pfn_pdx_hole_shift); -} - -static inline unsigned long pdx_to_pfn(unsigned long pdx) -{ - return (pdx & pfn_pdx_bottom_mask) | - ((pdx << pfn_pdx_hole_shift) & pfn_top_mask); -} - static inline unsigned long pfn_to_sdx(unsigned long pfn) { return pfn_to_pdx(pfn) >> (SUPERPAGE_SHIFT-PAGE_SHIFT); diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h new file mode 100644 index 0000000..624f04f --- /dev/null +++ b/xen/include/xen/pdx.h @@ -0,0 +1,47 @@ +#ifndef __XEN_PDX_H__ +#define __XEN_PDX_H__ + +#ifdef HAS_PDX + +extern unsigned long max_pdx; +extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; +extern unsigned int pfn_pdx_hole_shift; +extern unsigned long pfn_hole_mask; +extern unsigned long pfn_top_mask, ma_top_mask; + +#define PDX_GROUP_COUNT ((1 << PDX_GROUP_SHIFT) / \ + (sizeof(*frame_table) & -sizeof(*frame_table))) +extern unsigned long pdx_group_valid[]; + +extern void set_pdx_range(unsigned long smfn, unsigned long emfn); + +#define page_to_pdx(pg) ((pg) - frame_table) +#define pdx_to_page(pdx) (frame_table + (pdx)) + +extern int __mfn_valid(unsigned long mfn); + +static inline unsigned long pfn_to_pdx(unsigned long pfn) +{ + return (pfn & pfn_pdx_bottom_mask) | + ((pfn & pfn_top_mask) >> pfn_pdx_hole_shift); +} + +static inline unsigned long pdx_to_pfn(unsigned long pdx) +{ + return (pdx & pfn_pdx_bottom_mask) | + ((pdx << pfn_pdx_hole_shift) & pfn_top_mask); +} + +extern void pfn_pdx_hole_setup(unsigned long); + +#endif /* HAS_PDX */ +#endif /* __XEN_PDX_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 Tue Sep 23 16:57:45 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPJ-00069c-Lw; Tue, 23 Sep 2014 16:57:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPI-00069O-M6 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:40 +0000 Received: from [85.158.143.35:36004] by server-1.bemta-4.messagelabs.com id F9/3D-05872-486A1245; Tue, 23 Sep 2014 16:57:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1411491457!12749157!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13382 invoked from network); 23 Sep 2014 16:57:38 -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; 23 Sep 2014 16:57:38 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPF-0002Wy-Pm for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTPF-00034X-OV for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:37 +0000 Date: Tue, 23 Sep 2014 16:57:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: refactor physical address space compression support into common code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e028cedcae2edafb6ba176ec1e8c269346be05bc Author: Ian Campbell AuthorDate: Wed Sep 17 22:21:01 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 17:02:08 2014 +0100 xen: refactor physical address space compression support into common code The "pdx compression" functionality will be useful on ARM as well. Move the code to common code+header and introduce HAS_PDX to control when it is built. L2_PAGETABLE_SHIFT is x86 specific, so introduce PDX_GROUP_SHIFT to abstract it out. ARM has no need for superpage compression (yet?) and lacks SUPERPAGE_SHIFT so those functions (spage_to_mfn et al) are not moved. No affect on x86 and no change for ARM (yet). Signed-off-by: Ian Campbell Acked-by: Jan Beulich --- xen/Rules.mk | 1 + xen/arch/x86/Rules.mk | 1 + xen/arch/x86/mm.c | 3 - xen/arch/x86/setup.c | 10 ---- xen/arch/x86/x86_64/mm.c | 53 -------------------- xen/common/Makefile | 1 + xen/common/pdx.c | 99 +++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/mm.h | 4 +- xen/include/asm-x86/page.h | 2 - xen/include/asm-x86/x86_64/page.h | 25 +--------- xen/include/xen/pdx.h | 47 +++++++++++++++++ 11 files changed, 152 insertions(+), 94 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b49f3c8..e2f9e36 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,6 +59,7 @@ CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE CFLAGS-$(HAS_PCI) += -DHAS_PCI CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS +CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 576985e..6775cb5 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -12,6 +12,7 @@ HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y HAS_GDBSX := y +HAS_PDX := y xenoprof := y # diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d23cb3f..5b3f06f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -147,9 +147,6 @@ struct domain *dom_xen, *dom_io, *dom_cow; unsigned long max_page; unsigned long total_pages; -unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( - (FRAMETABLE_NR + PDX_GROUP_COUNT - 1) / PDX_GROUP_COUNT)] = { [0] = 1 }; - bool_t __read_mostly machine_to_phys_mapping_valid = 0; struct rangeset *__read_mostly mmio_ro_ranges; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6a814cd..8c8b91f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -392,16 +392,6 @@ static void __init setup_max_pdx(unsigned long top_page) max_page = pdx_to_pfn(max_pdx - 1) + 1; } -void set_pdx_range(unsigned long smfn, unsigned long emfn) -{ - unsigned long idx, eidx; - - idx = pfn_to_pdx(smfn) / PDX_GROUP_COUNT; - eidx = (pfn_to_pdx(emfn - 1) + PDX_GROUP_COUNT) / PDX_GROUP_COUNT; - for ( ; idx < eidx; ++idx ) - __set_bit(idx, pdx_group_valid); -} - /* A temporary copy of the e820 map that we can mess with during bootstrap. */ static struct e820map __initdata boot_e820; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 4937f9a..09817fc 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -40,15 +40,6 @@ #include #include -/* Parameters for PFN/MADDR compression. */ -unsigned long __read_mostly max_pdx; -unsigned long __read_mostly pfn_pdx_bottom_mask = ~0UL; -unsigned long __read_mostly ma_va_bottom_mask = ~0UL; -unsigned long __read_mostly pfn_top_mask = 0; -unsigned long __read_mostly ma_top_mask = 0; -unsigned long __read_mostly pfn_hole_mask = 0; -unsigned int __read_mostly pfn_pdx_hole_shift = 0; - unsigned int __read_mostly m2p_compat_vstart = __HYPERVISOR_COMPAT_VIRT_START; /* Enough page directories to map into the bottom 1GB. */ @@ -59,14 +50,6 @@ l2_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) l2_pgentry_t *compat_idle_pg_table_l2; -int __mfn_valid(unsigned long mfn) -{ - return likely(mfn < max_page) && - likely(!(mfn & pfn_hole_mask)) && - likely(test_bit(pfn_to_pdx(mfn) / PDX_GROUP_COUNT, - pdx_group_valid)); -} - void *do_page_walk(struct vcpu *v, unsigned long addr) { unsigned long mfn = pagetable_get_pfn(v->arch.guest_table); @@ -119,42 +102,6 @@ void *do_page_walk(struct vcpu *v, unsigned long addr) return map_domain_page(mfn) + (addr & ~PAGE_MASK); } -void __init pfn_pdx_hole_setup(unsigned long mask) -{ - unsigned int i, j, bottom_shift = 0, hole_shift = 0; - - /* - * We skip the first MAX_ORDER bits, as we never want to compress them. - * This guarantees that page-pointer arithmetic remains valid within - * contiguous aligned ranges of 2^MAX_ORDER pages. Among others, our - * buddy allocator relies on this assumption. - */ - for ( j = MAX_ORDER-1; ; ) - { - i = find_next_zero_bit(&mask, BITS_PER_LONG, j); - j = find_next_bit(&mask, BITS_PER_LONG, i); - if ( j >= BITS_PER_LONG ) - break; - if ( j - i > hole_shift ) - { - hole_shift = j - i; - bottom_shift = i; - } - } - if ( !hole_shift ) - return; - - printk(KERN_INFO "PFN compression on bits %u...%u\n", - bottom_shift, bottom_shift + hole_shift - 1); - - pfn_pdx_hole_shift = hole_shift; - pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; - ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; - pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; - pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); - ma_top_mask = pfn_top_mask << PAGE_SHIFT; -} - /* * Allocate page table pages for m2p table */ diff --git a/xen/common/Makefile b/xen/common/Makefile index 3683ae3..f7d10f0 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -51,6 +51,7 @@ obj-y += tmem_xen.o obj-y += radix-tree.o obj-y += rbtree.o obj-y += lzo.o +obj-$(HAS_PDX) += pdx.o obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo unlz4 earlycpio,$(n).init.o) diff --git a/xen/common/pdx.c b/xen/common/pdx.c new file mode 100644 index 0000000..11349a7 --- /dev/null +++ b/xen/common/pdx.c @@ -0,0 +1,99 @@ +/****************************************************************************** + * Original code extracted from arch/x86/x86_64/mm.c + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include + +/* Parameters for PFN/MADDR compression. */ +unsigned long __read_mostly max_pdx; +unsigned long __read_mostly pfn_pdx_bottom_mask = ~0UL; +unsigned long __read_mostly ma_va_bottom_mask = ~0UL; +unsigned long __read_mostly pfn_top_mask = 0; +unsigned long __read_mostly ma_top_mask = 0; +unsigned long __read_mostly pfn_hole_mask = 0; +unsigned int __read_mostly pfn_pdx_hole_shift = 0; + +unsigned long __read_mostly pdx_group_valid[BITS_TO_LONGS( + (FRAMETABLE_NR + PDX_GROUP_COUNT - 1) / PDX_GROUP_COUNT)] = { [0] = 1 }; + +int __mfn_valid(unsigned long mfn) +{ + return likely(mfn < max_page) && + likely(!(mfn & pfn_hole_mask)) && + likely(test_bit(pfn_to_pdx(mfn) / PDX_GROUP_COUNT, + pdx_group_valid)); +} + +void set_pdx_range(unsigned long smfn, unsigned long emfn) +{ + unsigned long idx, eidx; + + idx = pfn_to_pdx(smfn) / PDX_GROUP_COUNT; + eidx = (pfn_to_pdx(emfn - 1) + PDX_GROUP_COUNT) / PDX_GROUP_COUNT; + + for ( ; idx < eidx; ++idx ) + __set_bit(idx, pdx_group_valid); +} + +void __init pfn_pdx_hole_setup(unsigned long mask) +{ + unsigned int i, j, bottom_shift = 0, hole_shift = 0; + + /* + * We skip the first MAX_ORDER bits, as we never want to compress them. + * This guarantees that page-pointer arithmetic remains valid within + * contiguous aligned ranges of 2^MAX_ORDER pages. Among others, our + * buddy allocator relies on this assumption. + */ + for ( j = MAX_ORDER-1; ; ) + { + i = find_next_zero_bit(&mask, BITS_PER_LONG, j); + j = find_next_bit(&mask, BITS_PER_LONG, i); + if ( j >= BITS_PER_LONG ) + break; + if ( j - i > hole_shift ) + { + hole_shift = j - i; + bottom_shift = i; + } + } + if ( !hole_shift ) + return; + + printk(KERN_INFO "PFN compression on bits %u...%u\n", + bottom_shift, bottom_shift + hole_shift - 1); + + pfn_pdx_hole_shift = hole_shift; + pfn_pdx_bottom_mask = (1UL << bottom_shift) - 1; + ma_va_bottom_mask = (PAGE_SIZE << bottom_shift) - 1; + pfn_hole_mask = ((1UL << hole_shift) - 1) << bottom_shift; + pfn_top_mask = ~(pfn_pdx_bottom_mask | pfn_hole_mask); + ma_top_mask = pfn_top_mask << PAGE_SHIFT; +} + + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 7b85865..746bcf1 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -280,9 +280,7 @@ extern unsigned long max_page; extern unsigned long total_pages; void init_frametable(void); -#define PDX_GROUP_COUNT ((1 << L2_PAGETABLE_SHIFT) / \ - (sizeof(*frame_table) & -sizeof(*frame_table))) -extern unsigned long pdx_group_valid[]; +#define PDX_GROUP_SHIFT L2_PAGETABLE_SHIFT /* Convert between Xen-heap virtual addresses and page-info structures. */ static inline struct page_info *__virt_to_page(const void *v) diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index ccc268d..9aa780e 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -334,8 +334,6 @@ void *alloc_xen_pagetable(void); void free_xen_pagetable(void *v); l1_pgentry_t *virt_to_xen_l1e(unsigned long v); -extern void set_pdx_range(unsigned long smfn, unsigned long emfn); - /* Convert between PAT/PCD/PWT embedded in PTE flags and 3-bit cacheattr. */ static inline uint32_t pte_flags_to_cacheattr(uint32_t flags) { diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 3eee5b5..1d54587 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -35,17 +35,10 @@ #include #include -extern unsigned long xen_virt_end; +#include -extern unsigned long max_pdx; -extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; -extern unsigned int pfn_pdx_hole_shift; -extern unsigned long pfn_hole_mask; -extern unsigned long pfn_top_mask, ma_top_mask; -extern void pfn_pdx_hole_setup(unsigned long); +extern unsigned long xen_virt_end; -#define page_to_pdx(pg) ((pg) - frame_table) -#define pdx_to_page(pdx) (frame_table + (pdx)) #define spage_to_pdx(spg) (((spg) - spage_table)<<(SUPERPAGE_SHIFT-PAGE_SHIFT)) #define pdx_to_spage(pdx) (spage_table + ((pdx)>>(SUPERPAGE_SHIFT-PAGE_SHIFT))) /* @@ -57,20 +50,6 @@ extern void pfn_pdx_hole_setup(unsigned long); #define pdx_to_virt(pdx) ((void *)(DIRECTMAP_VIRT_START + \ ((unsigned long)(pdx) << PAGE_SHIFT))) -extern int __mfn_valid(unsigned long mfn); - -static inline unsigned long pfn_to_pdx(unsigned long pfn) -{ - return (pfn & pfn_pdx_bottom_mask) | - ((pfn & pfn_top_mask) >> pfn_pdx_hole_shift); -} - -static inline unsigned long pdx_to_pfn(unsigned long pdx) -{ - return (pdx & pfn_pdx_bottom_mask) | - ((pdx << pfn_pdx_hole_shift) & pfn_top_mask); -} - static inline unsigned long pfn_to_sdx(unsigned long pfn) { return pfn_to_pdx(pfn) >> (SUPERPAGE_SHIFT-PAGE_SHIFT); diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h new file mode 100644 index 0000000..624f04f --- /dev/null +++ b/xen/include/xen/pdx.h @@ -0,0 +1,47 @@ +#ifndef __XEN_PDX_H__ +#define __XEN_PDX_H__ + +#ifdef HAS_PDX + +extern unsigned long max_pdx; +extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; +extern unsigned int pfn_pdx_hole_shift; +extern unsigned long pfn_hole_mask; +extern unsigned long pfn_top_mask, ma_top_mask; + +#define PDX_GROUP_COUNT ((1 << PDX_GROUP_SHIFT) / \ + (sizeof(*frame_table) & -sizeof(*frame_table))) +extern unsigned long pdx_group_valid[]; + +extern void set_pdx_range(unsigned long smfn, unsigned long emfn); + +#define page_to_pdx(pg) ((pg) - frame_table) +#define pdx_to_page(pdx) (frame_table + (pdx)) + +extern int __mfn_valid(unsigned long mfn); + +static inline unsigned long pfn_to_pdx(unsigned long pfn) +{ + return (pfn & pfn_pdx_bottom_mask) | + ((pfn & pfn_top_mask) >> pfn_pdx_hole_shift); +} + +static inline unsigned long pdx_to_pfn(unsigned long pdx) +{ + return (pdx & pfn_pdx_bottom_mask) | + ((pdx << pfn_pdx_hole_shift) & pfn_top_mask); +} + +extern void pfn_pdx_hole_setup(unsigned long); + +#endif /* HAS_PDX */ +#endif /* __XEN_PDX_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 Tue Sep 23 16:57:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTPT-0006CJ-Qv; Tue, 23 Sep 2014 16:57:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPS-0006C1-Me for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:50 +0000 Received: from [85.158.137.68:38206] by server-7.bemta-3.messagelabs.com id 9D/81-01084-D86A1245; Tue, 23 Sep 2014 16:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1411491468!11551355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25256 invoked from network); 23 Sep 2014 16:57:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPP-0002X7-V6 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTPP-00034w-TA for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:47 +0000 Date: Tue, 23 Sep 2014 16:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: add helpers for PDX mask initialisation calculations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 333dd94230b21427c9f52fa5b9d844bff1c2ab7c Author: Ian Campbell AuthorDate: Tue Sep 16 21:01:41 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 17:02:30 2014 +0100 xen: add helpers for PDX mask initialisation calculations I wanted to make fill_mask a public function so I could use it on ARM, but it was actually easier to think of a (semi) reasonable public name for the users of it, so that is what I have done. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Reviewed-by: Julien Grall --- xen/arch/x86/srat.c | 16 +++------------- xen/common/pdx.c | 18 ++++++++++++++++++ xen/include/xen/pdx.h | 3 +++ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 2b05272..29fc724 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -339,13 +339,6 @@ void __init acpi_numa_arch_fixup(void) {} static u64 __initdata srat_region_mask; -static u64 __init fill_mask(u64 mask) -{ - while (mask & (mask + 1)) - mask |= mask + 1; - return mask; -} - static int __init srat_parse_region(struct acpi_subtable_header *header, const unsigned long end) { @@ -366,8 +359,7 @@ static int __init srat_parse_region(struct acpi_subtable_header *header, ma->base_address, ma->base_address + ma->length - 1); srat_region_mask |= ma->base_address | - fill_mask(ma->base_address ^ - (ma->base_address + ma->length - 1)); + pdx_region_mask(ma->base_address, ma->length); return 0; } @@ -381,7 +373,7 @@ void __init srat_parse_regions(u64 addr) acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) return; - srat_region_mask = fill_mask(addr - 1); + srat_region_mask = pdx_init_mask(addr); acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, srat_parse_region, 0); @@ -389,9 +381,7 @@ void __init srat_parse_regions(u64 addr) if (e820.map[i].type != E820_RAM) continue; - if (~mask & - fill_mask(e820.map[i].addr ^ - (e820.map[i].addr + e820.map[i].size - 1))) + if (~mask & pdx_region_mask(e820.map[i].addr, e820.map[i].size)) mask = 0; } diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 11349a7..cf8b9b5 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -41,6 +41,24 @@ int __mfn_valid(unsigned long mfn) pdx_group_valid)); } +/* Sets all bits from the most-significant 1-bit down to the LSB */ +static u64 __init fill_mask(u64 mask) +{ + while (mask & (mask + 1)) + mask |= mask + 1; + return mask; +} + +u64 __init pdx_init_mask(u64 base_addr) +{ + return fill_mask(base_addr - 1); +} + +u64 __init pdx_region_mask(u64 base, u64 len) +{ + return fill_mask(base ^ (base + len - 1)); +} + void set_pdx_range(unsigned long smfn, unsigned long emfn) { unsigned long idx, eidx; diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 624f04f..18fe8e5 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -13,6 +13,9 @@ extern unsigned long pfn_top_mask, ma_top_mask; (sizeof(*frame_table) & -sizeof(*frame_table))) extern unsigned long pdx_group_valid[]; +extern u64 pdx_init_mask(u64 base_addr); +extern u64 pdx_region_mask(u64 base, u64 len); + extern void set_pdx_range(unsigned long smfn, unsigned long emfn); #define page_to_pdx(pg) ((pg) - frame_table) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:57:55 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:57: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 1XWTPT-0006CJ-Qv; Tue, 23 Sep 2014 16:57:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPS-0006C1-Me for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:50 +0000 Received: from [85.158.137.68:38206] by server-7.bemta-3.messagelabs.com id 9D/81-01084-D86A1245; Tue, 23 Sep 2014 16:57:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1411491468!11551355!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25256 invoked from network); 23 Sep 2014 16:57:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPP-0002X7-V6 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTPP-00034w-TA for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:47 +0000 Date: Tue, 23 Sep 2014 16:57:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: add helpers for PDX mask initialisation calculations X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 333dd94230b21427c9f52fa5b9d844bff1c2ab7c Author: Ian Campbell AuthorDate: Tue Sep 16 21:01:41 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 17:02:30 2014 +0100 xen: add helpers for PDX mask initialisation calculations I wanted to make fill_mask a public function so I could use it on ARM, but it was actually easier to think of a (semi) reasonable public name for the users of it, so that is what I have done. Signed-off-by: Ian Campbell Acked-by: Jan Beulich Reviewed-by: Julien Grall --- xen/arch/x86/srat.c | 16 +++------------- xen/common/pdx.c | 18 ++++++++++++++++++ xen/include/xen/pdx.h | 3 +++ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index 2b05272..29fc724 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -339,13 +339,6 @@ void __init acpi_numa_arch_fixup(void) {} static u64 __initdata srat_region_mask; -static u64 __init fill_mask(u64 mask) -{ - while (mask & (mask + 1)) - mask |= mask + 1; - return mask; -} - static int __init srat_parse_region(struct acpi_subtable_header *header, const unsigned long end) { @@ -366,8 +359,7 @@ static int __init srat_parse_region(struct acpi_subtable_header *header, ma->base_address, ma->base_address + ma->length - 1); srat_region_mask |= ma->base_address | - fill_mask(ma->base_address ^ - (ma->base_address + ma->length - 1)); + pdx_region_mask(ma->base_address, ma->length); return 0; } @@ -381,7 +373,7 @@ void __init srat_parse_regions(u64 addr) acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) return; - srat_region_mask = fill_mask(addr - 1); + srat_region_mask = pdx_init_mask(addr); acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, srat_parse_region, 0); @@ -389,9 +381,7 @@ void __init srat_parse_regions(u64 addr) if (e820.map[i].type != E820_RAM) continue; - if (~mask & - fill_mask(e820.map[i].addr ^ - (e820.map[i].addr + e820.map[i].size - 1))) + if (~mask & pdx_region_mask(e820.map[i].addr, e820.map[i].size)) mask = 0; } diff --git a/xen/common/pdx.c b/xen/common/pdx.c index 11349a7..cf8b9b5 100644 --- a/xen/common/pdx.c +++ b/xen/common/pdx.c @@ -41,6 +41,24 @@ int __mfn_valid(unsigned long mfn) pdx_group_valid)); } +/* Sets all bits from the most-significant 1-bit down to the LSB */ +static u64 __init fill_mask(u64 mask) +{ + while (mask & (mask + 1)) + mask |= mask + 1; + return mask; +} + +u64 __init pdx_init_mask(u64 base_addr) +{ + return fill_mask(base_addr - 1); +} + +u64 __init pdx_region_mask(u64 base, u64 len) +{ + return fill_mask(base ^ (base + len - 1)); +} + void set_pdx_range(unsigned long smfn, unsigned long emfn) { unsigned long idx, eidx; diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 624f04f..18fe8e5 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -13,6 +13,9 @@ extern unsigned long pfn_top_mask, ma_top_mask; (sizeof(*frame_table) & -sizeof(*frame_table))) extern unsigned long pdx_group_valid[]; +extern u64 pdx_init_mask(u64 base_addr); +extern u64 pdx_region_mask(u64 base, u64 len); + extern void set_pdx_range(unsigned long smfn, unsigned long emfn); #define page_to_pdx(pg) ((pg) - frame_table) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:58:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:58:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPe-0006FU-UW; Tue, 23 Sep 2014 16:58:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPd-0006E9-8K for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:58:01 +0000 Received: from [193.109.254.147:39770] by server-1.bemta-14.messagelabs.com id B2/A8-24760-896A1245; Tue, 23 Sep 2014 16:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1411491478!7913598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18128 invoked from network); 23 Sep 2014 16:57:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPa-0002XG-4S for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTPa-00035I-39 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:58 +0000 Date: Tue, 23 Sep 2014 16:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Enable physical address space compression (PDX) on arm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e01fa4e223fc077e18936d890dbd4813c3e7c9b1 Author: Ian Campbell AuthorDate: Wed Sep 17 22:21:03 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 17:02:48 2014 +0100 xen: arm: Enable physical address space compression (PDX) on arm This allows us to support sparse physical address maps which we previously could not because the frametable would end up taking up an enormous fraction of RAM. On a fast model which has RAM at 0x80000000-0x100000000 and 0x880000000-0x900000000 this reduces the size of the frametable from 478M to 84M. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/Rules.mk | 1 + xen/arch/arm/mm.c | 17 +++--- xen/arch/arm/setup.c | 132 ++++++++++++++++-------------------------- xen/include/asm-arm/config.h | 11 +++- xen/include/asm-arm/mm.h | 37 ++++++------ xen/include/asm-arm/numa.h | 2 +- 6 files changed, 89 insertions(+), 111 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 8658176..26fafa2 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -10,6 +10,7 @@ HAS_DEVICE_TREE := y HAS_VIDEO := y HAS_ARM_HDLCD := y HAS_PASSTHROUGH := y +HAS_PDX := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 5cd4e99..c5b48ef 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -140,7 +140,7 @@ unsigned long xenheap_mfn_start __read_mostly = ~0UL; unsigned long xenheap_mfn_end __read_mostly; unsigned long xenheap_virt_end __read_mostly; -unsigned long frametable_base_mfn __read_mostly; +unsigned long frametable_base_pdx __read_mostly; unsigned long frametable_virt_end __read_mostly; unsigned long max_page; @@ -681,7 +681,7 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, /* Align to previous 1GB boundary */ base_mfn &= ~((FIRST_SIZE>>PAGE_SHIFT)-1); - offset = base_mfn - xenheap_mfn_start; + offset = pfn_to_pdx(base_mfn - xenheap_mfn_start); vaddr = DIRECTMAP_VIRT_START + offset*PAGE_SIZE; while ( base_mfn < end_mfn ) @@ -732,7 +732,8 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) { unsigned long nr_pages = (pe - ps) >> PAGE_SHIFT; - unsigned long frametable_size = nr_pages * sizeof(struct page_info); + unsigned long nr_pdxs = pfn_to_pdx(nr_pages); + unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); unsigned long base_mfn; #ifdef CONFIG_ARM_64 lpae_t *second, pte; @@ -740,7 +741,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) int i; #endif - frametable_base_mfn = ps >> PAGE_SHIFT; + frametable_base_pdx = pfn_to_pdx(ps >> PAGE_SHIFT); /* Round up to 32M boundary */ frametable_size = (frametable_size + 0x1ffffff) & ~0x1ffffff; @@ -761,11 +762,11 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) create_32mb_mappings(xen_second, FRAMETABLE_VIRT_START, base_mfn, frametable_size >> PAGE_SHIFT); #endif - memset(&frame_table[0], 0, nr_pages * sizeof(struct page_info)); - memset(&frame_table[nr_pages], -1, - frametable_size - (nr_pages * sizeof(struct page_info))); + memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_info)); + memset(&frame_table[nr_pdxs], -1, + frametable_size - (nr_pdxs * sizeof(struct page_info))); - frametable_virt_end = FRAMETABLE_VIRT_START + (nr_pages * sizeof(struct page_info)); + frametable_virt_end = FRAMETABLE_VIRT_START + (nr_pdxs * sizeof(struct page_info)); } void *__init arch_vmap_virt_end(void) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 8844720..446de8a 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -424,11 +424,47 @@ static paddr_t __init get_xen_paddr(void) return paddr; } +static void init_pdx(void) +{ + paddr_t bank_start, bank_size, bank_end; + + u64 mask = pdx_init_mask(bootinfo.mem.bank[0].start); + int bank; + + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) + { + bank_start = bootinfo.mem.bank[bank].start; + bank_size = bootinfo.mem.bank[bank].size; + + mask |= bank_start | pdx_region_mask(bank_start, bank_size); + } + + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) + { + bank_start = bootinfo.mem.bank[bank].start; + bank_size = bootinfo.mem.bank[bank].size; + + if (~mask & pdx_region_mask(bank_start, bank_size)) + mask = 0; + } + + pfn_pdx_hole_setup(mask >> PAGE_SHIFT); + + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) + { + bank_start = bootinfo.mem.bank[bank].start; + bank_size = bootinfo.mem.bank[bank].size; + bank_end = bank_start + bank_size; + + set_pdx_range(paddr_to_pfn(bank_start), + paddr_to_pfn(bank_end)); + } +} + #ifdef CONFIG_ARM_32 static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) { paddr_t ram_start, ram_end, ram_size; - paddr_t contig_start, contig_end; paddr_t s, e; unsigned long ram_pages; unsigned long heap_pages, xenheap_pages, domheap_pages; @@ -440,24 +476,11 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) if ( !bootinfo.mem.nr_banks ) panic("No memory bank"); - /* - * We are going to accumulate two regions here. - * - * The first is the bounds of the initial memory region which is - * contiguous with the first bank. For simplicity the xenheap is - * always allocated from this region. - * - * The second is the complete bounds of the regions containing RAM - * (ie. from the lowest RAM address to the highest), which - * includes any holes. - * - * We also track the number of actual RAM pages (i.e. not counting - * the holes). - */ - ram_size = bootinfo.mem.bank[0].size; + init_pdx(); - contig_start = ram_start = bootinfo.mem.bank[0].start; - contig_end = ram_end = ram_start + ram_size; + ram_start = bootinfo.mem.bank[0].start; + ram_size = bootinfo.mem.bank[0].size; + ram_end = ram_start + ram_size; for ( i = 1; i < bootinfo.mem.nr_banks; i++ ) { @@ -465,41 +488,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) paddr_t bank_size = bootinfo.mem.bank[i].size; paddr_t bank_end = bank_start + bank_size; - paddr_t new_ram_size = ram_size + bank_size; - paddr_t new_ram_start = min(ram_start,bank_start); - paddr_t new_ram_end = max(ram_end,bank_end); - - /* - * If the new bank is contiguous with the initial contiguous - * region then incorporate it into the contiguous region. - * - * Otherwise we allow non-contigious regions so long as at - * least half of the total RAM region actually contains - * RAM. We actually fudge this slightly and require that - * adding the current bank does not cause us to violate this - * restriction. - * - * This restriction ensures that the frametable (which is not - * currently sparse) does not consume all available RAM. - */ - if ( bank_start == contig_end ) - contig_end = bank_end; - else if ( bank_end == contig_start ) - contig_start = bank_start; - else if ( 2 * new_ram_size < new_ram_end - new_ram_start ) - /* Would create memory map which is too sparse, so stop here. */ - break; - - ram_size = new_ram_size; - ram_start = new_ram_start; - ram_end = new_ram_end; - } - - if ( i != bootinfo.mem.nr_banks ) - { - printk("WARNING: only using %d out of %d memory banks\n", - i, bootinfo.mem.nr_banks); - bootinfo.mem.nr_banks = i; + ram_size = ram_size + bank_size; + ram_start = min(ram_start,bank_start); + ram_end = max(ram_end,bank_end); } total_pages = ram_pages = ram_size >> PAGE_SHIFT; @@ -521,8 +512,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) do { - /* xenheap is always in the initial contiguous region */ - e = consider_modules(contig_start, contig_end, + e = consider_modules(ram_start, ram_end, pfn_to_paddr(xenheap_pages), 32<<20, 0); if ( e ) @@ -617,6 +607,8 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) unsigned long dtb_pages; void *fdt; + init_pdx(); + total_pages = 0; for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) { @@ -625,26 +617,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) paddr_t bank_end = bank_start + bank_size; paddr_t s, e; - paddr_t new_ram_size = ram_size + bank_size; - paddr_t new_ram_start = min(ram_start,bank_start); - paddr_t new_ram_end = max(ram_end,bank_end); - - /* - * We allow non-contigious regions so long as at least half of - * the total RAM region actually contains RAM. We actually - * fudge this slightly and require that adding the current - * bank does not cause us to violate this restriction. - * - * This restriction ensures that the frametable (which is not - * currently sparse) does not consume all available RAM. - */ - if ( bank > 0 && 2 * new_ram_size < new_ram_end - new_ram_start ) - /* Would create memory map which is too sparse, so stop here. */ - break; - - ram_start = new_ram_start; - ram_end = new_ram_end; - ram_size = new_ram_size; + ram_size = ram_size + bank_size; + ram_start = min(ram_start,bank_start); + ram_end = max(ram_end,bank_end); setup_xenheap_mappings(bank_start>>PAGE_SHIFT, bank_size>>PAGE_SHIFT); @@ -670,13 +645,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) } } - if ( bank != bootinfo.mem.nr_banks ) - { - printk("WARNING: only using %d out of %d memory banks\n", - bank, bootinfo.mem.nr_banks); - bootinfo.mem.nr_banks = bank; - } - total_pages += ram_size >> PAGE_SHIFT; xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 1c3abcf..59b2887 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -126,7 +126,12 @@ #define CONFIG_SEPARATE_XENHEAP 1 #define FRAMETABLE_VIRT_START _AT(vaddr_t,0x02000000) -#define VMAP_VIRT_START _AT(vaddr_t,0x10000000) +#define FRAMETABLE_SIZE MB(128-32) +#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) +#define FRAMETABLE_VIRT_END (FRAMETABLE_VIRT_START + FRAMETABLE_SIZE - 1) + +#define VMAP_VIRT_START _AT(vaddr_t,0x10000000) + #define XENHEAP_VIRT_START _AT(vaddr_t,0x40000000) #define XENHEAP_VIRT_END _AT(vaddr_t,0x7fffffff) #define DOMHEAP_VIRT_START _AT(vaddr_t,0x80000000) @@ -149,7 +154,9 @@ #define VMAP_VIRT_END (VMAP_VIRT_START + GB(1) - 1) #define FRAMETABLE_VIRT_START GB(32) -#define FRAMETABLE_VIRT_END (FRAMETABLE_VIRT_START + GB(32) - 1) +#define FRAMETABLE_SIZE GB(32) +#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) +#define FRAMETABLE_VIRT_END (FRAMETABLE_VIRT_START + FRAMETABLE_SIZE - 1) #define DIRECTMAP_VIRT_START SLOT0(256) #define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (265-256)) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 840a805..33ac4b4 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -6,6 +6,7 @@ #include #include #include +#include /* Align Xen to a 2 MiB boundary. */ #define XEN_PADDR_ALIGN (1 << 21) @@ -140,12 +141,14 @@ extern void share_xen_page_with_privileged_guests( struct page_info *page, int readonly); #define frame_table ((struct page_info *)FRAMETABLE_VIRT_START) -/* MFN of the first page in the frame table. */ -extern unsigned long frametable_base_mfn; +/* PDX of the first page in the frame table. */ +extern unsigned long frametable_base_pdx; extern unsigned long max_page; extern unsigned long total_pages; +#define PDX_GROUP_SHIFT SECOND_SHIFT + /* Boot-time pagetable setup */ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); /* Remove early mappings */ @@ -182,20 +185,15 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) return ioremap_attr(start, len, PAGE_HYPERVISOR_WC); } +/* XXX -- account for base */ #define mfn_valid(mfn) ({ \ unsigned long __m_f_n = (mfn); \ - likely(__m_f_n >= frametable_base_mfn && __m_f_n < max_page); \ + likely(pfn_to_pdx(__m_f_n) >= frametable_base_pdx && __mfn_valid(__m_f_n)); \ }) -#define max_pdx max_page -#define pfn_to_pdx(pfn) (pfn) -#define pdx_to_pfn(pdx) (pdx) -#define virt_to_pdx(va) virt_to_mfn(va) -#define pdx_to_virt(pdx) mfn_to_virt(pdx) - /* Convert between machine frame numbers and page-info structures. */ -#define mfn_to_page(mfn) (frame_table + (pfn_to_pdx(mfn) - frametable_base_mfn)) -#define page_to_mfn(pg) pdx_to_pfn((unsigned long)((pg) - frame_table) + frametable_base_mfn) +#define mfn_to_page(mfn) (frame_table + (pfn_to_pdx(mfn) - frametable_base_pdx)) +#define page_to_mfn(pg) pdx_to_pfn((unsigned long)((pg) - frame_table) + frametable_base_pdx) #define __page_to_mfn(pg) page_to_mfn(pg) #define __mfn_to_page(mfn) mfn_to_page(mfn) @@ -228,9 +226,11 @@ static inline void *maddr_to_virt(paddr_t ma) #else static inline void *maddr_to_virt(paddr_t ma) { - ASSERT((ma >> PAGE_SHIFT) < (DIRECTMAP_SIZE >> PAGE_SHIFT)); - ma -= pfn_to_paddr(xenheap_mfn_start); - return (void *)(unsigned long) ma + DIRECTMAP_VIRT_START; + ASSERT(pfn_to_pdx(ma >> PAGE_SHIFT) < (DIRECTMAP_SIZE >> PAGE_SHIFT)); + return (void *)(DIRECTMAP_VIRT_START - + pfn_to_paddr(xenheap_mfn_start) + + ((ma & ma_va_bottom_mask) | + ((ma & ma_top_mask) >> pfn_pdx_hole_shift))); } #endif @@ -256,13 +256,14 @@ static inline int gvirt_to_maddr(vaddr_t va, paddr_t *pa, unsigned int flags) static inline struct page_info *virt_to_page(const void *v) { unsigned long va = (unsigned long)v; + unsigned long pdx; + ASSERT(va >= XENHEAP_VIRT_START); ASSERT(va < xenheap_virt_end); - return frame_table - + ((va - XENHEAP_VIRT_START) >> PAGE_SHIFT) - + xenheap_mfn_start - - frametable_base_mfn; + pdx = (va - XENHEAP_VIRT_START) >> PAGE_SHIFT; + pdx += pfn_to_pdx(xenheap_mfn_start); + return frame_table + pdx - frametable_base_pdx; } static inline void *page_to_virt(const struct page_info *pg) diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 2c019d7..06a9d5a 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -12,7 +12,7 @@ static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) /* XXX: implement NUMA support */ #define node_spanned_pages(nid) (total_pages) -#define node_start_pfn(nid) (frametable_base_mfn) +#define node_start_pfn(nid) (pdx_to_pfn(frametable_base_pdx)) #define __node_distance(a, b) (20) #endif /* __ARCH_ARM_NUMA_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Sep 23 16:58:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 23 Sep 2014 16:58:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPe-0006FU-UW; Tue, 23 Sep 2014 16:58:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPd-0006E9-8K for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:58:01 +0000 Received: from [193.109.254.147:39770] by server-1.bemta-14.messagelabs.com id B2/A8-24760-896A1245; Tue, 23 Sep 2014 16:58:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1411491478!7913598!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18128 invoked from network); 23 Sep 2014 16:57:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Sep 2014 16:57:59 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWTPa-0002XG-4S for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWTPa-00035I-39 for xen-changelog@lists.xensource.com; Tue, 23 Sep 2014 16:57:58 +0000 Date: Tue, 23 Sep 2014 16:57:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Enable physical address space compression (PDX) on arm X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e01fa4e223fc077e18936d890dbd4813c3e7c9b1 Author: Ian Campbell AuthorDate: Wed Sep 17 22:21:03 2014 +0100 Commit: Ian Campbell CommitDate: Mon Sep 22 17:02:48 2014 +0100 xen: arm: Enable physical address space compression (PDX) on arm This allows us to support sparse physical address maps which we previously could not because the frametable would end up taking up an enormous fraction of RAM. On a fast model which has RAM at 0x80000000-0x100000000 and 0x880000000-0x900000000 this reduces the size of the frametable from 478M to 84M. Signed-off-by: Ian Campbell Reviewed-by: Julien Grall --- xen/arch/arm/Rules.mk | 1 + xen/arch/arm/mm.c | 17 +++--- xen/arch/arm/setup.c | 132 ++++++++++++++++-------------------------- xen/include/asm-arm/config.h | 11 +++- xen/include/asm-arm/mm.h | 37 ++++++------ xen/include/asm-arm/numa.h | 2 +- 6 files changed, 89 insertions(+), 111 deletions(-) diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 8658176..26fafa2 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -10,6 +10,7 @@ HAS_DEVICE_TREE := y HAS_VIDEO := y HAS_ARM_HDLCD := y HAS_PASSTHROUGH := y +HAS_PDX := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 5cd4e99..c5b48ef 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -140,7 +140,7 @@ unsigned long xenheap_mfn_start __read_mostly = ~0UL; unsigned long xenheap_mfn_end __read_mostly; unsigned long xenheap_virt_end __read_mostly; -unsigned long frametable_base_mfn __read_mostly; +unsigned long frametable_base_pdx __read_mostly; unsigned long frametable_virt_end __read_mostly; unsigned long max_page; @@ -681,7 +681,7 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, /* Align to previous 1GB boundary */ base_mfn &= ~((FIRST_SIZE>>PAGE_SHIFT)-1); - offset = base_mfn - xenheap_mfn_start; + offset = pfn_to_pdx(base_mfn - xenheap_mfn_start); vaddr = DIRECTMAP_VIRT_START + offset*PAGE_SIZE; while ( base_mfn < end_mfn ) @@ -732,7 +732,8 @@ void __init setup_xenheap_mappings(unsigned long base_mfn, void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) { unsigned long nr_pages = (pe - ps) >> PAGE_SHIFT; - unsigned long frametable_size = nr_pages * sizeof(struct page_info); + unsigned long nr_pdxs = pfn_to_pdx(nr_pages); + unsigned long frametable_size = nr_pdxs * sizeof(struct page_info); unsigned long base_mfn; #ifdef CONFIG_ARM_64 lpae_t *second, pte; @@ -740,7 +741,7 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) int i; #endif - frametable_base_mfn = ps >> PAGE_SHIFT; + frametable_base_pdx = pfn_to_pdx(ps >> PAGE_SHIFT); /* Round up to 32M boundary */ frametable_size = (frametable_size + 0x1ffffff) & ~0x1ffffff; @@ -761,11 +762,11 @@ void __init setup_frametable_mappings(paddr_t ps, paddr_t pe) create_32mb_mappings(xen_second, FRAMETABLE_VIRT_START, base_mfn, frametable_size >> PAGE_SHIFT); #endif - memset(&frame_table[0], 0, nr_pages * sizeof(struct page_info)); - memset(&frame_table[nr_pages], -1, - frametable_size - (nr_pages * sizeof(struct page_info))); + memset(&frame_table[0], 0, nr_pdxs * sizeof(struct page_info)); + memset(&frame_table[nr_pdxs], -1, + frametable_size - (nr_pdxs * sizeof(struct page_info))); - frametable_virt_end = FRAMETABLE_VIRT_START + (nr_pages * sizeof(struct page_info)); + frametable_virt_end = FRAMETABLE_VIRT_START + (nr_pdxs * sizeof(struct page_info)); } void *__init arch_vmap_virt_end(void) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 8844720..446de8a 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -424,11 +424,47 @@ static paddr_t __init get_xen_paddr(void) return paddr; } +static void init_pdx(void) +{ + paddr_t bank_start, bank_size, bank_end; + + u64 mask = pdx_init_mask(bootinfo.mem.bank[0].start); + int bank; + + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) + { + bank_start = bootinfo.mem.bank[bank].start; + bank_size = bootinfo.mem.bank[bank].size; + + mask |= bank_start | pdx_region_mask(bank_start, bank_size); + } + + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) + { + bank_start = bootinfo.mem.bank[bank].start; + bank_size = bootinfo.mem.bank[bank].size; + + if (~mask & pdx_region_mask(bank_start, bank_size)) + mask = 0; + } + + pfn_pdx_hole_setup(mask >> PAGE_SHIFT); + + for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) + { + bank_start = bootinfo.mem.bank[bank].start; + bank_size = bootinfo.mem.bank[bank].size; + bank_end = bank_start + bank_size; + + set_pdx_range(paddr_to_pfn(bank_start), + paddr_to_pfn(bank_end)); + } +} + #ifdef CONFIG_ARM_32 static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) { paddr_t ram_start, ram_end, ram_size; - paddr_t contig_start, contig_end; paddr_t s, e; unsigned long ram_pages; unsigned long heap_pages, xenheap_pages, domheap_pages; @@ -440,24 +476,11 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) if ( !bootinfo.mem.nr_banks ) panic("No memory bank"); - /* - * We are going to accumulate two regions here. - * - * The first is the bounds of the initial memory region which is - * contiguous with the first bank. For simplicity the xenheap is - * always allocated from this region. - * - * The second is the complete bounds of the regions containing RAM - * (ie. from the lowest RAM address to the highest), which - * includes any holes. - * - * We also track the number of actual RAM pages (i.e. not counting - * the holes). - */ - ram_size = bootinfo.mem.bank[0].size; + init_pdx(); - contig_start = ram_start = bootinfo.mem.bank[0].start; - contig_end = ram_end = ram_start + ram_size; + ram_start = bootinfo.mem.bank[0].start; + ram_size = bootinfo.mem.bank[0].size; + ram_end = ram_start + ram_size; for ( i = 1; i < bootinfo.mem.nr_banks; i++ ) { @@ -465,41 +488,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) paddr_t bank_size = bootinfo.mem.bank[i].size; paddr_t bank_end = bank_start + bank_size; - paddr_t new_ram_size = ram_size + bank_size; - paddr_t new_ram_start = min(ram_start,bank_start); - paddr_t new_ram_end = max(ram_end,bank_end); - - /* - * If the new bank is contiguous with the initial contiguous - * region then incorporate it into the contiguous region. - * - * Otherwise we allow non-contigious regions so long as at - * least half of the total RAM region actually contains - * RAM. We actually fudge this slightly and require that - * adding the current bank does not cause us to violate this - * restriction. - * - * This restriction ensures that the frametable (which is not - * currently sparse) does not consume all available RAM. - */ - if ( bank_start == contig_end ) - contig_end = bank_end; - else if ( bank_end == contig_start ) - contig_start = bank_start; - else if ( 2 * new_ram_size < new_ram_end - new_ram_start ) - /* Would create memory map which is too sparse, so stop here. */ - break; - - ram_size = new_ram_size; - ram_start = new_ram_start; - ram_end = new_ram_end; - } - - if ( i != bootinfo.mem.nr_banks ) - { - printk("WARNING: only using %d out of %d memory banks\n", - i, bootinfo.mem.nr_banks); - bootinfo.mem.nr_banks = i; + ram_size = ram_size + bank_size; + ram_start = min(ram_start,bank_start); + ram_end = max(ram_end,bank_end); } total_pages = ram_pages = ram_size >> PAGE_SHIFT; @@ -521,8 +512,7 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) do { - /* xenheap is always in the initial contiguous region */ - e = consider_modules(contig_start, contig_end, + e = consider_modules(ram_start, ram_end, pfn_to_paddr(xenheap_pages), 32<<20, 0); if ( e ) @@ -617,6 +607,8 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) unsigned long dtb_pages; void *fdt; + init_pdx(); + total_pages = 0; for ( bank = 0 ; bank < bootinfo.mem.nr_banks; bank++ ) { @@ -625,26 +617,9 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) paddr_t bank_end = bank_start + bank_size; paddr_t s, e; - paddr_t new_ram_size = ram_size + bank_size; - paddr_t new_ram_start = min(ram_start,bank_start); - paddr_t new_ram_end = max(ram_end,bank_end); - - /* - * We allow non-contigious regions so long as at least half of - * the total RAM region actually contains RAM. We actually - * fudge this slightly and require that adding the current - * bank does not cause us to violate this restriction. - * - * This restriction ensures that the frametable (which is not - * currently sparse) does not consume all available RAM. - */ - if ( bank > 0 && 2 * new_ram_size < new_ram_end - new_ram_start ) - /* Would create memory map which is too sparse, so stop here. */ - break; - - ram_start = new_ram_start; - ram_end = new_ram_end; - ram_size = new_ram_size; + ram_size = ram_size + bank_size; + ram_start = min(ram_start,bank_start); + ram_end = max(ram_end,bank_end); setup_xenheap_mappings(bank_start>>PAGE_SHIFT, bank_size>>PAGE_SHIFT); @@ -670,13 +645,6 @@ static void __init setup_mm(unsigned long dtb_paddr, size_t dtb_size) } } - if ( bank != bootinfo.mem.nr_banks ) - { - printk("WARNING: only using %d out of %d memory banks\n", - bank, bootinfo.mem.nr_banks); - bootinfo.mem.nr_banks = bank; - } - total_pages += ram_size >> PAGE_SHIFT; xenheap_virt_end = XENHEAP_VIRT_START + ram_end - ram_start; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 1c3abcf..59b2887 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -126,7 +126,12 @@ #define CONFIG_SEPARATE_XENHEAP 1 #define FRAMETABLE_VIRT_START _AT(vaddr_t,0x02000000) -#define VMAP_VIRT_START _AT(vaddr_t,0x10000000) +#define FRAMETABLE_SIZE MB(128-32) +#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) +#define FRAMETABLE_VIRT_END (FRAMETABLE_VIRT_START + FRAMETABLE_SIZE - 1) + +#define VMAP_VIRT_START _AT(vaddr_t,0x10000000) + #define XENHEAP_VIRT_START _AT(vaddr_t,0x40000000) #define XENHEAP_VIRT_END _AT(vaddr_t,0x7fffffff) #define DOMHEAP_VIRT_START _AT(vaddr_t,0x80000000) @@ -149,7 +154,9 @@ #define VMAP_VIRT_END (VMAP_VIRT_START + GB(1) - 1) #define FRAMETABLE_VIRT_START GB(32) -#define FRAMETABLE_VIRT_END (FRAMETABLE_VIRT_START + GB(32) - 1) +#define FRAMETABLE_SIZE GB(32) +#define FRAMETABLE_NR (FRAMETABLE_SIZE / sizeof(*frame_table)) +#define FRAMETABLE_VIRT_END (FRAMETABLE_VIRT_START + FRAMETABLE_SIZE - 1) #define DIRECTMAP_VIRT_START SLOT0(256) #define DIRECTMAP_SIZE (SLOT0_ENTRY_SIZE * (265-256)) diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 840a805..33ac4b4 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -6,6 +6,7 @@ #include #include #include +#include /* Align Xen to a 2 MiB boundary. */ #define XEN_PADDR_ALIGN (1 << 21) @@ -140,12 +141,14 @@ extern void share_xen_page_with_privileged_guests( struct page_info *page, int readonly); #define frame_table ((struct page_info *)FRAMETABLE_VIRT_START) -/* MFN of the first page in the frame table. */ -extern unsigned long frametable_base_mfn; +/* PDX of the first page in the frame table. */ +extern unsigned long frametable_base_pdx; extern unsigned long max_page; extern unsigned long total_pages; +#define PDX_GROUP_SHIFT SECOND_SHIFT + /* Boot-time pagetable setup */ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); /* Remove early mappings */ @@ -182,20 +185,15 @@ static inline void __iomem *ioremap_wc(paddr_t start, size_t len) return ioremap_attr(start, len, PAGE_HYPERVISOR_WC); } +/* XXX -- account for base */ #define mfn_valid(mfn) ({ \ unsigned long __m_f_n = (mfn); \ - likely(__m_f_n >= frametable_base_mfn && __m_f_n < max_page); \ + likely(pfn_to_pdx(__m_f_n) >= frametable_base_pdx && __mfn_valid(__m_f_n)); \ }) -#define max_pdx max_page -#define pfn_to_pdx(pfn) (pfn) -#define pdx_to_pfn(pdx) (pdx) -#define virt_to_pdx(va) virt_to_mfn(va) -#define pdx_to_virt(pdx) mfn_to_virt(pdx) - /* Convert between machine frame numbers and page-info structures. */ -#define mfn_to_page(mfn) (frame_table + (pfn_to_pdx(mfn) - frametable_base_mfn)) -#define page_to_mfn(pg) pdx_to_pfn((unsigned long)((pg) - frame_table) + frametable_base_mfn) +#define mfn_to_page(mfn) (frame_table + (pfn_to_pdx(mfn) - frametable_base_pdx)) +#define page_to_mfn(pg) pdx_to_pfn((unsigned long)((pg) - frame_table) + frametable_base_pdx) #define __page_to_mfn(pg) page_to_mfn(pg) #define __mfn_to_page(mfn) mfn_to_page(mfn) @@ -228,9 +226,11 @@ static inline void *maddr_to_virt(paddr_t ma) #else static inline void *maddr_to_virt(paddr_t ma) { - ASSERT((ma >> PAGE_SHIFT) < (DIRECTMAP_SIZE >> PAGE_SHIFT)); - ma -= pfn_to_paddr(xenheap_mfn_start); - return (void *)(unsigned long) ma + DIRECTMAP_VIRT_START; + ASSERT(pfn_to_pdx(ma >> PAGE_SHIFT) < (DIRECTMAP_SIZE >> PAGE_SHIFT)); + return (void *)(DIRECTMAP_VIRT_START - + pfn_to_paddr(xenheap_mfn_start) + + ((ma & ma_va_bottom_mask) | + ((ma & ma_top_mask) >> pfn_pdx_hole_shift))); } #endif @@ -256,13 +256,14 @@ static inline int gvirt_to_maddr(vaddr_t va, paddr_t *pa, unsigned int flags) static inline struct page_info *virt_to_page(const void *v) { unsigned long va = (unsigned long)v; + unsigned long pdx; + ASSERT(va >= XENHEAP_VIRT_START); ASSERT(va < xenheap_virt_end); - return frame_table - + ((va - XENHEAP_VIRT_START) >> PAGE_SHIFT) - + xenheap_mfn_start - - frametable_base_mfn; + pdx = (va - XENHEAP_VIRT_START) >> PAGE_SHIFT; + pdx += pfn_to_pdx(xenheap_mfn_start); + return frame_table + pdx - frametable_base_pdx; } static inline void *page_to_virt(const struct page_info *pg) diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 2c019d7..06a9d5a 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -12,7 +12,7 @@ static inline __attribute__((pure)) int phys_to_nid(paddr_t addr) /* XXX: implement NUMA support */ #define node_spanned_pages(nid) (total_pages) -#define node_start_pfn(nid) (frametable_base_mfn) +#define node_start_pfn(nid) (pdx_to_pfn(frametable_base_pdx)) #define __node_distance(a, b) (20) #endif /* __ARCH_ARM_NUMA_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Sep 24 03:44:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 24 Sep 2014 03:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdUu-0004C1-E0; Wed, 24 Sep 2014 03:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdUt-0004Bt-3l for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:07 +0000 Received: from [85.158.137.68:49673] by server-13.bemta-3.messagelabs.com id 0D/23-01569-60E32245; Wed, 24 Sep 2014 03:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1411530244!11656520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20122 invoked from network); 24 Sep 2014 03:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2014 03:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdUq-0008Mm-Hb for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWdUp-00085B-LW for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:03 +0000 Date: Wed, 24 Sep 2014 03:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/shadow: fix race condition sampling the dirty vram state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebd990bdd2911edb9ba9b6456305e849eb3848bf Author: Andrew Cooper AuthorDate: Tue Sep 23 14:49:35 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:49:35 2014 +0200 x86/shadow: fix race condition sampling the dirty vram state d->arch.hvm_domain.dirty_vram must be read with the domain's paging lock held. If not, two concurrent hypercalls could both end up attempting to free dirty_vram (the second of which will free a wild pointer), or both end up allocating a new dirty_vram structure (the first of which will be leaked). This is XSA-104. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 46a49b91f1026f64430b84dd83e845a33f06415e master date: 2014-09-23 14:31:47 +0200 --- xen/arch/x86/mm/shadow/common.c | 4 +++- xen/include/asm-x86/hvm/domain.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0362c85..d259902 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3601,7 +3601,7 @@ int shadow_track_dirty_vram(struct domain *d, int flush_tlb = 0; unsigned long i; p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct sh_dirty_vram *dirty_vram; struct p2m_domain *p2m = p2m_get_hostp2m(d); if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) @@ -3611,6 +3611,8 @@ int shadow_track_dirty_vram(struct domain *d, p2m_lock(p2m_get_hostp2m(d)); paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( dirty_vram && (!nr || ( begin_pfn != dirty_vram->begin_pfn || end_pfn != dirty_vram->end_pfn )) ) diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..863b097 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -73,7 +73,7 @@ struct hvm_domain { /* Memory ranges with pinned cache attributes. */ struct list_head pinned_cacheattr_ranges; - /* VRAM dirty support. */ + /* VRAM dirty support. Protect with the domain paging lock. */ struct sh_dirty_vram *dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or -- 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 Sep 24 03:44:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 24 Sep 2014 03:44:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdUu-0004C1-E0; Wed, 24 Sep 2014 03:44:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdUt-0004Bt-3l for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:07 +0000 Received: from [85.158.137.68:49673] by server-13.bemta-3.messagelabs.com id 0D/23-01569-60E32245; Wed, 24 Sep 2014 03:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1411530244!11656520!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20122 invoked from network); 24 Sep 2014 03:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2014 03:44:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdUq-0008Mm-Hb for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWdUp-00085B-LW for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:03 +0000 Date: Wed, 24 Sep 2014 03:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/shadow: fix race condition sampling the dirty vram state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ebd990bdd2911edb9ba9b6456305e849eb3848bf Author: Andrew Cooper AuthorDate: Tue Sep 23 14:49:35 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:49:35 2014 +0200 x86/shadow: fix race condition sampling the dirty vram state d->arch.hvm_domain.dirty_vram must be read with the domain's paging lock held. If not, two concurrent hypercalls could both end up attempting to free dirty_vram (the second of which will free a wild pointer), or both end up allocating a new dirty_vram structure (the first of which will be leaked). This is XSA-104. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 46a49b91f1026f64430b84dd83e845a33f06415e master date: 2014-09-23 14:31:47 +0200 --- xen/arch/x86/mm/shadow/common.c | 4 +++- xen/include/asm-x86/hvm/domain.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0362c85..d259902 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3601,7 +3601,7 @@ int shadow_track_dirty_vram(struct domain *d, int flush_tlb = 0; unsigned long i; p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct sh_dirty_vram *dirty_vram; struct p2m_domain *p2m = p2m_get_hostp2m(d); if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) @@ -3611,6 +3611,8 @@ int shadow_track_dirty_vram(struct domain *d, p2m_lock(p2m_get_hostp2m(d)); paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( dirty_vram && (!nr || ( begin_pfn != dirty_vram->begin_pfn || end_pfn != dirty_vram->end_pfn )) ) diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index 27b3de5..863b097 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -73,7 +73,7 @@ struct hvm_domain { /* Memory ranges with pinned cache attributes. */ struct list_head pinned_cacheattr_ranges; - /* VRAM dirty support. */ + /* VRAM dirty support. Protect with the domain paging lock. */ struct sh_dirty_vram *dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or -- 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 Sep 24 03:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 24 Sep 2014 03:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdV4-0004Co-If; Wed, 24 Sep 2014 03:44:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdV3-0004Cg-Kb for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:17 +0000 Received: from [193.109.254.147:30715] by server-13.bemta-14.messagelabs.com id 51/E5-19311-11E32245; Wed, 24 Sep 2014 03:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1411530255!12609176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26495 invoked from network); 24 Sep 2014 03:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2014 03:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdV0-0008Mp-U4 for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWdV0-00085l-Ld for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:14 +0000 Date: Wed, 24 Sep 2014 03:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/emulate: check cpl for all privileged instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b91c52d86e31e3877aeb56ea585af471530f444 Author: Andrew Cooper AuthorDate: Tue Sep 23 14:50:39 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:50:39 2014 +0200 x86/emulate: check cpl for all privileged instructions Without this, it is possible for userspace to load its own IDT or GDT. This is XSA-105. Reported-by: Andrei LUTAS Signed-off-by: Andrew Cooper Tested-by: Andrei LUTAS Reviewed-by: Jan Beulich master commit: 0e442727ceccfa32a7276cccd205b4722e68fdc1 master date: 2014-09-23 14:33:06 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b0363de..1d2eb03 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3296,6 +3296,7 @@ x86_emulate( goto swint; case 0xf4: /* hlt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); ctxt->retire.flags.hlt = 1; break; @@ -3721,6 +3722,7 @@ x86_emulate( break; case 2: /* lgdt */ case 3: /* lidt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); generate_exception_if(ea.type != OP_MEM, EXC_UD, -1); fail_if(ops->write_segment == NULL); memset(®, 0, sizeof(reg)); @@ -3749,6 +3751,7 @@ x86_emulate( case 6: /* lmsw */ fail_if(ops->read_cr == NULL); fail_if(ops->write_cr == NULL); + generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = ops->read_cr(0, &cr0, ctxt)) ) goto done; if ( ea.type == OP_REG ) -- 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 Sep 24 03:44:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 24 Sep 2014 03:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdV4-0004Co-If; Wed, 24 Sep 2014 03:44:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdV3-0004Cg-Kb for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:17 +0000 Received: from [193.109.254.147:30715] by server-13.bemta-14.messagelabs.com id 51/E5-19311-11E32245; Wed, 24 Sep 2014 03:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1411530255!12609176!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26495 invoked from network); 24 Sep 2014 03:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2014 03:44:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdV0-0008Mp-U4 for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWdV0-00085l-Ld for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:14 +0000 Date: Wed, 24 Sep 2014 03:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86/emulate: check cpl for all privileged instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b91c52d86e31e3877aeb56ea585af471530f444 Author: Andrew Cooper AuthorDate: Tue Sep 23 14:50:39 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:50:39 2014 +0200 x86/emulate: check cpl for all privileged instructions Without this, it is possible for userspace to load its own IDT or GDT. This is XSA-105. Reported-by: Andrei LUTAS Signed-off-by: Andrew Cooper Tested-by: Andrei LUTAS Reviewed-by: Jan Beulich master commit: 0e442727ceccfa32a7276cccd205b4722e68fdc1 master date: 2014-09-23 14:33:06 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index b0363de..1d2eb03 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3296,6 +3296,7 @@ x86_emulate( goto swint; case 0xf4: /* hlt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); ctxt->retire.flags.hlt = 1; break; @@ -3721,6 +3722,7 @@ x86_emulate( break; case 2: /* lgdt */ case 3: /* lidt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); generate_exception_if(ea.type != OP_MEM, EXC_UD, -1); fail_if(ops->write_segment == NULL); memset(®, 0, sizeof(reg)); @@ -3749,6 +3751,7 @@ x86_emulate( case 6: /* lmsw */ fail_if(ops->read_cr == NULL); fail_if(ops->write_cr == NULL); + generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = ops->read_cr(0, &cr0, ctxt)) ) goto done; if ( ea.type == OP_REG ) -- 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 Sep 24 03:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 24 Sep 2014 03: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 1XWdVE-0004EO-OH; Wed, 24 Sep 2014 03:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdVD-0004EE-OM for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:27 +0000 Received: from [193.109.254.147:59277] by server-7.bemta-14.messagelabs.com id AA/1F-13362-B1E32245; Wed, 24 Sep 2014 03:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1411530265!12628621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32343 invoked from network); 24 Sep 2014 03:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2014 03:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdVB-0008My-7F for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWdVB-00086g-1L for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:25 +0000 Date: Wed, 24 Sep 2014 03:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86emul: only emulate software interrupt injection for real mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6a279ffa10e1d3d26f25f5b569264fa3b5cf8d6 Author: Jan Beulich AuthorDate: Tue Sep 23 14:51:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:51:12 2014 +0200 x86emul: only emulate software interrupt injection for real mode Protected mode emulation currently lacks proper privilege checking of the referenced IDT entry, and there's currently no legitimate way for any of the respective instructions to reach the emulator when the guest is in protected mode. This is XSA-106. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 346d4545569928b652c40c7815c1732676f8587c master date: 2014-09-23 14:33:50 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1d2eb03..45a39b6 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2616,6 +2616,7 @@ x86_emulate( case 0xcd: /* int imm8 */ src.val = insn_fetch_type(uint8_t); swint: + fail_if(!in_realmode(ctxt, ops)); /* XSA-106 */ fail_if(ops->inject_sw_interrupt == NULL); rc = ops->inject_sw_interrupt(src.val, _regs.eip - ctxt->regs->eip, ctxt) ? : X86EMUL_EXCEPTION; -- 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 Sep 24 03:44:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 24 Sep 2014 03: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 1XWdVE-0004EO-OH; Wed, 24 Sep 2014 03:44:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdVD-0004EE-OM for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:27 +0000 Received: from [193.109.254.147:59277] by server-7.bemta-14.messagelabs.com id AA/1F-13362-B1E32245; Wed, 24 Sep 2014 03:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1411530265!12628621!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32343 invoked from network); 24 Sep 2014 03:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 24 Sep 2014 03:44:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XWdVB-0008My-7F for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XWdVB-00086g-1L for xen-changelog@lists.xensource.com; Wed, 24 Sep 2014 03:44:25 +0000 Date: Wed, 24 Sep 2014 03:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] x86emul: only emulate software interrupt injection for real mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d6a279ffa10e1d3d26f25f5b569264fa3b5cf8d6 Author: Jan Beulich AuthorDate: Tue Sep 23 14:51:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:51:12 2014 +0200 x86emul: only emulate software interrupt injection for real mode Protected mode emulation currently lacks proper privilege checking of the referenced IDT entry, and there's currently no legitimate way for any of the respective instructions to reach the emulator when the guest is in protected mode. This is XSA-106. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 346d4545569928b652c40c7815c1732676f8587c master date: 2014-09-23 14:33:50 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1d2eb03..45a39b6 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2616,6 +2616,7 @@ x86_emulate( case 0xcd: /* int imm8 */ src.val = insn_fetch_type(uint8_t); swint: + fail_if(!in_realmode(ctxt, ops)); /* XSA-106 */ fail_if(ops->inject_sw_interrupt == NULL); rc = ops->inject_sw_interrupt(src.val, _regs.eip - ctxt->regs->eip, ctxt) ? : X86EMUL_EXCEPTION; -- 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 Sep 25 04:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Sep 2014 04:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0OZ-0000WZ-5x; Thu, 25 Sep 2014 04:11:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0OY-0000WU-1t for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:06 +0000 Received: from [193.109.254.147:56578] by server-16.bemta-14.messagelabs.com id 0E/A9-16990-9D593245; Thu, 25 Sep 2014 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1411618263!12831513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30391 invoked from network); 25 Sep 2014 04:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Sep 2014 04:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0OV-0002W1-89 for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XX0OV-0003Az-2d for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:03 +0000 Date: Thu, 25 Sep 2014 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/shadow: fix race condition sampling the dirty vram state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20429b1274fe9ed0b40e73c295fa79b70c1bf80e Author: Andrew Cooper AuthorDate: Tue Sep 23 14:39:05 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:39:05 2014 +0200 x86/shadow: fix race condition sampling the dirty vram state d->arch.hvm_domain.dirty_vram must be read with the domain's paging lock held. If not, two concurrent hypercalls could both end up attempting to free dirty_vram (the second of which will free a wild pointer), or both end up allocating a new dirty_vram structure (the first of which will be leaked). This is XSA-104. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 46a49b91f1026f64430b84dd83e845a33f06415e master date: 2014-09-23 14:31:47 +0200 --- xen/arch/x86/mm/shadow/common.c | 4 +++- xen/include/asm-x86/hvm/domain.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index be095f6..3ed48c4 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3486,7 +3486,7 @@ int shadow_track_dirty_vram(struct domain *d, int flush_tlb = 0; unsigned long i; p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct sh_dirty_vram *dirty_vram; struct p2m_domain *p2m = p2m_get_hostp2m(d); if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) @@ -3496,6 +3496,8 @@ int shadow_track_dirty_vram(struct domain *d, p2m_lock(p2m_get_hostp2m(d)); paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( dirty_vram && (!nr || ( begin_pfn != dirty_vram->begin_pfn || end_pfn != dirty_vram->end_pfn )) ) diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index b1e3187..99c5e44 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -67,7 +67,7 @@ struct hvm_domain { /* Memory ranges with pinned cache attributes. */ struct list_head pinned_cacheattr_ranges; - /* VRAM dirty support. */ + /* VRAM dirty support. Protect with the domain paging lock. */ struct sh_dirty_vram *dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 25 04:11:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Sep 2014 04:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0OZ-0000WZ-5x; Thu, 25 Sep 2014 04:11:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0OY-0000WU-1t for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:06 +0000 Received: from [193.109.254.147:56578] by server-16.bemta-14.messagelabs.com id 0E/A9-16990-9D593245; Thu, 25 Sep 2014 04:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1411618263!12831513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30391 invoked from network); 25 Sep 2014 04:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Sep 2014 04:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0OV-0002W1-89 for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XX0OV-0003Az-2d for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:03 +0000 Date: Thu, 25 Sep 2014 04:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/shadow: fix race condition sampling the dirty vram state X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20429b1274fe9ed0b40e73c295fa79b70c1bf80e Author: Andrew Cooper AuthorDate: Tue Sep 23 14:39:05 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:39:05 2014 +0200 x86/shadow: fix race condition sampling the dirty vram state d->arch.hvm_domain.dirty_vram must be read with the domain's paging lock held. If not, two concurrent hypercalls could both end up attempting to free dirty_vram (the second of which will free a wild pointer), or both end up allocating a new dirty_vram structure (the first of which will be leaked). This is XSA-104. Signed-off-by: Andrew Cooper Reviewed-by: Tim Deegan master commit: 46a49b91f1026f64430b84dd83e845a33f06415e master date: 2014-09-23 14:31:47 +0200 --- xen/arch/x86/mm/shadow/common.c | 4 +++- xen/include/asm-x86/hvm/domain.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index be095f6..3ed48c4 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3486,7 +3486,7 @@ int shadow_track_dirty_vram(struct domain *d, int flush_tlb = 0; unsigned long i; p2m_type_t t; - struct sh_dirty_vram *dirty_vram = d->arch.hvm_domain.dirty_vram; + struct sh_dirty_vram *dirty_vram; struct p2m_domain *p2m = p2m_get_hostp2m(d); if ( end_pfn < begin_pfn || end_pfn > p2m->max_mapped_pfn + 1 ) @@ -3496,6 +3496,8 @@ int shadow_track_dirty_vram(struct domain *d, p2m_lock(p2m_get_hostp2m(d)); paging_lock(d); + dirty_vram = d->arch.hvm_domain.dirty_vram; + if ( dirty_vram && (!nr || ( begin_pfn != dirty_vram->begin_pfn || end_pfn != dirty_vram->end_pfn )) ) diff --git a/xen/include/asm-x86/hvm/domain.h b/xen/include/asm-x86/hvm/domain.h index b1e3187..99c5e44 100644 --- a/xen/include/asm-x86/hvm/domain.h +++ b/xen/include/asm-x86/hvm/domain.h @@ -67,7 +67,7 @@ struct hvm_domain { /* Memory ranges with pinned cache attributes. */ struct list_head pinned_cacheattr_ranges; - /* VRAM dirty support. */ + /* VRAM dirty support. Protect with the domain paging lock. */ struct sh_dirty_vram *dirty_vram; /* If one of vcpus of this domain is in no_fill_mode or -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 25 04:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Sep 2014 04: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 1XX0Oj-0000XA-8U; Thu, 25 Sep 2014 04:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Oh-0000X1-Rf for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:15 +0000 Received: from [85.158.143.35:58920] by server-3.bemta-4.messagelabs.com id 74/19-06192-3E593245; Thu, 25 Sep 2014 04:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1411618273!13075244!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4892 invoked from network); 25 Sep 2014 04:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 25 Sep 2014 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Of-0002W7-IB for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XX0Of-0003CE-CQ for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:13 +0000 Date: Thu, 25 Sep 2014 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/emulate: check cpl for all privileged instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 510f1717827b54e27acd86e1781bb472a10cc72a Author: Andrew Cooper AuthorDate: Tue Sep 23 14:40:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:40:12 2014 +0200 x86/emulate: check cpl for all privileged instructions Without this, it is possible for userspace to load its own IDT or GDT. This is XSA-105. Reported-by: Andrei LUTAS Signed-off-by: Andrew Cooper Tested-by: Andrei LUTAS Reviewed-by: Jan Beulich master commit: 0e442727ceccfa32a7276cccd205b4722e68fdc1 master date: 2014-09-23 14:33:06 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 50d8965..4810e68 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3314,6 +3314,7 @@ x86_emulate( goto swint; case 0xf4: /* hlt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); ctxt->retire.flags.hlt = 1; break; @@ -3710,6 +3711,7 @@ x86_emulate( break; case 2: /* lgdt */ case 3: /* lidt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); generate_exception_if(ea.type != OP_MEM, EXC_UD, -1); fail_if(ops->write_segment == NULL); memset(®, 0, sizeof(reg)); @@ -3738,6 +3740,7 @@ x86_emulate( case 6: /* lmsw */ fail_if(ops->read_cr == NULL); fail_if(ops->write_cr == NULL); + generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = ops->read_cr(0, &cr0, ctxt)) ) goto done; if ( ea.type == OP_REG ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 25 04:11:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Sep 2014 04: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 1XX0Oj-0000XA-8U; Thu, 25 Sep 2014 04:11:17 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Oh-0000X1-Rf for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:15 +0000 Received: from [85.158.143.35:58920] by server-3.bemta-4.messagelabs.com id 74/19-06192-3E593245; Thu, 25 Sep 2014 04:11:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1411618273!13075244!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4892 invoked from network); 25 Sep 2014 04:11:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 25 Sep 2014 04:11:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Of-0002W7-IB for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XX0Of-0003CE-CQ for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:13 +0000 Date: Thu, 25 Sep 2014 04:11:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/emulate: check cpl for all privileged instructions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 510f1717827b54e27acd86e1781bb472a10cc72a Author: Andrew Cooper AuthorDate: Tue Sep 23 14:40:12 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:40:12 2014 +0200 x86/emulate: check cpl for all privileged instructions Without this, it is possible for userspace to load its own IDT or GDT. This is XSA-105. Reported-by: Andrei LUTAS Signed-off-by: Andrew Cooper Tested-by: Andrei LUTAS Reviewed-by: Jan Beulich master commit: 0e442727ceccfa32a7276cccd205b4722e68fdc1 master date: 2014-09-23 14:33:06 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 50d8965..4810e68 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3314,6 +3314,7 @@ x86_emulate( goto swint; case 0xf4: /* hlt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); ctxt->retire.flags.hlt = 1; break; @@ -3710,6 +3711,7 @@ x86_emulate( break; case 2: /* lgdt */ case 3: /* lidt */ + generate_exception_if(!mode_ring0(), EXC_GP, 0); generate_exception_if(ea.type != OP_MEM, EXC_UD, -1); fail_if(ops->write_segment == NULL); memset(®, 0, sizeof(reg)); @@ -3738,6 +3740,7 @@ x86_emulate( case 6: /* lmsw */ fail_if(ops->read_cr == NULL); fail_if(ops->write_cr == NULL); + generate_exception_if(!mode_ring0(), EXC_GP, 0); if ( (rc = ops->read_cr(0, &cr0, ctxt)) ) goto done; if ( ea.type == OP_REG ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 25 04:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Sep 2014 04:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Ot-0000YS-BC; Thu, 25 Sep 2014 04:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Os-0000YK-8o for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:26 +0000 Received: from [193.109.254.147:57507] by server-9.bemta-14.messagelabs.com id 15/11-31535-DE593245; Thu, 25 Sep 2014 04:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1411618283!12871352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18189 invoked from network); 25 Sep 2014 04:11:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Sep 2014 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Op-0002WG-NI for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XX0Op-0003Ca-LZ for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:23 +0000 Date: Thu, 25 Sep 2014 04:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86emul: only emulate software interrupt injection for real mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a299a3e88a387de88489d6a6f61bebdafc95ebe5 Author: Jan Beulich AuthorDate: Tue Sep 23 14:40:51 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:40:51 2014 +0200 x86emul: only emulate software interrupt injection for real mode Protected mode emulation currently lacks proper privilege checking of the referenced IDT entry, and there's currently no legitimate way for any of the respective instructions to reach the emulator when the guest is in protected mode. This is XSA-106. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 346d4545569928b652c40c7815c1732676f8587c master date: 2014-09-23 14:33:50 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 4810e68..5fbe024 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2634,6 +2634,7 @@ x86_emulate( case 0xcd: /* int imm8 */ src.val = insn_fetch_type(uint8_t); swint: + fail_if(!in_realmode(ctxt, ops)); /* XSA-106 */ fail_if(ops->inject_sw_interrupt == NULL); rc = ops->inject_sw_interrupt(src.val, _regs.eip - ctxt->regs->eip, ctxt) ? : X86EMUL_EXCEPTION; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Sep 25 04:11:27 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 25 Sep 2014 04:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Ot-0000YS-BC; Thu, 25 Sep 2014 04:11:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Os-0000YK-8o for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:26 +0000 Received: from [193.109.254.147:57507] by server-9.bemta-14.messagelabs.com id 15/11-31535-DE593245; Thu, 25 Sep 2014 04:11:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1411618283!12871352!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18189 invoked from network); 25 Sep 2014 04:11:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 25 Sep 2014 04:11:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XX0Op-0002WG-NI for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XX0Op-0003Ca-LZ for xen-changelog@lists.xensource.com; Thu, 25 Sep 2014 04:11:23 +0000 Date: Thu, 25 Sep 2014 04:11:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86emul: only emulate software interrupt injection for real mode X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a299a3e88a387de88489d6a6f61bebdafc95ebe5 Author: Jan Beulich AuthorDate: Tue Sep 23 14:40:51 2014 +0200 Commit: Jan Beulich CommitDate: Tue Sep 23 14:40:51 2014 +0200 x86emul: only emulate software interrupt injection for real mode Protected mode emulation currently lacks proper privilege checking of the referenced IDT entry, and there's currently no legitimate way for any of the respective instructions to reach the emulator when the guest is in protected mode. This is XSA-106. Reported-by: Andrei LUTAS Signed-off-by: Jan Beulich Acked-by: Keir Fraser master commit: 346d4545569928b652c40c7815c1732676f8587c master date: 2014-09-23 14:33:50 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 4810e68..5fbe024 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -2634,6 +2634,7 @@ x86_emulate( case 0xcd: /* int imm8 */ src.val = insn_fetch_type(uint8_t); swint: + fail_if(!in_realmode(ctxt, ops)); /* XSA-106 */ fail_if(ops->inject_sw_interrupt == NULL); rc = ops->inject_sw_interrupt(src.val, _regs.eip - ctxt->regs->eip, ctxt) ? : X86EMUL_EXCEPTION; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 26 10:11:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Sep 2014 10:11:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XXSUU-00059N-JA; Fri, 26 Sep 2014 10:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XXSUT-00058z-Nx for xen-changelog@lists.xensource.com; Fri, 26 Sep 2014 10:11:05 +0000 Received: from [193.109.254.147:53104] by server-3.bemta-14.messagelabs.com id B7/DF-23707-8BB35245; Fri, 26 Sep 2014 10:11:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1411726263!11759980!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14336 invoked from network); 26 Sep 2014 10:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2014 10:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XXSUR-00068R-4P for xen-changelog@lists.xensource.com; Fri, 26 Sep 2014 10:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XXSUR-00012q-1i for xen-changelog@lists.xensource.com; Fri, 26 Sep 2014 10:11:03 +0000 Message-Id: Date: Fri, 26 Sep 2014 10:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] usbback: mark request as consumed after finished using it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Juergen Gross # Date 1411725851 -7200 # Node ID ab22257ffed27a8700322f1a185a399dca909c59 # Parent 52f54ddbf4495d75384fc00caa075c42d4a6c3fd usbback: mark request as consumed after finished using it A request from the pvusb frontend should be marked as consumed by the backend only after the backend isn't accessing the request data in the communication ring any more. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 52f54ddbf449 -r ab22257ffed2 drivers/xen/usbback/usbback.c --- a/drivers/xen/usbback/usbback.c Fri Jul 25 08:22:58 2014 +0200 +++ b/drivers/xen/usbback/usbback.c Fri Sep 26 12:04:11 2014 +0200 @@ -1003,10 +1003,10 @@ static int usbbk_start_submit_urb(usbif_ } req = RING_GET_REQUEST(urb_ring, rc); - urb_ring->req_cons = ++rc; dispatch_request_to_pending_reqs(usbif, req, pending_req); + urb_ring->req_cons = ++rc; cond_resched(); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Sep 26 10:11:07 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 26 Sep 2014 10:11:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XXSUU-00059N-JA; Fri, 26 Sep 2014 10:11:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XXSUT-00058z-Nx for xen-changelog@lists.xensource.com; Fri, 26 Sep 2014 10:11:05 +0000 Received: from [193.109.254.147:53104] by server-3.bemta-14.messagelabs.com id B7/DF-23707-8BB35245; Fri, 26 Sep 2014 10:11:04 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-10.tower-27.messagelabs.com!1411726263!11759980!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14336 invoked from network); 26 Sep 2014 10:11:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 26 Sep 2014 10:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XXSUR-00068R-4P for xen-changelog@lists.xensource.com; Fri, 26 Sep 2014 10:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XXSUR-00012q-1i for xen-changelog@lists.xensource.com; Fri, 26 Sep 2014 10:11:03 +0000 Message-Id: Date: Fri, 26 Sep 2014 10:11:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] usbback: mark request as consumed after finished using it X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Juergen Gross # Date 1411725851 -7200 # Node ID ab22257ffed27a8700322f1a185a399dca909c59 # Parent 52f54ddbf4495d75384fc00caa075c42d4a6c3fd usbback: mark request as consumed after finished using it A request from the pvusb frontend should be marked as consumed by the backend only after the backend isn't accessing the request data in the communication ring any more. Signed-off-by: Juergen Gross Committed-by: Jan Beulich --- diff -r 52f54ddbf449 -r ab22257ffed2 drivers/xen/usbback/usbback.c --- a/drivers/xen/usbback/usbback.c Fri Jul 25 08:22:58 2014 +0200 +++ b/drivers/xen/usbback/usbback.c Fri Sep 26 12:04:11 2014 +0200 @@ -1003,10 +1003,10 @@ static int usbbk_start_submit_urb(usbif_ } req = RING_GET_REQUEST(urb_ring, rc); - urb_ring->req_cons = ++rc; dispatch_request_to_pending_reqs(usbif, req, pending_req); + urb_ring->req_cons = ++rc; cond_resched(); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog