From xen-changelog-bounces@lists.xen.org Tue Dec 02 11:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Dec 2014 11:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xvm2z-0006k0-Ae; Tue, 02 Dec 2014 11:55:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xvm2x-0006jh-Uv for xen-changelog@lists.xensource.com; Tue, 02 Dec 2014 11:55:12 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 90/46-25276-F98AD745; Tue, 02 Dec 2014 11:55:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1417521310!4802386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11942 invoked from network); 2 Dec 2014 11:55:10 -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; 2 Dec 2014 11:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xvm2s-0008SD-Ne for xen-changelog@lists.xensource.com; Tue, 02 Dec 2014 11:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xvm2s-0006z1-KT for xen-changelog@lists.xensource.com; Tue, 02 Dec 2014 11:55:06 +0000 Message-Id: Date: Tue, 02 Dec 2014 11:55:06 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86-64/MCE: flip CPU and bank numbers in log message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1417520601 -3600 # Node ID e8c8784ca274e2200c1b4ab9b41912acce1f33ae # Parent 49e06ed72c53a183378ec6efc97caf26846678e7 x86-64/MCE: flip CPU and bank numbers in log message Seeing "CPU8, BANK0" when "CPU0, BANK8" is meant can be rather confusing when trying to decode the remaining printed information or determine the offending physical CPU package. Reformat the message so that one can recognize whether it's a properly or wrongly ordered one without needing to know the precise kernel version. Signed-off-by: Jan Beulich --- diff -r 49e06ed72c53 -r e8c8784ca274 arch/x86_64/kernel/mce_dom0.c --- a/arch/x86_64/kernel/mce_dom0.c Thu Nov 13 15:17:12 2014 +0100 +++ b/arch/x86_64/kernel/mce_dom0.c Tue Dec 02 12:43:21 2014 +0100 @@ -38,8 +38,8 @@ static int convert_log(struct mc_info *m m.tsc = mc_bank->mc_tsc; m.res1 = mc_bank->mc_ctrl2; m.bank = mc_bank->mc_bank; - printk(KERN_DEBUG "[CPU%d, BANK%d, addr %llx, state %llx]\n", - m.bank, m.cpu, m.addr, m.status); + printk(KERN_DEBUG "[CPU %d bank %d addr %Lx state %Lx]\n", + m.cpu, m.bank, m.addr, m.status); /*log this record*/ mce_log(&m); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 02 11:55:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 02 Dec 2014 11:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xvm2z-0006k0-Ae; Tue, 02 Dec 2014 11:55:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xvm2x-0006jh-Uv for xen-changelog@lists.xensource.com; Tue, 02 Dec 2014 11:55:12 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 90/46-25276-F98AD745; Tue, 02 Dec 2014 11:55:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-21.messagelabs.com!1417521310!4802386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11942 invoked from network); 2 Dec 2014 11:55:10 -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; 2 Dec 2014 11:55:10 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xvm2s-0008SD-Ne for xen-changelog@lists.xensource.com; Tue, 02 Dec 2014 11:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xvm2s-0006z1-KT for xen-changelog@lists.xensource.com; Tue, 02 Dec 2014 11:55:06 +0000 Message-Id: Date: Tue, 02 Dec 2014 11:55:06 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] x86-64/MCE: flip CPU and bank numbers in log message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1417520601 -3600 # Node ID e8c8784ca274e2200c1b4ab9b41912acce1f33ae # Parent 49e06ed72c53a183378ec6efc97caf26846678e7 x86-64/MCE: flip CPU and bank numbers in log message Seeing "CPU8, BANK0" when "CPU0, BANK8" is meant can be rather confusing when trying to decode the remaining printed information or determine the offending physical CPU package. Reformat the message so that one can recognize whether it's a properly or wrongly ordered one without needing to know the precise kernel version. Signed-off-by: Jan Beulich --- diff -r 49e06ed72c53 -r e8c8784ca274 arch/x86_64/kernel/mce_dom0.c --- a/arch/x86_64/kernel/mce_dom0.c Thu Nov 13 15:17:12 2014 +0100 +++ b/arch/x86_64/kernel/mce_dom0.c Tue Dec 02 12:43:21 2014 +0100 @@ -38,8 +38,8 @@ static int convert_log(struct mc_info *m m.tsc = mc_bank->mc_tsc; m.res1 = mc_bank->mc_ctrl2; m.bank = mc_bank->mc_bank; - printk(KERN_DEBUG "[CPU%d, BANK%d, addr %llx, state %llx]\n", - m.bank, m.cpu, m.addr, m.status); + printk(KERN_DEBUG "[CPU %d bank %d addr %Lx state %Lx]\n", + m.cpu, m.bank, m.addr, m.status); /*log this record*/ mce_log(&m); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 03 17:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Dec 2014 17:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwDSE-000483-L5; Wed, 03 Dec 2014 17:11:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwDSD-00047y-SI for xen-changelog@lists.xensource.com; Wed, 03 Dec 2014 17:11:05 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 55/7B-01660-9244F745; Wed, 03 Dec 2014 17:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1417626663!11338372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30577 invoked from network); 3 Dec 2014 17: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; 3 Dec 2014 17:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwDSB-0002RM-8D for xen-changelog@lists.xensource.com; Wed, 03 Dec 2014 17:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XwDSA-0005hp-Pp for xen-changelog@lists.xensource.com; Wed, 03 Dec 2014 17:11:02 +0000 Date: Wed, 03 Dec 2014 17:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Xen-4.5.0-rc3: Update tag for qemu-xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3a80985b894f54eb3b2e143e4dea737cf139a517 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Dec 3 10:31:22 2014 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Dec 3 10:31:22 2014 -0500 Xen-4.5.0-rc3: Update tag for qemu-xen. QEMU-traditional has nothing new, so stay at rc1 there. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 642744f..a53cfb5 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc3 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 03 17:11:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 03 Dec 2014 17:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwDSE-000483-L5; Wed, 03 Dec 2014 17:11:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwDSD-00047y-SI for xen-changelog@lists.xensource.com; Wed, 03 Dec 2014 17:11:05 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 55/7B-01660-9244F745; Wed, 03 Dec 2014 17:11:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1417626663!11338372!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30577 invoked from network); 3 Dec 2014 17: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; 3 Dec 2014 17:11:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwDSB-0002RM-8D for xen-changelog@lists.xensource.com; Wed, 03 Dec 2014 17:11:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XwDSA-0005hp-Pp for xen-changelog@lists.xensource.com; Wed, 03 Dec 2014 17:11:02 +0000 Date: Wed, 03 Dec 2014 17:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Xen-4.5.0-rc3: Update tag for qemu-xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3a80985b894f54eb3b2e143e4dea737cf139a517 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Dec 3 10:31:22 2014 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Wed Dec 3 10:31:22 2014 -0500 Xen-4.5.0-rc3: Update tag for qemu-xen. QEMU-traditional has nothing new, so stay at rc1 there. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index 642744f..a53cfb5 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc3 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 05 01:33:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 01: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 1Xwhla-00062v-OX; Fri, 05 Dec 2014 01:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwhlZ-00062k-Nh for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 01:33:05 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id EA/7C-22777-05B01845; Fri, 05 Dec 2014 01:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1417743183!11649052!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23589 invoked from network); 5 Dec 2014 01:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Dec 2014 01:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwhlW-0004xb-VT for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 01:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XwhlW-0002E4-OW for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 01:33:02 +0000 Date: Fri, 05 Dec 2014 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio-net: fix unmap leak X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ebb75b1fee779621b63e84fefa7b07354c43a99 Author: Jason Wang AuthorDate: Thu Nov 27 18:04:03 2014 +0800 Commit: Stefano Stabellini CommitDate: Tue Dec 2 10:41:02 2014 +0000 virtio-net: fix unmap leak virtio_net_handle_ctrl() and other functions that process control vq request call iov_discard_front() which will shorten the iov. This will lead unmapping in virtqueue_push() leaks mapping. Fixes this by keeping the original iov untouched and using a temp variable in those functions. upstream-commit-id: 771b6ed37e3aa188a7485560b949a41c6cf174dc Cc: Wen Congyang Cc: Stefano Stabellini Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang Reviewed-by: Stefano Stabellini Reviewed-by: Fam Zheng Reviewed-by: Michael S. Tsirkin Message-id: 1417082643-23907-1-git-send-email-jasowang@redhat.com Signed-off-by: Peter Maydell Reviewed-Acked-by: Konrad Rzeszutek Wilk --- hw/net/virtio-net.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 2ac6ce5..d5e8ecb 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -772,7 +772,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) virtio_net_ctrl_ack status = VIRTIO_NET_ERR; VirtQueueElement elem; size_t s; - struct iovec *iov; + struct iovec *iov, *iov2; unsigned int iov_cnt; while (virtqueue_pop(vq, &elem)) { @@ -782,8 +782,8 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) exit(1); } - iov = elem.out_sg; iov_cnt = elem.out_num; + iov2 = iov = g_memdup(elem.out_sg, sizeof(struct iovec) * elem.out_num); s = iov_to_buf(iov, iov_cnt, 0, &ctrl, sizeof(ctrl)); iov_discard_front(&iov, &iov_cnt, sizeof(ctrl)); if (s != sizeof(ctrl)) { @@ -805,6 +805,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) virtqueue_push(vq, &elem, sizeof(status)); virtio_notify(vdev, vq); + g_free(iov2); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 05 01:33:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 01: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 1Xwhla-00062v-OX; Fri, 05 Dec 2014 01:33:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwhlZ-00062k-Nh for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 01:33:05 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id EA/7C-22777-05B01845; Fri, 05 Dec 2014 01:33:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1417743183!11649052!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23589 invoked from network); 5 Dec 2014 01:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Dec 2014 01:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwhlW-0004xb-VT for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 01:33:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XwhlW-0002E4-OW for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 01:33:02 +0000 Date: Fri, 05 Dec 2014 01:33:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-upstream-unstable] virtio-net: fix unmap leak X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ebb75b1fee779621b63e84fefa7b07354c43a99 Author: Jason Wang AuthorDate: Thu Nov 27 18:04:03 2014 +0800 Commit: Stefano Stabellini CommitDate: Tue Dec 2 10:41:02 2014 +0000 virtio-net: fix unmap leak virtio_net_handle_ctrl() and other functions that process control vq request call iov_discard_front() which will shorten the iov. This will lead unmapping in virtqueue_push() leaks mapping. Fixes this by keeping the original iov untouched and using a temp variable in those functions. upstream-commit-id: 771b6ed37e3aa188a7485560b949a41c6cf174dc Cc: Wen Congyang Cc: Stefano Stabellini Cc: qemu-stable@nongnu.org Signed-off-by: Jason Wang Reviewed-by: Stefano Stabellini Reviewed-by: Fam Zheng Reviewed-by: Michael S. Tsirkin Message-id: 1417082643-23907-1-git-send-email-jasowang@redhat.com Signed-off-by: Peter Maydell Reviewed-Acked-by: Konrad Rzeszutek Wilk --- hw/net/virtio-net.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 2ac6ce5..d5e8ecb 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -772,7 +772,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) virtio_net_ctrl_ack status = VIRTIO_NET_ERR; VirtQueueElement elem; size_t s; - struct iovec *iov; + struct iovec *iov, *iov2; unsigned int iov_cnt; while (virtqueue_pop(vq, &elem)) { @@ -782,8 +782,8 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) exit(1); } - iov = elem.out_sg; iov_cnt = elem.out_num; + iov2 = iov = g_memdup(elem.out_sg, sizeof(struct iovec) * elem.out_num); s = iov_to_buf(iov, iov_cnt, 0, &ctrl, sizeof(ctrl)); iov_discard_front(&iov, &iov_cnt, sizeof(ctrl)); if (s != sizeof(ctrl)) { @@ -805,6 +805,7 @@ static void virtio_net_handle_ctrl(VirtIODevice *vdev, VirtQueue *vq) virtqueue_push(vq, &elem, sizeof(status)); virtio_notify(vdev, vq); + g_free(iov2); } } -- generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 05 15:33:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15:33: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 1XwusW-0001ta-2t; Fri, 05 Dec 2014 15:33:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwusU-0001tQ-J8 for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:06 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 57/7C-29352-130D1845; Fri, 05 Dec 2014 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1417793583!6407341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2457 invoked from network); 5 Dec 2014 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Dec 2014 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwusR-0006Xx-LH for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XwusR-0003Qb-BG for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:03 +0000 Date: Fri, 05 Dec 2014 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98c78711764082171b3fa189793c6db904f65ebc Author: Jan Beulich AuthorDate: Thu Nov 27 14:10:52 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:10:52 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0ad715304b04739fd2fc9517ce8671d3947c7621 master date: 2014-11-27 14:00:23 +0100 --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 6 +++--- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 789e4a0..8a276f9 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1697,7 +1697,8 @@ unsigned long hypercall_create_continuation( return op; } -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1706,7 +1707,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1719,7 +1723,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) return 0; } - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1747,7 +1751,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index 0a8408b..42aa85e 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -116,7 +116,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -351,7 +351,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -359,7 +359,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index daa2e04..c5d58e6 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -279,7 +279,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index ca60699..bb3ffd1 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -195,6 +195,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -214,7 +216,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- 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 Dec 05 15:33:14 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15:33: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 1XwusW-0001ta-2t; Fri, 05 Dec 2014 15:33:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwusU-0001tQ-J8 for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:06 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 57/7C-29352-130D1845; Fri, 05 Dec 2014 15:33:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1417793583!6407341!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2457 invoked from network); 5 Dec 2014 15:33:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 5 Dec 2014 15:33:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XwusR-0006Xx-LH for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XwusR-0003Qb-BG for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:03 +0000 Date: Fri, 05 Dec 2014 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98c78711764082171b3fa189793c6db904f65ebc Author: Jan Beulich AuthorDate: Thu Nov 27 14:10:52 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:10:52 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: 0ad715304b04739fd2fc9517ce8671d3947c7621 master date: 2014-11-27 14:00:23 +0100 --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 6 +++--- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 789e4a0..8a276f9 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1697,7 +1697,8 @@ unsigned long hypercall_create_continuation( return op; } -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1706,7 +1707,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1719,7 +1723,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) return 0; } - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1747,7 +1751,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index 0a8408b..42aa85e 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -116,7 +116,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -351,7 +351,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -359,7 +359,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index daa2e04..c5d58e6 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -279,7 +279,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index ca60699..bb3ffd1 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -195,6 +195,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -214,7 +216,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- 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 Dec 05 15:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusg-0001uE-5X; Fri, 05 Dec 2014 15:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwuse-0001u3-Dq for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:16 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 32/D6-15461-B30D1845; Fri, 05 Dec 2014 15:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1417793594!6420897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8896 invoked from network); 5 Dec 2014 15:33:15 -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; 5 Dec 2014 15:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusc-0006Y0-34 for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xwusb-0003Qz-PO for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:13 +0000 Date: Fri, 05 Dec 2014 15:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: confine internally handled MMIO to solitary 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 a39f202031d7f1d8d9e14b8c3d7d11c812db253e Author: Jan Beulich AuthorDate: Thu Nov 27 14:11:57 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:11:57 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: c5397354b998d030b021810b8202de93b9526818 master date: 2014-11-27 14:01:40 +0100 --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 7cc13b5..52ffee3 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -169,11 +169,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -330,6 +343,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size < addr + : p->addr + p->count * 1L * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 10e5f34..dc3e4d7 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -235,6 +235,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -277,6 +279,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- 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 Dec 05 15:33:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusg-0001uE-5X; Fri, 05 Dec 2014 15:33:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwuse-0001u3-Dq for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:16 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 32/D6-15461-B30D1845; Fri, 05 Dec 2014 15:33:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1417793594!6420897!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8896 invoked from network); 5 Dec 2014 15:33:15 -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; 5 Dec 2014 15:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusc-0006Y0-34 for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xwusb-0003Qz-PO for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:13 +0000 Date: Fri, 05 Dec 2014 15:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: confine internally handled MMIO to solitary 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 a39f202031d7f1d8d9e14b8c3d7d11c812db253e Author: Jan Beulich AuthorDate: Thu Nov 27 14:11:57 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:11:57 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan master commit: c5397354b998d030b021810b8202de93b9526818 master date: 2014-11-27 14:01:40 +0100 --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 7cc13b5..52ffee3 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -169,11 +169,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -330,6 +343,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size < addr + : p->addr + p->count * 1L * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 10e5f34..dc3e4d7 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -235,6 +235,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -277,6 +279,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- 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 Dec 05 15:33:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15: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 1Xwuss-0001vm-8Q; Fri, 05 Dec 2014 15:33:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusq-0001vb-QW for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:29 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 3E/0A-26740-840D1845; Fri, 05 Dec 2014 15:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1417793606!11390159!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19336 invoked from network); 5 Dec 2014 15:33:27 -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; 5 Dec 2014 15:33:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusn-0006Y9-QM for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xwusn-0003SU-K9 for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:25 +0000 Date: Fri, 05 Dec 2014 15:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e687e7da367827344db3965b8a5f5f761a8431a Author: Jan Beulich AuthorDate: Thu Nov 27 14:14:15 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:14:15 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 8 ++++---- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 336cd79..74e1146 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1653,7 +1653,8 @@ unsigned long hypercall_create_continuation( return op; } -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1662,7 +1663,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1671,7 +1675,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) { if ( !test_bit(_MCSF_call_preempted, &mcs->flags) ) return 0; - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1699,7 +1703,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index f01f8ff..f1e63d6 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -78,7 +78,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) } if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); break; } @@ -144,7 +144,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -379,7 +379,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -387,7 +387,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index ba7e6eb..04ba0db 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -208,7 +208,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index ca60699..bb3ffd1 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -195,6 +195,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -214,7 +216,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 05 15:33:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15: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 1Xwuss-0001vm-8Q; Fri, 05 Dec 2014 15:33:30 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusq-0001vb-QW for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:29 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 3E/0A-26740-840D1845; Fri, 05 Dec 2014 15:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1417793606!11390159!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19336 invoked from network); 5 Dec 2014 15:33:27 -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; 5 Dec 2014 15:33:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusn-0006Y9-QM for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xwusn-0003SU-K9 for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:25 +0000 Date: Fri, 05 Dec 2014 15:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: limit checks in hypercall_xlat_continuation() to actual arguments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5e687e7da367827344db3965b8a5f5f761a8431a Author: Jan Beulich AuthorDate: Thu Nov 27 14:14:15 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:14:15 2014 +0100 x86: limit checks in hypercall_xlat_continuation() to actual arguments HVM/PVH guests can otherwise trigger the final BUG_ON() in that function by entering 64-bit mode, setting the high halves of affected registers to non-zero values, leaving 64-bit mode, and issuing a hypercall that might get preempted and hence become subject to continuation argument translation (HYPERVISOR_memory_op being the only one possible for HVM, PVH also having the option of using HYPERVISOR_mmuext_op). This issue got introduced when HVM code was switched to use compat_memory_op() - neither that nor hypercall_xlat_continuation() were originally intended to be used by other than PV guests (which can't enter 64-bit mode and hence have no way to alter the high halves of 64-bit registers). This is CVE-2014-8866 / XSA-111. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/domain.c | 12 ++++++++---- xen/arch/x86/x86_64/compat/mm.c | 8 ++++---- xen/common/compat/memory.c | 2 +- xen/include/xen/compat.h | 5 ++++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 336cd79..74e1146 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1653,7 +1653,8 @@ unsigned long hypercall_create_continuation( return op; } -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...) { int rc = 0; struct mc_state *mcs = ¤t->mc_state; @@ -1662,7 +1663,10 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) unsigned long nval = 0; va_list args; - BUG_ON(id && *id > 5); + ASSERT(nr <= ARRAY_SIZE(mcs->call.args)); + ASSERT(!(mask >> nr)); + + BUG_ON(id && *id >= nr); BUG_ON(id && (mask & (1U << *id))); va_start(args, mask); @@ -1671,7 +1675,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) { if ( !test_bit(_MCSF_call_preempted, &mcs->flags) ) return 0; - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { if ( mask & 1 ) { @@ -1699,7 +1703,7 @@ int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...) else { regs = guest_cpu_user_regs(); - for ( i = 0; i < 6; ++i, mask >>= 1 ) + for ( i = 0; i < nr; ++i, mask >>= 1 ) { unsigned long *reg; diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index f01f8ff..f1e63d6 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -78,7 +78,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) } if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); break; } @@ -144,7 +144,7 @@ int compat_arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg) break; if ( rc == __HYPERVISOR_memory_op ) - hypercall_xlat_continuation(NULL, 0x2, nat, arg); + hypercall_xlat_continuation(NULL, 2, 0x2, nat, arg); XLAT_pod_target(&cmp, nat); @@ -379,7 +379,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, left = 1; if ( arg1 != MMU_UPDATE_PREEMPTED ) { - BUG_ON(!hypercall_xlat_continuation(&left, 0x01, nat_ops, + BUG_ON(!hypercall_xlat_continuation(&left, 4, 0x01, nat_ops, cmp_uops)); if ( !test_bit(_MCSF_in_multicall, &mcs->flags) ) regs->_ecx += count - i; @@ -387,7 +387,7 @@ int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, mcs->compat_call.args[1] += count - i; } else - BUG_ON(hypercall_xlat_continuation(&left, 0)); + BUG_ON(hypercall_xlat_continuation(&left, 4, 0)); BUG_ON(left != arg1); } else diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index ba7e6eb..04ba0db 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -208,7 +208,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; cmd = 0; - if ( hypercall_xlat_continuation(&cmd, 0x02, nat.hnd, compat) ) + if ( hypercall_xlat_continuation(&cmd, 2, 0x02, nat.hnd, compat) ) { BUG_ON(rc != __HYPERVISOR_memory_op); BUG_ON((cmd & MEMOP_CMD_MASK) != op); diff --git a/xen/include/xen/compat.h b/xen/include/xen/compat.h index ca60699..bb3ffd1 100644 --- a/xen/include/xen/compat.h +++ b/xen/include/xen/compat.h @@ -195,6 +195,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * This option is useful for extracting the "op" argument or similar from the * hypercall to enable further xlat processing. * + * nr: Total number of arguments the hypercall has. + * * mask: Specifies which of the hypercall arguments require compat translation. * bit 0 indicates that the 0'th argument requires translation, bit 1 indicates * that the first argument requires translation and so on. Native and compat @@ -214,7 +216,8 @@ static inline int name(k xen_ ## n *x, k compat_ ## n *c) \ * * Return: Number of arguments which were actually translated. */ -int hypercall_xlat_continuation(unsigned int *id, unsigned int mask, ...); +int hypercall_xlat_continuation(unsigned int *id, unsigned int nr, + unsigned int mask, ...); /* In-place translation functons: */ struct start_info; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 05 15:33:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15: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 1Xwut1-0001x3-B6; Fri, 05 Dec 2014 15:33:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwut0-0001wo-4r for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:38 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id E9/65-25276-150D1845; Fri, 05 Dec 2014 15:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1417793616!10290753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11956 invoked from network); 5 Dec 2014 15:33:36 -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; 5 Dec 2014 15:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusx-0006YH-VT for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xwusx-0003Sx-UL for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:35 +0000 Date: Fri, 05 Dec 2014 15:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: confine internally handled MMIO to solitary 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 e0921ec746410f0a07eb3767e95e5eda25d4934a Author: Jan Beulich AuthorDate: Thu Nov 27 14:15:27 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:15:27 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 5bb1c17..21fd33f 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -131,11 +131,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -243,6 +256,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size < addr + : p->addr + p->count * 1L * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 2bda25c..f158a2e 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -235,6 +235,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -277,6 +279,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 05 15:33:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 05 Dec 2014 15: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 1Xwut1-0001x3-B6; Fri, 05 Dec 2014 15:33:39 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwut0-0001wo-4r for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:38 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id E9/65-25276-150D1845; Fri, 05 Dec 2014 15:33:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1417793616!10290753!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11956 invoked from network); 5 Dec 2014 15:33:36 -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; 5 Dec 2014 15:33:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xwusx-0006YH-VT for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xwusx-0003Sx-UL for xen-changelog@lists.xensource.com; Fri, 05 Dec 2014 15:33:35 +0000 Date: Fri, 05 Dec 2014 15:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: confine internally handled MMIO to solitary 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 e0921ec746410f0a07eb3767e95e5eda25d4934a Author: Jan Beulich AuthorDate: Thu Nov 27 14:15:27 2014 +0100 Commit: Jan Beulich CommitDate: Thu Nov 27 14:15:27 2014 +0100 x86/HVM: confine internally handled MMIO to solitary regions While it is generally wrong to cross region boundaries when dealing with MMIO accesses of repeated string instructions (currently only MOVS) as that would do things a guest doesn't expect (leaving aside that none of these regions would normally be accessed with repeated string instructions in the first place), this is even more of a problem for all virtual MSI-X page accesses (both msixtbl_{read,write}() can be made dereference NULL "entry" pointers this way) as well as undersized (1- or 2-byte) LAPIC writes (causing vlapic_read_aligned() to access space beyond the one memory page set up for holding LAPIC register values). Since those functions validly assume to be called only with addresses their respective checking functions indicated to be okay, it is generic code that needs to be fixed to clip the repetition count. To be on the safe side (and consistent), also do the same for buffered I/O intercepts, even if their only client (stdvga) doesn't put the hypervisor at risk (i.e. "only" guest misbehavior would result). This is CVE-2014-8867 / XSA-112. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan --- xen/arch/x86/hvm/intercept.c | 22 +++++++++++++++++++++- xen/arch/x86/hvm/vmsi.c | 4 ++++ 2 files changed, 25 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c index 5bb1c17..21fd33f 100644 --- a/xen/arch/x86/hvm/intercept.c +++ b/xen/arch/x86/hvm/intercept.c @@ -131,11 +131,24 @@ int hvm_mmio_intercept(ioreq_t *p) int i; for ( i = 0; i < HVM_MMIO_HANDLER_NR; i++ ) - if ( hvm_mmio_handlers[i]->check_handler(v, p->addr) ) + { + hvm_mmio_check_t check_handler = + hvm_mmio_handlers[i]->check_handler; + + if ( check_handler(v, p->addr) ) + { + if ( unlikely(p->count > 1) && + !check_handler(v, unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size + : p->addr + (p->count - 1L) * p->size) ) + p->count = 1; + return hvm_mmio_access( v, p, hvm_mmio_handlers[i]->read_handler, hvm_mmio_handlers[i]->write_handler); + } + } return X86EMUL_UNHANDLEABLE; } @@ -243,6 +256,13 @@ int hvm_io_intercept(ioreq_t *p, int type) if ( type == HVM_PORTIO ) return process_portio_intercept( handler->hdl_list[i].action.portio, p); + + if ( unlikely(p->count > 1) && + (unlikely(p->df) + ? p->addr - (p->count - 1L) * p->size < addr + : p->addr + p->count * 1L * p->size - 1 >= addr + size) ) + p->count = 1; + return handler->hdl_list[i].action.mmio(p); } } diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index 2bda25c..f158a2e 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -235,6 +235,8 @@ static int msixtbl_read( rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); if ( offset != PCI_MSIX_ENTRY_VECTOR_CTRL_OFFSET ) @@ -277,6 +279,8 @@ static int msixtbl_write(struct vcpu *v, unsigned long address, rcu_read_lock(&msixtbl_rcu_lock); entry = msixtbl_find_entry(v, address); + if ( !entry ) + goto out; nr_entry = (address - entry->gtable) / PCI_MSIX_ENTRY_SIZE; offset = address & (PCI_MSIX_ENTRY_SIZE - 1); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:00:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00: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 1XyMGt-0007NA-9a; Tue, 09 Dec 2014 15:00:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMGr-0007N5-Ru for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:14 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 02/08-09842-D7E07845; Tue, 09 Dec 2014 15:00:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1418137211!14409064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28386 invoked from network); 9 Dec 2014 15:00:12 -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; 9 Dec 2014 15:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMGo-0008F1-Gj for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMGn-00027M-J4 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:10 +0000 Date: Tue, 09 Dec 2014 15:00:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: prevent infinite VM entry retries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04ae2f6837b35bcfb689baf15f493da626929fb5 Author: Jan Beulich AuthorDate: Tue Dec 2 12:48:01 2014 +0100 Commit: Jan Beulich CommitDate: Tue Dec 2 12:48:01 2014 +0100 x86/HVM: prevent infinite VM entry retries This reverts the VMX side of commit 28b4baac ("x86/HVM: don't crash guest upon problems occurring in user mode") and gets SVM in line with the resulting VMX behavior. This is because Andrew validly says "A failed vmentry is overwhelmingly likely to be caused by corrupt VMC[SB] state. As a result, injecting a fault and retrying the the vmentry is likely to fail in the same way." Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/svm/svm.c | 20 ++++++++++++-------- xen/arch/x86/hvm/vmx/vmx.c | 29 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 9398690..a7655bd 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2371,8 +2371,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) goto out; case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_vmexit() error\n"); - goto exit_and_crash; - + domain_crash(v->domain); + goto out; default: BUG(); case NESTEDHVM_VMEXIT_ERROR: @@ -2385,18 +2385,22 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_check_intercepts() error\n"); - goto exit_and_crash; + domain_crash(v->domain); + goto out; default: gdprintk(XENLOG_INFO, "nestedsvm_check_intercepts() returned %i\n", nsret); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } } if ( unlikely(exit_reason == VMEXIT_INVALID) ) { + gdprintk(XENLOG_ERR, "invalid VMCB state:\n"); svm_vmcb_dump(__func__, vmcb); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } perfc_incra(svmexits, exit_reason); @@ -2431,13 +2435,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; /* AMD Vol2, 15.11: INT3, INTO, BOUND intercepts do not update RIP. */ if ( (inst_len = __get_instruction_length(v, INSTR_INT3)) == 0 ) break; @@ -2684,7 +2688,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; default: - exit_and_crash: + unexpected_exit_type: gdprintk(XENLOG_ERR, "unexpected VMEXIT: exit reason = %#"PRIx64", " "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2907afa..0bf92b2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -134,18 +134,6 @@ static void vmx_vcpu_destroy(struct vcpu *v) passive_domain_destroy(v); } -/* Only crash the guest if the problem originates in kernel mode. */ -static void vmx_crash_or_fault(struct vcpu *v) -{ - struct segment_register ss; - - vmx_get_segment_register(v, x86_seg_ss, &ss); - if ( ss.attr.fields.dpl ) - hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); -} - static DEFINE_PER_CPU(struct vmx_msr_state, host_msr_state); static const u32 msr_index[] = @@ -2520,7 +2508,7 @@ static void vmx_failed_vmentry(unsigned int exit_reason, vmcs_dump_vcpu(curr); printk("**************************************\n"); - vmx_crash_or_fault(curr); + domain_crash(curr->domain); } void vmx_enter_realmode(struct cpu_user_regs *regs) @@ -3173,8 +3161,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", exit_reason); - vmx_crash_or_fault(v); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:00:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00: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 1XyMH3-0007NY-CE; Tue, 09 Dec 2014 15:00:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMH2-0007NN-Nx for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:24 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id DC/A3-17694-78E07845; Tue, 09 Dec 2014 15:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1418137222!12107236!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8725 invoked from network); 9 Dec 2014 15:00:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMH0-0008F4-2B for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMGz-00028m-Q2 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:21 +0000 Date: Tue, 09 Dec 2014 15:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl_domain_info: fix typo in error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fed4af8d870e6fe4c4e2eceafaf8afba49fc169 Author: Euan Harris AuthorDate: Mon Dec 1 10:47:33 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 13:43:54 2014 +0000 libxl: libxl_domain_info: fix typo in error message Signed-off-by: Euan Harris Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f84f7c2..c50c323 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -674,7 +674,7 @@ int libxl_domain_info(libxl_ctx *ctx, libxl_dominfo *info_r, ret = xc_domain_getinfolist(ctx->xch, domid, 1, &xcinfo); if (ret<0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); return ERROR_FAIL; } if (ret==0 || xcinfo.domain != domid) return ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:00:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00: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 1XyMH3-0007NY-CE; Tue, 09 Dec 2014 15:00:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMH2-0007NN-Nx for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:24 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id DC/A3-17694-78E07845; Tue, 09 Dec 2014 15:00:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1418137222!12107236!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8725 invoked from network); 9 Dec 2014 15:00:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:00:23 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMH0-0008F4-2B for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMGz-00028m-Q2 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:21 +0000 Date: Tue, 09 Dec 2014 15:00:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: libxl_domain_info: fix typo in error message X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1fed4af8d870e6fe4c4e2eceafaf8afba49fc169 Author: Euan Harris AuthorDate: Mon Dec 1 10:47:33 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 13:43:54 2014 +0000 libxl: libxl_domain_info: fix typo in error message Signed-off-by: Euan Harris Acked-by: Ian Campbell --- tools/libxl/libxl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f84f7c2..c50c323 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -674,7 +674,7 @@ int libxl_domain_info(libxl_ctx *ctx, libxl_dominfo *info_r, ret = xc_domain_getinfolist(ctx->xch, domid, 1, &xcinfo); if (ret<0) { - LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "geting domain info list"); + LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR, "getting domain info list"); return ERROR_FAIL; } if (ret==0 || xcinfo.domain != domid) return ERROR_INVAL; -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:00:31 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00: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 1XyMGt-0007NA-9a; Tue, 09 Dec 2014 15:00:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMGr-0007N5-Ru for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:14 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 02/08-09842-D7E07845; Tue, 09 Dec 2014 15:00:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1418137211!14409064!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28386 invoked from network); 9 Dec 2014 15:00:12 -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; 9 Dec 2014 15:00:12 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMGo-0008F1-Gj for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMGn-00027M-J4 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:10 +0000 Date: Tue, 09 Dec 2014 15:00:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: prevent infinite VM entry retries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04ae2f6837b35bcfb689baf15f493da626929fb5 Author: Jan Beulich AuthorDate: Tue Dec 2 12:48:01 2014 +0100 Commit: Jan Beulich CommitDate: Tue Dec 2 12:48:01 2014 +0100 x86/HVM: prevent infinite VM entry retries This reverts the VMX side of commit 28b4baac ("x86/HVM: don't crash guest upon problems occurring in user mode") and gets SVM in line with the resulting VMX behavior. This is because Andrew validly says "A failed vmentry is overwhelmingly likely to be caused by corrupt VMC[SB] state. As a result, injecting a fault and retrying the the vmentry is likely to fail in the same way." Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/svm/svm.c | 20 ++++++++++++-------- xen/arch/x86/hvm/vmx/vmx.c | 29 ++++++++++++++--------------- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 9398690..a7655bd 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2371,8 +2371,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) goto out; case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_vmexit() error\n"); - goto exit_and_crash; - + domain_crash(v->domain); + goto out; default: BUG(); case NESTEDHVM_VMEXIT_ERROR: @@ -2385,18 +2385,22 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_check_intercepts() error\n"); - goto exit_and_crash; + domain_crash(v->domain); + goto out; default: gdprintk(XENLOG_INFO, "nestedsvm_check_intercepts() returned %i\n", nsret); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } } if ( unlikely(exit_reason == VMEXIT_INVALID) ) { + gdprintk(XENLOG_ERR, "invalid VMCB state:\n"); svm_vmcb_dump(__func__, vmcb); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } perfc_incra(svmexits, exit_reason); @@ -2431,13 +2435,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; /* AMD Vol2, 15.11: INT3, INTO, BOUND intercepts do not update RIP. */ if ( (inst_len = __get_instruction_length(v, INSTR_INT3)) == 0 ) break; @@ -2684,7 +2688,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; default: - exit_and_crash: + unexpected_exit_type: gdprintk(XENLOG_ERR, "unexpected VMEXIT: exit reason = %#"PRIx64", " "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2907afa..0bf92b2 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -134,18 +134,6 @@ static void vmx_vcpu_destroy(struct vcpu *v) passive_domain_destroy(v); } -/* Only crash the guest if the problem originates in kernel mode. */ -static void vmx_crash_or_fault(struct vcpu *v) -{ - struct segment_register ss; - - vmx_get_segment_register(v, x86_seg_ss, &ss); - if ( ss.attr.fields.dpl ) - hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); -} - static DEFINE_PER_CPU(struct vmx_msr_state, host_msr_state); static const u32 msr_index[] = @@ -2520,7 +2508,7 @@ static void vmx_failed_vmentry(unsigned int exit_reason, vmcs_dump_vcpu(curr); printk("**************************************\n"); - vmx_crash_or_fault(curr); + domain_crash(curr->domain); } void vmx_enter_realmode(struct cpu_user_regs *regs) @@ -3173,8 +3161,19 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) /* fall through */ default: exit_and_crash: - gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", exit_reason); - vmx_crash_or_fault(v); + { + struct segment_register ss; + + gdprintk(XENLOG_WARNING, "Bad vmexit (reason %#lx)\n", + exit_reason); + + vmx_get_segment_register(v, x86_seg_ss, &ss); + if ( ss.attr.fields.dpl ) + hvm_inject_hw_exception(TRAP_invalid_op, + HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); + } break; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:00:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00: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 1XyMHF-0007Ou-FH; Tue, 09 Dec 2014 15:00:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHE-0007Ok-Dh for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:36 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id AF/5D-02954-39E07845; Tue, 09 Dec 2014 15:00:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1418137232!8529840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29492 invoked from network); 9 Dec 2014 15:00:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:00:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHA-0008F9-AO for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHA-000299-5Y for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:32 +0000 Date: Tue, 09 Dec 2014 15:00:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix migration failure with xl migrate --debug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d36a3734a6abccd36a8050e19633af1671a2083d Author: M A Young AuthorDate: Tue Dec 2 13:48:54 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 13:48:54 2014 +0000 xl: fix migration failure with xl migrate --debug Migrations with xl migrate --debug will fail because debugging information from the receiving process is written to the stdout channel. This channel is also used for status messages so the migration will fail as the sending process receives an unexpected message. This patch moves the debugging information to the stderr channel. Signed-off-by: Michael Young Acked-by: Ian Campbell --- tools/libxl/xl.h | 2 +- tools/libxl/xl_cmdimpl.c | 22 +++-- tools/libxl/xl_sxp.c | 228 +++++++++++++++++++++++----------------------- 3 files changed, 129 insertions(+), 123 deletions(-) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index c91de4f..5bc138c 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -186,7 +186,7 @@ enum output_format { }; extern enum output_format default_output_format; -extern void printf_info_sexp(int domid, libxl_domain_config *d_config); +extern void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh); #define XL_GLOBAL_CONFIG XEN_CONFIG_DIR "/xl.conf" #define XL_LOCK_FILE XEN_LOCK_DIR "/xl" diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0e754e7..88a4d65 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -381,10 +381,10 @@ out: } static void printf_info(enum output_format output_format, int domid, - libxl_domain_config *d_config) + libxl_domain_config *d_config, FILE *fh) { if (output_format == OUTPUT_FORMAT_SXP) - return printf_info_sexp(domid, d_config); + return printf_info_sexp(domid, d_config, fh); const char *buf; libxl_yajl_length len = 0; @@ -405,7 +405,7 @@ static void printf_info(enum output_format output_format, if (s != yajl_gen_status_ok) goto out; - puts(buf); + fputs(buf, fh); out: yajl_gen_free(hand); @@ -414,7 +414,13 @@ out: fprintf(stderr, "unable to format domain config as JSON (YAJL:%d)\n", s); - if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } + if (ferror(fh) || fflush(fh)) { + if (fh == stdout) + perror("stdout"); + else + perror("stderr"); + exit(-1); + } } static int do_daemonize(char *name) @@ -2436,7 +2442,7 @@ static uint32_t create_domain(struct domain_create *dom_info) } if (!dom_info->quiet) - printf("Parsing config from %s\n", config_source); + fprintf(stderr, "Parsing config from %s\n", config_source); if (config_in_json) { libxl_domain_config_from_json(ctx, &d_config, @@ -2464,7 +2470,7 @@ static uint32_t create_domain(struct domain_create *dom_info) } if (debug || dom_info->dryrun) - printf_info(default_output_format, -1, &d_config); + printf_info(default_output_format, -1, &d_config, stderr); ret = 0; if (dom_info->dryrun) @@ -3416,7 +3422,7 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) if (default_output_format == OUTPUT_FORMAT_JSON) s = printf_info_one_json(hand, info[i].domid, &d_config); else - printf_info_sexp(info[i].domid, &d_config); + printf_info_sexp(info[i].domid, &d_config, stdout); libxl_domain_config_dispose(&d_config); if (s != yajl_gen_status_ok) goto out; @@ -4738,7 +4744,7 @@ int main_config_update(int argc, char **argv) parse_config_data(filename, config_data, config_len, &d_config); if (debug || dryrun_only) - printf_info(default_output_format, -1, &d_config); + printf_info(default_output_format, -1, &d_config, stdout); if (!dryrun_only) { fprintf(stderr, "setting dom%d configuration\n", domid); diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 1c98352..a8c127b 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -30,7 +30,7 @@ /* In general you should not add new output to this function since it * is intended only for legacy use. */ -void printf_info_sexp(int domid, libxl_domain_config *d_config) +void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh) { int i; libxl_dominfo info; @@ -38,195 +38,195 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) libxl_domain_create_info *c_info = &d_config->c_info; libxl_domain_build_info *b_info = &d_config->b_info; - printf("(domain\n\t(domid %d)\n", domid); - printf("\t(create_info)\n"); - printf("\t(hvm %d)\n", c_info->type == LIBXL_DOMAIN_TYPE_HVM); - printf("\t(hap %s)\n", libxl_defbool_to_string(c_info->hap)); - printf("\t(oos %s)\n", libxl_defbool_to_string(c_info->oos)); - printf("\t(ssidref %d)\n", c_info->ssidref); - printf("\t(name %s)\n", c_info->name); + fprintf(fh, "(domain\n\t(domid %d)\n", domid); + fprintf(fh, "\t(create_info)\n"); + fprintf(fh, "\t(hvm %d)\n", c_info->type == LIBXL_DOMAIN_TYPE_HVM); + fprintf(fh, "\t(hap %s)\n", libxl_defbool_to_string(c_info->hap)); + fprintf(fh, "\t(oos %s)\n", libxl_defbool_to_string(c_info->oos)); + fprintf(fh, "\t(ssidref %d)\n", c_info->ssidref); + fprintf(fh, "\t(name %s)\n", c_info->name); /* retrieve the UUID from dominfo, since it is probably generated * during parsing and thus does not match the real one */ if (libxl_domain_info(ctx, &info, domid) == 0) { - printf("\t(uuid " LIBXL_UUID_FMT ")\n", LIBXL_UUID_BYTES(info.uuid)); + fprintf(fh, "\t(uuid " LIBXL_UUID_FMT ")\n", LIBXL_UUID_BYTES(info.uuid)); } else { - printf("\t(uuid )\n"); + fprintf(fh, "\t(uuid )\n"); } if (c_info->pool_name) - printf("\t(cpupool %s)\n", c_info->pool_name); + fprintf(fh, "\t(cpupool %s)\n", c_info->pool_name); if (c_info->xsdata) - printf("\t(xsdata contains data)\n"); + fprintf(fh, "\t(xsdata contains data)\n"); else - printf("\t(xsdata (null))\n"); + fprintf(fh, "\t(xsdata (null))\n"); if (c_info->platformdata) - printf("\t(platformdata contains data)\n"); + fprintf(fh, "\t(platformdata contains data)\n"); else - printf("\t(platformdata (null))\n"); + fprintf(fh, "\t(platformdata (null))\n"); - printf("\t(build_info)\n"); - printf("\t(max_vcpus %d)\n", b_info->max_vcpus); - printf("\t(tsc_mode %s)\n", libxl_tsc_mode_to_string(b_info->tsc_mode)); - printf("\t(max_memkb %"PRId64")\n", b_info->max_memkb); - printf("\t(target_memkb %"PRId64")\n", b_info->target_memkb); - printf("\t(nomigrate %s)\n", + fprintf(fh, "\t(build_info)\n"); + fprintf(fh, "\t(max_vcpus %d)\n", b_info->max_vcpus); + fprintf(fh, "\t(tsc_mode %s)\n", libxl_tsc_mode_to_string(b_info->tsc_mode)); + fprintf(fh, "\t(max_memkb %"PRId64")\n", b_info->max_memkb); + fprintf(fh, "\t(target_memkb %"PRId64")\n", b_info->target_memkb); + fprintf(fh, "\t(nomigrate %s)\n", libxl_defbool_to_string(b_info->disable_migrate)); if (c_info->type == LIBXL_DOMAIN_TYPE_PV && b_info->u.pv.bootloader) { - printf("\t(bootloader %s)\n", b_info->u.pv.bootloader); + fprintf(fh, "\t(bootloader %s)\n", b_info->u.pv.bootloader); if (b_info->u.pv.bootloader_args) { - printf("\t(bootloader_args"); + fprintf(fh, "\t(bootloader_args"); for (i=0; b_info->u.pv.bootloader_args[i]; i++) - printf(" %s", b_info->u.pv.bootloader_args[i]); - printf(")\n"); + fprintf(fh, " %s", b_info->u.pv.bootloader_args[i]); + fprintf(fh, ")\n"); } } - printf("\t(image\n"); + fprintf(fh, "\t(image\n"); switch (c_info->type) { case LIBXL_DOMAIN_TYPE_HVM: - printf("\t\t(hvm\n"); - printf("\t\t\t(firmware %s)\n", b_info->u.hvm.firmware); - printf("\t\t\t(video_memkb %"PRId64")\n", b_info->video_memkb); - printf("\t\t\t(shadow_memkb %"PRId64")\n", b_info->shadow_memkb); - printf("\t\t\t(pae %s)\n", libxl_defbool_to_string(b_info->u.hvm.pae)); - printf("\t\t\t(apic %s)\n", + fprintf(fh, "\t\t(hvm\n"); + fprintf(fh, "\t\t\t(firmware %s)\n", b_info->u.hvm.firmware); + fprintf(fh, "\t\t\t(video_memkb %"PRId64")\n", b_info->video_memkb); + fprintf(fh, "\t\t\t(shadow_memkb %"PRId64")\n", b_info->shadow_memkb); + fprintf(fh, "\t\t\t(pae %s)\n", libxl_defbool_to_string(b_info->u.hvm.pae)); + fprintf(fh, "\t\t\t(apic %s)\n", libxl_defbool_to_string(b_info->u.hvm.apic)); - printf("\t\t\t(acpi %s)\n", + fprintf(fh, "\t\t\t(acpi %s)\n", libxl_defbool_to_string(b_info->u.hvm.acpi)); - printf("\t\t\t(nx %s)\n", libxl_defbool_to_string(b_info->u.hvm.nx)); - printf("\t\t\t(viridian %s)\n", + fprintf(fh, "\t\t\t(nx %s)\n", libxl_defbool_to_string(b_info->u.hvm.nx)); + fprintf(fh, "\t\t\t(viridian %s)\n", libxl_defbool_to_string(b_info->u.hvm.viridian)); - printf("\t\t\t(hpet %s)\n", + fprintf(fh, "\t\t\t(hpet %s)\n", libxl_defbool_to_string(b_info->u.hvm.hpet)); - printf("\t\t\t(vpt_align %s)\n", + fprintf(fh, "\t\t\t(vpt_align %s)\n", libxl_defbool_to_string(b_info->u.hvm.vpt_align)); - printf("\t\t\t(timer_mode %s)\n", + fprintf(fh, "\t\t\t(timer_mode %s)\n", libxl_timer_mode_to_string(b_info->u.hvm.timer_mode)); - printf("\t\t\t(nestedhvm %s)\n", + fprintf(fh, "\t\t\t(nestedhvm %s)\n", libxl_defbool_to_string(b_info->u.hvm.nested_hvm)); - printf("\t\t\t(stdvga %s)\n", b_info->u.hvm.vga.kind == + fprintf(fh, "\t\t\t(stdvga %s)\n", b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD ? "True" : "False"); - printf("\t\t\t(vnc %s)\n", + fprintf(fh, "\t\t\t(vnc %s)\n", libxl_defbool_to_string(b_info->u.hvm.vnc.enable)); - printf("\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); - printf("\t\t\t(vncdisplay %d)\n", b_info->u.hvm.vnc.display); - printf("\t\t\t(vncunused %s)\n", + fprintf(fh, "\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); + fprintf(fh, "\t\t\t(vncdisplay %d)\n", b_info->u.hvm.vnc.display); + fprintf(fh, "\t\t\t(vncunused %s)\n", libxl_defbool_to_string(b_info->u.hvm.vnc.findunused)); - printf("\t\t\t(keymap %s)\n", b_info->u.hvm.keymap); - printf("\t\t\t(sdl %s)\n", + fprintf(fh, "\t\t\t(keymap %s)\n", b_info->u.hvm.keymap); + fprintf(fh, "\t\t\t(sdl %s)\n", libxl_defbool_to_string(b_info->u.hvm.sdl.enable)); - printf("\t\t\t(opengl %s)\n", + fprintf(fh, "\t\t\t(opengl %s)\n", libxl_defbool_to_string(b_info->u.hvm.sdl.opengl)); - printf("\t\t\t(nographic %s)\n", + fprintf(fh, "\t\t\t(nographic %s)\n", libxl_defbool_to_string(b_info->u.hvm.nographic)); - printf("\t\t\t(spice %s)\n", + fprintf(fh, "\t\t\t(spice %s)\n", libxl_defbool_to_string(b_info->u.hvm.spice.enable)); - printf("\t\t\t(spiceport %d)\n", b_info->u.hvm.spice.port); - printf("\t\t\t(spicetls_port %d)\n", b_info->u.hvm.spice.tls_port); - printf("\t\t\t(spicehost %s)\n", b_info->u.hvm.spice.host); - printf("\t\t\t(spicedisable_ticketing %s)\n", + fprintf(fh, "\t\t\t(spiceport %d)\n", b_info->u.hvm.spice.port); + fprintf(fh, "\t\t\t(spicetls_port %d)\n", b_info->u.hvm.spice.tls_port); + fprintf(fh, "\t\t\t(spicehost %s)\n", b_info->u.hvm.spice.host); + fprintf(fh, "\t\t\t(spicedisable_ticketing %s)\n", libxl_defbool_to_string(b_info->u.hvm.spice.disable_ticketing)); - printf("\t\t\t(spiceagent_mouse %s)\n", + fprintf(fh, "\t\t\t(spiceagent_mouse %s)\n", libxl_defbool_to_string(b_info->u.hvm.spice.agent_mouse)); - printf("\t\t\t(device_model %s)\n", b_info->device_model ? : "default"); - printf("\t\t\t(gfx_passthru %s)\n", + fprintf(fh, "\t\t\t(device_model %s)\n", b_info->device_model ? : "default"); + fprintf(fh, "\t\t\t(gfx_passthru %s)\n", libxl_defbool_to_string(b_info->u.hvm.gfx_passthru)); - printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); - printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); - printf("\t\t\t(usb %s)\n", libxl_defbool_to_string(b_info->u.hvm.usb)); - printf("\t\t\t(usbdevice %s)\n", b_info->u.hvm.usbdevice); - printf("\t\t)\n"); + fprintf(fh, "\t\t\t(serial %s)\n", b_info->u.hvm.serial); + fprintf(fh, "\t\t\t(boot %s)\n", b_info->u.hvm.boot); + fprintf(fh, "\t\t\t(usb %s)\n", libxl_defbool_to_string(b_info->u.hvm.usb)); + fprintf(fh, "\t\t\t(usbdevice %s)\n", b_info->u.hvm.usbdevice); + fprintf(fh, "\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: - printf("\t\t(linux %d)\n", 0); - printf("\t\t\t(kernel %s)\n", b_info->kernel); - printf("\t\t\t(cmdline %s)\n", b_info->cmdline); - printf("\t\t\t(ramdisk %s)\n", b_info->ramdisk); - printf("\t\t\t(e820_host %s)\n", + fprintf(fh, "\t\t(linux %d)\n", 0); + fprintf(fh, "\t\t\t(kernel %s)\n", b_info->kernel); + fprintf(fh, "\t\t\t(cmdline %s)\n", b_info->cmdline); + fprintf(fh, "\t\t\t(ramdisk %s)\n", b_info->ramdisk); + fprintf(fh, "\t\t\t(e820_host %s)\n", libxl_defbool_to_string(b_info->u.pv.e820_host)); - printf("\t\t)\n"); + fprintf(fh, "\t\t)\n"); break; default: fprintf(stderr, "Unknown domain type %d\n", c_info->type); exit(1); } - printf("\t)\n"); + fprintf(fh, "\t)\n"); for (i = 0; i < d_config->num_disks; i++) { - printf("\t(device\n"); - printf("\t\t(tap\n"); - printf("\t\t\t(backend_domid %d)\n", d_config->disks[i].backend_domid); - printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(physpath %s)\n", d_config->disks[i].pdev_path); - printf("\t\t\t(phystype %d)\n", d_config->disks[i].backend); - printf("\t\t\t(virtpath %s)\n", d_config->disks[i].vdev); - printf("\t\t\t(unpluggable %d)\n", d_config->disks[i].removable); - printf("\t\t\t(readwrite %d)\n", d_config->disks[i].readwrite); - printf("\t\t\t(is_cdrom %d)\n", d_config->disks[i].is_cdrom); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(tap\n"); + fprintf(fh, "\t\t\t(backend_domid %d)\n", d_config->disks[i].backend_domid); + fprintf(fh, "\t\t\t(frontend_domid %d)\n", domid); + fprintf(fh, "\t\t\t(physpath %s)\n", d_config->disks[i].pdev_path); + fprintf(fh, "\t\t\t(phystype %d)\n", d_config->disks[i].backend); + fprintf(fh, "\t\t\t(virtpath %s)\n", d_config->disks[i].vdev); + fprintf(fh, "\t\t\t(unpluggable %d)\n", d_config->disks[i].removable); + fprintf(fh, "\t\t\t(readwrite %d)\n", d_config->disks[i].readwrite); + fprintf(fh, "\t\t\t(is_cdrom %d)\n", d_config->disks[i].is_cdrom); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } for (i = 0; i < d_config->num_nics; i++) { - printf("\t(device\n"); - printf("\t\t(vif\n"); + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(vif\n"); if (d_config->nics[i].ifname) - printf("\t\t\t(vifname %s)\n", d_config->nics[i].ifname); - printf("\t\t\t(backend_domid %d)\n", d_config->nics[i].backend_domid); - printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(devid %d)\n", d_config->nics[i].devid); - printf("\t\t\t(mtu %d)\n", d_config->nics[i].mtu); - printf("\t\t\t(model %s)\n", d_config->nics[i].model); - printf("\t\t\t(mac %02x%02x%02x%02x%02x%02x)\n", + fprintf(fh, "\t\t\t(vifname %s)\n", d_config->nics[i].ifname); + fprintf(fh, "\t\t\t(backend_domid %d)\n", d_config->nics[i].backend_domid); + fprintf(fh, "\t\t\t(frontend_domid %d)\n", domid); + fprintf(fh, "\t\t\t(devid %d)\n", d_config->nics[i].devid); + fprintf(fh, "\t\t\t(mtu %d)\n", d_config->nics[i].mtu); + fprintf(fh, "\t\t\t(model %s)\n", d_config->nics[i].model); + fprintf(fh, "\t\t\t(mac %02x%02x%02x%02x%02x%02x)\n", d_config->nics[i].mac[0], d_config->nics[i].mac[1], d_config->nics[i].mac[2], d_config->nics[i].mac[3], d_config->nics[i].mac[4], d_config->nics[i].mac[5]); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } for (i = 0; i < d_config->num_pcidevs; i++) { - printf("\t(device\n"); - printf("\t\t(pci\n"); - printf("\t\t\t(pci dev %04x:%02x:%02x.%01x@%02x)\n", + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(pci\n"); + fprintf(fh, "\t\t\t(pci dev %04x:%02x:%02x.%01x@%02x)\n", d_config->pcidevs[i].domain, d_config->pcidevs[i].bus, d_config->pcidevs[i].dev, d_config->pcidevs[i].func, d_config->pcidevs[i].vdevfn); - printf("\t\t\t(opts msitranslate %d power_mgmt %d)\n", + fprintf(fh, "\t\t\t(opts msitranslate %d power_mgmt %d)\n", d_config->pcidevs[i].msitranslate, d_config->pcidevs[i].power_mgmt); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } for (i = 0; i < d_config->num_vfbs; i++) { - printf("\t(device\n"); - printf("\t\t(vfb\n"); - printf("\t\t\t(backend_domid %d)\n", d_config->vfbs[i].backend_domid); - printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(devid %d)\n", d_config->vfbs[i].devid); - printf("\t\t\t(vnc %s)\n", + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(vfb\n"); + fprintf(fh, "\t\t\t(backend_domid %d)\n", d_config->vfbs[i].backend_domid); + fprintf(fh, "\t\t\t(frontend_domid %d)\n", domid); + fprintf(fh, "\t\t\t(devid %d)\n", d_config->vfbs[i].devid); + fprintf(fh, "\t\t\t(vnc %s)\n", libxl_defbool_to_string(d_config->vfbs[i].vnc.enable)); - printf("\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnc.listen); - printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); - printf("\t\t\t(vncunused %s)\n", + fprintf(fh, "\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnc.listen); + fprintf(fh, "\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); + fprintf(fh, "\t\t\t(vncunused %s)\n", libxl_defbool_to_string(d_config->vfbs[i].vnc.findunused)); - printf("\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); - printf("\t\t\t(sdl %s)\n", + fprintf(fh, "\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); + fprintf(fh, "\t\t\t(sdl %s)\n", libxl_defbool_to_string(d_config->vfbs[i].sdl.enable)); - printf("\t\t\t(opengl %s)\n", + fprintf(fh, "\t\t\t(opengl %s)\n", libxl_defbool_to_string(d_config->vfbs[i].sdl.opengl)); - printf("\t\t\t(display %s)\n", d_config->vfbs[i].sdl.display); - printf("\t\t\t(xauthority %s)\n", d_config->vfbs[i].sdl.xauthority); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t\t\t(display %s)\n", d_config->vfbs[i].sdl.display); + fprintf(fh, "\t\t\t(xauthority %s)\n", d_config->vfbs[i].sdl.xauthority); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } - printf(")\n"); + fprintf(fh, ")\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 Tue Dec 09 15:00:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00: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 1XyMHF-0007Ou-FH; Tue, 09 Dec 2014 15:00:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHE-0007Ok-Dh for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:36 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id AF/5D-02954-39E07845; Tue, 09 Dec 2014 15:00:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1418137232!8529840!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29492 invoked from network); 9 Dec 2014 15:00:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:00:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHA-0008F9-AO for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHA-000299-5Y for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:32 +0000 Date: Tue, 09 Dec 2014 15:00:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix migration failure with xl migrate --debug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d36a3734a6abccd36a8050e19633af1671a2083d Author: M A Young AuthorDate: Tue Dec 2 13:48:54 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 13:48:54 2014 +0000 xl: fix migration failure with xl migrate --debug Migrations with xl migrate --debug will fail because debugging information from the receiving process is written to the stdout channel. This channel is also used for status messages so the migration will fail as the sending process receives an unexpected message. This patch moves the debugging information to the stderr channel. Signed-off-by: Michael Young Acked-by: Ian Campbell --- tools/libxl/xl.h | 2 +- tools/libxl/xl_cmdimpl.c | 22 +++-- tools/libxl/xl_sxp.c | 228 +++++++++++++++++++++++----------------------- 3 files changed, 129 insertions(+), 123 deletions(-) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index c91de4f..5bc138c 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -186,7 +186,7 @@ enum output_format { }; extern enum output_format default_output_format; -extern void printf_info_sexp(int domid, libxl_domain_config *d_config); +extern void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh); #define XL_GLOBAL_CONFIG XEN_CONFIG_DIR "/xl.conf" #define XL_LOCK_FILE XEN_LOCK_DIR "/xl" diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 0e754e7..88a4d65 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -381,10 +381,10 @@ out: } static void printf_info(enum output_format output_format, int domid, - libxl_domain_config *d_config) + libxl_domain_config *d_config, FILE *fh) { if (output_format == OUTPUT_FORMAT_SXP) - return printf_info_sexp(domid, d_config); + return printf_info_sexp(domid, d_config, fh); const char *buf; libxl_yajl_length len = 0; @@ -405,7 +405,7 @@ static void printf_info(enum output_format output_format, if (s != yajl_gen_status_ok) goto out; - puts(buf); + fputs(buf, fh); out: yajl_gen_free(hand); @@ -414,7 +414,13 @@ out: fprintf(stderr, "unable to format domain config as JSON (YAJL:%d)\n", s); - if (ferror(stdout) || fflush(stdout)) { perror("stdout"); exit(-1); } + if (ferror(fh) || fflush(fh)) { + if (fh == stdout) + perror("stdout"); + else + perror("stderr"); + exit(-1); + } } static int do_daemonize(char *name) @@ -2436,7 +2442,7 @@ static uint32_t create_domain(struct domain_create *dom_info) } if (!dom_info->quiet) - printf("Parsing config from %s\n", config_source); + fprintf(stderr, "Parsing config from %s\n", config_source); if (config_in_json) { libxl_domain_config_from_json(ctx, &d_config, @@ -2464,7 +2470,7 @@ static uint32_t create_domain(struct domain_create *dom_info) } if (debug || dom_info->dryrun) - printf_info(default_output_format, -1, &d_config); + printf_info(default_output_format, -1, &d_config, stderr); ret = 0; if (dom_info->dryrun) @@ -3416,7 +3422,7 @@ static void list_domains_details(const libxl_dominfo *info, int nb_domain) if (default_output_format == OUTPUT_FORMAT_JSON) s = printf_info_one_json(hand, info[i].domid, &d_config); else - printf_info_sexp(info[i].domid, &d_config); + printf_info_sexp(info[i].domid, &d_config, stdout); libxl_domain_config_dispose(&d_config); if (s != yajl_gen_status_ok) goto out; @@ -4738,7 +4744,7 @@ int main_config_update(int argc, char **argv) parse_config_data(filename, config_data, config_len, &d_config); if (debug || dryrun_only) - printf_info(default_output_format, -1, &d_config); + printf_info(default_output_format, -1, &d_config, stdout); if (!dryrun_only) { fprintf(stderr, "setting dom%d configuration\n", domid); diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 1c98352..a8c127b 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -30,7 +30,7 @@ /* In general you should not add new output to this function since it * is intended only for legacy use. */ -void printf_info_sexp(int domid, libxl_domain_config *d_config) +void printf_info_sexp(int domid, libxl_domain_config *d_config, FILE *fh) { int i; libxl_dominfo info; @@ -38,195 +38,195 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) libxl_domain_create_info *c_info = &d_config->c_info; libxl_domain_build_info *b_info = &d_config->b_info; - printf("(domain\n\t(domid %d)\n", domid); - printf("\t(create_info)\n"); - printf("\t(hvm %d)\n", c_info->type == LIBXL_DOMAIN_TYPE_HVM); - printf("\t(hap %s)\n", libxl_defbool_to_string(c_info->hap)); - printf("\t(oos %s)\n", libxl_defbool_to_string(c_info->oos)); - printf("\t(ssidref %d)\n", c_info->ssidref); - printf("\t(name %s)\n", c_info->name); + fprintf(fh, "(domain\n\t(domid %d)\n", domid); + fprintf(fh, "\t(create_info)\n"); + fprintf(fh, "\t(hvm %d)\n", c_info->type == LIBXL_DOMAIN_TYPE_HVM); + fprintf(fh, "\t(hap %s)\n", libxl_defbool_to_string(c_info->hap)); + fprintf(fh, "\t(oos %s)\n", libxl_defbool_to_string(c_info->oos)); + fprintf(fh, "\t(ssidref %d)\n", c_info->ssidref); + fprintf(fh, "\t(name %s)\n", c_info->name); /* retrieve the UUID from dominfo, since it is probably generated * during parsing and thus does not match the real one */ if (libxl_domain_info(ctx, &info, domid) == 0) { - printf("\t(uuid " LIBXL_UUID_FMT ")\n", LIBXL_UUID_BYTES(info.uuid)); + fprintf(fh, "\t(uuid " LIBXL_UUID_FMT ")\n", LIBXL_UUID_BYTES(info.uuid)); } else { - printf("\t(uuid )\n"); + fprintf(fh, "\t(uuid )\n"); } if (c_info->pool_name) - printf("\t(cpupool %s)\n", c_info->pool_name); + fprintf(fh, "\t(cpupool %s)\n", c_info->pool_name); if (c_info->xsdata) - printf("\t(xsdata contains data)\n"); + fprintf(fh, "\t(xsdata contains data)\n"); else - printf("\t(xsdata (null))\n"); + fprintf(fh, "\t(xsdata (null))\n"); if (c_info->platformdata) - printf("\t(platformdata contains data)\n"); + fprintf(fh, "\t(platformdata contains data)\n"); else - printf("\t(platformdata (null))\n"); + fprintf(fh, "\t(platformdata (null))\n"); - printf("\t(build_info)\n"); - printf("\t(max_vcpus %d)\n", b_info->max_vcpus); - printf("\t(tsc_mode %s)\n", libxl_tsc_mode_to_string(b_info->tsc_mode)); - printf("\t(max_memkb %"PRId64")\n", b_info->max_memkb); - printf("\t(target_memkb %"PRId64")\n", b_info->target_memkb); - printf("\t(nomigrate %s)\n", + fprintf(fh, "\t(build_info)\n"); + fprintf(fh, "\t(max_vcpus %d)\n", b_info->max_vcpus); + fprintf(fh, "\t(tsc_mode %s)\n", libxl_tsc_mode_to_string(b_info->tsc_mode)); + fprintf(fh, "\t(max_memkb %"PRId64")\n", b_info->max_memkb); + fprintf(fh, "\t(target_memkb %"PRId64")\n", b_info->target_memkb); + fprintf(fh, "\t(nomigrate %s)\n", libxl_defbool_to_string(b_info->disable_migrate)); if (c_info->type == LIBXL_DOMAIN_TYPE_PV && b_info->u.pv.bootloader) { - printf("\t(bootloader %s)\n", b_info->u.pv.bootloader); + fprintf(fh, "\t(bootloader %s)\n", b_info->u.pv.bootloader); if (b_info->u.pv.bootloader_args) { - printf("\t(bootloader_args"); + fprintf(fh, "\t(bootloader_args"); for (i=0; b_info->u.pv.bootloader_args[i]; i++) - printf(" %s", b_info->u.pv.bootloader_args[i]); - printf(")\n"); + fprintf(fh, " %s", b_info->u.pv.bootloader_args[i]); + fprintf(fh, ")\n"); } } - printf("\t(image\n"); + fprintf(fh, "\t(image\n"); switch (c_info->type) { case LIBXL_DOMAIN_TYPE_HVM: - printf("\t\t(hvm\n"); - printf("\t\t\t(firmware %s)\n", b_info->u.hvm.firmware); - printf("\t\t\t(video_memkb %"PRId64")\n", b_info->video_memkb); - printf("\t\t\t(shadow_memkb %"PRId64")\n", b_info->shadow_memkb); - printf("\t\t\t(pae %s)\n", libxl_defbool_to_string(b_info->u.hvm.pae)); - printf("\t\t\t(apic %s)\n", + fprintf(fh, "\t\t(hvm\n"); + fprintf(fh, "\t\t\t(firmware %s)\n", b_info->u.hvm.firmware); + fprintf(fh, "\t\t\t(video_memkb %"PRId64")\n", b_info->video_memkb); + fprintf(fh, "\t\t\t(shadow_memkb %"PRId64")\n", b_info->shadow_memkb); + fprintf(fh, "\t\t\t(pae %s)\n", libxl_defbool_to_string(b_info->u.hvm.pae)); + fprintf(fh, "\t\t\t(apic %s)\n", libxl_defbool_to_string(b_info->u.hvm.apic)); - printf("\t\t\t(acpi %s)\n", + fprintf(fh, "\t\t\t(acpi %s)\n", libxl_defbool_to_string(b_info->u.hvm.acpi)); - printf("\t\t\t(nx %s)\n", libxl_defbool_to_string(b_info->u.hvm.nx)); - printf("\t\t\t(viridian %s)\n", + fprintf(fh, "\t\t\t(nx %s)\n", libxl_defbool_to_string(b_info->u.hvm.nx)); + fprintf(fh, "\t\t\t(viridian %s)\n", libxl_defbool_to_string(b_info->u.hvm.viridian)); - printf("\t\t\t(hpet %s)\n", + fprintf(fh, "\t\t\t(hpet %s)\n", libxl_defbool_to_string(b_info->u.hvm.hpet)); - printf("\t\t\t(vpt_align %s)\n", + fprintf(fh, "\t\t\t(vpt_align %s)\n", libxl_defbool_to_string(b_info->u.hvm.vpt_align)); - printf("\t\t\t(timer_mode %s)\n", + fprintf(fh, "\t\t\t(timer_mode %s)\n", libxl_timer_mode_to_string(b_info->u.hvm.timer_mode)); - printf("\t\t\t(nestedhvm %s)\n", + fprintf(fh, "\t\t\t(nestedhvm %s)\n", libxl_defbool_to_string(b_info->u.hvm.nested_hvm)); - printf("\t\t\t(stdvga %s)\n", b_info->u.hvm.vga.kind == + fprintf(fh, "\t\t\t(stdvga %s)\n", b_info->u.hvm.vga.kind == LIBXL_VGA_INTERFACE_TYPE_STD ? "True" : "False"); - printf("\t\t\t(vnc %s)\n", + fprintf(fh, "\t\t\t(vnc %s)\n", libxl_defbool_to_string(b_info->u.hvm.vnc.enable)); - printf("\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); - printf("\t\t\t(vncdisplay %d)\n", b_info->u.hvm.vnc.display); - printf("\t\t\t(vncunused %s)\n", + fprintf(fh, "\t\t\t(vnclisten %s)\n", b_info->u.hvm.vnc.listen); + fprintf(fh, "\t\t\t(vncdisplay %d)\n", b_info->u.hvm.vnc.display); + fprintf(fh, "\t\t\t(vncunused %s)\n", libxl_defbool_to_string(b_info->u.hvm.vnc.findunused)); - printf("\t\t\t(keymap %s)\n", b_info->u.hvm.keymap); - printf("\t\t\t(sdl %s)\n", + fprintf(fh, "\t\t\t(keymap %s)\n", b_info->u.hvm.keymap); + fprintf(fh, "\t\t\t(sdl %s)\n", libxl_defbool_to_string(b_info->u.hvm.sdl.enable)); - printf("\t\t\t(opengl %s)\n", + fprintf(fh, "\t\t\t(opengl %s)\n", libxl_defbool_to_string(b_info->u.hvm.sdl.opengl)); - printf("\t\t\t(nographic %s)\n", + fprintf(fh, "\t\t\t(nographic %s)\n", libxl_defbool_to_string(b_info->u.hvm.nographic)); - printf("\t\t\t(spice %s)\n", + fprintf(fh, "\t\t\t(spice %s)\n", libxl_defbool_to_string(b_info->u.hvm.spice.enable)); - printf("\t\t\t(spiceport %d)\n", b_info->u.hvm.spice.port); - printf("\t\t\t(spicetls_port %d)\n", b_info->u.hvm.spice.tls_port); - printf("\t\t\t(spicehost %s)\n", b_info->u.hvm.spice.host); - printf("\t\t\t(spicedisable_ticketing %s)\n", + fprintf(fh, "\t\t\t(spiceport %d)\n", b_info->u.hvm.spice.port); + fprintf(fh, "\t\t\t(spicetls_port %d)\n", b_info->u.hvm.spice.tls_port); + fprintf(fh, "\t\t\t(spicehost %s)\n", b_info->u.hvm.spice.host); + fprintf(fh, "\t\t\t(spicedisable_ticketing %s)\n", libxl_defbool_to_string(b_info->u.hvm.spice.disable_ticketing)); - printf("\t\t\t(spiceagent_mouse %s)\n", + fprintf(fh, "\t\t\t(spiceagent_mouse %s)\n", libxl_defbool_to_string(b_info->u.hvm.spice.agent_mouse)); - printf("\t\t\t(device_model %s)\n", b_info->device_model ? : "default"); - printf("\t\t\t(gfx_passthru %s)\n", + fprintf(fh, "\t\t\t(device_model %s)\n", b_info->device_model ? : "default"); + fprintf(fh, "\t\t\t(gfx_passthru %s)\n", libxl_defbool_to_string(b_info->u.hvm.gfx_passthru)); - printf("\t\t\t(serial %s)\n", b_info->u.hvm.serial); - printf("\t\t\t(boot %s)\n", b_info->u.hvm.boot); - printf("\t\t\t(usb %s)\n", libxl_defbool_to_string(b_info->u.hvm.usb)); - printf("\t\t\t(usbdevice %s)\n", b_info->u.hvm.usbdevice); - printf("\t\t)\n"); + fprintf(fh, "\t\t\t(serial %s)\n", b_info->u.hvm.serial); + fprintf(fh, "\t\t\t(boot %s)\n", b_info->u.hvm.boot); + fprintf(fh, "\t\t\t(usb %s)\n", libxl_defbool_to_string(b_info->u.hvm.usb)); + fprintf(fh, "\t\t\t(usbdevice %s)\n", b_info->u.hvm.usbdevice); + fprintf(fh, "\t\t)\n"); break; case LIBXL_DOMAIN_TYPE_PV: - printf("\t\t(linux %d)\n", 0); - printf("\t\t\t(kernel %s)\n", b_info->kernel); - printf("\t\t\t(cmdline %s)\n", b_info->cmdline); - printf("\t\t\t(ramdisk %s)\n", b_info->ramdisk); - printf("\t\t\t(e820_host %s)\n", + fprintf(fh, "\t\t(linux %d)\n", 0); + fprintf(fh, "\t\t\t(kernel %s)\n", b_info->kernel); + fprintf(fh, "\t\t\t(cmdline %s)\n", b_info->cmdline); + fprintf(fh, "\t\t\t(ramdisk %s)\n", b_info->ramdisk); + fprintf(fh, "\t\t\t(e820_host %s)\n", libxl_defbool_to_string(b_info->u.pv.e820_host)); - printf("\t\t)\n"); + fprintf(fh, "\t\t)\n"); break; default: fprintf(stderr, "Unknown domain type %d\n", c_info->type); exit(1); } - printf("\t)\n"); + fprintf(fh, "\t)\n"); for (i = 0; i < d_config->num_disks; i++) { - printf("\t(device\n"); - printf("\t\t(tap\n"); - printf("\t\t\t(backend_domid %d)\n", d_config->disks[i].backend_domid); - printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(physpath %s)\n", d_config->disks[i].pdev_path); - printf("\t\t\t(phystype %d)\n", d_config->disks[i].backend); - printf("\t\t\t(virtpath %s)\n", d_config->disks[i].vdev); - printf("\t\t\t(unpluggable %d)\n", d_config->disks[i].removable); - printf("\t\t\t(readwrite %d)\n", d_config->disks[i].readwrite); - printf("\t\t\t(is_cdrom %d)\n", d_config->disks[i].is_cdrom); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(tap\n"); + fprintf(fh, "\t\t\t(backend_domid %d)\n", d_config->disks[i].backend_domid); + fprintf(fh, "\t\t\t(frontend_domid %d)\n", domid); + fprintf(fh, "\t\t\t(physpath %s)\n", d_config->disks[i].pdev_path); + fprintf(fh, "\t\t\t(phystype %d)\n", d_config->disks[i].backend); + fprintf(fh, "\t\t\t(virtpath %s)\n", d_config->disks[i].vdev); + fprintf(fh, "\t\t\t(unpluggable %d)\n", d_config->disks[i].removable); + fprintf(fh, "\t\t\t(readwrite %d)\n", d_config->disks[i].readwrite); + fprintf(fh, "\t\t\t(is_cdrom %d)\n", d_config->disks[i].is_cdrom); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } for (i = 0; i < d_config->num_nics; i++) { - printf("\t(device\n"); - printf("\t\t(vif\n"); + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(vif\n"); if (d_config->nics[i].ifname) - printf("\t\t\t(vifname %s)\n", d_config->nics[i].ifname); - printf("\t\t\t(backend_domid %d)\n", d_config->nics[i].backend_domid); - printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(devid %d)\n", d_config->nics[i].devid); - printf("\t\t\t(mtu %d)\n", d_config->nics[i].mtu); - printf("\t\t\t(model %s)\n", d_config->nics[i].model); - printf("\t\t\t(mac %02x%02x%02x%02x%02x%02x)\n", + fprintf(fh, "\t\t\t(vifname %s)\n", d_config->nics[i].ifname); + fprintf(fh, "\t\t\t(backend_domid %d)\n", d_config->nics[i].backend_domid); + fprintf(fh, "\t\t\t(frontend_domid %d)\n", domid); + fprintf(fh, "\t\t\t(devid %d)\n", d_config->nics[i].devid); + fprintf(fh, "\t\t\t(mtu %d)\n", d_config->nics[i].mtu); + fprintf(fh, "\t\t\t(model %s)\n", d_config->nics[i].model); + fprintf(fh, "\t\t\t(mac %02x%02x%02x%02x%02x%02x)\n", d_config->nics[i].mac[0], d_config->nics[i].mac[1], d_config->nics[i].mac[2], d_config->nics[i].mac[3], d_config->nics[i].mac[4], d_config->nics[i].mac[5]); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } for (i = 0; i < d_config->num_pcidevs; i++) { - printf("\t(device\n"); - printf("\t\t(pci\n"); - printf("\t\t\t(pci dev %04x:%02x:%02x.%01x@%02x)\n", + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(pci\n"); + fprintf(fh, "\t\t\t(pci dev %04x:%02x:%02x.%01x@%02x)\n", d_config->pcidevs[i].domain, d_config->pcidevs[i].bus, d_config->pcidevs[i].dev, d_config->pcidevs[i].func, d_config->pcidevs[i].vdevfn); - printf("\t\t\t(opts msitranslate %d power_mgmt %d)\n", + fprintf(fh, "\t\t\t(opts msitranslate %d power_mgmt %d)\n", d_config->pcidevs[i].msitranslate, d_config->pcidevs[i].power_mgmt); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } for (i = 0; i < d_config->num_vfbs; i++) { - printf("\t(device\n"); - printf("\t\t(vfb\n"); - printf("\t\t\t(backend_domid %d)\n", d_config->vfbs[i].backend_domid); - printf("\t\t\t(frontend_domid %d)\n", domid); - printf("\t\t\t(devid %d)\n", d_config->vfbs[i].devid); - printf("\t\t\t(vnc %s)\n", + fprintf(fh, "\t(device\n"); + fprintf(fh, "\t\t(vfb\n"); + fprintf(fh, "\t\t\t(backend_domid %d)\n", d_config->vfbs[i].backend_domid); + fprintf(fh, "\t\t\t(frontend_domid %d)\n", domid); + fprintf(fh, "\t\t\t(devid %d)\n", d_config->vfbs[i].devid); + fprintf(fh, "\t\t\t(vnc %s)\n", libxl_defbool_to_string(d_config->vfbs[i].vnc.enable)); - printf("\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnc.listen); - printf("\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); - printf("\t\t\t(vncunused %s)\n", + fprintf(fh, "\t\t\t(vnclisten %s)\n", d_config->vfbs[i].vnc.listen); + fprintf(fh, "\t\t\t(vncdisplay %d)\n", d_config->vfbs[i].vnc.display); + fprintf(fh, "\t\t\t(vncunused %s)\n", libxl_defbool_to_string(d_config->vfbs[i].vnc.findunused)); - printf("\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); - printf("\t\t\t(sdl %s)\n", + fprintf(fh, "\t\t\t(keymap %s)\n", d_config->vfbs[i].keymap); + fprintf(fh, "\t\t\t(sdl %s)\n", libxl_defbool_to_string(d_config->vfbs[i].sdl.enable)); - printf("\t\t\t(opengl %s)\n", + fprintf(fh, "\t\t\t(opengl %s)\n", libxl_defbool_to_string(d_config->vfbs[i].sdl.opengl)); - printf("\t\t\t(display %s)\n", d_config->vfbs[i].sdl.display); - printf("\t\t\t(xauthority %s)\n", d_config->vfbs[i].sdl.xauthority); - printf("\t\t)\n"); - printf("\t)\n"); + fprintf(fh, "\t\t\t(display %s)\n", d_config->vfbs[i].sdl.display); + fprintf(fh, "\t\t\t(xauthority %s)\n", d_config->vfbs[i].sdl.xauthority); + fprintf(fh, "\t\t)\n"); + fprintf(fh, "\t)\n"); } - printf(")\n"); + fprintf(fh, ")\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 Tue Dec 09 15:00:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHO-0007QY-KR; Tue, 09 Dec 2014 15:00:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHN-0007QN-47 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:45 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 6F/4A-15461-C9E07845; Tue, 09 Dec 2014 15:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1418137242!14464002!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7034 invoked from network); 9 Dec 2014 15:00:43 -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; 9 Dec 2014 15:00:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHK-0008FI-JH for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHK-00029Y-F9 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:42 +0000 Date: Tue, 09 Dec 2014 15:00:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: Clarify xs_open() semantics X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13dc6bf0430eedc3422d81b87764c31e59a73b1f Author: Razvan Cojocaru AuthorDate: Fri Nov 28 14:26:48 2014 +0200 Commit: Ian Campbell CommitDate: Tue Dec 2 13:50:58 2014 +0000 xenstore: Clarify xs_open() semantics Added to the xs_open() comments in xenstore.h. The text has been taken almost verbatim from a xen-devel email by Ian Campbell, and confirmed as accurate by Ian Jackson. Suggested-by: Ian Campbell Signed-off-by: Razvan Cojocaru Acked-by: Ian Jackson --- tools/xenstore/include/xenstore.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h index fdf5e76..b4b113e 100644 --- a/tools/xenstore/include/xenstore.h +++ b/tools/xenstore/include/xenstore.h @@ -59,10 +59,20 @@ typedef uint32_t xs_transaction_t; /* On failure, these routines set errno. */ /* Open a connection to the xs daemon. - * Attempts to make a connection over the socket interface, + * Attempts to make a connection over the socket interface, * and if it fails, then over the xenbus interface. * Mode 0 specifies read-write access, XS_OPEN_READONLY for * read-only access. + * + * * Connections made with xs_open(0) (which might be shared page or + * socket based) are only guaranteed to work in the parent after + * fork. + * * Connections made with xs_open(XS_OPEN_SOCKETONLY) will be usable + * in either the parent or the child after fork, but not both. + * * xs_daemon_open*() and xs_domain_open() are deprecated synonyms + * for xs_open(0). + * * XS_OPEN_READONLY has no bearing on any of this. + * * Returns a handle or NULL. */ struct xs_handle *xs_open(unsigned long flags); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:00:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHO-0007QY-KR; Tue, 09 Dec 2014 15:00:46 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHN-0007QN-47 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:45 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 6F/4A-15461-C9E07845; Tue, 09 Dec 2014 15:00:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1418137242!14464002!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7034 invoked from network); 9 Dec 2014 15:00:43 -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; 9 Dec 2014 15:00:43 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHK-0008FI-JH for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHK-00029Y-F9 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:42 +0000 Date: Tue, 09 Dec 2014 15:00:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xenstore: Clarify xs_open() semantics X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 13dc6bf0430eedc3422d81b87764c31e59a73b1f Author: Razvan Cojocaru AuthorDate: Fri Nov 28 14:26:48 2014 +0200 Commit: Ian Campbell CommitDate: Tue Dec 2 13:50:58 2014 +0000 xenstore: Clarify xs_open() semantics Added to the xs_open() comments in xenstore.h. The text has been taken almost verbatim from a xen-devel email by Ian Campbell, and confirmed as accurate by Ian Jackson. Suggested-by: Ian Campbell Signed-off-by: Razvan Cojocaru Acked-by: Ian Jackson --- tools/xenstore/include/xenstore.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/tools/xenstore/include/xenstore.h b/tools/xenstore/include/xenstore.h index fdf5e76..b4b113e 100644 --- a/tools/xenstore/include/xenstore.h +++ b/tools/xenstore/include/xenstore.h @@ -59,10 +59,20 @@ typedef uint32_t xs_transaction_t; /* On failure, these routines set errno. */ /* Open a connection to the xs daemon. - * Attempts to make a connection over the socket interface, + * Attempts to make a connection over the socket interface, * and if it fails, then over the xenbus interface. * Mode 0 specifies read-write access, XS_OPEN_READONLY for * read-only access. + * + * * Connections made with xs_open(0) (which might be shared page or + * socket based) are only guaranteed to work in the parent after + * fork. + * * Connections made with xs_open(XS_OPEN_SOCKETONLY) will be usable + * in either the parent or the child after fork, but not both. + * * xs_daemon_open*() and xs_domain_open() are deprecated synonyms + * for xs_open(0). + * * XS_OPEN_READONLY has no bearing on any of this. + * * Returns a handle or NULL. */ struct xs_handle *xs_open(unsigned long flags); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:01:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHa-0007SV-NN; Tue, 09 Dec 2014 15:00:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHZ-0007SE-Jh for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:57 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id C7/74-03145-8AE07845; Tue, 09 Dec 2014 15:00:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1418137252!13938942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23549 invoked from network); 9 Dec 2014 15:00:53 -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; 9 Dec 2014 15:00:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHU-0008FU-OL for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHU-0002AQ-MW for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:52 +0000 Date: Tue, 09 Dec 2014 15:00:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] missing chunk of HVM direct kernel boot patch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e609bb983ea6e0a5a4d791cffccad0ce3712e12f Author: Chunyan Liu AuthorDate: Fri Nov 28 13:55:22 2014 +0800 Commit: Ian Campbell CommitDate: Tue Dec 2 13:54:41 2014 +0000 missing chunk of HVM direct kernel boot patch Found by Stefano, this chunk of the patch was never applied to xen-unstable (commit 11dffa2359e8a2629490c14c029c7c7c777b3e47), see http://marc.info/?l=qemu-devel&m=140471493425353&w=2. Signed-off-by: Chunyan Liu Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 3e191c3..b25b574 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -527,6 +527,15 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_nics = 0; + if (b_info->kernel) + flexarray_vappend(dm_args, "-kernel", b_info->kernel, NULL); + + if (b_info->ramdisk) + flexarray_vappend(dm_args, "-initrd", b_info->ramdisk, NULL); + + if (b_info->cmdline) + flexarray_vappend(dm_args, "-append", b_info->cmdline, NULL); + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:01:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHa-0007SV-NN; Tue, 09 Dec 2014 15:00:58 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHZ-0007SE-Jh for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:57 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id C7/74-03145-8AE07845; Tue, 09 Dec 2014 15:00:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1418137252!13938942!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23549 invoked from network); 9 Dec 2014 15:00:53 -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; 9 Dec 2014 15:00:53 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHU-0008FU-OL for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHU-0002AQ-MW for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:00:52 +0000 Date: Tue, 09 Dec 2014 15:00:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] missing chunk of HVM direct kernel boot patch X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e609bb983ea6e0a5a4d791cffccad0ce3712e12f Author: Chunyan Liu AuthorDate: Fri Nov 28 13:55:22 2014 +0800 Commit: Ian Campbell CommitDate: Tue Dec 2 13:54:41 2014 +0000 missing chunk of HVM direct kernel boot patch Found by Stefano, this chunk of the patch was never applied to xen-unstable (commit 11dffa2359e8a2629490c14c029c7c7c777b3e47), see http://marc.info/?l=qemu-devel&m=140471493425353&w=2. Signed-off-by: Chunyan Liu Reviewed-by: Stefano Stabellini Acked-by: Ian Campbell --- tools/libxl/libxl_dm.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 3e191c3..b25b574 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -527,6 +527,15 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { int ioemu_nics = 0; + if (b_info->kernel) + flexarray_vappend(dm_args, "-kernel", b_info->kernel, NULL); + + if (b_info->ramdisk) + flexarray_vappend(dm_args, "-initrd", b_info->ramdisk, NULL); + + if (b_info->cmdline) + flexarray_vappend(dm_args, "-append", b_info->cmdline, NULL); + if (b_info->u.hvm.serial || b_info->u.hvm.serial_list) { if ( b_info->u.hvm.serial && b_info->u.hvm.serial_list ) { -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:01:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMHi-0007To-QB; Tue, 09 Dec 2014 15:01:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHh-0007Td-Lg for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:05 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 9F/48-25547-0BE07845; Tue, 09 Dec 2014 15:01:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1418137263!12136570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6550 invoked from network); 9 Dec 2014 15:01:04 -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; 9 Dec 2014 15:01:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHf-0008G0-2O for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHe-0002B3-SP for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:02 +0000 Date: Tue, 09 Dec 2014 15:01:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: un-constify return value of libxl_basename X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3abab74598d96de87e3cbcaf1d567ac854e53cf Author: Wei Liu AuthorDate: Mon Dec 1 11:31:12 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 13:55:28 2014 +0000 libxl: un-constify return value of libxl_basename The string returned is malloc'ed but marked as "const". Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_utils.c | 5 ++++- tools/libxl/libxl_utils.h | 6 +++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 41d6e8d..291c190 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -478,6 +478,16 @@ typedef struct libxl__ctx libxl_ctx; #endif /* + * LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE + * + * The return value of libxl_basename is malloc'ed but the erroneously + * marked as "const" in releases before 4.5. + */ +#if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 +#define LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE 1 +#endif + +/* * LIBXL_HAVE_PHYSINFO_OUTSTANDING_PAGES * * If this is defined, libxl_physinfo structure will contain an uint64 field diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 3e1ba17..22119fc 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -19,7 +19,10 @@ #include "libxl_internal.h" -const char *libxl_basename(const char *name) +#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +const +#endif +char *libxl_basename(const char *name) { const char *filename; if (name == NULL) diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 117b229..8277eb9 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -18,7 +18,11 @@ #include "libxl.h" -const char *libxl_basename(const char *name); /* returns string from strdup */ +#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +const +#endif +char *libxl_basename(const char *name); /* returns string from strdup */ + unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsigned int smp_cpus); int libxl_name_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid); int libxl_domain_qualifier_to_domid(libxl_ctx *ctx, const char *name, 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 Tue Dec 09 15:01:06 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMHi-0007To-QB; Tue, 09 Dec 2014 15:01:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHh-0007Td-Lg for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:05 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 9F/48-25547-0BE07845; Tue, 09 Dec 2014 15:01:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1418137263!12136570!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6550 invoked from network); 9 Dec 2014 15:01:04 -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; 9 Dec 2014 15:01:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHf-0008G0-2O for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHe-0002B3-SP for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:02 +0000 Date: Tue, 09 Dec 2014 15:01:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: un-constify return value of libxl_basename X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3abab74598d96de87e3cbcaf1d567ac854e53cf Author: Wei Liu AuthorDate: Mon Dec 1 11:31:12 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 13:55:28 2014 +0000 libxl: un-constify return value of libxl_basename The string returned is malloc'ed but marked as "const". Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- tools/libxl/libxl.h | 10 ++++++++++ tools/libxl/libxl_utils.c | 5 ++++- tools/libxl/libxl_utils.h | 6 +++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 41d6e8d..291c190 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -478,6 +478,16 @@ typedef struct libxl__ctx libxl_ctx; #endif /* + * LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE + * + * The return value of libxl_basename is malloc'ed but the erroneously + * marked as "const" in releases before 4.5. + */ +#if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 +#define LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE 1 +#endif + +/* * LIBXL_HAVE_PHYSINFO_OUTSTANDING_PAGES * * If this is defined, libxl_physinfo structure will contain an uint64 field diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 3e1ba17..22119fc 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -19,7 +19,10 @@ #include "libxl_internal.h" -const char *libxl_basename(const char *name) +#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +const +#endif +char *libxl_basename(const char *name) { const char *filename; if (name == NULL) diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 117b229..8277eb9 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -18,7 +18,11 @@ #include "libxl.h" -const char *libxl_basename(const char *name); /* returns string from strdup */ +#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +const +#endif +char *libxl_basename(const char *name); /* returns string from strdup */ + unsigned long libxl_get_required_shadow_memory(unsigned long maxmem_kb, unsigned int smp_cpus); int libxl_name_to_domid(libxl_ctx *ctx, const char *name, uint32_t *domid); int libxl_domain_qualifier_to_domid(libxl_ctx *ctx, const char *name, 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 Tue Dec 09 15:01:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMHs-0007VU-Ta; Tue, 09 Dec 2014 15:01:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHr-0007VG-QH for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:15 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E2/31-11581-BBE07845; Tue, 09 Dec 2014 15:01:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1418137273!12370581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14960 invoked from network); 9 Dec 2014 15:01:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:01:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHp-0008G9-80 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHp-0002Bq-6s for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:13 +0000 Date: Tue, 09 Dec 2014 15:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Don't dereference null new_name pointer in libxl_domain_rename() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 276ba7806259c10b186c9cd9115078fb35b28bc7 Author: Euan Harris AuthorDate: Mon Dec 1 14:27:06 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 14:18:57 2014 +0000 libxl: Don't dereference null new_name pointer in libxl_domain_rename() libxl__domain_rename() unconditionally dereferences its new_name parameter, to check whether it is an empty string. Add a check to avoid a segfault if new_name is null. Signed-off-by: Euan Harris Acked-by: Ian Campbell --- tools/libxl/libxl.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c50c323..74c00dc 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -385,6 +385,13 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, } } + if (!new_name) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "new domain name not specified"); + rc = ERROR_INVAL; + goto x_rc; + } + if (new_name[0]) { /* nonempty names must be unique */ uint32_t domid_e; -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:01:23 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMHs-0007VU-Ta; Tue, 09 Dec 2014 15:01:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHr-0007VG-QH for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:15 +0000 Received: from [85.158.139.211] by server-8.bemta-5.messagelabs.com id E2/31-11581-BBE07845; Tue, 09 Dec 2014 15:01:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1418137273!12370581!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14960 invoked from network); 9 Dec 2014 15:01:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:01:14 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHp-0008G9-80 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHp-0002Bq-6s for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:13 +0000 Date: Tue, 09 Dec 2014 15:01:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Don't dereference null new_name pointer in libxl_domain_rename() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 276ba7806259c10b186c9cd9115078fb35b28bc7 Author: Euan Harris AuthorDate: Mon Dec 1 14:27:06 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 14:18:57 2014 +0000 libxl: Don't dereference null new_name pointer in libxl_domain_rename() libxl__domain_rename() unconditionally dereferences its new_name parameter, to check whether it is an empty string. Add a check to avoid a segfault if new_name is null. Signed-off-by: Euan Harris Acked-by: Ian Campbell --- tools/libxl/libxl.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index c50c323..74c00dc 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -385,6 +385,13 @@ int libxl__domain_rename(libxl__gc *gc, uint32_t domid, } } + if (!new_name) { + LIBXL__LOG(ctx, LIBXL__LOG_ERROR, + "new domain name not specified"); + rc = ERROR_INVAL; + goto x_rc; + } + if (new_name[0]) { /* nonempty names must be unique */ uint32_t domid_e; -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:01:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMI3-0007Wr-WB; Tue, 09 Dec 2014 15:01:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMI2-0007WY-6D for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:26 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 55/3C-25714-5CE07845; Tue, 09 Dec 2014 15:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1418137283!12404122!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9223 invoked from network); 9 Dec 2014 15:01:24 -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; 9 Dec 2014 15:01:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHz-0008GC-EB for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHz-0002CG-CD for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:23 +0000 Date: Tue, 09 Dec 2014 15:01:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix two memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d1a77ba7ab94183c203226d3fe7ac1cd087c59b Author: Wei Liu AuthorDate: Mon Dec 1 11:31:13 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 15:21:16 2014 +0000 xl: fix two memory leaks Free strings returned by libxl_basename after used. Signed-off-by: Wei Liu Acked-by: Ian Campbell Cc: Ian Jackson [ ijc -- s/basename/kernel_basename in parse_config_data to avoid shadowing basename(3). ] --- tools/libxl/xl_cmdimpl.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 88a4d65..3737c7e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -926,6 +926,7 @@ static void parse_config_data(const char *config_source, int pci_permissive = 0; int pci_seize = 0; int i, e; + char *kernel_basename; libxl_domain_create_info *c_info = &d_config->c_info; libxl_domain_build_info *b_info = &d_config->b_info; @@ -1122,13 +1123,15 @@ static void parse_config_data(const char *config_source, switch(b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: - if (!strcmp(libxl_basename(b_info->kernel), "hvmloader")) { + kernel_basename = libxl_basename(b_info->kernel); + if (!strcmp(kernel_basename, "hvmloader")) { fprintf(stderr, "WARNING: you seem to be using \"kernel\" " "directive to override HVM guest firmware. Ignore " "that. Use \"firmware_override\" instead if you " "really want a non-default firmware\n"); b_info->kernel = NULL; } + free(kernel_basename); xlu_cfg_replace_string (config, "firmware_override", &b_info->u.hvm.firmware, 0); @@ -7029,7 +7032,7 @@ int main_cpupoolcreate(int argc, char **argv) int config_len = 0; XLU_Config *config; const char *buf; - const char *name; + char *name = NULL; uint32_t poolid; libxl_scheduler sched = 0; XLU_ConfigList *cpus; @@ -7203,6 +7206,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(name); free(config_data); 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 Dec 09 15:01:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMI3-0007Wr-WB; Tue, 09 Dec 2014 15:01:27 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMI2-0007WY-6D for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:26 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 55/3C-25714-5CE07845; Tue, 09 Dec 2014 15:01:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1418137283!12404122!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9223 invoked from network); 9 Dec 2014 15:01:24 -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; 9 Dec 2014 15:01:24 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMHz-0008GC-EB for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMHz-0002CG-CD for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:23 +0000 Date: Tue, 09 Dec 2014 15:01:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: fix two memory leaks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4d1a77ba7ab94183c203226d3fe7ac1cd087c59b Author: Wei Liu AuthorDate: Mon Dec 1 11:31:13 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 2 15:21:16 2014 +0000 xl: fix two memory leaks Free strings returned by libxl_basename after used. Signed-off-by: Wei Liu Acked-by: Ian Campbell Cc: Ian Jackson [ ijc -- s/basename/kernel_basename in parse_config_data to avoid shadowing basename(3). ] --- tools/libxl/xl_cmdimpl.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 88a4d65..3737c7e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -926,6 +926,7 @@ static void parse_config_data(const char *config_source, int pci_permissive = 0; int pci_seize = 0; int i, e; + char *kernel_basename; libxl_domain_create_info *c_info = &d_config->c_info; libxl_domain_build_info *b_info = &d_config->b_info; @@ -1122,13 +1123,15 @@ static void parse_config_data(const char *config_source, switch(b_info->type) { case LIBXL_DOMAIN_TYPE_HVM: - if (!strcmp(libxl_basename(b_info->kernel), "hvmloader")) { + kernel_basename = libxl_basename(b_info->kernel); + if (!strcmp(kernel_basename, "hvmloader")) { fprintf(stderr, "WARNING: you seem to be using \"kernel\" " "directive to override HVM guest firmware. Ignore " "that. Use \"firmware_override\" instead if you " "really want a non-default firmware\n"); b_info->kernel = NULL; } + free(kernel_basename); xlu_cfg_replace_string (config, "firmware_override", &b_info->u.hvm.firmware, 0); @@ -7029,7 +7032,7 @@ int main_cpupoolcreate(int argc, char **argv) int config_len = 0; XLU_Config *config; const char *buf; - const char *name; + char *name = NULL; uint32_t poolid; libxl_scheduler sched = 0; XLU_ConfigList *cpus; @@ -7203,6 +7206,7 @@ int main_cpupoolcreate(int argc, char **argv) out_cfg: xlu_cfg_destroy(config); out: + free(name); free(config_data); 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 Dec 09 15:01:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMID-0007YS-2z; Tue, 09 Dec 2014 15:01:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIB-0007YC-Vs for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:36 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id C3/2C-15461-FCE07845; Tue, 09 Dec 2014 15:01:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1418137293!14095446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24462 invoked from network); 9 Dec 2014 15:01:34 -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; 9 Dec 2014 15:01:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMI9-0008GN-NY for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMI9-0002DC-IC for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:33 +0000 Date: Tue, 09 Dec 2014 15:01:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'master' of xenbits.xen.org:/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1671a60a9b4d288c10ce8eada5fc4e20793b32e5 Merge: 4d1a77ba7ab94183c203226d3fe7ac1cd087c59b 3a80985b894f54eb3b2e143e4dea737cf139a517 Author: Ian Jackson AuthorDate: Wed Dec 3 17:03:59 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 3 17:03:59 2014 +0000 Merge branch 'master' of xenbits.xen.org:/home/xen/git/xen into staging Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 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 Tue Dec 09 15:01:43 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01: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 1XyMID-0007YS-2z; Tue, 09 Dec 2014 15:01:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIB-0007YC-Vs for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:36 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id C3/2C-15461-FCE07845; Tue, 09 Dec 2014 15:01:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1418137293!14095446!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24462 invoked from network); 9 Dec 2014 15:01:34 -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; 9 Dec 2014 15:01:34 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMI9-0008GN-NY for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:33 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMI9-0002DC-IC for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:33 +0000 Date: Tue, 09 Dec 2014 15:01:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge branch 'master' of xenbits.xen.org:/home/xen/git/xen into staging X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1671a60a9b4d288c10ce8eada5fc4e20793b32e5 Merge: 4d1a77ba7ab94183c203226d3fe7ac1cd087c59b 3a80985b894f54eb3b2e143e4dea737cf139a517 Author: Ian Jackson AuthorDate: Wed Dec 3 17:03:59 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 3 17:03:59 2014 +0000 Merge branch 'master' of xenbits.xen.org:/home/xen/git/xen into staging Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 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 Tue Dec 09 15:01:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIN-0007af-PS; Tue, 09 Dec 2014 15:01:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIM-0007aD-Ij for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:46 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id A0/5E-24859-9DE07845; Tue, 09 Dec 2014 15:01:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1418137304!12128067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14146 invoked from network); 9 Dec 2014 15:01:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:01:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIK-0008GT-08 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIJ-0002Dp-Rd for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:43 +0000 Date: Tue, 09 Dec 2014 15:01:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] INSTALL: fix typo in xendomains.service name X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98d1fd8ef1e2caadc204e4fa986e46ac740561fd Author: Olaf Hering AuthorDate: Wed Dec 3 09:52:34 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:53:10 2014 +0000 INSTALL: fix typo in xendomains.service name Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- INSTALL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 0bc67ea..71dd0eb 100644 --- a/INSTALL +++ b/INSTALL @@ -284,7 +284,7 @@ systemctl enable xen-init-dom0.service systemctl enable xenconsoled.service Other optional services are: -systemctl enable xen-domains.service +systemctl enable xendomains.service systemctl enable xen-watchdog.service -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:01:47 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:01:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIN-0007af-PS; Tue, 09 Dec 2014 15:01:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIM-0007aD-Ij for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:46 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id A0/5E-24859-9DE07845; Tue, 09 Dec 2014 15:01:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1418137304!12128067!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14146 invoked from network); 9 Dec 2014 15:01:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:01:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIK-0008GT-08 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIJ-0002Dp-Rd for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:43 +0000 Date: Tue, 09 Dec 2014 15:01:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] INSTALL: fix typo in xendomains.service name X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 98d1fd8ef1e2caadc204e4fa986e46ac740561fd Author: Olaf Hering AuthorDate: Wed Dec 3 09:52:34 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:53:10 2014 +0000 INSTALL: fix typo in xendomains.service name Signed-off-by: Olaf Hering Cc: Ian Campbell Cc: Ian Jackson Acked-by: Ian Campbell --- INSTALL | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/INSTALL b/INSTALL index 0bc67ea..71dd0eb 100644 --- a/INSTALL +++ b/INSTALL @@ -284,7 +284,7 @@ systemctl enable xen-init-dom0.service systemctl enable xenconsoled.service Other optional services are: -systemctl enable xen-domains.service +systemctl enable xendomains.service systemctl enable xen-watchdog.service -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIX-0007dB-T8; Tue, 09 Dec 2014 15:01:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIW-0007cz-MM for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:56 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 08/79-31453-3EE07845; Tue, 09 Dec 2014 15:01:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1418137314!12370804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20630 invoked from network); 9 Dec 2014 15:01:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:01:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIU-0008Gi-4z for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIU-0002F0-3y for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:54 +0000 Date: Tue, 09 Dec 2014 15:01:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: expose #define to 4.5 and above X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bfac2d7a00e9e8b52fe1fc2ffb3d12a57adce96c Author: Wei Liu AuthorDate: Wed Dec 3 10:41:38 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 11:53:43 2014 +0000 libxl: expose #define to 4.5 and above In e3abab74 (libxl: un-constify return value of libxl_basename), the macro was exposed to releases < 4.5. However only new code is able to make use of that macro so it should be exposed to releases >= 4.5. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl.h | 6 +++--- tools/libxl/libxl_utils.c | 2 +- tools/libxl/libxl_utils.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 291c190..0a123f1 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -478,13 +478,13 @@ typedef struct libxl__ctx libxl_ctx; #endif /* - * LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE + * LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE * * The return value of libxl_basename is malloc'ed but the erroneously * marked as "const" in releases before 4.5. */ -#if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 -#define LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE 1 +#if !defined(LIBXL_API_VERSION) || LIBXL_API_VERSION >= 0x040500 +#define LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE 1 #endif /* diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 22119fc..7095b58 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -19,7 +19,7 @@ #include "libxl_internal.h" -#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +#ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const #endif char *libxl_basename(const char *name) diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 8277eb9..acacdd9 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -18,7 +18,7 @@ #include "libxl.h" -#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +#ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const #endif char *libxl_basename(const char *name); /* returns string from strdup */ -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:02:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIX-0007dB-T8; Tue, 09 Dec 2014 15:01:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIW-0007cz-MM for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:56 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 08/79-31453-3EE07845; Tue, 09 Dec 2014 15:01:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1418137314!12370804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20630 invoked from network); 9 Dec 2014 15:01:55 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:01:55 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIU-0008Gi-4z for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:54 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIU-0002F0-3y for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:01:54 +0000 Date: Tue, 09 Dec 2014 15:01:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: expose #define to 4.5 and above X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bfac2d7a00e9e8b52fe1fc2ffb3d12a57adce96c Author: Wei Liu AuthorDate: Wed Dec 3 10:41:38 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 11:53:43 2014 +0000 libxl: expose #define to 4.5 and above In e3abab74 (libxl: un-constify return value of libxl_basename), the macro was exposed to releases < 4.5. However only new code is able to make use of that macro so it should be exposed to releases >= 4.5. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: Andrew Cooper Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxl/libxl.h | 6 +++--- tools/libxl/libxl_utils.c | 2 +- tools/libxl/libxl_utils.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 291c190..0a123f1 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -478,13 +478,13 @@ typedef struct libxl__ctx libxl_ctx; #endif /* - * LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE + * LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE * * The return value of libxl_basename is malloc'ed but the erroneously * marked as "const" in releases before 4.5. */ -#if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 -#define LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE 1 +#if !defined(LIBXL_API_VERSION) || LIBXL_API_VERSION >= 0x040500 +#define LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE 1 #endif /* diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 22119fc..7095b58 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -19,7 +19,7 @@ #include "libxl_internal.h" -#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +#ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const #endif char *libxl_basename(const char *name) diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 8277eb9..acacdd9 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -18,7 +18,7 @@ #include "libxl.h" -#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +#ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const #endif char *libxl_basename(const char *name); /* returns string from strdup */ -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:02:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02: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 1XyMIi-0007nj-1n; Tue, 09 Dec 2014 15:02:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIg-0007jP-OQ for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:06 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id B5/77-03145-EEE07845; Tue, 09 Dec 2014 15:02:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1418137324!13979921!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18319 invoked from network); 9 Dec 2014 15:02:05 -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; 9 Dec 2014 15:02:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIe-0008HE-AW for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIe-0002Fc-97 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:04 +0000 Date: Tue, 09 Dec 2014 15:02:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: update systemd dependency to use service instead of socket X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 268b8f1d46d758deb635f9602b94e5826db54884 Author: Olaf Hering AuthorDate: Tue Dec 2 16:39:23 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:57:02 2014 +0000 tools/hotplug: update systemd dependency to use service instead of socket Since commit 4542ae340d75bd6319e3fcd94e6c9336e210aeef ("tools/hotplug: systemd xenstored dependencies") all service files use the .socket unit as startup dependency. While this happens to work for boot it fails for shutdown because a .socket does not seem to enforce ordering. When xendomains.service runs during shutdown then systemd will stop xenstored.service at the same time. Change all "xenstored.socket" to "xenstored.service" to let systemd know that xenstored has to be shutdown after everything else. Reported-by: Mark Pryor Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- .../hotplug/Linux/systemd/xen-init-dom0.service.in | 4 ++-- .../systemd/xen-qemu-dom0-disk-backend.service.in | 4 ++-- tools/hotplug/Linux/systemd/xenconsoled.service.in | 4 ++-- tools/hotplug/Linux/systemd/xendomains.service.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in index 4d4cb23..3befadc 100644 --- a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in +++ b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in @@ -1,7 +1,7 @@ [Unit] Description=xen-init-dom0, initialise Dom0 configuration (xenstore nodes, JSON configuration stub) -Requires=xenstored.socket proc-xen.mount -After=xenstored.socket proc-xen.mount +Requires=xenstored.service proc-xen.mount +After=xenstored.service proc-xen.mount ConditionPathExists=/proc/xen/capabilities [Service] diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 6b9c96e..0a5807a 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -1,7 +1,7 @@ [Unit] Description=qemu for xen dom0 disk backend -Requires=proc-xen.mount xenstored.socket -After=proc-xen.mount xenstored.socket xenconsoled.service +Requires=proc-xen.mount xenstored.service +After=proc-xen.mount xenstored.service xenconsoled.service Before=xendomains.service libvirtd.service libvirt-guests.service RefuseManualStop=true ConditionPathExists=/proc/xen/capabilities diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index 2c5d99f..cb44cd6 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -1,7 +1,7 @@ [Unit] Description=Xenconsoled - handles logging from guest consoles and hypervisor -Requires=proc-xen.mount xenstored.socket -After=proc-xen.mount xenstored.socket +Requires=proc-xen.mount xenstored.service +After=proc-xen.mount xenstored.service ConditionPathExists=/proc/xen/capabilities [Service] diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in index 757278f..9962671 100644 --- a/tools/hotplug/Linux/systemd/xendomains.service.in +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -1,7 +1,7 @@ [Unit] Description=Xendomains - start and stop guests on boot and shutdown -Requires=proc-xen.mount xenstored.socket -After=proc-xen.mount xenstored.socket xenconsoled.service xen-init-dom0.service +Requires=proc-xen.mount xenstored.service +After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service ConditionPathExists=/proc/xen/capabilities [Service] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:02:08 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02: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 1XyMIi-0007nj-1n; Tue, 09 Dec 2014 15:02:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIg-0007jP-OQ for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:06 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id B5/77-03145-EEE07845; Tue, 09 Dec 2014 15:02:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1418137324!13979921!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18319 invoked from network); 9 Dec 2014 15:02:05 -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; 9 Dec 2014 15:02:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIe-0008HE-AW for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIe-0002Fc-97 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:04 +0000 Date: Tue, 09 Dec 2014 15:02:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/hotplug: update systemd dependency to use service instead of socket X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 268b8f1d46d758deb635f9602b94e5826db54884 Author: Olaf Hering AuthorDate: Tue Dec 2 16:39:23 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:57:02 2014 +0000 tools/hotplug: update systemd dependency to use service instead of socket Since commit 4542ae340d75bd6319e3fcd94e6c9336e210aeef ("tools/hotplug: systemd xenstored dependencies") all service files use the .socket unit as startup dependency. While this happens to work for boot it fails for shutdown because a .socket does not seem to enforce ordering. When xendomains.service runs during shutdown then systemd will stop xenstored.service at the same time. Change all "xenstored.socket" to "xenstored.service" to let systemd know that xenstored has to be shutdown after everything else. Reported-by: Mark Pryor Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- .../hotplug/Linux/systemd/xen-init-dom0.service.in | 4 ++-- .../systemd/xen-qemu-dom0-disk-backend.service.in | 4 ++-- tools/hotplug/Linux/systemd/xenconsoled.service.in | 4 ++-- tools/hotplug/Linux/systemd/xendomains.service.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in index 4d4cb23..3befadc 100644 --- a/tools/hotplug/Linux/systemd/xen-init-dom0.service.in +++ b/tools/hotplug/Linux/systemd/xen-init-dom0.service.in @@ -1,7 +1,7 @@ [Unit] Description=xen-init-dom0, initialise Dom0 configuration (xenstore nodes, JSON configuration stub) -Requires=xenstored.socket proc-xen.mount -After=xenstored.socket proc-xen.mount +Requires=xenstored.service proc-xen.mount +After=xenstored.service proc-xen.mount ConditionPathExists=/proc/xen/capabilities [Service] diff --git a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in index 6b9c96e..0a5807a 100644 --- a/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in +++ b/tools/hotplug/Linux/systemd/xen-qemu-dom0-disk-backend.service.in @@ -1,7 +1,7 @@ [Unit] Description=qemu for xen dom0 disk backend -Requires=proc-xen.mount xenstored.socket -After=proc-xen.mount xenstored.socket xenconsoled.service +Requires=proc-xen.mount xenstored.service +After=proc-xen.mount xenstored.service xenconsoled.service Before=xendomains.service libvirtd.service libvirt-guests.service RefuseManualStop=true ConditionPathExists=/proc/xen/capabilities diff --git a/tools/hotplug/Linux/systemd/xenconsoled.service.in b/tools/hotplug/Linux/systemd/xenconsoled.service.in index 2c5d99f..cb44cd6 100644 --- a/tools/hotplug/Linux/systemd/xenconsoled.service.in +++ b/tools/hotplug/Linux/systemd/xenconsoled.service.in @@ -1,7 +1,7 @@ [Unit] Description=Xenconsoled - handles logging from guest consoles and hypervisor -Requires=proc-xen.mount xenstored.socket -After=proc-xen.mount xenstored.socket +Requires=proc-xen.mount xenstored.service +After=proc-xen.mount xenstored.service ConditionPathExists=/proc/xen/capabilities [Service] diff --git a/tools/hotplug/Linux/systemd/xendomains.service.in b/tools/hotplug/Linux/systemd/xendomains.service.in index 757278f..9962671 100644 --- a/tools/hotplug/Linux/systemd/xendomains.service.in +++ b/tools/hotplug/Linux/systemd/xendomains.service.in @@ -1,7 +1,7 @@ [Unit] Description=Xendomains - start and stop guests on boot and shutdown -Requires=proc-xen.mount xenstored.socket -After=proc-xen.mount xenstored.socket xenconsoled.service xen-init-dom0.service +Requires=proc-xen.mount xenstored.service +After=proc-xen.mount xenstored.service xenconsoled.service xen-init-dom0.service ConditionPathExists=/proc/xen/capabilities [Service] -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:02:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02: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 1XyMIs-0007ze-5j; Tue, 09 Dec 2014 15:02:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIr-0007zL-1o for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:17 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 91/59-27584-8FE07845; Tue, 09 Dec 2014 15:02:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1418137334!12404421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17054 invoked from network); 9 Dec 2014 15:02:15 -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; 9 Dec 2014 15:02:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIo-0008HN-IV for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIo-0002G4-EZ for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:14 +0000 Date: Tue, 09 Dec 2014 15:02:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gitignore: ignore some files generated by configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8df9b41855ac206c87e794e41249bad9ba72d539 Author: Daniel Kiper AuthorDate: Tue Dec 2 16:16:29 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:58:16 2014 +0000 gitignore: ignore some files generated by configure Signed-off-by: Daniel Kiper --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b24e905..2b51d5f 100644 --- a/.gitignore +++ b/.gitignore @@ -141,12 +141,15 @@ tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci tools/hotplug/common/hotplugpath.sh tools/hotplug/FreeBSD/rc.d/xencommons +tools/hotplug/Linux/init.d/sysconfig.xencommons tools/hotplug/Linux/init.d/xen-watchdog +tools/hotplug/Linux/init.d/xencommons tools/hotplug/Linux/init.d/xendomains tools/hotplug/Linux/vif-setup tools/hotplug/Linux/xen-backend.rules tools/hotplug/Linux/xen-hotplug-common.sh tools/hotplug/Linux/xendomains +tools/hotplug/NetBSD/rc.d/xencommons tools/include/xen/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:02:24 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02: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 1XyMIs-0007ze-5j; Tue, 09 Dec 2014 15:02:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIr-0007zL-1o for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:17 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 91/59-27584-8FE07845; Tue, 09 Dec 2014 15:02:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1418137334!12404421!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17054 invoked from network); 9 Dec 2014 15:02:15 -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; 9 Dec 2014 15:02:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIo-0008HN-IV for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIo-0002G4-EZ for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:14 +0000 Date: Tue, 09 Dec 2014 15:02:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gitignore: ignore some files generated by configure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8df9b41855ac206c87e794e41249bad9ba72d539 Author: Daniel Kiper AuthorDate: Tue Dec 2 16:16:29 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:58:16 2014 +0000 gitignore: ignore some files generated by configure Signed-off-by: Daniel Kiper --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index b24e905..2b51d5f 100644 --- a/.gitignore +++ b/.gitignore @@ -141,12 +141,15 @@ tools/flask/utils/flask-set-bool tools/flask/utils/flask-label-pci tools/hotplug/common/hotplugpath.sh tools/hotplug/FreeBSD/rc.d/xencommons +tools/hotplug/Linux/init.d/sysconfig.xencommons tools/hotplug/Linux/init.d/xen-watchdog +tools/hotplug/Linux/init.d/xencommons tools/hotplug/Linux/init.d/xendomains tools/hotplug/Linux/vif-setup tools/hotplug/Linux/xen-backend.rules tools/hotplug/Linux/xen-hotplug-common.sh tools/hotplug/Linux/xendomains +tools/hotplug/NetBSD/rc.d/xencommons tools/include/xen/* tools/include/xen-foreign/*.(c|h|size) tools/include/xen-foreign/checker -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:02:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJ2-00081N-8T; Tue, 09 Dec 2014 15:02:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJ1-00080y-9v for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:27 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id DD/40-24859-20F07845; Tue, 09 Dec 2014 15:02:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1418137344!9664038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4568 invoked from network); 9 Dec 2014 15:02:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:02:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIy-0008HQ-Nq for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIy-0002GX-MO for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:24 +0000 Date: Tue, 09 Dec 2014 15:02:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gitignore: group tools/hotplug files in one place X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6848e6e8f3e02db8ed32c153e96e82352110bc80 Author: Daniel Kiper AuthorDate: Tue Dec 2 16:16:30 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:58:16 2014 +0000 gitignore: group tools/hotplug files in one place Signed-off-by: Daniel Kiper --- .gitignore | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2b51d5f..8c8c06f 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,10 @@ tools/hotplug/Linux/init.d/sysconfig.xencommons tools/hotplug/Linux/init.d/xen-watchdog tools/hotplug/Linux/init.d/xencommons tools/hotplug/Linux/init.d/xendomains +tools/hotplug/Linux/systemd/*.conf +tools/hotplug/Linux/systemd/*.mount +tools/hotplug/Linux/systemd/*.socket +tools/hotplug/Linux/systemd/*.service tools/hotplug/Linux/vif-setup tools/hotplug/Linux/xen-backend.rules tools/hotplug/Linux/xen-hotplug-common.sh @@ -329,8 +333,3 @@ tools/xenstore/xenstore-watch docs/txt/misc/*.txt docs/txt/man/*.txt docs/figs/*.png - -tools/hotplug/Linux/systemd/*.conf -tools/hotplug/Linux/systemd/*.mount -tools/hotplug/Linux/systemd/*.socket -tools/hotplug/Linux/systemd/*.service -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:02:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJ2-00081N-8T; Tue, 09 Dec 2014 15:02:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJ1-00080y-9v for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:27 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id DD/40-24859-20F07845; Tue, 09 Dec 2014 15:02:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1418137344!9664038!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4568 invoked from network); 9 Dec 2014 15:02:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:02:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMIy-0008HQ-Nq for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMIy-0002GX-MO for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:24 +0000 Date: Tue, 09 Dec 2014 15:02:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] gitignore: group tools/hotplug files in one place X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6848e6e8f3e02db8ed32c153e96e82352110bc80 Author: Daniel Kiper AuthorDate: Tue Dec 2 16:16:30 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 11:58:16 2014 +0000 gitignore: group tools/hotplug files in one place Signed-off-by: Daniel Kiper --- .gitignore | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2b51d5f..8c8c06f 100644 --- a/.gitignore +++ b/.gitignore @@ -145,6 +145,10 @@ tools/hotplug/Linux/init.d/sysconfig.xencommons tools/hotplug/Linux/init.d/xen-watchdog tools/hotplug/Linux/init.d/xencommons tools/hotplug/Linux/init.d/xendomains +tools/hotplug/Linux/systemd/*.conf +tools/hotplug/Linux/systemd/*.mount +tools/hotplug/Linux/systemd/*.socket +tools/hotplug/Linux/systemd/*.service tools/hotplug/Linux/vif-setup tools/hotplug/Linux/xen-backend.rules tools/hotplug/Linux/xen-hotplug-common.sh @@ -329,8 +333,3 @@ tools/xenstore/xenstore-watch docs/txt/misc/*.txt docs/txt/man/*.txt docs/figs/*.png - -tools/hotplug/Linux/systemd/*.conf -tools/hotplug/Linux/systemd/*.mount -tools/hotplug/Linux/systemd/*.socket -tools/hotplug/Linux/systemd/*.service -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:02:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJC-000836-BC; Tue, 09 Dec 2014 15:02:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJB-00082u-IB for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:37 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 19/40-28865-C0F07845; Tue, 09 Dec 2014 15:02:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1418137355!12404533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19857 invoked from network); 9 Dec 2014 15:02:36 -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; 9 Dec 2014 15:02:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJ8-0008Hb-Vr for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJ8-0002H3-S5 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:34 +0000 Date: Tue, 09 Dec 2014 15:02:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xc: Fix multiple issues in pyxc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9592f35c49a912cd5e48c8b105d0ff575d54dfa2 Author: Andrew Cooper AuthorDate: Thu Nov 27 12:34:33 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:06:54 2014 +0000 python/xc: Fix multiple issues in pyxc_readconsolering() Don't leak a 16k allocation if PyArg_ParseTupleAndKeywords() or the first xc_readconsolering() fail. It is trivial to run throught the processes memory by repeatedly passing junk parameters to this function. In the case that the call to xc_readconsolering() in the while loop fails, reinstate str before breaking out, and passing a spurious pointer to free(). Signed-off-by: Andrew Cooper Coverity-IDs: 1054984 1055906 CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team Acked-by: Ian Campbell --- tools/python/xen/lowlevel/xc/xc.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index d95d459..f83e33d 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1089,7 +1089,7 @@ static PyObject *pyxc_readconsolering(XcObject *self, { unsigned int clear = 0, index = 0, incremental = 0; unsigned int count = 16384 + 1, size = count; - char *str = malloc(size), *ptr; + char *str, *ptr; PyObject *obj; int ret; @@ -1097,15 +1097,17 @@ static PyObject *pyxc_readconsolering(XcObject *self, if ( !PyArg_ParseTupleAndKeywords(args, kwds, "|iii", kwd_list, &clear, &index, &incremental) || - !str ) + !(str = malloc(size)) ) return NULL; ret = xc_readconsolering(self->xc_handle, str, &count, clear, incremental, &index); - if ( ret < 0 ) + if ( ret < 0 ) { + free(str); return pyxc_error_to_exception(self->xc_handle); + } - while ( !incremental && count == size ) + while ( !incremental && count == size && ret >= 0 ) { size += count - 1; if ( size < count ) @@ -1119,9 +1121,6 @@ static PyObject *pyxc_readconsolering(XcObject *self, count = size - count; ret = xc_readconsolering(self->xc_handle, str, &count, clear, 1, &index); - if ( ret < 0 ) - break; - count += str - ptr; str = ptr; } -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:02:44 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJC-000836-BC; Tue, 09 Dec 2014 15:02:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJB-00082u-IB for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:37 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 19/40-28865-C0F07845; Tue, 09 Dec 2014 15:02:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1418137355!12404533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19857 invoked from network); 9 Dec 2014 15:02:36 -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; 9 Dec 2014 15:02:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJ8-0008Hb-Vr for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJ8-0002H3-S5 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:34 +0000 Date: Tue, 09 Dec 2014 15:02:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xc: Fix multiple issues in pyxc_readconsolering() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9592f35c49a912cd5e48c8b105d0ff575d54dfa2 Author: Andrew Cooper AuthorDate: Thu Nov 27 12:34:33 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:06:54 2014 +0000 python/xc: Fix multiple issues in pyxc_readconsolering() Don't leak a 16k allocation if PyArg_ParseTupleAndKeywords() or the first xc_readconsolering() fail. It is trivial to run throught the processes memory by repeatedly passing junk parameters to this function. In the case that the call to xc_readconsolering() in the while loop fails, reinstate str before breaking out, and passing a spurious pointer to free(). Signed-off-by: Andrew Cooper Coverity-IDs: 1054984 1055906 CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team Acked-by: Ian Campbell --- tools/python/xen/lowlevel/xc/xc.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index d95d459..f83e33d 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -1089,7 +1089,7 @@ static PyObject *pyxc_readconsolering(XcObject *self, { unsigned int clear = 0, index = 0, incremental = 0; unsigned int count = 16384 + 1, size = count; - char *str = malloc(size), *ptr; + char *str, *ptr; PyObject *obj; int ret; @@ -1097,15 +1097,17 @@ static PyObject *pyxc_readconsolering(XcObject *self, if ( !PyArg_ParseTupleAndKeywords(args, kwds, "|iii", kwd_list, &clear, &index, &incremental) || - !str ) + !(str = malloc(size)) ) return NULL; ret = xc_readconsolering(self->xc_handle, str, &count, clear, incremental, &index); - if ( ret < 0 ) + if ( ret < 0 ) { + free(str); return pyxc_error_to_exception(self->xc_handle); + } - while ( !incremental && count == size ) + while ( !incremental && count == size && ret >= 0 ) { size += count - 1; if ( size < count ) @@ -1119,9 +1121,6 @@ static PyObject *pyxc_readconsolering(XcObject *self, count = size - count; ret = xc_readconsolering(self->xc_handle, str, &count, clear, 1, &index); - if ( ret < 0 ) - break; - count += str - ptr; str = ptr; } -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:02:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02: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 1XyMJM-00084v-E0; Tue, 09 Dec 2014 15:02:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJL-00084h-LN for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:47 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 55/85-02712-71F07845; Tue, 09 Dec 2014 15:02:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1418137365!13963640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5018 invoked from network); 9 Dec 2014 15:02:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:02:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJJ-0008He-4J for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJJ-0002Hw-2s for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:45 +0000 Date: Tue, 09 Dec 2014 15:02:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xs: Correct the indirection of the NULL xshandle() check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78b3afe2e5764b3ac61c46042c63619455483999 Author: Andrew Cooper AuthorDate: Thu Nov 27 12:34:34 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:06:54 2014 +0000 python/xs: Correct the indirection of the NULL xshandle() check The code now now matches its comment, and will actually catch the case of a bad xs handle. Signed-off-by: Andrew Cooper Coverity-ID: 1055948 CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team Acked-by: Ian Campbell --- tools/python/xen/lowlevel/xs/xs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/lowlevel/xs/xs.c b/tools/python/xen/lowlevel/xs/xs.c index 84e1711..ec364bb 100644 --- a/tools/python/xen/lowlevel/xs/xs.c +++ b/tools/python/xen/lowlevel/xs/xs.c @@ -816,7 +816,7 @@ static int parse_transaction_path(XsHandle *self, PyObject *args, *xh = xshandle(self); - if (!xh) + if (!*xh) return 0; if (!PyArg_ParseTuple(args, "ss", &thstr, path)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:02:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:02: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 1XyMJM-00084v-E0; Tue, 09 Dec 2014 15:02:48 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJL-00084h-LN for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:47 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 55/85-02712-71F07845; Tue, 09 Dec 2014 15:02:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1418137365!13963640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5018 invoked from network); 9 Dec 2014 15:02:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:02:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJJ-0008He-4J for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJJ-0002Hw-2s for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:45 +0000 Date: Tue, 09 Dec 2014 15:02:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xs: Correct the indirection of the NULL xshandle() check X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78b3afe2e5764b3ac61c46042c63619455483999 Author: Andrew Cooper AuthorDate: Thu Nov 27 12:34:34 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:06:54 2014 +0000 python/xs: Correct the indirection of the NULL xshandle() check The code now now matches its comment, and will actually catch the case of a bad xs handle. Signed-off-by: Andrew Cooper Coverity-ID: 1055948 CC: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team Acked-by: Ian Campbell --- tools/python/xen/lowlevel/xs/xs.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/python/xen/lowlevel/xs/xs.c b/tools/python/xen/lowlevel/xs/xs.c index 84e1711..ec364bb 100644 --- a/tools/python/xen/lowlevel/xs/xs.c +++ b/tools/python/xen/lowlevel/xs/xs.c @@ -816,7 +816,7 @@ static int parse_transaction_path(XsHandle *self, PyObject *args, *xh = xshandle(self); - if (!xh) + if (!*xh) return 0; if (!PyArg_ParseTuple(args, "ss", &thstr, path)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:03:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJW-00086l-Ge; Tue, 09 Dec 2014 15:02:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJV-00086c-Pn for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:57 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 4C/6D-29352-12F07845; Tue, 09 Dec 2014 15:02:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1418137375!12362209!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9159 invoked from network); 9 Dec 2014 15:02:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:02:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJT-0008Hq-D2 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJT-0002II-8C for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:55 +0000 Date: Tue, 09 Dec 2014 15:02:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: check in xc_get_tot_pages() that the proper domain is reported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5dcd0dcb85941bd92336e01ae3f8c44730099c96 Author: Vitaly Kuznetsov AuthorDate: Tue Dec 2 16:18:08 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 12:08:19 2014 +0000 libxc: check in xc_get_tot_pages() that the proper domain is reported XEN_DOMCTL_getdomaininfo, which is being used by xc_domain_getinfo(), has strange interface: it reports first domain which has domid >= requested domid so all callers are supposed to check that the proper domain(s) was queried by checking domid. xc_get_tot_pages() doesn't do that. In case the requested domain was destroyed it will report first domain with domid > requested domid which is apparently misleading as there is no way xc_get_tot_pages() callers can figure out that they got tot_pages for some other domain. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Don Slutz Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/libxc/xc_private.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 1c214dd..e2441ad 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -613,8 +613,10 @@ int xc_get_pfn_list(xc_interface *xch, long xc_get_tot_pages(xc_interface *xch, uint32_t domid) { xc_dominfo_t info; - return (xc_domain_getinfo(xch, domid, 1, &info) != 1) ? - -1 : info.nr_pages; + if ( (xc_domain_getinfo(xch, domid, 1, &info) != 1) || + (info.domid != domid) ) + return -1; + return info.nr_pages; } int xc_copy_to_domain_page(xc_interface *xch, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:03:04 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJW-00086l-Ge; Tue, 09 Dec 2014 15:02:58 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJV-00086c-Pn for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:57 +0000 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id 4C/6D-29352-12F07845; Tue, 09 Dec 2014 15:02:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1418137375!12362209!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9159 invoked from network); 9 Dec 2014 15:02:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:02:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJT-0008Hq-D2 for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJT-0002II-8C for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:02:55 +0000 Date: Tue, 09 Dec 2014 15:02:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: check in xc_get_tot_pages() that the proper domain is reported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5dcd0dcb85941bd92336e01ae3f8c44730099c96 Author: Vitaly Kuznetsov AuthorDate: Tue Dec 2 16:18:08 2014 +0100 Commit: Ian Campbell CommitDate: Thu Dec 4 12:08:19 2014 +0000 libxc: check in xc_get_tot_pages() that the proper domain is reported XEN_DOMCTL_getdomaininfo, which is being used by xc_domain_getinfo(), has strange interface: it reports first domain which has domid >= requested domid so all callers are supposed to check that the proper domain(s) was queried by checking domid. xc_get_tot_pages() doesn't do that. In case the requested domain was destroyed it will report first domain with domid > requested domid which is apparently misleading as there is no way xc_get_tot_pages() callers can figure out that they got tot_pages for some other domain. Signed-off-by: Vitaly Kuznetsov Reviewed-by: Don Slutz Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/libxc/xc_private.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 1c214dd..e2441ad 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -613,8 +613,10 @@ int xc_get_pfn_list(xc_interface *xch, long xc_get_tot_pages(xc_interface *xch, uint32_t domid) { xc_dominfo_t info; - return (xc_domain_getinfo(xch, domid, 1, &info) != 1) ? - -1 : info.nr_pages; + if ( (xc_domain_getinfo(xch, domid, 1, &info) != 1) || + (info.domid != domid) ) + return -1; + return info.nr_pages; } int xc_copy_to_domain_page(xc_interface *xch, -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:03:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMJh-00088l-Jf; Tue, 09 Dec 2014 15:03:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJg-00088K-4O for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:08 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id A3/DC-18267-B2F07845; Tue, 09 Dec 2014 15:03:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1418137385!12053129!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17798 invoked from network); 9 Dec 2014 15:03:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:03:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJd-0008IM-Ih for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJd-0002Is-HE for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:05 +0000 Date: Tue, 09 Dec 2014 15:03:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: Fix regression from c/s d1b93ea, attempt 2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b279811707dab4bab95c2e952e94ebf4d6badd9 Author: Boris Ostrovsky AuthorDate: Tue Nov 25 11:11:50 2014 -0500 Commit: Ian Campbell CommitDate: Thu Dec 4 12:09:21 2014 +0000 pygrub: Fix regression from c/s d1b93ea, attempt 2 c/s d1b93ea causes substantial functional regressions in pygrub's ability to parse bootloader configuration files. c/s d1b93ea itself changed an an interface which previously used exclusively integers, to using strings in the case of a grub configuration with explicit default set, along with changing the code calling the interface to require a string. The default value for "default" remained as an integer. As a result, any Extlinux or Lilo configuration (which drives this interface exclusively with integers), or Grub configuration which doesn't explicitly declare a default will die with an AttributeError when attempting to call "self.cf.default.isdigit()" where "default" is an integer. Sadly, this AttributeError gets swallowed by the blanket ignore in the loop which searches partitions for valid bootloader configurations, causing the issue to be reported as "Unable to find partition containing kernel" We should explicitly check type of "default" in image_index() and process it appropriately. Reported-by: Andrew Cooper Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub old mode 100644 new mode 100755 index aa7e562..3ec52fd --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -457,7 +457,9 @@ class Grub: self.cf.parse(buf) def image_index(self): - if self.cf.default.isdigit(): + if isinstance(self.cf.default, int): + sel = self.cf.default + elif self.cf.default.isdigit(): sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:03:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMJh-00088l-Jf; Tue, 09 Dec 2014 15:03:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJg-00088K-4O for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:08 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id A3/DC-18267-B2F07845; Tue, 09 Dec 2014 15:03:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1418137385!12053129!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17798 invoked from network); 9 Dec 2014 15:03:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:03:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJd-0008IM-Ih for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJd-0002Is-HE for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:05 +0000 Date: Tue, 09 Dec 2014 15:03:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pygrub: Fix regression from c/s d1b93ea, attempt 2 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b279811707dab4bab95c2e952e94ebf4d6badd9 Author: Boris Ostrovsky AuthorDate: Tue Nov 25 11:11:50 2014 -0500 Commit: Ian Campbell CommitDate: Thu Dec 4 12:09:21 2014 +0000 pygrub: Fix regression from c/s d1b93ea, attempt 2 c/s d1b93ea causes substantial functional regressions in pygrub's ability to parse bootloader configuration files. c/s d1b93ea itself changed an an interface which previously used exclusively integers, to using strings in the case of a grub configuration with explicit default set, along with changing the code calling the interface to require a string. The default value for "default" remained as an integer. As a result, any Extlinux or Lilo configuration (which drives this interface exclusively with integers), or Grub configuration which doesn't explicitly declare a default will die with an AttributeError when attempting to call "self.cf.default.isdigit()" where "default" is an integer. Sadly, this AttributeError gets swallowed by the blanket ignore in the loop which searches partitions for valid bootloader configurations, causing the issue to be reported as "Unable to find partition containing kernel" We should explicitly check type of "default" in image_index() and process it appropriately. Reported-by: Andrew Cooper Signed-off-by: Boris Ostrovsky Acked-by: Ian Campbell --- tools/pygrub/src/pygrub | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub old mode 100644 new mode 100755 index aa7e562..3ec52fd --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -457,7 +457,9 @@ class Grub: self.cf.parse(buf) def image_index(self): - if self.cf.default.isdigit(): + if isinstance(self.cf.default, int): + sel = self.cf.default + elif self.cf.default.isdigit(): sel = int(self.cf.default) else: # We don't fully support submenus. Look for the leaf value in -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 09 15:03:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMJr-0008AV-Mv; Tue, 09 Dec 2014 15:03:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJq-0008AK-HV for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:18 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CB/AE-28296-53F07845; Tue, 09 Dec 2014 15:03:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1418137395!9664335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12282 invoked from network); 9 Dec 2014 15:03:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:03:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJn-0008IV-PS for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJn-0002JG-NH for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:15 +0000 Date: Tue, 09 Dec 2014 15:03:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Handle platforms with edge-triggered virtual timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f688aec47c452d6aef382739d0781735672ef995 Author: Julien Grall AuthorDate: Fri Nov 28 15:17:06 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:10:45 2014 +0000 xen/arm: Handle platforms with edge-triggered virtual timer Some platforms (such as Xgene and ARMv8 models) use an edge-triggered interrupt for the virtual timer. Even if the timer output signal is masked in the context switch, the GIC will keep track that of any interrupts raised while IRQs are disabled. As soon as IRQs are re-enabled, the virtual interrupt timer will be injected to Xen. If an idle vVCPU was scheduled next then the interrupt handler doesn't expect to the receive the IRQ and will crash: (XEN) [<0000000000228388>] _spin_lock_irqsave+0x28/0x94 (PC) (XEN) [<0000000000228380>] _spin_lock_irqsave+0x20/0x94 (LR) (XEN) [<0000000000250510>] vgic_vcpu_inject_irq+0x40/0x1b0 (XEN) [<000000000024bcd0>] vtimer_interrupt+0x4c/0x54 (XEN) [<0000000000247010>] do_IRQ+0x1a4/0x220 (XEN) [<0000000000244864>] gic_interrupt+0x50/0xec (XEN) [<000000000024fbac>] do_trap_irq+0x20/0x2c (XEN) [<0000000000255240>] hyp_irq+0x5c/0x60 (XEN) [<0000000000241084>] context_switch+0xb8/0xc4 (XEN) [<000000000022482c>] schedule+0x684/0x6d0 (XEN) [<000000000022785c>] __do_softirq+0xcc/0xe8 (XEN) [<00000000002278d4>] do_softirq+0x14/0x1c (XEN) [<0000000000240fac>] idle_loop+0x134/0x154 (XEN) [<000000000024c160>] start_secondary+0x14c/0x15c (XEN) [<0000000000000001>] 0000000000000001 The proper solution is to context switch the virtual interrupt state at the GIC level. This would also avoid masking the output signal which requires specific handling in the guest OS and more complex code in Xen to deal with EOIs, and so is desirable for that reason too. Sadly, this solution requires some refactoring which would not be suitable for a freeze exception for the Xen 4.5 release. For now implement a temporary solution which ignores the virtual timer interrupt when the idle VCPU is running. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- tweaked some wording in the comment ] --- xen/arch/arm/time.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index a6436f1..0add494 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -169,6 +169,19 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { + /* + * Edge-triggered interrupts can be used for the virtual timer. Even + * if the timer output signal is masked in the context switch, the + * GIC will keep track that of any interrupts raised while IRQS are + * disabled. As soon as IRQs are re-enabled, the virtual interrupt + * will be injected to Xen. + * + * If an IDLE vCPU was scheduled next then we should ignore the + * interrupt. + */ + if ( unlikely(is_idle_vcpu(current)) ) + return; + current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:03:25 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMJr-0008AV-Mv; Tue, 09 Dec 2014 15:03:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJq-0008AK-HV for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:18 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CB/AE-28296-53F07845; Tue, 09 Dec 2014 15:03:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1418137395!9664335!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12282 invoked from network); 9 Dec 2014 15:03:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:03:17 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJn-0008IV-PS for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJn-0002JG-NH for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:15 +0000 Date: Tue, 09 Dec 2014 15:03:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Handle platforms with edge-triggered virtual timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f688aec47c452d6aef382739d0781735672ef995 Author: Julien Grall AuthorDate: Fri Nov 28 15:17:06 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:10:45 2014 +0000 xen/arm: Handle platforms with edge-triggered virtual timer Some platforms (such as Xgene and ARMv8 models) use an edge-triggered interrupt for the virtual timer. Even if the timer output signal is masked in the context switch, the GIC will keep track that of any interrupts raised while IRQs are disabled. As soon as IRQs are re-enabled, the virtual interrupt timer will be injected to Xen. If an idle vVCPU was scheduled next then the interrupt handler doesn't expect to the receive the IRQ and will crash: (XEN) [<0000000000228388>] _spin_lock_irqsave+0x28/0x94 (PC) (XEN) [<0000000000228380>] _spin_lock_irqsave+0x20/0x94 (LR) (XEN) [<0000000000250510>] vgic_vcpu_inject_irq+0x40/0x1b0 (XEN) [<000000000024bcd0>] vtimer_interrupt+0x4c/0x54 (XEN) [<0000000000247010>] do_IRQ+0x1a4/0x220 (XEN) [<0000000000244864>] gic_interrupt+0x50/0xec (XEN) [<000000000024fbac>] do_trap_irq+0x20/0x2c (XEN) [<0000000000255240>] hyp_irq+0x5c/0x60 (XEN) [<0000000000241084>] context_switch+0xb8/0xc4 (XEN) [<000000000022482c>] schedule+0x684/0x6d0 (XEN) [<000000000022785c>] __do_softirq+0xcc/0xe8 (XEN) [<00000000002278d4>] do_softirq+0x14/0x1c (XEN) [<0000000000240fac>] idle_loop+0x134/0x154 (XEN) [<000000000024c160>] start_secondary+0x14c/0x15c (XEN) [<0000000000000001>] 0000000000000001 The proper solution is to context switch the virtual interrupt state at the GIC level. This would also avoid masking the output signal which requires specific handling in the guest OS and more complex code in Xen to deal with EOIs, and so is desirable for that reason too. Sadly, this solution requires some refactoring which would not be suitable for a freeze exception for the Xen 4.5 release. For now implement a temporary solution which ignores the virtual timer interrupt when the idle VCPU is running. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- tweaked some wording in the comment ] --- xen/arch/arm/time.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index a6436f1..0add494 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -169,6 +169,19 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { + /* + * Edge-triggered interrupts can be used for the virtual timer. Even + * if the timer output signal is masked in the context switch, the + * GIC will keep track that of any interrupts raised while IRQS are + * disabled. As soon as IRQs are re-enabled, the virtual interrupt + * will be injected to Xen. + * + * If an IDLE vCPU was scheduled next then we should ignore the + * interrupt. + */ + if ( unlikely(is_idle_vcpu(current)) ) + return; + current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq); -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:03:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMK2-0008CW-RR; Tue, 09 Dec 2014 15:03:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMK1-0008C7-3l for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:29 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id AE/1E-25276-04F07845; Tue, 09 Dec 2014 15:03:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1418137406!14424804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22428 invoked from network); 9 Dec 2014 15:03:27 -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; 9 Dec 2014 15:03:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJy-0008IY-4t for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJy-0002Jg-0B for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:26 +0000 Date: Tue, 09 Dec 2014 15:03:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] systemd: use pkg-config to determine systemd library availability X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6c3d371d475a10d2ebe9351472a2ec261023d72 Author: Wei Liu AuthorDate: Tue Dec 2 15:11:30 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:17:14 2014 +0000 systemd: use pkg-config to determine systemd library availability AC_CHECK_LIB fails on Debian Jessie since the ld flag it generates is incorrect, even in the event systemd library is available. Use PKG_CHECK_MODULES instead. Tested on Debian Jessie and Arch Linux. Reported-by: Mark Pryor Signed-off-by: Wei Liu Acked-by: Ian Campbell Cc: Ian Jackson Cc: Anthony Perard Cc: Luis R. Rodriguez Cc: Mark Pryor [ ijc -- reran autogen.sh as requested ] --- m4/systemd.m4 | 12 +---- tools/configure | 149 ++++++++++++++++++++++--------------------------------- 2 files changed, 62 insertions(+), 99 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index a832d59..b04964b 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -42,13 +42,6 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ - AC_CHECK_HEADER([systemd/sd-daemon.h], [ - AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [libsystemddaemon="y"]) - ]) - AS_IF([test "x$libsystemddaemon" = x], [ - AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library]) - ]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) dnl pkg-config older than 0.24 does not set these for dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 @@ -98,9 +91,8 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ - AC_CHECK_HEADER([systemd/sd-daemon.h], [ - AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [systemd="y"]) - ]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"], + [systemd="n"]) ]) dnl Enables systemd by default and requires a --disable-systemd option flag diff --git a/tools/configure b/tools/configure index c65ad3a..b0aea0a 100755 --- a/tools/configure +++ b/tools/configure @@ -8663,116 +8663,87 @@ fi - ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" -if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 -$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } -if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsystemd-daemon $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 +$as_echo_n "checking for SYSTEMD... " >&6; } -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sd_listen_fds (); -int -main () -{ -return sd_listen_fds (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_systemd_daemon_sd_listen_fds=yes +if test -n "$SYSTEMD_CFLAGS"; then + pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_cv_lib_systemd_daemon_sd_listen_fds=no + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 -$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } -if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" = xyes; then : - systemd="y" +if test -n "$SYSTEMD_LIBS"; then + pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi - - + else + pkg_failed=untried fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "x$enable_systemd" != "xno"; then : - - if test "x$systemd" = "xy" ; then : - - -$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h - - systemd=y - - ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" -if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 -$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } -if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : - $as_echo_n "(cached) " >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsystemd-daemon $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + else + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_PKG_ERRORS" >&5 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sd_listen_fds (); -int -main () -{ -return sd_listen_fds (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_systemd_daemon_sd_listen_fds=yes + systemd="n" +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + systemd="n" else - ac_cv_lib_systemd_daemon_sd_listen_fds=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 -$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } -if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" = xyes; then : - libsystemddaemon="y" + SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS + SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + systemd="y" fi -fi + if test "x$enable_systemd" != "xno"; then : + if test "x$systemd" = "xy" ; then : - if test "x$libsystemddaemon" = x; then : - as_fn_error $? "Unable to find a suitable libsystemd-daemon library" "$LINENO" 5 +$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h -fi + systemd=y pkg_failed=no -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:03:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMK2-0008CW-RR; Tue, 09 Dec 2014 15:03:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMK1-0008C7-3l for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:29 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id AE/1E-25276-04F07845; Tue, 09 Dec 2014 15:03:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1418137406!14424804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22428 invoked from network); 9 Dec 2014 15:03:27 -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; 9 Dec 2014 15:03:27 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMJy-0008IY-4t for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMJy-0002Jg-0B for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:26 +0000 Date: Tue, 09 Dec 2014 15:03:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] systemd: use pkg-config to determine systemd library availability X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6c3d371d475a10d2ebe9351472a2ec261023d72 Author: Wei Liu AuthorDate: Tue Dec 2 15:11:30 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 4 12:17:14 2014 +0000 systemd: use pkg-config to determine systemd library availability AC_CHECK_LIB fails on Debian Jessie since the ld flag it generates is incorrect, even in the event systemd library is available. Use PKG_CHECK_MODULES instead. Tested on Debian Jessie and Arch Linux. Reported-by: Mark Pryor Signed-off-by: Wei Liu Acked-by: Ian Campbell Cc: Ian Jackson Cc: Anthony Perard Cc: Luis R. Rodriguez Cc: Mark Pryor [ ijc -- reran autogen.sh as requested ] --- m4/systemd.m4 | 12 +---- tools/configure | 149 ++++++++++++++++++++++--------------------------------- 2 files changed, 62 insertions(+), 99 deletions(-) diff --git a/m4/systemd.m4 b/m4/systemd.m4 index a832d59..b04964b 100644 --- a/m4/systemd.m4 +++ b/m4/systemd.m4 @@ -42,13 +42,6 @@ AC_DEFUN([AX_ALLOW_SYSTEMD_OPTS], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_LIBS], [ - AC_CHECK_HEADER([systemd/sd-daemon.h], [ - AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [libsystemddaemon="y"]) - ]) - AS_IF([test "x$libsystemddaemon" = x], [ - AC_MSG_ERROR([Unable to find a suitable libsystemd-daemon library]) - ]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon]) dnl pkg-config older than 0.24 does not set these for dnl PKG_CHECK_MODULES() worth also noting is that as of version 208 @@ -98,9 +91,8 @@ AC_DEFUN([AX_CHECK_SYSTEMD], [ ]) AC_DEFUN([AX_CHECK_SYSTEMD_ENABLE_AVAILABLE], [ - AC_CHECK_HEADER([systemd/sd-daemon.h], [ - AC_CHECK_LIB([systemd-daemon], [sd_listen_fds], [systemd="y"]) - ]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd-daemon], [systemd="y"], + [systemd="n"]) ]) dnl Enables systemd by default and requires a --disable-systemd option flag diff --git a/tools/configure b/tools/configure index c65ad3a..b0aea0a 100755 --- a/tools/configure +++ b/tools/configure @@ -8663,116 +8663,87 @@ fi - ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" -if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 -$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } -if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsystemd-daemon $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5 +$as_echo_n "checking for SYSTEMD... " >&6; } -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sd_listen_fds (); -int -main () -{ -return sd_listen_fds (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_systemd_daemon_sd_listen_fds=yes +if test -n "$SYSTEMD_CFLAGS"; then + pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes else - ac_cv_lib_systemd_daemon_sd_listen_fds=no + pkg_failed=yes fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + else + pkg_failed=untried fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 -$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } -if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" = xyes; then : - systemd="y" +if test -n "$SYSTEMD_LIBS"; then + pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes fi - - + else + pkg_failed=untried fi +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } - if test "x$enable_systemd" != "xno"; then : - - if test "x$systemd" = "xy" ; then : - - -$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h - - systemd=y - - ac_fn_c_check_header_mongrel "$LINENO" "systemd/sd-daemon.h" "ac_cv_header_systemd_sd_daemon_h" "$ac_includes_default" -if test "x$ac_cv_header_systemd_sd_daemon_h" = xyes; then : - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sd_listen_fds in -lsystemd-daemon" >&5 -$as_echo_n "checking for sd_listen_fds in -lsystemd-daemon... " >&6; } -if ${ac_cv_lib_systemd_daemon_sd_listen_fds+:} false; then : - $as_echo_n "(cached) " >&6 +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsystemd-daemon $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + else + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$SYSTEMD_PKG_ERRORS" >&5 -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char sd_listen_fds (); -int -main () -{ -return sd_listen_fds (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_systemd_daemon_sd_listen_fds=yes + systemd="n" +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + systemd="n" else - ac_cv_lib_systemd_daemon_sd_listen_fds=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_daemon_sd_listen_fds" >&5 -$as_echo "$ac_cv_lib_systemd_daemon_sd_listen_fds" >&6; } -if test "x$ac_cv_lib_systemd_daemon_sd_listen_fds" = xyes; then : - libsystemddaemon="y" + SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS + SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + systemd="y" fi -fi + if test "x$enable_systemd" != "xno"; then : + if test "x$systemd" = "xy" ; then : - if test "x$libsystemddaemon" = x; then : - as_fn_error $? "Unable to find a suitable libsystemd-daemon library" "$LINENO" 5 +$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h -fi + systemd=y pkg_failed=no -- generated by git-patchbot for /home/xen/git/xen.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 Dec 09 15:03:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMKB-0008EI-U4; Tue, 09 Dec 2014 15:03:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMKA-0008Dz-QB for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:39 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 20/4D-27584-A4F07845; Tue, 09 Dec 2014 15:03:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418137416!12427521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27928 invoked from network); 9 Dec 2014 15:03:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:03:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMK8-0008Ij-BK for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMK8-0002KE-9U for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:36 +0000 Date: Tue, 09 Dec 2014 15:03:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: decouple SandyBridge quirk from VTd timeout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10e7747bca538205555e313574432f231070153b Author: Don Dugger AuthorDate: Fri Dec 5 12:46:15 2014 +0100 Commit: Jan Beulich CommitDate: Fri Dec 5 12:46:15 2014 +0100 VT-d: decouple SandyBridge quirk from VTd timeout Currently the quirk code for SandyBridge uses the VTd timeout value when writing to an IGD register. This is the wrong timeout to use and, at 1000 msec., is also much too large. This patch changes the quirk code to use a timeout that is specific to the IGD device and allows the user control of the timeout. Boolean settings for the boot parameter `snb_igd_quirk' keep their current meaning, enabling or disabling the quirk code with a timeout of 1000 msec. In addition specifying `snb_igd_quirk=default' will enable the code and set the timeout to the theoretical maximum of 670 msec. For finer control, specifying `snb_igd_quirk=n', where `n' is a decimal number, will enable the code and set the timeout to `n' msec. Signed-off-by: Don Dugger Acked-by: Kevin Tian Update documentation. Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 7 ++++- xen/drivers/passthrough/vtd/quirks.c | 46 +++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 0866df2..311316a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1171,7 +1171,12 @@ Flag to enable Supervisor Mode Execution Protection Flag to enable Supervisor Mode Access Prevention ### snb\_igd\_quirk -> `= ` +> `= | cap | ` + +A true boolean value enables legacy behavior (1s timeout), while `cap` +enforces the maximum theoretically necessary timeout of 670ms. Any number +is being interpreted as a custom timeout in milliseconds. Zero or boolean +false disable the quirk workaround, which is also the default. ### sync\_console > `= ` diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 839dc45..b24fb12 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -50,6 +50,11 @@ #define IS_ILK(id) (id == 0x00408086 || id == 0x00448086 || id== 0x00628086 || id == 0x006A8086) #define IS_CPT(id) (id == 0x01008086 || id == 0x01048086) +/* SandyBridge IGD timeouts in milliseconds */ +#define SNB_IGD_TIMEOUT_LEGACY 1000 +#define SNB_IGD_TIMEOUT 670 +static unsigned int snb_igd_timeout; + static u32 __read_mostly ioh_id; static u32 __initdata igd_id; bool_t __read_mostly rwbf_quirk; @@ -158,6 +163,16 @@ static int cantiga_vtd_ops_preamble(struct iommu* iommu) * Workaround is to prevent graphics get into RC6 * state when doing VT-d IOTLB operations, do the VT-d * IOTLB operation, and then re-enable RC6 state. + * + * This quirk is enabled with the snb_igd_quirk command + * line parameter. Specifying snb_igd_quirk with no value + * (or any of the standard boolean values) enables this + * quirk and sets the timeout to the legacy timeout of + * 1000 msec. Setting this parameter to the string + * "cap" enables this quirk and sets the timeout to + * the theoretical maximum of 670 msec. Setting this + * parameter to a numerical value enables the quirk and + * sets the timeout to that numerical number of msecs. */ static void snb_vtd_ops_preamble(struct iommu* iommu) { @@ -177,7 +192,7 @@ static void snb_vtd_ops_preamble(struct iommu* iommu) start_time = NOW(); while ( (*(volatile u32 *)(igd_reg_va + 0x22AC) & 0xF) != 0 ) { - if ( NOW() > start_time + DMAR_OPERATION_TIMEOUT ) + if ( NOW() > start_time + snb_igd_timeout ) { dprintk(XENLOG_INFO VTDPREFIX, "snb_vtd_ops_preamble: failed to disable idle handshake\n"); @@ -208,13 +223,10 @@ static void snb_vtd_ops_postamble(struct iommu* iommu) * call before VT-d translation enable and IOTLB flush operations. */ -static int snb_igd_quirk; -boolean_param("snb_igd_quirk", snb_igd_quirk); - void vtd_ops_preamble_quirk(struct iommu* iommu) { cantiga_vtd_ops_preamble(iommu); - if ( snb_igd_quirk ) + if ( snb_igd_timeout != 0 ) { spin_lock(&igd_lock); @@ -228,7 +240,7 @@ void vtd_ops_preamble_quirk(struct iommu* iommu) */ void vtd_ops_postamble_quirk(struct iommu* iommu) { - if ( snb_igd_quirk ) + if ( snb_igd_timeout != 0 ) { snb_vtd_ops_postamble(iommu); @@ -237,6 +249,28 @@ void vtd_ops_postamble_quirk(struct iommu* iommu) } } +static void __init parse_snb_timeout(const char *s) +{ + int t; + + t = parse_bool(s); + if ( t < 0 ) + { + if ( *s == '\0' ) + t = SNB_IGD_TIMEOUT_LEGACY; + else if ( strcmp(s, "cap") == 0 ) + t = SNB_IGD_TIMEOUT; + else + t = strtoul(s, NULL, 0); + } + else + t = t ? SNB_IGD_TIMEOUT_LEGACY : 0; + snb_igd_timeout = MILLISECS(t); + + return; +} +custom_param("snb_igd_quirk", parse_snb_timeout); + /* 5500/5520/X58 Chipset Interrupt remapping errata, for stepping B-3. * Fixed in stepping C-2. */ static void __init tylersburg_intremap_quirk(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 Tue Dec 09 15:03:46 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 09 Dec 2014 15:03: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 1XyMKB-0008EI-U4; Tue, 09 Dec 2014 15:03:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMKA-0008Dz-QB for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:39 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 20/4D-27584-A4F07845; Tue, 09 Dec 2014 15:03:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418137416!12427521!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27928 invoked from network); 9 Dec 2014 15:03:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2014 15:03:37 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyMK8-0008Ij-BK for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyMK8-0002KE-9U for xen-changelog@lists.xensource.com; Tue, 09 Dec 2014 15:03:36 +0000 Date: Tue, 09 Dec 2014 15:03:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: decouple SandyBridge quirk from VTd timeout X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 10e7747bca538205555e313574432f231070153b Author: Don Dugger AuthorDate: Fri Dec 5 12:46:15 2014 +0100 Commit: Jan Beulich CommitDate: Fri Dec 5 12:46:15 2014 +0100 VT-d: decouple SandyBridge quirk from VTd timeout Currently the quirk code for SandyBridge uses the VTd timeout value when writing to an IGD register. This is the wrong timeout to use and, at 1000 msec., is also much too large. This patch changes the quirk code to use a timeout that is specific to the IGD device and allows the user control of the timeout. Boolean settings for the boot parameter `snb_igd_quirk' keep their current meaning, enabling or disabling the quirk code with a timeout of 1000 msec. In addition specifying `snb_igd_quirk=default' will enable the code and set the timeout to the theoretical maximum of 670 msec. For finer control, specifying `snb_igd_quirk=n', where `n' is a decimal number, will enable the code and set the timeout to `n' msec. Signed-off-by: Don Dugger Acked-by: Kevin Tian Update documentation. Signed-off-by: Jan Beulich --- docs/misc/xen-command-line.markdown | 7 ++++- xen/drivers/passthrough/vtd/quirks.c | 46 +++++++++++++++++++++++++++++---- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 0866df2..311316a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1171,7 +1171,12 @@ Flag to enable Supervisor Mode Execution Protection Flag to enable Supervisor Mode Access Prevention ### snb\_igd\_quirk -> `= ` +> `= | cap | ` + +A true boolean value enables legacy behavior (1s timeout), while `cap` +enforces the maximum theoretically necessary timeout of 670ms. Any number +is being interpreted as a custom timeout in milliseconds. Zero or boolean +false disable the quirk workaround, which is also the default. ### sync\_console > `= ` diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 839dc45..b24fb12 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -50,6 +50,11 @@ #define IS_ILK(id) (id == 0x00408086 || id == 0x00448086 || id== 0x00628086 || id == 0x006A8086) #define IS_CPT(id) (id == 0x01008086 || id == 0x01048086) +/* SandyBridge IGD timeouts in milliseconds */ +#define SNB_IGD_TIMEOUT_LEGACY 1000 +#define SNB_IGD_TIMEOUT 670 +static unsigned int snb_igd_timeout; + static u32 __read_mostly ioh_id; static u32 __initdata igd_id; bool_t __read_mostly rwbf_quirk; @@ -158,6 +163,16 @@ static int cantiga_vtd_ops_preamble(struct iommu* iommu) * Workaround is to prevent graphics get into RC6 * state when doing VT-d IOTLB operations, do the VT-d * IOTLB operation, and then re-enable RC6 state. + * + * This quirk is enabled with the snb_igd_quirk command + * line parameter. Specifying snb_igd_quirk with no value + * (or any of the standard boolean values) enables this + * quirk and sets the timeout to the legacy timeout of + * 1000 msec. Setting this parameter to the string + * "cap" enables this quirk and sets the timeout to + * the theoretical maximum of 670 msec. Setting this + * parameter to a numerical value enables the quirk and + * sets the timeout to that numerical number of msecs. */ static void snb_vtd_ops_preamble(struct iommu* iommu) { @@ -177,7 +192,7 @@ static void snb_vtd_ops_preamble(struct iommu* iommu) start_time = NOW(); while ( (*(volatile u32 *)(igd_reg_va + 0x22AC) & 0xF) != 0 ) { - if ( NOW() > start_time + DMAR_OPERATION_TIMEOUT ) + if ( NOW() > start_time + snb_igd_timeout ) { dprintk(XENLOG_INFO VTDPREFIX, "snb_vtd_ops_preamble: failed to disable idle handshake\n"); @@ -208,13 +223,10 @@ static void snb_vtd_ops_postamble(struct iommu* iommu) * call before VT-d translation enable and IOTLB flush operations. */ -static int snb_igd_quirk; -boolean_param("snb_igd_quirk", snb_igd_quirk); - void vtd_ops_preamble_quirk(struct iommu* iommu) { cantiga_vtd_ops_preamble(iommu); - if ( snb_igd_quirk ) + if ( snb_igd_timeout != 0 ) { spin_lock(&igd_lock); @@ -228,7 +240,7 @@ void vtd_ops_preamble_quirk(struct iommu* iommu) */ void vtd_ops_postamble_quirk(struct iommu* iommu) { - if ( snb_igd_quirk ) + if ( snb_igd_timeout != 0 ) { snb_vtd_ops_postamble(iommu); @@ -237,6 +249,28 @@ void vtd_ops_postamble_quirk(struct iommu* iommu) } } +static void __init parse_snb_timeout(const char *s) +{ + int t; + + t = parse_bool(s); + if ( t < 0 ) + { + if ( *s == '\0' ) + t = SNB_IGD_TIMEOUT_LEGACY; + else if ( strcmp(s, "cap") == 0 ) + t = SNB_IGD_TIMEOUT; + else + t = strtoul(s, NULL, 0); + } + else + t = t ? SNB_IGD_TIMEOUT_LEGACY : 0; + snb_igd_timeout = MILLISECS(t); + + return; +} +custom_param("snb_igd_quirk", parse_snb_timeout); + /* 5500/5520/X58 Chipset Interrupt remapping errata, for stepping B-3. * Fixed in stepping C-2. */ static void __init tylersburg_intremap_quirk(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 Dec 10 09:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 09:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xydds-0003av-G3; Wed, 10 Dec 2014 09:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddr-0003al-Pu for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:07 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 9A/B0-17694-35318845; Wed, 10 Dec 2014 09:33:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-31.messagelabs.com!1418203985!12273947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25644 invoked from network); 10 Dec 2014 09:33:06 -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; 10 Dec 2014 09:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddn-00070d-Ks for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xyddn-0007Us-I2 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:03 +0000 Message-Id: Date: Wed, 10 Dec 2014 09:33:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: do not report success if backend_create_netif() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Alexey Khoroshilov # Date 1418203359 -3600 # Node ID 078f1bb69ea5e3772f3df4b4ee21f3c52e381e51 # Parent c21bd91c271348bd589fd2519139cc2816c1d26f netback: do not report success if backend_create_netif() fails If netif_alloc() or xenbus_scanf() fail in backend_create_netif(), xenbus is left in offline mode but netback_probe() reports success. The patch implements propagation of error code for backend_create_netif(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Acked-by: Wei Liu Adjusted to XenoLinux naming. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r c21bd91c2713 -r 078f1bb69ea5 drivers/xen/netback/xenbus.c --- a/drivers/xen/netback/xenbus.c Wed Dec 10 10:18:53 2014 +0100 +++ b/drivers/xen/netback/xenbus.c Wed Dec 10 10:22:39 2014 +0100 @@ -31,7 +31,7 @@ static int connect_rings(struct backend_info *); static void connect(struct backend_info *); -static void backend_create_netif(struct backend_info *be); +static int backend_create_netif(struct backend_info *be); static void unregister_hotplug_status_watch(struct backend_info *be); static void netback_disconnect(struct device *); @@ -138,7 +138,9 @@ static int netback_probe(struct xenbus_d goto fail; /* This kicks hotplug scripts, so do it immediately. */ - backend_create_netif(be); + err = backend_create_netif(be); + if (err) + goto fail; return 0; @@ -188,7 +190,7 @@ static int netback_uevent(struct xenbus_ } -static void backend_create_netif(struct backend_info *be) +static int backend_create_netif(struct backend_info *be) { int err; long handle; @@ -196,23 +198,24 @@ static void backend_create_netif(struct netif_t *netif; if (be->netif != NULL) - return; + return 0; err = xenbus_scanf(XBT_NIL, dev->nodename, "handle", "%li", &handle); if (err != 1) { xenbus_dev_fatal(dev, err, "reading handle"); - return; + return (err < 0) ? err : -EINVAL; } netif = netif_alloc(&dev->dev, dev->otherend_id, handle); if (IS_ERR(netif)) { err = PTR_ERR(netif); xenbus_dev_fatal(dev, err, "creating interface"); - return; + return err; } be->netif = netif; kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE); + return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 10 09:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 09:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddw-0003bD-IV; Wed, 10 Dec 2014 09:33:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddu-0003b6-VP for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 51/10-08051-55318845; Wed, 10 Dec 2014 09:33:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1418203985!14030638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15473 invoked from network); 10 Dec 2014 09:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Dec 2014 09:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddn-00070c-8b for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xyddn-0007Ud-60 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:03 +0000 Message-Id: Date: Wed, 10 Dec 2014 09:33:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: don't store invalid netif pointer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1418203133 -3600 # Node ID c21bd91c271348bd589fd2519139cc2816c1d26f # Parent e8c8784ca274e2200c1b4ab9b41912acce1f33ae netback: don't store invalid netif pointer When netif_alloc() fails, it returns a non-NULL error indicator. We shouldn't store that into struct backend_info as readers of it only check for NULL. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- diff -r e8c8784ca274 -r c21bd91c2713 drivers/xen/netback/xenbus.c --- a/drivers/xen/netback/xenbus.c Tue Dec 02 12:43:21 2014 +0100 +++ b/drivers/xen/netback/xenbus.c Wed Dec 10 10:18:53 2014 +0100 @@ -193,6 +193,7 @@ static void backend_create_netif(struct int err; long handle; struct xenbus_device *dev = be->dev; + netif_t *netif; if (be->netif != NULL) return; @@ -203,13 +204,13 @@ static void backend_create_netif(struct return; } - be->netif = netif_alloc(&dev->dev, dev->otherend_id, handle); - if (IS_ERR(be->netif)) { - err = PTR_ERR(be->netif); - be->netif = NULL; + netif = netif_alloc(&dev->dev, dev->otherend_id, handle); + if (IS_ERR(netif)) { + err = PTR_ERR(netif); xenbus_dev_fatal(dev, err, "creating interface"); return; } + be->netif = netif; kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 10 09:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 09:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddw-0003bD-IV; Wed, 10 Dec 2014 09:33:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddu-0003b6-VP for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:11 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 51/10-08051-55318845; Wed, 10 Dec 2014 09:33:09 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-3.tower-27.messagelabs.com!1418203985!14030638!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15473 invoked from network); 10 Dec 2014 09:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 10 Dec 2014 09:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddn-00070c-8b for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xyddn-0007Ud-60 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:03 +0000 Message-Id: Date: Wed, 10 Dec 2014 09:33:02 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: don't store invalid netif pointer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Jan Beulich # Date 1418203133 -3600 # Node ID c21bd91c271348bd589fd2519139cc2816c1d26f # Parent e8c8784ca274e2200c1b4ab9b41912acce1f33ae netback: don't store invalid netif pointer When netif_alloc() fails, it returns a non-NULL error indicator. We shouldn't store that into struct backend_info as readers of it only check for NULL. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- diff -r e8c8784ca274 -r c21bd91c2713 drivers/xen/netback/xenbus.c --- a/drivers/xen/netback/xenbus.c Tue Dec 02 12:43:21 2014 +0100 +++ b/drivers/xen/netback/xenbus.c Wed Dec 10 10:18:53 2014 +0100 @@ -193,6 +193,7 @@ static void backend_create_netif(struct int err; long handle; struct xenbus_device *dev = be->dev; + netif_t *netif; if (be->netif != NULL) return; @@ -203,13 +204,13 @@ static void backend_create_netif(struct return; } - be->netif = netif_alloc(&dev->dev, dev->otherend_id, handle); - if (IS_ERR(be->netif)) { - err = PTR_ERR(be->netif); - be->netif = NULL; + netif = netif_alloc(&dev->dev, dev->otherend_id, handle); + if (IS_ERR(netif)) { + err = PTR_ERR(netif); xenbus_dev_fatal(dev, err, "creating interface"); return; } + be->netif = netif; kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 10 09:33:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 09:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xydds-0003av-G3; Wed, 10 Dec 2014 09:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddr-0003al-Pu for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:07 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 9A/B0-17694-35318845; Wed, 10 Dec 2014 09:33:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-16.tower-31.messagelabs.com!1418203985!12273947!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25644 invoked from network); 10 Dec 2014 09:33:06 -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; 10 Dec 2014 09:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xyddn-00070d-Ks for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xyddn-0007Us-I2 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 09:33:03 +0000 Message-Id: Date: Wed, 10 Dec 2014 09:33:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: do not report success if backend_create_netif() fails X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 Alexey Khoroshilov # Date 1418203359 -3600 # Node ID 078f1bb69ea5e3772f3df4b4ee21f3c52e381e51 # Parent c21bd91c271348bd589fd2519139cc2816c1d26f netback: do not report success if backend_create_netif() fails If netif_alloc() or xenbus_scanf() fail in backend_create_netif(), xenbus is left in offline mode but netback_probe() reports success. The patch implements propagation of error code for backend_create_netif(). Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Alexey Khoroshilov Acked-by: Wei Liu Adjusted to XenoLinux naming. Signed-off-by: Jan Beulich Committed-by: Jan Beulich --- diff -r c21bd91c2713 -r 078f1bb69ea5 drivers/xen/netback/xenbus.c --- a/drivers/xen/netback/xenbus.c Wed Dec 10 10:18:53 2014 +0100 +++ b/drivers/xen/netback/xenbus.c Wed Dec 10 10:22:39 2014 +0100 @@ -31,7 +31,7 @@ static int connect_rings(struct backend_info *); static void connect(struct backend_info *); -static void backend_create_netif(struct backend_info *be); +static int backend_create_netif(struct backend_info *be); static void unregister_hotplug_status_watch(struct backend_info *be); static void netback_disconnect(struct device *); @@ -138,7 +138,9 @@ static int netback_probe(struct xenbus_d goto fail; /* This kicks hotplug scripts, so do it immediately. */ - backend_create_netif(be); + err = backend_create_netif(be); + if (err) + goto fail; return 0; @@ -188,7 +190,7 @@ static int netback_uevent(struct xenbus_ } -static void backend_create_netif(struct backend_info *be) +static int backend_create_netif(struct backend_info *be) { int err; long handle; @@ -196,23 +198,24 @@ static void backend_create_netif(struct netif_t *netif; if (be->netif != NULL) - return; + return 0; err = xenbus_scanf(XBT_NIL, dev->nodename, "handle", "%li", &handle); if (err != 1) { xenbus_dev_fatal(dev, err, "reading handle"); - return; + return (err < 0) ? err : -EINVAL; } netif = netif_alloc(&dev->dev, dev->otherend_id, handle); if (IS_ERR(netif)) { err = PTR_ERR(netif); xenbus_dev_fatal(dev, err, "creating interface"); - return; + return err; } be->netif = netif; kobject_uevent(&dev->dev.kobj, KOBJ_ONLINE); + return 0; } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 10 11:11:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 11:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyfAk-0000lM-Do; Wed, 10 Dec 2014 11:11:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyfAi-0000kz-2c for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 11:11:08 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 06/11-09842-B4A28845; Wed, 10 Dec 2014 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1418209865!14644784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9532 invoked from network); 10 Dec 2014 11:11:06 -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; 10 Dec 2014 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyfAd-0008Va-28 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyfAc-00028M-Vs for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 11:11:03 +0000 Date: Wed, 10 Dec 2014 11:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8029dc43f4b232968168ca5bbd0ef47589243140 Author: Keir Fraser AuthorDate: Mon Dec 8 15:26:57 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 15:26:57 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db master date: 2014-12-08 14:45:46 +0100 --- xen/common/spinlock.c | 136 ++++++++++++++++++++++------------ xen/include/asm-arm/arm32/spinlock.h | 78 ------------------- xen/include/asm-arm/arm64/spinlock.h | 63 ---------------- xen/include/asm-x86/spinlock.h | 54 ------------- xen/include/xen/spinlock.h | 6 +- 5 files changed, 93 insertions(+), 244 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 575cc6d..f9f19a8 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h index ba11ad6..bc0343c 100644 --- a/xen/include/asm-arm/arm32/spinlock.h +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -55,84 +55,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h index 3a36cfd..5ae034d 100644 --- a/xen/include/asm-arm/arm64/spinlock.h +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -52,69 +52,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return !tmp; } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2 = 1; - - asm volatile( - " ldaxr %w0, %2\n" - " add %w0, %w0, #1\n" - " tbnz %w0, #31, 1f\n" - " stxr %w1, %w0, %2\n" - "1:\n" - : "=&r" (tmp), "+r" (tmp2), "+Q" (rw->lock) - : - : "cc", "memory"); - - return !tmp2; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp; - - asm volatile( - " ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - "1:\n" - : "=&r" (tmp), "+Q" (rw->lock) - : "r" (0x80000000) - : "cc", "memory"); - - return !tmp; -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2; - - asm volatile( - " 1: ldxr %w0, %2\n" - " sub %w0, %w0, #1\n" - " stlxr %w1, %w0, %2\n" - " cbnz %w1, 1b\n" - : "=&r" (tmp), "=&r" (tmp2), "+Q" (rw->lock) - : - : "cc", "memory"); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile( - " stlr %w1, %0\n" - : "=Q" (rw->lock) : "r" (0) : "memory"); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 12b0a89..eda9b2e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- 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 Dec 10 11:11:12 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 11:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyfAk-0000lM-Do; Wed, 10 Dec 2014 11:11:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyfAi-0000kz-2c for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 11:11:08 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 06/11-09842-B4A28845; Wed, 10 Dec 2014 11:11:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1418209865!14644784!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9532 invoked from network); 10 Dec 2014 11:11:06 -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; 10 Dec 2014 11:11:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyfAd-0008Va-28 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 11:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XyfAc-00028M-Vs for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 11:11:03 +0000 Date: Wed, 10 Dec 2014 11:11:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8029dc43f4b232968168ca5bbd0ef47589243140 Author: Keir Fraser AuthorDate: Mon Dec 8 15:26:57 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 15:26:57 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db master date: 2014-12-08 14:45:46 +0100 --- xen/common/spinlock.c | 136 ++++++++++++++++++++++------------ xen/include/asm-arm/arm32/spinlock.h | 78 ------------------- xen/include/asm-arm/arm64/spinlock.h | 63 ---------------- xen/include/asm-x86/spinlock.h | 54 ------------- xen/include/xen/spinlock.h | 6 +- 5 files changed, 93 insertions(+), 244 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 575cc6d..f9f19a8 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h index ba11ad6..bc0343c 100644 --- a/xen/include/asm-arm/arm32/spinlock.h +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -55,84 +55,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h index 3a36cfd..5ae034d 100644 --- a/xen/include/asm-arm/arm64/spinlock.h +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -52,69 +52,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return !tmp; } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2 = 1; - - asm volatile( - " ldaxr %w0, %2\n" - " add %w0, %w0, #1\n" - " tbnz %w0, #31, 1f\n" - " stxr %w1, %w0, %2\n" - "1:\n" - : "=&r" (tmp), "+r" (tmp2), "+Q" (rw->lock) - : - : "cc", "memory"); - - return !tmp2; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp; - - asm volatile( - " ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - "1:\n" - : "=&r" (tmp), "+Q" (rw->lock) - : "r" (0x80000000) - : "cc", "memory"); - - return !tmp; -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2; - - asm volatile( - " 1: ldxr %w0, %2\n" - " sub %w0, %w0, #1\n" - " stlxr %w1, %w0, %2\n" - " cbnz %w1, 1b\n" - : "=&r" (tmp), "=&r" (tmp2), "+Q" (rw->lock) - : - : "cc", "memory"); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile( - " stlr %w1, %0\n" - : "=Q" (rw->lock) : "r" (0) : "memory"); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 12b0a89..eda9b2e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- 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 Dec 10 18:11:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 18:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyljC-0006Iw-UM; Wed, 10 Dec 2014 18:11:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyljB-0006Ho-Pa for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 18:11:09 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id F4/D9-03148-DBC88845; Wed, 10 Dec 2014 18:11:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1418235066!14276516!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26880 invoked from network); 10 Dec 2014 18:11:07 -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 Dec 2014 18:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xylj5-0006Ka-6F for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 18:11:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xylj5-00012d-39 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 18:11:03 +0000 Date: Wed, 10 Dec 2014 18:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db Author: Keir Fraser AuthorDate: Mon Dec 8 14:45:46 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 14:45:46 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/spinlock.c | 136 ++++++++++++++++++++++------------ xen/include/asm-arm/arm32/spinlock.h | 78 ------------------- xen/include/asm-arm/arm64/spinlock.h | 63 ---------------- xen/include/asm-x86/spinlock.h | 54 ------------- xen/include/xen/spinlock.h | 6 +- 5 files changed, 93 insertions(+), 244 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 575cc6d..f9f19a8 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h index ba11ad6..bc0343c 100644 --- a/xen/include/asm-arm/arm32/spinlock.h +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -55,84 +55,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h index 04300bc..5ae034d 100644 --- a/xen/include/asm-arm/arm64/spinlock.h +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -52,69 +52,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return !tmp; } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2 = 1; - - asm volatile( - " ldaxr %w0, %2\n" - " add %w0, %w0, #1\n" - " tbnz %w0, #31, 1f\n" - " stxr %w1, %w0, %2\n" - "1:\n" - : "=&r" (tmp), "+r" (tmp2), "+Q" (rw->lock) - : - : "memory"); - - return !tmp2; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp; - - asm volatile( - " ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - "1:\n" - : "=&r" (tmp), "+Q" (rw->lock) - : "r" (0x80000000) - : "memory"); - - return !tmp; -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2; - - asm volatile( - " 1: ldxr %w0, %2\n" - " sub %w0, %w0, #1\n" - " stlxr %w1, %w0, %2\n" - " cbnz %w1, 1b\n" - : "=&r" (tmp), "=&r" (tmp2), "+Q" (rw->lock) - : - : "memory"); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile( - " stlr %w1, %0\n" - : "=Q" (rw->lock) : "r" (0) : "memory"); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 12b0a89..eda9b2e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- generated by git-patchbot for /home/xen/git/xen.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 Dec 10 18:11:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 10 Dec 2014 18:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyljC-0006Iw-UM; Wed, 10 Dec 2014 18:11:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XyljB-0006Ho-Pa for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 18:11:09 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id F4/D9-03148-DBC88845; Wed, 10 Dec 2014 18:11:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1418235066!14276516!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26880 invoked from network); 10 Dec 2014 18:11:07 -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 Dec 2014 18:11:07 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xylj5-0006Ka-6F for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 18:11:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Xylj5-00012d-39 for xen-changelog@lists.xensource.com; Wed, 10 Dec 2014 18:11:03 +0000 Date: Wed, 10 Dec 2014 18:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db Author: Keir Fraser AuthorDate: Mon Dec 8 14:45:46 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 14:45:46 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/common/spinlock.c | 136 ++++++++++++++++++++++------------ xen/include/asm-arm/arm32/spinlock.h | 78 ------------------- xen/include/asm-arm/arm64/spinlock.h | 63 ---------------- xen/include/asm-x86/spinlock.h | 54 ------------- xen/include/xen/spinlock.h | 6 +- 5 files changed, 93 insertions(+), 244 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index 575cc6d..f9f19a8 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h index ba11ad6..bc0343c 100644 --- a/xen/include/asm-arm/arm32/spinlock.h +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -55,84 +55,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h index 04300bc..5ae034d 100644 --- a/xen/include/asm-arm/arm64/spinlock.h +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -52,69 +52,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return !tmp; } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2 = 1; - - asm volatile( - " ldaxr %w0, %2\n" - " add %w0, %w0, #1\n" - " tbnz %w0, #31, 1f\n" - " stxr %w1, %w0, %2\n" - "1:\n" - : "=&r" (tmp), "+r" (tmp2), "+Q" (rw->lock) - : - : "memory"); - - return !tmp2; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp; - - asm volatile( - " ldaxr %w0, %1\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, %1\n" - "1:\n" - : "=&r" (tmp), "+Q" (rw->lock) - : "r" (0x80000000) - : "memory"); - - return !tmp; -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2; - - asm volatile( - " 1: ldxr %w0, %2\n" - " sub %w0, %w0, #1\n" - " stlxr %w1, %w0, %2\n" - " cbnz %w1, 1b\n" - : "=&r" (tmp), "=&r" (tmp2), "+Q" (rw->lock) - : - : "memory"); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile( - " stlr %w1, %0\n" - : "=Q" (rw->lock) : "r" (0) : "memory"); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 12b0a89..eda9b2e 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 11 22:55:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdc-0002nZ-H9; Thu, 11 Dec 2014 22:55:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdb-0002nU-D7 for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:11 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id BB/73-25547-EC02A845; Thu, 11 Dec 2014 22:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1418338508!10317948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25618 invoked from network); 11 Dec 2014 22:55:09 -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; 11 Dec 2014 22:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdY-0003DK-0U for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCdX-0007XA-UR for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:07 +0000 Date: Thu, 11 Dec 2014 22:55:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] adjust number of domains in cpupools when destroying 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 c4ca9ef8864e3649cd1d8063356f92471f3760ee Author: Juergen Gross AuthorDate: Wed Dec 10 12:20:40 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:20:40 2014 +0100 adjust number of domains in cpupools when destroying domain Commit bac6334b51d9bcfe57ecf4a4cb5288348fcf044a (move domain to cpupool0 before destroying it) introduced an error in the accounting of cpupools regarding the number of domains. The number of domains is nor adjusted when a domain is moved to cpupool0 in kill_domain(). Correct this by introducing a cpupool function doing the move instead of open coding it by calling sched_move_domain(). Reported-by: Dietmar Hahn Signed-off-by: Juergen Gross Tested-by: Dietmar Hahn Reviewed-by: Andrew Cooper Acked-by: George Dunlap master commit: 934e7baa6c12d19cfaf24e8f8e27d6c6a8b8c5e4 master date: 2014-11-12 12:39:58 +0100 --- xen/common/cpupool.c | 47 +++++++++++++++++++++++++++++++++-------------- xen/common/domain.c | 2 +- xen/include/xen/sched.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index e46e930..53a1394 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -225,6 +225,35 @@ static int cpupool_destroy(struct cpupool *c) } /* + * Move domain to another cpupool + */ +static int cpupool_move_domain_locked(struct domain *d, struct cpupool *c) +{ + int ret; + + d->cpupool->n_dom--; + ret = sched_move_domain(d, c); + if ( ret ) + d->cpupool->n_dom++; + else + c->n_dom++; + + return ret; +} +int cpupool_move_domain(struct domain *d, struct cpupool *c) +{ + int ret; + + spin_lock(&cpupool_lock); + + ret = cpupool_move_domain_locked(d, c); + + spin_unlock(&cpupool_lock); + + return ret; +} + +/* * assign a specific cpu to a cpupool * cpupool_lock must be held */ @@ -338,14 +367,9 @@ int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) ret = -EBUSY; break; } - c->n_dom--; - ret = sched_move_domain(d, cpupool0); + ret = cpupool_move_domain_locked(d, cpupool0); if ( ret ) - { - c->n_dom++; break; - } - cpupool0->n_dom++; } rcu_read_unlock(&domlist_read_lock); if ( ret ) @@ -613,16 +637,11 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) d->domain_id, op->cpupool_id); ret = -ENOENT; spin_lock(&cpupool_lock); + c = cpupool_find_by_id(op->cpupool_id); if ( (c != NULL) && cpumask_weight(c->cpu_valid) ) - { - d->cpupool->n_dom--; - ret = sched_move_domain(d, c); - if ( ret ) - d->cpupool->n_dom++; - else - c->n_dom++; - } + ret = cpupool_move_domain_locked(d, c); + spin_unlock(&cpupool_lock); cpupool_dprintk("cpupool move_domain(dom=%d)->pool=%d ret %d\n", d->domain_id, op->cpupool_id, ret); diff --git a/xen/common/domain.c b/xen/common/domain.c index f050af5..b6601a3 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -538,7 +538,7 @@ int domain_kill(struct domain *d) { break; } - if ( sched_move_domain(d, cpupool0) ) + if ( cpupool_move_domain(d, cpupool0) ) return -EAGAIN; for_each_vcpu ( d, v ) unmap_vcpu_info(v); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 4418883..996a08a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -828,6 +828,7 @@ struct cpupool *cpupool_get_by_id(int poolid); void cpupool_put(struct cpupool *pool); int cpupool_add_domain(struct domain *d, int poolid); void cpupool_rm_domain(struct domain *d); +int cpupool_move_domain(struct domain *d, struct cpupool *c); int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op); void schedule_dump(struct cpupool *c); extern void dump_runq(unsigned char key); -- 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 Dec 11 22:55:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdc-0002nZ-H9; Thu, 11 Dec 2014 22:55:12 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdb-0002nU-D7 for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:11 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id BB/73-25547-EC02A845; Thu, 11 Dec 2014 22:55:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1418338508!10317948!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25618 invoked from network); 11 Dec 2014 22:55:09 -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; 11 Dec 2014 22:55:09 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdY-0003DK-0U for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCdX-0007XA-UR for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:07 +0000 Date: Thu, 11 Dec 2014 22:55:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] adjust number of domains in cpupools when destroying 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 c4ca9ef8864e3649cd1d8063356f92471f3760ee Author: Juergen Gross AuthorDate: Wed Dec 10 12:20:40 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:20:40 2014 +0100 adjust number of domains in cpupools when destroying domain Commit bac6334b51d9bcfe57ecf4a4cb5288348fcf044a (move domain to cpupool0 before destroying it) introduced an error in the accounting of cpupools regarding the number of domains. The number of domains is nor adjusted when a domain is moved to cpupool0 in kill_domain(). Correct this by introducing a cpupool function doing the move instead of open coding it by calling sched_move_domain(). Reported-by: Dietmar Hahn Signed-off-by: Juergen Gross Tested-by: Dietmar Hahn Reviewed-by: Andrew Cooper Acked-by: George Dunlap master commit: 934e7baa6c12d19cfaf24e8f8e27d6c6a8b8c5e4 master date: 2014-11-12 12:39:58 +0100 --- xen/common/cpupool.c | 47 +++++++++++++++++++++++++++++++++-------------- xen/common/domain.c | 2 +- xen/include/xen/sched.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index e46e930..53a1394 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -225,6 +225,35 @@ static int cpupool_destroy(struct cpupool *c) } /* + * Move domain to another cpupool + */ +static int cpupool_move_domain_locked(struct domain *d, struct cpupool *c) +{ + int ret; + + d->cpupool->n_dom--; + ret = sched_move_domain(d, c); + if ( ret ) + d->cpupool->n_dom++; + else + c->n_dom++; + + return ret; +} +int cpupool_move_domain(struct domain *d, struct cpupool *c) +{ + int ret; + + spin_lock(&cpupool_lock); + + ret = cpupool_move_domain_locked(d, c); + + spin_unlock(&cpupool_lock); + + return ret; +} + +/* * assign a specific cpu to a cpupool * cpupool_lock must be held */ @@ -338,14 +367,9 @@ int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) ret = -EBUSY; break; } - c->n_dom--; - ret = sched_move_domain(d, cpupool0); + ret = cpupool_move_domain_locked(d, cpupool0); if ( ret ) - { - c->n_dom++; break; - } - cpupool0->n_dom++; } rcu_read_unlock(&domlist_read_lock); if ( ret ) @@ -613,16 +637,11 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) d->domain_id, op->cpupool_id); ret = -ENOENT; spin_lock(&cpupool_lock); + c = cpupool_find_by_id(op->cpupool_id); if ( (c != NULL) && cpumask_weight(c->cpu_valid) ) - { - d->cpupool->n_dom--; - ret = sched_move_domain(d, c); - if ( ret ) - d->cpupool->n_dom++; - else - c->n_dom++; - } + ret = cpupool_move_domain_locked(d, c); + spin_unlock(&cpupool_lock); cpupool_dprintk("cpupool move_domain(dom=%d)->pool=%d ret %d\n", d->domain_id, op->cpupool_id, ret); diff --git a/xen/common/domain.c b/xen/common/domain.c index f050af5..b6601a3 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -538,7 +538,7 @@ int domain_kill(struct domain *d) { break; } - if ( sched_move_domain(d, cpupool0) ) + if ( cpupool_move_domain(d, cpupool0) ) return -EAGAIN; for_each_vcpu ( d, v ) unmap_vcpu_info(v); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 4418883..996a08a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -828,6 +828,7 @@ struct cpupool *cpupool_get_by_id(int poolid); void cpupool_put(struct cpupool *pool); int cpupool_add_domain(struct domain *d, int poolid); void cpupool_rm_domain(struct domain *d); +int cpupool_move_domain(struct domain *d, struct cpupool *c); int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op); void schedule_dump(struct cpupool *c); extern void dump_runq(unsigned char key); -- 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 Dec 11 22:55:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55: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 1XzCdl-0002o1-MC; Thu, 11 Dec 2014 22:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdk-0002nh-NA for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:20 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id A0/31-22737-8D02A845; Thu, 11 Dec 2014 22:55:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1418338518!12899692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14573 invoked from network); 11 Dec 2014 22:55:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2014 22:55:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdi-0003DQ-89 for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCdi-0007XY-4W for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:18 +0000 Date: Thu, 11 Dec 2014 22:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: (allow to) override LIST_POISON* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2cf20efda62a0ea83c6a9e97fba19100df200d6 Author: Jan Beulich AuthorDate: Wed Dec 10 12:22:00 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:22:00 2014 +0100 x86: (allow to) override LIST_POISON* Having these point into space not controlled by the hypervisor provides an unnecessary attack surface. Allow architectures to override them and utilize that override to make them non-canonical addresses (thus causing #GP rather than #PF when dereferenced). Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 404227138e1e49c8073e946649a8d4173b35625c master date: 2014-11-17 15:05:53 +0100 --- xen/include/asm-x86/config.h | 4 ++++ xen/include/xen/list.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 99d0e2c..3f7f852 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -101,6 +101,10 @@ /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) +/* Override include/xen/list.h to make these non-canonical addresses. */ +#define LIST_POISON1 ((void *)0x0100100100100100UL) +#define LIST_POISON2 ((void *)0x0200200200200200UL) + #ifndef __ASSEMBLY__ extern unsigned long trampoline_phys; #define bootsym_phys(sym) \ diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h index 792eda3..9768fee 100644 --- a/xen/include/xen/list.h +++ b/xen/include/xen/list.h @@ -10,12 +10,15 @@ #include #include -/* These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses - * non-initialized list entries. +/* + * These are non-NULL pointers that will result in faults under normal + * circumstances, used to verify that nobody uses non-initialized list + * entries. Architectures can override these. */ +#ifndef LIST_POISON1 #define LIST_POISON1 ((void *) 0x00100100) #define LIST_POISON2 ((void *) 0x00200200) +#endif /* * Simple doubly linked list implementation. -- 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 Dec 11 22:55:21 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55: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 1XzCdl-0002o1-MC; Thu, 11 Dec 2014 22:55:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdk-0002nh-NA for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:20 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id A0/31-22737-8D02A845; Thu, 11 Dec 2014 22:55:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1418338518!12899692!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14573 invoked from network); 11 Dec 2014 22:55:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2014 22:55:19 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdi-0003DQ-89 for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCdi-0007XY-4W for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:18 +0000 Date: Thu, 11 Dec 2014 22:55:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: (allow to) override LIST_POISON* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d2cf20efda62a0ea83c6a9e97fba19100df200d6 Author: Jan Beulich AuthorDate: Wed Dec 10 12:22:00 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:22:00 2014 +0100 x86: (allow to) override LIST_POISON* Having these point into space not controlled by the hypervisor provides an unnecessary attack surface. Allow architectures to override them and utilize that override to make them non-canonical addresses (thus causing #GP rather than #PF when dereferenced). Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 404227138e1e49c8073e946649a8d4173b35625c master date: 2014-11-17 15:05:53 +0100 --- xen/include/asm-x86/config.h | 4 ++++ xen/include/xen/list.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 99d0e2c..3f7f852 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -101,6 +101,10 @@ /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) +/* Override include/xen/list.h to make these non-canonical addresses. */ +#define LIST_POISON1 ((void *)0x0100100100100100UL) +#define LIST_POISON2 ((void *)0x0200200200200200UL) + #ifndef __ASSEMBLY__ extern unsigned long trampoline_phys; #define bootsym_phys(sym) \ diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h index 792eda3..9768fee 100644 --- a/xen/include/xen/list.h +++ b/xen/include/xen/list.h @@ -10,12 +10,15 @@ #include #include -/* These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses - * non-initialized list entries. +/* + * These are non-NULL pointers that will result in faults under normal + * circumstances, used to verify that nobody uses non-initialized list + * entries. Architectures can override these. */ +#ifndef LIST_POISON1 #define LIST_POISON1 ((void *) 0x00100100) #define LIST_POISON2 ((void *) 0x00200200) +#endif /* * Simple doubly linked list implementation. -- 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 Dec 11 22:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdw-0002pN-6w; Thu, 11 Dec 2014 22:55:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdv-0002pD-4F for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:31 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id CA/78-02953-2E02A845; Thu, 11 Dec 2014 22:55:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1418338528!14565251!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27119 invoked from network); 11 Dec 2014 22:55:29 -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; 11 Dec 2014 22:55:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCds-0003De-ET for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCds-0007YQ-Cg for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:28 +0000 Date: Thu, 11 Dec 2014 22:55:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: allow retry of ExitBootServices() call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa0e8fead76fd4974cee221bc42943c0e42fe8cf Author: Jan Beulich AuthorDate: Wed Dec 10 12:26:56 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:26:56 2014 +0100 EFI: allow retry of ExitBootServices() call The specification is kind of vague under what conditions ExitBootServices() may legitimately fail, requiring the OS loader to retry: "If MapKey value is incorrect, ExitBootServices() returns EFI_INVALID_PARAMETER and GetMemoryMap() with ExitBootServices() must be called again. Firmware implementation may choose to do a partial shutdown of the boot services during the first call to ExitBootServices(). EFI OS loader should not make calls to any boot service function other then GetMemoryMap() after the first call to ExitBootServices()." While our code guarantees the map key to be valid, there are systems where a firmware internal notification sent while processing ExitBootServices() reportedly results in changes to the memory map. In that case, make a best effort second try: Avoid any boot service calls other than the two named above, with the possible exception of error paths. Those aren't a problem, since if we end up needing to retry, we're hosed when something goes wrong as much as if we didn't make the retry attempt. For x86, a minimal adjustment to efi_arch_process_memory_map() is needed for it to cope with potentially being called a second time. For arm64, while efi_process_memory_map_bootinfo() is easy to verify that it can safely be called more than once without violating spec constraints, it's not so obvious for fdt_add_uefi_nodes(), hence a step by step approach: - deletion of memory nodes and memory reserve map entries: the 2nd pass shouldn't find any as the 1st one deleted them all, - a "chosen" node should be found as it got added in the 1st pass, - the various "linux,uefi-*" nodes all got added during the 1st pass and hence only their contents may get updated. Signed-off-by: Jan Beulich Reviewed-by: Roy Franz master commit: 0540b854f6733759593e829bc3f13c9b45974e32 master date: 2014-11-17 15:07:03 +0100 --- xen/arch/x86/efi/boot.c | 121 +++++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 56 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index a14d1b1..de240f8 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -782,9 +782,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - struct e820entry *e; u64 efer; - bool_t base_video = 0; + bool_t base_video = 0, retry; efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; @@ -1387,68 +1386,78 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( mbi.mem_upper < xen_phys_start ) blexit(L"Out of static memory"); efi_memmap = (void *)(long)mbi.mem_upper; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); - if ( EFI_ERROR(status) ) - blexit(L"Cannot obtain memory map"); - - /* Populate E820 table and check trampoline area availability. */ - e = e820map - 1; - for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) + for ( retry = 0; ; retry = 1 ) { - EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; - u32 type; + struct e820entry *e; + + status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, + &efi_mdesc_size, &mdesc_ver); + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot obtain memory map", status); - switch ( desc->Type ) + /* Populate E820 table and check trampoline area availability. */ + e = e820map - 1; + for ( e820nr = i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: - case EfiBootServicesCode: - case EfiBootServicesData: - if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && - len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) - cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; - /* fall through */ - case EfiLoaderCode: - case EfiLoaderData: - if ( desc->Attribute & EFI_MEMORY_WB ) - type = E820_RAM; + EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; + u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; + u32 type; + + switch ( desc->Type ) + { + default: + type = E820_RESERVED; + break; + case EfiConventionalMemory: + case EfiBootServicesCode: + case EfiBootServicesData: + if ( !trampoline_phys && + desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && + desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & + PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: + if ( desc->Attribute & EFI_MEMORY_WB ) + type = E820_RAM; + else + case EfiUnusableMemory: + type = E820_UNUSABLE; + break; + case EfiACPIReclaimMemory: + type = E820_ACPI; + break; + case EfiACPIMemoryNVS: + type = E820_NVS; + break; + } + if ( e820nr && type == e->type && + desc->PhysicalStart == e->addr + e->size ) + e->size += len; + else if ( !len || e820nr >= E820MAX ) + continue; else - case EfiUnusableMemory: - type = E820_UNUSABLE; - break; - case EfiACPIReclaimMemory: - type = E820_ACPI; - break; - case EfiACPIMemoryNVS: - type = E820_NVS; - break; + { + ++e; + e->addr = desc->PhysicalStart; + e->size = len; + e->type = type; + ++e820nr; + } } - if ( e820nr && type == e->type && - desc->PhysicalStart == e->addr + e->size ) - e->size += len; - else if ( !len || e820nr >= E820MAX ) - continue; - else + if ( !trampoline_phys ) { - ++e; - e->addr = desc->PhysicalStart; - e->size = len; - e->type = type; - ++e820nr; + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); } - } - if ( !trampoline_phys ) - { - if ( !cfg.addr ) - blexit(L"No memory for trampoline"); - relocate_trampoline(cfg.addr); - } - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = efi_bs->ExitBootServices(ImageHandle, map_key); + if ( status != EFI_INVALID_PARAMETER || retry ) + break; + } if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot exit boot services", status); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 11 22:55:32 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdw-0002pN-6w; Thu, 11 Dec 2014 22:55:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCdv-0002pD-4F for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:31 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id CA/78-02953-2E02A845; Thu, 11 Dec 2014 22:55:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1418338528!14565251!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27119 invoked from network); 11 Dec 2014 22:55:29 -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; 11 Dec 2014 22:55:29 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCds-0003De-ET for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCds-0007YQ-Cg for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:28 +0000 Date: Thu, 11 Dec 2014 22:55:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] EFI: allow retry of ExitBootServices() call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fa0e8fead76fd4974cee221bc42943c0e42fe8cf Author: Jan Beulich AuthorDate: Wed Dec 10 12:26:56 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:26:56 2014 +0100 EFI: allow retry of ExitBootServices() call The specification is kind of vague under what conditions ExitBootServices() may legitimately fail, requiring the OS loader to retry: "If MapKey value is incorrect, ExitBootServices() returns EFI_INVALID_PARAMETER and GetMemoryMap() with ExitBootServices() must be called again. Firmware implementation may choose to do a partial shutdown of the boot services during the first call to ExitBootServices(). EFI OS loader should not make calls to any boot service function other then GetMemoryMap() after the first call to ExitBootServices()." While our code guarantees the map key to be valid, there are systems where a firmware internal notification sent while processing ExitBootServices() reportedly results in changes to the memory map. In that case, make a best effort second try: Avoid any boot service calls other than the two named above, with the possible exception of error paths. Those aren't a problem, since if we end up needing to retry, we're hosed when something goes wrong as much as if we didn't make the retry attempt. For x86, a minimal adjustment to efi_arch_process_memory_map() is needed for it to cope with potentially being called a second time. For arm64, while efi_process_memory_map_bootinfo() is easy to verify that it can safely be called more than once without violating spec constraints, it's not so obvious for fdt_add_uefi_nodes(), hence a step by step approach: - deletion of memory nodes and memory reserve map entries: the 2nd pass shouldn't find any as the 1st one deleted them all, - a "chosen" node should be found as it got added in the 1st pass, - the various "linux,uefi-*" nodes all got added during the 1st pass and hence only their contents may get updated. Signed-off-by: Jan Beulich Reviewed-by: Roy Franz master commit: 0540b854f6733759593e829bc3f13c9b45974e32 master date: 2014-11-17 15:07:03 +0100 --- xen/arch/x86/efi/boot.c | 121 +++++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 56 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index a14d1b1..de240f8 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -782,9 +782,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - struct e820entry *e; u64 efer; - bool_t base_video = 0; + bool_t base_video = 0, retry; efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; @@ -1387,68 +1386,78 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( mbi.mem_upper < xen_phys_start ) blexit(L"Out of static memory"); efi_memmap = (void *)(long)mbi.mem_upper; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); - if ( EFI_ERROR(status) ) - blexit(L"Cannot obtain memory map"); - - /* Populate E820 table and check trampoline area availability. */ - e = e820map - 1; - for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) + for ( retry = 0; ; retry = 1 ) { - EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; - u32 type; + struct e820entry *e; + + status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, + &efi_mdesc_size, &mdesc_ver); + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot obtain memory map", status); - switch ( desc->Type ) + /* Populate E820 table and check trampoline area availability. */ + e = e820map - 1; + for ( e820nr = i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: - case EfiBootServicesCode: - case EfiBootServicesData: - if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && - len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) - cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; - /* fall through */ - case EfiLoaderCode: - case EfiLoaderData: - if ( desc->Attribute & EFI_MEMORY_WB ) - type = E820_RAM; + EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; + u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; + u32 type; + + switch ( desc->Type ) + { + default: + type = E820_RESERVED; + break; + case EfiConventionalMemory: + case EfiBootServicesCode: + case EfiBootServicesData: + if ( !trampoline_phys && + desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && + desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & + PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: + if ( desc->Attribute & EFI_MEMORY_WB ) + type = E820_RAM; + else + case EfiUnusableMemory: + type = E820_UNUSABLE; + break; + case EfiACPIReclaimMemory: + type = E820_ACPI; + break; + case EfiACPIMemoryNVS: + type = E820_NVS; + break; + } + if ( e820nr && type == e->type && + desc->PhysicalStart == e->addr + e->size ) + e->size += len; + else if ( !len || e820nr >= E820MAX ) + continue; else - case EfiUnusableMemory: - type = E820_UNUSABLE; - break; - case EfiACPIReclaimMemory: - type = E820_ACPI; - break; - case EfiACPIMemoryNVS: - type = E820_NVS; - break; + { + ++e; + e->addr = desc->PhysicalStart; + e->size = len; + e->type = type; + ++e820nr; + } } - if ( e820nr && type == e->type && - desc->PhysicalStart == e->addr + e->size ) - e->size += len; - else if ( !len || e820nr >= E820MAX ) - continue; - else + if ( !trampoline_phys ) { - ++e; - e->addr = desc->PhysicalStart; - e->size = len; - e->type = type; - ++e820nr; + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); } - } - if ( !trampoline_phys ) - { - if ( !cfg.addr ) - blexit(L"No memory for trampoline"); - relocate_trampoline(cfg.addr); - } - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = efi_bs->ExitBootServices(ImageHandle, map_key); + if ( status != EFI_INVALID_PARAMETER || retry ) + break; + } if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot exit boot services", status); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 11 22:55:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeH-0002rc-AV; Thu, 11 Dec 2014 22:55:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeF-0002rO-Fb for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:51 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 5D/4A-02699-6F02A845; Thu, 11 Dec 2014 22:55:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1418338548!14562220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14479 invoked from network); 11 Dec 2014 22:55:49 -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; 11 Dec 2014 22:55:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeC-0003Dr-Pp for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCeC-0007ZC-Og for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:48 +0000 Date: Thu, 11 Dec 2014 22:55:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: don't crash guest upon problems occurring in user 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 de6313ab40a2858693609338db935cb689380361 Author: Jan Beulich AuthorDate: Wed Dec 10 12:30:15 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:30:15 2014 +0100 x86/HVM: don't crash guest upon problems occurring in user mode This extends commit 5283b310 ("x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode") to a few more cases, including the failed VM entry one that XSA-110 was needed to be issued for. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper x86/HVM: prevent infinite VM entry retries This reverts the VMX side of commit 28b4baac ("x86/HVM: don't crash guest upon problems occurring in user mode") and gets SVM in line with the resulting VMX behavior. This is because Andrew validly says "A failed vmentry is overwhelmingly likely to be caused by corrupt VMC[SB] state. As a result, injecting a fault and retrying the the vmentry is likely to fail in the same way." Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: 28b4baacd599e8c10e6dac055f6a939bb730fb8a master date: 2014-11-25 10:08:57 +0100 master commit: 04ae2f6837b35bcfb689baf15f493da626929fb5 master date: 2014-12-02 12:48:01 +0100 --- xen/arch/x86/hvm/svm/svm.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index cb8f44f..db40c84 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -90,6 +90,15 @@ static bool_t amd_erratum383_found __read_mostly; static uint64_t osvw_length, osvw_status; static DEFINE_SPINLOCK(osvw_lock); +/* Only crash the guest if the problem originates in kernel mode. */ +static void svm_crash_or_fault(struct vcpu *v) +{ + if ( vmcb_get_cpl(v->arch.hvm_svm.vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) { struct vcpu *curr = current; @@ -100,7 +109,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len > 15) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); - domain_crash(curr->domain); + svm_crash_or_fault(curr); return; } @@ -2152,8 +2161,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) goto out; case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_vmexit() error\n"); - goto exit_and_crash; - + domain_crash(v->domain); + goto out; default: BUG(); case NESTEDHVM_VMEXIT_ERROR: @@ -2166,18 +2175,22 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_check_intercepts() error\n"); - goto exit_and_crash; + domain_crash(v->domain); + goto out; default: gdprintk(XENLOG_INFO, "nestedsvm_check_intercepts() returned %i\n", nsret); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } } if ( unlikely(exit_reason == VMEXIT_INVALID) ) { + gdprintk(XENLOG_ERR, "invalid VMCB state:\n"); svm_vmcb_dump(__func__, vmcb); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } perfc_incra(svmexits, exit_reason); @@ -2212,13 +2225,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; /* AMD Vol2, 15.11: INT3, INTO, BOUND intercepts do not update RIP. */ if ( (inst_len = __get_instruction_length(v, INSTR_INT3)) == 0 ) break; @@ -2455,16 +2468,12 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; default: - exit_and_crash: + unexpected_exit_type: gdprintk(XENLOG_ERR, "unexpected VMEXIT: exit reason = %#"PRIx64", " "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - if ( vmcb_get_cpl(vmcb) ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); + svm_crash_or_fault(v); break; } -- 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 Dec 11 22:55:53 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22:55:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeH-0002rc-AV; Thu, 11 Dec 2014 22:55:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeF-0002rO-Fb for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:51 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 5D/4A-02699-6F02A845; Thu, 11 Dec 2014 22:55:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1418338548!14562220!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14479 invoked from network); 11 Dec 2014 22:55:49 -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; 11 Dec 2014 22:55:49 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeC-0003Dr-Pp for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCeC-0007ZC-Og for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:48 +0000 Date: Thu, 11 Dec 2014 22:55:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: don't crash guest upon problems occurring in user 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 de6313ab40a2858693609338db935cb689380361 Author: Jan Beulich AuthorDate: Wed Dec 10 12:30:15 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:30:15 2014 +0100 x86/HVM: don't crash guest upon problems occurring in user mode This extends commit 5283b310 ("x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode") to a few more cases, including the failed VM entry one that XSA-110 was needed to be issued for. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper x86/HVM: prevent infinite VM entry retries This reverts the VMX side of commit 28b4baac ("x86/HVM: don't crash guest upon problems occurring in user mode") and gets SVM in line with the resulting VMX behavior. This is because Andrew validly says "A failed vmentry is overwhelmingly likely to be caused by corrupt VMC[SB] state. As a result, injecting a fault and retrying the the vmentry is likely to fail in the same way." Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: 28b4baacd599e8c10e6dac055f6a939bb730fb8a master date: 2014-11-25 10:08:57 +0100 master commit: 04ae2f6837b35bcfb689baf15f493da626929fb5 master date: 2014-12-02 12:48:01 +0100 --- xen/arch/x86/hvm/svm/svm.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index cb8f44f..db40c84 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -90,6 +90,15 @@ static bool_t amd_erratum383_found __read_mostly; static uint64_t osvw_length, osvw_status; static DEFINE_SPINLOCK(osvw_lock); +/* Only crash the guest if the problem originates in kernel mode. */ +static void svm_crash_or_fault(struct vcpu *v) +{ + if ( vmcb_get_cpl(v->arch.hvm_svm.vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) { struct vcpu *curr = current; @@ -100,7 +109,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len > 15) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); - domain_crash(curr->domain); + svm_crash_or_fault(curr); return; } @@ -2152,8 +2161,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) goto out; case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_vmexit() error\n"); - goto exit_and_crash; - + domain_crash(v->domain); + goto out; default: BUG(); case NESTEDHVM_VMEXIT_ERROR: @@ -2166,18 +2175,22 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_check_intercepts() error\n"); - goto exit_and_crash; + domain_crash(v->domain); + goto out; default: gdprintk(XENLOG_INFO, "nestedsvm_check_intercepts() returned %i\n", nsret); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } } if ( unlikely(exit_reason == VMEXIT_INVALID) ) { + gdprintk(XENLOG_ERR, "invalid VMCB state:\n"); svm_vmcb_dump(__func__, vmcb); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } perfc_incra(svmexits, exit_reason); @@ -2212,13 +2225,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; /* AMD Vol2, 15.11: INT3, INTO, BOUND intercepts do not update RIP. */ if ( (inst_len = __get_instruction_length(v, INSTR_INT3)) == 0 ) break; @@ -2455,16 +2468,12 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; default: - exit_and_crash: + unexpected_exit_type: gdprintk(XENLOG_ERR, "unexpected VMEXIT: exit reason = %#"PRIx64", " "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - if ( vmcb_get_cpl(vmcb) ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); + svm_crash_or_fault(v); break; } -- 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 Dec 11 22:55:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22: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 1XzCeI-0002s5-D0; Thu, 11 Dec 2014 22:55:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeG-0002rW-H7 for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:52 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 8E/86-20609-7F02A845; Thu, 11 Dec 2014 22:55:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1418338538!14566663!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15730 invoked from network); 11 Dec 2014 22:55:39 -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; 11 Dec 2014 22:55:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCe2-0003Do-Kq for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCe2-0007Yq-ID for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:38 +0000 Date: Thu, 11 Dec 2014 22:55:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/cpuidle: don't count C1 multiple times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a00b8ace5e5788fc653ef037417a760ed09500cd Author: Jan Beulich AuthorDate: Wed Dec 10 12:29:05 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:29:05 2014 +0100 x86/cpuidle: don't count C1 multiple times Commit 4ca6f9f0 ("x86/cpuidle: publish new states only after fully initializing them") resulted in the state counter to be incremented for C1 despite that using a fixed table entry (and the statically initialized counter value already accounting for it and C0). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk master commit: 0aabd10525326edfe5098c2ec5bfe05db7732c32 master date: 2014-11-25 10:05:29 +0100 --- xen/arch/x86/acpi/cpu_idle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 2279f8f..36bd47f 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -954,7 +954,7 @@ static void set_cx( cx->target_residency = cx->latency * latency_factor; smp_wmb(); - acpi_power->count++; + acpi_power->count += (cx->type != ACPI_STATE_C1); if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) acpi_power->safe_state = cx; } -- 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 Dec 11 22:55:54 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 11 Dec 2014 22: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 1XzCeI-0002s5-D0; Thu, 11 Dec 2014 22:55:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCeG-0002rW-H7 for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:52 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 8E/86-20609-7F02A845; Thu, 11 Dec 2014 22:55:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1418338538!14566663!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15730 invoked from network); 11 Dec 2014 22:55:39 -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; 11 Dec 2014 22:55:39 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzCe2-0003Do-Kq for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzCe2-0007Yq-ID for xen-changelog@lists.xensource.com; Thu, 11 Dec 2014 22:55:38 +0000 Date: Thu, 11 Dec 2014 22:55:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/cpuidle: don't count C1 multiple times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a00b8ace5e5788fc653ef037417a760ed09500cd Author: Jan Beulich AuthorDate: Wed Dec 10 12:29:05 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:29:05 2014 +0100 x86/cpuidle: don't count C1 multiple times Commit 4ca6f9f0 ("x86/cpuidle: publish new states only after fully initializing them") resulted in the state counter to be incremented for C1 despite that using a fixed table entry (and the statically initialized counter value already accounting for it and C0). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk master commit: 0aabd10525326edfe5098c2ec5bfe05db7732c32 master date: 2014-11-25 10:05:29 +0100 --- xen/arch/x86/acpi/cpu_idle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 2279f8f..36bd47f 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -954,7 +954,7 @@ static void set_cx( cx->target_residency = cx->latency * latency_factor; smp_wmb(); - acpi_power->count++; + acpi_power->count += (cx->type != ACPI_STATE_C1); if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) acpi_power->safe_state = cx; } -- 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 Dec 12 11:55:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoP-0003mB-8A; Fri, 12 Dec 2014 11:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoN-0003m0-N6 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:07 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 9A/30-09284-A97DA845; Fri, 12 Dec 2014 11:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1418385304!12878083!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22502 invoked from network); 12 Dec 2014 11:55:06 -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; 12 Dec 2014 11:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoK-00035f-7l for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoJ-0007xW-LC for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:03 +0000 Date: Fri, 12 Dec 2014 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask/policy: Example policy updates for migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c6825c69e94f4d71bd2b354b6f9d77b2b9e3ed8 Author: Daniel De Graaf AuthorDate: Fri Dec 5 12:03:07 2014 -0500 Commit: Ian Campbell CommitDate: Tue Dec 9 14:25:40 2014 +0000 flask/policy: Example policy updates for migration The example XSM policy was missing permission for dom0_t to migrate domains; add these permissions. Reported-by: Wei Liu Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- tools/flask/policy/policy/modules/xen/xen.if | 11 +++++++---- tools/flask/policy/policy/modules/xen/xen.te | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index fa69c9d..2d32e1c 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -48,11 +48,13 @@ define(`create_domain_common', ` allow $1 $2:domain { create max_vcpus setdomainmaxmem setaddrsize getdomaininfo hypercall setvcpucontext setextvcpucontext getscheduler getvcpuinfo getvcpuextstate getaddrsize - getaffinity setaffinity }; - allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op configure_domain }; + getaffinity setaffinity setvcpuextstate }; + allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim + set_max_evtchn set_vnumainfo get_vnumainfo cacheflush + psr_cmt_op configure_domain }; 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 }; + allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op updatemp }; allow $1 $2:grant setup; allow $1 $2:hvm { cacheattr getparam hvmctl irqlevel pciroute sethvmc setparam pcilevel trackdirtyvram nested }; @@ -80,7 +82,7 @@ define(`create_domain_build_label', ` define(`manage_domain', ` allow $1 $2:domain { getdomaininfo getvcpuinfo getaffinity getaddrsize pause unpause trigger shutdown destroy - setaffinity setdomainmaxmem getscheduler }; + setaffinity setdomainmaxmem getscheduler resume }; allow $1 $2:domain2 set_vnumainfo; ') @@ -88,6 +90,7 @@ define(`manage_domain', ` # Allow creation of a snapshot or migration image from a domain # (inbound migration is the same as domain creation) define(`migrate_domain_out', ` + allow $1 domxen_t:mmu map_read; allow $1 $2:hvm { gethvmc getparam irqlevel }; allow $1 $2:mmu { stat pageinfo map_read }; allow $1 $2:domain { getaddrsize getvcpucontext getextvcpucontext getvcpuextstate pause destroy }; diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index d214470..c0128aa 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -129,12 +129,14 @@ create_domain(dom0_t, domU_t) manage_domain(dom0_t, domU_t) domain_comms(dom0_t, domU_t) domain_comms(domU_t, domU_t) +migrate_domain_out(dom0_t, domU_t) domain_self_comms(domU_t) declare_domain(isolated_domU_t) create_domain(dom0_t, isolated_domU_t) manage_domain(dom0_t, isolated_domU_t) domain_comms(dom0_t, isolated_domU_t) +migrate_domain_out(dom0_t, isolated_domU_t) domain_self_comms(isolated_domU_t) # Declare a boolean that denies creation of prot_domU_t domains @@ -142,6 +144,7 @@ gen_bool(prot_doms_locked, false) declare_domain(prot_domU_t) if (!prot_doms_locked) { create_domain(dom0_t, prot_domU_t) + migrate_domain_out(dom0_t, prot_domU_t) } domain_comms(dom0_t, prot_domU_t) domain_comms(domU_t, prot_domU_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 Dec 12 11:55:11 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoP-0003mB-8A; Fri, 12 Dec 2014 11:55:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoN-0003m0-N6 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:07 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 9A/30-09284-A97DA845; Fri, 12 Dec 2014 11:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1418385304!12878083!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22502 invoked from network); 12 Dec 2014 11:55:06 -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; 12 Dec 2014 11:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoK-00035f-7l for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoJ-0007xW-LC for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:03 +0000 Date: Fri, 12 Dec 2014 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask/policy: Example policy updates for migration X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6c6825c69e94f4d71bd2b354b6f9d77b2b9e3ed8 Author: Daniel De Graaf AuthorDate: Fri Dec 5 12:03:07 2014 -0500 Commit: Ian Campbell CommitDate: Tue Dec 9 14:25:40 2014 +0000 flask/policy: Example policy updates for migration The example XSM policy was missing permission for dom0_t to migrate domains; add these permissions. Reported-by: Wei Liu Signed-off-by: Daniel De Graaf Acked-by: Ian Campbell --- tools/flask/policy/policy/modules/xen/xen.if | 11 +++++++---- tools/flask/policy/policy/modules/xen/xen.te | 3 +++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index fa69c9d..2d32e1c 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -48,11 +48,13 @@ define(`create_domain_common', ` allow $1 $2:domain { create max_vcpus setdomainmaxmem setaddrsize getdomaininfo hypercall setvcpucontext setextvcpucontext getscheduler getvcpuinfo getvcpuextstate getaddrsize - getaffinity setaffinity }; - allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo psr_cmt_op configure_domain }; + getaffinity setaffinity setvcpuextstate }; + allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim + set_max_evtchn set_vnumainfo get_vnumainfo cacheflush + psr_cmt_op configure_domain }; 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 }; + allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op updatemp }; allow $1 $2:grant setup; allow $1 $2:hvm { cacheattr getparam hvmctl irqlevel pciroute sethvmc setparam pcilevel trackdirtyvram nested }; @@ -80,7 +82,7 @@ define(`create_domain_build_label', ` define(`manage_domain', ` allow $1 $2:domain { getdomaininfo getvcpuinfo getaffinity getaddrsize pause unpause trigger shutdown destroy - setaffinity setdomainmaxmem getscheduler }; + setaffinity setdomainmaxmem getscheduler resume }; allow $1 $2:domain2 set_vnumainfo; ') @@ -88,6 +90,7 @@ define(`manage_domain', ` # Allow creation of a snapshot or migration image from a domain # (inbound migration is the same as domain creation) define(`migrate_domain_out', ` + allow $1 domxen_t:mmu map_read; allow $1 $2:hvm { gethvmc getparam irqlevel }; allow $1 $2:mmu { stat pageinfo map_read }; allow $1 $2:domain { getaddrsize getvcpucontext getextvcpucontext getvcpuextstate pause destroy }; diff --git a/tools/flask/policy/policy/modules/xen/xen.te b/tools/flask/policy/policy/modules/xen/xen.te index d214470..c0128aa 100644 --- a/tools/flask/policy/policy/modules/xen/xen.te +++ b/tools/flask/policy/policy/modules/xen/xen.te @@ -129,12 +129,14 @@ create_domain(dom0_t, domU_t) manage_domain(dom0_t, domU_t) domain_comms(dom0_t, domU_t) domain_comms(domU_t, domU_t) +migrate_domain_out(dom0_t, domU_t) domain_self_comms(domU_t) declare_domain(isolated_domU_t) create_domain(dom0_t, isolated_domU_t) manage_domain(dom0_t, isolated_domU_t) domain_comms(dom0_t, isolated_domU_t) +migrate_domain_out(dom0_t, isolated_domU_t) domain_self_comms(isolated_domU_t) # Declare a boolean that denies creation of prot_domU_t domains @@ -142,6 +144,7 @@ gen_bool(prot_doms_locked, false) declare_domain(prot_domU_t) if (!prot_doms_locked) { create_domain(dom0_t, prot_domU_t) + migrate_domain_out(dom0_t, prot_domU_t) } domain_comms(dom0_t, prot_domU_t) domain_comms(domU_t, prot_domU_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 Dec 12 11:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoZ-0003nC-Ah; Fri, 12 Dec 2014 11:55:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoX-0003my-P0 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:17 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id F3/31-09842-5A7DA845; Fri, 12 Dec 2014 11:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1418385314!14832935!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17088 invoked from network); 12 Dec 2014 11:55:15 -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; 12 Dec 2014 11:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoU-00035j-DR for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoU-0007xu-B3 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:14 +0000 Date: Fri, 12 Dec 2014 11:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correct the opcode for BUG_INSTR on arm32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4338f903185cd53eacb161394c56b768a6f9f2a Author: Julien Grall AuthorDate: Thu Dec 4 19:26:55 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 9 14:28:15 2014 +0000 xen/arm: Correct the opcode for BUG_INSTR on arm32 A 0 was forgotten when the arm32 BUG instruction opcode has been added in commit 3e802c6ca1fb9a9549258c2855a57cad483f3cbd "xen/arm: Correctly support WARN_ON". This will result to use a valid instruction (mcreq 0, 3, r0, cr15, cr0, {7}), and inhibit usage of BUG/WARN_ON and co. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/arm32/bug.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/arm32/bug.h b/xen/include/asm-arm/arm32/bug.h index 155b420..3e66f35 100644 --- a/xen/include/asm-arm/arm32/bug.h +++ b/xen/include/asm-arm/arm32/bug.h @@ -6,7 +6,7 @@ /* ARMv7 provides a list of undefined opcode (see A8.8.247 DDI 0406C.b) * Use one them encoding A1 to go in exception mode */ -#define BUG_OPCODE 0xe7f00f0 +#define BUG_OPCODE 0xe7f000f0 #define BUG_INSTR ".word " __stringify(BUG_OPCODE) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoZ-0003nC-Ah; Fri, 12 Dec 2014 11:55:19 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoX-0003my-P0 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:17 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id F3/31-09842-5A7DA845; Fri, 12 Dec 2014 11:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1418385314!14832935!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17088 invoked from network); 12 Dec 2014 11:55:15 -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; 12 Dec 2014 11:55:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoU-00035j-DR for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoU-0007xu-B3 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:14 +0000 Date: Fri, 12 Dec 2014 11:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: Correct the opcode for BUG_INSTR on arm32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a4338f903185cd53eacb161394c56b768a6f9f2a Author: Julien Grall AuthorDate: Thu Dec 4 19:26:55 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 9 14:28:15 2014 +0000 xen/arm: Correct the opcode for BUG_INSTR on arm32 A 0 was forgotten when the arm32 BUG instruction opcode has been added in commit 3e802c6ca1fb9a9549258c2855a57cad483f3cbd "xen/arm: Correctly support WARN_ON". This will result to use a valid instruction (mcreq 0, 3, r0, cr15, cr0, {7}), and inhibit usage of BUG/WARN_ON and co. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/include/asm-arm/arm32/bug.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/asm-arm/arm32/bug.h b/xen/include/asm-arm/arm32/bug.h index 155b420..3e66f35 100644 --- a/xen/include/asm-arm/arm32/bug.h +++ b/xen/include/asm-arm/arm32/bug.h @@ -6,7 +6,7 @@ /* ARMv7 provides a list of undefined opcode (see A8.8.247 DDI 0406C.b) * Use one them encoding A1 to go in exception mode */ -#define BUG_OPCODE 0xe7f00f0 +#define BUG_OPCODE 0xe7f000f0 #define BUG_INSTR ".word " __stringify(BUG_OPCODE) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11: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 1XzOoi-0003oO-Dc; Fri, 12 Dec 2014 11: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 1XzOog-0003o8-TK for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:27 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id EB/27-15461-EA7DA845; Fri, 12 Dec 2014 11:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1418385324!15175452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8897 invoked from network); 12 Dec 2014 11:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 11:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoe-00035r-Hm for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoe-0007yz-GL for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:24 +0000 Date: Fri, 12 Dec 2014 11:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenstore: fix link error with libsystemd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d8582553aaa074c7981f84cd326f95e38625a22c Author: Olaf Hering AuthorDate: Fri Dec 5 11:49:47 2014 +0100 Commit: Ian Campbell CommitDate: Tue Dec 9 14:35:50 2014 +0000 tools/xenstore: fix link error with libsystemd Linking fails with undefined reference to the used systemd functions. Move LDFLAGS after the object files to fix the failure. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/xenstore/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index bff9b25..11b6a06 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -74,10 +74,10 @@ endif init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest) init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE) - $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS) + $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS) xenstored: $(XENSTORED_OBJS) - $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xenstored.a: $(XENSTORED_OBJS) $(AR) cr $@ $^ @@ -86,13 +86,13 @@ $(CLIENTS): xenstore ln -f xenstore $@ xenstore: xenstore_client.o $(LIBXENSTORE) - $(CC) $(LDFLAGS) $< $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xenstore-control: xenstore_control.o $(LIBXENSTORE) - $(CC) $(LDFLAGS) $< $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o - $(CC) $(LDFLAGS) $^ -o $@ $(APPEND_LDFLAGS) + $(CC) $^ $(LDFLAGS) -o $@ $(APPEND_LDFLAGS) libxenstore.so: libxenstore.so.$(MAJOR) ln -sf $< $@ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11: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 1XzOoi-0003oO-Dc; Fri, 12 Dec 2014 11: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 1XzOog-0003o8-TK for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:27 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id EB/27-15461-EA7DA845; Fri, 12 Dec 2014 11:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1418385324!15175452!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8897 invoked from network); 12 Dec 2014 11:55:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 11:55:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoe-00035r-Hm for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoe-0007yz-GL for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:24 +0000 Date: Fri, 12 Dec 2014 11:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xenstore: fix link error with libsystemd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d8582553aaa074c7981f84cd326f95e38625a22c Author: Olaf Hering AuthorDate: Fri Dec 5 11:49:47 2014 +0100 Commit: Ian Campbell CommitDate: Tue Dec 9 14:35:50 2014 +0000 tools/xenstore: fix link error with libsystemd Linking fails with undefined reference to the used systemd functions. Move LDFLAGS after the object files to fix the failure. Signed-off-by: Olaf Hering Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/xenstore/Makefile | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index bff9b25..11b6a06 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -74,10 +74,10 @@ endif init-xenstore-domain.o: CFLAGS += $(CFLAGS_libxenguest) init-xenstore-domain: init-xenstore-domain.o $(LIBXENSTORE) - $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS) + $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) -o $@ $(APPEND_LDFLAGS) xenstored: $(XENSTORED_OBJS) - $(CC) $(LDFLAGS) $^ $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $^ $(LDFLAGS) $(LDLIBS_libxenctrl) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xenstored.a: $(XENSTORED_OBJS) $(AR) cr $@ $^ @@ -86,13 +86,13 @@ $(CLIENTS): xenstore ln -f xenstore $@ xenstore: xenstore_client.o $(LIBXENSTORE) - $(CC) $(LDFLAGS) $< $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xenstore-control: xenstore_control.o $(LIBXENSTORE) - $(CC) $(LDFLAGS) $< $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) + $(CC) $< $(LDFLAGS) $(LDLIBS_libxenstore) $(SOCKET_LIBS) -o $@ $(APPEND_LDFLAGS) xs_tdb_dump: xs_tdb_dump.o utils.o tdb.o talloc.o - $(CC) $(LDFLAGS) $^ -o $@ $(APPEND_LDFLAGS) + $(CC) $^ $(LDFLAGS) -o $@ $(APPEND_LDFLAGS) libxenstore.so: libxenstore.so.$(MAJOR) ln -sf $< $@ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOos-0003px-GA; Fri, 12 Dec 2014 11:55:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoq-0003pg-Oz for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:36 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id D7/87-15461-8B7DA845; Fri, 12 Dec 2014 11:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1418385334!15202036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22779 invoked from network); 12 Dec 2014 11:55:35 -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; 12 Dec 2014 11:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoo-00035z-Ny for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoo-0007zP-M0 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:34 +0000 Date: Fri, 12 Dec 2014 11:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Assert that libxl_ctx_free is not called from a hook X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f49f9b4114d59a67b53322f3f6148ed0db497dca Author: Ian Jackson AuthorDate: Wed Nov 26 16:17:49 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:30 2014 +0000 libxl: events: Assert that libxl_ctx_free is not called from a hook No-one in their right mind would do this, and if they did everything would definitely collapse. Arrange that if this happens, we crash ASAP. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 74c00dc..55ef535 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -148,6 +148,8 @@ int libxl_ctx_free(libxl_ctx *ctx) { if (!ctx) return 0; + assert(!ctx->osevent_in_hook); + int i; GC_INIT(ctx); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOos-0003px-GA; Fri, 12 Dec 2014 11:55:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoq-0003pg-Oz for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:36 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id D7/87-15461-8B7DA845; Fri, 12 Dec 2014 11:55:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1418385334!15202036!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22779 invoked from network); 12 Dec 2014 11:55:35 -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; 12 Dec 2014 11:55:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoo-00035z-Ny for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoo-0007zP-M0 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:34 +0000 Date: Fri, 12 Dec 2014 11:55:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Assert that libxl_ctx_free is not called from a hook X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f49f9b4114d59a67b53322f3f6148ed0db497dca Author: Ian Jackson AuthorDate: Wed Nov 26 16:17:49 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:30 2014 +0000 libxl: events: Assert that libxl_ctx_free is not called from a hook No-one in their right mind would do this, and if they did everything would definitely collapse. Arrange that if this happens, we crash ASAP. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 74c00dc..55ef535 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -148,6 +148,8 @@ int libxl_ctx_free(libxl_ctx *ctx) { if (!ctx) return 0; + assert(!ctx->osevent_in_hook); + int i; GC_INIT(ctx); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOp3-0003rS-JL; Fri, 12 Dec 2014 11:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOp1-0003rB-Ox for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:47 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 77/04-25547-3C7DA845; Fri, 12 Dec 2014 11:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1418385345!12848788!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13809 invoked from network); 12 Dec 2014 11:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 11:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoy-000365-Uv for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoy-0007zv-S7 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:44 +0000 Date: Fri, 12 Dec 2014 11:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Deregister xenstore watch fd when not needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77a1bf37790d8eb8fb99e7539a1591fdd2988f6d Author: Ian Jackson AuthorDate: Wed Nov 26 16:44:52 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Deregister xenstore watch fd when not needed We want to have no fd events registered when we are idle. In this patch, deal with the xenstore watch fd: * Track the total number of active watches. * When deregistering a watch, or when watch registration fails, check whether there are now no watches and if so deregister the fd. * On libxl teardown, the watch fd should therefore be unregistered. assert that this is the case. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_event.c | 11 +++++++++++ tools/libxl/libxl_internal.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 55ef535..a238621 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -164,7 +164,7 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); - libxl__ev_fd_deregister(gc, &ctx->watch_efd); + assert(!libxl__ev_fd_isregistered(&ctx->watch_efd)); libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 22b1227..da0a20e 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -524,6 +524,13 @@ static char *watch_token(libxl__gc *gc, int slotnum, uint32_t counterval) return libxl__sprintf(gc, "%d/%"PRIx32, slotnum, counterval); } +static void watches_check_fd_deregister(libxl__gc *gc) +{ + assert(CTX->nwatches>=0); + if (!CTX->nwatches) + libxl__ev_fd_deregister(gc, &CTX->watch_efd); +} + int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, libxl__ev_xswatch_callback *func, const char *path /* copied */) @@ -579,6 +586,7 @@ int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, w->slotnum = slotnum; w->path = path_copy; w->callback = func; + CTX->nwatches++; libxl__set_watch_slot_contents(use, w); CTX_UNLOCK; @@ -590,6 +598,7 @@ int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, if (use) LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, use, empty); free(path_copy); + watches_check_fd_deregister(gc); CTX_UNLOCK; return rc; } @@ -614,6 +623,8 @@ void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch *w) libxl__ev_watch_slot *slot = &CTX->watch_slots[w->slotnum]; LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, slot, empty); w->slotnum = -1; + CTX->nwatches--; + watches_check_fd_deregister(gc); } else { LOG(DEBUG, "watch w=%p: deregister unregistered", w); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a38f695..9695f18 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -352,7 +352,7 @@ struct libxl__ctx { LIBXL_TAILQ_HEAD(, libxl__ev_time) etimes; libxl__ev_watch_slot *watch_slots; - int watch_nslots; + int watch_nslots, nwatches; LIBXL_SLIST_HEAD(, libxl__ev_watch_slot) watch_freeslots; uint32_t watch_counter; /* helps disambiguate slot reuse */ libxl__ev_fd watch_efd; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:49 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:55:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOp3-0003rS-JL; Fri, 12 Dec 2014 11:55:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOp1-0003rB-Ox for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:47 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 77/04-25547-3C7DA845; Fri, 12 Dec 2014 11:55:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1418385345!12848788!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13809 invoked from network); 12 Dec 2014 11:55:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 11:55:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOoy-000365-Uv for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOoy-0007zv-S7 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:44 +0000 Date: Fri, 12 Dec 2014 11:55:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Deregister xenstore watch fd when not needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 77a1bf37790d8eb8fb99e7539a1591fdd2988f6d Author: Ian Jackson AuthorDate: Wed Nov 26 16:44:52 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Deregister xenstore watch fd when not needed We want to have no fd events registered when we are idle. In this patch, deal with the xenstore watch fd: * Track the total number of active watches. * When deregistering a watch, or when watch registration fails, check whether there are now no watches and if so deregister the fd. * On libxl teardown, the watch fd should therefore be unregistered. assert that this is the case. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl.c | 2 +- tools/libxl/libxl_event.c | 11 +++++++++++ tools/libxl/libxl_internal.h | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 55ef535..a238621 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -164,7 +164,7 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); - libxl__ev_fd_deregister(gc, &ctx->watch_efd); + assert(!libxl__ev_fd_isregistered(&ctx->watch_efd)); libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index 22b1227..da0a20e 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -524,6 +524,13 @@ static char *watch_token(libxl__gc *gc, int slotnum, uint32_t counterval) return libxl__sprintf(gc, "%d/%"PRIx32, slotnum, counterval); } +static void watches_check_fd_deregister(libxl__gc *gc) +{ + assert(CTX->nwatches>=0); + if (!CTX->nwatches) + libxl__ev_fd_deregister(gc, &CTX->watch_efd); +} + int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, libxl__ev_xswatch_callback *func, const char *path /* copied */) @@ -579,6 +586,7 @@ int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, w->slotnum = slotnum; w->path = path_copy; w->callback = func; + CTX->nwatches++; libxl__set_watch_slot_contents(use, w); CTX_UNLOCK; @@ -590,6 +598,7 @@ int libxl__ev_xswatch_register(libxl__gc *gc, libxl__ev_xswatch *w, if (use) LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, use, empty); free(path_copy); + watches_check_fd_deregister(gc); CTX_UNLOCK; return rc; } @@ -614,6 +623,8 @@ void libxl__ev_xswatch_deregister(libxl__gc *gc, libxl__ev_xswatch *w) libxl__ev_watch_slot *slot = &CTX->watch_slots[w->slotnum]; LIBXL_SLIST_INSERT_HEAD(&CTX->watch_freeslots, slot, empty); w->slotnum = -1; + CTX->nwatches--; + watches_check_fd_deregister(gc); } else { LOG(DEBUG, "watch w=%p: deregister unregistered", w); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a38f695..9695f18 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -352,7 +352,7 @@ struct libxl__ctx { LIBXL_TAILQ_HEAD(, libxl__ev_time) etimes; libxl__ev_watch_slot *watch_slots; - int watch_nslots; + int watch_nslots, nwatches; LIBXL_SLIST_HEAD(, libxl__ev_watch_slot) watch_freeslots; uint32_t watch_counter; /* helps disambiguate slot reuse */ libxl__ev_fd watch_efd; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11: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 1XzOpD-0003t2-M1; Fri, 12 Dec 2014 11:55:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpB-0003sb-MW for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:57 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 60/54-25547-CC7DA845; Fri, 12 Dec 2014 11:55:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1418385355!8464668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32545 invoked from network); 12 Dec 2014 11:55:56 -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; 12 Dec 2014 11:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOp9-00036E-3x for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOp9-00080H-2t for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:55 +0000 Date: Fri, 12 Dec 2014 11:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Deregister, don't just modify, sigchld pipe fd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b9143e4a447789fab45162edd9cbf00512b88a9 Author: Ian Jackson AuthorDate: Thu Nov 27 18:03:03 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Deregister, don't just modify, sigchld pipe fd We want to have no fd events registered when we are idle. This implies that we must be able to deregister our interest in the sigchld self-pipe fd, not just modify to request no events. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl_fork.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index fa15095..144208a 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -372,15 +372,8 @@ static void sigchld_user_remove(libxl_ctx *ctx) /* idempotent */ void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ { - int rc; - sigchld_user_remove(CTX); - - if (libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { - rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, 0); - if (rc) - libxl__ev_fd_deregister(gc, &CTX->sigchld_selfpipe_efd); - } + libxl__ev_fd_deregister(gc, &CTX->sigchld_selfpipe_efd); } int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:55:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11: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 1XzOpD-0003t2-M1; Fri, 12 Dec 2014 11:55:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpB-0003sb-MW for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:57 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 60/54-25547-CC7DA845; Fri, 12 Dec 2014 11:55:56 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1418385355!8464668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32545 invoked from network); 12 Dec 2014 11:55:56 -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; 12 Dec 2014 11:55:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOp9-00036E-3x for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOp9-00080H-2t for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:55:55 +0000 Date: Fri, 12 Dec 2014 11:55:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Deregister, don't just modify, sigchld pipe fd X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4b9143e4a447789fab45162edd9cbf00512b88a9 Author: Ian Jackson AuthorDate: Thu Nov 27 18:03:03 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Deregister, don't just modify, sigchld pipe fd We want to have no fd events registered when we are idle. This implies that we must be able to deregister our interest in the sigchld self-pipe fd, not just modify to request no events. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl_fork.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/tools/libxl/libxl_fork.c b/tools/libxl/libxl_fork.c index fa15095..144208a 100644 --- a/tools/libxl/libxl_fork.c +++ b/tools/libxl/libxl_fork.c @@ -372,15 +372,8 @@ static void sigchld_user_remove(libxl_ctx *ctx) /* idempotent */ void libxl__sigchld_notneeded(libxl__gc *gc) /* non-reentrant, idempotent */ { - int rc; - sigchld_user_remove(CTX); - - if (libxl__ev_fd_isregistered(&CTX->sigchld_selfpipe_efd)) { - rc = libxl__ev_fd_modify(gc, &CTX->sigchld_selfpipe_efd, 0); - if (rc) - libxl__ev_fd_deregister(gc, &CTX->sigchld_selfpipe_efd); - } + libxl__ev_fd_deregister(gc, &CTX->sigchld_selfpipe_efd); } int libxl__sigchld_needed(libxl__gc *gc) /* non-reentrant, idempotent */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:56:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpN-0003uZ-Oq; Fri, 12 Dec 2014 11:56:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpL-0003uD-OT for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:07 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 01/10-17694-7D7DA845; Fri, 12 Dec 2014 11:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1418385365!12916374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 378 invoked from network); 12 Dec 2014 11:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 11:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpJ-00036n-AL for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOpJ-00080t-8E for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:05 +0000 Date: Fri, 12 Dec 2014 11:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Tear down SIGCHLD machinery on ctx destruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a9682574538e7cc1b59c17af19ced628ccfe594 Author: Ian Jackson AuthorDate: Thu Nov 27 18:04:29 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Tear down SIGCHLD machinery on ctx destruction We want to have no fd events registered when we are idle. Also, we should put back the default SIGCHLD handler. So: * In libxl_ctx_free, use libxl_childproc_setmode to set the mode to the default, which is libxl_sigchld_owner_libxl (ie `libxl owns SIGCHLD only when it has active children'). But of course there are no active children at libxl teardown so this results in libxl__sigchld_notneeded: the ctx loses its interest in SIGCHLD (unsetting the SIGCHLD handler if we were the last ctx) and deregisters the per-ctx selfpipe fd. * assert that this is the case: ie that we are no longer interested in the selfpipe. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a238621..8f06043 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -162,11 +162,12 @@ int libxl_ctx_free(libxl_ctx *ctx) while ((eject = LIBXL_LIST_FIRST(&CTX->disk_eject_evgens))) libxl__evdisable_disk_eject(gc, eject); + libxl_childproc_setmode(CTX,0,0); for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); assert(!libxl__ev_fd_isregistered(&ctx->watch_efd)); libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); - libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); + assert(!libxl__ev_fd_isregistered(&ctx->sigchld_selfpipe_efd)); /* Now there should be no more events requested from the application: */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:56:09 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:56:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpN-0003uZ-Oq; Fri, 12 Dec 2014 11:56:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpL-0003uD-OT for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:07 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 01/10-17694-7D7DA845; Fri, 12 Dec 2014 11:56:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1418385365!12916374!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 378 invoked from network); 12 Dec 2014 11:56:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 11:56:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpJ-00036n-AL for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOpJ-00080t-8E for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:05 +0000 Date: Fri, 12 Dec 2014 11:56:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Tear down SIGCHLD machinery on ctx destruction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5a9682574538e7cc1b59c17af19ced628ccfe594 Author: Ian Jackson AuthorDate: Thu Nov 27 18:04:29 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Tear down SIGCHLD machinery on ctx destruction We want to have no fd events registered when we are idle. Also, we should put back the default SIGCHLD handler. So: * In libxl_ctx_free, use libxl_childproc_setmode to set the mode to the default, which is libxl_sigchld_owner_libxl (ie `libxl owns SIGCHLD only when it has active children'). But of course there are no active children at libxl teardown so this results in libxl__sigchld_notneeded: the ctx loses its interest in SIGCHLD (unsetting the SIGCHLD handler if we were the last ctx) and deregisters the per-ctx selfpipe fd. * assert that this is the case: ie that we are no longer interested in the selfpipe. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index a238621..8f06043 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -162,11 +162,12 @@ int libxl_ctx_free(libxl_ctx *ctx) while ((eject = LIBXL_LIST_FIRST(&CTX->disk_eject_evgens))) libxl__evdisable_disk_eject(gc, eject); + libxl_childproc_setmode(CTX,0,0); for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); assert(!libxl__ev_fd_isregistered(&ctx->watch_efd)); libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); - libxl__ev_fd_deregister(gc, &ctx->sigchld_selfpipe_efd); + assert(!libxl__ev_fd_isregistered(&ctx->sigchld_selfpipe_efd)); /* Now there should be no more events requested from the application: */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:56:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11: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 1XzOpX-0003wN-U2; Fri, 12 Dec 2014 11:56:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpW-0003w9-D4 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:18 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 49/16-20609-1E7DA845; Fri, 12 Dec 2014 11:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1418385375!14648926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19947 invoked from network); 12 Dec 2014 11:56:16 -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; 12 Dec 2014 11:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpT-00036t-Hn for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOpT-00081H-F7 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:15 +0000 Date: Fri, 12 Dec 2014 11:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Deregister evtchn fd when not needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ffeb5d7f5d8ea35055c6e6642b74078bfc76a73 Author: Ian Jackson AuthorDate: Wed Nov 26 17:27:27 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Deregister evtchn fd when not needed We want to have no fd events registered when we are idle. In this patch, deal with the evtchn fd: * Defer setup of the evtchn handle to the first use. * Defer registration of the evtchn fd; register as needed on use. * When cancelling an evtchn wait, or when wait setup fails, check whether there are now no evtchn waits and if so deregister the fd. * On libxl teardown, the evtchn fd should therefore be unregistered. assert that this is the case. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- v2: Do not bother putting evtchn_fd in the ctx; instead, get it from xc_evtchn_fd when we need it. (Cosmetic.) Do not register the evtchn fd multiple times: check it's not registered before we call libxl__ev_fd_register. (Bugfix.) --- tools/libxl/libxl.c | 4 +--- tools/libxl/libxl_event.c | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 8f06043..50a8928 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -118,8 +118,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = ERROR_FAIL; goto out; } - rc = libxl__ctx_evtchn_init(gc); - *pctx = ctx; return 0; @@ -166,7 +164,7 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); assert(!libxl__ev_fd_isregistered(&ctx->watch_efd)); - libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); + assert(!libxl__ev_fd_isregistered(&ctx->evtchn_efd)); assert(!libxl__ev_fd_isregistered(&ctx->sigchld_selfpipe_efd)); /* Now there should be no more events requested from the application: */ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index da0a20e..a36e6d9 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -739,10 +739,6 @@ int libxl__ctx_evtchn_init(libxl__gc *gc) { rc = libxl_fd_set_nonblock(CTX, fd, 1); if (rc) goto out; - rc = libxl__ev_fd_register(gc, &CTX->evtchn_efd, - evtchn_fd_callback, fd, POLLIN); - if (rc) goto out; - CTX->xce = xce; return 0; @@ -751,6 +747,12 @@ int libxl__ctx_evtchn_init(libxl__gc *gc) { return rc; } +static void evtchn_check_fd_deregister(libxl__gc *gc) +{ + if (CTX->xce && LIBXL_LIST_EMPTY(&CTX->evtchns_waiting)) + libxl__ev_fd_deregister(gc, &CTX->evtchn_efd); +} + int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) { int r, rc; @@ -758,6 +760,15 @@ int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) DBG("ev_evtchn=%p port=%d wait (was waiting=%d)", evev, evev->port, evev->waiting); + rc = libxl__ctx_evtchn_init(gc); + if (rc) goto out; + + if (!libxl__ev_fd_isregistered(&CTX->evtchn_efd)) { + rc = libxl__ev_fd_register(gc, &CTX->evtchn_efd, evtchn_fd_callback, + xc_evtchn_fd(CTX->xce), POLLIN); + if (rc) goto out; + } + if (evev->waiting) return 0; @@ -773,6 +784,7 @@ int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) return 0; out: + evtchn_check_fd_deregister(gc); return rc; } @@ -786,6 +798,7 @@ void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev) evev->waiting = 0; LIBXL_LIST_REMOVE(evev, entry); + evtchn_check_fd_deregister(gc); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:56:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11: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 1XzOpX-0003wN-U2; Fri, 12 Dec 2014 11:56:19 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpW-0003w9-D4 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:18 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id 49/16-20609-1E7DA845; Fri, 12 Dec 2014 11:56:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1418385375!14648926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19947 invoked from network); 12 Dec 2014 11:56:16 -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; 12 Dec 2014 11:56:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpT-00036t-Hn for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOpT-00081H-F7 for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:15 +0000 Date: Fri, 12 Dec 2014 11:56:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Deregister evtchn fd when not needed X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ffeb5d7f5d8ea35055c6e6642b74078bfc76a73 Author: Ian Jackson AuthorDate: Wed Nov 26 17:27:27 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Deregister evtchn fd when not needed We want to have no fd events registered when we are idle. In this patch, deal with the evtchn fd: * Defer setup of the evtchn handle to the first use. * Defer registration of the evtchn fd; register as needed on use. * When cancelling an evtchn wait, or when wait setup fails, check whether there are now no evtchn waits and if so deregister the fd. * On libxl teardown, the evtchn fd should therefore be unregistered. assert that this is the case. Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- v2: Do not bother putting evtchn_fd in the ctx; instead, get it from xc_evtchn_fd when we need it. (Cosmetic.) Do not register the evtchn fd multiple times: check it's not registered before we call libxl__ev_fd_register. (Bugfix.) --- tools/libxl/libxl.c | 4 +--- tools/libxl/libxl_event.c | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 8f06043..50a8928 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -118,8 +118,6 @@ int libxl_ctx_alloc(libxl_ctx **pctx, int version, rc = ERROR_FAIL; goto out; } - rc = libxl__ctx_evtchn_init(gc); - *pctx = ctx; return 0; @@ -166,7 +164,7 @@ int libxl_ctx_free(libxl_ctx *ctx) for (i = 0; i < ctx->watch_nslots; i++) assert(!libxl__watch_slot_contents(gc, i)); assert(!libxl__ev_fd_isregistered(&ctx->watch_efd)); - libxl__ev_fd_deregister(gc, &ctx->evtchn_efd); + assert(!libxl__ev_fd_isregistered(&ctx->evtchn_efd)); assert(!libxl__ev_fd_isregistered(&ctx->sigchld_selfpipe_efd)); /* Now there should be no more events requested from the application: */ diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index da0a20e..a36e6d9 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -739,10 +739,6 @@ int libxl__ctx_evtchn_init(libxl__gc *gc) { rc = libxl_fd_set_nonblock(CTX, fd, 1); if (rc) goto out; - rc = libxl__ev_fd_register(gc, &CTX->evtchn_efd, - evtchn_fd_callback, fd, POLLIN); - if (rc) goto out; - CTX->xce = xce; return 0; @@ -751,6 +747,12 @@ int libxl__ctx_evtchn_init(libxl__gc *gc) { return rc; } +static void evtchn_check_fd_deregister(libxl__gc *gc) +{ + if (CTX->xce && LIBXL_LIST_EMPTY(&CTX->evtchns_waiting)) + libxl__ev_fd_deregister(gc, &CTX->evtchn_efd); +} + int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) { int r, rc; @@ -758,6 +760,15 @@ int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) DBG("ev_evtchn=%p port=%d wait (was waiting=%d)", evev, evev->port, evev->waiting); + rc = libxl__ctx_evtchn_init(gc); + if (rc) goto out; + + if (!libxl__ev_fd_isregistered(&CTX->evtchn_efd)) { + rc = libxl__ev_fd_register(gc, &CTX->evtchn_efd, evtchn_fd_callback, + xc_evtchn_fd(CTX->xce), POLLIN); + if (rc) goto out; + } + if (evev->waiting) return 0; @@ -773,6 +784,7 @@ int libxl__ev_evtchn_wait(libxl__gc *gc, libxl__ev_evtchn *evev) return 0; out: + evtchn_check_fd_deregister(gc); return rc; } @@ -786,6 +798,7 @@ void libxl__ev_evtchn_cancel(libxl__gc *gc, libxl__ev_evtchn *evev) evev->waiting = 0; LIBXL_LIST_REMOVE(evev, entry); + evtchn_check_fd_deregister(gc); } /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 11:56:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:56: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 1XzOph-0003xv-0U; Fri, 12 Dec 2014 11:56:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpg-0003xl-8T for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:28 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id D1/C1-03145-BE7DA845; Fri, 12 Dec 2014 11:56:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1418385385!14690720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20694 invoked from network); 12 Dec 2014 11:56:26 -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 Dec 2014 11:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpd-00036z-NR for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOpd-000829-Lr for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:25 +0000 Date: Fri, 12 Dec 2014 11:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Document and enforce actual callbacks restriction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60ce518a1b1caf2c1e4c1b203e87fb0b179ba687 Author: Ian Jackson AuthorDate: Wed Nov 26 17:28:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Document and enforce actual callbacks restriction libxl_event_register_callbacks cannot reasonably be called while libxl is busy (has outstanding operations and/or enabled events). This is because the previous spec implied (although not entirely clearly) that event hooks would not be called for existing fd and timeout interests. There is thus no way to reliably ensure that libxl would get told about fds and timeouts which it became interested in beforehand. So there have to be no such fds or timeouts, which means that the callbacks must only be registered or changed when the ctx is idle. Document this restriction, and enforce it with a pair of asserts. (It would be nicer, perhaps, to say that the application may not call libxl_osevent_register_hooks other than right after creating the ctx. But there are existing callers, including libvirt, who do it later - even after doing major operations such as domain creation.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl_event.c | 2 ++ tools/libxl/libxl_event.h | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index a36e6d9..0d874d9 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1219,6 +1219,8 @@ void libxl_osevent_register_hooks(libxl_ctx *ctx, { GC_INIT(ctx); CTX_LOCK; + assert(LIBXL_LIST_EMPTY(&ctx->efds)); + assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); ctx->osevent_hooks = hooks; ctx->osevent_user = user; CTX_UNLOCK; diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index b5db83c..3c6fcfe 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -124,10 +124,8 @@ void libxl_event_register_callbacks(libxl_ctx *ctx, * different parameters, as the application likes; the most recent * call determines the libxl behaviour. However it is NOT safe to * call _register_callbacks concurrently with, or reentrantly from, - * any other libxl function. - * - * Calls to _register_callbacks do not affect events which have - * already occurred. + * any other libxl function, nor while any event-generation + * facilities are 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 Fri Dec 12 11:56:29 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 11:56: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 1XzOph-0003xv-0U; Fri, 12 Dec 2014 11:56:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpg-0003xl-8T for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:28 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id D1/C1-03145-BE7DA845; Fri, 12 Dec 2014 11:56:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1418385385!14690720!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20694 invoked from network); 12 Dec 2014 11:56:26 -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 Dec 2014 11:56:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzOpd-00036z-NR for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzOpd-000829-Lr for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 11:56:25 +0000 Date: Fri, 12 Dec 2014 11:56:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: events: Document and enforce actual callbacks restriction X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60ce518a1b1caf2c1e4c1b203e87fb0b179ba687 Author: Ian Jackson AuthorDate: Wed Nov 26 17:28:18 2014 +0000 Commit: Ian Jackson CommitDate: Wed Dec 10 13:48:31 2014 +0000 libxl: events: Document and enforce actual callbacks restriction libxl_event_register_callbacks cannot reasonably be called while libxl is busy (has outstanding operations and/or enabled events). This is because the previous spec implied (although not entirely clearly) that event hooks would not be called for existing fd and timeout interests. There is thus no way to reliably ensure that libxl would get told about fds and timeouts which it became interested in beforehand. So there have to be no such fds or timeouts, which means that the callbacks must only be registered or changed when the ctx is idle. Document this restriction, and enforce it with a pair of asserts. (It would be nicer, perhaps, to say that the application may not call libxl_osevent_register_hooks other than right after creating the ctx. But there are existing callers, including libvirt, who do it later - even after doing major operations such as domain creation.) Signed-off-by: Ian Jackson Acked-by: Ian Campbell Tested-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- tools/libxl/libxl_event.c | 2 ++ tools/libxl/libxl_event.h | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_event.c b/tools/libxl/libxl_event.c index a36e6d9..0d874d9 100644 --- a/tools/libxl/libxl_event.c +++ b/tools/libxl/libxl_event.c @@ -1219,6 +1219,8 @@ void libxl_osevent_register_hooks(libxl_ctx *ctx, { GC_INIT(ctx); CTX_LOCK; + assert(LIBXL_LIST_EMPTY(&ctx->efds)); + assert(LIBXL_TAILQ_EMPTY(&ctx->etimes)); ctx->osevent_hooks = hooks; ctx->osevent_user = user; CTX_UNLOCK; diff --git a/tools/libxl/libxl_event.h b/tools/libxl/libxl_event.h index b5db83c..3c6fcfe 100644 --- a/tools/libxl/libxl_event.h +++ b/tools/libxl/libxl_event.h @@ -124,10 +124,8 @@ void libxl_event_register_callbacks(libxl_ctx *ctx, * different parameters, as the application likes; the most recent * call determines the libxl behaviour. However it is NOT safe to * call _register_callbacks concurrently with, or reentrantly from, - * any other libxl function. - * - * Calls to _register_callbacks do not affect events which have - * already occurred. + * any other libxl function, nor while any event-generation + * facilities are 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 Fri Dec 12 21:33:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33: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 1XzXpk-0001TS-HO; Fri, 12 Dec 2014 21:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpj-0001TK-8b for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:07 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 6C/7A-17694-21F5B845; Fri, 12 Dec 2014 21:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1418419984!12930914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17672 invoked from network); 12 Dec 2014 21:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 21:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpf-0001ZJ-Pr for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXpf-0001O8-Fp for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:03 +0000 Date: Fri, 12 Dec 2014 21:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 145c8ced0de02d0ad37743eb42b116e40f13e97e Author: Keir Fraser AuthorDate: Mon Dec 8 15:30:17 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 15:30:17 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db master date: 2014-12-08 14:45:46 +0100 --- xen/common/spinlock.c | 136 ++++++++++++++++++++++------------ xen/include/asm-arm/arm32/spinlock.h | 78 ------------------- xen/include/asm-arm/arm64/spinlock.h | 63 ---------------- xen/include/asm-x86/spinlock.h | 54 ------------- xen/include/xen/spinlock.h | 6 +- 5 files changed, 93 insertions(+), 244 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index bfb9670..b8d2352 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h index 4a11a97..a00a839 100644 --- a/xen/include/asm-arm/arm32/spinlock.h +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -52,84 +52,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h index fe4c403..4e86b93 100644 --- a/xen/include/asm-arm/arm64/spinlock.h +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -51,69 +51,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return !tmp; } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2 = 1; - - asm volatile( - " ldaxr %w0, [%2]\n" - " add %w0, %w0, #1\n" - " tbnz %w0, #31, 1f\n" - " stxr %w1, %w0, [%2]\n" - "1:\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "memory"); - - return !tmp2; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp; - - asm volatile( - " ldaxr %w0, [%1]\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, [%1]\n" - "1:\n" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "memory"); - - return !tmp; -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2; - - asm volatile( - "1: ldxr %w0, [%2]\n" - " sub %w0, %w0, #1\n" - " stlxr %w1, %w0, [%2]\n" - " cbnz %w1, 1b\n" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "memory"); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile( - " stlr %w1, [%0]\n" - : : "r" (&rw->lock), "r" (0) : "memory"); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 76581c5..4f743ba 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33: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 1XzXpk-0001TS-HO; Fri, 12 Dec 2014 21:33:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpj-0001TK-8b for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:07 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 6C/7A-17694-21F5B845; Fri, 12 Dec 2014 21:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1418419984!12930914!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17672 invoked from network); 12 Dec 2014 21:33:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 21:33:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpf-0001ZJ-Pr for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXpf-0001O8-Fp for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:03 +0000 Date: Fri, 12 Dec 2014 21:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 145c8ced0de02d0ad37743eb42b116e40f13e97e Author: Keir Fraser AuthorDate: Mon Dec 8 15:30:17 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 15:30:17 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db master date: 2014-12-08 14:45:46 +0100 --- xen/common/spinlock.c | 136 ++++++++++++++++++++++------------ xen/include/asm-arm/arm32/spinlock.h | 78 ------------------- xen/include/asm-arm/arm64/spinlock.h | 63 ---------------- xen/include/asm-x86/spinlock.h | 54 ------------- xen/include/xen/spinlock.h | 6 +- 5 files changed, 93 insertions(+), 244 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index bfb9670..b8d2352 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/arm32/spinlock.h b/xen/include/asm-arm/arm32/spinlock.h index 4a11a97..a00a839 100644 --- a/xen/include/asm-arm/arm32/spinlock.h +++ b/xen/include/asm-arm/arm32/spinlock.h @@ -52,84 +52,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-arm/arm64/spinlock.h b/xen/include/asm-arm/arm64/spinlock.h index fe4c403..4e86b93 100644 --- a/xen/include/asm-arm/arm64/spinlock.h +++ b/xen/include/asm-arm/arm64/spinlock.h @@ -51,69 +51,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return !tmp; } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2 = 1; - - asm volatile( - " ldaxr %w0, [%2]\n" - " add %w0, %w0, #1\n" - " tbnz %w0, #31, 1f\n" - " stxr %w1, %w0, [%2]\n" - "1:\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "memory"); - - return !tmp2; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned int tmp; - - asm volatile( - " ldaxr %w0, [%1]\n" - " cbnz %w0, 1f\n" - " stxr %w0, %w2, [%1]\n" - "1:\n" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "memory"); - - return !tmp; -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned int tmp, tmp2; - - asm volatile( - "1: ldxr %w0, [%2]\n" - " sub %w0, %w0, #1\n" - " stlxr %w1, %w0, [%2]\n" - " cbnz %w1, 1b\n" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "memory"); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile( - " stlr %w1, [%0]\n" - : : "r" (&rw->lock), "r" (0) : "memory"); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 76581c5..4f743ba 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpt-0001U4-LJ; Fri, 12 Dec 2014 21:33:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXps-0001Tv-Sy for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:17 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id BB/31-14727-C1F5B845; Fri, 12 Dec 2014 21:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1418419994!8986707!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11332 invoked from network); 12 Dec 2014 21:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 21:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpq-0001ZM-6a for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXpp-0001OW-UD for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:14 +0000 Date: Fri, 12 Dec 2014 21:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] adjust number of domains in cpupools when destroying 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 2c884737326f68f6bbb609b6870654f5b75e6327 Author: Juergen Gross AuthorDate: Wed Dec 10 12:32:55 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:32:55 2014 +0100 adjust number of domains in cpupools when destroying domain Commit bac6334b51d9bcfe57ecf4a4cb5288348fcf044a (move domain to cpupool0 before destroying it) introduced an error in the accounting of cpupools regarding the number of domains. The number of domains is nor adjusted when a domain is moved to cpupool0 in kill_domain(). Correct this by introducing a cpupool function doing the move instead of open coding it by calling sched_move_domain(). Reported-by: Dietmar Hahn Signed-off-by: Juergen Gross Tested-by: Dietmar Hahn Reviewed-by: Andrew Cooper Acked-by: George Dunlap master commit: 934e7baa6c12d19cfaf24e8f8e27d6c6a8b8c5e4 master date: 2014-11-12 12:39:58 +0100 --- xen/common/cpupool.c | 47 +++++++++++++++++++++++++++++++++-------------- xen/common/domain.c | 2 +- xen/include/xen/sched.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index c8bfb4c..2c283b9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -225,6 +225,35 @@ static int cpupool_destroy(struct cpupool *c) } /* + * Move domain to another cpupool + */ +static int cpupool_move_domain_locked(struct domain *d, struct cpupool *c) +{ + int ret; + + d->cpupool->n_dom--; + ret = sched_move_domain(d, c); + if ( ret ) + d->cpupool->n_dom++; + else + c->n_dom++; + + return ret; +} +int cpupool_move_domain(struct domain *d, struct cpupool *c) +{ + int ret; + + spin_lock(&cpupool_lock); + + ret = cpupool_move_domain_locked(d, c); + + spin_unlock(&cpupool_lock); + + return ret; +} + +/* * assign a specific cpu to a cpupool * cpupool_lock must be held */ @@ -338,14 +367,9 @@ int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) ret = -EBUSY; break; } - c->n_dom--; - ret = sched_move_domain(d, cpupool0); + ret = cpupool_move_domain_locked(d, cpupool0); if ( ret ) - { - c->n_dom++; break; - } - cpupool0->n_dom++; } rcu_read_unlock(&domlist_read_lock); if ( ret ) @@ -607,16 +631,11 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) d->domain_id, op->cpupool_id); ret = -ENOENT; spin_lock(&cpupool_lock); + c = cpupool_find_by_id(op->cpupool_id); if ( (c != NULL) && cpumask_weight(c->cpu_valid) ) - { - d->cpupool->n_dom--; - ret = sched_move_domain(d, c); - if ( ret ) - d->cpupool->n_dom++; - else - c->n_dom++; - } + ret = cpupool_move_domain_locked(d, c); + spin_unlock(&cpupool_lock); cpupool_dprintk("cpupool move_domain(dom=%d)->pool=%d ret %d\n", d->domain_id, op->cpupool_id, ret); diff --git a/xen/common/domain.c b/xen/common/domain.c index 9980d83..fefef40 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -529,7 +529,7 @@ int domain_kill(struct domain *d) { break; } - if ( sched_move_domain(d, cpupool0) ) + if ( cpupool_move_domain(d, cpupool0) ) return -EAGAIN; for_each_vcpu ( d, v ) unmap_vcpu_info(v); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ea7f4a8..f3e6fd3 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -770,6 +770,7 @@ struct cpupool *cpupool_get_by_id(int poolid); void cpupool_put(struct cpupool *pool); int cpupool_add_domain(struct domain *d, int poolid); void cpupool_rm_domain(struct domain *d); +int cpupool_move_domain(struct domain *d, struct cpupool *c); int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op); void schedule_dump(struct cpupool *c); extern void dump_runq(unsigned char key); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:17 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpt-0001U4-LJ; Fri, 12 Dec 2014 21:33:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXps-0001Tv-Sy for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:17 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id BB/31-14727-C1F5B845; Fri, 12 Dec 2014 21:33:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1418419994!8986707!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11332 invoked from network); 12 Dec 2014 21:33:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2014 21:33:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXpq-0001ZM-6a for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXpp-0001OW-UD for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:14 +0000 Date: Fri, 12 Dec 2014 21:33:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] adjust number of domains in cpupools when destroying 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 2c884737326f68f6bbb609b6870654f5b75e6327 Author: Juergen Gross AuthorDate: Wed Dec 10 12:32:55 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:32:55 2014 +0100 adjust number of domains in cpupools when destroying domain Commit bac6334b51d9bcfe57ecf4a4cb5288348fcf044a (move domain to cpupool0 before destroying it) introduced an error in the accounting of cpupools regarding the number of domains. The number of domains is nor adjusted when a domain is moved to cpupool0 in kill_domain(). Correct this by introducing a cpupool function doing the move instead of open coding it by calling sched_move_domain(). Reported-by: Dietmar Hahn Signed-off-by: Juergen Gross Tested-by: Dietmar Hahn Reviewed-by: Andrew Cooper Acked-by: George Dunlap master commit: 934e7baa6c12d19cfaf24e8f8e27d6c6a8b8c5e4 master date: 2014-11-12 12:39:58 +0100 --- xen/common/cpupool.c | 47 +++++++++++++++++++++++++++++++++-------------- xen/common/domain.c | 2 +- xen/include/xen/sched.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/xen/common/cpupool.c b/xen/common/cpupool.c index c8bfb4c..2c283b9 100644 --- a/xen/common/cpupool.c +++ b/xen/common/cpupool.c @@ -225,6 +225,35 @@ static int cpupool_destroy(struct cpupool *c) } /* + * Move domain to another cpupool + */ +static int cpupool_move_domain_locked(struct domain *d, struct cpupool *c) +{ + int ret; + + d->cpupool->n_dom--; + ret = sched_move_domain(d, c); + if ( ret ) + d->cpupool->n_dom++; + else + c->n_dom++; + + return ret; +} +int cpupool_move_domain(struct domain *d, struct cpupool *c) +{ + int ret; + + spin_lock(&cpupool_lock); + + ret = cpupool_move_domain_locked(d, c); + + spin_unlock(&cpupool_lock); + + return ret; +} + +/* * assign a specific cpu to a cpupool * cpupool_lock must be held */ @@ -338,14 +367,9 @@ int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) ret = -EBUSY; break; } - c->n_dom--; - ret = sched_move_domain(d, cpupool0); + ret = cpupool_move_domain_locked(d, cpupool0); if ( ret ) - { - c->n_dom++; break; - } - cpupool0->n_dom++; } rcu_read_unlock(&domlist_read_lock); if ( ret ) @@ -607,16 +631,11 @@ int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op) d->domain_id, op->cpupool_id); ret = -ENOENT; spin_lock(&cpupool_lock); + c = cpupool_find_by_id(op->cpupool_id); if ( (c != NULL) && cpumask_weight(c->cpu_valid) ) - { - d->cpupool->n_dom--; - ret = sched_move_domain(d, c); - if ( ret ) - d->cpupool->n_dom++; - else - c->n_dom++; - } + ret = cpupool_move_domain_locked(d, c); + spin_unlock(&cpupool_lock); cpupool_dprintk("cpupool move_domain(dom=%d)->pool=%d ret %d\n", d->domain_id, op->cpupool_id, ret); diff --git a/xen/common/domain.c b/xen/common/domain.c index 9980d83..fefef40 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -529,7 +529,7 @@ int domain_kill(struct domain *d) { break; } - if ( sched_move_domain(d, cpupool0) ) + if ( cpupool_move_domain(d, cpupool0) ) return -EAGAIN; for_each_vcpu ( d, v ) unmap_vcpu_info(v); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index ea7f4a8..f3e6fd3 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -770,6 +770,7 @@ struct cpupool *cpupool_get_by_id(int poolid); void cpupool_put(struct cpupool *pool); int cpupool_add_domain(struct domain *d, int poolid); void cpupool_rm_domain(struct domain *d); +int cpupool_move_domain(struct domain *d, struct cpupool *c); int cpupool_do_sysctl(struct xen_sysctl_cpupool_op *op); void schedule_dump(struct cpupool *c); extern void dump_runq(unsigned char key); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33: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 1XzXq4-0001VM-O1; Fri, 12 Dec 2014 21:33:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXq3-0001V7-Mb for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:27 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 9B/98-07724-62F5B845; Fri, 12 Dec 2014 21:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1418420004!8588925!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12231 invoked from network); 12 Dec 2014 21:33:25 -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; 12 Dec 2014 21:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXq0-0001ZV-DP for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXq0-0001Ou-AH for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:24 +0000 Date: Fri, 12 Dec 2014 21:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: (allow to) override LIST_POISON* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6007f183bafef5c8e87cf06957ba95026b1121 Author: Jan Beulich AuthorDate: Wed Dec 10 12:34:00 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:34:00 2014 +0100 x86: (allow to) override LIST_POISON* Having these point into space not controlled by the hypervisor provides an unnecessary attack surface. Allow architectures to override them and utilize that override to make them non-canonical addresses (thus causing #GP rather than #PF when dereferenced). Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 404227138e1e49c8073e946649a8d4173b35625c master date: 2014-11-17 15:05:53 +0100 --- xen/include/asm-x86/config.h | 4 ++++ xen/include/xen/list.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index bd8f61c..9d76a04 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -96,6 +96,10 @@ /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) +/* Override include/xen/list.h to make these non-canonical addresses. */ +#define LIST_POISON1 ((void *)0x0100100100100100UL) +#define LIST_POISON2 ((void *)0x0200200200200200UL) + #ifndef __ASSEMBLY__ extern unsigned long trampoline_phys; #define bootsym_phys(sym) \ diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h index 792eda3..9768fee 100644 --- a/xen/include/xen/list.h +++ b/xen/include/xen/list.h @@ -10,12 +10,15 @@ #include #include -/* These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses - * non-initialized list entries. +/* + * These are non-NULL pointers that will result in faults under normal + * circumstances, used to verify that nobody uses non-initialized list + * entries. Architectures can override these. */ +#ifndef LIST_POISON1 #define LIST_POISON1 ((void *) 0x00100100) #define LIST_POISON2 ((void *) 0x00200200) +#endif /* * Simple doubly linked list implementation. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33: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 1XzXq4-0001VM-O1; Fri, 12 Dec 2014 21:33:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXq3-0001V7-Mb for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:27 +0000 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id 9B/98-07724-62F5B845; Fri, 12 Dec 2014 21:33:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1418420004!8588925!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12231 invoked from network); 12 Dec 2014 21:33:25 -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; 12 Dec 2014 21:33:25 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXq0-0001ZV-DP for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXq0-0001Ou-AH for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:24 +0000 Date: Fri, 12 Dec 2014 21:33:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86: (allow to) override LIST_POISON* X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ad6007f183bafef5c8e87cf06957ba95026b1121 Author: Jan Beulich AuthorDate: Wed Dec 10 12:34:00 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:34:00 2014 +0100 x86: (allow to) override LIST_POISON* Having these point into space not controlled by the hypervisor provides an unnecessary attack surface. Allow architectures to override them and utilize that override to make them non-canonical addresses (thus causing #GP rather than #PF when dereferenced). Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 404227138e1e49c8073e946649a8d4173b35625c master date: 2014-11-17 15:05:53 +0100 --- xen/include/asm-x86/config.h | 4 ++++ xen/include/xen/list.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index bd8f61c..9d76a04 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -96,6 +96,10 @@ /* Return value for zero-size _xmalloc(), distinguished from NULL. */ #define ZERO_BLOCK_PTR ((void *)0xBAD0BAD0BAD0BAD0UL) +/* Override include/xen/list.h to make these non-canonical addresses. */ +#define LIST_POISON1 ((void *)0x0100100100100100UL) +#define LIST_POISON2 ((void *)0x0200200200200200UL) + #ifndef __ASSEMBLY__ extern unsigned long trampoline_phys; #define bootsym_phys(sym) \ diff --git a/xen/include/xen/list.h b/xen/include/xen/list.h index 792eda3..9768fee 100644 --- a/xen/include/xen/list.h +++ b/xen/include/xen/list.h @@ -10,12 +10,15 @@ #include #include -/* These are non-NULL pointers that will result in page faults - * under normal circumstances, used to verify that nobody uses - * non-initialized list entries. +/* + * These are non-NULL pointers that will result in faults under normal + * circumstances, used to verify that nobody uses non-initialized list + * entries. Architectures can override these. */ +#ifndef LIST_POISON1 #define LIST_POISON1 ((void *) 0x00100100) #define LIST_POISON2 ((void *) 0x00200200) +#endif /* * Simple doubly linked list implementation. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqE-0001X6-Qi; Fri, 12 Dec 2014 21:33:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqD-0001Wl-CW for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:37 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id BF/92-24124-03F5B845; Fri, 12 Dec 2014 21:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418420014!13152836!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19688 invoked from network); 12 Dec 2014 21:33:35 -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; 12 Dec 2014 21:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqA-0001Zd-Iv for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXqA-0001PU-HZ for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:34 +0000 Date: Fri, 12 Dec 2014 21:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] EFI: allow retry of ExitBootServices() call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2aa3e033410617826aac4881d60fc9c201077db5 Author: Jan Beulich AuthorDate: Wed Dec 10 12:37:26 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:37:26 2014 +0100 EFI: allow retry of ExitBootServices() call The specification is kind of vague under what conditions ExitBootServices() may legitimately fail, requiring the OS loader to retry: "If MapKey value is incorrect, ExitBootServices() returns EFI_INVALID_PARAMETER and GetMemoryMap() with ExitBootServices() must be called again. Firmware implementation may choose to do a partial shutdown of the boot services during the first call to ExitBootServices(). EFI OS loader should not make calls to any boot service function other then GetMemoryMap() after the first call to ExitBootServices()." While our code guarantees the map key to be valid, there are systems where a firmware internal notification sent while processing ExitBootServices() reportedly results in changes to the memory map. In that case, make a best effort second try: Avoid any boot service calls other than the two named above, with the possible exception of error paths. Those aren't a problem, since if we end up needing to retry, we're hosed when something goes wrong as much as if we didn't make the retry attempt. For x86, a minimal adjustment to efi_arch_process_memory_map() is needed for it to cope with potentially being called a second time. For arm64, while efi_process_memory_map_bootinfo() is easy to verify that it can safely be called more than once without violating spec constraints, it's not so obvious for fdt_add_uefi_nodes(), hence a step by step approach: - deletion of memory nodes and memory reserve map entries: the 2nd pass shouldn't find any as the 1st one deleted them all, - a "chosen" node should be found as it got added in the 1st pass, - the various "linux,uefi-*" nodes all got added during the 1st pass and hence only their contents may get updated. Signed-off-by: Jan Beulich Reviewed-by: Roy Franz master commit: 0540b854f6733759593e829bc3f13c9b45974e32 master date: 2014-11-17 15:07:03 +0100 --- xen/arch/x86/efi/boot.c | 121 +++++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 56 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 2cdf1be..68940cd 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -782,9 +782,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - struct e820entry *e; u64 efer; - bool_t base_video = 0; + bool_t base_video = 0, retry; efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; @@ -1387,68 +1386,78 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( mbi.mem_upper < xen_phys_start ) blexit(L"Out of static memory\r\n"); efi_memmap = (void *)(long)mbi.mem_upper; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); - if ( EFI_ERROR(status) ) - blexit(L"Cannot obtain memory map\r\n"); - - /* Populate E820 table and check trampoline area availability. */ - e = e820map - 1; - for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) + for ( retry = 0; ; retry = 1 ) { - EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; - u32 type; + struct e820entry *e; + + status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, + &efi_mdesc_size, &mdesc_ver); + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot obtain memory map", status); - switch ( desc->Type ) + /* Populate E820 table and check trampoline area availability. */ + e = e820map - 1; + for ( e820nr = i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: - case EfiBootServicesCode: - case EfiBootServicesData: - if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && - len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) - cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; - /* fall through */ - case EfiLoaderCode: - case EfiLoaderData: - if ( desc->Attribute & EFI_MEMORY_WB ) - type = E820_RAM; + EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; + u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; + u32 type; + + switch ( desc->Type ) + { + default: + type = E820_RESERVED; + break; + case EfiConventionalMemory: + case EfiBootServicesCode: + case EfiBootServicesData: + if ( !trampoline_phys && + desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && + desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & + PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: + if ( desc->Attribute & EFI_MEMORY_WB ) + type = E820_RAM; + else + case EfiUnusableMemory: + type = E820_UNUSABLE; + break; + case EfiACPIReclaimMemory: + type = E820_ACPI; + break; + case EfiACPIMemoryNVS: + type = E820_NVS; + break; + } + if ( e820nr && type == e->type && + desc->PhysicalStart == e->addr + e->size ) + e->size += len; + else if ( !len || e820nr >= E820MAX ) + continue; else - case EfiUnusableMemory: - type = E820_UNUSABLE; - break; - case EfiACPIReclaimMemory: - type = E820_ACPI; - break; - case EfiACPIMemoryNVS: - type = E820_NVS; - break; + { + ++e; + e->addr = desc->PhysicalStart; + e->size = len; + e->type = type; + ++e820nr; + } } - if ( e820nr && type == e->type && - desc->PhysicalStart == e->addr + e->size ) - e->size += len; - else if ( !len || e820nr >= E820MAX ) - continue; - else + if ( !trampoline_phys ) { - ++e; - e->addr = desc->PhysicalStart; - e->size = len; - e->type = type; - ++e820nr; + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); } - } - if ( !trampoline_phys ) - { - if ( !cfg.addr ) - blexit(L"No memory for trampoline"); - relocate_trampoline(cfg.addr); - } - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = efi_bs->ExitBootServices(ImageHandle, map_key); + if ( status != EFI_INVALID_PARAMETER || retry ) + break; + } if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot exit boot services", status); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqE-0001X6-Qi; Fri, 12 Dec 2014 21:33:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqD-0001Wl-CW for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:37 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id BF/92-24124-03F5B845; Fri, 12 Dec 2014 21:33:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418420014!13152836!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19688 invoked from network); 12 Dec 2014 21:33:35 -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; 12 Dec 2014 21:33:35 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqA-0001Zd-Iv for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXqA-0001PU-HZ for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:34 +0000 Date: Fri, 12 Dec 2014 21:33:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] EFI: allow retry of ExitBootServices() call X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2aa3e033410617826aac4881d60fc9c201077db5 Author: Jan Beulich AuthorDate: Wed Dec 10 12:37:26 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:37:26 2014 +0100 EFI: allow retry of ExitBootServices() call The specification is kind of vague under what conditions ExitBootServices() may legitimately fail, requiring the OS loader to retry: "If MapKey value is incorrect, ExitBootServices() returns EFI_INVALID_PARAMETER and GetMemoryMap() with ExitBootServices() must be called again. Firmware implementation may choose to do a partial shutdown of the boot services during the first call to ExitBootServices(). EFI OS loader should not make calls to any boot service function other then GetMemoryMap() after the first call to ExitBootServices()." While our code guarantees the map key to be valid, there are systems where a firmware internal notification sent while processing ExitBootServices() reportedly results in changes to the memory map. In that case, make a best effort second try: Avoid any boot service calls other than the two named above, with the possible exception of error paths. Those aren't a problem, since if we end up needing to retry, we're hosed when something goes wrong as much as if we didn't make the retry attempt. For x86, a minimal adjustment to efi_arch_process_memory_map() is needed for it to cope with potentially being called a second time. For arm64, while efi_process_memory_map_bootinfo() is easy to verify that it can safely be called more than once without violating spec constraints, it's not so obvious for fdt_add_uefi_nodes(), hence a step by step approach: - deletion of memory nodes and memory reserve map entries: the 2nd pass shouldn't find any as the 1st one deleted them all, - a "chosen" node should be found as it got added in the 1st pass, - the various "linux,uefi-*" nodes all got added during the 1st pass and hence only their contents may get updated. Signed-off-by: Jan Beulich Reviewed-by: Roy Franz master commit: 0540b854f6733759593e829bc3f13c9b45974e32 master date: 2014-11-17 15:07:03 +0100 --- xen/arch/x86/efi/boot.c | 121 +++++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 56 deletions(-) diff --git a/xen/arch/x86/efi/boot.c b/xen/arch/x86/efi/boot.c index 2cdf1be..68940cd 100644 --- a/xen/arch/x86/efi/boot.c +++ b/xen/arch/x86/efi/boot.c @@ -782,9 +782,8 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_FILE_HANDLE dir_handle; union string section = { NULL }, name; - struct e820entry *e; u64 efer; - bool_t base_video = 0; + bool_t base_video = 0, retry; efi_ih = ImageHandle; efi_bs = SystemTable->BootServices; @@ -1387,68 +1386,78 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable) if ( mbi.mem_upper < xen_phys_start ) blexit(L"Out of static memory\r\n"); efi_memmap = (void *)(long)mbi.mem_upper; - status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, - &efi_mdesc_size, &mdesc_ver); - if ( EFI_ERROR(status) ) - blexit(L"Cannot obtain memory map\r\n"); - - /* Populate E820 table and check trampoline area availability. */ - e = e820map - 1; - for ( i = 0; i < efi_memmap_size; i += efi_mdesc_size ) + for ( retry = 0; ; retry = 1 ) { - EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; - u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; - u32 type; + struct e820entry *e; + + status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key, + &efi_mdesc_size, &mdesc_ver); + if ( EFI_ERROR(status) ) + PrintErrMesg(L"Cannot obtain memory map", status); - switch ( desc->Type ) + /* Populate E820 table and check trampoline area availability. */ + e = e820map - 1; + for ( e820nr = i = 0; i < efi_memmap_size; i += efi_mdesc_size ) { - default: - type = E820_RESERVED; - break; - case EfiConventionalMemory: - case EfiBootServicesCode: - case EfiBootServicesData: - if ( !trampoline_phys && desc->PhysicalStart + len <= 0x100000 && - len >= cfg.size && desc->PhysicalStart + len > cfg.addr ) - cfg.addr = (desc->PhysicalStart + len - cfg.size) & PAGE_MASK; - /* fall through */ - case EfiLoaderCode: - case EfiLoaderData: - if ( desc->Attribute & EFI_MEMORY_WB ) - type = E820_RAM; + EFI_MEMORY_DESCRIPTOR *desc = efi_memmap + i; + u64 len = desc->NumberOfPages << EFI_PAGE_SHIFT; + u32 type; + + switch ( desc->Type ) + { + default: + type = E820_RESERVED; + break; + case EfiConventionalMemory: + case EfiBootServicesCode: + case EfiBootServicesData: + if ( !trampoline_phys && + desc->PhysicalStart + len <= 0x100000 && + len >= cfg.size && + desc->PhysicalStart + len > cfg.addr ) + cfg.addr = (desc->PhysicalStart + len - cfg.size) & + PAGE_MASK; + /* fall through */ + case EfiLoaderCode: + case EfiLoaderData: + if ( desc->Attribute & EFI_MEMORY_WB ) + type = E820_RAM; + else + case EfiUnusableMemory: + type = E820_UNUSABLE; + break; + case EfiACPIReclaimMemory: + type = E820_ACPI; + break; + case EfiACPIMemoryNVS: + type = E820_NVS; + break; + } + if ( e820nr && type == e->type && + desc->PhysicalStart == e->addr + e->size ) + e->size += len; + else if ( !len || e820nr >= E820MAX ) + continue; else - case EfiUnusableMemory: - type = E820_UNUSABLE; - break; - case EfiACPIReclaimMemory: - type = E820_ACPI; - break; - case EfiACPIMemoryNVS: - type = E820_NVS; - break; + { + ++e; + e->addr = desc->PhysicalStart; + e->size = len; + e->type = type; + ++e820nr; + } } - if ( e820nr && type == e->type && - desc->PhysicalStart == e->addr + e->size ) - e->size += len; - else if ( !len || e820nr >= E820MAX ) - continue; - else + if ( !trampoline_phys ) { - ++e; - e->addr = desc->PhysicalStart; - e->size = len; - e->type = type; - ++e820nr; + if ( !cfg.addr ) + blexit(L"No memory for trampoline"); + relocate_trampoline(cfg.addr); } - } - if ( !trampoline_phys ) - { - if ( !cfg.addr ) - blexit(L"No memory for trampoline"); - relocate_trampoline(cfg.addr); - } - status = efi_bs->ExitBootServices(ImageHandle, map_key); + status = efi_bs->ExitBootServices(ImageHandle, map_key); + if ( status != EFI_INVALID_PARAMETER || retry ) + break; + } if ( EFI_ERROR(status) ) PrintErrMesg(L"Cannot exit boot services", status); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqN-0001Z3-VQ; Fri, 12 Dec 2014 21:33:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqN-0001Yn-9v for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:47 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 18/49-08051-A3F5B845; Fri, 12 Dec 2014 21:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1418420025!14754737!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21597 invoked from network); 12 Dec 2014 21:33:45 -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; 12 Dec 2014 21:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqK-0001Zj-Ps for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXqK-0001Pq-Md for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:44 +0000 Date: Fri, 12 Dec 2014 21:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/cpuidle: don't count C1 multiple times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b87e1b0d057678e989a0c1f2a0f41fc970d1c28d Author: Jan Beulich AuthorDate: Wed Dec 10 12:38:53 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:38:53 2014 +0100 x86/cpuidle: don't count C1 multiple times Commit 4ca6f9f0 ("x86/cpuidle: publish new states only after fully initializing them") resulted in the state counter to be incremented for C1 despite that using a fixed table entry (and the statically initialized counter value already accounting for it and C0). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk master commit: 0aabd10525326edfe5098c2ec5bfe05db7732c32 master date: 2014-11-25 10:05:29 +0100 --- xen/arch/x86/acpi/cpu_idle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index d3fd793..274ea00 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -948,7 +948,7 @@ static void set_cx( cx->target_residency = cx->latency * latency_factor; smp_wmb(); - acpi_power->count++; + acpi_power->count += (cx->type != ACPI_STATE_C1); if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) acpi_power->safe_state = cx; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqN-0001Z3-VQ; Fri, 12 Dec 2014 21:33:47 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqN-0001Yn-9v for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:47 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 18/49-08051-A3F5B845; Fri, 12 Dec 2014 21:33:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1418420025!14754737!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21597 invoked from network); 12 Dec 2014 21:33:45 -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; 12 Dec 2014 21:33:45 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqK-0001Zj-Ps for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXqK-0001Pq-Md for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:44 +0000 Date: Fri, 12 Dec 2014 21:33:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/cpuidle: don't count C1 multiple times X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b87e1b0d057678e989a0c1f2a0f41fc970d1c28d Author: Jan Beulich AuthorDate: Wed Dec 10 12:38:53 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:38:53 2014 +0100 x86/cpuidle: don't count C1 multiple times Commit 4ca6f9f0 ("x86/cpuidle: publish new states only after fully initializing them") resulted in the state counter to be incremented for C1 despite that using a fixed table entry (and the statically initialized counter value already accounting for it and C0). Signed-off-by: Jan Beulich Reviewed-by: Konrad Rzeszutek Wilk master commit: 0aabd10525326edfe5098c2ec5bfe05db7732c32 master date: 2014-11-25 10:05:29 +0100 --- xen/arch/x86/acpi/cpu_idle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index d3fd793..274ea00 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -948,7 +948,7 @@ static void set_cx( cx->target_residency = cx->latency * latency_factor; smp_wmb(); - acpi_power->count++; + acpi_power->count += (cx->type != ACPI_STATE_C1); if ( cx->type == ACPI_STATE_C1 || cx->type == ACPI_STATE_C2 ) acpi_power->safe_state = cx; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqZ-0001am-1w; Fri, 12 Dec 2014 21:33:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqX-0001aY-Oj for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:57 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CC/1C-28296-54F5B845; Fri, 12 Dec 2014 21:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1418420035!9289938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7501 invoked from network); 12 Dec 2014 21:33:56 -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 Dec 2014 21:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqV-0001Zs-3K for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXqU-0001QC-Ud for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:54 +0000 Date: Fri, 12 Dec 2014 21:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: don't crash guest upon problems occurring in user 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 5cd7ed02530eb86ffee6f5b9c7f04743c726754f Author: Jan Beulich AuthorDate: Wed Dec 10 12:39:36 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:39:36 2014 +0100 x86/HVM: don't crash guest upon problems occurring in user mode This extends commit 5283b310 ("x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode") to a few more cases, including the failed VM entry one that XSA-110 was needed to be issued for. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper x86/HVM: prevent infinite VM entry retries This reverts the VMX side of commit 28b4baac ("x86/HVM: don't crash guest upon problems occurring in user mode") and gets SVM in line with the resulting VMX behavior. This is because Andrew validly says "A failed vmentry is overwhelmingly likely to be caused by corrupt VMC[SB] state. As a result, injecting a fault and retrying the the vmentry is likely to fail in the same way." Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: 28b4baacd599e8c10e6dac055f6a939bb730fb8a master date: 2014-11-25 10:08:57 +0100 master commit: 04ae2f6837b35bcfb689baf15f493da626929fb5 master date: 2014-12-02 12:48:01 +0100 --- xen/arch/x86/hvm/svm/svm.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 30e130f..df592de 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -90,6 +90,15 @@ static bool_t amd_erratum383_found __read_mostly; static uint64_t osvw_length, osvw_status; static DEFINE_SPINLOCK(osvw_lock); +/* Only crash the guest if the problem originates in kernel mode. */ +static void svm_crash_or_fault(struct vcpu *v) +{ + if ( vmcb_get_cpl(v->arch.hvm_svm.vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) { struct vcpu *curr = current; @@ -100,7 +109,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len > 15) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); - domain_crash(curr->domain); + svm_crash_or_fault(curr); return; } @@ -2150,8 +2159,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) goto out; case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_vmexit() error\n"); - goto exit_and_crash; - + domain_crash(v->domain); + goto out; default: BUG(); case NESTEDHVM_VMEXIT_ERROR: @@ -2164,18 +2173,22 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_check_intercepts() error\n"); - goto exit_and_crash; + domain_crash(v->domain); + goto out; default: gdprintk(XENLOG_INFO, "nestedsvm_check_intercepts() returned %i\n", nsret); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } } if ( unlikely(exit_reason == VMEXIT_INVALID) ) { + gdprintk(XENLOG_ERR, "invalid VMCB state:\n"); svm_vmcb_dump(__func__, vmcb); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } perfc_incra(svmexits, exit_reason); @@ -2210,13 +2223,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; /* AMD Vol2, 15.11: INT3, INTO, BOUND intercepts do not update RIP. */ if ( (inst_len = __get_instruction_length(v, INSTR_INT3)) == 0 ) break; @@ -2453,16 +2466,12 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; default: - exit_and_crash: + unexpected_exit_type: gdprintk(XENLOG_ERR, "unexpected VMEXIT: exit reason = %#"PRIx64", " "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - if ( vmcb_get_cpl(vmcb) ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); + svm_crash_or_fault(v); break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 12 21:33:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 12 Dec 2014 21:33:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqZ-0001am-1w; Fri, 12 Dec 2014 21:33:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqX-0001aY-Oj for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:57 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CC/1C-28296-54F5B845; Fri, 12 Dec 2014 21:33:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1418420035!9289938!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7501 invoked from network); 12 Dec 2014 21:33:56 -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 Dec 2014 21:33:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzXqV-0001Zs-3K for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzXqU-0001QC-Ud for xen-changelog@lists.xensource.com; Fri, 12 Dec 2014 21:33:54 +0000 Date: Fri, 12 Dec 2014 21:33:54 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] x86/HVM: don't crash guest upon problems occurring in user 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 5cd7ed02530eb86ffee6f5b9c7f04743c726754f Author: Jan Beulich AuthorDate: Wed Dec 10 12:39:36 2014 +0100 Commit: Jan Beulich CommitDate: Wed Dec 10 12:39:36 2014 +0100 x86/HVM: don't crash guest upon problems occurring in user mode This extends commit 5283b310 ("x86/HVM: only kill guest when unknown VM exit occurred in guest kernel mode") to a few more cases, including the failed VM entry one that XSA-110 was needed to be issued for. Signed-off-by: Jan Beulich Reviewed-by: Tim Deegan Reviewed-by: Andrew Cooper x86/HVM: prevent infinite VM entry retries This reverts the VMX side of commit 28b4baac ("x86/HVM: don't crash guest upon problems occurring in user mode") and gets SVM in line with the resulting VMX behavior. This is because Andrew validly says "A failed vmentry is overwhelmingly likely to be caused by corrupt VMC[SB] state. As a result, injecting a fault and retrying the the vmentry is likely to fail in the same way." Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Signed-off-by: Tim Deegan Reviewed-by: Andrew Cooper master commit: 28b4baacd599e8c10e6dac055f6a939bb730fb8a master date: 2014-11-25 10:08:57 +0100 master commit: 04ae2f6837b35bcfb689baf15f493da626929fb5 master date: 2014-12-02 12:48:01 +0100 --- xen/arch/x86/hvm/svm/svm.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 30e130f..df592de 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -90,6 +90,15 @@ static bool_t amd_erratum383_found __read_mostly; static uint64_t osvw_length, osvw_status; static DEFINE_SPINLOCK(osvw_lock); +/* Only crash the guest if the problem originates in kernel mode. */ +static void svm_crash_or_fault(struct vcpu *v) +{ + if ( vmcb_get_cpl(v->arch.hvm_svm.vmcb) ) + hvm_inject_hw_exception(TRAP_invalid_op, HVM_DELIVER_NO_ERROR_CODE); + else + domain_crash(v->domain); +} + void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) { struct vcpu *curr = current; @@ -100,7 +109,7 @@ void __update_guest_eip(struct cpu_user_regs *regs, unsigned int inst_len) if ( unlikely(inst_len > 15) ) { gdprintk(XENLOG_ERR, "Bad instruction length %u\n", inst_len); - domain_crash(curr->domain); + svm_crash_or_fault(curr); return; } @@ -2150,8 +2159,8 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) goto out; case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_vmexit() error\n"); - goto exit_and_crash; - + domain_crash(v->domain); + goto out; default: BUG(); case NESTEDHVM_VMEXIT_ERROR: @@ -2164,18 +2173,22 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case NESTEDHVM_VMEXIT_FATALERROR: gdprintk(XENLOG_ERR, "unexpected nestedsvm_check_intercepts() error\n"); - goto exit_and_crash; + domain_crash(v->domain); + goto out; default: gdprintk(XENLOG_INFO, "nestedsvm_check_intercepts() returned %i\n", nsret); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } } if ( unlikely(exit_reason == VMEXIT_INVALID) ) { + gdprintk(XENLOG_ERR, "invalid VMCB state:\n"); svm_vmcb_dump(__func__, vmcb); - goto exit_and_crash; + domain_crash(v->domain); + goto out; } perfc_incra(svmexits, exit_reason); @@ -2210,13 +2223,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: if ( !v->domain->debugger_attached ) - goto exit_and_crash; + goto unexpected_exit_type; /* AMD Vol2, 15.11: INT3, INTO, BOUND intercepts do not update RIP. */ if ( (inst_len = __get_instruction_length(v, INSTR_INT3)) == 0 ) break; @@ -2453,16 +2466,12 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; default: - exit_and_crash: + unexpected_exit_type: gdprintk(XENLOG_ERR, "unexpected VMEXIT: exit reason = %#"PRIx64", " "exitinfo1 = %#"PRIx64", exitinfo2 = %#"PRIx64"\n", exit_reason, (u64)vmcb->exitinfo1, (u64)vmcb->exitinfo2); - if ( vmcb_get_cpl(vmcb) ) - hvm_inject_hw_exception(TRAP_invalid_op, - HVM_DELIVER_NO_ERROR_CODE); - else - domain_crash(v->domain); + svm_crash_or_fault(v); break; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 13 04:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Dec 2014 04:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzejU-0000TJ-I1; Sat, 13 Dec 2014 04:55:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzejS-0000TB-Kr for xen-changelog@lists.xensource.com; Sat, 13 Dec 2014 04:55:06 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 15/F7-27584-9A6CB845; Sat, 13 Dec 2014 04:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418446503!13176006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9117 invoked from network); 13 Dec 2014 04:55:04 -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; 13 Dec 2014 04:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzejO-000584-NY for xen-changelog@lists.xensource.com; Sat, 13 Dec 2014 04:55:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzejO-00075O-Jq for xen-changelog@lists.xensource.com; Sat, 13 Dec 2014 04:55:02 +0000 Date: Sat, 13 Dec 2014 04:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 353de6b221c2d0fb59edfceb1f535357e4d84825 Author: Keir Fraser AuthorDate: Mon Dec 8 15:32:04 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 15:32:04 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db master date: 2014-12-08 14:45:46 +0100 --- xen/common/spinlock.c | 136 ++++++++++++++++++++++++++-------------- xen/include/asm-arm/spinlock.h | 78 ----------------------- xen/include/asm-x86/spinlock.h | 54 ---------------- xen/include/xen/spinlock.h | 6 +- 4 files changed, 93 insertions(+), 181 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index bfb9670..b8d2352 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h index b1825c9..a9debba 100644 --- a/xen/include/asm-arm/spinlock.h +++ b/xen/include/asm-arm/spinlock.h @@ -55,84 +55,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 76581c5..4f743ba 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- 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 Sat Dec 13 04:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 13 Dec 2014 04:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzejU-0000TJ-I1; Sat, 13 Dec 2014 04:55:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzejS-0000TB-Kr for xen-changelog@lists.xensource.com; Sat, 13 Dec 2014 04:55:06 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 15/F7-27584-9A6CB845; Sat, 13 Dec 2014 04:55:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418446503!13176006!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9117 invoked from network); 13 Dec 2014 04:55:04 -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; 13 Dec 2014 04:55:04 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XzejO-000584-NY for xen-changelog@lists.xensource.com; Sat, 13 Dec 2014 04:55:02 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1XzejO-00075O-Jq for xen-changelog@lists.xensource.com; Sat, 13 Dec 2014 04:55:02 +0000 Date: Sat, 13 Dec 2014 04:55:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.2] switch to write-biased r/w locks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 353de6b221c2d0fb59edfceb1f535357e4d84825 Author: Keir Fraser AuthorDate: Mon Dec 8 15:32:04 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 8 15:32:04 2014 +0100 switch to write-biased r/w locks This is to improve fairness: A permanent flow of read acquires can otherwise lock out eventual writers indefinitely. This is CVE-2014-9065 / XSA-114. Signed-off-by: Keir Fraser Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: 2a549b9c8aa48dc39d7c97e5a93978b781b3a1db master date: 2014-12-08 14:45:46 +0100 --- xen/common/spinlock.c | 136 ++++++++++++++++++++++++++-------------- xen/include/asm-arm/spinlock.h | 78 ----------------------- xen/include/asm-x86/spinlock.h | 54 ---------------- xen/include/xen/spinlock.h | 6 +- 4 files changed, 93 insertions(+), 181 deletions(-) diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c index bfb9670..b8d2352 100644 --- a/xen/common/spinlock.c +++ b/xen/common/spinlock.c @@ -271,112 +271,151 @@ void _spin_unlock_recursive(spinlock_t *lock) void _read_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); - } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } void _read_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_enable(); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); } unsigned long _read_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_read_trylock(&lock->raw)) ) - { - local_irq_restore(flags); - while ( likely(_raw_rw_is_write_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); - } + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return flags; } int _read_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_read_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + return 0; + } while ( cmpxchg(&lock->lock, x, x+1) != x ); preempt_disable(); return 1; } void _read_unlock(rwlock_t *lock) { + uint32_t x, y; + preempt_enable(); - _raw_read_unlock(&lock->raw); + x = lock->lock; + while ( (y = cmpxchg(&lock->lock, x, x-1)) != x ) + x = y; } void _read_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_enable(); } void _read_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_read_unlock(&lock->raw); + _read_unlock(lock); local_irq_restore(flags); } void _write_lock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) - { - while ( likely(_raw_rw_is_locked(&lock->raw)) ) + do { + while ( (x = lock->lock) & RW_WRITE_FLAG ) cpu_relax(); + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) + { + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } void _write_lock_irq(rwlock_t *lock) { + uint32_t x; + ASSERT(local_irq_is_enabled()); local_irq_disable(); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_enable(); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_disable(); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_enable(); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_disable(); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); } unsigned long _write_lock_irqsave(rwlock_t *lock) { + uint32_t x; unsigned long flags; + local_irq_save(flags); check_lock(&lock->debug); - while ( unlikely(!_raw_write_trylock(&lock->raw)) ) + do { + if ( (x = lock->lock) & RW_WRITE_FLAG ) + { + local_irq_restore(flags); + while ( (x = lock->lock) & RW_WRITE_FLAG ) + cpu_relax(); + local_irq_save(flags); + } + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); + while ( x != 0 ) { - local_irq_restore(flags); - while ( likely(_raw_rw_is_locked(&lock->raw)) ) - cpu_relax(); - local_irq_save(flags); + cpu_relax(); + x = lock->lock & ~RW_WRITE_FLAG; } preempt_disable(); return flags; @@ -384,9 +423,13 @@ unsigned long _write_lock_irqsave(rwlock_t *lock) int _write_trylock(rwlock_t *lock) { + uint32_t x; + check_lock(&lock->debug); - if ( !_raw_write_trylock(&lock->raw) ) - return 0; + do { + if ( (x = lock->lock) != 0 ) + return 0; + } while ( cmpxchg(&lock->lock, x, x|RW_WRITE_FLAG) != x ); preempt_disable(); return 1; } @@ -394,33 +437,32 @@ int _write_trylock(rwlock_t *lock) void _write_unlock(rwlock_t *lock) { preempt_enable(); - _raw_write_unlock(&lock->raw); + if ( cmpxchg(&lock->lock, RW_WRITE_FLAG, 0) != RW_WRITE_FLAG ) + BUG(); } void _write_unlock_irq(rwlock_t *lock) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_enable(); } void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags) { - preempt_enable(); - _raw_write_unlock(&lock->raw); + _write_unlock(lock); local_irq_restore(flags); } int _rw_is_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_locked(&lock->raw); + return (lock->lock != 0); /* anyone in critical section? */ } int _rw_is_write_locked(rwlock_t *lock) { check_lock(&lock->debug); - return _raw_rw_is_write_locked(&lock->raw); + return (lock->lock == RW_WRITE_FLAG); /* writer in critical section? */ } #ifdef LOCK_PROFILE diff --git a/xen/include/asm-arm/spinlock.h b/xen/include/asm-arm/spinlock.h index b1825c9..a9debba 100644 --- a/xen/include/asm-arm/spinlock.h +++ b/xen/include/asm-arm/spinlock.h @@ -55,84 +55,6 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) } } -typedef struct { - volatile unsigned int lock; -} raw_rwlock_t; - -#define _RAW_RW_LOCK_UNLOCKED { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2 = 1; - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" adds %0, %0, #1\n" -" strexpl %1, %0, [%2]\n" - : "=&r" (tmp), "+r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - smp_mb(); - return tmp2 == 0; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - unsigned long tmp; - - __asm__ __volatile__( -"1: ldrex %0, [%1]\n" -" teq %0, #0\n" -" strexeq %0, %2, [%1]" - : "=&r" (tmp) - : "r" (&rw->lock), "r" (0x80000000) - : "cc"); - - if (tmp == 0) { - smp_mb(); - return 1; - } else { - return 0; - } -} - -static inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - unsigned long tmp, tmp2; - - smp_mb(); - - __asm__ __volatile__( -"1: ldrex %0, [%2]\n" -" sub %0, %0, #1\n" -" strex %1, %0, [%2]\n" -" teq %1, #0\n" -" bne 1b" - : "=&r" (tmp), "=&r" (tmp2) - : "r" (&rw->lock) - : "cc"); - - if (tmp == 0) - dsb_sev(); -} - -static inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - smp_mb(); - - __asm__ __volatile__( - "str %1, [%0]\n" - : - : "r" (&rw->lock), "r" (0) - : "cc"); - - dsb_sev(); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock == 0x80000000) - #endif /* __ASM_SPINLOCK_H */ /* * Local variables: diff --git a/xen/include/asm-x86/spinlock.h b/xen/include/asm-x86/spinlock.h index 6bc044c..06d9b04 100644 --- a/xen/include/asm-x86/spinlock.h +++ b/xen/include/asm-x86/spinlock.h @@ -31,58 +31,4 @@ static always_inline int _raw_spin_trylock(raw_spinlock_t *lock) return (oldval > 0); } -typedef struct { - volatile int lock; -} raw_rwlock_t; - -#define RW_WRITE_BIAS 0x7fffffff -#define _RAW_RW_LOCK_UNLOCKED /*(raw_rwlock_t)*/ { 0 } - -static always_inline int _raw_read_trylock(raw_rwlock_t *rw) -{ - int acquired; - - asm volatile ( - " lock; decl %0 \n" - " jns 2f \n" -#ifdef __clang__ /* clang's builtin assember can't do .subsection */ - "1: .pushsection .fixup,\"ax\"\n" -#else - "1: .subsection 1 \n" -#endif - "2: lock; incl %0 \n" - " decl %1 \n" - " jmp 1b \n" -#ifdef __clang__ - " .popsection \n" -#else - " .subsection 0 \n" -#endif - : "=m" (rw->lock), "=r" (acquired) : "1" (1) : "memory" ); - - return acquired; -} - -static always_inline int _raw_write_trylock(raw_rwlock_t *rw) -{ - return (cmpxchg(&rw->lock, 0, RW_WRITE_BIAS) == 0); -} - -static always_inline void _raw_read_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; incl %0" - : "=m" ((rw)->lock) : : "memory" ); -} - -static always_inline void _raw_write_unlock(raw_rwlock_t *rw) -{ - asm volatile ( - "lock ; subl %1,%0" - : "=m" ((rw)->lock) : "i" (RW_WRITE_BIAS) : "memory" ); -} - -#define _raw_rw_is_locked(x) ((x)->lock != 0) -#define _raw_rw_is_write_locked(x) ((x)->lock > 0) - #endif /* __ASM_SPINLOCK_H */ diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h index 76581c5..4f743ba 100644 --- a/xen/include/xen/spinlock.h +++ b/xen/include/xen/spinlock.h @@ -141,11 +141,13 @@ typedef struct spinlock { #define spin_lock_init(l) (*(l) = (spinlock_t)SPIN_LOCK_UNLOCKED) typedef struct { - raw_rwlock_t raw; + volatile uint32_t lock; struct lock_debug debug; } rwlock_t; -#define RW_LOCK_UNLOCKED { _RAW_RW_LOCK_UNLOCKED, _LOCK_DEBUG } +#define RW_WRITE_FLAG (1u<<31) + +#define RW_LOCK_UNLOCKED { 0, _LOCK_DEBUG } #define DEFINE_RWLOCK(l) rwlock_t l = RW_LOCK_UNLOCKED #define rwlock_init(l) (*(l) = (rwlock_t)RW_LOCK_UNLOCKED) -- 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 Sun Dec 14 11:55:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lU-00029D-LT; Sun, 14 Dec 2014 11:55:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lT-000293-5e for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:07 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id D8/D2-09842-A9A7D845; Sun, 14 Dec 2014 11:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1418558105!15496020!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19999 invoked from network); 14 Dec 2014 11:55:06 -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; 14 Dec 2014 11:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lP-0008Fy-JV for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07lP-0007cY-Bn for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:03 +0000 Date: Sun, 14 Dec 2014 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] 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 c3ed5de85e7916d70ac8f1e741d5fe31c719004c Author: Julien Grall AuthorDate: Fri Jul 25 15:17:26 2014 +0100 Commit: Ian Campbell CommitDate: Wed Dec 10 12:06:35 2014 +0000 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 (cherry picked from commit 7b41618f5a08145b0198af4a8a2ce361d7e677e6) --- 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 850006c..86d4575 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -95,10 +95,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#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 Dec 14 11:55:13 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lU-00029D-LT; Sun, 14 Dec 2014 11:55:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lT-000293-5e for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:07 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id D8/D2-09842-A9A7D845; Sun, 14 Dec 2014 11:55:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1418558105!15496020!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19999 invoked from network); 14 Dec 2014 11:55:06 -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; 14 Dec 2014 11:55:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lP-0008Fy-JV for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07lP-0007cY-Bn for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:03 +0000 Date: Sun, 14 Dec 2014 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] 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 c3ed5de85e7916d70ac8f1e741d5fe31c719004c Author: Julien Grall AuthorDate: Fri Jul 25 15:17:26 2014 +0100 Commit: Ian Campbell CommitDate: Wed Dec 10 12:06:35 2014 +0000 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 (cherry picked from commit 7b41618f5a08145b0198af4a8a2ce361d7e677e6) --- 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 850006c..86d4575 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -95,10 +95,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#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 Dec 14 11:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07le-0002A2-R2; Sun, 14 Dec 2014 11:55:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07ld-00029q-Mk for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:17 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 03/C6-02957-5AA7D845; Sun, 14 Dec 2014 11:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1418558115!10303067!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17409 invoked from network); 14 Dec 2014 11:55: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; 14 Dec 2014 11:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lb-0008G1-40 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07la-0007cw-V9 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:14 +0000 Date: Sun, 14 Dec 2014 11:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] call vgic_en/disable_irqs holding the rank_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 dcb95321d24d3659d5bfa61fe9b0e0e5a5bfe32c Author: Stefano Stabellini AuthorDate: Tue Jun 24 19:30:00 2014 +0100 Commit: Ian Campbell CommitDate: Wed Dec 10 12:09:23 2014 +0000 call vgic_en/disable_irqs holding the rank_lock Modifying ienable and calling vgic_enable_irqs or vgic_disable_irqs need to be atomic. Move the calls to vgic_enable_irqs and vgic_disable_irqs before releasing the rank lock. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell [ ijc -- partial backport of just the locking part of 5b3a817ea33b "xen/arm: observe itargets setting in vgic_enable_irqs and vgic_disable_irqs" ] --- xen/arch/arm/vgic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 86d4575..8d1b79e 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -506,8 +506,8 @@ static int vgic_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); vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER); + vgic_unlock_rank(v, rank); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -517,8 +517,8 @@ static int vgic_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); vgic_disable_irqs(v, (*r) & tr, gicd_reg - GICD_ICENABLER); + vgic_unlock_rank(v, rank); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: -- 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 Dec 14 11:55:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11:55:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07le-0002A2-R2; Sun, 14 Dec 2014 11:55:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07ld-00029q-Mk for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:17 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 03/C6-02957-5AA7D845; Sun, 14 Dec 2014 11:55:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1418558115!10303067!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17409 invoked from network); 14 Dec 2014 11:55: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; 14 Dec 2014 11:55:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lb-0008G1-40 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07la-0007cw-V9 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:14 +0000 Date: Sun, 14 Dec 2014 11:55:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] call vgic_en/disable_irqs holding the rank_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 dcb95321d24d3659d5bfa61fe9b0e0e5a5bfe32c Author: Stefano Stabellini AuthorDate: Tue Jun 24 19:30:00 2014 +0100 Commit: Ian Campbell CommitDate: Wed Dec 10 12:09:23 2014 +0000 call vgic_en/disable_irqs holding the rank_lock Modifying ienable and calling vgic_enable_irqs or vgic_disable_irqs need to be atomic. Move the calls to vgic_enable_irqs and vgic_disable_irqs before releasing the rank lock. Signed-off-by: Stefano Stabellini Acked-by: Ian Campbell [ ijc -- partial backport of just the locking part of 5b3a817ea33b "xen/arm: observe itargets setting in vgic_enable_irqs and vgic_disable_irqs" ] --- xen/arch/arm/vgic.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 86d4575..8d1b79e 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -506,8 +506,8 @@ static int vgic_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); vgic_enable_irqs(v, (*r) & (~tr), gicd_reg - GICD_ISENABLER); + vgic_unlock_rank(v, rank); return 1; case GICD_ICENABLER ... GICD_ICENABLERN: @@ -517,8 +517,8 @@ static int vgic_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); vgic_disable_irqs(v, (*r) & tr, gicd_reg - GICD_ICENABLER); + vgic_unlock_rank(v, rank); return 1; case GICD_ISPENDR ... GICD_ISPENDRN: -- 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 Dec 14 11:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11: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 1Y07lo-0002BE-TU; Sun, 14 Dec 2014 11:55:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07ln-0002B3-PY for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:27 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A4/90-25714-FAA7D845; Sun, 14 Dec 2014 11:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418558125!13277382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5135 invoked from network); 14 Dec 2014 11:55:26 -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; 14 Dec 2014 11:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07ll-0008GA-81 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07ll-0007dI-6d for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:25 +0000 Date: Sun, 14 Dec 2014 11:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Handle platforms with edge-triggered virtual timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af73321f101962c69d48daf21bfe09b87a49b459 Author: Julien Grall AuthorDate: Fri Nov 28 15:17:06 2014 +0000 Commit: Ian Campbell CommitDate: Wed Dec 10 14:08:55 2014 +0000 xen/arm: Handle platforms with edge-triggered virtual timer Some platforms (such as Xgene and ARMv8 models) use an edge-triggered interrupt for the virtual timer. Even if the timer output signal is masked in the context switch, the GIC will keep track that of any interrupts raised while IRQs are disabled. As soon as IRQs are re-enabled, the virtual interrupt timer will be injected to Xen. If an idle vVCPU was scheduled next then the interrupt handler doesn't expect to the receive the IRQ and will crash: (XEN) [<0000000000228388>] _spin_lock_irqsave+0x28/0x94 (PC) (XEN) [<0000000000228380>] _spin_lock_irqsave+0x20/0x94 (LR) (XEN) [<0000000000250510>] vgic_vcpu_inject_irq+0x40/0x1b0 (XEN) [<000000000024bcd0>] vtimer_interrupt+0x4c/0x54 (XEN) [<0000000000247010>] do_IRQ+0x1a4/0x220 (XEN) [<0000000000244864>] gic_interrupt+0x50/0xec (XEN) [<000000000024fbac>] do_trap_irq+0x20/0x2c (XEN) [<0000000000255240>] hyp_irq+0x5c/0x60 (XEN) [<0000000000241084>] context_switch+0xb8/0xc4 (XEN) [<000000000022482c>] schedule+0x684/0x6d0 (XEN) [<000000000022785c>] __do_softirq+0xcc/0xe8 (XEN) [<00000000002278d4>] do_softirq+0x14/0x1c (XEN) [<0000000000240fac>] idle_loop+0x134/0x154 (XEN) [<000000000024c160>] start_secondary+0x14c/0x15c (XEN) [<0000000000000001>] 0000000000000001 The proper solution is to context switch the virtual interrupt state at the GIC level. This would also avoid masking the output signal which requires specific handling in the guest OS and more complex code in Xen to deal with EOIs, and so is desirable for that reason too. Sadly, this solution requires some refactoring which would not be suitable for a freeze exception for the Xen 4.5 release. For now implement a temporary solution which ignores the virtual timer interrupt when the idle VCPU is running. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- tweaked some wording in the comment ] (cherry picked from commit f688aec47c452d6aef382739d0781735672ef995) --- xen/arch/arm/time.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 5374bf7..170d1cd 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -213,6 +213,19 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { + /* + * Edge-triggered interrupts can be used for the virtual timer. Even + * if the timer output signal is masked in the context switch, the + * GIC will keep track that of any interrupts raised while IRQS are + * disabled. As soon as IRQs are re-enabled, the virtual interrupt + * will be injected to Xen. + * + * If an IDLE vCPU was scheduled next then we should ignore the + * interrupt. + */ + if ( unlikely(is_idle_vcpu(current)) ) + return; + current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq, 1); -- 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 Dec 14 11:55:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11: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 1Y07lo-0002BE-TU; Sun, 14 Dec 2014 11:55:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07ln-0002B3-PY for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:27 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A4/90-25714-FAA7D845; Sun, 14 Dec 2014 11:55:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1418558125!13277382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5135 invoked from network); 14 Dec 2014 11:55:26 -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; 14 Dec 2014 11:55:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07ll-0008GA-81 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07ll-0007dI-6d for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:25 +0000 Date: Sun, 14 Dec 2014 11:55:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: Handle platforms with edge-triggered virtual timer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af73321f101962c69d48daf21bfe09b87a49b459 Author: Julien Grall AuthorDate: Fri Nov 28 15:17:06 2014 +0000 Commit: Ian Campbell CommitDate: Wed Dec 10 14:08:55 2014 +0000 xen/arm: Handle platforms with edge-triggered virtual timer Some platforms (such as Xgene and ARMv8 models) use an edge-triggered interrupt for the virtual timer. Even if the timer output signal is masked in the context switch, the GIC will keep track that of any interrupts raised while IRQs are disabled. As soon as IRQs are re-enabled, the virtual interrupt timer will be injected to Xen. If an idle vVCPU was scheduled next then the interrupt handler doesn't expect to the receive the IRQ and will crash: (XEN) [<0000000000228388>] _spin_lock_irqsave+0x28/0x94 (PC) (XEN) [<0000000000228380>] _spin_lock_irqsave+0x20/0x94 (LR) (XEN) [<0000000000250510>] vgic_vcpu_inject_irq+0x40/0x1b0 (XEN) [<000000000024bcd0>] vtimer_interrupt+0x4c/0x54 (XEN) [<0000000000247010>] do_IRQ+0x1a4/0x220 (XEN) [<0000000000244864>] gic_interrupt+0x50/0xec (XEN) [<000000000024fbac>] do_trap_irq+0x20/0x2c (XEN) [<0000000000255240>] hyp_irq+0x5c/0x60 (XEN) [<0000000000241084>] context_switch+0xb8/0xc4 (XEN) [<000000000022482c>] schedule+0x684/0x6d0 (XEN) [<000000000022785c>] __do_softirq+0xcc/0xe8 (XEN) [<00000000002278d4>] do_softirq+0x14/0x1c (XEN) [<0000000000240fac>] idle_loop+0x134/0x154 (XEN) [<000000000024c160>] start_secondary+0x14c/0x15c (XEN) [<0000000000000001>] 0000000000000001 The proper solution is to context switch the virtual interrupt state at the GIC level. This would also avoid masking the output signal which requires specific handling in the guest OS and more complex code in Xen to deal with EOIs, and so is desirable for that reason too. Sadly, this solution requires some refactoring which would not be suitable for a freeze exception for the Xen 4.5 release. For now implement a temporary solution which ignores the virtual timer interrupt when the idle VCPU is running. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- tweaked some wording in the comment ] (cherry picked from commit f688aec47c452d6aef382739d0781735672ef995) --- xen/arch/arm/time.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 5374bf7..170d1cd 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -213,6 +213,19 @@ static void timer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) static void vtimer_interrupt(int irq, void *dev_id, struct cpu_user_regs *regs) { + /* + * Edge-triggered interrupts can be used for the virtual timer. Even + * if the timer output signal is masked in the context switch, the + * GIC will keep track that of any interrupts raised while IRQS are + * disabled. As soon as IRQs are re-enabled, the virtual interrupt + * will be injected to Xen. + * + * If an IDLE vCPU was scheduled next then we should ignore the + * interrupt. + */ + if ( unlikely(is_idle_vcpu(current)) ) + return; + current->arch.virt_timer.ctl = READ_SYSREG32(CNTV_CTL_EL0); WRITE_SYSREG32(current->arch.virt_timer.ctl | CNTx_CTL_MASK, CNTV_CTL_EL0); vgic_vcpu_inject_irq(current, current->arch.virt_timer.irq, 1); -- 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 Dec 14 11:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11:55: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 1Y07ly-0002Cf-WD; Sun, 14 Dec 2014 11:55:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lx-0002CP-TR for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:38 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 40/53-02698-9BA7D845; Sun, 14 Dec 2014 11:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1418558135!14944795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20617 invoked from network); 14 Dec 2014 11:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Dec 2014 11:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lv-0008GI-DR for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07lv-0007di-C1 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:35 +0000 Date: Sun, 14 Dec 2014 11:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: dump guest stack even if not the current VCPU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bb6b2722be1e27f99948e5c68f7f42eb23f8e53 Author: Frediano Ziglio AuthorDate: Thu Oct 23 17:18:52 2014 +0100 Commit: Ian Campbell CommitDate: Wed Dec 10 14:09:35 2014 +0000 xen/arm: dump guest stack even if not the current VCPU If show_guest_stack was called from Xen context (for instance hitting '0' key on Xen console) get_page_from_gva was not able to get the page returning NULL. Detecting different domain and changing VTTBR register make get_page_from_gva works for different domains. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell (cherry picked from commit 281c892e3bdb0a56cfd8ab6516cd1a33c095c857) --- xen/arch/arm/p2m.c | 24 ++++++++++++++++++++---- xen/arch/arm/traps.c | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index bc81b67..aff7a2c 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -688,13 +688,29 @@ struct page_info *get_page_from_gva(struct domain *d, vaddr_t va, { struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page = NULL; - paddr_t maddr; - - ASSERT(d == current->domain); + paddr_t maddr = 0; + int rc; spin_lock(&p2m->lock); - if ( gvirt_to_maddr(va, &maddr, flags) ) + if ( unlikely(d != current->domain) ) + { + unsigned long irq_flags; + + local_irq_save(irq_flags); + p2m_load_VTTBR(d); + + rc = gvirt_to_maddr(va, &maddr, flags); + + p2m_load_VTTBR(current->domain); + local_irq_restore(irq_flags); + } + else + { + rc = gvirt_to_maddr(va, &maddr, flags); + } + + if ( rc ) goto err; if ( !mfn_valid(maddr >> PAGE_SHIFT) ) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 4c910c8..d527409 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -888,7 +888,7 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) return; } - page = get_page_from_gva(current->domain, sp, GV2M_READ); + page = get_page_from_gva(v->domain, sp, GV2M_READ); if ( page == NULL ) { printk("Failed to convert stack to physical address\n"); -- 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 Dec 14 11:55:39 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 14 Dec 2014 11:55: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 1Y07ly-0002Cf-WD; Sun, 14 Dec 2014 11:55:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lx-0002CP-TR for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:38 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 40/53-02698-9BA7D845; Sun, 14 Dec 2014 11:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1418558135!14944795!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20617 invoked from network); 14 Dec 2014 11:55:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 14 Dec 2014 11:55:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y07lv-0008GI-DR for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y07lv-0007di-C1 for xen-changelog@lists.xensource.com; Sun, 14 Dec 2014 11:55:35 +0000 Date: Sun, 14 Dec 2014 11:55:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] xen/arm: dump guest stack even if not the current VCPU X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7bb6b2722be1e27f99948e5c68f7f42eb23f8e53 Author: Frediano Ziglio AuthorDate: Thu Oct 23 17:18:52 2014 +0100 Commit: Ian Campbell CommitDate: Wed Dec 10 14:09:35 2014 +0000 xen/arm: dump guest stack even if not the current VCPU If show_guest_stack was called from Xen context (for instance hitting '0' key on Xen console) get_page_from_gva was not able to get the page returning NULL. Detecting different domain and changing VTTBR register make get_page_from_gva works for different domains. Signed-off-by: Frediano Ziglio Acked-by: Ian Campbell (cherry picked from commit 281c892e3bdb0a56cfd8ab6516cd1a33c095c857) --- xen/arch/arm/p2m.c | 24 ++++++++++++++++++++---- xen/arch/arm/traps.c | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index bc81b67..aff7a2c 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -688,13 +688,29 @@ struct page_info *get_page_from_gva(struct domain *d, vaddr_t va, { struct p2m_domain *p2m = &d->arch.p2m; struct page_info *page = NULL; - paddr_t maddr; - - ASSERT(d == current->domain); + paddr_t maddr = 0; + int rc; spin_lock(&p2m->lock); - if ( gvirt_to_maddr(va, &maddr, flags) ) + if ( unlikely(d != current->domain) ) + { + unsigned long irq_flags; + + local_irq_save(irq_flags); + p2m_load_VTTBR(d); + + rc = gvirt_to_maddr(va, &maddr, flags); + + p2m_load_VTTBR(current->domain); + local_irq_restore(irq_flags); + } + else + { + rc = gvirt_to_maddr(va, &maddr, flags); + } + + if ( rc ) goto err; if ( !mfn_valid(maddr >> PAGE_SHIFT) ) diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 4c910c8..d527409 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -888,7 +888,7 @@ static void show_guest_stack(struct vcpu *v, struct cpu_user_regs *regs) return; } - page = get_page_from_gva(current->domain, sp, GV2M_READ); + page = get_page_from_gva(v->domain, sp, GV2M_READ); if ( page == NULL ) { printk("Failed to convert stack to physical address\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Mon Dec 15 15:33:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Dec 2014 15:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xe0-0000aR-EZ; Mon, 15 Dec 2014 15:33:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xdz-0000aE-RG for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:07 +0000 Content-Length: 1844 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id A3/AF-29352-33FFE845; Mon, 15 Dec 2014 15:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1418657585!8140010!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10605 invoked from network); 15 Dec 2014 15:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Dec 2014 15:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xdv-0000q4-Kn for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0Xdv-0002a9-Hz for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:03 +0000 Date: Mon, 15 Dec 2014 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: don't allow PVH to reach handle_mmio() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6926632929143000322==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6926632929143000322== Content-Length: 1428 Content-Transfer-Encoding: quoted-printable commit 4d1308afaafa43ff68d6ecc493e36ee8f3ac9942 Author: Jan Beulich AuthorDate: Thu Dec 11 12:24:05 2014 +0100 Commit: Jan Beulich CommitDate: Thu Dec 11 12:24:05 2014 +0100 VMX: don't allow PVH to reach handle_mmio() PVH guests accessing I/O ports via string ops is not supported yet. Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich Acked-by: Mukesh Rathor Acked-by: Roger Pau Monn=C3=A9 Acked-by: Kevin Tian Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/vmx/vmx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0bf92b2..f2554d6 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3086,7 +3086,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) if ( exit_qualification & 0x10 ) { /* INS, OUTS */ - if ( !handle_mmio() ) + if ( unlikely(is_pvh_vcpu(v)) /* PVH fixme */ || + !handle_mmio() ) hvm_inject_hw_exception(TRAP_gp_fault, 0); } else -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6926632929143000322== 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 --===============6926632929143000322==-- From xen-changelog-bounces@lists.xen.org Mon Dec 15 15:33:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Dec 2014 15:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xe0-0000aR-EZ; Mon, 15 Dec 2014 15:33:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xdz-0000aE-RG for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:07 +0000 Content-Length: 1844 Received: from [85.158.139.211] by server-16.bemta-5.messagelabs.com id A3/AF-29352-33FFE845; Mon, 15 Dec 2014 15:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1418657585!8140010!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10605 invoked from network); 15 Dec 2014 15:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 15 Dec 2014 15:33:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xdv-0000q4-Kn for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0Xdv-0002a9-Hz for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:03 +0000 Date: Mon, 15 Dec 2014 15:33:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: don't allow PVH to reach handle_mmio() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6926632929143000322==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6926632929143000322== Content-Length: 1428 Content-Transfer-Encoding: quoted-printable commit 4d1308afaafa43ff68d6ecc493e36ee8f3ac9942 Author: Jan Beulich AuthorDate: Thu Dec 11 12:24:05 2014 +0100 Commit: Jan Beulich CommitDate: Thu Dec 11 12:24:05 2014 +0100 VMX: don't allow PVH to reach handle_mmio() PVH guests accessing I/O ports via string ops is not supported yet. Reported-by: Roger Pau Monn=C3=A9 Signed-off-by: Jan Beulich Acked-by: Mukesh Rathor Acked-by: Roger Pau Monn=C3=A9 Acked-by: Kevin Tian Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/vmx/vmx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 0bf92b2..f2554d6 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3086,7 +3086,8 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) if ( exit_qualification & 0x10 ) { /* INS, OUTS */ - if ( !handle_mmio() ) + if ( unlikely(is_pvh_vcpu(v)) /* PVH fixme */ || + !handle_mmio() ) hvm_inject_hw_exception(TRAP_gp_fault, 0); } else -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6926632929143000322== 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 --===============6926632929143000322==-- From xen-changelog-bounces@lists.xen.org Mon Dec 15 15:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Dec 2014 15: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 1Y0XeB-0000cH-HR; Mon, 15 Dec 2014 15: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 1Y0XeA-0000bz-Hk for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:18 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 41/70-09842-D3FFE845; Mon, 15 Dec 2014 15:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1418657595!15698391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25631 invoked from network); 15 Dec 2014 15:33:16 -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; 15 Dec 2014 15:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xe7-0000qA-Jo for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0Xe7-0002ad-F7 for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:15 +0000 Date: Mon, 15 Dec 2014 15:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lock down hypercall continuation encoding masks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ef6b5f16c8a91cf6592f8817720a9de95b7052c Author: Jan Beulich AuthorDate: Thu Dec 11 17:13:04 2014 +0100 Commit: Jan Beulich CommitDate: Thu Dec 11 17:13:04 2014 +0100 lock down hypercall continuation encoding masks Andrew validly points out that even if these masks aren't a formal part of the hypercall interface, we aren't free to change them: A guest suspended for migration in the middle of a continuation would fail to work if resumed on a hypervisor using a different value. Hence add respective comments to their definitions. Additionally, to help future extensibility as well as in the spirit of reducing undefined behavior as much as possible, refuse hypercalls made with the respective bits non-zero when the respective sub-ops don't make use of those bits. Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Tim Deegan Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/hvm.c | 24 +++++++++++++++++++++--- xen/arch/x86/mm.c | 9 ++++----- xen/arch/x86/x86_64/compat/mm.c | 7 +++---- xen/arch/x86/x86_64/mm.c | 7 +++---- xen/common/compat/grant_table.c | 2 ++ xen/common/grant_table.c | 11 ++++++++++- xen/common/mem_access.c | 18 ++++++++++++------ xen/common/memory.c | 18 ++++++++++++++++++ xen/include/xen/hypercall.h | 5 +++++ 9 files changed, 78 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 51ffc90..bc414ff 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5458,16 +5458,34 @@ static int hvmop_destroy_ioreq_server( return rc; } +/* + * Note that this value is effectively part of the ABI, even if we don't need + * to make it a formal part of it: A guest suspended for migration in the + * middle of a continuation would fail to work if resumed on a hypervisor + * using a different value. + */ #define HVMOP_op_mask 0xff long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *curr_d = current->domain; - unsigned long start_iter = op & ~HVMOP_op_mask; + unsigned long start_iter, mask; long rc = 0; - switch ( op &= HVMOP_op_mask ) + switch ( op & HVMOP_op_mask ) + { + default: + mask = ~0UL; + break; + case HVMOP_modified_memory: + case HVMOP_set_mem_type: + mask = HVMOP_op_mask; + break; + } + + start_iter = op & ~mask; + switch ( op &= mask ) { case HVMOP_create_ioreq_server: rc = hvmop_create_ioreq_server( @@ -6120,7 +6138,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) if ( rc == -ERESTART ) { - ASSERT(!(start_iter & HVMOP_op_mask)); + ASSERT(!(start_iter & mask)); rc = hypercall_create_continuation(__HYPERVISOR_hvm_op, "lh", op | start_iter, arg); } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 522c43d..6e9c2c0 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4661,9 +4661,8 @@ int xenmem_add_to_physmap_one( long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { int rc; - int op = cmd & MEMOP_CMD_MASK; - switch ( op ) + switch ( cmd ) { case XENMEM_set_memory_map: { @@ -4837,7 +4836,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( d == NULL ) return -ESRCH; - if ( op == XENMEM_set_pod_target ) + if ( cmd == XENMEM_set_pod_target ) rc = xsm_set_pod_target(XSM_PRIV, d); else rc = xsm_get_pod_target(XSM_PRIV, d); @@ -4845,7 +4844,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( rc != 0 ) goto pod_target_out_unlock; - if ( op == XENMEM_set_pod_target ) + if ( cmd == XENMEM_set_pod_target ) { if ( target.target_pages > d->max_pages ) { @@ -4859,7 +4858,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( rc == -ERESTART ) { rc = hypercall_create_continuation( - __HYPERVISOR_memory_op, "lh", op, arg); + __HYPERVISOR_memory_op, "lh", cmd, arg); } else if ( rc >= 0 ) { diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index dce3f1f..f90f611 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -53,9 +53,8 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) compat_pfn_t mfn; unsigned int i; int rc = 0; - int op = cmd & MEMOP_CMD_MASK; - switch ( op ) + switch ( cmd ) { case XENMEM_set_memory_map: { @@ -192,7 +191,7 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_mem_event_op_t meo; if ( copy_from_guest(&meo, arg, 1) ) return -EFAULT; - rc = do_mem_event_op(op, meo.domain, (void *) &meo); + rc = do_mem_event_op(cmd, meo.domain, &meo); if ( !rc && __copy_to_guest(arg, &meo, 1) ) return -EFAULT; break; @@ -205,7 +204,7 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return -EFAULT; if ( mso.op == XENMEM_sharing_op_audit ) return mem_sharing_audit(); - rc = do_mem_event_op(op, mso.domain, (void *) &mso); + rc = do_mem_event_op(cmd, mso.domain, &mso); if ( !rc && __copy_to_guest(arg, &mso, 1) ) return -EFAULT; break; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 8e5a1a1..d631aee 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -906,9 +906,8 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_pfn_t mfn, last_mfn; unsigned int i; long rc = 0; - int op = cmd & MEMOP_CMD_MASK; - switch ( op ) + switch ( cmd ) { case XENMEM_machphys_mfn_list: if ( copy_from_guest(&xmml, arg, 1) ) @@ -989,7 +988,7 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_mem_event_op_t meo; if ( copy_from_guest(&meo, arg, 1) ) return -EFAULT; - rc = do_mem_event_op(op, meo.domain, (void *) &meo); + rc = do_mem_event_op(cmd, meo.domain, &meo); if ( !rc && __copy_to_guest(arg, &meo, 1) ) return -EFAULT; break; @@ -1002,7 +1001,7 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return -EFAULT; if ( mso.op == XENMEM_sharing_op_audit ) return mem_sharing_audit(); - rc = do_mem_event_op(op, mso.domain, (void *) &mso); + rc = do_mem_event_op(cmd, mso.domain, &mso); if ( !rc && __copy_to_guest(arg, &mso, 1) ) return -EFAULT; break; diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index 0368289..f8c60a1 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -65,6 +65,8 @@ int compat_grant_table_op(unsigned int cmd, set_xen_guest_handle(cnt_uop, NULL); cmd_op = cmd & GNTTABOP_CMD_MASK; + if ( cmd_op != GNTTABOP_cache_flush ) + cmd_op = cmd; switch ( cmd_op ) { #define CASE(name) \ diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 8fba923..fe52b63 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -62,6 +62,12 @@ integer_param("gnttab_max_frames", max_grant_frames); static unsigned int __read_mostly max_maptrack_frames; integer_param("gnttab_max_maptrack_frames", max_maptrack_frames); +/* + * Note that the three values below are effectively part of the ABI, even if + * we don't need to make them a formal part of it: A guest suspended for + * migration in the middle of a continuation would fail to work if resumed on + * a hypervisor using different values. + */ #define GNTTABOP_CONTINUATION_ARG_SHIFT 12 #define GNTTABOP_CMD_MASK ((1< domain_get_maximum_gpfn(d)) && mao.pfn != ~0ull ) break; diff --git a/xen/common/memory.c b/xen/common/memory.c index 9f21bd3..234dae6 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -779,16 +779,25 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; case XENMEM_exchange: + if ( unlikely(start_extent) ) + return -ENOSYS; + rc = memory_exchange(guest_handle_cast(arg, xen_memory_exchange_t)); break; case XENMEM_maximum_ram_page: + if ( unlikely(start_extent) ) + return -ENOSYS; + rc = max_page; break; case XENMEM_current_reservation: case XENMEM_maximum_reservation: case XENMEM_maximum_gpfn: + if ( unlikely(start_extent) ) + return -ENOSYS; + if ( copy_from_guest(&domid, arg, 1) ) return -EFAULT; @@ -912,6 +921,9 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct page_info *page; struct domain *d; + if ( unlikely(start_extent) ) + return -ENOSYS; + if ( copy_from_guest(&xrfp, arg, 1) ) return -EFAULT; @@ -945,6 +957,9 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; case XENMEM_claim_pages: + if ( unlikely(start_extent) ) + return -ENOSYS; + if ( copy_from_guest(&reservation, arg, 1) ) return -EFAULT; @@ -977,6 +992,9 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) unsigned int dom_vnodes, dom_vranges, dom_vcpus; struct vnuma_info tmp; + if ( unlikely(start_extent) ) + return -ENOSYS; + /* * Guest passes nr_vnodes, number of regions and nr_vcpus thus * we know how much memory guest has allocated. diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index a9e5229..8c55779 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -57,6 +57,11 @@ do_platform_op( * To allow safe resume of do_memory_op() after preemption, we need to know * at what point in the page list to resume. For this purpose I steal the * high-order bits of the @cmd parameter, which are otherwise unused and zero. + * + * Note that both of these values are effectively part of the ABI, even if + * we don't need to make them a formal part of it: A guest suspended for + * migration in the middle of a continuation would fail to work if resumed on + * a hypervisor using different values. */ #define MEMOP_EXTENT_SHIFT 6 /* cmd[:6] == start_extent */ #define MEMOP_CMD_MASK ((1 << MEMOP_EXTENT_SHIFT) - 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 Dec 15 15:33:19 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Dec 2014 15: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 1Y0XeB-0000cH-HR; Mon, 15 Dec 2014 15: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 1Y0XeA-0000bz-Hk for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:18 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 41/70-09842-D3FFE845; Mon, 15 Dec 2014 15:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1418657595!15698391!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25631 invoked from network); 15 Dec 2014 15:33:16 -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; 15 Dec 2014 15:33:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0Xe7-0000qA-Jo for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0Xe7-0002ad-F7 for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:15 +0000 Date: Mon, 15 Dec 2014 15:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] lock down hypercall continuation encoding masks X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4ef6b5f16c8a91cf6592f8817720a9de95b7052c Author: Jan Beulich AuthorDate: Thu Dec 11 17:13:04 2014 +0100 Commit: Jan Beulich CommitDate: Thu Dec 11 17:13:04 2014 +0100 lock down hypercall continuation encoding masks Andrew validly points out that even if these masks aren't a formal part of the hypercall interface, we aren't free to change them: A guest suspended for migration in the middle of a continuation would fail to work if resumed on a hypervisor using a different value. Hence add respective comments to their definitions. Additionally, to help future extensibility as well as in the spirit of reducing undefined behavior as much as possible, refuse hypercalls made with the respective bits non-zero when the respective sub-ops don't make use of those bits. Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Ian Campbell Acked-by: Tim Deegan Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/x86/hvm/hvm.c | 24 +++++++++++++++++++++--- xen/arch/x86/mm.c | 9 ++++----- xen/arch/x86/x86_64/compat/mm.c | 7 +++---- xen/arch/x86/x86_64/mm.c | 7 +++---- xen/common/compat/grant_table.c | 2 ++ xen/common/grant_table.c | 11 ++++++++++- xen/common/mem_access.c | 18 ++++++++++++------ xen/common/memory.c | 18 ++++++++++++++++++ xen/include/xen/hypercall.h | 5 +++++ 9 files changed, 78 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 51ffc90..bc414ff 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5458,16 +5458,34 @@ static int hvmop_destroy_ioreq_server( return rc; } +/* + * Note that this value is effectively part of the ABI, even if we don't need + * to make it a formal part of it: A guest suspended for migration in the + * middle of a continuation would fail to work if resumed on a hypervisor + * using a different value. + */ #define HVMOP_op_mask 0xff long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *curr_d = current->domain; - unsigned long start_iter = op & ~HVMOP_op_mask; + unsigned long start_iter, mask; long rc = 0; - switch ( op &= HVMOP_op_mask ) + switch ( op & HVMOP_op_mask ) + { + default: + mask = ~0UL; + break; + case HVMOP_modified_memory: + case HVMOP_set_mem_type: + mask = HVMOP_op_mask; + break; + } + + start_iter = op & ~mask; + switch ( op &= mask ) { case HVMOP_create_ioreq_server: rc = hvmop_create_ioreq_server( @@ -6120,7 +6138,7 @@ long do_hvm_op(unsigned long op, XEN_GUEST_HANDLE_PARAM(void) arg) if ( rc == -ERESTART ) { - ASSERT(!(start_iter & HVMOP_op_mask)); + ASSERT(!(start_iter & mask)); rc = hypercall_create_continuation(__HYPERVISOR_hvm_op, "lh", op | start_iter, arg); } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 522c43d..6e9c2c0 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4661,9 +4661,8 @@ int xenmem_add_to_physmap_one( long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { int rc; - int op = cmd & MEMOP_CMD_MASK; - switch ( op ) + switch ( cmd ) { case XENMEM_set_memory_map: { @@ -4837,7 +4836,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( d == NULL ) return -ESRCH; - if ( op == XENMEM_set_pod_target ) + if ( cmd == XENMEM_set_pod_target ) rc = xsm_set_pod_target(XSM_PRIV, d); else rc = xsm_get_pod_target(XSM_PRIV, d); @@ -4845,7 +4844,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( rc != 0 ) goto pod_target_out_unlock; - if ( op == XENMEM_set_pod_target ) + if ( cmd == XENMEM_set_pod_target ) { if ( target.target_pages > d->max_pages ) { @@ -4859,7 +4858,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( rc == -ERESTART ) { rc = hypercall_create_continuation( - __HYPERVISOR_memory_op, "lh", op, arg); + __HYPERVISOR_memory_op, "lh", cmd, arg); } else if ( rc >= 0 ) { diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index dce3f1f..f90f611 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -53,9 +53,8 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) compat_pfn_t mfn; unsigned int i; int rc = 0; - int op = cmd & MEMOP_CMD_MASK; - switch ( op ) + switch ( cmd ) { case XENMEM_set_memory_map: { @@ -192,7 +191,7 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_mem_event_op_t meo; if ( copy_from_guest(&meo, arg, 1) ) return -EFAULT; - rc = do_mem_event_op(op, meo.domain, (void *) &meo); + rc = do_mem_event_op(cmd, meo.domain, &meo); if ( !rc && __copy_to_guest(arg, &meo, 1) ) return -EFAULT; break; @@ -205,7 +204,7 @@ int compat_arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return -EFAULT; if ( mso.op == XENMEM_sharing_op_audit ) return mem_sharing_audit(); - rc = do_mem_event_op(op, mso.domain, (void *) &mso); + rc = do_mem_event_op(cmd, mso.domain, &mso); if ( !rc && __copy_to_guest(arg, &mso, 1) ) return -EFAULT; break; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 8e5a1a1..d631aee 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -906,9 +906,8 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_pfn_t mfn, last_mfn; unsigned int i; long rc = 0; - int op = cmd & MEMOP_CMD_MASK; - switch ( op ) + switch ( cmd ) { case XENMEM_machphys_mfn_list: if ( copy_from_guest(&xmml, arg, 1) ) @@ -989,7 +988,7 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) xen_mem_event_op_t meo; if ( copy_from_guest(&meo, arg, 1) ) return -EFAULT; - rc = do_mem_event_op(op, meo.domain, (void *) &meo); + rc = do_mem_event_op(cmd, meo.domain, &meo); if ( !rc && __copy_to_guest(arg, &meo, 1) ) return -EFAULT; break; @@ -1002,7 +1001,7 @@ long subarch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return -EFAULT; if ( mso.op == XENMEM_sharing_op_audit ) return mem_sharing_audit(); - rc = do_mem_event_op(op, mso.domain, (void *) &mso); + rc = do_mem_event_op(cmd, mso.domain, &mso); if ( !rc && __copy_to_guest(arg, &mso, 1) ) return -EFAULT; break; diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index 0368289..f8c60a1 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -65,6 +65,8 @@ int compat_grant_table_op(unsigned int cmd, set_xen_guest_handle(cnt_uop, NULL); cmd_op = cmd & GNTTABOP_CMD_MASK; + if ( cmd_op != GNTTABOP_cache_flush ) + cmd_op = cmd; switch ( cmd_op ) { #define CASE(name) \ diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 8fba923..fe52b63 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -62,6 +62,12 @@ integer_param("gnttab_max_frames", max_grant_frames); static unsigned int __read_mostly max_maptrack_frames; integer_param("gnttab_max_maptrack_frames", max_maptrack_frames); +/* + * Note that the three values below are effectively part of the ABI, even if + * we don't need to make them a formal part of it: A guest suspended for + * migration in the middle of a continuation would fail to work if resumed on + * a hypervisor using different values. + */ #define GNTTABOP_CONTINUATION_ARG_SHIFT 12 #define GNTTABOP_CMD_MASK ((1< domain_get_maximum_gpfn(d)) && mao.pfn != ~0ull ) break; diff --git a/xen/common/memory.c b/xen/common/memory.c index 9f21bd3..234dae6 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -779,16 +779,25 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; case XENMEM_exchange: + if ( unlikely(start_extent) ) + return -ENOSYS; + rc = memory_exchange(guest_handle_cast(arg, xen_memory_exchange_t)); break; case XENMEM_maximum_ram_page: + if ( unlikely(start_extent) ) + return -ENOSYS; + rc = max_page; break; case XENMEM_current_reservation: case XENMEM_maximum_reservation: case XENMEM_maximum_gpfn: + if ( unlikely(start_extent) ) + return -ENOSYS; + if ( copy_from_guest(&domid, arg, 1) ) return -EFAULT; @@ -912,6 +921,9 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) struct page_info *page; struct domain *d; + if ( unlikely(start_extent) ) + return -ENOSYS; + if ( copy_from_guest(&xrfp, arg, 1) ) return -EFAULT; @@ -945,6 +957,9 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; case XENMEM_claim_pages: + if ( unlikely(start_extent) ) + return -ENOSYS; + if ( copy_from_guest(&reservation, arg, 1) ) return -EFAULT; @@ -977,6 +992,9 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) unsigned int dom_vnodes, dom_vranges, dom_vcpus; struct vnuma_info tmp; + if ( unlikely(start_extent) ) + return -ENOSYS; + /* * Guest passes nr_vnodes, number of regions and nr_vcpus thus * we know how much memory guest has allocated. diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index a9e5229..8c55779 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -57,6 +57,11 @@ do_platform_op( * To allow safe resume of do_memory_op() after preemption, we need to know * at what point in the page list to resume. For this purpose I steal the * high-order bits of the @cmd parameter, which are otherwise unused and zero. + * + * Note that both of these values are effectively part of the ABI, even if + * we don't need to make them a formal part of it: A guest suspended for + * migration in the middle of a continuation would fail to work if resumed on + * a hypervisor using different values. */ #define MEMOP_EXTENT_SHIFT 6 /* cmd[:6] == start_extent */ #define MEMOP_CMD_MASK ((1 << MEMOP_EXTENT_SHIFT) - 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 Dec 15 15:33:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Dec 2014 15: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 1Y0XeM-0000eD-Lm; Mon, 15 Dec 2014 15:33:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0XeL-0000e0-NM for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:29 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id C2/52-20609-94FFE845; Mon, 15 Dec 2014 15:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1418657606!10530759!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24351 invoked from network); 15 Dec 2014 15:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Dec 2014 15:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0XeH-0000qG-Rw for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0XeH-0002bG-Nz for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:25 +0000 Date: Mon, 15 Dec 2014 15:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] have architectures specify the number of PIRQs a hardware domain gets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e73a6e7f12ae080222c5d339799905de3443a6e Author: Jan Beulich AuthorDate: Thu Dec 11 17:14:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Dec 11 17:14:07 2014 +0100 have architectures specify the number of PIRQs a hardware domain gets The current value of nr_static_irqs + 256 is often too small for larger systems. Make it dependent on CPU count and number of IO-APIC pins on x86, and (until it obtains PCI support) simply NR_IRQS on ARM. Signed-off-by: Jan Beulich Acked-by: David Vrabel Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- docs/misc/xen-command-line.markdown | 7 +++++-- xen/arch/x86/domain_build.c | 9 ++++++++- xen/arch/x86/io_apic.c | 12 ++++++++++++ xen/common/domain.c | 7 ++++--- xen/include/asm-arm/irq.h | 2 +- xen/include/asm-x86/setup.h | 2 ++ xen/include/xen/irq.h | 4 ++++ 7 files changed, 36 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 311316a..1e8c024 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -596,13 +596,16 @@ Force or disable use of EFI runtime services. ### extra\_guest\_irqs > `= [][,]` -> Default: `32,256` +> Default: `32,` Change the number of PIRQs available for guests. The optional first number is common for all domUs, while the optional second number (preceded by a comma) is for dom0. Changing the setting for domU has no impact on dom0 and vice versa. For example to change dom0 without changing domU, use -`extra_guest_irqs=,512` +`extra_guest_irqs=,512`. The default value for Dom0 and an eventual separate +hardware domain is architecture dependent. +Note that specifying zero as domU value means zero, while for dom0 it means +to use the default. ### flask\_enabled > `= ` diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 7a6afea..7993b17 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -101,7 +101,7 @@ static void __init parse_dom0_max_vcpus(const char *s) } custom_param("dom0_max_vcpus", parse_dom0_max_vcpus); -struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) +unsigned int __init dom0_max_vcpus(void) { unsigned max_vcpus; @@ -113,6 +113,13 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) if ( max_vcpus > MAX_VIRT_CPUS ) max_vcpus = MAX_VIRT_CPUS; + return max_vcpus; +} + +struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) +{ + unsigned int max_vcpus = dom0_max_vcpus(); + dom0->vcpu = xzalloc_array(struct vcpu *, max_vcpus); if ( !dom0->vcpu ) return NULL; diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 6f8f62c..01f816b 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -2606,3 +2607,14 @@ void __init init_ioapic_mappings(void) nr_irqs_gsi, nr_irqs - nr_irqs_gsi); } +unsigned int arch_hwdom_irqs(domid_t domid) +{ + unsigned int n = fls(num_present_cpus()); + + if ( !domid ) + n = min(n, dom0_max_vcpus()); + n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, nr_irqs); + printk("Dom%d has maximum %u PIRQs\n", domid, n); + + return n; +} diff --git a/xen/common/domain.c b/xen/common/domain.c index 4a62c1d..336e9ea 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -231,14 +231,14 @@ static int late_hwdom_init(struct domain *d) #endif } -static unsigned int __read_mostly extra_dom0_irqs = 256; +static unsigned int __read_mostly extra_hwdom_irqs; static unsigned int __read_mostly extra_domU_irqs = 32; static void __init parse_extra_guest_irqs(const char *s) { if ( isdigit(*s) ) extra_domU_irqs = simple_strtoul(s, &s, 0); if ( *s == ',' && isdigit(*++s) ) - extra_dom0_irqs = simple_strtoul(s, &s, 0); + extra_hwdom_irqs = simple_strtoul(s, &s, 0); } custom_param("extra_guest_irqs", parse_extra_guest_irqs); @@ -326,7 +326,8 @@ struct domain *domain_create( if ( !is_hardware_domain(d) ) d->nr_pirqs = nr_static_irqs + extra_domU_irqs; else - d->nr_pirqs = nr_static_irqs + extra_dom0_irqs; + d->nr_pirqs = extra_hwdom_irqs ? nr_static_irqs + extra_hwdom_irqs + : arch_hwdom_irqs(domid); if ( d->nr_pirqs > nr_irqs ) d->nr_pirqs = nr_irqs; diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index e877334..435dfcd 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -21,10 +21,10 @@ struct arch_irq_desc { #define NR_LOCAL_IRQS 32 #define NR_IRQS 1024 -#define nr_irqs NR_IRQS #define nr_irqs NR_IRQS #define nr_static_irqs NR_IRQS +#define arch_hwdom_irqs(domid) NR_IRQS struct irq_desc; struct irqaction; diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 8f8c6f3..762eb02 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -35,6 +35,8 @@ int construct_dom0( unsigned long initial_images_nrpages(void); void discard_initial_images(void); +unsigned int dom0_max_vcpus(void); + int xen_in_range(unsigned long mfn); void microcode_grab_module( diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index ffb5932..9e0155c 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -168,4 +168,8 @@ static inline void set_native_irq_info(unsigned int irq, const cpumask_t *mask) unsigned int set_desc_affinity(struct irq_desc *, const cpumask_t *); +#ifndef arch_hwdom_irqs +unsigned int arch_hwdom_irqs(domid_t); +#endif + #endif /* __XEN_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 Mon Dec 15 15:33:30 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 15 Dec 2014 15: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 1Y0XeM-0000eD-Lm; Mon, 15 Dec 2014 15:33:30 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0XeL-0000e0-NM for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:29 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id C2/52-20609-94FFE845; Mon, 15 Dec 2014 15:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1418657606!10530759!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.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24351 invoked from network); 15 Dec 2014 15:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 15 Dec 2014 15:33:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0XeH-0000qG-Rw for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0XeH-0002bG-Nz for xen-changelog@lists.xensource.com; Mon, 15 Dec 2014 15:33:25 +0000 Date: Mon, 15 Dec 2014 15:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] have architectures specify the number of PIRQs a hardware domain gets X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e73a6e7f12ae080222c5d339799905de3443a6e Author: Jan Beulich AuthorDate: Thu Dec 11 17:14:07 2014 +0100 Commit: Jan Beulich CommitDate: Thu Dec 11 17:14:07 2014 +0100 have architectures specify the number of PIRQs a hardware domain gets The current value of nr_static_irqs + 256 is often too small for larger systems. Make it dependent on CPU count and number of IO-APIC pins on x86, and (until it obtains PCI support) simply NR_IRQS on ARM. Signed-off-by: Jan Beulich Acked-by: David Vrabel Acked-by: Ian Campbell Release-Acked-by: Konrad Rzeszutek Wilk --- docs/misc/xen-command-line.markdown | 7 +++++-- xen/arch/x86/domain_build.c | 9 ++++++++- xen/arch/x86/io_apic.c | 12 ++++++++++++ xen/common/domain.c | 7 ++++--- xen/include/asm-arm/irq.h | 2 +- xen/include/asm-x86/setup.h | 2 ++ xen/include/xen/irq.h | 4 ++++ 7 files changed, 36 insertions(+), 7 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 311316a..1e8c024 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -596,13 +596,16 @@ Force or disable use of EFI runtime services. ### extra\_guest\_irqs > `= [][,]` -> Default: `32,256` +> Default: `32,` Change the number of PIRQs available for guests. The optional first number is common for all domUs, while the optional second number (preceded by a comma) is for dom0. Changing the setting for domU has no impact on dom0 and vice versa. For example to change dom0 without changing domU, use -`extra_guest_irqs=,512` +`extra_guest_irqs=,512`. The default value for Dom0 and an eventual separate +hardware domain is architecture dependent. +Note that specifying zero as domU value means zero, while for dom0 it means +to use the default. ### flask\_enabled > `= ` diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c index 7a6afea..7993b17 100644 --- a/xen/arch/x86/domain_build.c +++ b/xen/arch/x86/domain_build.c @@ -101,7 +101,7 @@ static void __init parse_dom0_max_vcpus(const char *s) } custom_param("dom0_max_vcpus", parse_dom0_max_vcpus); -struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) +unsigned int __init dom0_max_vcpus(void) { unsigned max_vcpus; @@ -113,6 +113,13 @@ struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) if ( max_vcpus > MAX_VIRT_CPUS ) max_vcpus = MAX_VIRT_CPUS; + return max_vcpus; +} + +struct vcpu *__init alloc_dom0_vcpu0(struct domain *dom0) +{ + unsigned int max_vcpus = dom0_max_vcpus(); + dom0->vcpu = xzalloc_array(struct vcpu *, max_vcpus); if ( !dom0->vcpu ) return NULL; diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 6f8f62c..01f816b 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -2606,3 +2607,14 @@ void __init init_ioapic_mappings(void) nr_irqs_gsi, nr_irqs - nr_irqs_gsi); } +unsigned int arch_hwdom_irqs(domid_t domid) +{ + unsigned int n = fls(num_present_cpus()); + + if ( !domid ) + n = min(n, dom0_max_vcpus()); + n = min(nr_irqs_gsi + n * NR_DYNAMIC_VECTORS, nr_irqs); + printk("Dom%d has maximum %u PIRQs\n", domid, n); + + return n; +} diff --git a/xen/common/domain.c b/xen/common/domain.c index 4a62c1d..336e9ea 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -231,14 +231,14 @@ static int late_hwdom_init(struct domain *d) #endif } -static unsigned int __read_mostly extra_dom0_irqs = 256; +static unsigned int __read_mostly extra_hwdom_irqs; static unsigned int __read_mostly extra_domU_irqs = 32; static void __init parse_extra_guest_irqs(const char *s) { if ( isdigit(*s) ) extra_domU_irqs = simple_strtoul(s, &s, 0); if ( *s == ',' && isdigit(*++s) ) - extra_dom0_irqs = simple_strtoul(s, &s, 0); + extra_hwdom_irqs = simple_strtoul(s, &s, 0); } custom_param("extra_guest_irqs", parse_extra_guest_irqs); @@ -326,7 +326,8 @@ struct domain *domain_create( if ( !is_hardware_domain(d) ) d->nr_pirqs = nr_static_irqs + extra_domU_irqs; else - d->nr_pirqs = nr_static_irqs + extra_dom0_irqs; + d->nr_pirqs = extra_hwdom_irqs ? nr_static_irqs + extra_hwdom_irqs + : arch_hwdom_irqs(domid); if ( d->nr_pirqs > nr_irqs ) d->nr_pirqs = nr_irqs; diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index e877334..435dfcd 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -21,10 +21,10 @@ struct arch_irq_desc { #define NR_LOCAL_IRQS 32 #define NR_IRQS 1024 -#define nr_irqs NR_IRQS #define nr_irqs NR_IRQS #define nr_static_irqs NR_IRQS +#define arch_hwdom_irqs(domid) NR_IRQS struct irq_desc; struct irqaction; diff --git a/xen/include/asm-x86/setup.h b/xen/include/asm-x86/setup.h index 8f8c6f3..762eb02 100644 --- a/xen/include/asm-x86/setup.h +++ b/xen/include/asm-x86/setup.h @@ -35,6 +35,8 @@ int construct_dom0( unsigned long initial_images_nrpages(void); void discard_initial_images(void); +unsigned int dom0_max_vcpus(void); + int xen_in_range(unsigned long mfn); void microcode_grab_module( diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index ffb5932..9e0155c 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -168,4 +168,8 @@ static inline void set_native_irq_info(unsigned int irq, const cpumask_t *mask) unsigned int set_desc_affinity(struct irq_desc *, const cpumask_t *); +#ifndef arch_hwdom_irqs +unsigned int arch_hwdom_irqs(domid_t); +#endif + #endif /* __XEN_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 Tue Dec 16 17:55:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Dec 2014 17:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0wL0-00018Y-3Z; Tue, 16 Dec 2014 17:55:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0wKz-00018T-M7 for xen-changelog@lists.xensource.com; Tue, 16 Dec 2014 17:55:09 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id C6/96-09842-DF170945; Tue, 16 Dec 2014 17:55:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1418752507!8714623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31864 invoked from network); 16 Dec 2014 17:55:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2014 17:55:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0wKx-0001At-A6 for xen-changelog@lists.xensource.com; Tue, 16 Dec 2014 17:55:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0wKx-0006Ry-44 for xen-changelog@lists.xensource.com; Tue, 16 Dec 2014 17:55:07 +0000 Date: Tue, 16 Dec 2014 17:55:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: allocate ring buffer 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 2676bc915157ab474ee478d929b0928cf696b385 Author: Jan Beulich AuthorDate: Mon Dec 15 09:30:05 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 15 09:30:05 2014 +0100 console: allocate ring buffer earlier ... when "conring_size=" was specified on the command line. We can't really do this as early as we would want to when the option was not specified, as the default depends on knowing the system CPU count. Yet the parsing of the ACPI tables is one of the things that generates a lot of output especially on large systems. Signed-off-by: Jan Beulich Acked-by: Ian Campbell (ARM and generic bits) Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/arm/setup.c | 1 + xen/arch/x86/setup.c | 1 + xen/drivers/char/console.c | 24 ++++++++++++++++++------ xen/include/xen/console.h | 1 + 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d2dcc3a..3991d64 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -745,6 +745,7 @@ void __init start_xen(unsigned long boot_phys_offset, dt_uart_init(); console_init_preirq(); + console_init_ring(); system_state = SYS_STATE_boot; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 73e95c6..c27c49c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1187,6 +1187,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) } vm_init(); + console_init_ring(); vesa_init(); softirq_init(); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2f03259..0b8d3d4 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -744,15 +744,14 @@ void __init console_init_preirq(void) } } -void __init console_init_postirq(void) +void __init console_init_ring(void) { char *ring; unsigned int i, order, memflags; - - serial_init_postirq(); + unsigned long flags; if ( !opt_conring_size ) - opt_conring_size = num_present_cpus() << (9 + xenlog_lower_thresh); + return; order = get_order_from_bytes(max(opt_conring_size, conring_size)); memflags = MEMF_bits(crashinfo_maxaddr_bits); @@ -763,17 +762,30 @@ void __init console_init_postirq(void) } opt_conring_size = PAGE_SIZE << order; - spin_lock_irq(&console_lock); + spin_lock_irqsave(&console_lock, flags); for ( i = conringc ; i != conringp; i++ ) ring[i & (opt_conring_size - 1)] = conring[i & (conring_size - 1)]; conring = ring; smp_wmb(); /* Allow users of console_force_unlock() to see larger buffer. */ conring_size = opt_conring_size; - spin_unlock_irq(&console_lock); + spin_unlock_irqrestore(&console_lock, flags); printk("Allocated console ring of %u KiB.\n", opt_conring_size >> 10); } +void __init console_init_postirq(void) +{ + serial_init_postirq(); + + if ( conring != _conring ) + return; + + if ( !opt_conring_size ) + opt_conring_size = num_present_cpus() << (9 + xenlog_lower_thresh); + + console_init_ring(); +} + void __init console_endboot(void) { int i, j; diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index cfb07a2..c7fd9ca 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -14,6 +14,7 @@ struct xen_sysctl_readconsole; long read_console_ring(struct xen_sysctl_readconsole *op); void console_init_preirq(void); +void console_init_ring(void); void console_init_postirq(void); void console_endboot(void); int console_has(const char *device); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Tue Dec 16 17:55:15 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 16 Dec 2014 17:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0wL0-00018Y-3Z; Tue, 16 Dec 2014 17:55:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0wKz-00018T-M7 for xen-changelog@lists.xensource.com; Tue, 16 Dec 2014 17:55:09 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id C6/96-09842-DF170945; Tue, 16 Dec 2014 17:55:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1418752507!8714623!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31864 invoked from network); 16 Dec 2014 17:55:08 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2014 17:55:08 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y0wKx-0001At-A6 for xen-changelog@lists.xensource.com; Tue, 16 Dec 2014 17:55:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y0wKx-0006Ry-44 for xen-changelog@lists.xensource.com; Tue, 16 Dec 2014 17:55:07 +0000 Date: Tue, 16 Dec 2014 17:55:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] console: allocate ring buffer 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 2676bc915157ab474ee478d929b0928cf696b385 Author: Jan Beulich AuthorDate: Mon Dec 15 09:30:05 2014 +0100 Commit: Jan Beulich CommitDate: Mon Dec 15 09:30:05 2014 +0100 console: allocate ring buffer earlier ... when "conring_size=" was specified on the command line. We can't really do this as early as we would want to when the option was not specified, as the default depends on knowing the system CPU count. Yet the parsing of the ACPI tables is one of the things that generates a lot of output especially on large systems. Signed-off-by: Jan Beulich Acked-by: Ian Campbell (ARM and generic bits) Release-Acked-by: Konrad Rzeszutek Wilk --- xen/arch/arm/setup.c | 1 + xen/arch/x86/setup.c | 1 + xen/drivers/char/console.c | 24 ++++++++++++++++++------ xen/include/xen/console.h | 1 + 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index d2dcc3a..3991d64 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -745,6 +745,7 @@ void __init start_xen(unsigned long boot_phys_offset, dt_uart_init(); console_init_preirq(); + console_init_ring(); system_state = SYS_STATE_boot; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 73e95c6..c27c49c 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1187,6 +1187,7 @@ void __init noreturn __start_xen(unsigned long mbi_p) } vm_init(); + console_init_ring(); vesa_init(); softirq_init(); diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 2f03259..0b8d3d4 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -744,15 +744,14 @@ void __init console_init_preirq(void) } } -void __init console_init_postirq(void) +void __init console_init_ring(void) { char *ring; unsigned int i, order, memflags; - - serial_init_postirq(); + unsigned long flags; if ( !opt_conring_size ) - opt_conring_size = num_present_cpus() << (9 + xenlog_lower_thresh); + return; order = get_order_from_bytes(max(opt_conring_size, conring_size)); memflags = MEMF_bits(crashinfo_maxaddr_bits); @@ -763,17 +762,30 @@ void __init console_init_postirq(void) } opt_conring_size = PAGE_SIZE << order; - spin_lock_irq(&console_lock); + spin_lock_irqsave(&console_lock, flags); for ( i = conringc ; i != conringp; i++ ) ring[i & (opt_conring_size - 1)] = conring[i & (conring_size - 1)]; conring = ring; smp_wmb(); /* Allow users of console_force_unlock() to see larger buffer. */ conring_size = opt_conring_size; - spin_unlock_irq(&console_lock); + spin_unlock_irqrestore(&console_lock, flags); printk("Allocated console ring of %u KiB.\n", opt_conring_size >> 10); } +void __init console_init_postirq(void) +{ + serial_init_postirq(); + + if ( conring != _conring ) + return; + + if ( !opt_conring_size ) + opt_conring_size = num_present_cpus() << (9 + xenlog_lower_thresh); + + console_init_ring(); +} + void __init console_endboot(void) { int i, j; diff --git a/xen/include/xen/console.h b/xen/include/xen/console.h index cfb07a2..c7fd9ca 100644 --- a/xen/include/xen/console.h +++ b/xen/include/xen/console.h @@ -14,6 +14,7 @@ struct xen_sysctl_readconsole; long read_console_ring(struct xen_sysctl_readconsole *op); void console_init_preirq(void); +void console_init_ring(void); void console_init_postirq(void); void console_endboot(void); int console_has(const char *device); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Dec 21 03:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5t-00022u-FP; Sun, 21 Dec 2014 03:22:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5s-00022k-Gh for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:08 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id AA/66-02696-FDC36945; Sun, 21 Dec 2014 03:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1419132124!11770804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24949 invoked from network); 21 Dec 2014 03:22:05 -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; 21 Dec 2014 03:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5n-0008UH-Me for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X5n-0006xH-JW for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:03 +0000 Date: Sun, 21 Dec 2014 03:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Xen-4.5.0-rc4: Update tag for qemu-xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 05fecc382e129731c6595268a377f4bff879f694 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Dec 15 11:35:59 2014 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Dec 15 11:35:59 2014 -0500 Xen-4.5.0-rc4: Update tag for qemu-xen. QEMU-traditional has nothing new, so stay at rc1 there. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index a53cfb5..0e22057 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc3 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc4 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Dec 21 03:22:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5t-00022u-FP; Sun, 21 Dec 2014 03:22:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5s-00022k-Gh for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:08 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id AA/66-02696-FDC36945; Sun, 21 Dec 2014 03:22:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1419132124!11770804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24949 invoked from network); 21 Dec 2014 03:22:05 -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; 21 Dec 2014 03:22:05 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5n-0008UH-Me for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X5n-0006xH-JW for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:03 +0000 Date: Sun, 21 Dec 2014 03:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Xen-4.5.0-rc4: Update tag for qemu-xen. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 05fecc382e129731c6595268a377f4bff879f694 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Dec 15 11:35:59 2014 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Mon Dec 15 11:35:59 2014 -0500 Xen-4.5.0-rc4: Update tag for qemu-xen. QEMU-traditional has nothing new, so stay at rc1 there. Signed-off-by: Konrad Rzeszutek Wilk --- Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Config.mk b/Config.mk index a53cfb5..0e22057 100644 --- a/Config.mk +++ b/Config.mk @@ -252,7 +252,7 @@ QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-unstable.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git endif OVMF_UPSTREAM_REVISION ?= 447d264115c476142f884af0be287622cd244423 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc3 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.5.0-rc4 SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 # Thu May 22 16:59:16 2014 -0400 # python3 fixes for vgabios and csm builds. -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Dec 21 03:22:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22: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 1Y2X64-000264-5k; Sun, 21 Dec 2014 03:22:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X62-00023e-Nw for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:18 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 3A/4C-25276-9EC36945; Sun, 21 Dec 2014 03:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1419132134!17033487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6259 invoked from network); 21 Dec 2014 03:22:15 -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; 21 Dec 2014 03:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5y-0008UR-HA for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X5y-0006xo-Ea for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:14 +0000 Date: Sun, 21 Dec 2014 03:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge tag '4.5.0-rc4' 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 6c9b27d3f363889718e7e046511383927f257095 Merge: 2676bc915157ab474ee478d929b0928cf696b385 05fecc382e129731c6595268a377f4bff879f694 Author: Ian Jackson AuthorDate: Mon Dec 15 17:40:12 2014 +0000 Commit: Ian Jackson CommitDate: Mon Dec 15 17:40:12 2014 +0000 Merge tag '4.5.0-rc4' into staging Xen 4.5.0 RC4 Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 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 Sun Dec 21 03:22:20 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22: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 1Y2X64-000264-5k; Sun, 21 Dec 2014 03:22:20 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X62-00023e-Nw for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:18 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 3A/4C-25276-9EC36945; Sun, 21 Dec 2014 03:22:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-21.messagelabs.com!1419132134!17033487!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6259 invoked from network); 21 Dec 2014 03:22:15 -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; 21 Dec 2014 03:22:15 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X5y-0008UR-HA for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X5y-0006xo-Ea for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:14 +0000 Date: Sun, 21 Dec 2014 03:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Merge tag '4.5.0-rc4' 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 6c9b27d3f363889718e7e046511383927f257095 Merge: 2676bc915157ab474ee478d929b0928cf696b385 05fecc382e129731c6595268a377f4bff879f694 Author: Ian Jackson AuthorDate: Mon Dec 15 17:40:12 2014 +0000 Commit: Ian Jackson CommitDate: Mon Dec 15 17:40:12 2014 +0000 Merge tag '4.5.0-rc4' into staging Xen 4.5.0 RC4 Config.mk | 2 +- 1 files changed, 1 insertions(+), 1 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 Sun Dec 21 03:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6C-00027R-8M; Sun, 21 Dec 2014 03:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6B-00027E-El for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:27 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 6B/86-26740-2FC36945; Sun, 21 Dec 2014 03:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1419132145!14911734!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28856 invoked from network); 21 Dec 2014 03:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Dec 2014 03:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X68-0008Ua-Mn for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X68-0006yB-LP for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:24 +0000 Date: Sun, 21 Dec 2014 03:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/serial: setup UART idle mode for OMAP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcd84861b0b01b8895716d4c803c9d24c31c8cab Author: Oleksandr Dmytryshyn AuthorDate: Mon Dec 8 15:51:47 2014 +0200 Commit: Ian Campbell CommitDate: Tue Dec 16 12:41:06 2014 +0000 xen/serial: setup UART idle mode for OMAP The UART is not able to receive bytes when idle mode is not configured properly, therefore setup the UART with autoidle and wakeup enabled. Older Linux kernels (for example 3.8) configure hwmods for all devices even if the device tree nodes for those devices is absent in device tree, thus UART idle mode is configured too. With such kernels we can workaround the issue by adding a fake node in the UART containing this MMIO range, which is therefore mapped by Xen to dom0, which reconfigures the UART, causing things to work normally. Newer Linux Kernels (3.12 and beyond) do not configure idle mode for UART and so this hack no longer works. Signed-off-by: Oleksandr Dmytryshyn Acked-by: Ian Campbell [ ijc -- updated commit message as discussed ] --- xen/drivers/char/omap-uart.c | 3 +++ xen/include/xen/8250-uart.h | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index a798b8d..16d1454 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -195,6 +195,9 @@ static void __init omap_uart_init_preirq(struct serial_port *port) omap_write(uart, UART_MCR, UART_MCR_DTR|UART_MCR_RTS); omap_write(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE); + + /* setup iddle mode */ + omap_write(uart, UART_SYSC, OMAP_UART_SYSC_DEF_CONF); } static void __init omap_uart_init_postirq(struct serial_port *port) diff --git a/xen/include/xen/8250-uart.h b/xen/include/xen/8250-uart.h index a682bae..304b9dd 100644 --- a/xen/include/xen/8250-uart.h +++ b/xen/include/xen/8250-uart.h @@ -32,6 +32,7 @@ #define UART_MCR 0x04 /* Modem control */ #define UART_LSR 0x05 /* line status */ #define UART_MSR 0x06 /* Modem status */ +#define UART_SYSC 0x15 /* System configuration register */ #define UART_USR 0x1f /* Status register (DW) */ #define UART_DLL 0x00 /* divisor latch (ls) (DLAB=1) */ #define UART_DLM 0x01 /* divisor latch (ms) (DLAB=1) */ @@ -145,6 +146,9 @@ /* SCR register bitmasks */ #define OMAP_UART_SCR_RX_TRIG_GRANU1_MASK (1 << 7) +/* System configuration register */ +#define OMAP_UART_SYSC_DEF_CONF 0x0d /* autoidle mode, wakeup is enabled */ + #endif /* __XEN_8250_UART_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 Dec 21 03:22:28 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6C-00027R-8M; Sun, 21 Dec 2014 03:22:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6B-00027E-El for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:27 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 6B/86-26740-2FC36945; Sun, 21 Dec 2014 03:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1419132145!14911734!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28856 invoked from network); 21 Dec 2014 03:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 21 Dec 2014 03:22:26 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X68-0008Ua-Mn for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X68-0006yB-LP for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:24 +0000 Date: Sun, 21 Dec 2014 03:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/serial: setup UART idle mode for OMAP X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcd84861b0b01b8895716d4c803c9d24c31c8cab Author: Oleksandr Dmytryshyn AuthorDate: Mon Dec 8 15:51:47 2014 +0200 Commit: Ian Campbell CommitDate: Tue Dec 16 12:41:06 2014 +0000 xen/serial: setup UART idle mode for OMAP The UART is not able to receive bytes when idle mode is not configured properly, therefore setup the UART with autoidle and wakeup enabled. Older Linux kernels (for example 3.8) configure hwmods for all devices even if the device tree nodes for those devices is absent in device tree, thus UART idle mode is configured too. With such kernels we can workaround the issue by adding a fake node in the UART containing this MMIO range, which is therefore mapped by Xen to dom0, which reconfigures the UART, causing things to work normally. Newer Linux Kernels (3.12 and beyond) do not configure idle mode for UART and so this hack no longer works. Signed-off-by: Oleksandr Dmytryshyn Acked-by: Ian Campbell [ ijc -- updated commit message as discussed ] --- xen/drivers/char/omap-uart.c | 3 +++ xen/include/xen/8250-uart.h | 4 ++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index a798b8d..16d1454 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -195,6 +195,9 @@ static void __init omap_uart_init_preirq(struct serial_port *port) omap_write(uart, UART_MCR, UART_MCR_DTR|UART_MCR_RTS); omap_write(uart, UART_OMAP_MDR1, UART_OMAP_MDR1_16X_MODE); + + /* setup iddle mode */ + omap_write(uart, UART_SYSC, OMAP_UART_SYSC_DEF_CONF); } static void __init omap_uart_init_postirq(struct serial_port *port) diff --git a/xen/include/xen/8250-uart.h b/xen/include/xen/8250-uart.h index a682bae..304b9dd 100644 --- a/xen/include/xen/8250-uart.h +++ b/xen/include/xen/8250-uart.h @@ -32,6 +32,7 @@ #define UART_MCR 0x04 /* Modem control */ #define UART_LSR 0x05 /* line status */ #define UART_MSR 0x06 /* Modem status */ +#define UART_SYSC 0x15 /* System configuration register */ #define UART_USR 0x1f /* Status register (DW) */ #define UART_DLL 0x00 /* divisor latch (ls) (DLAB=1) */ #define UART_DLM 0x01 /* divisor latch (ms) (DLAB=1) */ @@ -145,6 +146,9 @@ /* SCR register bitmasks */ #define OMAP_UART_SCR_RX_TRIG_GRANU1_MASK (1 << 7) +/* System configuration register */ +#define OMAP_UART_SYSC_DEF_CONF 0x0d /* autoidle mode, wakeup is enabled */ + #endif /* __XEN_8250_UART_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 Dec 21 03:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03: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 1Y2X6M-00029D-B1; Sun, 21 Dec 2014 03:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6L-00028w-MN for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:37 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 3F/F5-01660-CFC36945; Sun, 21 Dec 2014 03:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1419132155!14510177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26198 invoked from network); 21 Dec 2014 03:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Dec 2014 03:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6I-0008Ui-T3 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6I-0006yb-Re for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:34 +0000 Date: Sun, 21 Dec 2014 03:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xc: Fix multiple issues in pyflask_context_to_sid() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f727fb1a7d5f3be2513ab2e692b067075325fb3 Author: Andrew Cooper AuthorDate: Tue Dec 9 16:43:22 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:43:35 2014 +0000 python/xc: Fix multiple issues in pyflask_context_to_sid() The error handling from a failed memory allocation should return PyErr_SetFromErrno(xc_error_obj); rather than simply calling it and continuing to the memcpy() below, with the dest pointer being NULL. Coverity also complains about passing a non-NUL terminated string to xc_flask_context_to_sid(). xc_flask_context_to_sid() doesn't actually take a NUL terminated string, but it does take a char* which, in context, used to be a string, which is why Coverity complains. One solution would be to use strdup(ctx) which is simpler than a strlen()/malloc()/memcpy() combo, which would result in a NUL-terminated string being used with xc_flask_context_to_sid(). However, ctx is strictly an input to the hypercall and is not mutated along the way. Both these issues can be fixed, and the error logic simplified, by not duplicating ctx in the first place. Signed-off-by: Andrew Cooper Coverity-IDs: 1055305 1055721 Acked-by: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team --- tools/python/xen/lowlevel/xc/xc.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index f83e33d..2aa0dc7 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -2125,8 +2125,6 @@ static PyObject *pyflask_context_to_sid(PyObject *self, PyObject *args, { xc_interface *xc_handle; char *ctx; - char *buf; - uint32_t len; uint32_t sid; int ret; @@ -2136,28 +2134,15 @@ static PyObject *pyflask_context_to_sid(PyObject *self, PyObject *args, &ctx) ) return NULL; - len = strlen(ctx); - - buf = malloc(len); - if (!buf) { - errno = -ENOMEM; - PyErr_SetFromErrno(xc_error_obj); - } - - memcpy(buf, ctx, len); - xc_handle = xc_interface_open(0,0,0); if (!xc_handle) { - free(buf); return PyErr_SetFromErrno(xc_error_obj); } - - ret = xc_flask_context_to_sid(xc_handle, buf, len, &sid); - + + ret = xc_flask_context_to_sid(xc_handle, ctx, strlen(ctx), &sid); + xc_interface_close(xc_handle); - free(buf); - if ( ret != 0 ) { errno = -ret; return PyErr_SetFromErrno(xc_error_obj); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Dec 21 03:22:38 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03: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 1Y2X6M-00029D-B1; Sun, 21 Dec 2014 03:22:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6L-00028w-MN for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:37 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 3F/F5-01660-CFC36945; Sun, 21 Dec 2014 03:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1419132155!14510177!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26198 invoked from network); 21 Dec 2014 03:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 21 Dec 2014 03:22:36 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6I-0008Ui-T3 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6I-0006yb-Re for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:34 +0000 Date: Sun, 21 Dec 2014 03:22:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] python/xc: Fix multiple issues in pyflask_context_to_sid() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f727fb1a7d5f3be2513ab2e692b067075325fb3 Author: Andrew Cooper AuthorDate: Tue Dec 9 16:43:22 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:43:35 2014 +0000 python/xc: Fix multiple issues in pyflask_context_to_sid() The error handling from a failed memory allocation should return PyErr_SetFromErrno(xc_error_obj); rather than simply calling it and continuing to the memcpy() below, with the dest pointer being NULL. Coverity also complains about passing a non-NUL terminated string to xc_flask_context_to_sid(). xc_flask_context_to_sid() doesn't actually take a NUL terminated string, but it does take a char* which, in context, used to be a string, which is why Coverity complains. One solution would be to use strdup(ctx) which is simpler than a strlen()/malloc()/memcpy() combo, which would result in a NUL-terminated string being used with xc_flask_context_to_sid(). However, ctx is strictly an input to the hypercall and is not mutated along the way. Both these issues can be fixed, and the error logic simplified, by not duplicating ctx in the first place. Signed-off-by: Andrew Cooper Coverity-IDs: 1055305 1055721 Acked-by: Ian Campbell CC: Ian Jackson CC: Wei Liu CC: Xen Coverity Team --- tools/python/xen/lowlevel/xc/xc.c | 21 +++------------------ 1 files changed, 3 insertions(+), 18 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index f83e33d..2aa0dc7 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -2125,8 +2125,6 @@ static PyObject *pyflask_context_to_sid(PyObject *self, PyObject *args, { xc_interface *xc_handle; char *ctx; - char *buf; - uint32_t len; uint32_t sid; int ret; @@ -2136,28 +2134,15 @@ static PyObject *pyflask_context_to_sid(PyObject *self, PyObject *args, &ctx) ) return NULL; - len = strlen(ctx); - - buf = malloc(len); - if (!buf) { - errno = -ENOMEM; - PyErr_SetFromErrno(xc_error_obj); - } - - memcpy(buf, ctx, len); - xc_handle = xc_interface_open(0,0,0); if (!xc_handle) { - free(buf); return PyErr_SetFromErrno(xc_error_obj); } - - ret = xc_flask_context_to_sid(xc_handle, buf, len, &sid); - + + ret = xc_flask_context_to_sid(xc_handle, ctx, strlen(ctx), &sid); + xc_interface_close(xc_handle); - free(buf); - if ( ret != 0 ) { errno = -ret; return PyErr_SetFromErrno(xc_error_obj); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sun Dec 21 03:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03: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 1Y2X6W-0002JN-E4; Sun, 21 Dec 2014 03: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 1Y2X6V-0002J5-Jc for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:47 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 6B/07-14727-60D36945; Sun, 21 Dec 2014 03:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1419132165!14559558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28331 invoked from network); 21 Dec 2014 03:22:46 -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; 21 Dec 2014 03:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6T-0008Uo-21 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6T-0006yx-0q for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:45 +0000 Date: Sun, 21 Dec 2014 03:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/commandline: Minor formatting fixes and clarifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afa3fd8753c944f37c1cd182d5ad7c436c7614da Author: Andrew Cooper AuthorDate: Fri Dec 12 18:26:02 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:45:46 2014 +0000 docs/commandline: Minor formatting fixes and clarifications `font` had a trailing single quote which was out of place. `gnttab_max_frames` was missing escapes for the underscores which caused the underscores to take their markdown meaning, causing 'max' in the middle to be italicised. Escape the underscores, and make all command line parameters bold, to be consistent with the existing style. Clarify how the default for `nmi` changes between debug and non debug builds of Xen. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- docs/misc/xen-command-line.markdown | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 1e8c024..152ae03 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -614,7 +614,7 @@ to use the default. > `= ` ### font -> `= ` where height is `8x8 | 8x14 | 8x16 '` +> `= ` where height is `8x8 | 8x14 | 8x16` Specify the font size when using the VESA console driver. @@ -648,13 +648,13 @@ Specify the maximum number of frames per grant table operation. > `= ` Specify the maximum number of maptrack frames domain. -The default value is 8 times gnttab_max_frames. +The default value is 8 times **gnttab\_max\_frames**. ### gnttab\_max\_nr\_frames > `= ` *Deprecated* -Use gnttab\_max\_frames and gnttab\_max\_maptrack\_frames instead. +Use **gnttab\_max\_frames** and **gnttab\_max\_maptrack\_frames** instead. Specify the maximum number of frames per grant table operation and the maximum number of maptrack frames domain. @@ -986,7 +986,7 @@ of the ACPI based one. ### nmi > `= ignore | dom0 | fatal` -> Default: `nmi=fatal` +> Default: `fatal` for a debug build, or `dom0` for a non-debug build Specify what Xen should do in the event of an NMI parity or I/O error. `ignore` discards the error; `dom0` causes Xen to report the error to -- generated by git-patchbot for /home/xen/git/xen.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 Dec 21 03:22:48 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03: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 1Y2X6W-0002JN-E4; Sun, 21 Dec 2014 03: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 1Y2X6V-0002J5-Jc for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:47 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 6B/07-14727-60D36945; Sun, 21 Dec 2014 03:22:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1419132165!14559558!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28331 invoked from network); 21 Dec 2014 03:22:46 -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; 21 Dec 2014 03:22:46 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6T-0008Uo-21 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6T-0006yx-0q for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:45 +0000 Date: Sun, 21 Dec 2014 03:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] docs/commandline: Minor formatting fixes and clarifications X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit afa3fd8753c944f37c1cd182d5ad7c436c7614da Author: Andrew Cooper AuthorDate: Fri Dec 12 18:26:02 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:45:46 2014 +0000 docs/commandline: Minor formatting fixes and clarifications `font` had a trailing single quote which was out of place. `gnttab_max_frames` was missing escapes for the underscores which caused the underscores to take their markdown meaning, causing 'max' in the middle to be italicised. Escape the underscores, and make all command line parameters bold, to be consistent with the existing style. Clarify how the default for `nmi` changes between debug and non debug builds of Xen. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Ian Campbell --- docs/misc/xen-command-line.markdown | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 1e8c024..152ae03 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -614,7 +614,7 @@ to use the default. > `= ` ### font -> `= ` where height is `8x8 | 8x14 | 8x16 '` +> `= ` where height is `8x8 | 8x14 | 8x16` Specify the font size when using the VESA console driver. @@ -648,13 +648,13 @@ Specify the maximum number of frames per grant table operation. > `= ` Specify the maximum number of maptrack frames domain. -The default value is 8 times gnttab_max_frames. +The default value is 8 times **gnttab\_max\_frames**. ### gnttab\_max\_nr\_frames > `= ` *Deprecated* -Use gnttab\_max\_frames and gnttab\_max\_maptrack\_frames instead. +Use **gnttab\_max\_frames** and **gnttab\_max\_maptrack\_frames** instead. Specify the maximum number of frames per grant table operation and the maximum number of maptrack frames domain. @@ -986,7 +986,7 @@ of the ACPI based one. ### nmi > `= ignore | dom0 | fatal` -> Default: `nmi=fatal` +> Default: `fatal` for a debug build, or `dom0` for a non-debug build Specify what Xen should do in the event of an NMI parity or I/O error. `ignore` discards the error; `dom0` causes Xen to report the error to -- generated by git-patchbot for /home/xen/git/xen.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 Dec 21 03:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22: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 1Y2X6h-0002M1-H0; Sun, 21 Dec 2014 03:22:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6f-0002Le-Tx for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:58 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 45/75-02954-11D36945; Sun, 21 Dec 2014 03:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1419132175!11713926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12693 invoked from network); 21 Dec 2014 03:22:56 -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; 21 Dec 2014 03:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6d-0008Ux-97 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6d-000702-6p for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:55 +0000 Date: Sun, 21 Dec 2014 03:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: print message to stdout when (!debug && dryrun) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09b7ff1a118f5e920ef12f5592f3ce991218962a Author: Wei Liu AuthorDate: Mon Dec 15 10:56:24 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:46:17 2014 +0000 xl: print message to stdout when (!debug && dryrun) In commit d36a3734a ("xl: fix migration failure with xl migrate --debug"), message is printed to stderr for both debug mode and dryrun mode. That caused rdname() in xendomains fails to parse domain name since it's expecting input from xl's stdout. So this patch separates those two cases. If xl is running in debug mode, then message is printed to stderr; if xl is running in dryrun mode and debug is not enabled, message is printed to stdout. This will fix xendomains and other scripts that use "xl create --dryrun", as well as not re-introducing the old bug fixed in d36a3734a. Reported-by: Mark Pryor Signed-off-by: Wei Liu Cc: M A Young Cc: Ian Campbell Release-Acked-by: Konrad Wilk Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3737c7e..ed0d478 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2473,7 +2473,8 @@ static uint32_t create_domain(struct domain_create *dom_info) } if (debug || dom_info->dryrun) - printf_info(default_output_format, -1, &d_config, stderr); + printf_info(default_output_format, -1, &d_config, + debug ? stderr : stdout); ret = 0; if (dom_info->dryrun) -- generated by git-patchbot for /home/xen/git/xen.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 Dec 21 03:22:59 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:22: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 1Y2X6h-0002M1-H0; Sun, 21 Dec 2014 03:22:59 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6f-0002Le-Tx for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:58 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 45/75-02954-11D36945; Sun, 21 Dec 2014 03:22:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1419132175!11713926!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12693 invoked from network); 21 Dec 2014 03:22:56 -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; 21 Dec 2014 03:22:56 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6d-0008Ux-97 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6d-000702-6p for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:22:55 +0000 Date: Sun, 21 Dec 2014 03:22:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xl: print message to stdout when (!debug && dryrun) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 09b7ff1a118f5e920ef12f5592f3ce991218962a Author: Wei Liu AuthorDate: Mon Dec 15 10:56:24 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:46:17 2014 +0000 xl: print message to stdout when (!debug && dryrun) In commit d36a3734a ("xl: fix migration failure with xl migrate --debug"), message is printed to stderr for both debug mode and dryrun mode. That caused rdname() in xendomains fails to parse domain name since it's expecting input from xl's stdout. So this patch separates those two cases. If xl is running in debug mode, then message is printed to stderr; if xl is running in dryrun mode and debug is not enabled, message is printed to stdout. This will fix xendomains and other scripts that use "xl create --dryrun", as well as not re-introducing the old bug fixed in d36a3734a. Reported-by: Mark Pryor Signed-off-by: Wei Liu Cc: M A Young Cc: Ian Campbell Release-Acked-by: Konrad Wilk Acked-by: Ian Campbell --- tools/libxl/xl_cmdimpl.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 3737c7e..ed0d478 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2473,7 +2473,8 @@ static uint32_t create_domain(struct domain_create *dom_info) } if (debug || dom_info->dryrun) - printf_info(default_output_format, -1, &d_config, stderr); + printf_info(default_output_format, -1, &d_config, + debug ? stderr : stdout); ret = 0; if (dom_info->dryrun) -- generated by git-patchbot for /home/xen/git/xen.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 Dec 21 03:23:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6s-0002O7-Jj; Sun, 21 Dec 2014 03:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6r-0002Nr-Lr for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:09 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 6B/47-17936-D1D36945; Sun, 21 Dec 2014 03:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1419132185!16424490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30503 invoked from network); 21 Dec 2014 03:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Dec 2014 03:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6n-0008VW-F4 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6n-00070Y-DA for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:05 +0000 Date: Sun, 21 Dec 2014 03:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Tell qemu to use raw format when using a tapdisk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e88c23239591e2638bcc944151a660fcd53495b Author: George Dunlap AuthorDate: Tue Dec 9 14:04:19 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:47:41 2014 +0000 libxl: Tell qemu to use raw format when using a tapdisk At the moment libxl unconditinally passes the underlying file format to qemu in the device string. However, when tapdisk is in use, tapdisk handles the underlying format and presents qemu with effectively a raw disk. When qemu looks at the tapdisk block device and doesn't find the image format it was looking for, it will fail. This effectively means that tapdisk cannot be used with HVM domains at the moment except for raw files. Instead, if we're using a tapdisk backend, tell qemu to use a raw file format. Signed-off-by: George Dunlap Acked-by: Ian Campbell Acked-by: Wei Liu [ ijc -- nuked extra blank line ] --- tools/libxl/libxl_dm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b25b574..c2b0487 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -797,11 +797,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, continue; } - if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) + if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) { + format = qemu_disk_format_string(LIBXL_DISK_FORMAT_RAW); pdev_path = libxl__blktap_devpath(gc, disks[i].pdev_path, disks[i].format); - else + } else { pdev_path = disks[i].pdev_path; + } /* * Explicit sd disks are passed through as is. -- generated by git-patchbot for /home/xen/git/xen.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 Dec 21 03:23:10 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:23:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6s-0002O7-Jj; Sun, 21 Dec 2014 03:23:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6r-0002Nr-Lr for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:09 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 6B/47-17936-D1D36945; Sun, 21 Dec 2014 03:23:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1419132185!16424490!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30503 invoked from network); 21 Dec 2014 03:23:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 21 Dec 2014 03:23:06 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6n-0008VW-F4 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6n-00070Y-DA for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:05 +0000 Date: Sun, 21 Dec 2014 03:23:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Tell qemu to use raw format when using a tapdisk X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7e88c23239591e2638bcc944151a660fcd53495b Author: George Dunlap AuthorDate: Tue Dec 9 14:04:19 2014 +0000 Commit: Ian Campbell CommitDate: Tue Dec 16 12:47:41 2014 +0000 libxl: Tell qemu to use raw format when using a tapdisk At the moment libxl unconditinally passes the underlying file format to qemu in the device string. However, when tapdisk is in use, tapdisk handles the underlying format and presents qemu with effectively a raw disk. When qemu looks at the tapdisk block device and doesn't find the image format it was looking for, it will fail. This effectively means that tapdisk cannot be used with HVM domains at the moment except for raw files. Instead, if we're using a tapdisk backend, tell qemu to use a raw file format. Signed-off-by: George Dunlap Acked-by: Ian Campbell Acked-by: Wei Liu [ ijc -- nuked extra blank line ] --- tools/libxl/libxl_dm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b25b574..c2b0487 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -797,11 +797,13 @@ static char ** libxl__build_device_model_args_new(libxl__gc *gc, continue; } - if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) + if (disks[i].backend == LIBXL_DISK_BACKEND_TAP) { + format = qemu_disk_format_string(LIBXL_DISK_FORMAT_RAW); pdev_path = libxl__blktap_devpath(gc, disks[i].pdev_path, disks[i].format); - else + } else { pdev_path = disks[i].pdev_path; + } /* * Explicit sd disks are passed through as is. -- generated by git-patchbot for /home/xen/git/xen.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 Dec 21 03:23:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:23:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X70-0002Pj-Mw; Sun, 21 Dec 2014 03:23:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6z-0002PR-Q9 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:17 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id E0/9B-15461-52D36945; Sun, 21 Dec 2014 03:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1419132195!17013928!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2651 invoked from network); 21 Dec 2014 03:23:16 -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; 21 Dec 2014 03:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6x-0008Vc-Jy for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6x-000717-IM for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:15 +0000 Date: Sun, 21 Dec 2014 03:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xl: fix segfault in xl migrate --debug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 36174af3fbeb1b662c0eadbfa193e77f68cc955b Author: M A Young AuthorDate: Thu Dec 18 10:02:16 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 18 10:02:16 2014 +0000 tools/xl: fix segfault in xl migrate --debug If differences are found during the verification phase of xl migrate --debug then it is likely to crash with a segfault because the bogus pagebuf->pfn_types[pfn] is used in a print statement instead of pfn_type[pfn] . Signed-off-by: Michael Young Reviewed-by: Andrew Cooper 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 d8bd9b3..a382701 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1404,7 +1404,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, int v; DPRINTF("************** pfn=%lx type=%lx gotcs=%08lx " - "actualcs=%08lx\n", pfn, pagebuf->pfn_types[pfn], + "actualcs=%08lx\n", pfn, pfn_type[pfn], csum_page(region_base + i * PAGE_SIZE), csum_page(buf)); -- generated by git-patchbot for /home/xen/git/xen.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 Dec 21 03:23:18 2014 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 21 Dec 2014 03:23:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X70-0002Pj-Mw; Sun, 21 Dec 2014 03:23:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6z-0002PR-Q9 for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:17 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id E0/9B-15461-52D36945; Sun, 21 Dec 2014 03:23:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1419132195!17013928!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.5; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2651 invoked from network); 21 Dec 2014 03:23:16 -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; 21 Dec 2014 03:23:16 -0000 Received: from xenbits.xen.org ([50.57.170.242]) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Y2X6x-0008Vc-Jy for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1Y2X6x-000717-IM for xen-changelog@lists.xensource.com; Sun, 21 Dec 2014 03:23:15 +0000 Date: Sun, 21 Dec 2014 03:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/xl: fix segfault in xl migrate --debug X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 36174af3fbeb1b662c0eadbfa193e77f68cc955b Author: M A Young AuthorDate: Thu Dec 18 10:02:16 2014 +0000 Commit: Ian Campbell CommitDate: Thu Dec 18 10:02:16 2014 +0000 tools/xl: fix segfault in xl migrate --debug If differences are found during the verification phase of xl migrate --debug then it is likely to crash with a segfault because the bogus pagebuf->pfn_types[pfn] is used in a print statement instead of pfn_type[pfn] . Signed-off-by: Michael Young Reviewed-by: Andrew Cooper 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 d8bd9b3..a382701 100644 --- a/tools/libxc/xc_domain_restore.c +++ b/tools/libxc/xc_domain_restore.c @@ -1404,7 +1404,7 @@ static int apply_batch(xc_interface *xch, uint32_t dom, struct restore_ctx *ctx, int v; DPRINTF("************** pfn=%lx type=%lx gotcs=%08lx " - "actualcs=%08lx\n", pfn, pagebuf->pfn_types[pfn], + "actualcs=%08lx\n", pfn, pfn_type[pfn], csum_page(region_base + i * PAGE_SIZE), csum_page(buf)); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog