From xen-changelog-bounces@lists.xen.org Thu Dec 03 14:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UwZ-00081V-H2; Thu, 03 Dec 2015 14:33:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UwY-00081A-8A for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:10 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 9A/00-02940-4A250665; Thu, 03 Dec 2015 14:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1449153186!8286081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38615 invoked from network); 3 Dec 2015 14:33:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UwS-0002gh-QT for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UwS-0001Cd-Hr for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:04 +0000 Date: Thu, 03 Dec 2015 14:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] Qemu/Xen: Fix early freeing MSIX MMIO memory region X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c7d5c4333986cbbf41dae8c6b40da62291ef967 Author: Lan Tianyu AuthorDate: Sun Oct 11 23:19:24 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:02:27 2015 +0000 Qemu/Xen: Fix early freeing MSIX MMIO memory region msix->mmio is added to XenPCIPassthroughState's object as property. object_finalize_child_property is called for XenPCIPassthroughState's object, which calls object_property_del_all, which is going to try to delete msix->mmio. object_finalize_child_property() will access msix->mmio's obj. But the whole msix struct has already been freed by xen_pt_msix_delete. This will cause segment fault when msix->mmio has been overwritten. This patch is to fix the issue. upstream-commit-id: 4e494de66800747446e73b5ec0189ad7f4690908 Signed-off-by: Lan Tianyu Reviewed-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 8 ++++++++ hw/xen/xen_pt.h | 1 + hw/xen/xen_pt_config_init.c | 2 +- hw/xen/xen_pt_msi.c | 13 ++++++++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index ed5fcae..dba8560 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -870,10 +870,18 @@ static void xen_pci_passthrough_class_init(ObjectClass *klass, void *data) dc->props = xen_pci_passthrough_properties; }; +static void xen_pci_passthrough_finalize(Object *obj) +{ + XenPCIPassthroughState *s = XEN_PT_DEVICE(obj); + + xen_pt_msix_delete(s); +} + static const TypeInfo xen_pci_passthrough_info = { .name = TYPE_XEN_PT_DEVICE, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(XenPCIPassthroughState), + .instance_finalize = xen_pci_passthrough_finalize, .class_init = xen_pci_passthrough_class_init, }; diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 393f36c..9bf79c0 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -296,6 +296,7 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s); int xen_pt_msix_init(XenPCIPassthroughState *s, uint32_t base); void xen_pt_msix_delete(XenPCIPassthroughState *s); +void xen_pt_msix_unmap(XenPCIPassthroughState *s); int xen_pt_msix_update(XenPCIPassthroughState *s); int xen_pt_msix_update_remap(XenPCIPassthroughState *s, int bar_index); void xen_pt_msix_disable(XenPCIPassthroughState *s); diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index dd37be3..286eea3 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1916,7 +1916,7 @@ void xen_pt_config_delete(XenPCIPassthroughState *s) /* free MSI/MSI-X info table */ if (s->msix) { - xen_pt_msix_delete(s); + xen_pt_msix_unmap(s); } if (s->msi) { g_free(s->msi); diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 263e051..49671e1 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -600,7 +600,7 @@ error_out: return rc; } -void xen_pt_msix_delete(XenPCIPassthroughState *s) +void xen_pt_msix_unmap(XenPCIPassthroughState *s) { XenPTMSIX *msix = s->msix; @@ -617,6 +617,17 @@ void xen_pt_msix_delete(XenPCIPassthroughState *s) } memory_region_del_subregion(&s->bar[msix->bar_index], &msix->mmio); +} + +void xen_pt_msix_delete(XenPCIPassthroughState *s) +{ + XenPTMSIX *msix = s->msix; + + if (!msix) { + return; + } + + object_unparent(OBJECT(&msix->mmio)); g_free(s->msix); s->msix = NULL; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UwZ-00081V-H2; Thu, 03 Dec 2015 14:33:11 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UwY-00081A-8A for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:10 +0000 Received: from [85.158.137.68] by server-17.bemta-3.messagelabs.com id 9A/00-02940-4A250665; Thu, 03 Dec 2015 14:33:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1449153186!8286081!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38615 invoked from network); 3 Dec 2015 14:33:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UwS-0002gh-QT for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UwS-0001Cd-Hr for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:04 +0000 Date: Thu, 03 Dec 2015 14:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] Qemu/Xen: Fix early freeing MSIX MMIO memory region X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c7d5c4333986cbbf41dae8c6b40da62291ef967 Author: Lan Tianyu AuthorDate: Sun Oct 11 23:19:24 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:02:27 2015 +0000 Qemu/Xen: Fix early freeing MSIX MMIO memory region msix->mmio is added to XenPCIPassthroughState's object as property. object_finalize_child_property is called for XenPCIPassthroughState's object, which calls object_property_del_all, which is going to try to delete msix->mmio. object_finalize_child_property() will access msix->mmio's obj. But the whole msix struct has already been freed by xen_pt_msix_delete. This will cause segment fault when msix->mmio has been overwritten. This patch is to fix the issue. upstream-commit-id: 4e494de66800747446e73b5ec0189ad7f4690908 Signed-off-by: Lan Tianyu Reviewed-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 8 ++++++++ hw/xen/xen_pt.h | 1 + hw/xen/xen_pt_config_init.c | 2 +- hw/xen/xen_pt_msi.c | 13 ++++++++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index ed5fcae..dba8560 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -870,10 +870,18 @@ static void xen_pci_passthrough_class_init(ObjectClass *klass, void *data) dc->props = xen_pci_passthrough_properties; }; +static void xen_pci_passthrough_finalize(Object *obj) +{ + XenPCIPassthroughState *s = XEN_PT_DEVICE(obj); + + xen_pt_msix_delete(s); +} + static const TypeInfo xen_pci_passthrough_info = { .name = TYPE_XEN_PT_DEVICE, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(XenPCIPassthroughState), + .instance_finalize = xen_pci_passthrough_finalize, .class_init = xen_pci_passthrough_class_init, }; diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 393f36c..9bf79c0 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -296,6 +296,7 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s); int xen_pt_msix_init(XenPCIPassthroughState *s, uint32_t base); void xen_pt_msix_delete(XenPCIPassthroughState *s); +void xen_pt_msix_unmap(XenPCIPassthroughState *s); int xen_pt_msix_update(XenPCIPassthroughState *s); int xen_pt_msix_update_remap(XenPCIPassthroughState *s, int bar_index); void xen_pt_msix_disable(XenPCIPassthroughState *s); diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index dd37be3..286eea3 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1916,7 +1916,7 @@ void xen_pt_config_delete(XenPCIPassthroughState *s) /* free MSI/MSI-X info table */ if (s->msix) { - xen_pt_msix_delete(s); + xen_pt_msix_unmap(s); } if (s->msi) { g_free(s->msi); diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 263e051..49671e1 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -600,7 +600,7 @@ error_out: return rc; } -void xen_pt_msix_delete(XenPCIPassthroughState *s) +void xen_pt_msix_unmap(XenPCIPassthroughState *s) { XenPTMSIX *msix = s->msix; @@ -617,6 +617,17 @@ void xen_pt_msix_delete(XenPCIPassthroughState *s) } memory_region_del_subregion(&s->bar[msix->bar_index], &msix->mmio); +} + +void xen_pt_msix_delete(XenPCIPassthroughState *s) +{ + XenPTMSIX *msix = s->msix; + + if (!msix) { + return; + } + + object_unparent(OBJECT(&msix->mmio)); g_free(s->msix); s->msix = NULL; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14: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 1a4Uwh-00082x-Kt; Thu, 03 Dec 2015 14:33:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwg-00082h-IU for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:18 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 24/2A-31450-DA250665; Thu, 03 Dec 2015 14:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1449153196!8366655!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36211 invoked from network); 3 Dec 2015 14:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwe-0002go-4U for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uwe-0001DE-0x for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:16 +0000 Date: Thu, 03 Dec 2015 14:33:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen: use errno instead of rc for xc_domain_add_to_physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88a8f79d3f5a92f67439f01d16f59a72dac6a142 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 12:51:05 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:07:25 2015 +0000 xen: use errno instead of rc for xc_domain_add_to_physmap In Xen 4.6 commit cd2f100f0f61b3f333d52d1737dd73f02daee592 "libxc: Fix do_memory_op to return negative value on errors" made the libxc API less odd-ball: On errors, return value is -1 and error code is in errno. On success the return value is either 0 or an positive value. Since we could be running with an old toolstack in which the Exx value is in rc or the newer, we add an wrapper around the xc_domain_add_to_physmap (called xen_xc_domain_add_to_physmap) which will always return the EXX. Xen 4.6 did not change the libxc functions mentioned (same parameters) so we piggyback on the fact that Xen 4.6 has a new function: commit 504ed2053362381ac01b98db9313454488b7db40 "tools/libxc: Expose new hypercall xc_reserved_device_memory_map" and check for that. Reviewed-by: Stefano Stabellini Suggested-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- configure | 1 + include/hw/xen/xen_common.h | 22 ++++++++++++++++++++++ xen-hvm.c | 4 ++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c8f6b86..62fc6b9 100755 --- a/configure +++ b/configure @@ -1882,6 +1882,7 @@ int main(void) { xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); xc_hvm_create_ioreq_server(xc, 0, HVM_IOREQSRV_BUFIOREQ_ATOMIC, NULL); + xc_reserved_device_memory_map(xc, 0, 0, 0, 0, NULL, 0); return 0; } EOF diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 19d0bca..d7fa6a4 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -417,4 +417,26 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, #endif +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460 +static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, + unsigned int space, + unsigned long idx, + xen_pfn_t gpfn) +{ + return xc_domain_add_to_physmap(xch, domid, space, idx, gpfn); +} +#else +static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, + unsigned int space, + unsigned long idx, + xen_pfn_t gpfn) +{ + /* In Xen 4.6 rc is -1 and errno contains the error value. */ + int rc = xc_domain_add_to_physmap(xch, domid, space, idx, gpfn); + if (rc == -1) + return errno; + return rc; +} +#endif + #endif /* QEMU_HW_XEN_COMMON_H */ diff --git a/xen-hvm.c b/xen-hvm.c index 4d4b950..d7bc134 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -345,7 +345,7 @@ go_physmap: unsigned long idx = pfn + i; xen_pfn_t gpfn = start_gpfn + i; - rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); + rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { DPRINTF("add_to_physmap MFN %"PRI_xen_pfn" to PFN %" PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); @@ -422,7 +422,7 @@ static int xen_remove_from_physmap(XenIOState *state, xen_pfn_t idx = start_addr + i; xen_pfn_t gpfn = phys_offset + i; - rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); + rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { fprintf(stderr, "add_to_physmap MFN %"PRI_xen_pfn" to PFN %" PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14: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 1a4Uwh-00082x-Kt; Thu, 03 Dec 2015 14:33:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwg-00082h-IU for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:18 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 24/2A-31450-DA250665; Thu, 03 Dec 2015 14:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1449153196!8366655!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36211 invoked from network); 3 Dec 2015 14:33:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwe-0002go-4U for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uwe-0001DE-0x for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:16 +0000 Date: Thu, 03 Dec 2015 14:33:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen: use errno instead of rc for xc_domain_add_to_physmap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 88a8f79d3f5a92f67439f01d16f59a72dac6a142 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 12:51:05 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:07:25 2015 +0000 xen: use errno instead of rc for xc_domain_add_to_physmap In Xen 4.6 commit cd2f100f0f61b3f333d52d1737dd73f02daee592 "libxc: Fix do_memory_op to return negative value on errors" made the libxc API less odd-ball: On errors, return value is -1 and error code is in errno. On success the return value is either 0 or an positive value. Since we could be running with an old toolstack in which the Exx value is in rc or the newer, we add an wrapper around the xc_domain_add_to_physmap (called xen_xc_domain_add_to_physmap) which will always return the EXX. Xen 4.6 did not change the libxc functions mentioned (same parameters) so we piggyback on the fact that Xen 4.6 has a new function: commit 504ed2053362381ac01b98db9313454488b7db40 "tools/libxc: Expose new hypercall xc_reserved_device_memory_map" and check for that. Reviewed-by: Stefano Stabellini Suggested-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- configure | 1 + include/hw/xen/xen_common.h | 22 ++++++++++++++++++++++ xen-hvm.c | 4 ++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c8f6b86..62fc6b9 100755 --- a/configure +++ b/configure @@ -1882,6 +1882,7 @@ int main(void) { xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0); xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000); xc_hvm_create_ioreq_server(xc, 0, HVM_IOREQSRV_BUFIOREQ_ATOMIC, NULL); + xc_reserved_device_memory_map(xc, 0, 0, 0, 0, NULL, 0); return 0; } EOF diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 19d0bca..d7fa6a4 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -417,4 +417,26 @@ static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom, #endif +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 460 +static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, + unsigned int space, + unsigned long idx, + xen_pfn_t gpfn) +{ + return xc_domain_add_to_physmap(xch, domid, space, idx, gpfn); +} +#else +static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, + unsigned int space, + unsigned long idx, + xen_pfn_t gpfn) +{ + /* In Xen 4.6 rc is -1 and errno contains the error value. */ + int rc = xc_domain_add_to_physmap(xch, domid, space, idx, gpfn); + if (rc == -1) + return errno; + return rc; +} +#endif + #endif /* QEMU_HW_XEN_COMMON_H */ diff --git a/xen-hvm.c b/xen-hvm.c index 4d4b950..d7bc134 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -345,7 +345,7 @@ go_physmap: unsigned long idx = pfn + i; xen_pfn_t gpfn = start_gpfn + i; - rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); + rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { DPRINTF("add_to_physmap MFN %"PRI_xen_pfn" to PFN %" PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); @@ -422,7 +422,7 @@ static int xen_remove_from_physmap(XenIOState *state, xen_pfn_t idx = start_addr + i; xen_pfn_t gpfn = phys_offset + i; - rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); + rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { fprintf(stderr, "add_to_physmap MFN %"PRI_xen_pfn" to PFN %" PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14: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 1a4Uws-00084r-QT; Thu, 03 Dec 2015 14:33:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwr-00084S-1z for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:29 +0000 Content-Length: 3702 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 3D/6D-03235-8B250665; Thu, 03 Dec 2015 14:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1449153206!8374169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37318 invoked from network); 3 Dec 2015 14:33:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwo-0002h0-Ee for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uwo-0001Do-9V for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:26 +0000 Date: Thu, 03 Dec 2015 14:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen: fix usage of xc_domain_create in domain builder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8432477416941753280==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8432477416941753280== Content-Length: 3342 Content-Transfer-Encoding: quoted-printable commit e32ad204e2fd75fd443cbbe75b9cefce040251c2 Author: Roger Pau Monne AuthorDate: Fri Nov 13 17:38:06 2015 +0000 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:07:54 2015 +0000 xen: fix usage of xc_domain_create in domain builder Due to the addition of HVMlite and the requirement to always provide a valid xc_domain_configuration_t, xc_domain_create now always takes an arch domain config, which can be NULL in order to mimic previous behaviour. Add a small stub called xen_domain_create that encapsulates the correct call to xc_domain_create depending on the libxc version detected. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- configure | 17 +++++++++++++++++ hw/xenpv/xen_domainbuild.c | 2 +- include/hw/xen/xen_common.h | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 62fc6b9..e41876a 100755 --- a/configure +++ b/configure @@ -1867,6 +1867,23 @@ EOF elif cat > $TMPC < +#include +int main(void) { + xc_interface *xc =3D NULL; + xen_domain_handle_t handle; + xc_domain_create(xc, 0, handle, 0, NULL, NULL); + return 0; +} +EOF + compile_prog "" "$xen_libs" + then + xen_ctrl_version=3D470 + xen=3Dyes + + # Xen 4.6 + elif + cat > $TMPC < #include #include #include diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index c0ab753..ac0e5ac 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -234,7 +234,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, int rc; memcpy(uuid, qemu_uuid, sizeof(uuid)); - rc =3D xc_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); + rc =3D xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); if (rc < 0) { fprintf(stderr, "xen: xc_domain_create() failed\n"); goto err; diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index d7fa6a4..4ac0c6f 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -439,4 +439,20 @@ static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, } #endif +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470 +static inline int xen_domain_create(XenXC xc, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid) +{ + return xc_domain_create(xc, ssidref, handle, flags, pdomid); +} +#else +static inline int xen_domain_create(XenXC xc, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid) +{ + return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL); +} +#endif + #endif /* QEMU_HW_XEN_COMMON_H */ -- generated by git-patchbot for /home/xen/git/qemu-xen.git#master --===============8432477416941753280== 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 --===============8432477416941753280==-- From xen-changelog-bounces@lists.xen.org Thu Dec 03 14:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14: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 1a4Uws-00084r-QT; Thu, 03 Dec 2015 14:33:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwr-00084S-1z for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:29 +0000 Content-Length: 3702 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 3D/6D-03235-8B250665; Thu, 03 Dec 2015 14:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1449153206!8374169!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37318 invoked from network); 3 Dec 2015 14:33:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwo-0002h0-Ee for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uwo-0001Do-9V for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:26 +0000 Date: Thu, 03 Dec 2015 14:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen: fix usage of xc_domain_create in domain builder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8432477416941753280==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8432477416941753280== Content-Length: 3342 Content-Transfer-Encoding: quoted-printable commit e32ad204e2fd75fd443cbbe75b9cefce040251c2 Author: Roger Pau Monne AuthorDate: Fri Nov 13 17:38:06 2015 +0000 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:07:54 2015 +0000 xen: fix usage of xc_domain_create in domain builder Due to the addition of HVMlite and the requirement to always provide a valid xc_domain_configuration_t, xc_domain_create now always takes an arch domain config, which can be NULL in order to mimic previous behaviour. Add a small stub called xen_domain_create that encapsulates the correct call to xc_domain_create depending on the libxc version detected. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- configure | 17 +++++++++++++++++ hw/xenpv/xen_domainbuild.c | 2 +- include/hw/xen/xen_common.h | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletions(-) diff --git a/configure b/configure index 62fc6b9..e41876a 100755 --- a/configure +++ b/configure @@ -1867,6 +1867,23 @@ EOF elif cat > $TMPC < +#include +int main(void) { + xc_interface *xc =3D NULL; + xen_domain_handle_t handle; + xc_domain_create(xc, 0, handle, 0, NULL, NULL); + return 0; +} +EOF + compile_prog "" "$xen_libs" + then + xen_ctrl_version=3D470 + xen=3Dyes + + # Xen 4.6 + elif + cat > $TMPC < #include #include #include diff --git a/hw/xenpv/xen_domainbuild.c b/hw/xenpv/xen_domainbuild.c index c0ab753..ac0e5ac 100644 --- a/hw/xenpv/xen_domainbuild.c +++ b/hw/xenpv/xen_domainbuild.c @@ -234,7 +234,7 @@ int xen_domain_build_pv(const char *kernel, const char *ramdisk, int rc; memcpy(uuid, qemu_uuid, sizeof(uuid)); - rc =3D xc_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); + rc =3D xen_domain_create(xen_xc, ssidref, uuid, flags, &xen_domid); if (rc < 0) { fprintf(stderr, "xen: xc_domain_create() failed\n"); goto err; diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index d7fa6a4..4ac0c6f 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -439,4 +439,20 @@ static inline int xen_xc_domain_add_to_physmap(XenXC xch, uint32_t domid, } #endif +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 470 +static inline int xen_domain_create(XenXC xc, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid) +{ + return xc_domain_create(xc, ssidref, handle, flags, pdomid); +} +#else +static inline int xen_domain_create(XenXC xc, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid) +{ + return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL); +} +#endif + #endif /* QEMU_HW_XEN_COMMON_H */ -- generated by git-patchbot for /home/xen/git/qemu-xen.git#master --===============8432477416941753280== 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 --===============8432477416941753280==-- From xen-changelog-bounces@lists.xen.org Thu Dec 03 14:33:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:33:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Ux2-000873-Ua; Thu, 03 Dec 2015 14:33:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Ux1-00086X-Di for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:39 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id BA/D7-28228-2C250665; Thu, 03 Dec 2015 14:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1449153216!8508804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45686 invoked from network); 3 Dec 2015 14:33:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwy-0002h8-N5 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uwy-0001FE-KX for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:36 +0000 Date: Thu, 03 Dec 2015 14:33:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen-hvm: Add trace to ioreq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af379d4283320a7efee544bdd1d932ea5f173a9c Author: Don Slutz AuthorDate: Thu Apr 30 14:27:09 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:36 2015 +0000 xen-hvm: Add trace to ioreq Signed-off-by: Stefano Stabellini Signed-off-by: Don Slutz --- trace-events | 7 +++++++ xen-hvm.c | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/trace-events b/trace-events index e198730..7fd6e18 100644 --- a/trace-events +++ b/trace-events @@ -932,6 +932,13 @@ xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: % xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" +handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=%#"PRIx64" port=%#"PRIx64" size=%d" +cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=%#"PRIx64" port=%#"PRIx64" size=%d" +cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" # xen-mapcache.c xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 diff --git a/xen-hvm.c b/xen-hvm.c index d7bc134..23d767b 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -814,9 +814,14 @@ static void cpu_ioreq_pio(ioreq_t *req) { uint32_t i; + trace_cpu_ioreq_pio(req, req->dir, req->df, req->data_is_ptr, req->addr, + req->data, req->count, req->size); + if (req->dir == IOREQ_READ) { if (!req->data_is_ptr) { req->data = do_inp(req->addr, req->size); + trace_cpu_ioreq_pio_read_reg(req, req->data, req->addr, + req->size); } else { uint32_t tmp; @@ -827,6 +832,8 @@ static void cpu_ioreq_pio(ioreq_t *req) } } else if (req->dir == IOREQ_WRITE) { if (!req->data_is_ptr) { + trace_cpu_ioreq_pio_write_reg(req, req->data, req->addr, + req->size); do_outp(req->addr, req->size, req->data); } else { for (i = 0; i < req->count; i++) { @@ -843,6 +850,9 @@ static void cpu_ioreq_move(ioreq_t *req) { uint32_t i; + trace_cpu_ioreq_move(req, req->dir, req->df, req->data_is_ptr, req->addr, + req->data, req->count, req->size); + if (!req->data_is_ptr) { if (req->dir == IOREQ_READ) { for (i = 0; i < req->count; i++) { @@ -915,11 +925,18 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req) static void handle_ioreq(XenIOState *state, ioreq_t *req) { + trace_handle_ioreq(req, req->type, req->dir, req->df, req->data_is_ptr, + req->addr, req->data, req->count, req->size); + if (!req->data_is_ptr && (req->dir == IOREQ_WRITE) && (req->size < sizeof (target_ulong))) { req->data &= ((target_ulong) 1 << (8 * req->size)) - 1; } + if (req->dir == IOREQ_WRITE) + trace_handle_ioreq_write(req, req->type, req->df, req->data_is_ptr, + req->addr, req->data, req->count, req->size); + switch (req->type) { case IOREQ_TYPE_PIO: cpu_ioreq_pio(req); @@ -959,6 +976,10 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req) default: hw_error("Invalid ioreq type 0x%x\n", req->type); } + if (req->dir == IOREQ_READ) { + trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr, + req->addr, req->data, req->count, req->size); + } } static int handle_buffered_iopage(XenIOState *state) -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:33:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:33:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Ux2-000873-Ua; Thu, 03 Dec 2015 14:33:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Ux1-00086X-Di for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:39 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id BA/D7-28228-2C250665; Thu, 03 Dec 2015 14:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1449153216!8508804!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45686 invoked from network); 3 Dec 2015 14:33:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uwy-0002h8-N5 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uwy-0001FE-KX for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:36 +0000 Date: Thu, 03 Dec 2015 14:33:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen-hvm: Add trace to ioreq X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit af379d4283320a7efee544bdd1d932ea5f173a9c Author: Don Slutz AuthorDate: Thu Apr 30 14:27:09 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:36 2015 +0000 xen-hvm: Add trace to ioreq Signed-off-by: Stefano Stabellini Signed-off-by: Don Slutz --- trace-events | 7 +++++++ xen-hvm.c | 21 +++++++++++++++++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/trace-events b/trace-events index e198730..7fd6e18 100644 --- a/trace-events +++ b/trace-events @@ -932,6 +932,13 @@ xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: % xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" +handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" +cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=%#"PRIx64" port=%#"PRIx64" size=%d" +cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=%#"PRIx64" port=%#"PRIx64" size=%d" +cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=%#"PRIx64" data=%#"PRIx64" count=%d size=%d" # xen-mapcache.c xen_map_cache(uint64_t phys_addr) "want %#"PRIx64 diff --git a/xen-hvm.c b/xen-hvm.c index d7bc134..23d767b 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -814,9 +814,14 @@ static void cpu_ioreq_pio(ioreq_t *req) { uint32_t i; + trace_cpu_ioreq_pio(req, req->dir, req->df, req->data_is_ptr, req->addr, + req->data, req->count, req->size); + if (req->dir == IOREQ_READ) { if (!req->data_is_ptr) { req->data = do_inp(req->addr, req->size); + trace_cpu_ioreq_pio_read_reg(req, req->data, req->addr, + req->size); } else { uint32_t tmp; @@ -827,6 +832,8 @@ static void cpu_ioreq_pio(ioreq_t *req) } } else if (req->dir == IOREQ_WRITE) { if (!req->data_is_ptr) { + trace_cpu_ioreq_pio_write_reg(req, req->data, req->addr, + req->size); do_outp(req->addr, req->size, req->data); } else { for (i = 0; i < req->count; i++) { @@ -843,6 +850,9 @@ static void cpu_ioreq_move(ioreq_t *req) { uint32_t i; + trace_cpu_ioreq_move(req, req->dir, req->df, req->data_is_ptr, req->addr, + req->data, req->count, req->size); + if (!req->data_is_ptr) { if (req->dir == IOREQ_READ) { for (i = 0; i < req->count; i++) { @@ -915,11 +925,18 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req) static void handle_ioreq(XenIOState *state, ioreq_t *req) { + trace_handle_ioreq(req, req->type, req->dir, req->df, req->data_is_ptr, + req->addr, req->data, req->count, req->size); + if (!req->data_is_ptr && (req->dir == IOREQ_WRITE) && (req->size < sizeof (target_ulong))) { req->data &= ((target_ulong) 1 << (8 * req->size)) - 1; } + if (req->dir == IOREQ_WRITE) + trace_handle_ioreq_write(req, req->type, req->df, req->data_is_ptr, + req->addr, req->data, req->count, req->size); + switch (req->type) { case IOREQ_TYPE_PIO: cpu_ioreq_pio(req); @@ -959,6 +976,10 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req) default: hw_error("Invalid ioreq type 0x%x\n", req->type); } + if (req->dir == IOREQ_READ) { + trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr, + req->addr, req->data, req->count, req->size); + } } static int handle_buffered_iopage(XenIOState *state) -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:33:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:33:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxC-00088Q-3S; Thu, 03 Dec 2015 14:33:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxB-000889-2j for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:49 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 7A/1C-31450-CC250665; Thu, 03 Dec 2015 14:33:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449153227!8351380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33545 invoked from network); 3 Dec 2015 14:33:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Ux8-0002hL-UR for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Ux8-0001Fk-Qr for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:46 +0000 Date: Thu, 03 Dec 2015 14:33:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] i440fx: make types configurable at run-time X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b51957ddd3ffb655c0262fa0174d0edfe9c2e287 Author: Michael S. Tsirkin AuthorDate: Wed Jul 15 13:37:41 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:47 2015 +0000 i440fx: make types configurable at run-time IGD passthrough wants to supply a different pci and host devices, inheriting i440fx devices. Make types configurable. Signed-off-by: Michael S. Tsirkin Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini --- hw/i386/pc_piix.c | 4 +++- hw/pci-host/piix.c | 9 ++++----- include/hw/i386/pc.h | 6 +++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a896624..a36fad2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -200,7 +200,9 @@ static void pc_init1(MachineState *machine) } if (pci_enabled) { - pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi, + pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE, + TYPE_I440FX_PCI_DEVICE, + &i440fx_state, &piix3_devfn, &isa_bus, gsi, system_memory, system_io, machine->ram_size, below_4g_mem_size, above_4g_mem_size, diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index ad55f99..a203d93 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -40,7 +40,6 @@ * http://download.intel.com/design/chipsets/datashts/29054901.pdf */ -#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" #define I440FX_PCI_HOST_BRIDGE(obj) \ OBJECT_CHECK(I440FXState, (obj), TYPE_I440FX_PCI_HOST_BRIDGE) @@ -95,7 +94,6 @@ typedef struct PIIX3State { #define PIIX3_PCI_DEVICE(obj) \ OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3_PCI_DEVICE) -#define TYPE_I440FX_PCI_DEVICE "i440FX" #define I440FX_PCI_DEVICE(obj) \ OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE) @@ -300,7 +298,8 @@ static void i440fx_realize(PCIDevice *dev, Error **errp) dev->config[I440FX_SMRAM] = 0x02; } -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, +PCIBus *i440fx_init(const char *host_type, const char *pci_type, + PCII440FXState **pi440fx_state, int *piix3_devfn, ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, @@ -320,7 +319,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, unsigned i; I440FXState *i440fx; - dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE); + dev = qdev_create(NULL, host_type); s = PCI_HOST_BRIDGE(dev); b = pci_bus_new(dev, NULL, pci_address_space, address_space_io, 0, TYPE_PCI_BUS); @@ -328,7 +327,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL); qdev_init_nofail(dev); - d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE); + d = pci_create_simple(b, 0, pci_type); *pi440fx_state = I440FX_PCI_DEVICE(d); f = *pi440fx_state; f->system_memory = address_space_mem; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 954203d..2eae750 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -227,7 +227,11 @@ extern int no_hpet; struct PCII440FXState; typedef struct PCII440FXState PCII440FXState; -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, +#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" +#define TYPE_I440FX_PCI_DEVICE "i440FX" + +PCIBus *i440fx_init(const char *host_type, const char *pci_type, + PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:33:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:33:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxC-00088Q-3S; Thu, 03 Dec 2015 14:33:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxB-000889-2j for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:49 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 7A/1C-31450-CC250665; Thu, 03 Dec 2015 14:33:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449153227!8351380!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33545 invoked from network); 3 Dec 2015 14:33:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:33:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Ux8-0002hL-UR for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Ux8-0001Fk-Qr for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:46 +0000 Date: Thu, 03 Dec 2015 14:33:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] i440fx: make types configurable at run-time X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b51957ddd3ffb655c0262fa0174d0edfe9c2e287 Author: Michael S. Tsirkin AuthorDate: Wed Jul 15 13:37:41 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:47 2015 +0000 i440fx: make types configurable at run-time IGD passthrough wants to supply a different pci and host devices, inheriting i440fx devices. Make types configurable. Signed-off-by: Michael S. Tsirkin Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini --- hw/i386/pc_piix.c | 4 +++- hw/pci-host/piix.c | 9 ++++----- include/hw/i386/pc.h | 6 +++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a896624..a36fad2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -200,7 +200,9 @@ static void pc_init1(MachineState *machine) } if (pci_enabled) { - pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, &isa_bus, gsi, + pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE, + TYPE_I440FX_PCI_DEVICE, + &i440fx_state, &piix3_devfn, &isa_bus, gsi, system_memory, system_io, machine->ram_size, below_4g_mem_size, above_4g_mem_size, diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index ad55f99..a203d93 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -40,7 +40,6 @@ * http://download.intel.com/design/chipsets/datashts/29054901.pdf */ -#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" #define I440FX_PCI_HOST_BRIDGE(obj) \ OBJECT_CHECK(I440FXState, (obj), TYPE_I440FX_PCI_HOST_BRIDGE) @@ -95,7 +94,6 @@ typedef struct PIIX3State { #define PIIX3_PCI_DEVICE(obj) \ OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3_PCI_DEVICE) -#define TYPE_I440FX_PCI_DEVICE "i440FX" #define I440FX_PCI_DEVICE(obj) \ OBJECT_CHECK(PCII440FXState, (obj), TYPE_I440FX_PCI_DEVICE) @@ -300,7 +298,8 @@ static void i440fx_realize(PCIDevice *dev, Error **errp) dev->config[I440FX_SMRAM] = 0x02; } -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, +PCIBus *i440fx_init(const char *host_type, const char *pci_type, + PCII440FXState **pi440fx_state, int *piix3_devfn, ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, @@ -320,7 +319,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, unsigned i; I440FXState *i440fx; - dev = qdev_create(NULL, TYPE_I440FX_PCI_HOST_BRIDGE); + dev = qdev_create(NULL, host_type); s = PCI_HOST_BRIDGE(dev); b = pci_bus_new(dev, NULL, pci_address_space, address_space_io, 0, TYPE_PCI_BUS); @@ -328,7 +327,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, object_property_add_child(qdev_get_machine(), "i440fx", OBJECT(dev), NULL); qdev_init_nofail(dev); - d = pci_create_simple(b, 0, TYPE_I440FX_PCI_DEVICE); + d = pci_create_simple(b, 0, pci_type); *pi440fx_state = I440FX_PCI_DEVICE(d); f = *pi440fx_state; f->system_memory = address_space_mem; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 954203d..2eae750 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -227,7 +227,11 @@ extern int no_hpet; struct PCII440FXState; typedef struct PCII440FXState PCII440FXState; -PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn, +#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" +#define TYPE_I440FX_PCI_DEVICE "i440FX" + +PCIBus *i440fx_init(const char *host_type, const char *pci_type, + PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, MemoryRegion *address_space_mem, MemoryRegion *address_space_io, -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxP-0008BM-CX; Thu, 03 Dec 2015 14:34:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxN-0008B9-KX for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:01 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id C3/08-08347-8D250665; Thu, 03 Dec 2015 14:34:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1449153239!8238221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63806 invoked from network); 3 Dec 2015 14:34:00 -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; 3 Dec 2015 14:34:00 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxL-0002hT-5m for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UxJ-0001GJ-6k for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:58 +0000 Date: Thu, 03 Dec 2015 14:33:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] pc_init1: pass parameters just with types X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 367cc2cd7b4a6de74792bb23c879508a6770a987 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:42 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:49 2015 +0000 pc_init1: pass parameters just with types Pass types to configure pc_init1(). Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a36fad2..8b1f1cd 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -76,7 +76,8 @@ static bool has_reserved_memory = true; static bool kvmclock_enabled = true; /* PC hardware initialisation */ -static void pc_init1(MachineState *machine) +static void pc_init1(MachineState *machine, + const char *host_type, const char *pci_type) { PCMachineState *pc_machine = PC_MACHINE(machine); MemoryRegion *system_memory = get_system_memory(); @@ -200,8 +201,8 @@ static void pc_init1(MachineState *machine) } if (pci_enabled) { - pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE, - TYPE_I440FX_PCI_DEVICE, + pci_bus = i440fx_init(host_type, + pci_type, &i440fx_state, &piix3_devfn, &isa_bus, gsi, system_memory, system_io, machine->ram_size, below_4g_mem_size, @@ -443,7 +444,7 @@ static void pc_init_isa(MachineState *machine) } x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, 1 << KVM_FEATURE_PV_EOI); enable_compat_apic_id_mode(); - pc_init1(machine); + pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); } #ifdef CONFIG_XEN @@ -451,7 +452,7 @@ static void pc_xen_hvm_init(MachineState *machine) { PCIBus *bus; - pc_init1(machine); + pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); bus = pci_find_primary_bus(); if (bus != NULL) { @@ -467,7 +468,8 @@ static void pc_xen_hvm_init(MachineState *machine) if (compat) { \ compat(machine); \ } \ - pc_init1(machine); \ + pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \ + TYPE_I440FX_PCI_DEVICE); \ } \ DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn) -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxP-0008BM-CX; Thu, 03 Dec 2015 14:34:03 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxN-0008B9-KX for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:01 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id C3/08-08347-8D250665; Thu, 03 Dec 2015 14:34:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1449153239!8238221!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63806 invoked from network); 3 Dec 2015 14:34:00 -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; 3 Dec 2015 14:34:00 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxL-0002hT-5m for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UxJ-0001GJ-6k for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:33:58 +0000 Date: Thu, 03 Dec 2015 14:33:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] pc_init1: pass parameters just with types X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 367cc2cd7b4a6de74792bb23c879508a6770a987 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:42 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:49 2015 +0000 pc_init1: pass parameters just with types Pass types to configure pc_init1(). Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index a36fad2..8b1f1cd 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -76,7 +76,8 @@ static bool has_reserved_memory = true; static bool kvmclock_enabled = true; /* PC hardware initialisation */ -static void pc_init1(MachineState *machine) +static void pc_init1(MachineState *machine, + const char *host_type, const char *pci_type) { PCMachineState *pc_machine = PC_MACHINE(machine); MemoryRegion *system_memory = get_system_memory(); @@ -200,8 +201,8 @@ static void pc_init1(MachineState *machine) } if (pci_enabled) { - pci_bus = i440fx_init(TYPE_I440FX_PCI_HOST_BRIDGE, - TYPE_I440FX_PCI_DEVICE, + pci_bus = i440fx_init(host_type, + pci_type, &i440fx_state, &piix3_devfn, &isa_bus, gsi, system_memory, system_io, machine->ram_size, below_4g_mem_size, @@ -443,7 +444,7 @@ static void pc_init_isa(MachineState *machine) } x86_cpu_compat_kvm_no_autoenable(FEAT_KVM, 1 << KVM_FEATURE_PV_EOI); enable_compat_apic_id_mode(); - pc_init1(machine); + pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); } #ifdef CONFIG_XEN @@ -451,7 +452,7 @@ static void pc_xen_hvm_init(MachineState *machine) { PCIBus *bus; - pc_init1(machine); + pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); bus = pci_find_primary_bus(); if (bus != NULL) { @@ -467,7 +468,8 @@ static void pc_xen_hvm_init(MachineState *machine) if (compat) { \ compat(machine); \ } \ - pc_init1(machine); \ + pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, \ + TYPE_I440FX_PCI_DEVICE); \ } \ DEFINE_PC_MACHINE(suffix, name, pc_init_##suffix, optionfn) -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34: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 1a4Uxa-0008Cu-HS; Thu, 03 Dec 2015 14:34:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxY-0008Cb-Hf for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:12 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 8C/38-08347-3E250665; Thu, 03 Dec 2015 14:34:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1449153250!4764712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26441 invoked from network); 3 Dec 2015 14:34:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxW-0002i4-5O for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UxV-0001H8-SR for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:10 +0000 Date: Thu, 03 Dec 2015 14:34:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] piix: create host bridge to passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44fa27a729e488df221915686bdbdd6fd45536db Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:43 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:52 2015 +0000 piix: create host bridge to passthrough Implement a pci host bridge specific to passthrough. Actually this just inherits the standard one. And we also just expose a minimal real host bridge pci configuration subset. [Replace pread with lseek and read to fix Windows build] Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/pci-host/piix.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 2 + 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index a203d93..3520e31 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -734,6 +734,90 @@ static const TypeInfo i440fx_info = { .class_init = i440fx_class_init, }; +/* IGD Passthrough Host Bridge. */ +typedef struct { + uint8_t offset; + uint8_t len; +} IGDHostInfo; + +/* Here we just expose minimal host bridge offset subset. */ +static const IGDHostInfo igd_host_bridge_infos[] = { + {0x08, 2}, /* revision id */ + {0x2c, 2}, /* sybsystem vendor id */ + {0x2e, 2}, /* sybsystem id */ + {0x50, 2}, /* SNB: processor graphics control register */ + {0x52, 2}, /* processor graphics control register */ + {0xa4, 4}, /* SNB: graphics base of stolen memory */ + {0xa8, 4}, /* SNB: base of GTT stolen memory */ +}; + +static int host_pci_config_read(int pos, int len, uint32_t val) +{ + char path[PATH_MAX]; + int config_fd; + ssize_t size = sizeof(path); + /* Access real host bridge. */ + int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", + 0, 0, 0, 0, "config"); + + if (rc >= size || rc < 0) { + return -ENODEV; + } + + config_fd = open(path, O_RDWR); + if (config_fd < 0) { + return -ENODEV; + } + + if (lseek(config_fd, pos, SEEK_SET) != pos) { + return -errno; + } + do { + rc = read(config_fd, (uint8_t *)&val, len); + } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); + if (rc != len) { + return -errno; + } + + return 0; +} + +static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) +{ + uint32_t val = 0; + int rc, i, num; + int pos, len; + + num = ARRAY_SIZE(igd_host_bridge_infos); + for (i = 0; i < num; i++) { + pos = igd_host_bridge_infos[i].offset; + len = igd_host_bridge_infos[i].len; + rc = host_pci_config_read(pos, len, val); + if (rc) { + return -ENODEV; + } + pci_default_write_config(pci_dev, pos, val, len); + } + + return 0; +} + +static void igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->init = igd_pt_i440fx_initfn; + dc->desc = "IGD Passthrough Host bridge"; +} + +static const TypeInfo igd_passthrough_i440fx_info = { + .name = TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, + .parent = TYPE_I440FX_PCI_DEVICE, + .instance_size = sizeof(PCII440FXState), + .class_init = igd_passthrough_i440fx_class_init, +}; + static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge, PCIBus *rootbus) { @@ -775,6 +859,7 @@ static const TypeInfo i440fx_pcihost_info = { static void i440fx_register_types(void) { type_register_static(&i440fx_info); + type_register_static(&igd_passthrough_i440fx_info); type_register_static(&piix3_pci_type_info); type_register_static(&piix3_info); type_register_static(&piix3_xen_info); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 2eae750..afb390e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -230,6 +230,8 @@ typedef struct PCII440FXState PCII440FXState; #define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" #define TYPE_I440FX_PCI_DEVICE "i440FX" +#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" + PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34: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 1a4Uxa-0008Cu-HS; Thu, 03 Dec 2015 14:34:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxY-0008Cb-Hf for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:12 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 8C/38-08347-3E250665; Thu, 03 Dec 2015 14:34:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1449153250!4764712!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26441 invoked from network); 3 Dec 2015 14:34:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UxW-0002i4-5O for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UxV-0001H8-SR for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:10 +0000 Date: Thu, 03 Dec 2015 14:34:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] piix: create host bridge to passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 44fa27a729e488df221915686bdbdd6fd45536db Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:43 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:19:52 2015 +0000 piix: create host bridge to passthrough Implement a pci host bridge specific to passthrough. Actually this just inherits the standard one. And we also just expose a minimal real host bridge pci configuration subset. [Replace pread with lseek and read to fix Windows build] Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/pci-host/piix.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 2 + 2 files changed, 87 insertions(+), 0 deletions(-) diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index a203d93..3520e31 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -734,6 +734,90 @@ static const TypeInfo i440fx_info = { .class_init = i440fx_class_init, }; +/* IGD Passthrough Host Bridge. */ +typedef struct { + uint8_t offset; + uint8_t len; +} IGDHostInfo; + +/* Here we just expose minimal host bridge offset subset. */ +static const IGDHostInfo igd_host_bridge_infos[] = { + {0x08, 2}, /* revision id */ + {0x2c, 2}, /* sybsystem vendor id */ + {0x2e, 2}, /* sybsystem id */ + {0x50, 2}, /* SNB: processor graphics control register */ + {0x52, 2}, /* processor graphics control register */ + {0xa4, 4}, /* SNB: graphics base of stolen memory */ + {0xa8, 4}, /* SNB: base of GTT stolen memory */ +}; + +static int host_pci_config_read(int pos, int len, uint32_t val) +{ + char path[PATH_MAX]; + int config_fd; + ssize_t size = sizeof(path); + /* Access real host bridge. */ + int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", + 0, 0, 0, 0, "config"); + + if (rc >= size || rc < 0) { + return -ENODEV; + } + + config_fd = open(path, O_RDWR); + if (config_fd < 0) { + return -ENODEV; + } + + if (lseek(config_fd, pos, SEEK_SET) != pos) { + return -errno; + } + do { + rc = read(config_fd, (uint8_t *)&val, len); + } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); + if (rc != len) { + return -errno; + } + + return 0; +} + +static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) +{ + uint32_t val = 0; + int rc, i, num; + int pos, len; + + num = ARRAY_SIZE(igd_host_bridge_infos); + for (i = 0; i < num; i++) { + pos = igd_host_bridge_infos[i].offset; + len = igd_host_bridge_infos[i].len; + rc = host_pci_config_read(pos, len, val); + if (rc) { + return -ENODEV; + } + pci_default_write_config(pci_dev, pos, val, len); + } + + return 0; +} + +static void igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + k->init = igd_pt_i440fx_initfn; + dc->desc = "IGD Passthrough Host bridge"; +} + +static const TypeInfo igd_passthrough_i440fx_info = { + .name = TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE, + .parent = TYPE_I440FX_PCI_DEVICE, + .instance_size = sizeof(PCII440FXState), + .class_init = igd_passthrough_i440fx_class_init, +}; + static const char *i440fx_pcihost_root_bus_path(PCIHostState *host_bridge, PCIBus *rootbus) { @@ -775,6 +859,7 @@ static const TypeInfo i440fx_pcihost_info = { static void i440fx_register_types(void) { type_register_static(&i440fx_info); + type_register_static(&igd_passthrough_i440fx_info); type_register_static(&piix3_pci_type_info); type_register_static(&piix3_info); type_register_static(&piix3_xen_info); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 2eae750..afb390e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -230,6 +230,8 @@ typedef struct PCII440FXState PCII440FXState; #define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" #define TYPE_I440FX_PCI_DEVICE "i440FX" +#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" + PCIBus *i440fx_init(const char *host_type, const char *pci_type, PCII440FXState **pi440fx_state, int *piix_devfn, ISABus **isa_bus, qemu_irq *pic, -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34: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 1a4Uxk-0008EH-LX; Thu, 03 Dec 2015 14:34:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxj-0008Dp-2n for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:23 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 4B/26-16870-EE250665; Thu, 03 Dec 2015 14:34:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1449153260!8052773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62276 invoked from network); 3 Dec 2015 14:34:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxg-0002iC-Cj for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uxg-0001Hf-Bi for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:20 +0000 Date: Thu, 03 Dec 2015 14:34:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] hw/pci-assign: split pci-assign.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f745796ae9ae5886564a1ed1d03b994cd265e39d Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:44 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:20:46 2015 +0000 hw/pci-assign: split pci-assign.c We will try to reuse assign_dev_load_option_rom in xen side, and especially its a good beginning to unify pci assign codes both on kvm and xen in the future. [Fix build for Windows] Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/Makefile.objs | 2 + hw/i386/kvm/pci-assign.c | 82 +++--------------------------------- hw/i386/pci-assign-load-rom.c | 91 +++++++++++++++++++++++++++++++++++++++++ include/hw/pci/pci-assign.h | 27 ++++++++++++ 4 files changed, 127 insertions(+), 75 deletions(-) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index bd4f147..001d54f 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -7,6 +7,8 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o +obj-y += pci-assign-load-rom.o + hw/i386/acpi-build.o: hw/i386/acpi-build.c \ hw/i386/acpi-dsdt.hex hw/i386/q35-acpi-dsdt.hex diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index 74d22f4..b1beaa6 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -37,6 +37,7 @@ #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "kvm_i386.h" +#include "hw/pci/pci-assign.h" #define MSIX_PAGE_SIZE 0x1000 @@ -48,17 +49,6 @@ #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ #define IORESOURCE_MEM_64 0x00100000 -//#define DEVICE_ASSIGNMENT_DEBUG - -#ifdef DEVICE_ASSIGNMENT_DEBUG -#define DEBUG(fmt, ...) \ - do { \ - fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \ - } while (0) -#else -#define DEBUG(fmt, ...) -#endif - typedef struct PCIRegion { int type; /* Memory or port I/O */ int valid; @@ -1896,73 +1886,15 @@ static void assign_register_types(void) type_init(assign_register_types) -/* - * Scan the assigned devices for the devices that have an option ROM, and then - * load the corresponding ROM data to RAM. If an error occurs while loading an - * option ROM, we just ignore that option ROM and continue with the next one. - */ static void assigned_dev_load_option_rom(AssignedDevice *dev) { - char name[32], rom_file[64]; - FILE *fp; - uint8_t val; - struct stat st; - void *ptr; - - /* If loading ROM from file, pci handles it */ - if (dev->dev.romfile || !dev->dev.rom_bar) { - return; - } + int size = 0; - snprintf(rom_file, sizeof(rom_file), - "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/rom", - dev->host.domain, dev->host.bus, dev->host.slot, - dev->host.function); + pci_assign_dev_load_option_rom(&dev->dev, OBJECT(dev), &size, + dev->host.domain, dev->host.bus, + dev->host.slot, dev->host.function); - if (stat(rom_file, &st)) { - return; - } - - if (access(rom_file, F_OK)) { - error_report("pci-assign: Insufficient privileges for %s", rom_file); - return; - } - - /* Write "1" to the ROM file to enable it */ - fp = fopen(rom_file, "r+"); - if (fp == NULL) { - return; + if (!size) { + error_report("pci-assign: Invalid ROM."); } - val = 1; - if (fwrite(&val, 1, 1, fp) != 1) { - goto close_rom; - } - fseek(fp, 0, SEEK_SET); - - snprintf(name, sizeof(name), "%s.rom", - object_get_typename(OBJECT(dev))); - memory_region_init_ram(&dev->dev.rom, OBJECT(dev), name, st.st_size, - &error_abort); - vmstate_register_ram(&dev->dev.rom, &dev->dev.qdev); - ptr = memory_region_get_ram_ptr(&dev->dev.rom); - memset(ptr, 0xff, st.st_size); - - if (!fread(ptr, 1, st.st_size, fp)) { - error_report("pci-assign: Cannot read from host %s", rom_file); - error_printf("Device option ROM contents are probably invalid " - "(check dmesg).\nSkip option ROM probe with rombar=0, " - "or load from file with romfile=\n"); - goto close_rom; - } - - pci_register_bar(&dev->dev, PCI_ROM_SLOT, 0, &dev->dev.rom); - dev->dev.has_rom = true; -close_rom: - /* Write "0" to disable ROM */ - fseek(fp, 0, SEEK_SET); - val = 0; - if (!fwrite(&val, 1, 1, fp)) { - DEBUG("%s\n", "Failed to disable pci-sysfs rom file"); - } - fclose(fp); } diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c new file mode 100644 index 0000000..34a3a7e --- /dev/null +++ b/hw/i386/pci-assign-load-rom.c @@ -0,0 +1,91 @@ +/* + * This is splited from hw/i386/kvm/pci-assign.c + */ +#include +#include +#include +#include +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "qemu/error-report.h" +#include "ui/console.h" +#include "hw/loader.h" +#include "monitor/monitor.h" +#include "qemu/range.h" +#include "sysemu/sysemu.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci-assign.h" + +/* + * Scan the assigned devices for the devices that have an option ROM, and then + * load the corresponding ROM data to RAM. If an error occurs while loading an + * option ROM, we just ignore that option ROM and continue with the next one. + */ +void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner, + int *size, unsigned int domain, + unsigned int bus, unsigned int slot, + unsigned int function) +{ + char name[32], rom_file[64]; + FILE *fp; + uint8_t val; + struct stat st; + void *ptr = NULL; + + /* If loading ROM from file, pci handles it */ + if (dev->romfile || !dev->rom_bar) { + return NULL; + } + + snprintf(rom_file, sizeof(rom_file), + "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/rom", + domain, bus, slot, function); + + if (stat(rom_file, &st)) { + return NULL; + } + + if (access(rom_file, F_OK)) { + error_report("pci-assign: Insufficient privileges for %s", rom_file); + return NULL; + } + + /* Write "1" to the ROM file to enable it */ + fp = fopen(rom_file, "r+"); + if (fp == NULL) { + return NULL; + } + val = 1; + if (fwrite(&val, 1, 1, fp) != 1) { + goto close_rom; + } + fseek(fp, 0, SEEK_SET); + + snprintf(name, sizeof(name), "%s.rom", object_get_typename(owner)); + memory_region_init_ram(&dev->rom, owner, name, st.st_size, &error_abort); + vmstate_register_ram(&dev->rom, &dev->qdev); + ptr = memory_region_get_ram_ptr(&dev->rom); + memset(ptr, 0xff, st.st_size); + + if (!fread(ptr, 1, st.st_size, fp)) { + error_report("pci-assign: Cannot read from host %s", rom_file); + error_printf("Device option ROM contents are probably invalid " + "(check dmesg).\nSkip option ROM probe with rombar=0, " + "or load from file with romfile=\n"); + goto close_rom; + } + + pci_register_bar(dev, PCI_ROM_SLOT, 0, &dev->rom); + dev->has_rom = true; + *size = st.st_size; +close_rom: + /* Write "0" to disable ROM */ + fseek(fp, 0, SEEK_SET); + val = 0; + if (!fwrite(&val, 1, 1, fp)) { + DEBUG("%s\n", "Failed to disable pci-sysfs rom file"); + } + fclose(fp); + + return ptr; +} diff --git a/include/hw/pci/pci-assign.h b/include/hw/pci/pci-assign.h new file mode 100644 index 0000000..55f42c5 --- /dev/null +++ b/include/hw/pci/pci-assign.h @@ -0,0 +1,27 @@ +/* + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Just split from hw/i386/kvm/pci-assign.c. + */ +#ifndef PCI_ASSIGN_H +#define PCI_ASSIGN_H + +#include "hw/pci/pci.h" + +//#define DEVICE_ASSIGNMENT_DEBUG + +#ifdef DEVICE_ASSIGNMENT_DEBUG +#define DEBUG(fmt, ...) \ + do { \ + fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \ + } while (0) +#else +#define DEBUG(fmt, ...) +#endif + +void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner, + int *size, unsigned int domain, + unsigned int bus, unsigned int slot, + unsigned int function); +#endif /* PCI_ASSIGN_H */ -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34: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 1a4Uxk-0008EH-LX; Thu, 03 Dec 2015 14:34:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxj-0008Dp-2n for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:23 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 4B/26-16870-EE250665; Thu, 03 Dec 2015 14:34:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1449153260!8052773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62276 invoked from network); 3 Dec 2015 14:34:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxg-0002iC-Cj for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uxg-0001Hf-Bi for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:20 +0000 Date: Thu, 03 Dec 2015 14:34:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] hw/pci-assign: split pci-assign.c X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f745796ae9ae5886564a1ed1d03b994cd265e39d Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:44 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:20:46 2015 +0000 hw/pci-assign: split pci-assign.c We will try to reuse assign_dev_load_option_rom in xen side, and especially its a good beginning to unify pci assign codes both on kvm and xen in the future. [Fix build for Windows] Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/Makefile.objs | 2 + hw/i386/kvm/pci-assign.c | 82 +++--------------------------------- hw/i386/pci-assign-load-rom.c | 91 +++++++++++++++++++++++++++++++++++++++++ include/hw/pci/pci-assign.h | 27 ++++++++++++ 4 files changed, 127 insertions(+), 75 deletions(-) diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index bd4f147..001d54f 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -7,6 +7,8 @@ obj-$(CONFIG_XEN) += ../xenpv/ xen/ obj-y += kvmvapic.o obj-y += acpi-build.o +obj-y += pci-assign-load-rom.o + hw/i386/acpi-build.o: hw/i386/acpi-build.c \ hw/i386/acpi-dsdt.hex hw/i386/q35-acpi-dsdt.hex diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index 74d22f4..b1beaa6 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -37,6 +37,7 @@ #include "hw/pci/pci.h" #include "hw/pci/msi.h" #include "kvm_i386.h" +#include "hw/pci/pci-assign.h" #define MSIX_PAGE_SIZE 0x1000 @@ -48,17 +49,6 @@ #define IORESOURCE_PREFETCH 0x00002000 /* No side effects */ #define IORESOURCE_MEM_64 0x00100000 -//#define DEVICE_ASSIGNMENT_DEBUG - -#ifdef DEVICE_ASSIGNMENT_DEBUG -#define DEBUG(fmt, ...) \ - do { \ - fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \ - } while (0) -#else -#define DEBUG(fmt, ...) -#endif - typedef struct PCIRegion { int type; /* Memory or port I/O */ int valid; @@ -1896,73 +1886,15 @@ static void assign_register_types(void) type_init(assign_register_types) -/* - * Scan the assigned devices for the devices that have an option ROM, and then - * load the corresponding ROM data to RAM. If an error occurs while loading an - * option ROM, we just ignore that option ROM and continue with the next one. - */ static void assigned_dev_load_option_rom(AssignedDevice *dev) { - char name[32], rom_file[64]; - FILE *fp; - uint8_t val; - struct stat st; - void *ptr; - - /* If loading ROM from file, pci handles it */ - if (dev->dev.romfile || !dev->dev.rom_bar) { - return; - } + int size = 0; - snprintf(rom_file, sizeof(rom_file), - "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/rom", - dev->host.domain, dev->host.bus, dev->host.slot, - dev->host.function); + pci_assign_dev_load_option_rom(&dev->dev, OBJECT(dev), &size, + dev->host.domain, dev->host.bus, + dev->host.slot, dev->host.function); - if (stat(rom_file, &st)) { - return; - } - - if (access(rom_file, F_OK)) { - error_report("pci-assign: Insufficient privileges for %s", rom_file); - return; - } - - /* Write "1" to the ROM file to enable it */ - fp = fopen(rom_file, "r+"); - if (fp == NULL) { - return; + if (!size) { + error_report("pci-assign: Invalid ROM."); } - val = 1; - if (fwrite(&val, 1, 1, fp) != 1) { - goto close_rom; - } - fseek(fp, 0, SEEK_SET); - - snprintf(name, sizeof(name), "%s.rom", - object_get_typename(OBJECT(dev))); - memory_region_init_ram(&dev->dev.rom, OBJECT(dev), name, st.st_size, - &error_abort); - vmstate_register_ram(&dev->dev.rom, &dev->dev.qdev); - ptr = memory_region_get_ram_ptr(&dev->dev.rom); - memset(ptr, 0xff, st.st_size); - - if (!fread(ptr, 1, st.st_size, fp)) { - error_report("pci-assign: Cannot read from host %s", rom_file); - error_printf("Device option ROM contents are probably invalid " - "(check dmesg).\nSkip option ROM probe with rombar=0, " - "or load from file with romfile=\n"); - goto close_rom; - } - - pci_register_bar(&dev->dev, PCI_ROM_SLOT, 0, &dev->dev.rom); - dev->dev.has_rom = true; -close_rom: - /* Write "0" to disable ROM */ - fseek(fp, 0, SEEK_SET); - val = 0; - if (!fwrite(&val, 1, 1, fp)) { - DEBUG("%s\n", "Failed to disable pci-sysfs rom file"); - } - fclose(fp); } diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c new file mode 100644 index 0000000..34a3a7e --- /dev/null +++ b/hw/i386/pci-assign-load-rom.c @@ -0,0 +1,91 @@ +/* + * This is splited from hw/i386/kvm/pci-assign.c + */ +#include +#include +#include +#include +#include "hw/hw.h" +#include "hw/i386/pc.h" +#include "qemu/error-report.h" +#include "ui/console.h" +#include "hw/loader.h" +#include "monitor/monitor.h" +#include "qemu/range.h" +#include "sysemu/sysemu.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci-assign.h" + +/* + * Scan the assigned devices for the devices that have an option ROM, and then + * load the corresponding ROM data to RAM. If an error occurs while loading an + * option ROM, we just ignore that option ROM and continue with the next one. + */ +void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner, + int *size, unsigned int domain, + unsigned int bus, unsigned int slot, + unsigned int function) +{ + char name[32], rom_file[64]; + FILE *fp; + uint8_t val; + struct stat st; + void *ptr = NULL; + + /* If loading ROM from file, pci handles it */ + if (dev->romfile || !dev->rom_bar) { + return NULL; + } + + snprintf(rom_file, sizeof(rom_file), + "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/rom", + domain, bus, slot, function); + + if (stat(rom_file, &st)) { + return NULL; + } + + if (access(rom_file, F_OK)) { + error_report("pci-assign: Insufficient privileges for %s", rom_file); + return NULL; + } + + /* Write "1" to the ROM file to enable it */ + fp = fopen(rom_file, "r+"); + if (fp == NULL) { + return NULL; + } + val = 1; + if (fwrite(&val, 1, 1, fp) != 1) { + goto close_rom; + } + fseek(fp, 0, SEEK_SET); + + snprintf(name, sizeof(name), "%s.rom", object_get_typename(owner)); + memory_region_init_ram(&dev->rom, owner, name, st.st_size, &error_abort); + vmstate_register_ram(&dev->rom, &dev->qdev); + ptr = memory_region_get_ram_ptr(&dev->rom); + memset(ptr, 0xff, st.st_size); + + if (!fread(ptr, 1, st.st_size, fp)) { + error_report("pci-assign: Cannot read from host %s", rom_file); + error_printf("Device option ROM contents are probably invalid " + "(check dmesg).\nSkip option ROM probe with rombar=0, " + "or load from file with romfile=\n"); + goto close_rom; + } + + pci_register_bar(dev, PCI_ROM_SLOT, 0, &dev->rom); + dev->has_rom = true; + *size = st.st_size; +close_rom: + /* Write "0" to disable ROM */ + fseek(fp, 0, SEEK_SET); + val = 0; + if (!fwrite(&val, 1, 1, fp)) { + DEBUG("%s\n", "Failed to disable pci-sysfs rom file"); + } + fclose(fp); + + return ptr; +} diff --git a/include/hw/pci/pci-assign.h b/include/hw/pci/pci-assign.h new file mode 100644 index 0000000..55f42c5 --- /dev/null +++ b/include/hw/pci/pci-assign.h @@ -0,0 +1,27 @@ +/* + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + * Just split from hw/i386/kvm/pci-assign.c. + */ +#ifndef PCI_ASSIGN_H +#define PCI_ASSIGN_H + +#include "hw/pci/pci.h" + +//#define DEVICE_ASSIGNMENT_DEBUG + +#ifdef DEVICE_ASSIGNMENT_DEBUG +#define DEBUG(fmt, ...) \ + do { \ + fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \ + } while (0) +#else +#define DEBUG(fmt, ...) +#endif + +void *pci_assign_dev_load_option_rom(PCIDevice *dev, struct Object *owner, + int *size, unsigned int domain, + unsigned int bus, unsigned int slot, + unsigned int function); +#endif /* PCI_ASSIGN_H */ -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxv-0008GK-Q5; Thu, 03 Dec 2015 14:34:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxu-0008Fu-MS for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:35 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id C8/7F-01748-9F250665; Thu, 03 Dec 2015 14:34:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1449153271!8643013!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58490 invoked from network); 3 Dec 2015 14:34:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxq-0002iK-PW for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uxq-0001IX-Kv for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:30 +0000 Date: Thu, 03 Dec 2015 14:34:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: basic graphics passthrough support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a3ba3ec4f6c30cccf862e7aee25c28890fafeff Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:45 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:20 2015 +0000 xen, gfx passthrough: basic graphics passthrough support basic gfx passthrough support: - add a vga type for gfx passthrough - register/unregister legacy VGA I/O ports and MMIOs for passthrough GFX Signed-off-by: Tiejun Chen Signed-off-by: Yang Zhang Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/core/machine.c | 20 ++++++++ hw/xen/Makefile.objs | 1 + hw/xen/xen-host-pci-device.c | 5 ++ hw/xen/xen-host-pci-device.h | 1 + hw/xen/xen_pt.c | 4 ++ hw/xen/xen_pt.h | 10 +++- hw/xen/xen_pt_graphics.c | 111 ++++++++++++++++++++++++++++++++++++++++++ include/hw/boards.h | 1 + qemu-options.hx | 3 + vl.c | 10 ++++ 10 files changed, 165 insertions(+), 1 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index ac4654e..51ed6b2 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -226,6 +226,20 @@ static void machine_set_usb(Object *obj, bool value, Error **errp) ms->usb_disabled = !value; } +static bool machine_get_igd_gfx_passthru(Object *obj, Error **errp) +{ + MachineState *ms = MACHINE(obj); + + return ms->igd_gfx_passthru; +} + +static void machine_set_igd_gfx_passthru(Object *obj, bool value, Error **errp) +{ + MachineState *ms = MACHINE(obj); + + ms->igd_gfx_passthru = value; +} + static char *machine_get_firmware(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); @@ -388,6 +402,12 @@ static void machine_initfn(Object *obj) object_property_set_description(obj, "usb", "Set on/off to enable/disable usb", NULL); + object_property_add_bool(obj, "igd-passthru", + machine_get_igd_gfx_passthru, + machine_set_igd_gfx_passthru, NULL); + object_property_set_description(obj, "igd-passthru", + "Set on/off to enable/disable igd passthrou", + NULL); object_property_add_str(obj, "firmware", machine_get_firmware, machine_set_firmware, NULL); diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs index a0ca0aa..a9ad7e7 100644 --- a/hw/xen/Makefile.objs +++ b/hw/xen/Makefile.objs @@ -3,3 +3,4 @@ common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o +obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o xen_pt_graphics.o diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c index 743b37b..a54b7de 100644 --- a/hw/xen/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c @@ -376,6 +376,11 @@ int xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain, goto error; } d->irq = v; + rc = xen_host_pci_get_hex_value(d, "class", &v); + if (rc) { + goto error; + } + d->class_code = v; d->is_virtfn = xen_host_pci_dev_is_virtfn(d); return 0; diff --git a/hw/xen/xen-host-pci-device.h b/hw/xen/xen-host-pci-device.h index c2486f0..f1e1c30 100644 --- a/hw/xen/xen-host-pci-device.h +++ b/hw/xen/xen-host-pci-device.h @@ -25,6 +25,7 @@ typedef struct XenHostPCIDevice { uint16_t vendor_id; uint16_t device_id; + uint32_t class_code; int irq; XenHostPCIIORegion io_regions[PCI_NUM_REGIONS - 1]; diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index dba8560..9fb5315 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -502,6 +502,7 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s, uint16_t *cmd) d->rom.size, d->rom.base_addr); } + xen_pt_register_vga_regions(d); return 0; } @@ -801,6 +802,7 @@ out: static void xen_pt_unregister_device(PCIDevice *d) { XenPCIPassthroughState *s = XEN_PT_DEVICE(d); + XenHostPCIDevice *host_dev = &s->real_device; uint8_t machine_irq = s->machine_irq; uint8_t intx = xen_pt_pci_intx(s); int rc; @@ -844,6 +846,8 @@ static void xen_pt_unregister_device(PCIDevice *d) /* delete all emulated config registers */ xen_pt_config_delete(s); + xen_pt_unregister_vga_regions(host_dev); + memory_listener_unregister(&s->memory_listener); memory_listener_unregister(&s->io_listener); diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 9bf79c0..5740d4f 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -306,5 +306,13 @@ static inline bool xen_pt_has_msix_mapping(XenPCIPassthroughState *s, int bar) return s->msix && s->msix->bar_index == bar; } - +extern bool has_igd_gfx_passthru; +static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev) +{ + return (has_igd_gfx_passthru + && ((dev->class_code >> 0x8) == PCI_CLASS_DISPLAY_VGA)); +} +int xen_pt_register_vga_regions(XenHostPCIDevice *dev); +int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev); +int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev); #endif /* !XEN_PT_H */ diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c new file mode 100644 index 0000000..9b3df81 --- /dev/null +++ b/hw/xen/xen_pt_graphics.c @@ -0,0 +1,111 @@ +/* + * graphics passthrough + */ +#include "xen_pt.h" +#include "xen-host-pci-device.h" +#include "hw/xen/xen_backend.h" + +typedef struct VGARegion { + int type; /* Memory or port I/O */ + uint64_t guest_base_addr; + uint64_t machine_base_addr; + uint64_t size; /* size of the region */ + int rc; +} VGARegion; + +#define IORESOURCE_IO 0x00000100 +#define IORESOURCE_MEM 0x00000200 + +static struct VGARegion vga_args[] = { + { + .type = IORESOURCE_IO, + .guest_base_addr = 0x3B0, + .machine_base_addr = 0x3B0, + .size = 0xC, + .rc = -1, + }, + { + .type = IORESOURCE_IO, + .guest_base_addr = 0x3C0, + .machine_base_addr = 0x3C0, + .size = 0x20, + .rc = -1, + }, + { + .type = IORESOURCE_MEM, + .guest_base_addr = 0xa0000 >> XC_PAGE_SHIFT, + .machine_base_addr = 0xa0000 >> XC_PAGE_SHIFT, + .size = 0x20, + .rc = -1, + }, +}; + +/* + * register VGA resources for the domain with assigned gfx + */ +int xen_pt_register_vga_regions(XenHostPCIDevice *dev) +{ + int i = 0; + + if (!is_igd_vga_passthrough(dev)) { + return 0; + } + + for (i = 0 ; i < ARRAY_SIZE(vga_args); i++) { + if (vga_args[i].type == IORESOURCE_IO) { + vga_args[i].rc = xc_domain_ioport_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_ADD_MAPPING); + } else { + vga_args[i].rc = xc_domain_memory_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_ADD_MAPPING); + } + + if (vga_args[i].rc) { + XEN_PT_ERR(NULL, "VGA %s mapping failed! (rc: %i)\n", + vga_args[i].type == IORESOURCE_IO ? "ioport" : "memory", + vga_args[i].rc); + return vga_args[i].rc; + } + } + + return 0; +} + +/* + * unregister VGA resources for the domain with assigned gfx + */ +int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) +{ + int i = 0; + + if (!is_igd_vga_passthrough(dev)) { + return 0; + } + + for (i = 0 ; i < ARRAY_SIZE(vga_args); i++) { + if (vga_args[i].type == IORESOURCE_IO) { + vga_args[i].rc = xc_domain_ioport_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_REMOVE_MAPPING); + } else { + vga_args[i].rc = xc_domain_memory_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_REMOVE_MAPPING); + } + + if (vga_args[i].rc) { + XEN_PT_ERR(NULL, "VGA %s unmapping failed! (rc: %i)\n", + vga_args[i].type == IORESOURCE_IO ? "ioport" : "memory", + vga_args[i].rc); + return vga_args[i].rc; + } + } + + return 0; +} diff --git a/include/hw/boards.h b/include/hw/boards.h index 2aec9cb..4a0ee05 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -136,6 +136,7 @@ struct MachineState { bool mem_merge; bool usb; bool usb_disabled; + bool igd_gfx_passthru; char *firmware; bool iommu; bool suppress_vmdesc; diff --git a/qemu-options.hx b/qemu-options.hx index 77f5853..f26f477 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -38,6 +38,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" " iommu=on|off controls emulated Intel IOMMU (VT-d) support (default=off)\n" + " igd-passthru=on|off controls IGD GFX passthrough support (default=off)\n" " aes-key-wrap=on|off controls support for AES key wrapping (default=on)\n" " dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n" " suppress-vmdesc=on|off disables self-describing migration (default=off)\n", @@ -55,6 +56,8 @@ than one accelerator specified, the next one is used if the previous one fails to initialize. @item kernel_irqchip=on|off Enables in-kernel irqchip support for the chosen accelerator when available. +@item gfx_passthru=on|off +Enables IGD GFX passthrough support for the chosen machine when available. @item vmport=on|off|auto Enables emulation of VMWare IO port, for vmmouse etc. auto says to select the value based on accel. For accel=xen the default is off otherwise the default diff --git a/vl.c b/vl.c index 6b73934..88fdbf1 100644 --- a/vl.c +++ b/vl.c @@ -1338,6 +1338,13 @@ static inline void semihosting_arg_fallback(const char *file, const char *cmd) } } +/* Now we still need this for compatibility with XEN. */ +bool has_igd_gfx_passthru; +static void igd_gfx_passthru(void) +{ + has_igd_gfx_passthru = current_machine->igd_gfx_passthru; +} + /***********************************************************/ /* USB devices */ @@ -4501,6 +4508,9 @@ int main(int argc, char **argv, char **envp) exit(1); } + /* Check if IGD GFX passthrough. */ + igd_gfx_passthru(); + /* init generic devices */ if (qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, NULL)) { -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxv-0008GK-Q5; Thu, 03 Dec 2015 14:34:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxu-0008Fu-MS for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:35 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id C8/7F-01748-9F250665; Thu, 03 Dec 2015 14:34:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1449153271!8643013!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58490 invoked from network); 3 Dec 2015 14:34:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uxq-0002iK-PW for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uxq-0001IX-Kv for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:30 +0000 Date: Thu, 03 Dec 2015 14:34:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: basic graphics passthrough support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a3ba3ec4f6c30cccf862e7aee25c28890fafeff Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:45 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:20 2015 +0000 xen, gfx passthrough: basic graphics passthrough support basic gfx passthrough support: - add a vga type for gfx passthrough - register/unregister legacy VGA I/O ports and MMIOs for passthrough GFX Signed-off-by: Tiejun Chen Signed-off-by: Yang Zhang Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/core/machine.c | 20 ++++++++ hw/xen/Makefile.objs | 1 + hw/xen/xen-host-pci-device.c | 5 ++ hw/xen/xen-host-pci-device.h | 1 + hw/xen/xen_pt.c | 4 ++ hw/xen/xen_pt.h | 10 +++- hw/xen/xen_pt_graphics.c | 111 ++++++++++++++++++++++++++++++++++++++++++ include/hw/boards.h | 1 + qemu-options.hx | 3 + vl.c | 10 ++++ 10 files changed, 165 insertions(+), 1 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index ac4654e..51ed6b2 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -226,6 +226,20 @@ static void machine_set_usb(Object *obj, bool value, Error **errp) ms->usb_disabled = !value; } +static bool machine_get_igd_gfx_passthru(Object *obj, Error **errp) +{ + MachineState *ms = MACHINE(obj); + + return ms->igd_gfx_passthru; +} + +static void machine_set_igd_gfx_passthru(Object *obj, bool value, Error **errp) +{ + MachineState *ms = MACHINE(obj); + + ms->igd_gfx_passthru = value; +} + static char *machine_get_firmware(Object *obj, Error **errp) { MachineState *ms = MACHINE(obj); @@ -388,6 +402,12 @@ static void machine_initfn(Object *obj) object_property_set_description(obj, "usb", "Set on/off to enable/disable usb", NULL); + object_property_add_bool(obj, "igd-passthru", + machine_get_igd_gfx_passthru, + machine_set_igd_gfx_passthru, NULL); + object_property_set_description(obj, "igd-passthru", + "Set on/off to enable/disable igd passthrou", + NULL); object_property_add_str(obj, "firmware", machine_get_firmware, machine_set_firmware, NULL); diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs index a0ca0aa..a9ad7e7 100644 --- a/hw/xen/Makefile.objs +++ b/hw/xen/Makefile.objs @@ -3,3 +3,4 @@ common-obj-$(CONFIG_XEN_BACKEND) += xen_backend.o xen_devconfig.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o +obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o xen_pt_graphics.o diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c index 743b37b..a54b7de 100644 --- a/hw/xen/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c @@ -376,6 +376,11 @@ int xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain, goto error; } d->irq = v; + rc = xen_host_pci_get_hex_value(d, "class", &v); + if (rc) { + goto error; + } + d->class_code = v; d->is_virtfn = xen_host_pci_dev_is_virtfn(d); return 0; diff --git a/hw/xen/xen-host-pci-device.h b/hw/xen/xen-host-pci-device.h index c2486f0..f1e1c30 100644 --- a/hw/xen/xen-host-pci-device.h +++ b/hw/xen/xen-host-pci-device.h @@ -25,6 +25,7 @@ typedef struct XenHostPCIDevice { uint16_t vendor_id; uint16_t device_id; + uint32_t class_code; int irq; XenHostPCIIORegion io_regions[PCI_NUM_REGIONS - 1]; diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index dba8560..9fb5315 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -502,6 +502,7 @@ static int xen_pt_register_regions(XenPCIPassthroughState *s, uint16_t *cmd) d->rom.size, d->rom.base_addr); } + xen_pt_register_vga_regions(d); return 0; } @@ -801,6 +802,7 @@ out: static void xen_pt_unregister_device(PCIDevice *d) { XenPCIPassthroughState *s = XEN_PT_DEVICE(d); + XenHostPCIDevice *host_dev = &s->real_device; uint8_t machine_irq = s->machine_irq; uint8_t intx = xen_pt_pci_intx(s); int rc; @@ -844,6 +846,8 @@ static void xen_pt_unregister_device(PCIDevice *d) /* delete all emulated config registers */ xen_pt_config_delete(s); + xen_pt_unregister_vga_regions(host_dev); + memory_listener_unregister(&s->memory_listener); memory_listener_unregister(&s->io_listener); diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 9bf79c0..5740d4f 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -306,5 +306,13 @@ static inline bool xen_pt_has_msix_mapping(XenPCIPassthroughState *s, int bar) return s->msix && s->msix->bar_index == bar; } - +extern bool has_igd_gfx_passthru; +static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev) +{ + return (has_igd_gfx_passthru + && ((dev->class_code >> 0x8) == PCI_CLASS_DISPLAY_VGA)); +} +int xen_pt_register_vga_regions(XenHostPCIDevice *dev); +int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev); +int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev); #endif /* !XEN_PT_H */ diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c new file mode 100644 index 0000000..9b3df81 --- /dev/null +++ b/hw/xen/xen_pt_graphics.c @@ -0,0 +1,111 @@ +/* + * graphics passthrough + */ +#include "xen_pt.h" +#include "xen-host-pci-device.h" +#include "hw/xen/xen_backend.h" + +typedef struct VGARegion { + int type; /* Memory or port I/O */ + uint64_t guest_base_addr; + uint64_t machine_base_addr; + uint64_t size; /* size of the region */ + int rc; +} VGARegion; + +#define IORESOURCE_IO 0x00000100 +#define IORESOURCE_MEM 0x00000200 + +static struct VGARegion vga_args[] = { + { + .type = IORESOURCE_IO, + .guest_base_addr = 0x3B0, + .machine_base_addr = 0x3B0, + .size = 0xC, + .rc = -1, + }, + { + .type = IORESOURCE_IO, + .guest_base_addr = 0x3C0, + .machine_base_addr = 0x3C0, + .size = 0x20, + .rc = -1, + }, + { + .type = IORESOURCE_MEM, + .guest_base_addr = 0xa0000 >> XC_PAGE_SHIFT, + .machine_base_addr = 0xa0000 >> XC_PAGE_SHIFT, + .size = 0x20, + .rc = -1, + }, +}; + +/* + * register VGA resources for the domain with assigned gfx + */ +int xen_pt_register_vga_regions(XenHostPCIDevice *dev) +{ + int i = 0; + + if (!is_igd_vga_passthrough(dev)) { + return 0; + } + + for (i = 0 ; i < ARRAY_SIZE(vga_args); i++) { + if (vga_args[i].type == IORESOURCE_IO) { + vga_args[i].rc = xc_domain_ioport_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_ADD_MAPPING); + } else { + vga_args[i].rc = xc_domain_memory_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_ADD_MAPPING); + } + + if (vga_args[i].rc) { + XEN_PT_ERR(NULL, "VGA %s mapping failed! (rc: %i)\n", + vga_args[i].type == IORESOURCE_IO ? "ioport" : "memory", + vga_args[i].rc); + return vga_args[i].rc; + } + } + + return 0; +} + +/* + * unregister VGA resources for the domain with assigned gfx + */ +int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) +{ + int i = 0; + + if (!is_igd_vga_passthrough(dev)) { + return 0; + } + + for (i = 0 ; i < ARRAY_SIZE(vga_args); i++) { + if (vga_args[i].type == IORESOURCE_IO) { + vga_args[i].rc = xc_domain_ioport_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_REMOVE_MAPPING); + } else { + vga_args[i].rc = xc_domain_memory_mapping(xen_xc, xen_domid, + vga_args[i].guest_base_addr, + vga_args[i].machine_base_addr, + vga_args[i].size, DPCI_REMOVE_MAPPING); + } + + if (vga_args[i].rc) { + XEN_PT_ERR(NULL, "VGA %s unmapping failed! (rc: %i)\n", + vga_args[i].type == IORESOURCE_IO ? "ioport" : "memory", + vga_args[i].rc); + return vga_args[i].rc; + } + } + + return 0; +} diff --git a/include/hw/boards.h b/include/hw/boards.h index 2aec9cb..4a0ee05 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -136,6 +136,7 @@ struct MachineState { bool mem_merge; bool usb; bool usb_disabled; + bool igd_gfx_passthru; char *firmware; bool iommu; bool suppress_vmdesc; diff --git a/qemu-options.hx b/qemu-options.hx index 77f5853..f26f477 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -38,6 +38,7 @@ DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ " dump-guest-core=on|off include guest memory in a core dump (default=on)\n" " mem-merge=on|off controls memory merge support (default: on)\n" " iommu=on|off controls emulated Intel IOMMU (VT-d) support (default=off)\n" + " igd-passthru=on|off controls IGD GFX passthrough support (default=off)\n" " aes-key-wrap=on|off controls support for AES key wrapping (default=on)\n" " dea-key-wrap=on|off controls support for DEA key wrapping (default=on)\n" " suppress-vmdesc=on|off disables self-describing migration (default=off)\n", @@ -55,6 +56,8 @@ than one accelerator specified, the next one is used if the previous one fails to initialize. @item kernel_irqchip=on|off Enables in-kernel irqchip support for the chosen accelerator when available. +@item gfx_passthru=on|off +Enables IGD GFX passthrough support for the chosen machine when available. @item vmport=on|off|auto Enables emulation of VMWare IO port, for vmmouse etc. auto says to select the value based on accel. For accel=xen the default is off otherwise the default diff --git a/vl.c b/vl.c index 6b73934..88fdbf1 100644 --- a/vl.c +++ b/vl.c @@ -1338,6 +1338,13 @@ static inline void semihosting_arg_fallback(const char *file, const char *cmd) } } +/* Now we still need this for compatibility with XEN. */ +bool has_igd_gfx_passthru; +static void igd_gfx_passthru(void) +{ + has_igd_gfx_passthru = current_machine->igd_gfx_passthru; +} + /***********************************************************/ /* USB devices */ @@ -4501,6 +4508,9 @@ int main(int argc, char **argv, char **envp) exit(1); } + /* Check if IGD GFX passthrough. */ + igd_gfx_passthru(); + /* init generic devices */ if (qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, NULL)) { -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uy5-0008Ib-32; Thu, 03 Dec 2015 14:34:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uy4-0008I3-7t for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:44 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 34/0C-10115-30350665; Thu, 03 Dec 2015 14:34:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1449153281!8510771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13554 invoked from network); 3 Dec 2015 14:34:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uy1-0002iS-Pl for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uy0-0001JA-VK for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:41 +0000 Date: Thu, 03 Dec 2015 14:34:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: retrieve VGA BIOS to work X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a8b37e532076799484ccadc2f17913e41883b74 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:46 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:23 2015 +0000 xen, gfx passthrough: retrieve VGA BIOS to work Now we retrieve VGA bios like kvm stuff in qemu but we need to fix Device Identification in case if its not matched with the real IGD device since Seabios is always trying to compare this ID to work out VGA BIOS. Signed-off-by: Tiejun Chen Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 10 ++++++ hw/xen/xen_pt.h | 5 +++ hw/xen/xen_pt_graphics.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 9fb5315..2aa0a74 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -725,6 +725,16 @@ static int xen_pt_initfn(PCIDevice *d) s->memory_listener = xen_pt_memory_listener; s->io_listener = xen_pt_io_listener; + /* Setup VGA bios for passthrough GFX */ + if ((s->real_device.domain == 0) && (s->real_device.bus == 0) && + (s->real_device.dev == 2) && (s->real_device.func == 0)) { + if (xen_pt_setup_vga(s, &s->real_device) < 0) { + XEN_PT_ERR(d, "Setup VGA BIOS of passthrough GFX failed!\n"); + xen_host_pci_device_put(&s->real_device); + return -1; + } + } + /* Handle real device's MMIO/PIO BARs */ xen_pt_register_regions(s, &cmd); diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 5740d4f..9463de9 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -306,6 +306,11 @@ static inline bool xen_pt_has_msix_mapping(XenPCIPassthroughState *s, int bar) return s->msix && s->msix->bar_index == bar; } +extern void *pci_assign_dev_load_option_rom(PCIDevice *dev, + struct Object *owner, int *size, + unsigned int domain, + unsigned int bus, unsigned int slot, + unsigned int function); extern bool has_igd_gfx_passthru; static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev) { diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index 9b3df81..3232296 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -109,3 +109,82 @@ int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) return 0; } + +static void *get_vgabios(XenPCIPassthroughState *s, int *size, + XenHostPCIDevice *dev) +{ + return pci_assign_dev_load_option_rom(&s->dev, OBJECT(&s->dev), size, + dev->domain, dev->bus, + dev->dev, dev->func); +} + +/* Refer to Seabios. */ +struct rom_header { + uint16_t signature; + uint8_t size; + uint8_t initVector[4]; + uint8_t reserved[17]; + uint16_t pcioffset; + uint16_t pnpoffset; +} __attribute__((packed)); + +struct pci_data { + uint32_t signature; + uint16_t vendor; + uint16_t device; + uint16_t vitaldata; + uint16_t dlen; + uint8_t drevision; + uint8_t class_lo; + uint16_t class_hi; + uint16_t ilen; + uint16_t irevision; + uint8_t type; + uint8_t indicator; + uint16_t reserved; +} __attribute__((packed)); + +int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev) +{ + unsigned char *bios = NULL; + struct rom_header *rom; + int bios_size; + char *c = NULL; + char checksum = 0; + uint32_t len = 0; + struct pci_data *pd = NULL; + + if (!is_igd_vga_passthrough(dev)) { + return -1; + } + + bios = get_vgabios(s, &bios_size, dev); + if (!bios) { + XEN_PT_ERR(&s->dev, "VGA: Can't getting VBIOS!\n"); + return -1; + } + + /* Currently we fixed this address as a primary. */ + rom = (struct rom_header *)bios; + pd = (void *)(bios + (unsigned char)rom->pcioffset); + + /* We may need to fixup Device Identification. */ + if (pd->device != s->real_device.device_id) { + pd->device = s->real_device.device_id; + + len = rom->size * 512; + /* Then adjust the bios checksum */ + for (c = (char *)bios; c < ((char *)bios + len); c++) { + checksum += *c; + } + if (checksum) { + bios[len - 1] -= checksum; + XEN_PT_LOG(&s->dev, "vga bios checksum is adjusted %x!\n", + checksum); + } + } + + /* Currently we fixed this address as a primary for legacy BIOS. */ + cpu_physical_memory_rw(0xc0000, bios, bios_size, 1); + return 0; +} -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uy5-0008Ib-32; Thu, 03 Dec 2015 14:34:45 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uy4-0008I3-7t for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:44 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id 34/0C-10115-30350665; Thu, 03 Dec 2015 14:34:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1449153281!8510771!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13554 invoked from network); 3 Dec 2015 14:34:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uy1-0002iS-Pl for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uy0-0001JA-VK for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:41 +0000 Date: Thu, 03 Dec 2015 14:34:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: retrieve VGA BIOS to work X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a8b37e532076799484ccadc2f17913e41883b74 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:46 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:23 2015 +0000 xen, gfx passthrough: retrieve VGA BIOS to work Now we retrieve VGA bios like kvm stuff in qemu but we need to fix Device Identification in case if its not matched with the real IGD device since Seabios is always trying to compare this ID to work out VGA BIOS. Signed-off-by: Tiejun Chen Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 10 ++++++ hw/xen/xen_pt.h | 5 +++ hw/xen/xen_pt_graphics.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 9fb5315..2aa0a74 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -725,6 +725,16 @@ static int xen_pt_initfn(PCIDevice *d) s->memory_listener = xen_pt_memory_listener; s->io_listener = xen_pt_io_listener; + /* Setup VGA bios for passthrough GFX */ + if ((s->real_device.domain == 0) && (s->real_device.bus == 0) && + (s->real_device.dev == 2) && (s->real_device.func == 0)) { + if (xen_pt_setup_vga(s, &s->real_device) < 0) { + XEN_PT_ERR(d, "Setup VGA BIOS of passthrough GFX failed!\n"); + xen_host_pci_device_put(&s->real_device); + return -1; + } + } + /* Handle real device's MMIO/PIO BARs */ xen_pt_register_regions(s, &cmd); diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 5740d4f..9463de9 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -306,6 +306,11 @@ static inline bool xen_pt_has_msix_mapping(XenPCIPassthroughState *s, int bar) return s->msix && s->msix->bar_index == bar; } +extern void *pci_assign_dev_load_option_rom(PCIDevice *dev, + struct Object *owner, int *size, + unsigned int domain, + unsigned int bus, unsigned int slot, + unsigned int function); extern bool has_igd_gfx_passthru; static inline bool is_igd_vga_passthrough(XenHostPCIDevice *dev) { diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index 9b3df81..3232296 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -109,3 +109,82 @@ int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) return 0; } + +static void *get_vgabios(XenPCIPassthroughState *s, int *size, + XenHostPCIDevice *dev) +{ + return pci_assign_dev_load_option_rom(&s->dev, OBJECT(&s->dev), size, + dev->domain, dev->bus, + dev->dev, dev->func); +} + +/* Refer to Seabios. */ +struct rom_header { + uint16_t signature; + uint8_t size; + uint8_t initVector[4]; + uint8_t reserved[17]; + uint16_t pcioffset; + uint16_t pnpoffset; +} __attribute__((packed)); + +struct pci_data { + uint32_t signature; + uint16_t vendor; + uint16_t device; + uint16_t vitaldata; + uint16_t dlen; + uint8_t drevision; + uint8_t class_lo; + uint16_t class_hi; + uint16_t ilen; + uint16_t irevision; + uint8_t type; + uint8_t indicator; + uint16_t reserved; +} __attribute__((packed)); + +int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev) +{ + unsigned char *bios = NULL; + struct rom_header *rom; + int bios_size; + char *c = NULL; + char checksum = 0; + uint32_t len = 0; + struct pci_data *pd = NULL; + + if (!is_igd_vga_passthrough(dev)) { + return -1; + } + + bios = get_vgabios(s, &bios_size, dev); + if (!bios) { + XEN_PT_ERR(&s->dev, "VGA: Can't getting VBIOS!\n"); + return -1; + } + + /* Currently we fixed this address as a primary. */ + rom = (struct rom_header *)bios; + pd = (void *)(bios + (unsigned char)rom->pcioffset); + + /* We may need to fixup Device Identification. */ + if (pd->device != s->real_device.device_id) { + pd->device = s->real_device.device_id; + + len = rom->size * 512; + /* Then adjust the bios checksum */ + for (c = (char *)bios; c < ((char *)bios + len); c++) { + checksum += *c; + } + if (checksum) { + bios[len - 1] -= checksum; + XEN_PT_LOG(&s->dev, "vga bios checksum is adjusted %x!\n", + checksum); + } + } + + /* Currently we fixed this address as a primary for legacy BIOS. */ + cpu_physical_memory_rw(0xc0000, bios, bios_size, 1); + return 0; +} -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyG-0008M5-7w; Thu, 03 Dec 2015 14:34:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyF-0008Li-BO for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:55 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 43/38-16870-E0350665; Thu, 03 Dec 2015 14:34:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1449153293!8392823!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2965 invoked from network); 3 Dec 2015 14:34:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyC-0002iX-UX for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UyC-0001Jt-Ic for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:52 +0000 Date: Thu, 03 Dec 2015 14:34:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] igd gfx passthrough: create a isa bridge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 426a5c194e283a72adc5021511dd2889ddb736a9 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:47 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:27 2015 +0000 igd gfx passthrough: create a isa bridge Currently IGD drivers always need to access PCH by 1f.0. But we don't want to poke that directly to get ID, and although in real world different GPU should have different PCH. But actually the different PCH DIDs likely map to different PCH SKUs. We do the same thing for the GPU. For PCH, the different SKUs are going to be all the same silicon design and implementation, just different features turn on and off with fuses. The SW interfaces should be consistent across all SKUs in a given family (eg LPT). But just same features may not be supported. Most of these different PCH features probably don't matter to the Gfx driver, but obviously any difference in display port connections will so it should be fine with any PCH in case of passthrough. So currently use one PCH version, 0x8c4e, to cover all HSW(Haswell) scenarios, 0x9cc3 for BDW(Broadwell). Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 1 + 2 files changed, 113 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8b1f1cd..8d6f629 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -910,6 +910,118 @@ static void pc_i440fx_0_10_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v0_10, "pc-0.10", pc_compat_0_13, pc_i440fx_0_10_machine_options); +typedef struct { + uint16_t gpu_device_id; + uint16_t pch_device_id; + uint8_t pch_revision_id; +} IGDDeviceIDInfo; + +/* In real world different GPU should have different PCH. But actually + * the different PCH DIDs likely map to different PCH SKUs. We do the + * same thing for the GPU. For PCH, the different SKUs are going to be + * all the same silicon design and implementation, just different + * features turn on and off with fuses. The SW interfaces should be + * consistent across all SKUs in a given family (eg LPT). But just same + * features may not be supported. + * + * Most of these different PCH features probably don't matter to the + * Gfx driver, but obviously any difference in display port connections + * will so it should be fine with any PCH in case of passthrough. + * + * So currently use one PCH version, 0x8c4e, to cover all HSW(Haswell) + * scenarios, 0x9cc3 for BDW(Broadwell). + */ +static const IGDDeviceIDInfo igd_combo_id_infos[] = { + /* HSW Classic */ + {0x0402, 0x8c4e, 0x04}, /* HSWGT1D, HSWD_w7 */ + {0x0406, 0x8c4e, 0x04}, /* HSWGT1M, HSWM_w7 */ + {0x0412, 0x8c4e, 0x04}, /* HSWGT2D, HSWD_w7 */ + {0x0416, 0x8c4e, 0x04}, /* HSWGT2M, HSWM_w7 */ + {0x041E, 0x8c4e, 0x04}, /* HSWGT15D, HSWD_w7 */ + /* HSW ULT */ + {0x0A06, 0x8c4e, 0x04}, /* HSWGT1UT, HSWM_w7 */ + {0x0A16, 0x8c4e, 0x04}, /* HSWGT2UT, HSWM_w7 */ + {0x0A26, 0x8c4e, 0x06}, /* HSWGT3UT, HSWM_w7 */ + {0x0A2E, 0x8c4e, 0x04}, /* HSWGT3UT28W, HSWM_w7 */ + {0x0A1E, 0x8c4e, 0x04}, /* HSWGT2UX, HSWM_w7 */ + {0x0A0E, 0x8c4e, 0x04}, /* HSWGT1ULX, HSWM_w7 */ + /* HSW CRW */ + {0x0D26, 0x8c4e, 0x04}, /* HSWGT3CW, HSWM_w7 */ + {0x0D22, 0x8c4e, 0x04}, /* HSWGT3CWDT, HSWD_w7 */ + /* HSW Server */ + {0x041A, 0x8c4e, 0x04}, /* HSWSVGT2, HSWD_w7 */ + /* HSW SRVR */ + {0x040A, 0x8c4e, 0x04}, /* HSWSVGT1, HSWD_w7 */ + /* BSW */ + {0x1606, 0x9cc3, 0x03}, /* BDWULTGT1, BDWM_w7 */ + {0x1616, 0x9cc3, 0x03}, /* BDWULTGT2, BDWM_w7 */ + {0x1626, 0x9cc3, 0x03}, /* BDWULTGT3, BDWM_w7 */ + {0x160E, 0x9cc3, 0x03}, /* BDWULXGT1, BDWM_w7 */ + {0x161E, 0x9cc3, 0x03}, /* BDWULXGT2, BDWM_w7 */ + {0x1602, 0x9cc3, 0x03}, /* BDWHALOGT1, BDWM_w7 */ + {0x1612, 0x9cc3, 0x03}, /* BDWHALOGT2, BDWM_w7 */ + {0x1622, 0x9cc3, 0x03}, /* BDWHALOGT3, BDWM_w7 */ + {0x162B, 0x9cc3, 0x03}, /* BDWHALO28W, BDWM_w7 */ + {0x162A, 0x9cc3, 0x03}, /* BDWGT3WRKS, BDWM_w7 */ + {0x162D, 0x9cc3, 0x03}, /* BDWGT3SRVR, BDWM_w7 */ +}; + +static void isa_bridge_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + dc->desc = "ISA bridge faked to support IGD PT"; + k->vendor_id = PCI_VENDOR_ID_INTEL; + k->class_id = PCI_CLASS_BRIDGE_ISA; +}; + +static TypeInfo isa_bridge_info = { + .name = "igd-passthrough-isa-bridge", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIDevice), + .class_init = isa_bridge_class_init, +}; + +static void pt_graphics_register_types(void) +{ + type_register_static(&isa_bridge_info); +} +type_init(pt_graphics_register_types) + +void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id) +{ + struct PCIDevice *bridge_dev; + int i, num; + uint16_t pch_dev_id = 0xffff; + uint8_t pch_rev_id; + + num = ARRAY_SIZE(igd_combo_id_infos); + for (i = 0; i < num; i++) { + if (gpu_dev_id == igd_combo_id_infos[i].gpu_device_id) { + pch_dev_id = igd_combo_id_infos[i].pch_device_id; + pch_rev_id = igd_combo_id_infos[i].pch_revision_id; + } + } + + if (pch_dev_id == 0xffff) { + return; + } + + /* Currently IGD drivers always need to access PCH by 1f.0. */ + bridge_dev = pci_create_simple(bus, PCI_DEVFN(0x1f, 0), + "igd-passthrough-isa-bridge"); + + /* + * Note that vendor id is always PCI_VENDOR_ID_INTEL. + */ + if (!bridge_dev) { + fprintf(stderr, "set igd-passthrough-isa-bridge failed!\n"); + return; + } + pci_config_set_device_id(bridge_dev->config, pch_dev_id); + pci_config_set_revision(bridge_dev->config, pch_rev_id); +} static void isapc_machine_options(MachineClass *m) { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index afb390e..359bf08 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -636,4 +636,5 @@ static inline void pc_default_machine_options(MachineClass *m) (m)->compat_props = props; \ } while (0) +extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id); #endif -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:34:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:34:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyG-0008M5-7w; Thu, 03 Dec 2015 14:34:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyF-0008Li-BO for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:55 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 43/38-16870-E0350665; Thu, 03 Dec 2015 14:34:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1449153293!8392823!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2965 invoked from network); 3 Dec 2015 14:34:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:34:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyC-0002iX-UX for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UyC-0001Jt-Ic for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:34:52 +0000 Date: Thu, 03 Dec 2015 14:34:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] igd gfx passthrough: create a isa bridge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 426a5c194e283a72adc5021511dd2889ddb736a9 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:47 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:27 2015 +0000 igd gfx passthrough: create a isa bridge Currently IGD drivers always need to access PCH by 1f.0. But we don't want to poke that directly to get ID, and although in real world different GPU should have different PCH. But actually the different PCH DIDs likely map to different PCH SKUs. We do the same thing for the GPU. For PCH, the different SKUs are going to be all the same silicon design and implementation, just different features turn on and off with fuses. The SW interfaces should be consistent across all SKUs in a given family (eg LPT). But just same features may not be supported. Most of these different PCH features probably don't matter to the Gfx driver, but obviously any difference in display port connections will so it should be fine with any PCH in case of passthrough. So currently use one PCH version, 0x8c4e, to cover all HSW(Haswell) scenarios, 0x9cc3 for BDW(Broadwell). Signed-off-by: Tiejun Chen Signed-off-by: Stefano Stabellini Acked-by: Michael S. Tsirkin --- hw/i386/pc_piix.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/hw/i386/pc.h | 1 + 2 files changed, 113 insertions(+), 0 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8b1f1cd..8d6f629 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -910,6 +910,118 @@ static void pc_i440fx_0_10_machine_options(MachineClass *m) DEFINE_I440FX_MACHINE(v0_10, "pc-0.10", pc_compat_0_13, pc_i440fx_0_10_machine_options); +typedef struct { + uint16_t gpu_device_id; + uint16_t pch_device_id; + uint8_t pch_revision_id; +} IGDDeviceIDInfo; + +/* In real world different GPU should have different PCH. But actually + * the different PCH DIDs likely map to different PCH SKUs. We do the + * same thing for the GPU. For PCH, the different SKUs are going to be + * all the same silicon design and implementation, just different + * features turn on and off with fuses. The SW interfaces should be + * consistent across all SKUs in a given family (eg LPT). But just same + * features may not be supported. + * + * Most of these different PCH features probably don't matter to the + * Gfx driver, but obviously any difference in display port connections + * will so it should be fine with any PCH in case of passthrough. + * + * So currently use one PCH version, 0x8c4e, to cover all HSW(Haswell) + * scenarios, 0x9cc3 for BDW(Broadwell). + */ +static const IGDDeviceIDInfo igd_combo_id_infos[] = { + /* HSW Classic */ + {0x0402, 0x8c4e, 0x04}, /* HSWGT1D, HSWD_w7 */ + {0x0406, 0x8c4e, 0x04}, /* HSWGT1M, HSWM_w7 */ + {0x0412, 0x8c4e, 0x04}, /* HSWGT2D, HSWD_w7 */ + {0x0416, 0x8c4e, 0x04}, /* HSWGT2M, HSWM_w7 */ + {0x041E, 0x8c4e, 0x04}, /* HSWGT15D, HSWD_w7 */ + /* HSW ULT */ + {0x0A06, 0x8c4e, 0x04}, /* HSWGT1UT, HSWM_w7 */ + {0x0A16, 0x8c4e, 0x04}, /* HSWGT2UT, HSWM_w7 */ + {0x0A26, 0x8c4e, 0x06}, /* HSWGT3UT, HSWM_w7 */ + {0x0A2E, 0x8c4e, 0x04}, /* HSWGT3UT28W, HSWM_w7 */ + {0x0A1E, 0x8c4e, 0x04}, /* HSWGT2UX, HSWM_w7 */ + {0x0A0E, 0x8c4e, 0x04}, /* HSWGT1ULX, HSWM_w7 */ + /* HSW CRW */ + {0x0D26, 0x8c4e, 0x04}, /* HSWGT3CW, HSWM_w7 */ + {0x0D22, 0x8c4e, 0x04}, /* HSWGT3CWDT, HSWD_w7 */ + /* HSW Server */ + {0x041A, 0x8c4e, 0x04}, /* HSWSVGT2, HSWD_w7 */ + /* HSW SRVR */ + {0x040A, 0x8c4e, 0x04}, /* HSWSVGT1, HSWD_w7 */ + /* BSW */ + {0x1606, 0x9cc3, 0x03}, /* BDWULTGT1, BDWM_w7 */ + {0x1616, 0x9cc3, 0x03}, /* BDWULTGT2, BDWM_w7 */ + {0x1626, 0x9cc3, 0x03}, /* BDWULTGT3, BDWM_w7 */ + {0x160E, 0x9cc3, 0x03}, /* BDWULXGT1, BDWM_w7 */ + {0x161E, 0x9cc3, 0x03}, /* BDWULXGT2, BDWM_w7 */ + {0x1602, 0x9cc3, 0x03}, /* BDWHALOGT1, BDWM_w7 */ + {0x1612, 0x9cc3, 0x03}, /* BDWHALOGT2, BDWM_w7 */ + {0x1622, 0x9cc3, 0x03}, /* BDWHALOGT3, BDWM_w7 */ + {0x162B, 0x9cc3, 0x03}, /* BDWHALO28W, BDWM_w7 */ + {0x162A, 0x9cc3, 0x03}, /* BDWGT3WRKS, BDWM_w7 */ + {0x162D, 0x9cc3, 0x03}, /* BDWGT3SRVR, BDWM_w7 */ +}; + +static void isa_bridge_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + + dc->desc = "ISA bridge faked to support IGD PT"; + k->vendor_id = PCI_VENDOR_ID_INTEL; + k->class_id = PCI_CLASS_BRIDGE_ISA; +}; + +static TypeInfo isa_bridge_info = { + .name = "igd-passthrough-isa-bridge", + .parent = TYPE_PCI_DEVICE, + .instance_size = sizeof(PCIDevice), + .class_init = isa_bridge_class_init, +}; + +static void pt_graphics_register_types(void) +{ + type_register_static(&isa_bridge_info); +} +type_init(pt_graphics_register_types) + +void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id) +{ + struct PCIDevice *bridge_dev; + int i, num; + uint16_t pch_dev_id = 0xffff; + uint8_t pch_rev_id; + + num = ARRAY_SIZE(igd_combo_id_infos); + for (i = 0; i < num; i++) { + if (gpu_dev_id == igd_combo_id_infos[i].gpu_device_id) { + pch_dev_id = igd_combo_id_infos[i].pch_device_id; + pch_rev_id = igd_combo_id_infos[i].pch_revision_id; + } + } + + if (pch_dev_id == 0xffff) { + return; + } + + /* Currently IGD drivers always need to access PCH by 1f.0. */ + bridge_dev = pci_create_simple(bus, PCI_DEVFN(0x1f, 0), + "igd-passthrough-isa-bridge"); + + /* + * Note that vendor id is always PCI_VENDOR_ID_INTEL. + */ + if (!bridge_dev) { + fprintf(stderr, "set igd-passthrough-isa-bridge failed!\n"); + return; + } + pci_config_set_device_id(bridge_dev->config, pch_dev_id); + pci_config_set_revision(bridge_dev->config, pch_rev_id); +} static void isapc_machine_options(MachineClass *m) { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index afb390e..359bf08 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -636,4 +636,5 @@ static inline void pc_default_machine_options(MachineClass *m) (m)->compat_props = props; \ } while (0) +extern void igd_passthrough_isa_bridge_create(PCIBus *bus, uint16_t gpu_dev_id); #endif -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35: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 1a4UyS-0008OQ-Bq; Thu, 03 Dec 2015 14:35:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyQ-0008O9-R7 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:07 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 3E/E2-21201-91350665; Thu, 03 Dec 2015 14:35:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1449153303!8286666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64324 invoked from network); 3 Dec 2015 14:35:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyN-0002jB-LK for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UyN-0001Kj-8i for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:03 +0000 Date: Thu, 03 Dec 2015 14:35:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: register a isa bridge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6db05b86683a40bddba33c843676118f0ab3128a Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:48 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:31 2015 +0000 xen, gfx passthrough: register a isa bridge Currently we just register this isa bridge when we use IGD passthrough in Xen side. Signed-off-by: Tiejun Chen Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 2aa0a74..e5cbce8 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -56,6 +56,7 @@ #include "hw/pci/pci.h" #include "hw/xen/xen.h" +#include "hw/i386/pc.h" #include "hw/xen/xen_backend.h" #include "xen_pt.h" #include "qemu/range.h" @@ -684,6 +685,17 @@ static const MemoryListener xen_pt_io_listener = { .priority = 10, }; +static void +xen_igd_passthrough_isa_bridge_create(XenPCIPassthroughState *s, + XenHostPCIDevice *dev) +{ + uint16_t gpu_dev_id; + PCIDevice *d = &s->dev; + + gpu_dev_id = dev->device_id; + igd_passthrough_isa_bridge_create(d->bus, gpu_dev_id); +} + /* init */ static int xen_pt_initfn(PCIDevice *d) @@ -728,11 +740,21 @@ static int xen_pt_initfn(PCIDevice *d) /* Setup VGA bios for passthrough GFX */ if ((s->real_device.domain == 0) && (s->real_device.bus == 0) && (s->real_device.dev == 2) && (s->real_device.func == 0)) { + if (!is_igd_vga_passthrough(&s->real_device)) { + XEN_PT_ERR(d, "Need to enable igd-passthru if you're trying" + " to passthrough IGD GFX.\n"); + xen_host_pci_device_put(&s->real_device); + return -1; + } + if (xen_pt_setup_vga(s, &s->real_device) < 0) { XEN_PT_ERR(d, "Setup VGA BIOS of passthrough GFX failed!\n"); xen_host_pci_device_put(&s->real_device); return -1; } + + /* Register ISA bridge for passthrough GFX. */ + xen_igd_passthrough_isa_bridge_create(s, &s->real_device); } /* Handle real device's MMIO/PIO BARs */ -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35: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 1a4UyS-0008OQ-Bq; Thu, 03 Dec 2015 14:35:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyQ-0008O9-R7 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:07 +0000 Received: from [85.158.137.68] by server-2.bemta-3.messagelabs.com id 3E/E2-21201-91350665; Thu, 03 Dec 2015 14:35:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1449153303!8286666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64324 invoked from network); 3 Dec 2015 14:35:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyN-0002jB-LK for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UyN-0001Kj-8i for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:03 +0000 Date: Thu, 03 Dec 2015 14:35:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: register a isa bridge X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6db05b86683a40bddba33c843676118f0ab3128a Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:48 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:31 2015 +0000 xen, gfx passthrough: register a isa bridge Currently we just register this isa bridge when we use IGD passthrough in Xen side. Signed-off-by: Tiejun Chen Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 2aa0a74..e5cbce8 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -56,6 +56,7 @@ #include "hw/pci/pci.h" #include "hw/xen/xen.h" +#include "hw/i386/pc.h" #include "hw/xen/xen_backend.h" #include "xen_pt.h" #include "qemu/range.h" @@ -684,6 +685,17 @@ static const MemoryListener xen_pt_io_listener = { .priority = 10, }; +static void +xen_igd_passthrough_isa_bridge_create(XenPCIPassthroughState *s, + XenHostPCIDevice *dev) +{ + uint16_t gpu_dev_id; + PCIDevice *d = &s->dev; + + gpu_dev_id = dev->device_id; + igd_passthrough_isa_bridge_create(d->bus, gpu_dev_id); +} + /* init */ static int xen_pt_initfn(PCIDevice *d) @@ -728,11 +740,21 @@ static int xen_pt_initfn(PCIDevice *d) /* Setup VGA bios for passthrough GFX */ if ((s->real_device.domain == 0) && (s->real_device.bus == 0) && (s->real_device.dev == 2) && (s->real_device.func == 0)) { + if (!is_igd_vga_passthrough(&s->real_device)) { + XEN_PT_ERR(d, "Need to enable igd-passthru if you're trying" + " to passthrough IGD GFX.\n"); + xen_host_pci_device_put(&s->real_device); + return -1; + } + if (xen_pt_setup_vga(s, &s->real_device) < 0) { XEN_PT_ERR(d, "Setup VGA BIOS of passthrough GFX failed!\n"); xen_host_pci_device_put(&s->real_device); return -1; } + + /* Register ISA bridge for passthrough GFX. */ + xen_igd_passthrough_isa_bridge_create(s, &s->real_device); } /* Handle real device's MMIO/PIO BARs */ -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35: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 1a4Uyc-0008QD-Gb; Thu, 03 Dec 2015 14:35:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyb-0008Pv-3f for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:17 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6D/6F-12889-42350665; Thu, 03 Dec 2015 14:35:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1449153314!8513955!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22941 invoked from network); 3 Dec 2015 14:35:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyY-0002jJ-Eh for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UyY-0001L6-0c for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:14 +0000 Date: Thu, 03 Dec 2015 14:35:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: register host bridge specific to passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63307c596cd8d03f03c3ba9f0f569972a74e6e43 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:49 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:34 2015 +0000 xen, gfx passthrough: register host bridge specific to passthrough Just register that pci host bridge specific to passthrough. Signed-off-by: Tiejun Chen Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/i386/pc_piix.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8d6f629..631bd8d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -50,7 +50,8 @@ #include "cpu.h" #include "qemu/error-report.h" #ifdef CONFIG_XEN -# include +#include +#include "hw/xen/xen_pt.h" #endif #include "migration/migration.h" @@ -448,11 +449,21 @@ static void pc_init_isa(MachineState *machine) } #ifdef CONFIG_XEN +static void pc_xen_hvm_init_pci(MachineState *machine) +{ + const char *pci_type = has_igd_gfx_passthru ? + TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE; + + pc_init1(machine, + TYPE_I440FX_PCI_HOST_BRIDGE, + pci_type); +} + static void pc_xen_hvm_init(MachineState *machine) { PCIBus *bus; - pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); + pc_xen_hvm_init_pci(machine); bus = pci_find_primary_bus(); if (bus != NULL) { -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35: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 1a4Uyc-0008QD-Gb; Thu, 03 Dec 2015 14:35:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyb-0008Pv-3f for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:17 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 6D/6F-12889-42350665; Thu, 03 Dec 2015 14:35:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1449153314!8513955!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22941 invoked from network); 3 Dec 2015 14:35:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UyY-0002jJ-Eh for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UyY-0001L6-0c for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:14 +0000 Date: Thu, 03 Dec 2015 14:35:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: register host bridge specific to passthrough X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 63307c596cd8d03f03c3ba9f0f569972a74e6e43 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:49 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:34 2015 +0000 xen, gfx passthrough: register host bridge specific to passthrough Just register that pci host bridge specific to passthrough. Signed-off-by: Tiejun Chen Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/i386/pc_piix.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 8d6f629..631bd8d 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -50,7 +50,8 @@ #include "cpu.h" #include "qemu/error-report.h" #ifdef CONFIG_XEN -# include +#include +#include "hw/xen/xen_pt.h" #endif #include "migration/migration.h" @@ -448,11 +449,21 @@ static void pc_init_isa(MachineState *machine) } #ifdef CONFIG_XEN +static void pc_xen_hvm_init_pci(MachineState *machine) +{ + const char *pci_type = has_igd_gfx_passthru ? + TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE : TYPE_I440FX_PCI_DEVICE; + + pc_init1(machine, + TYPE_I440FX_PCI_HOST_BRIDGE, + pci_type); +} + static void pc_xen_hvm_init(MachineState *machine) { PCIBus *bus; - pc_init1(machine, TYPE_I440FX_PCI_HOST_BRIDGE, TYPE_I440FX_PCI_DEVICE); + pc_xen_hvm_init_pci(machine); bus = pci_find_primary_bus(); if (bus != NULL) { -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyt-0008TZ-Lm; Thu, 03 Dec 2015 14:35:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uys-0008SP-0c for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:34 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id EE/97-31122-03350665; Thu, 03 Dec 2015 14:35:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1449153326!3428202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39501 invoked from network); 3 Dec 2015 14:35:27 -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; 3 Dec 2015 14:35:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyk-0002jR-FC for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uyi-0001LT-MS for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:26 +0000 Date: Thu, 03 Dec 2015 14:35:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: add opregion mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 641b29dbea984c7871d830eaa39875c961df6f81 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:50 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:36 2015 +0000 xen, gfx passthrough: add opregion mapping The OpRegion shouldn't be mapped 1:1 because the address in the host can't be used in the guest directly. This patch traps read and write access to the opregion of the Intel GPU config space (offset 0xfc). The original patch is from Jean Guyader Signed-off-by: Tiejun Chen Signed-off-by: Yang Zhang Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.h | 6 +++- hw/xen/xen_pt_config_init.c | 51 +++++++++++++++++++++++++- hw/xen/xen_pt_graphics.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 9463de9..4454ba9 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -40,6 +40,9 @@ typedef struct XenPCIPassthroughState XenPCIPassthroughState; #define XEN_PT_DEVICE(obj) \ OBJECT_CHECK(XenPCIPassthroughState, (obj), TYPE_XEN_PT_DEVICE) +uint32_t igd_read_opregion(XenPCIPassthroughState *s); +void igd_write_opregion(XenPCIPassthroughState *s, uint32_t val); + /* function type for config reg */ typedef int (*xen_pt_conf_reg_init) (XenPCIPassthroughState *, XenPTRegInfo *, uint32_t real_offset, @@ -66,8 +69,9 @@ typedef int (*xen_pt_conf_byte_read) #define XEN_PT_BAR_ALLF 0xFFFFFFFF #define XEN_PT_BAR_UNMAPPED (-1) -#define PCI_CAP_MAX 48 +#define XEN_PCI_CAP_MAX 48 +#define XEN_PCI_INTEL_OPREGION 0xfc typedef enum { XEN_PT_GRP_TYPE_HARDWIRED = 0, /* 0 Hardwired reg group */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 286eea3..2cb0104 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -552,6 +552,22 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, return 0; } +static int xen_pt_intel_opregion_read(XenPCIPassthroughState *s, + XenPTReg *cfg_entry, + uint32_t *value, uint32_t valid_mask) +{ + *value = igd_read_opregion(s); + return 0; +} + +static int xen_pt_intel_opregion_write(XenPCIPassthroughState *s, + XenPTReg *cfg_entry, uint32_t *value, + uint32_t dev_value, uint32_t valid_mask) +{ + igd_write_opregion(s, *value); + return 0; +} + /* Header Type0 reg static information table */ static XenPTRegInfo xen_pt_emu_reg_header0[] = { /* Vendor ID reg */ @@ -1492,6 +1508,19 @@ static XenPTRegInfo xen_pt_emu_reg_msix[] = { }, }; +static XenPTRegInfo xen_pt_emu_reg_igd_opregion[] = { + /* Intel IGFX OpRegion reg */ + { + .offset = 0x0, + .size = 4, + .init_val = 0, + .u.dw.read = xen_pt_intel_opregion_read, + .u.dw.write = xen_pt_intel_opregion_write, + }, + { + .size = 0, + }, +}; /**************************** * Capabilities @@ -1729,6 +1758,14 @@ static const XenPTRegGroupInfo xen_pt_emu_reg_grps[] = { .size_init = xen_pt_msix_size_init, .emu_regs = xen_pt_emu_reg_msix, }, + /* Intel IGD Opregion group */ + { + .grp_id = XEN_PCI_INTEL_OPREGION, + .grp_type = XEN_PT_GRP_TYPE_EMU, + .grp_size = 0x4, + .size_init = xen_pt_reg_grp_size_init, + .emu_regs = xen_pt_emu_reg_igd_opregion, + }, { .grp_size = 0, }, @@ -1779,7 +1816,7 @@ out: static uint8_t find_cap_offset(XenPCIPassthroughState *s, uint8_t cap) { uint8_t id; - unsigned max_cap = PCI_CAP_MAX; + unsigned max_cap = XEN_PCI_CAP_MAX; uint8_t pos = PCI_CAPABILITY_LIST; uint8_t status = 0; @@ -1858,7 +1895,8 @@ int xen_pt_config_init(XenPCIPassthroughState *s) uint32_t reg_grp_offset = 0; XenPTRegGroup *reg_grp_entry = NULL; - if (xen_pt_emu_reg_grps[i].grp_id != 0xFF) { + if (xen_pt_emu_reg_grps[i].grp_id != 0xFF + && xen_pt_emu_reg_grps[i].grp_id != XEN_PCI_INTEL_OPREGION) { if (xen_pt_hide_dev_cap(&s->real_device, xen_pt_emu_reg_grps[i].grp_id)) { continue; @@ -1871,6 +1909,15 @@ int xen_pt_config_init(XenPCIPassthroughState *s) } } + /* + * By default we will trap up to 0x40 in the cfg space. + * If an intel device is pass through we need to trap 0xfc, + * therefore the size should be 0xff. + */ + if (xen_pt_emu_reg_grps[i].grp_id == XEN_PCI_INTEL_OPREGION) { + reg_grp_offset = XEN_PCI_INTEL_OPREGION; + } + reg_grp_entry = g_new0(XenPTRegGroup, 1); QLIST_INIT(®_grp_entry->reg_tbl_list); QLIST_INSERT_HEAD(&s->reg_grps, reg_grp_entry, entries); diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index 3232296..df6069b 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -5,6 +5,11 @@ #include "xen-host-pci-device.h" #include "hw/xen/xen_backend.h" +static unsigned long igd_guest_opregion; +static unsigned long igd_host_opregion; + +#define XEN_PCI_INTEL_OPREGION_MASK 0xfff + typedef struct VGARegion { int type; /* Memory or port I/O */ uint64_t guest_base_addr; @@ -81,6 +86,7 @@ int xen_pt_register_vga_regions(XenHostPCIDevice *dev) int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) { int i = 0; + int ret = 0; if (!is_igd_vga_passthrough(dev)) { return 0; @@ -107,6 +113,17 @@ int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) } } + if (igd_guest_opregion) { + ret = xc_domain_memory_mapping(xen_xc, xen_domid, + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + 3, + DPCI_REMOVE_MAPPING); + if (ret) { + return ret; + } + } + return 0; } @@ -188,3 +205,68 @@ int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev) cpu_physical_memory_rw(0xc0000, bios, bios_size, 1); return 0; } + +uint32_t igd_read_opregion(XenPCIPassthroughState *s) +{ + uint32_t val = 0; + + if (!igd_guest_opregion) { + return val; + } + + val = igd_guest_opregion; + + XEN_PT_LOG(&s->dev, "Read opregion val=%x\n", val); + return val; +} + +#define XEN_PCI_INTEL_OPREGION_PAGES 0x3 +#define XEN_PCI_INTEL_OPREGION_ENABLE_ACCESSED 0x1 +void igd_write_opregion(XenPCIPassthroughState *s, uint32_t val) +{ + int ret; + + if (igd_guest_opregion) { + XEN_PT_LOG(&s->dev, "opregion register already been set, ignoring %x\n", + val); + return; + } + + /* We just work with LE. */ + xen_host_pci_get_block(&s->real_device, XEN_PCI_INTEL_OPREGION, + (uint8_t *)&igd_host_opregion, 4); + igd_guest_opregion = (unsigned long)(val & ~XEN_PCI_INTEL_OPREGION_MASK) + | (igd_host_opregion & XEN_PCI_INTEL_OPREGION_MASK); + + ret = xc_domain_iomem_permission(xen_xc, xen_domid, + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + XEN_PCI_INTEL_OPREGION_PAGES, + XEN_PCI_INTEL_OPREGION_ENABLE_ACCESSED); + + if (ret) { + XEN_PT_ERR(&s->dev, "[%d]:Can't enable to access IGD host opregion:" + " 0x%lx.\n", ret, + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT)), + igd_guest_opregion = 0; + return; + } + + ret = xc_domain_memory_mapping(xen_xc, xen_domid, + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + XEN_PCI_INTEL_OPREGION_PAGES, + DPCI_ADD_MAPPING); + + if (ret) { + XEN_PT_ERR(&s->dev, "[%d]:Can't map IGD host opregion:0x%lx to" + " guest opregion:0x%lx.\n", ret, + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT)); + igd_guest_opregion = 0; + return; + } + + XEN_PT_LOG(&s->dev, "Map OpRegion: 0x%lx -> 0x%lx\n", + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT)); +} -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyt-0008TZ-Lm; Thu, 03 Dec 2015 14:35:35 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uys-0008SP-0c for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:34 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id EE/97-31122-03350665; Thu, 03 Dec 2015 14:35:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1449153326!3428202!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39501 invoked from network); 3 Dec 2015 14:35:27 -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; 3 Dec 2015 14:35:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyk-0002jR-FC for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uyi-0001LT-MS for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:26 +0000 Date: Thu, 03 Dec 2015 14:35:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen, gfx passthrough: add opregion mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 641b29dbea984c7871d830eaa39875c961df6f81 Author: Tiejun Chen AuthorDate: Wed Jul 15 13:37:50 2015 +0800 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:36 2015 +0000 xen, gfx passthrough: add opregion mapping The OpRegion shouldn't be mapped 1:1 because the address in the host can't be used in the guest directly. This patch traps read and write access to the opregion of the Intel GPU config space (offset 0xfc). The original patch is from Jean Guyader Signed-off-by: Tiejun Chen Signed-off-by: Yang Zhang Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.h | 6 +++- hw/xen/xen_pt_config_init.c | 51 +++++++++++++++++++++++++- hw/xen/xen_pt_graphics.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 136 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 9463de9..4454ba9 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -40,6 +40,9 @@ typedef struct XenPCIPassthroughState XenPCIPassthroughState; #define XEN_PT_DEVICE(obj) \ OBJECT_CHECK(XenPCIPassthroughState, (obj), TYPE_XEN_PT_DEVICE) +uint32_t igd_read_opregion(XenPCIPassthroughState *s); +void igd_write_opregion(XenPCIPassthroughState *s, uint32_t val); + /* function type for config reg */ typedef int (*xen_pt_conf_reg_init) (XenPCIPassthroughState *, XenPTRegInfo *, uint32_t real_offset, @@ -66,8 +69,9 @@ typedef int (*xen_pt_conf_byte_read) #define XEN_PT_BAR_ALLF 0xFFFFFFFF #define XEN_PT_BAR_UNMAPPED (-1) -#define PCI_CAP_MAX 48 +#define XEN_PCI_CAP_MAX 48 +#define XEN_PCI_INTEL_OPREGION 0xfc typedef enum { XEN_PT_GRP_TYPE_HARDWIRED = 0, /* 0 Hardwired reg group */ diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 286eea3..2cb0104 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -552,6 +552,22 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, return 0; } +static int xen_pt_intel_opregion_read(XenPCIPassthroughState *s, + XenPTReg *cfg_entry, + uint32_t *value, uint32_t valid_mask) +{ + *value = igd_read_opregion(s); + return 0; +} + +static int xen_pt_intel_opregion_write(XenPCIPassthroughState *s, + XenPTReg *cfg_entry, uint32_t *value, + uint32_t dev_value, uint32_t valid_mask) +{ + igd_write_opregion(s, *value); + return 0; +} + /* Header Type0 reg static information table */ static XenPTRegInfo xen_pt_emu_reg_header0[] = { /* Vendor ID reg */ @@ -1492,6 +1508,19 @@ static XenPTRegInfo xen_pt_emu_reg_msix[] = { }, }; +static XenPTRegInfo xen_pt_emu_reg_igd_opregion[] = { + /* Intel IGFX OpRegion reg */ + { + .offset = 0x0, + .size = 4, + .init_val = 0, + .u.dw.read = xen_pt_intel_opregion_read, + .u.dw.write = xen_pt_intel_opregion_write, + }, + { + .size = 0, + }, +}; /**************************** * Capabilities @@ -1729,6 +1758,14 @@ static const XenPTRegGroupInfo xen_pt_emu_reg_grps[] = { .size_init = xen_pt_msix_size_init, .emu_regs = xen_pt_emu_reg_msix, }, + /* Intel IGD Opregion group */ + { + .grp_id = XEN_PCI_INTEL_OPREGION, + .grp_type = XEN_PT_GRP_TYPE_EMU, + .grp_size = 0x4, + .size_init = xen_pt_reg_grp_size_init, + .emu_regs = xen_pt_emu_reg_igd_opregion, + }, { .grp_size = 0, }, @@ -1779,7 +1816,7 @@ out: static uint8_t find_cap_offset(XenPCIPassthroughState *s, uint8_t cap) { uint8_t id; - unsigned max_cap = PCI_CAP_MAX; + unsigned max_cap = XEN_PCI_CAP_MAX; uint8_t pos = PCI_CAPABILITY_LIST; uint8_t status = 0; @@ -1858,7 +1895,8 @@ int xen_pt_config_init(XenPCIPassthroughState *s) uint32_t reg_grp_offset = 0; XenPTRegGroup *reg_grp_entry = NULL; - if (xen_pt_emu_reg_grps[i].grp_id != 0xFF) { + if (xen_pt_emu_reg_grps[i].grp_id != 0xFF + && xen_pt_emu_reg_grps[i].grp_id != XEN_PCI_INTEL_OPREGION) { if (xen_pt_hide_dev_cap(&s->real_device, xen_pt_emu_reg_grps[i].grp_id)) { continue; @@ -1871,6 +1909,15 @@ int xen_pt_config_init(XenPCIPassthroughState *s) } } + /* + * By default we will trap up to 0x40 in the cfg space. + * If an intel device is pass through we need to trap 0xfc, + * therefore the size should be 0xff. + */ + if (xen_pt_emu_reg_grps[i].grp_id == XEN_PCI_INTEL_OPREGION) { + reg_grp_offset = XEN_PCI_INTEL_OPREGION; + } + reg_grp_entry = g_new0(XenPTRegGroup, 1); QLIST_INIT(®_grp_entry->reg_tbl_list); QLIST_INSERT_HEAD(&s->reg_grps, reg_grp_entry, entries); diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c index 3232296..df6069b 100644 --- a/hw/xen/xen_pt_graphics.c +++ b/hw/xen/xen_pt_graphics.c @@ -5,6 +5,11 @@ #include "xen-host-pci-device.h" #include "hw/xen/xen_backend.h" +static unsigned long igd_guest_opregion; +static unsigned long igd_host_opregion; + +#define XEN_PCI_INTEL_OPREGION_MASK 0xfff + typedef struct VGARegion { int type; /* Memory or port I/O */ uint64_t guest_base_addr; @@ -81,6 +86,7 @@ int xen_pt_register_vga_regions(XenHostPCIDevice *dev) int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) { int i = 0; + int ret = 0; if (!is_igd_vga_passthrough(dev)) { return 0; @@ -107,6 +113,17 @@ int xen_pt_unregister_vga_regions(XenHostPCIDevice *dev) } } + if (igd_guest_opregion) { + ret = xc_domain_memory_mapping(xen_xc, xen_domid, + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + 3, + DPCI_REMOVE_MAPPING); + if (ret) { + return ret; + } + } + return 0; } @@ -188,3 +205,68 @@ int xen_pt_setup_vga(XenPCIPassthroughState *s, XenHostPCIDevice *dev) cpu_physical_memory_rw(0xc0000, bios, bios_size, 1); return 0; } + +uint32_t igd_read_opregion(XenPCIPassthroughState *s) +{ + uint32_t val = 0; + + if (!igd_guest_opregion) { + return val; + } + + val = igd_guest_opregion; + + XEN_PT_LOG(&s->dev, "Read opregion val=%x\n", val); + return val; +} + +#define XEN_PCI_INTEL_OPREGION_PAGES 0x3 +#define XEN_PCI_INTEL_OPREGION_ENABLE_ACCESSED 0x1 +void igd_write_opregion(XenPCIPassthroughState *s, uint32_t val) +{ + int ret; + + if (igd_guest_opregion) { + XEN_PT_LOG(&s->dev, "opregion register already been set, ignoring %x\n", + val); + return; + } + + /* We just work with LE. */ + xen_host_pci_get_block(&s->real_device, XEN_PCI_INTEL_OPREGION, + (uint8_t *)&igd_host_opregion, 4); + igd_guest_opregion = (unsigned long)(val & ~XEN_PCI_INTEL_OPREGION_MASK) + | (igd_host_opregion & XEN_PCI_INTEL_OPREGION_MASK); + + ret = xc_domain_iomem_permission(xen_xc, xen_domid, + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + XEN_PCI_INTEL_OPREGION_PAGES, + XEN_PCI_INTEL_OPREGION_ENABLE_ACCESSED); + + if (ret) { + XEN_PT_ERR(&s->dev, "[%d]:Can't enable to access IGD host opregion:" + " 0x%lx.\n", ret, + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT)), + igd_guest_opregion = 0; + return; + } + + ret = xc_domain_memory_mapping(xen_xc, xen_domid, + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + XEN_PCI_INTEL_OPREGION_PAGES, + DPCI_ADD_MAPPING); + + if (ret) { + XEN_PT_ERR(&s->dev, "[%d]:Can't map IGD host opregion:0x%lx to" + " guest opregion:0x%lx.\n", ret, + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT)); + igd_guest_opregion = 0; + return; + } + + XEN_PT_LOG(&s->dev, "Map OpRegion: 0x%lx -> 0x%lx\n", + (unsigned long)(igd_host_opregion >> XC_PAGE_SHIFT), + (unsigned long)(igd_guest_opregion >> XC_PAGE_SHIFT)); +} -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyy-0008VY-TU; Thu, 03 Dec 2015 14:35:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyx-0008V5-DV for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:39 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id AD/C8-13487-A3350665; Thu, 03 Dec 2015 14:35:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449153337!8373963!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49463 invoked from network); 3 Dec 2015 14:35:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyv-0002jV-4J for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uyu-0001My-V9 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:37 +0000 Date: Thu, 03 Dec 2015 14:35:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b89f59b8e4b5865778934cd0e05ff85fd5e558d1 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 13 15:36:58 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:39 2015 +0000 xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting .errors - as it will most likely have the proper error value. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- xen-hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 23d767b..3371c4e 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -348,7 +348,7 @@ go_physmap: rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { DPRINTF("add_to_physmap MFN %"PRI_xen_pfn" to PFN %" - PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); + PRI_xen_pfn" failed: %d (errno: %d)\n", idx, gpfn, rc, errno); return -rc; } } @@ -425,7 +425,7 @@ static int xen_remove_from_physmap(XenIOState *state, rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { fprintf(stderr, "add_to_physmap MFN %"PRI_xen_pfn" to PFN %" - PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); + PRI_xen_pfn" failed: %d (errno: %d)\n", idx, gpfn, rc, errno); return -rc; } } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyy-0008VY-TU; Thu, 03 Dec 2015 14:35:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyx-0008V5-DV for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:39 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id AD/C8-13487-A3350665; Thu, 03 Dec 2015 14:35:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449153337!8373963!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49463 invoked from network); 3 Dec 2015 14:35:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uyv-0002jV-4J for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uyu-0001My-V9 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:37 +0000 Date: Thu, 03 Dec 2015 14:35:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b89f59b8e4b5865778934cd0e05ff85fd5e558d1 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Mar 13 15:36:58 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:39 2015 +0000 xen-hvm: When using xc_domain_add_to_physmap also include errno when reporting .errors - as it will most likely have the proper error value. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Stefano Stabellini Signed-off-by: Stefano Stabellini --- xen-hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 23d767b..3371c4e 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -348,7 +348,7 @@ go_physmap: rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { DPRINTF("add_to_physmap MFN %"PRI_xen_pfn" to PFN %" - PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); + PRI_xen_pfn" failed: %d (errno: %d)\n", idx, gpfn, rc, errno); return -rc; } } @@ -425,7 +425,7 @@ static int xen_remove_from_physmap(XenIOState *state, rc = xen_xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { fprintf(stderr, "add_to_physmap MFN %"PRI_xen_pfn" to PFN %" - PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); + PRI_xen_pfn" failed: %d (errno: %d)\n", idx, gpfn, rc, errno); return -rc; } } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35: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 1a4UzB-00006a-3y; Thu, 03 Dec 2015 14:35:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uz9-00005z-BK for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:51 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 82/27-01753-64350665; Thu, 03 Dec 2015 14:35:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1449153347!975324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65066 invoked from network); 3 Dec 2015 14:35:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uz5-0002jl-Gd for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uz5-0001NO-Ah for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:47 +0000 Date: Thu, 03 Dec 2015 14:35:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Update comments with proper function 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 864d0ce2eb76a036a67085255f87150ecf0e80a9 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:16:01 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:41 2015 +0000 xen/pt: Update comments with proper function name. It has changed but the comments still refer to the old names. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index e5cbce8..00b24ab 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -379,7 +379,7 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, } } - /* need to shift back before passing them to xen_host_pci_device */ + /* need to shift back before passing them to xen_host_pci_set_block. */ val >>= (addr & 3) << 3; memory_region_transaction_commit(); @@ -407,7 +407,7 @@ out: (uint8_t *)&val + index, len); if (rc < 0) { - XEN_PT_ERR(d, "pci_write_block failed. return value: %d.\n", rc); + XEN_PT_ERR(d, "xen_host_pci_set_block failed. return value: %d.\n", rc); } } } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:35:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:35: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 1a4UzB-00006a-3y; Thu, 03 Dec 2015 14:35:53 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uz9-00005z-BK for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:51 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 82/27-01753-64350665; Thu, 03 Dec 2015 14:35:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1449153347!975324!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 65066 invoked from network); 3 Dec 2015 14:35:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uz5-0002jl-Gd for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uz5-0001NO-Ah for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:47 +0000 Date: Thu, 03 Dec 2015 14:35:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Update comments with proper function 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 864d0ce2eb76a036a67085255f87150ecf0e80a9 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:16:01 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:41 2015 +0000 xen/pt: Update comments with proper function name. It has changed but the comments still refer to the old names. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index e5cbce8..00b24ab 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -379,7 +379,7 @@ static void xen_pt_pci_write_config(PCIDevice *d, uint32_t addr, } } - /* need to shift back before passing them to xen_host_pci_device */ + /* need to shift back before passing them to xen_host_pci_set_block. */ val >>= (addr & 3) << 3; memory_region_transaction_commit(); @@ -407,7 +407,7 @@ out: (uint8_t *)&val + index, len); if (rc < 0) { - XEN_PT_ERR(d, "pci_write_block failed. return value: %d.\n", rc); + XEN_PT_ERR(d, "xen_host_pci_set_block failed. return value: %d.\n", rc); } } } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzJ-00008x-8a; Thu, 03 Dec 2015 14:36:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzI-00008c-2Y for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:00 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id D6/4B-16870-F4350665; Thu, 03 Dec 2015 14:35:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449153358!8352026!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57722 invoked from network); 3 Dec 2015 14:35:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzF-0002jx-WA for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UzF-0001Nw-PT for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:57 +0000 Date: Thu, 03 Dec 2015 14:35:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Make xen_pt_msi_set_enable static X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20a69e0cde44d4d92e44f3f34c42965bf2525b7f Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:26:43 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:44 2015 +0000 xen/pt: Make xen_pt_msi_set_enable static As we do not use it outside our code. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.h | 1 - hw/xen/xen_pt_msi.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 4454ba9..017065c 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -293,7 +293,6 @@ static inline uint8_t xen_pt_pci_intx(XenPCIPassthroughState *s) } /* MSI/MSI-X */ -int xen_pt_msi_set_enable(XenPCIPassthroughState *s, bool en); int xen_pt_msi_setup(XenPCIPassthroughState *s); int xen_pt_msi_update(XenPCIPassthroughState *d); void xen_pt_msi_disable(XenPCIPassthroughState *s); diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 49671e1..71c872b 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -220,7 +220,7 @@ static int msi_msix_disable(XenPCIPassthroughState *s, * MSI virtualization functions */ -int xen_pt_msi_set_enable(XenPCIPassthroughState *s, bool enable) +static int xen_pt_msi_set_enable(XenPCIPassthroughState *s, bool enable) { XEN_PT_LOG(&s->dev, "%s MSI.\n", enable ? "enabling" : "disabling"); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzJ-00008x-8a; Thu, 03 Dec 2015 14:36:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzI-00008c-2Y for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:00 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id D6/4B-16870-F4350665; Thu, 03 Dec 2015 14:35:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449153358!8352026!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 57722 invoked from network); 3 Dec 2015 14:35:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:35:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzF-0002jx-WA for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UzF-0001Nw-PT for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:35:57 +0000 Date: Thu, 03 Dec 2015 14:35:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Make xen_pt_msi_set_enable static X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 20a69e0cde44d4d92e44f3f34c42965bf2525b7f Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:26:43 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:44 2015 +0000 xen/pt: Make xen_pt_msi_set_enable static As we do not use it outside our code. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.h | 1 - hw/xen/xen_pt_msi.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 4454ba9..017065c 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -293,7 +293,6 @@ static inline uint8_t xen_pt_pci_intx(XenPCIPassthroughState *s) } /* MSI/MSI-X */ -int xen_pt_msi_set_enable(XenPCIPassthroughState *s, bool en); int xen_pt_msi_setup(XenPCIPassthroughState *s); int xen_pt_msi_update(XenPCIPassthroughState *d); void xen_pt_msi_disable(XenPCIPassthroughState *s); diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 49671e1..71c872b 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -220,7 +220,7 @@ static int msi_msix_disable(XenPCIPassthroughState *s, * MSI virtualization functions */ -int xen_pt_msi_set_enable(XenPCIPassthroughState *s, bool enable) +static int xen_pt_msi_set_enable(XenPCIPassthroughState *s, bool enable) { XEN_PT_LOG(&s->dev, "%s MSI.\n", enable ? "enabling" : "disabling"); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36: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 1a4UzU-0000BT-Cy; Thu, 03 Dec 2015 14:36:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzT-0000BC-El for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:11 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 8B/3C-07165-A5350665; Thu, 03 Dec 2015 14:36:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1449153369!8520119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11633 invoked from network); 3 Dec 2015 14:36:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzQ-0002kY-SQ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UzQ-0001Oi-E8 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:08 +0000 Date: Thu, 03 Dec 2015 14:36:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: xen_host_pci_config_read returns -errno, not -1 on failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35ce22556b59c01502e9829ab2f7c3d29c873cc1 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 13:58:17 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:46 2015 +0000 xen/pt: xen_host_pci_config_read returns -errno, not -1 on failure However the init routines assume that on errors the return code is -1 (as the libxc API is) - while those xen_host_* routines follow another paradigm - negative errno on return, 0 on success. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 00b24ab..c105deb 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -729,7 +729,7 @@ static int xen_pt_initfn(PCIDevice *d) /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ if (xen_host_pci_get_block(&s->real_device, 0, d->config, - PCI_CONFIG_SPACE_SIZE) == -1) { + PCI_CONFIG_SPACE_SIZE) < 0) { xen_host_pci_device_put(&s->real_device); return -1; } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36: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 1a4UzU-0000BT-Cy; Thu, 03 Dec 2015 14:36:12 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzT-0000BC-El for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:11 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 8B/3C-07165-A5350665; Thu, 03 Dec 2015 14:36:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1449153369!8520119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11633 invoked from network); 3 Dec 2015 14:36:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4UzQ-0002kY-SQ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4UzQ-0001Oi-E8 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:08 +0000 Date: Thu, 03 Dec 2015 14:36:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: xen_host_pci_config_read returns -errno, not -1 on failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35ce22556b59c01502e9829ab2f7c3d29c873cc1 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 13:58:17 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:46 2015 +0000 xen/pt: xen_host_pci_config_read returns -errno, not -1 on failure However the init routines assume that on errors the return code is -1 (as the libxc API is) - while those xen_host_* routines follow another paradigm - negative errno on return, 0 on success. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 00b24ab..c105deb 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -729,7 +729,7 @@ static int xen_pt_initfn(PCIDevice *d) /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ if (xen_host_pci_get_block(&s->real_device, 0, d->config, - PCI_CONFIG_SPACE_SIZE) == -1) { + PCI_CONFIG_SPACE_SIZE) < 0) { xen_host_pci_device_put(&s->real_device); return -1; } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36: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 1a4Uzf-0000Dg-IC; Thu, 03 Dec 2015 14:36:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uze-0000DR-Ec for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:22 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 01/F8-31122-56350665; Thu, 03 Dec 2015 14:36:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1449153379!3428505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35440 invoked from network); 3 Dec 2015 14:36:21 -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; 3 Dec 2015 14:36:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzb-0002kg-LN for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uzb-0001Pc-85 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:19 +0000 Date: Thu, 03 Dec 2015 14:36:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt/msi: Add the register value when printing logging and error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd125e2984f6b6da70f390d42ef3ef1c48650479 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 12:30:37 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:48 2015 +0000 xen/pt/msi: Add the register value when printing logging and error messages We would like to know what the MSI register value is to help in troubleshooting in the field. As such modify the logging logic to include such details in xen_pt_msgctrl_reg_write. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 2cb0104..f9d2a68 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1102,7 +1102,7 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, /* setup MSI pirq for the first time */ if (!msi->initialized) { /* Init physical one */ - XEN_PT_LOG(&s->dev, "setup MSI\n"); + XEN_PT_LOG(&s->dev, "setup MSI (register: %x).\n", *val); if (xen_pt_msi_setup(s)) { /* We do not broadcast the error to the framework code, so * that MSI errors are contained in MSI emulation code and @@ -1110,12 +1110,12 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, * Guest MSI would be actually not working. */ *val &= ~PCI_MSI_FLAGS_ENABLE; - XEN_PT_WARN(&s->dev, "Can not map MSI.\n"); + XEN_PT_WARN(&s->dev, "Can not map MSI (register: %x)!\n", *val); return 0; } if (xen_pt_msi_update(s)) { *val &= ~PCI_MSI_FLAGS_ENABLE; - XEN_PT_WARN(&s->dev, "Can not bind MSI\n"); + XEN_PT_WARN(&s->dev, "Can not bind MSI (register: %x)!\n", *val); return 0; } msi->initialized = true; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36: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 1a4Uzf-0000Dg-IC; Thu, 03 Dec 2015 14:36:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uze-0000DR-Ec for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:22 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 01/F8-31122-56350665; Thu, 03 Dec 2015 14:36:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1449153379!3428505!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35440 invoked from network); 3 Dec 2015 14:36:21 -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; 3 Dec 2015 14:36:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzb-0002kg-LN for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uzb-0001Pc-85 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:19 +0000 Date: Thu, 03 Dec 2015 14:36:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt/msi: Add the register value when printing logging and error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fd125e2984f6b6da70f390d42ef3ef1c48650479 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 12:30:37 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:48 2015 +0000 xen/pt/msi: Add the register value when printing logging and error messages We would like to know what the MSI register value is to help in troubleshooting in the field. As such modify the logging logic to include such details in xen_pt_msgctrl_reg_write. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 2cb0104..f9d2a68 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1102,7 +1102,7 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, /* setup MSI pirq for the first time */ if (!msi->initialized) { /* Init physical one */ - XEN_PT_LOG(&s->dev, "setup MSI\n"); + XEN_PT_LOG(&s->dev, "setup MSI (register: %x).\n", *val); if (xen_pt_msi_setup(s)) { /* We do not broadcast the error to the framework code, so * that MSI errors are contained in MSI emulation code and @@ -1110,12 +1110,12 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, * Guest MSI would be actually not working. */ *val &= ~PCI_MSI_FLAGS_ENABLE; - XEN_PT_WARN(&s->dev, "Can not map MSI.\n"); + XEN_PT_WARN(&s->dev, "Can not map MSI (register: %x)!\n", *val); return 0; } if (xen_pt_msi_update(s)) { *val &= ~PCI_MSI_FLAGS_ENABLE; - XEN_PT_WARN(&s->dev, "Can not bind MSI\n"); + XEN_PT_WARN(&s->dev, "Can not bind MSI (register: %x)!\n", *val); return 0; } msi->initialized = true; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzp-0000Ff-M2; Thu, 03 Dec 2015 14:36:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzo-0000FN-LZ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:32 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 4A/D8-00475-F6350665; Thu, 03 Dec 2015 14:36:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1449153390!4765428!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47568 invoked from network); 3 Dec 2015 14:36:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzm-0002ko-AN for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uzl-0001Qy-SF for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:30 +0000 Date: Thu, 03 Dec 2015 14:36:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 189cd5f1c0601d06f07b478bc978ad2de3b79d1b Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 16:06:19 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:51 2015 +0000 xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings. If XEN_PT_LOGGING_ENABLED is enabled the XEN_PT_LOG macros start using the first argument. Which means if within the function there is only one user of the argument ('d') and XEN_PT_LOGGING_ENABLED is not set, we get compiler warnings. This is not the case now but with the "xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config" we will hit - so this sync up the function to the rest of them. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index f9d2a68..b2799c5 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1434,7 +1434,7 @@ static int xen_pt_msixctrl_reg_init(XenPCIPassthroughState *s, reg_field = pci_get_word(d->config + real_offset); if (reg_field & PCI_MSIX_FLAGS_ENABLE) { - XEN_PT_LOG(d, "MSIX already enabled, disabling it first\n"); + XEN_PT_LOG(&s->dev, "MSIX already enabled, disabling it first\n"); xen_host_pci_set_word(&s->real_device, real_offset, reg_field & ~PCI_MSIX_FLAGS_ENABLE); } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzp-0000Ff-M2; Thu, 03 Dec 2015 14:36:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzo-0000FN-LZ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:32 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 4A/D8-00475-F6350665; Thu, 03 Dec 2015 14:36:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1449153390!4765428!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47568 invoked from network); 3 Dec 2015 14:36:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzm-0002ko-AN for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uzl-0001Qy-SF for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:30 +0000 Date: Thu, 03 Dec 2015 14:36:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 189cd5f1c0601d06f07b478bc978ad2de3b79d1b Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 16:06:19 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:51 2015 +0000 xen/pt: Use XEN_PT_LOG properly to guard against compiler warnings. If XEN_PT_LOGGING_ENABLED is enabled the XEN_PT_LOG macros start using the first argument. Which means if within the function there is only one user of the argument ('d') and XEN_PT_LOGGING_ENABLED is not set, we get compiler warnings. This is not the case now but with the "xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config" we will hit - so this sync up the function to the rest of them. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index f9d2a68..b2799c5 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1434,7 +1434,7 @@ static int xen_pt_msixctrl_reg_init(XenPCIPassthroughState *s, reg_field = pci_get_word(d->config + real_offset); if (reg_field & PCI_MSIX_FLAGS_ENABLE) { - XEN_PT_LOG(d, "MSIX already enabled, disabling it first\n"); + XEN_PT_LOG(&s->dev, "MSIX already enabled, disabling it first\n"); xen_host_pci_set_word(&s->real_device, real_offset, reg_field & ~PCI_MSIX_FLAGS_ENABLE); } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36: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 1a4V03-0000IM-QL; Thu, 03 Dec 2015 14:36:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V02-0000Hm-PQ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:46 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7F/5B-22142-B7350665; Thu, 03 Dec 2015 14:36:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1449153401!8110389!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19754 invoked from network); 3 Dec 2015 14:36:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzw-0002kw-Uh for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uzw-0001RZ-Hg for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:40 +0000 Date: Thu, 03 Dec 2015 14:36:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e810812e09a86a09df83474270d59df6fc68805c Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 14:01:13 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:53 2015 +0000 xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config During init time we treat the dev.config area as a cache of the host view. However during execution time we treat it as guest view (by the generic PCI API). We need to sync Xen's code to the generic PCI API view. This is the first step by replacing all of the code that uses dev.config or pci_get_[byte|word] to get host value to actually use the xen_host_pci_get_[byte|word] functions. Interestingly in 'xen_pt_ptr_reg_init' we also needed to swap reg_field from uint32_t to uint8_t - since the access is only for one byte not four bytes. We can split this as a seperate patch however we would have to use a cast to thwart compiler warnings in the meantime. We also truncated 'flags' to 'flag' to make the code fit within the 80 characters. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 24 +++++++++++-- hw/xen/xen_pt_config_init.c | 77 +++++++++++++++++++++++++++++------------- 2 files changed, 73 insertions(+), 28 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index c105deb..5dd80b3 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -702,7 +702,7 @@ static int xen_pt_initfn(PCIDevice *d) { XenPCIPassthroughState *s = XEN_PT_DEVICE(d); int rc = 0; - uint8_t machine_irq = 0; + uint8_t machine_irq = 0, scratch; uint16_t cmd = 0; int pirq = XEN_PT_UNASSIGNED_PIRQ; @@ -768,7 +768,12 @@ static int xen_pt_initfn(PCIDevice *d) } /* Bind interrupt */ - if (!s->dev.config[PCI_INTERRUPT_PIN]) { + rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, &scratch); + if (rc) { + XEN_PT_ERR(d, "Failed to read PCI_INTERRUPT_PIN! (rc:%d)\n", rc); + scratch = 0; + } + if (!scratch) { XEN_PT_LOG(d, "no pin interrupt\n"); goto out; } @@ -818,8 +823,19 @@ static int xen_pt_initfn(PCIDevice *d) out: if (cmd) { - xen_host_pci_set_word(&s->real_device, PCI_COMMAND, - pci_get_word(d->config + PCI_COMMAND) | cmd); + uint16_t val; + + rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val); + if (rc) { + XEN_PT_ERR(d, "Failed to read PCI_COMMAND! (rc: %d)\n", rc); + } else { + val |= cmd; + rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val); + if (rc) { + XEN_PT_ERR(d, "Failed to write PCI_COMMAND val=0x%x!(rc: %d)\n", + val, rc); + } + } } memory_listener_register(&s->memory_listener, &s->dev.bus_master_as); diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index b2799c5..0b24d1f 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -816,15 +816,21 @@ static XenPTRegInfo xen_pt_emu_reg_vendor[] = { static inline uint8_t get_capability_version(XenPCIPassthroughState *s, uint32_t offset) { - uint8_t flags = pci_get_byte(s->dev.config + offset + PCI_EXP_FLAGS); - return flags & PCI_EXP_FLAGS_VERS; + uint8_t flag; + if (xen_host_pci_get_byte(&s->real_device, offset + PCI_EXP_FLAGS, &flag)) { + return 0; + } + return flag & PCI_EXP_FLAGS_VERS; } static inline uint8_t get_device_type(XenPCIPassthroughState *s, uint32_t offset) { - uint8_t flags = pci_get_byte(s->dev.config + offset + PCI_EXP_FLAGS); - return (flags & PCI_EXP_FLAGS_TYPE) >> 4; + uint8_t flag; + if (xen_host_pci_get_byte(&s->real_device, offset + PCI_EXP_FLAGS, &flag)) { + return 0; + } + return (flag & PCI_EXP_FLAGS_TYPE) >> 4; } /* initialize Link Control register */ @@ -873,8 +879,14 @@ static int xen_pt_linkctrl2_reg_init(XenPCIPassthroughState *s, reg_field = XEN_PT_INVALID_REG; } else { /* set Supported Link Speed */ - uint8_t lnkcap = pci_get_byte(s->dev.config + real_offset - reg->offset - + PCI_EXP_LNKCAP); + uint8_t lnkcap; + int rc; + rc = xen_host_pci_get_byte(&s->real_device, + real_offset - reg->offset + PCI_EXP_LNKCAP, + &lnkcap); + if (rc) { + return rc; + } reg_field |= PCI_EXP_LNKCAP_SLS & lnkcap; } @@ -1055,13 +1067,15 @@ static int xen_pt_msgctrl_reg_init(XenPCIPassthroughState *s, XenPTRegInfo *reg, uint32_t real_offset, uint32_t *data) { - PCIDevice *d = &s->dev; XenPTMSI *msi = s->msi; - uint16_t reg_field = 0; + uint16_t reg_field; + int rc; /* use I/O device register's value as initial value */ - reg_field = pci_get_word(d->config + real_offset); - + rc = xen_host_pci_get_word(&s->real_device, real_offset, ®_field); + if (rc) { + return rc; + } if (reg_field & PCI_MSI_FLAGS_ENABLE) { XEN_PT_LOG(&s->dev, "MSI already enabled, disabling it first\n"); xen_host_pci_set_word(&s->real_device, real_offset, @@ -1427,12 +1441,14 @@ static int xen_pt_msixctrl_reg_init(XenPCIPassthroughState *s, XenPTRegInfo *reg, uint32_t real_offset, uint32_t *data) { - PCIDevice *d = &s->dev; - uint16_t reg_field = 0; + uint16_t reg_field; + int rc; /* use I/O device register's value as initial value */ - reg_field = pci_get_word(d->config + real_offset); - + rc = xen_host_pci_get_word(&s->real_device, real_offset, ®_field); + if (rc) { + return rc; + } if (reg_field & PCI_MSIX_FLAGS_ENABLE) { XEN_PT_LOG(&s->dev, "MSIX already enabled, disabling it first\n"); xen_host_pci_set_word(&s->real_device, real_offset, @@ -1540,8 +1556,7 @@ static int xen_pt_vendor_size_init(XenPCIPassthroughState *s, const XenPTRegGroupInfo *grp_reg, uint32_t base_offset, uint8_t *size) { - *size = pci_get_byte(s->dev.config + base_offset + 0x02); - return 0; + return xen_host_pci_get_byte(&s->real_device, base_offset + 0x02, size); } /* get PCI Express Capability Structure register group size */ static int xen_pt_pcie_size_init(XenPCIPassthroughState *s, @@ -1620,12 +1635,15 @@ static int xen_pt_msi_size_init(XenPCIPassthroughState *s, const XenPTRegGroupInfo *grp_reg, uint32_t base_offset, uint8_t *size) { - PCIDevice *d = &s->dev; uint16_t msg_ctrl = 0; uint8_t msi_size = 0xa; + int rc; - msg_ctrl = pci_get_word(d->config + (base_offset + PCI_MSI_FLAGS)); - + rc = xen_host_pci_get_word(&s->real_device, base_offset + PCI_MSI_FLAGS, + &msg_ctrl); + if (rc) { + return rc; + } /* check if 64-bit address is capable of per-vector masking */ if (msg_ctrl & PCI_MSI_FLAGS_64BIT) { msi_size += 4; @@ -1776,11 +1794,14 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, XenPTRegInfo *reg, uint32_t real_offset, uint32_t *data) { - int i; - uint8_t *config = s->dev.config; - uint32_t reg_field = pci_get_byte(config + real_offset); + int i, rc; + uint8_t reg_field; uint8_t cap_id = 0; + rc = xen_host_pci_get_byte(&s->real_device, real_offset, ®_field); + if (rc) { + return rc; + } /* find capability offset */ while (reg_field) { for (i = 0; xen_pt_emu_reg_grps[i].grp_size != 0; i++) { @@ -1789,7 +1810,11 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, continue; } - cap_id = pci_get_byte(config + reg_field + PCI_CAP_LIST_ID); + rc = xen_host_pci_get_byte(&s->real_device, + reg_field + PCI_CAP_LIST_ID, &cap_id); + if (rc) { + return rc; + } if (xen_pt_emu_reg_grps[i].grp_id == cap_id) { if (xen_pt_emu_reg_grps[i].grp_type == XEN_PT_GRP_TYPE_EMU) { goto out; @@ -1800,7 +1825,11 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, } /* next capability */ - reg_field = pci_get_byte(config + reg_field + PCI_CAP_LIST_NEXT); + rc = xen_host_pci_get_byte(&s->real_device, + reg_field + PCI_CAP_LIST_NEXT, ®_field); + if (rc) { + return rc; + } } out: -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36: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 1a4V03-0000IM-QL; Thu, 03 Dec 2015 14:36:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V02-0000Hm-PQ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:46 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7F/5B-22142-B7350665; Thu, 03 Dec 2015 14:36:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1449153401!8110389!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19754 invoked from network); 3 Dec 2015 14:36:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4Uzw-0002kw-Uh for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4Uzw-0001RZ-Hg for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:40 +0000 Date: Thu, 03 Dec 2015 14:36:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e810812e09a86a09df83474270d59df6fc68805c Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 14:01:13 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:53 2015 +0000 xen/pt: Use xen_host_pci_get_[byte|word] instead of dev.config During init time we treat the dev.config area as a cache of the host view. However during execution time we treat it as guest view (by the generic PCI API). We need to sync Xen's code to the generic PCI API view. This is the first step by replacing all of the code that uses dev.config or pci_get_[byte|word] to get host value to actually use the xen_host_pci_get_[byte|word] functions. Interestingly in 'xen_pt_ptr_reg_init' we also needed to swap reg_field from uint32_t to uint8_t - since the access is only for one byte not four bytes. We can split this as a seperate patch however we would have to use a cast to thwart compiler warnings in the meantime. We also truncated 'flags' to 'flag' to make the code fit within the 80 characters. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 24 +++++++++++-- hw/xen/xen_pt_config_init.c | 77 +++++++++++++++++++++++++++++------------- 2 files changed, 73 insertions(+), 28 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index c105deb..5dd80b3 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -702,7 +702,7 @@ static int xen_pt_initfn(PCIDevice *d) { XenPCIPassthroughState *s = XEN_PT_DEVICE(d); int rc = 0; - uint8_t machine_irq = 0; + uint8_t machine_irq = 0, scratch; uint16_t cmd = 0; int pirq = XEN_PT_UNASSIGNED_PIRQ; @@ -768,7 +768,12 @@ static int xen_pt_initfn(PCIDevice *d) } /* Bind interrupt */ - if (!s->dev.config[PCI_INTERRUPT_PIN]) { + rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, &scratch); + if (rc) { + XEN_PT_ERR(d, "Failed to read PCI_INTERRUPT_PIN! (rc:%d)\n", rc); + scratch = 0; + } + if (!scratch) { XEN_PT_LOG(d, "no pin interrupt\n"); goto out; } @@ -818,8 +823,19 @@ static int xen_pt_initfn(PCIDevice *d) out: if (cmd) { - xen_host_pci_set_word(&s->real_device, PCI_COMMAND, - pci_get_word(d->config + PCI_COMMAND) | cmd); + uint16_t val; + + rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val); + if (rc) { + XEN_PT_ERR(d, "Failed to read PCI_COMMAND! (rc: %d)\n", rc); + } else { + val |= cmd; + rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val); + if (rc) { + XEN_PT_ERR(d, "Failed to write PCI_COMMAND val=0x%x!(rc: %d)\n", + val, rc); + } + } } memory_listener_register(&s->memory_listener, &s->dev.bus_master_as); diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index b2799c5..0b24d1f 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -816,15 +816,21 @@ static XenPTRegInfo xen_pt_emu_reg_vendor[] = { static inline uint8_t get_capability_version(XenPCIPassthroughState *s, uint32_t offset) { - uint8_t flags = pci_get_byte(s->dev.config + offset + PCI_EXP_FLAGS); - return flags & PCI_EXP_FLAGS_VERS; + uint8_t flag; + if (xen_host_pci_get_byte(&s->real_device, offset + PCI_EXP_FLAGS, &flag)) { + return 0; + } + return flag & PCI_EXP_FLAGS_VERS; } static inline uint8_t get_device_type(XenPCIPassthroughState *s, uint32_t offset) { - uint8_t flags = pci_get_byte(s->dev.config + offset + PCI_EXP_FLAGS); - return (flags & PCI_EXP_FLAGS_TYPE) >> 4; + uint8_t flag; + if (xen_host_pci_get_byte(&s->real_device, offset + PCI_EXP_FLAGS, &flag)) { + return 0; + } + return (flag & PCI_EXP_FLAGS_TYPE) >> 4; } /* initialize Link Control register */ @@ -873,8 +879,14 @@ static int xen_pt_linkctrl2_reg_init(XenPCIPassthroughState *s, reg_field = XEN_PT_INVALID_REG; } else { /* set Supported Link Speed */ - uint8_t lnkcap = pci_get_byte(s->dev.config + real_offset - reg->offset - + PCI_EXP_LNKCAP); + uint8_t lnkcap; + int rc; + rc = xen_host_pci_get_byte(&s->real_device, + real_offset - reg->offset + PCI_EXP_LNKCAP, + &lnkcap); + if (rc) { + return rc; + } reg_field |= PCI_EXP_LNKCAP_SLS & lnkcap; } @@ -1055,13 +1067,15 @@ static int xen_pt_msgctrl_reg_init(XenPCIPassthroughState *s, XenPTRegInfo *reg, uint32_t real_offset, uint32_t *data) { - PCIDevice *d = &s->dev; XenPTMSI *msi = s->msi; - uint16_t reg_field = 0; + uint16_t reg_field; + int rc; /* use I/O device register's value as initial value */ - reg_field = pci_get_word(d->config + real_offset); - + rc = xen_host_pci_get_word(&s->real_device, real_offset, ®_field); + if (rc) { + return rc; + } if (reg_field & PCI_MSI_FLAGS_ENABLE) { XEN_PT_LOG(&s->dev, "MSI already enabled, disabling it first\n"); xen_host_pci_set_word(&s->real_device, real_offset, @@ -1427,12 +1441,14 @@ static int xen_pt_msixctrl_reg_init(XenPCIPassthroughState *s, XenPTRegInfo *reg, uint32_t real_offset, uint32_t *data) { - PCIDevice *d = &s->dev; - uint16_t reg_field = 0; + uint16_t reg_field; + int rc; /* use I/O device register's value as initial value */ - reg_field = pci_get_word(d->config + real_offset); - + rc = xen_host_pci_get_word(&s->real_device, real_offset, ®_field); + if (rc) { + return rc; + } if (reg_field & PCI_MSIX_FLAGS_ENABLE) { XEN_PT_LOG(&s->dev, "MSIX already enabled, disabling it first\n"); xen_host_pci_set_word(&s->real_device, real_offset, @@ -1540,8 +1556,7 @@ static int xen_pt_vendor_size_init(XenPCIPassthroughState *s, const XenPTRegGroupInfo *grp_reg, uint32_t base_offset, uint8_t *size) { - *size = pci_get_byte(s->dev.config + base_offset + 0x02); - return 0; + return xen_host_pci_get_byte(&s->real_device, base_offset + 0x02, size); } /* get PCI Express Capability Structure register group size */ static int xen_pt_pcie_size_init(XenPCIPassthroughState *s, @@ -1620,12 +1635,15 @@ static int xen_pt_msi_size_init(XenPCIPassthroughState *s, const XenPTRegGroupInfo *grp_reg, uint32_t base_offset, uint8_t *size) { - PCIDevice *d = &s->dev; uint16_t msg_ctrl = 0; uint8_t msi_size = 0xa; + int rc; - msg_ctrl = pci_get_word(d->config + (base_offset + PCI_MSI_FLAGS)); - + rc = xen_host_pci_get_word(&s->real_device, base_offset + PCI_MSI_FLAGS, + &msg_ctrl); + if (rc) { + return rc; + } /* check if 64-bit address is capable of per-vector masking */ if (msg_ctrl & PCI_MSI_FLAGS_64BIT) { msi_size += 4; @@ -1776,11 +1794,14 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, XenPTRegInfo *reg, uint32_t real_offset, uint32_t *data) { - int i; - uint8_t *config = s->dev.config; - uint32_t reg_field = pci_get_byte(config + real_offset); + int i, rc; + uint8_t reg_field; uint8_t cap_id = 0; + rc = xen_host_pci_get_byte(&s->real_device, real_offset, ®_field); + if (rc) { + return rc; + } /* find capability offset */ while (reg_field) { for (i = 0; xen_pt_emu_reg_grps[i].grp_size != 0; i++) { @@ -1789,7 +1810,11 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, continue; } - cap_id = pci_get_byte(config + reg_field + PCI_CAP_LIST_ID); + rc = xen_host_pci_get_byte(&s->real_device, + reg_field + PCI_CAP_LIST_ID, &cap_id); + if (rc) { + return rc; + } if (xen_pt_emu_reg_grps[i].grp_id == cap_id) { if (xen_pt_emu_reg_grps[i].grp_type == XEN_PT_GRP_TYPE_EMU) { goto out; @@ -1800,7 +1825,11 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, } /* next capability */ - reg_field = pci_get_byte(config + reg_field + PCI_CAP_LIST_NEXT); + rc = xen_host_pci_get_byte(&s->real_device, + reg_field + PCI_CAP_LIST_NEXT, ®_field); + if (rc) { + return rc; + } } out: -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0E-0000MY-3N; Thu, 03 Dec 2015 14:36:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0C-0000M8-8E for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:56 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id E8/55-21571-78350665; Thu, 03 Dec 2015 14:36:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1449153413!3428127!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: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5044 invoked from network); 3 Dec 2015 14:36:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:54 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V08-0002lA-Vf for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V07-0001SB-CW for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:52 +0000 Date: Thu, 03 Dec 2015 14:36:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Sync up the dev.config and data values. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56708a94117cfca95b1cc695e885e15d2771e391 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 16:24:40 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:55 2015 +0000 xen/pt: Sync up the dev.config and data values. For a passthrough device we maintain a state of emulated registers value contained within d->config. We also consult the host registers (and apply ro and write masks) whenever the guest access the registers. This is done in xen_pt_pci_write_config and xen_pt_pci_read_config. Also in this picture we call pci_default_write_config which updates the d->config and if the d->config[PCI_COMMAND] register has PCI_COMMAND_MEMORY (or PCI_COMMAND_IO) acts on those changes. On startup the d->config[PCI_COMMAND] are the host values, not what the guest initial values should be, which is exactly what we do _not_ want to do for 64-bit BARs when the guest just wants to read the size of the BAR. Huh you say? To get the size of 64-bit memory space BARs, the guest has to calculate ((BAR[x] & 0xFFFFFFF0) + ((BAR[x+1] & 0xFFFFFFFF) << 32)) which means it has to do two writes of ~0 to BARx and BARx+1. prior to this patch and with XSA120-addendum patch (Linux kernel) the PCI_COMMAND register is copied from the host it can have PCI_COMMAND_MEMORY bit set which means that QEMU will try to update the hypervisor's P2M with BARx+1 value to ~0 (0xffffffff) (to sync the guest state to host) instead of just having xen_pt_pci_write_config and xen_pt_bar_reg_write apply the proper masks and return the size to the guest. To thwart this, this patch syncs up the host values with the guest values taking into account the emu_mask (bit set means we emulate, PCI_COMMAND_MEMORY and PCI_COMMAND_IO are set). That is we copy the host values - masking out any bits which we will emulate. Then merge it with the initial emulation register values. Lastly this value is then copied both in dev.config _and_ XenPTReg->data field. There is also reg->size accounting taken into consideration that ends up being used in patch. xen/pt: Check if reg->init function sets the 'data' past the reg->size This fixes errors such as these: (XEN) memory_map:add: dom2 gfn=fffe0 mfn=fbce0 nr=20 (DEBUG) 189 pci dev 04:0 BAR16 wrote ~0. (DEBUG) 200 pci dev 04:0 BAR16 read 0x0fffe0004. (XEN) memory_map:remove: dom2 gfn=fffe0 mfn=fbce0 nr=20 (DEBUG) 204 pci dev 04:0 BAR16 wrote 0x0fffe0004. (DEBUG) 217 pci dev 04:0 BAR16 read upper 0x000000000. (XEN) memory_map:add: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 (XEN) p2m.c:883:d0v0 p2m_set_entry failed! mfn=ffffffffffffffff rc:-22 (XEN) memory_map:fail: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 ret:-22 (XEN) memory_map:remove: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 (XEN) p2m.c:920:d0v0 gfn_to_mfn failed! gfn=ffffffff00000 type:4 (XEN) p2m.c:920:d0v0 gfn_to_mfn failed! gfn=ffffffff00001 type:4 .. (XEN) memory_map: error -22 removing dom2 access to [fbce0,fbcff] (DEBUG) 222 pci dev 04:0 BAR16 read upper 0x0ffffffff. (XEN) memory_map:remove: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 (XEN) memory_map: error -22 removing dom2 access to [fbce0,fbcff] [The DEBUG is to illustate what the hvmloader was doing] Also we swap from xen_host_pci_long to using xen_host_pci_get_[byte,word,long]. Otherwise we get: xen_pt_config_reg_init: Offset 0x0004 mismatch! Emulated=0x0000, host=0x2300017, syncing to 0x2300014. xen_pt_config_reg_init: Error: Offset 0x0004:0x2300014 expands past register size(2)! which is not surprising. We read the value as an 32-bit (from host), then operate it as a 16-bit - and the remainder is left unchanged. We end up writing the value as 16-bit (so 0014) to dev.config (as we use proper xen_set_host_[byte,word,long] so we don't spill to other registers) but in XenPTReg->data it is as 32-bit (0x2300014)! It is harmless as the read/write functions end up using an size mask and never modify the bits past 16-bit (reg->size is 2). This patch fixes the warnings by reading the value using the proper size. Note that the check for size is still left in-case the developer sets bits past the reg->size in the ->init routines. The author tried to fiddle with QEMU_BUILD_BUG to make this work but failed. Reviewed-by: Stefano Stabellini Reported-by: Sander Eikelenboom Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 59 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 0b24d1f..bf2066a 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1893,6 +1893,10 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, reg_entry->reg = reg; if (reg->init) { + uint32_t host_mask, size_mask; + unsigned int offset; + uint32_t val; + /* initialize emulate register */ rc = reg->init(s, reg_entry->reg, reg_grp->base_offset + reg->offset, &data); @@ -1905,8 +1909,61 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, g_free(reg_entry); return 0; } + /* Sync up the data to dev.config */ + offset = reg_grp->base_offset + reg->offset; + size_mask = 0xFFFFFFFF >> ((4 - reg->size) << 3); + + switch (reg->size) { + case 1: rc = xen_host_pci_get_byte(&s->real_device, offset, (uint8_t *)&val); + break; + case 2: rc = xen_host_pci_get_word(&s->real_device, offset, (uint16_t *)&val); + break; + case 4: rc = xen_host_pci_get_long(&s->real_device, offset, &val); + break; + default: assert(1); + } + if (rc) { + /* Serious issues when we cannot read the host values! */ + g_free(reg_entry); + return rc; + } + /* Set bits in emu_mask are the ones we emulate. The dev.config shall + * contain the emulated view of the guest - therefore we flip the mask + * to mask out the host values (which dev.config initially has) . */ + host_mask = size_mask & ~reg->emu_mask; + + if ((data & host_mask) != (val & host_mask)) { + uint32_t new_val; + + /* Mask out host (including past size). */ + new_val = val & host_mask; + /* Merge emulated ones (excluding the non-emulated ones). */ + new_val |= data & host_mask; + /* Leave intact host and emulated values past the size - even though + * we do not care as we write per reg->size granularity, but for the + * logging below lets have the proper value. */ + new_val |= ((val | data)) & ~size_mask; + XEN_PT_LOG(&s->dev,"Offset 0x%04x mismatch! Emulated=0x%04x, host=0x%04x, syncing to 0x%04x.\n", + offset, data, val, new_val); + val = new_val; + } else + val = data; + + /* This could be just pci_set_long as we don't modify the bits + * past reg->size, but in case this routine is run in parallel + * we do not want to over-write other registers. */ + switch (reg->size) { + case 1: pci_set_byte(s->dev.config + offset, (uint8_t)val); + break; + case 2: pci_set_word(s->dev.config + offset, (uint16_t)val); + break; + case 4: pci_set_long(s->dev.config + offset, val); + break; + default: assert(1); + } /* set register value */ - reg_entry->data = data; + reg_entry->data = val; + } /* list add register entry */ QLIST_INSERT_HEAD(®_grp->reg_tbl_list, reg_entry, entries); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:36:58 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:36:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0E-0000MY-3N; Thu, 03 Dec 2015 14:36:58 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0C-0000M8-8E for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:56 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id E8/55-21571-78350665; Thu, 03 Dec 2015 14:36:55 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1449153413!3428127!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: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5044 invoked from network); 3 Dec 2015 14:36:54 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:36:54 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V08-0002lA-Vf for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V07-0001SB-CW for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:36:52 +0000 Date: Thu, 03 Dec 2015 14:36:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Sync up the dev.config and data values. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56708a94117cfca95b1cc695e885e15d2771e391 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 16:24:40 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:55 2015 +0000 xen/pt: Sync up the dev.config and data values. For a passthrough device we maintain a state of emulated registers value contained within d->config. We also consult the host registers (and apply ro and write masks) whenever the guest access the registers. This is done in xen_pt_pci_write_config and xen_pt_pci_read_config. Also in this picture we call pci_default_write_config which updates the d->config and if the d->config[PCI_COMMAND] register has PCI_COMMAND_MEMORY (or PCI_COMMAND_IO) acts on those changes. On startup the d->config[PCI_COMMAND] are the host values, not what the guest initial values should be, which is exactly what we do _not_ want to do for 64-bit BARs when the guest just wants to read the size of the BAR. Huh you say? To get the size of 64-bit memory space BARs, the guest has to calculate ((BAR[x] & 0xFFFFFFF0) + ((BAR[x+1] & 0xFFFFFFFF) << 32)) which means it has to do two writes of ~0 to BARx and BARx+1. prior to this patch and with XSA120-addendum patch (Linux kernel) the PCI_COMMAND register is copied from the host it can have PCI_COMMAND_MEMORY bit set which means that QEMU will try to update the hypervisor's P2M with BARx+1 value to ~0 (0xffffffff) (to sync the guest state to host) instead of just having xen_pt_pci_write_config and xen_pt_bar_reg_write apply the proper masks and return the size to the guest. To thwart this, this patch syncs up the host values with the guest values taking into account the emu_mask (bit set means we emulate, PCI_COMMAND_MEMORY and PCI_COMMAND_IO are set). That is we copy the host values - masking out any bits which we will emulate. Then merge it with the initial emulation register values. Lastly this value is then copied both in dev.config _and_ XenPTReg->data field. There is also reg->size accounting taken into consideration that ends up being used in patch. xen/pt: Check if reg->init function sets the 'data' past the reg->size This fixes errors such as these: (XEN) memory_map:add: dom2 gfn=fffe0 mfn=fbce0 nr=20 (DEBUG) 189 pci dev 04:0 BAR16 wrote ~0. (DEBUG) 200 pci dev 04:0 BAR16 read 0x0fffe0004. (XEN) memory_map:remove: dom2 gfn=fffe0 mfn=fbce0 nr=20 (DEBUG) 204 pci dev 04:0 BAR16 wrote 0x0fffe0004. (DEBUG) 217 pci dev 04:0 BAR16 read upper 0x000000000. (XEN) memory_map:add: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 (XEN) p2m.c:883:d0v0 p2m_set_entry failed! mfn=ffffffffffffffff rc:-22 (XEN) memory_map:fail: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 ret:-22 (XEN) memory_map:remove: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 (XEN) p2m.c:920:d0v0 gfn_to_mfn failed! gfn=ffffffff00000 type:4 (XEN) p2m.c:920:d0v0 gfn_to_mfn failed! gfn=ffffffff00001 type:4 .. (XEN) memory_map: error -22 removing dom2 access to [fbce0,fbcff] (DEBUG) 222 pci dev 04:0 BAR16 read upper 0x0ffffffff. (XEN) memory_map:remove: dom2 gfn=ffffffff00000 mfn=fbce0 nr=20 (XEN) memory_map: error -22 removing dom2 access to [fbce0,fbcff] [The DEBUG is to illustate what the hvmloader was doing] Also we swap from xen_host_pci_long to using xen_host_pci_get_[byte,word,long]. Otherwise we get: xen_pt_config_reg_init: Offset 0x0004 mismatch! Emulated=0x0000, host=0x2300017, syncing to 0x2300014. xen_pt_config_reg_init: Error: Offset 0x0004:0x2300014 expands past register size(2)! which is not surprising. We read the value as an 32-bit (from host), then operate it as a 16-bit - and the remainder is left unchanged. We end up writing the value as 16-bit (so 0014) to dev.config (as we use proper xen_set_host_[byte,word,long] so we don't spill to other registers) but in XenPTReg->data it is as 32-bit (0x2300014)! It is harmless as the read/write functions end up using an size mask and never modify the bits past 16-bit (reg->size is 2). This patch fixes the warnings by reading the value using the proper size. Note that the check for size is still left in-case the developer sets bits past the reg->size in the ->init routines. The author tried to fiddle with QEMU_BUILD_BUG to make this work but failed. Reviewed-by: Stefano Stabellini Reported-by: Sander Eikelenboom Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 59 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 1 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 0b24d1f..bf2066a 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1893,6 +1893,10 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, reg_entry->reg = reg; if (reg->init) { + uint32_t host_mask, size_mask; + unsigned int offset; + uint32_t val; + /* initialize emulate register */ rc = reg->init(s, reg_entry->reg, reg_grp->base_offset + reg->offset, &data); @@ -1905,8 +1909,61 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, g_free(reg_entry); return 0; } + /* Sync up the data to dev.config */ + offset = reg_grp->base_offset + reg->offset; + size_mask = 0xFFFFFFFF >> ((4 - reg->size) << 3); + + switch (reg->size) { + case 1: rc = xen_host_pci_get_byte(&s->real_device, offset, (uint8_t *)&val); + break; + case 2: rc = xen_host_pci_get_word(&s->real_device, offset, (uint16_t *)&val); + break; + case 4: rc = xen_host_pci_get_long(&s->real_device, offset, &val); + break; + default: assert(1); + } + if (rc) { + /* Serious issues when we cannot read the host values! */ + g_free(reg_entry); + return rc; + } + /* Set bits in emu_mask are the ones we emulate. The dev.config shall + * contain the emulated view of the guest - therefore we flip the mask + * to mask out the host values (which dev.config initially has) . */ + host_mask = size_mask & ~reg->emu_mask; + + if ((data & host_mask) != (val & host_mask)) { + uint32_t new_val; + + /* Mask out host (including past size). */ + new_val = val & host_mask; + /* Merge emulated ones (excluding the non-emulated ones). */ + new_val |= data & host_mask; + /* Leave intact host and emulated values past the size - even though + * we do not care as we write per reg->size granularity, but for the + * logging below lets have the proper value. */ + new_val |= ((val | data)) & ~size_mask; + XEN_PT_LOG(&s->dev,"Offset 0x%04x mismatch! Emulated=0x%04x, host=0x%04x, syncing to 0x%04x.\n", + offset, data, val, new_val); + val = new_val; + } else + val = data; + + /* This could be just pci_set_long as we don't modify the bits + * past reg->size, but in case this routine is run in parallel + * we do not want to over-write other registers. */ + switch (reg->size) { + case 1: pci_set_byte(s->dev.config + offset, (uint8_t)val); + break; + case 2: pci_set_word(s->dev.config + offset, (uint16_t)val); + break; + case 4: pci_set_long(s->dev.config + offset, val); + break; + default: assert(1); + } /* set register value */ - reg_entry->data = data; + reg_entry->data = val; + } /* list add register entry */ QLIST_INSERT_HEAD(®_grp->reg_tbl_list, reg_entry, entries); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0P-0000Pg-7t; Thu, 03 Dec 2015 14:37:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0N-0000PC-IQ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:07 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id ED/46-25438-29350665; Thu, 03 Dec 2015 14:37:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1449153424!8448882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52900 invoked from network); 3 Dec 2015 14:37:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0J-0002lo-Te for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0J-0001Sr-JJ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:03 +0000 Date: Thu, 03 Dec 2015 14:37:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Check if reg->init function sets the 'data' past the reg->size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 03e8ca87256f64acb0cc31f1c31ed953390e0311 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 16:41:14 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:57 2015 +0000 xen/pt: Check if reg->init function sets the 'data' past the reg->size It should never happen, but in case it does (an developer adds a new register and the 'init_val' expands past the register size) we want to report. The code will only write up to reg->size so there is no runtime danger of the register spilling across other ones - however to catch this sort of thing we still return an error. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index bf2066a..ec77db2 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1949,9 +1949,15 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, } else val = data; + if (val & ~size_mask) { + XEN_PT_ERR(&s->dev,"Offset 0x%04x:0x%04x expands past register size(%d)!\n", + offset, val, reg->size); + g_free(reg_entry); + return -ENXIO; + } /* This could be just pci_set_long as we don't modify the bits - * past reg->size, but in case this routine is run in parallel - * we do not want to over-write other registers. */ + * past reg->size, but in case this routine is run in parallel or the + * init value is larger, we do not want to over-write registers. */ switch (reg->size) { case 1: pci_set_byte(s->dev.config + offset, (uint8_t)val); break; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0P-0000Pg-7t; Thu, 03 Dec 2015 14:37:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0N-0000PC-IQ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:07 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id ED/46-25438-29350665; Thu, 03 Dec 2015 14:37:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1449153424!8448882!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52900 invoked from network); 3 Dec 2015 14:37:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0J-0002lo-Te for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0J-0001Sr-JJ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:03 +0000 Date: Thu, 03 Dec 2015 14:37:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Check if reg->init function sets the 'data' past the reg->size X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 03e8ca87256f64acb0cc31f1c31ed953390e0311 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Jun 29 16:41:14 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:57 2015 +0000 xen/pt: Check if reg->init function sets the 'data' past the reg->size It should never happen, but in case it does (an developer adds a new register and the 'init_val' expands past the register size) we want to report. The code will only write up to reg->size so there is no runtime danger of the register spilling across other ones - however to catch this sort of thing we still return an error. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index bf2066a..ec77db2 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1949,9 +1949,15 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, } else val = data; + if (val & ~size_mask) { + XEN_PT_ERR(&s->dev,"Offset 0x%04x:0x%04x expands past register size(%d)!\n", + offset, val, reg->size); + g_free(reg_entry); + return -ENXIO; + } /* This could be just pci_set_long as we don't modify the bits - * past reg->size, but in case this routine is run in parallel - * we do not want to over-write other registers. */ + * past reg->size, but in case this routine is run in parallel or the + * init value is larger, we do not want to over-write registers. */ switch (reg->size) { case 1: pci_set_byte(s->dev.config + offset, (uint8_t)val); break; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0b-0000T2-CH; Thu, 03 Dec 2015 14:37:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0Z-0000SS-Jy for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:19 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 0A/F5-21571-E9350665; Thu, 03 Dec 2015 14:37:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1449153435!3428191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7990 invoked from network); 3 Dec 2015 14:37:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0V-0002lw-FJ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0V-0001TH-42 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:15 +0000 Date: Thu, 03 Dec 2015 14:37:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Remove XenPTReg->data field. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53b3558f082dc625cc093f451085d7aefb0b630a Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jul 1 15:41:33 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:59 2015 +0000 xen/pt: Remove XenPTReg->data field. We do not want to have two entries to cache the guest configuration registers: XenPTReg->data and dev.config. Instead we want to use only the dev.config. To do without much complications we rip out the ->data field and replace it with an pointer to the dev.config. This way we have the type-checking (uint8_t, uint16_t, etc) and as well and pre-computed location. Alternatively we could compute the offset in dev.config by using the XenPTRRegInfo and XenPTRegGroup every time but this way we have the pre-computed values. This change also exposes some mis-use: - In 'xen_pt_status_reg_init' we used u32 for the Capabilities Pointer register, but said register is an an u16. - In 'xen_pt_msgdata_reg_write' we used u32 but should have only use u16. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.h | 6 +++- hw/xen/xen_pt_config_init.c | 73 ++++++++++++++++++++++++++----------------- 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 017065c..403aae1 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -138,7 +138,11 @@ struct XenPTRegInfo { struct XenPTReg { QLIST_ENTRY(XenPTReg) entries; XenPTRegInfo *reg; - uint32_t data; /* emulated value */ + union { + uint8_t *byte; + uint16_t *half_word; + uint32_t *word; + } ptr; /* pointer to dev.config. */ }; typedef const struct XenPTRegGroupInfo XenPTRegGroupInfo; diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index ec77db2..39689be 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -128,10 +128,11 @@ static int xen_pt_byte_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint8_t valid_emu_mask = 0; + uint8_t *data = cfg_entry->ptr.byte; /* emulate byte register */ valid_emu_mask = reg->emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *data, ~valid_emu_mask); return 0; } @@ -140,10 +141,11 @@ static int xen_pt_word_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t valid_emu_mask = 0; + uint16_t *data = cfg_entry->ptr.half_word; /* emulate word register */ valid_emu_mask = reg->emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *data, ~valid_emu_mask); return 0; } @@ -152,10 +154,11 @@ static int xen_pt_long_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t valid_emu_mask = 0; + uint32_t *data = cfg_entry->ptr.word; /* emulate long register */ valid_emu_mask = reg->emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *data, ~valid_emu_mask); return 0; } @@ -169,10 +172,11 @@ static int xen_pt_byte_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint8_t writable_mask = 0; uint8_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint8_t *data = cfg_entry->ptr.byte; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -186,10 +190,11 @@ static int xen_pt_word_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -203,10 +208,11 @@ static int xen_pt_long_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint32_t *data = cfg_entry->ptr.word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -255,7 +261,7 @@ static int xen_pt_status_reg_init(XenPCIPassthroughState *s, reg_entry = xen_pt_find_reg(reg_grp_entry, PCI_CAPABILITY_LIST); if (reg_entry) { /* check Capabilities Pointer register */ - if (reg_entry->data) { + if (*reg_entry->ptr.half_word) { reg_field |= PCI_STATUS_CAP_LIST; } else { reg_field &= ~PCI_STATUS_CAP_LIST; @@ -301,10 +307,11 @@ static int xen_pt_cmd_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ if (*val & PCI_COMMAND_INTX_DISABLE) { @@ -447,7 +454,7 @@ static int xen_pt_bar_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, /* emulate BAR */ valid_emu_mask = bar_emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *cfg_entry->ptr.word, ~valid_emu_mask); return 0; } @@ -464,6 +471,7 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, uint32_t bar_ro_mask = 0; uint32_t r_size = 0; int index = 0; + uint32_t *data = cfg_entry->ptr.word; index = xen_pt_bar_offset_to_index(reg->offset); if (index < 0 || index >= PCI_NUM_REGIONS) { @@ -500,7 +508,7 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, /* modify emulate register */ writable_mask = bar_emu_mask & ~bar_ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* check whether we need to update the virtual region address or not */ switch (s->bases[index].bar_flag) { @@ -533,6 +541,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); pcibus_t r_size = 0; uint32_t bar_ro_mask = 0; + uint32_t *data = cfg_entry->ptr.word; r_size = d->io_regions[PCI_ROM_SLOT].size; base = &s->bases[PCI_ROM_SLOT]; @@ -544,7 +553,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = ~bar_ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -999,10 +1008,11 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, @@ -1097,6 +1107,7 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* Currently no support for multi-vector */ if (*val & PCI_MSI_FLAGS_QSIZE) { @@ -1105,8 +1116,8 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); + msi->flags |= *data & ~PCI_MSI_FLAGS_ENABLE; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -1220,18 +1231,19 @@ static int xen_pt_msgaddr32_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t old_addr = cfg_entry->data; + uint32_t old_addr = *cfg_entry->ptr.word; + uint32_t *data = cfg_entry->ptr.word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - s->msi->addr_lo = cfg_entry->data; + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); + s->msi->addr_lo = *data; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ - if (cfg_entry->data != old_addr) { + if (*data != old_addr) { if (s->msi->mapped) { xen_pt_msi_update(s); } @@ -1246,7 +1258,8 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t old_addr = cfg_entry->data; + uint32_t old_addr = *cfg_entry->ptr.word; + uint32_t *data = cfg_entry->ptr.word; /* check whether the type is 64 bit or not */ if (!(s->msi->flags & PCI_MSI_FLAGS_64BIT)) { @@ -1257,15 +1270,15 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* update the msi_info too */ - s->msi->addr_hi = cfg_entry->data; + s->msi->addr_hi = *data; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ - if (cfg_entry->data != old_addr) { + if (*data != old_addr) { if (s->msi->mapped) { xen_pt_msi_update(s); } @@ -1284,8 +1297,9 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; - uint16_t old_data = cfg_entry->data; + uint16_t old_data = *cfg_entry->ptr.half_word; uint32_t offset = reg->offset; + uint16_t *data = cfg_entry->ptr.half_word; /* check the offset whether matches the type or not */ if (!xen_pt_msi_check_type(offset, msi->flags, DATA)) { @@ -1296,15 +1310,15 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* update the msi_info too */ - msi->data = cfg_entry->data; + msi->data = *data; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ - if (cfg_entry->data != old_data) { + if (*data != old_data) { if (msi->mapped) { xen_pt_msi_update(s); } @@ -1468,10 +1482,11 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s, uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); int debug_msix_enabled_old; + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -1967,8 +1982,8 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, break; default: assert(1); } - /* set register value */ - reg_entry->data = val; + /* set register value pointer to the data. */ + reg_entry->ptr.byte = s->dev.config + offset; } /* list add register entry */ -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0b-0000T2-CH; Thu, 03 Dec 2015 14:37:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0Z-0000SS-Jy for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:19 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 0A/F5-21571-E9350665; Thu, 03 Dec 2015 14:37:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1449153435!3428191!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7990 invoked from network); 3 Dec 2015 14:37:17 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0V-0002lw-FJ for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0V-0001TH-42 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:15 +0000 Date: Thu, 03 Dec 2015 14:37:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Remove XenPTReg->data field. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53b3558f082dc625cc093f451085d7aefb0b630a Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jul 1 15:41:33 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:21:59 2015 +0000 xen/pt: Remove XenPTReg->data field. We do not want to have two entries to cache the guest configuration registers: XenPTReg->data and dev.config. Instead we want to use only the dev.config. To do without much complications we rip out the ->data field and replace it with an pointer to the dev.config. This way we have the type-checking (uint8_t, uint16_t, etc) and as well and pre-computed location. Alternatively we could compute the offset in dev.config by using the XenPTRRegInfo and XenPTRegGroup every time but this way we have the pre-computed values. This change also exposes some mis-use: - In 'xen_pt_status_reg_init' we used u32 for the Capabilities Pointer register, but said register is an an u16. - In 'xen_pt_msgdata_reg_write' we used u32 but should have only use u16. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.h | 6 +++- hw/xen/xen_pt_config_init.c | 73 ++++++++++++++++++++++++++----------------- 2 files changed, 49 insertions(+), 30 deletions(-) diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 017065c..403aae1 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -138,7 +138,11 @@ struct XenPTRegInfo { struct XenPTReg { QLIST_ENTRY(XenPTReg) entries; XenPTRegInfo *reg; - uint32_t data; /* emulated value */ + union { + uint8_t *byte; + uint16_t *half_word; + uint32_t *word; + } ptr; /* pointer to dev.config. */ }; typedef const struct XenPTRegGroupInfo XenPTRegGroupInfo; diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index ec77db2..39689be 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -128,10 +128,11 @@ static int xen_pt_byte_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint8_t valid_emu_mask = 0; + uint8_t *data = cfg_entry->ptr.byte; /* emulate byte register */ valid_emu_mask = reg->emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *data, ~valid_emu_mask); return 0; } @@ -140,10 +141,11 @@ static int xen_pt_word_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint16_t valid_emu_mask = 0; + uint16_t *data = cfg_entry->ptr.half_word; /* emulate word register */ valid_emu_mask = reg->emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *data, ~valid_emu_mask); return 0; } @@ -152,10 +154,11 @@ static int xen_pt_long_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t valid_emu_mask = 0; + uint32_t *data = cfg_entry->ptr.word; /* emulate long register */ valid_emu_mask = reg->emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *data, ~valid_emu_mask); return 0; } @@ -169,10 +172,11 @@ static int xen_pt_byte_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint8_t writable_mask = 0; uint8_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint8_t *data = cfg_entry->ptr.byte; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -186,10 +190,11 @@ static int xen_pt_word_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -203,10 +208,11 @@ static int xen_pt_long_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint32_t *data = cfg_entry->ptr.word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -255,7 +261,7 @@ static int xen_pt_status_reg_init(XenPCIPassthroughState *s, reg_entry = xen_pt_find_reg(reg_grp_entry, PCI_CAPABILITY_LIST); if (reg_entry) { /* check Capabilities Pointer register */ - if (reg_entry->data) { + if (*reg_entry->ptr.half_word) { reg_field |= PCI_STATUS_CAP_LIST; } else { reg_field &= ~PCI_STATUS_CAP_LIST; @@ -301,10 +307,11 @@ static int xen_pt_cmd_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ if (*val & PCI_COMMAND_INTX_DISABLE) { @@ -447,7 +454,7 @@ static int xen_pt_bar_reg_read(XenPCIPassthroughState *s, XenPTReg *cfg_entry, /* emulate BAR */ valid_emu_mask = bar_emu_mask & valid_mask; - *value = XEN_PT_MERGE_VALUE(*value, cfg_entry->data, ~valid_emu_mask); + *value = XEN_PT_MERGE_VALUE(*value, *cfg_entry->ptr.word, ~valid_emu_mask); return 0; } @@ -464,6 +471,7 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, uint32_t bar_ro_mask = 0; uint32_t r_size = 0; int index = 0; + uint32_t *data = cfg_entry->ptr.word; index = xen_pt_bar_offset_to_index(reg->offset); if (index < 0 || index >= PCI_NUM_REGIONS) { @@ -500,7 +508,7 @@ static int xen_pt_bar_reg_write(XenPCIPassthroughState *s, XenPTReg *cfg_entry, /* modify emulate register */ writable_mask = bar_emu_mask & ~bar_ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* check whether we need to update the virtual region address or not */ switch (s->bases[index].bar_flag) { @@ -533,6 +541,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, uint32_t throughable_mask = get_throughable_mask(s, reg, valid_mask); pcibus_t r_size = 0; uint32_t bar_ro_mask = 0; + uint32_t *data = cfg_entry->ptr.word; r_size = d->io_regions[PCI_ROM_SLOT].size; base = &s->bases[PCI_ROM_SLOT]; @@ -544,7 +553,7 @@ static int xen_pt_exp_rom_bar_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = ~bar_ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -999,10 +1008,11 @@ static int xen_pt_pmcsr_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value & ~PCI_PM_CTRL_PME_STATUS, @@ -1097,6 +1107,7 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); + uint16_t *data = cfg_entry->ptr.half_word; /* Currently no support for multi-vector */ if (*val & PCI_MSI_FLAGS_QSIZE) { @@ -1105,8 +1116,8 @@ static int xen_pt_msgctrl_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - msi->flags |= cfg_entry->data & ~PCI_MSI_FLAGS_ENABLE; + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); + msi->flags |= *data & ~PCI_MSI_FLAGS_ENABLE; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -1220,18 +1231,19 @@ static int xen_pt_msgaddr32_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t old_addr = cfg_entry->data; + uint32_t old_addr = *cfg_entry->ptr.word; + uint32_t *data = cfg_entry->ptr.word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); - s->msi->addr_lo = cfg_entry->data; + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); + s->msi->addr_lo = *data; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ - if (cfg_entry->data != old_addr) { + if (*data != old_addr) { if (s->msi->mapped) { xen_pt_msi_update(s); } @@ -1246,7 +1258,8 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, { XenPTRegInfo *reg = cfg_entry->reg; uint32_t writable_mask = 0; - uint32_t old_addr = cfg_entry->data; + uint32_t old_addr = *cfg_entry->ptr.word; + uint32_t *data = cfg_entry->ptr.word; /* check whether the type is 64 bit or not */ if (!(s->msi->flags & PCI_MSI_FLAGS_64BIT)) { @@ -1257,15 +1270,15 @@ static int xen_pt_msgaddr64_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* update the msi_info too */ - s->msi->addr_hi = cfg_entry->data; + s->msi->addr_hi = *data; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ - if (cfg_entry->data != old_addr) { + if (*data != old_addr) { if (s->msi->mapped) { xen_pt_msi_update(s); } @@ -1284,8 +1297,9 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, XenPTRegInfo *reg = cfg_entry->reg; XenPTMSI *msi = s->msi; uint16_t writable_mask = 0; - uint16_t old_data = cfg_entry->data; + uint16_t old_data = *cfg_entry->ptr.half_word; uint32_t offset = reg->offset; + uint16_t *data = cfg_entry->ptr.half_word; /* check the offset whether matches the type or not */ if (!xen_pt_msi_check_type(offset, msi->flags, DATA)) { @@ -1296,15 +1310,15 @@ static int xen_pt_msgdata_reg_write(XenPCIPassthroughState *s, /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* update the msi_info too */ - msi->data = cfg_entry->data; + msi->data = *data; /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, 0); /* update MSI */ - if (cfg_entry->data != old_data) { + if (*data != old_data) { if (msi->mapped) { xen_pt_msi_update(s); } @@ -1468,10 +1482,11 @@ static int xen_pt_msixctrl_reg_write(XenPCIPassthroughState *s, uint16_t writable_mask = 0; uint16_t throughable_mask = get_throughable_mask(s, reg, valid_mask); int debug_msix_enabled_old; + uint16_t *data = cfg_entry->ptr.half_word; /* modify emulate register */ writable_mask = reg->emu_mask & ~reg->ro_mask & valid_mask; - cfg_entry->data = XEN_PT_MERGE_VALUE(*val, cfg_entry->data, writable_mask); + *data = XEN_PT_MERGE_VALUE(*val, *data, writable_mask); /* create value for writing to I/O device register */ *val = XEN_PT_MERGE_VALUE(*val, dev_value, throughable_mask); @@ -1967,8 +1982,8 @@ static int xen_pt_config_reg_init(XenPCIPassthroughState *s, break; default: assert(1); } - /* set register value */ - reg_entry->data = val; + /* set register value pointer to the data. */ + reg_entry->ptr.byte = s->dev.config + offset; } /* list add register entry */ -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0j-0000Vr-M9; Thu, 03 Dec 2015 14:37:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0i-0000Vf-GF for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:28 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id A5/36-21571-7A350665; Thu, 03 Dec 2015 14:37:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1449153446!3427264!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42209 invoked from network); 3 Dec 2015 14:37:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0g-0002m4-0L for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0f-0001Tk-PP for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:25 +0000 Date: Thu, 03 Dec 2015 14:37:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Log xen_host_pci_get in two init functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adc455704ce3c576b44bbf5dea14c4f8029753e5 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:18:26 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:02 2015 +0000 xen/pt: Log xen_host_pci_get in two init functions To help with troubleshooting in the field. Acked-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 39689be..3a60080 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1828,6 +1828,8 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, rc = xen_host_pci_get_byte(&s->real_device, reg_field + PCI_CAP_LIST_ID, &cap_id); if (rc) { + XEN_PT_ERR(&s->dev, "Failed to read capability @0x%x (rc:%d)\n", + reg_field + PCI_CAP_LIST_ID, rc); return rc; } if (xen_pt_emu_reg_grps[i].grp_id == cap_id) { @@ -2037,6 +2039,9 @@ int xen_pt_config_init(XenPCIPassthroughState *s) reg_grp_offset, ®_grp_entry->size); if (rc < 0) { + XEN_PT_LOG(&s->dev, "Failed to initialize %d/%ld, type=0x%x, rc:%d\n", + i, ARRAY_SIZE(xen_pt_emu_reg_grps), + xen_pt_emu_reg_grps[i].grp_type, rc); xen_pt_config_delete(s); return rc; } @@ -2051,6 +2056,10 @@ int xen_pt_config_init(XenPCIPassthroughState *s) /* initialize capability register */ rc = xen_pt_config_reg_init(s, reg_grp_entry, regs); if (rc < 0) { + XEN_PT_LOG(&s->dev, "Failed to initialize %d/%ld reg 0x%x in grp_type=0x%x (%d/%ld), rc=%d\n", + j, ARRAY_SIZE(xen_pt_emu_reg_grps[i].emu_regs), + regs->offset, xen_pt_emu_reg_grps[i].grp_type, + i, ARRAY_SIZE(xen_pt_emu_reg_grps), rc); xen_pt_config_delete(s); return rc; } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0j-0000Vr-M9; Thu, 03 Dec 2015 14:37:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0i-0000Vf-GF for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:28 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id A5/36-21571-7A350665; Thu, 03 Dec 2015 14:37:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1449153446!3427264!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42209 invoked from network); 3 Dec 2015 14:37:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0g-0002m4-0L for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0f-0001Tk-PP for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:25 +0000 Date: Thu, 03 Dec 2015 14:37:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Log xen_host_pci_get in two init functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit adc455704ce3c576b44bbf5dea14c4f8029753e5 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:18:26 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:02 2015 +0000 xen/pt: Log xen_host_pci_get in two init functions To help with troubleshooting in the field. Acked-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_config_init.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c index 39689be..3a60080 100644 --- a/hw/xen/xen_pt_config_init.c +++ b/hw/xen/xen_pt_config_init.c @@ -1828,6 +1828,8 @@ static int xen_pt_ptr_reg_init(XenPCIPassthroughState *s, rc = xen_host_pci_get_byte(&s->real_device, reg_field + PCI_CAP_LIST_ID, &cap_id); if (rc) { + XEN_PT_ERR(&s->dev, "Failed to read capability @0x%x (rc:%d)\n", + reg_field + PCI_CAP_LIST_ID, rc); return rc; } if (xen_pt_emu_reg_grps[i].grp_id == cap_id) { @@ -2037,6 +2039,9 @@ int xen_pt_config_init(XenPCIPassthroughState *s) reg_grp_offset, ®_grp_entry->size); if (rc < 0) { + XEN_PT_LOG(&s->dev, "Failed to initialize %d/%ld, type=0x%x, rc:%d\n", + i, ARRAY_SIZE(xen_pt_emu_reg_grps), + xen_pt_emu_reg_grps[i].grp_type, rc); xen_pt_config_delete(s); return rc; } @@ -2051,6 +2056,10 @@ int xen_pt_config_init(XenPCIPassthroughState *s) /* initialize capability register */ rc = xen_pt_config_reg_init(s, reg_grp_entry, regs); if (rc < 0) { + XEN_PT_LOG(&s->dev, "Failed to initialize %d/%ld reg 0x%x in grp_type=0x%x (%d/%ld), rc=%d\n", + j, ARRAY_SIZE(xen_pt_emu_reg_grps[i].emu_regs), + regs->offset, xen_pt_emu_reg_grps[i].grp_type, + i, ARRAY_SIZE(xen_pt_emu_reg_grps), rc); xen_pt_config_delete(s); return rc; } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0t-0000XF-Qm; Thu, 03 Dec 2015 14:37:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0s-0000X4-U3 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:39 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id E4/87-31450-2B350665; Thu, 03 Dec 2015 14:37:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449153456!8374575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5787 invoked from network); 3 Dec 2015 14:37:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0q-0002mC-Kt for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0q-0001Ux-B8 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:36 +0000 Date: Thu, 03 Dec 2015 14:37:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Log xen_host_pci_get/set errors in MSI code. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2d472e6d70e7dc6fdf7d1ff003d69d59adbf113 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:27:40 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:04 2015 +0000 xen/pt: Log xen_host_pci_get/set errors in MSI code. We seem to only use these functions when de-activating the MSI - so just log errors. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_msi.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 71c872b..82de2bc 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -75,19 +75,29 @@ static int msi_msix_enable(XenPCIPassthroughState *s, bool enable) { uint16_t val = 0; + int rc; if (!address) { return -1; } - xen_host_pci_get_word(&s->real_device, address, &val); + rc = xen_host_pci_get_word(&s->real_device, address, &val); + if (rc) { + XEN_PT_ERR(&s->dev, "Failed to read MSI/MSI-X register (0x%x), rc:%d\n", + address, rc); + return rc; + } if (enable) { val |= flag; } else { val &= ~flag; } - xen_host_pci_set_word(&s->real_device, address, val); - return 0; + rc = xen_host_pci_set_word(&s->real_device, address, val); + if (rc) { + XEN_PT_ERR(&s->dev, "Failed to write MSI/MSI-X register (0x%x), rc:%d\n", + address, rc); + } + return rc; } static int msi_msix_setup(XenPCIPassthroughState *s, @@ -276,7 +286,7 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s) return; } - xen_pt_msi_set_enable(s, false); + (void)xen_pt_msi_set_enable(s, false); msi_msix_disable(s, msi_addr64(msi), msi->data, msi->pirq, false, msi->initialized); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37: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 1a4V0t-0000XF-Qm; Thu, 03 Dec 2015 14:37:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0s-0000X4-U3 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:39 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id E4/87-31450-2B350665; Thu, 03 Dec 2015 14:37:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449153456!8374575!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5787 invoked from network); 3 Dec 2015 14:37:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V0q-0002mC-Kt for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V0q-0001Ux-B8 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:36 +0000 Date: Thu, 03 Dec 2015 14:37:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Log xen_host_pci_get/set errors in MSI code. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c2d472e6d70e7dc6fdf7d1ff003d69d59adbf113 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jun 24 17:27:40 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:04 2015 +0000 xen/pt: Log xen_host_pci_get/set errors in MSI code. We seem to only use these functions when de-activating the MSI - so just log errors. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt_msi.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/xen/xen_pt_msi.c b/hw/xen/xen_pt_msi.c index 71c872b..82de2bc 100644 --- a/hw/xen/xen_pt_msi.c +++ b/hw/xen/xen_pt_msi.c @@ -75,19 +75,29 @@ static int msi_msix_enable(XenPCIPassthroughState *s, bool enable) { uint16_t val = 0; + int rc; if (!address) { return -1; } - xen_host_pci_get_word(&s->real_device, address, &val); + rc = xen_host_pci_get_word(&s->real_device, address, &val); + if (rc) { + XEN_PT_ERR(&s->dev, "Failed to read MSI/MSI-X register (0x%x), rc:%d\n", + address, rc); + return rc; + } if (enable) { val |= flag; } else { val &= ~flag; } - xen_host_pci_set_word(&s->real_device, address, val); - return 0; + rc = xen_host_pci_set_word(&s->real_device, address, val); + if (rc) { + XEN_PT_ERR(&s->dev, "Failed to write MSI/MSI-X register (0x%x), rc:%d\n", + address, rc); + } + return rc; } static int msi_msix_setup(XenPCIPassthroughState *s, @@ -276,7 +286,7 @@ void xen_pt_msi_disable(XenPCIPassthroughState *s) return; } - xen_pt_msi_set_enable(s, false); + (void)xen_pt_msi_set_enable(s, false); msi_msix_disable(s, msi_addr64(msi), msi->data, msi->pirq, false, msi->initialized); -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V17-0000Ys-Ut; Thu, 03 Dec 2015 14:37:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V16-0000Yf-Sx for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:53 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 07/2A-06091-0C350665; Thu, 03 Dec 2015 14:37:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1449153467!8053761!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39162 invoked from network); 3 Dec 2015 14:37:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:48 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V11-0002mK-Ev for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V11-0001VT-2Y for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:47 +0000 Date: Thu, 03 Dec 2015 14:37:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Make xen_pt_unregister_device idempotent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 90eb79ce206a2f91bdfb862c4cfbbc93d534baf4 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Sep 8 16:21:29 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:07 2015 +0000 xen/pt: Make xen_pt_unregister_device idempotent To deal with xen_host_pci_[set|get]_ functions returning error values and clearing ourselves in the init function we should make the .exit (xen_pt_unregister_device) function be idempotent in case the generic code starts calling .exit (or for fun does it before calling .init!). Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen-host-pci-device.c | 5 +++++ hw/xen/xen-host-pci-device.h | 1 + hw/xen/xen_pt.c | 20 ++++++++++++++------ hw/xen/xen_pt.h | 2 ++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c index a54b7de..be28ca2 100644 --- a/hw/xen/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c @@ -392,6 +392,11 @@ error: return rc; } +bool xen_host_pci_device_closed(XenHostPCIDevice *d) +{ + return d->config_fd == -1; +} + void xen_host_pci_device_put(XenHostPCIDevice *d) { if (d->config_fd >= 0) { diff --git a/hw/xen/xen-host-pci-device.h b/hw/xen/xen-host-pci-device.h index f1e1c30..3d44e04 100644 --- a/hw/xen/xen-host-pci-device.h +++ b/hw/xen/xen-host-pci-device.h @@ -39,6 +39,7 @@ typedef struct XenHostPCIDevice { int xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain, uint8_t bus, uint8_t dev, uint8_t func); void xen_host_pci_device_put(XenHostPCIDevice *pci_dev); +bool xen_host_pci_device_closed(XenHostPCIDevice *d); int xen_host_pci_get_byte(XenHostPCIDevice *d, int pos, uint8_t *p); int xen_host_pci_get_word(XenHostPCIDevice *d, int pos, uint16_t *p); diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 5dd80b3..f0fc7f5 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -840,6 +840,7 @@ out: memory_listener_register(&s->memory_listener, &s->dev.bus_master_as); memory_listener_register(&s->io_listener, &address_space_io); + s->listener_set = true; XEN_PT_LOG(d, "Real physical device %02x:%02x.%d registered successfully!\n", s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function); @@ -852,10 +853,11 @@ static void xen_pt_unregister_device(PCIDevice *d) XenPCIPassthroughState *s = XEN_PT_DEVICE(d); XenHostPCIDevice *host_dev = &s->real_device; uint8_t machine_irq = s->machine_irq; - uint8_t intx = xen_pt_pci_intx(s); + uint8_t intx; int rc; - if (machine_irq) { + if (machine_irq && !xen_host_pci_device_closed(&s->real_device)) { + intx = xen_pt_pci_intx(s); rc = xc_domain_unbind_pt_irq(xen_xc, xen_domid, machine_irq, PT_IRQ_TYPE_PCI, pci_bus_num(d->bus), @@ -870,6 +872,7 @@ static void xen_pt_unregister_device(PCIDevice *d) } } + /* N.B. xen_pt_config_delete takes care of freeing them. */ if (s->msi) { xen_pt_msi_disable(s); } @@ -889,6 +892,7 @@ static void xen_pt_unregister_device(PCIDevice *d) machine_irq, errno); } } + s->machine_irq = 0; } /* delete all emulated config registers */ @@ -896,10 +900,14 @@ static void xen_pt_unregister_device(PCIDevice *d) xen_pt_unregister_vga_regions(host_dev); - memory_listener_unregister(&s->memory_listener); - memory_listener_unregister(&s->io_listener); - - xen_host_pci_device_put(&s->real_device); + if (s->listener_set) { + memory_listener_unregister(&s->memory_listener); + memory_listener_unregister(&s->io_listener); + s->listener_set = false; + } + if (!xen_host_pci_device_closed(&s->real_device)) { + xen_host_pci_device_put(&s->real_device); + } } static Property xen_pci_passthrough_properties[] = { diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 403aae1..c545280 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -225,6 +225,7 @@ struct XenPCIPassthroughState { MemoryListener memory_listener; MemoryListener io_listener; + bool listener_set; }; int xen_pt_config_init(XenPCIPassthroughState *s); @@ -290,6 +291,7 @@ static inline uint8_t xen_pt_pci_intx(XenPCIPassthroughState *s) " value=%i, acceptable range is 1 - 4\n", r_val); r_val = 0; } else { + /* Note that if s.real_device.config_fd is closed we make 0xff. */ r_val -= 1; } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:37:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:37:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V17-0000Ys-Ut; Thu, 03 Dec 2015 14:37:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V16-0000Yf-Sx for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:53 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 07/2A-06091-0C350665; Thu, 03 Dec 2015 14:37:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1449153467!8053761!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39162 invoked from network); 3 Dec 2015 14:37:48 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:48 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V11-0002mK-Ev for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V11-0001VT-2Y for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:47 +0000 Date: Thu, 03 Dec 2015 14:37:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Make xen_pt_unregister_device idempotent X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 90eb79ce206a2f91bdfb862c4cfbbc93d534baf4 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Sep 8 16:21:29 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:07 2015 +0000 xen/pt: Make xen_pt_unregister_device idempotent To deal with xen_host_pci_[set|get]_ functions returning error values and clearing ourselves in the init function we should make the .exit (xen_pt_unregister_device) function be idempotent in case the generic code starts calling .exit (or for fun does it before calling .init!). Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen-host-pci-device.c | 5 +++++ hw/xen/xen-host-pci-device.h | 1 + hw/xen/xen_pt.c | 20 ++++++++++++++------ hw/xen/xen_pt.h | 2 ++ 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c index a54b7de..be28ca2 100644 --- a/hw/xen/xen-host-pci-device.c +++ b/hw/xen/xen-host-pci-device.c @@ -392,6 +392,11 @@ error: return rc; } +bool xen_host_pci_device_closed(XenHostPCIDevice *d) +{ + return d->config_fd == -1; +} + void xen_host_pci_device_put(XenHostPCIDevice *d) { if (d->config_fd >= 0) { diff --git a/hw/xen/xen-host-pci-device.h b/hw/xen/xen-host-pci-device.h index f1e1c30..3d44e04 100644 --- a/hw/xen/xen-host-pci-device.h +++ b/hw/xen/xen-host-pci-device.h @@ -39,6 +39,7 @@ typedef struct XenHostPCIDevice { int xen_host_pci_device_get(XenHostPCIDevice *d, uint16_t domain, uint8_t bus, uint8_t dev, uint8_t func); void xen_host_pci_device_put(XenHostPCIDevice *pci_dev); +bool xen_host_pci_device_closed(XenHostPCIDevice *d); int xen_host_pci_get_byte(XenHostPCIDevice *d, int pos, uint8_t *p); int xen_host_pci_get_word(XenHostPCIDevice *d, int pos, uint16_t *p); diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index 5dd80b3..f0fc7f5 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -840,6 +840,7 @@ out: memory_listener_register(&s->memory_listener, &s->dev.bus_master_as); memory_listener_register(&s->io_listener, &address_space_io); + s->listener_set = true; XEN_PT_LOG(d, "Real physical device %02x:%02x.%d registered successfully!\n", s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function); @@ -852,10 +853,11 @@ static void xen_pt_unregister_device(PCIDevice *d) XenPCIPassthroughState *s = XEN_PT_DEVICE(d); XenHostPCIDevice *host_dev = &s->real_device; uint8_t machine_irq = s->machine_irq; - uint8_t intx = xen_pt_pci_intx(s); + uint8_t intx; int rc; - if (machine_irq) { + if (machine_irq && !xen_host_pci_device_closed(&s->real_device)) { + intx = xen_pt_pci_intx(s); rc = xc_domain_unbind_pt_irq(xen_xc, xen_domid, machine_irq, PT_IRQ_TYPE_PCI, pci_bus_num(d->bus), @@ -870,6 +872,7 @@ static void xen_pt_unregister_device(PCIDevice *d) } } + /* N.B. xen_pt_config_delete takes care of freeing them. */ if (s->msi) { xen_pt_msi_disable(s); } @@ -889,6 +892,7 @@ static void xen_pt_unregister_device(PCIDevice *d) machine_irq, errno); } } + s->machine_irq = 0; } /* delete all emulated config registers */ @@ -896,10 +900,14 @@ static void xen_pt_unregister_device(PCIDevice *d) xen_pt_unregister_vga_regions(host_dev); - memory_listener_unregister(&s->memory_listener); - memory_listener_unregister(&s->io_listener); - - xen_host_pci_device_put(&s->real_device); + if (s->listener_set) { + memory_listener_unregister(&s->memory_listener); + memory_listener_unregister(&s->io_listener); + s->listener_set = false; + } + if (!xen_host_pci_device_closed(&s->real_device)) { + xen_host_pci_device_put(&s->real_device); + } } static Property xen_pci_passthrough_properties[] = { diff --git a/hw/xen/xen_pt.h b/hw/xen/xen_pt.h index 403aae1..c545280 100644 --- a/hw/xen/xen_pt.h +++ b/hw/xen/xen_pt.h @@ -225,6 +225,7 @@ struct XenPCIPassthroughState { MemoryListener memory_listener; MemoryListener io_listener; + bool listener_set; }; int xen_pt_config_init(XenPCIPassthroughState *s); @@ -290,6 +291,7 @@ static inline uint8_t xen_pt_pci_intx(XenPCIPassthroughState *s) " value=%i, acceptable range is 1 - 4\n", r_val); r_val = 0; } else { + /* Note that if s.real_device.config_fd is closed we make 0xff. */ r_val -= 1; } -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:38:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:38:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1G-0000ad-1L; Thu, 03 Dec 2015 14:38:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1F-0000aV-0k for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:01 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 3B/A3-30270-8C350665; Thu, 03 Dec 2015 14:38:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1449153478!8088340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11670 invoked from network); 3 Dec 2015 14:37:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1C-0002mS-Ij for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V1B-0001Vs-Q6 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:58 +0000 Date: Thu, 03 Dec 2015 14:37:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Move bulk of xen_pt_unregister_device in its own routine. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffd9028d1dd866e9674819723ba848c6699a3879 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Sep 8 16:21:59 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:09 2015 +0000 xen/pt: Move bulk of xen_pt_unregister_device in its own routine. This way we can call it if we fail during init. This code movement introduces no changes. Acked-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 121 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 58 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f0fc7f5..f9961e2 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -696,6 +696,68 @@ xen_igd_passthrough_isa_bridge_create(XenPCIPassthroughState *s, igd_passthrough_isa_bridge_create(d->bus, gpu_dev_id); } +/* destroy. */ +static void xen_pt_destroy(PCIDevice *d) { + + XenPCIPassthroughState *s = XEN_PT_DEVICE(d); + XenHostPCIDevice *host_dev = &s->real_device; + uint8_t machine_irq = s->machine_irq; + uint8_t intx; + int rc; + + if (machine_irq && !xen_host_pci_device_closed(&s->real_device)) { + intx = xen_pt_pci_intx(s); + rc = xc_domain_unbind_pt_irq(xen_xc, xen_domid, machine_irq, + PT_IRQ_TYPE_PCI, + pci_bus_num(d->bus), + PCI_SLOT(s->dev.devfn), + intx, + 0 /* isa_irq */); + if (rc < 0) { + XEN_PT_ERR(d, "unbinding of interrupt INT%c failed." + " (machine irq: %i, err: %d)" + " But bravely continuing on..\n", + 'a' + intx, machine_irq, errno); + } + } + + /* N.B. xen_pt_config_delete takes care of freeing them. */ + if (s->msi) { + xen_pt_msi_disable(s); + } + if (s->msix) { + xen_pt_msix_disable(s); + } + + if (machine_irq) { + xen_pt_mapped_machine_irq[machine_irq]--; + + if (xen_pt_mapped_machine_irq[machine_irq] == 0) { + rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); + + if (rc < 0) { + XEN_PT_ERR(d, "unmapping of interrupt %i failed. (err: %d)" + " But bravely continuing on..\n", + machine_irq, errno); + } + } + s->machine_irq = 0; + } + + /* delete all emulated config registers */ + xen_pt_config_delete(s); + + xen_pt_unregister_vga_regions(host_dev); + + if (s->listener_set) { + memory_listener_unregister(&s->memory_listener); + memory_listener_unregister(&s->io_listener); + s->listener_set = false; + } + if (!xen_host_pci_device_closed(&s->real_device)) { + xen_host_pci_device_put(&s->real_device); + } +} /* init */ static int xen_pt_initfn(PCIDevice *d) @@ -850,64 +912,7 @@ out: static void xen_pt_unregister_device(PCIDevice *d) { - XenPCIPassthroughState *s = XEN_PT_DEVICE(d); - XenHostPCIDevice *host_dev = &s->real_device; - uint8_t machine_irq = s->machine_irq; - uint8_t intx; - int rc; - - if (machine_irq && !xen_host_pci_device_closed(&s->real_device)) { - intx = xen_pt_pci_intx(s); - rc = xc_domain_unbind_pt_irq(xen_xc, xen_domid, machine_irq, - PT_IRQ_TYPE_PCI, - pci_bus_num(d->bus), - PCI_SLOT(s->dev.devfn), - intx, - 0 /* isa_irq */); - if (rc < 0) { - XEN_PT_ERR(d, "unbinding of interrupt INT%c failed." - " (machine irq: %i, err: %d)" - " But bravely continuing on..\n", - 'a' + intx, machine_irq, errno); - } - } - - /* N.B. xen_pt_config_delete takes care of freeing them. */ - if (s->msi) { - xen_pt_msi_disable(s); - } - if (s->msix) { - xen_pt_msix_disable(s); - } - - if (machine_irq) { - xen_pt_mapped_machine_irq[machine_irq]--; - - if (xen_pt_mapped_machine_irq[machine_irq] == 0) { - rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); - - if (rc < 0) { - XEN_PT_ERR(d, "unmapping of interrupt %i failed. (err: %d)" - " But bravely continuing on..\n", - machine_irq, errno); - } - } - s->machine_irq = 0; - } - - /* delete all emulated config registers */ - xen_pt_config_delete(s); - - xen_pt_unregister_vga_regions(host_dev); - - if (s->listener_set) { - memory_listener_unregister(&s->memory_listener); - memory_listener_unregister(&s->io_listener); - s->listener_set = false; - } - if (!xen_host_pci_device_closed(&s->real_device)) { - xen_host_pci_device_put(&s->real_device); - } + xen_pt_destroy(d); } static Property xen_pci_passthrough_properties[] = { -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:38:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:38:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1G-0000ad-1L; Thu, 03 Dec 2015 14:38:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1F-0000aV-0k for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:01 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 3B/A3-30270-8C350665; Thu, 03 Dec 2015 14:38:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1449153478!8088340!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11670 invoked from network); 3 Dec 2015 14:37:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:37:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1C-0002mS-Ij for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V1B-0001Vs-Q6 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:37:58 +0000 Date: Thu, 03 Dec 2015 14:37:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Move bulk of xen_pt_unregister_device in its own routine. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ffd9028d1dd866e9674819723ba848c6699a3879 Author: Konrad Rzeszutek Wilk AuthorDate: Tue Sep 8 16:21:59 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:09 2015 +0000 xen/pt: Move bulk of xen_pt_unregister_device in its own routine. This way we can call it if we fail during init. This code movement introduces no changes. Acked-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 121 ++++++++++++++++++++++++++++-------------------------- 1 files changed, 63 insertions(+), 58 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f0fc7f5..f9961e2 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -696,6 +696,68 @@ xen_igd_passthrough_isa_bridge_create(XenPCIPassthroughState *s, igd_passthrough_isa_bridge_create(d->bus, gpu_dev_id); } +/* destroy. */ +static void xen_pt_destroy(PCIDevice *d) { + + XenPCIPassthroughState *s = XEN_PT_DEVICE(d); + XenHostPCIDevice *host_dev = &s->real_device; + uint8_t machine_irq = s->machine_irq; + uint8_t intx; + int rc; + + if (machine_irq && !xen_host_pci_device_closed(&s->real_device)) { + intx = xen_pt_pci_intx(s); + rc = xc_domain_unbind_pt_irq(xen_xc, xen_domid, machine_irq, + PT_IRQ_TYPE_PCI, + pci_bus_num(d->bus), + PCI_SLOT(s->dev.devfn), + intx, + 0 /* isa_irq */); + if (rc < 0) { + XEN_PT_ERR(d, "unbinding of interrupt INT%c failed." + " (machine irq: %i, err: %d)" + " But bravely continuing on..\n", + 'a' + intx, machine_irq, errno); + } + } + + /* N.B. xen_pt_config_delete takes care of freeing them. */ + if (s->msi) { + xen_pt_msi_disable(s); + } + if (s->msix) { + xen_pt_msix_disable(s); + } + + if (machine_irq) { + xen_pt_mapped_machine_irq[machine_irq]--; + + if (xen_pt_mapped_machine_irq[machine_irq] == 0) { + rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); + + if (rc < 0) { + XEN_PT_ERR(d, "unmapping of interrupt %i failed. (err: %d)" + " But bravely continuing on..\n", + machine_irq, errno); + } + } + s->machine_irq = 0; + } + + /* delete all emulated config registers */ + xen_pt_config_delete(s); + + xen_pt_unregister_vga_regions(host_dev); + + if (s->listener_set) { + memory_listener_unregister(&s->memory_listener); + memory_listener_unregister(&s->io_listener); + s->listener_set = false; + } + if (!xen_host_pci_device_closed(&s->real_device)) { + xen_host_pci_device_put(&s->real_device); + } +} /* init */ static int xen_pt_initfn(PCIDevice *d) @@ -850,64 +912,7 @@ out: static void xen_pt_unregister_device(PCIDevice *d) { - XenPCIPassthroughState *s = XEN_PT_DEVICE(d); - XenHostPCIDevice *host_dev = &s->real_device; - uint8_t machine_irq = s->machine_irq; - uint8_t intx; - int rc; - - if (machine_irq && !xen_host_pci_device_closed(&s->real_device)) { - intx = xen_pt_pci_intx(s); - rc = xc_domain_unbind_pt_irq(xen_xc, xen_domid, machine_irq, - PT_IRQ_TYPE_PCI, - pci_bus_num(d->bus), - PCI_SLOT(s->dev.devfn), - intx, - 0 /* isa_irq */); - if (rc < 0) { - XEN_PT_ERR(d, "unbinding of interrupt INT%c failed." - " (machine irq: %i, err: %d)" - " But bravely continuing on..\n", - 'a' + intx, machine_irq, errno); - } - } - - /* N.B. xen_pt_config_delete takes care of freeing them. */ - if (s->msi) { - xen_pt_msi_disable(s); - } - if (s->msix) { - xen_pt_msix_disable(s); - } - - if (machine_irq) { - xen_pt_mapped_machine_irq[machine_irq]--; - - if (xen_pt_mapped_machine_irq[machine_irq] == 0) { - rc = xc_physdev_unmap_pirq(xen_xc, xen_domid, machine_irq); - - if (rc < 0) { - XEN_PT_ERR(d, "unmapping of interrupt %i failed. (err: %d)" - " But bravely continuing on..\n", - machine_irq, errno); - } - } - s->machine_irq = 0; - } - - /* delete all emulated config registers */ - xen_pt_config_delete(s); - - xen_pt_unregister_vga_regions(host_dev); - - if (s->listener_set) { - memory_listener_unregister(&s->memory_listener); - memory_listener_unregister(&s->io_listener); - s->listener_set = false; - } - if (!xen_host_pci_device_closed(&s->real_device)) { - xen_host_pci_device_put(&s->real_device); - } + xen_pt_destroy(d); } static Property xen_pci_passthrough_properties[] = { -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:38:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:38:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1T-0000cK-5t; Thu, 03 Dec 2015 14:38:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1P-0000c1-8b for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:14 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 5B/37-21571-2D350665; Thu, 03 Dec 2015 14:38:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1449153489!3427607!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48269 invoked from network); 3 Dec 2015 14:38:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:38:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1N-0002n3-3M for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V1M-0001Wf-T1 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:08 +0000 Date: Thu, 03 Dec 2015 14:38:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Check for return values for xen_host_pci_[get|set] in init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcb5db78555300291cd09581e29aa3e329d0f57e Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jul 2 14:33:44 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:12 2015 +0000 xen/pt: Check for return values for xen_host_pci_[get|set] in init and if we have failures we call xen_pt_destroy introduced in 'xen/pt: Move bulk of xen_pt_unregister_device in its own routine.' and free all of the allocated structures. Acked-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f9961e2..da9015c 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -790,10 +790,11 @@ static int xen_pt_initfn(PCIDevice *d) } /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ - if (xen_host_pci_get_block(&s->real_device, 0, d->config, - PCI_CONFIG_SPACE_SIZE) < 0) { - xen_host_pci_device_put(&s->real_device); - return -1; + rc = xen_host_pci_get_block(&s->real_device, 0, d->config, + PCI_CONFIG_SPACE_SIZE); + if (rc < 0) { + XEN_PT_ERR(d,"Could not read PCI_CONFIG space! (rc:%d)\n", rc); + goto err_out; } s->memory_listener = xen_pt_memory_listener; @@ -823,17 +824,17 @@ static int xen_pt_initfn(PCIDevice *d) xen_pt_register_regions(s, &cmd); /* reinitialize each config register to be emulated */ - if (xen_pt_config_init(s)) { + rc = xen_pt_config_init(s); + if (rc) { XEN_PT_ERR(d, "PCI Config space initialisation failed.\n"); - xen_host_pci_device_put(&s->real_device); - return -1; + goto err_out; } /* Bind interrupt */ rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, &scratch); if (rc) { XEN_PT_ERR(d, "Failed to read PCI_INTERRUPT_PIN! (rc:%d)\n", rc); - scratch = 0; + goto err_out; } if (!scratch) { XEN_PT_LOG(d, "no pin interrupt\n"); @@ -890,12 +891,14 @@ out: rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val); if (rc) { XEN_PT_ERR(d, "Failed to read PCI_COMMAND! (rc: %d)\n", rc); + goto err_out; } else { val |= cmd; rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val); if (rc) { XEN_PT_ERR(d, "Failed to write PCI_COMMAND val=0x%x!(rc: %d)\n", val, rc); + goto err_out; } } } @@ -908,6 +911,11 @@ out: s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function); return 0; + +err_out: + xen_pt_destroy(d); + assert(rc); + return rc; } static void xen_pt_unregister_device(PCIDevice *d) -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:38:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:38:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1T-0000cK-5t; Thu, 03 Dec 2015 14:38:15 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1P-0000c1-8b for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:14 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 5B/37-21571-2D350665; Thu, 03 Dec 2015 14:38:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1449153489!3427607!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48269 invoked from network); 3 Dec 2015 14:38:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:38:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1N-0002n3-3M for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V1M-0001Wf-T1 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:08 +0000 Date: Thu, 03 Dec 2015 14:38:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Check for return values for xen_host_pci_[get|set] in init X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcb5db78555300291cd09581e29aa3e329d0f57e Author: Konrad Rzeszutek Wilk AuthorDate: Thu Jul 2 14:33:44 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:12 2015 +0000 xen/pt: Check for return values for xen_host_pci_[get|set] in init and if we have failures we call xen_pt_destroy introduced in 'xen/pt: Move bulk of xen_pt_unregister_device in its own routine.' and free all of the allocated structures. Acked-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index f9961e2..da9015c 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -790,10 +790,11 @@ static int xen_pt_initfn(PCIDevice *d) } /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ - if (xen_host_pci_get_block(&s->real_device, 0, d->config, - PCI_CONFIG_SPACE_SIZE) < 0) { - xen_host_pci_device_put(&s->real_device); - return -1; + rc = xen_host_pci_get_block(&s->real_device, 0, d->config, + PCI_CONFIG_SPACE_SIZE); + if (rc < 0) { + XEN_PT_ERR(d,"Could not read PCI_CONFIG space! (rc:%d)\n", rc); + goto err_out; } s->memory_listener = xen_pt_memory_listener; @@ -823,17 +824,17 @@ static int xen_pt_initfn(PCIDevice *d) xen_pt_register_regions(s, &cmd); /* reinitialize each config register to be emulated */ - if (xen_pt_config_init(s)) { + rc = xen_pt_config_init(s); + if (rc) { XEN_PT_ERR(d, "PCI Config space initialisation failed.\n"); - xen_host_pci_device_put(&s->real_device); - return -1; + goto err_out; } /* Bind interrupt */ rc = xen_host_pci_get_byte(&s->real_device, PCI_INTERRUPT_PIN, &scratch); if (rc) { XEN_PT_ERR(d, "Failed to read PCI_INTERRUPT_PIN! (rc:%d)\n", rc); - scratch = 0; + goto err_out; } if (!scratch) { XEN_PT_LOG(d, "no pin interrupt\n"); @@ -890,12 +891,14 @@ out: rc = xen_host_pci_get_word(&s->real_device, PCI_COMMAND, &val); if (rc) { XEN_PT_ERR(d, "Failed to read PCI_COMMAND! (rc: %d)\n", rc); + goto err_out; } else { val |= cmd; rc = xen_host_pci_set_word(&s->real_device, PCI_COMMAND, val); if (rc) { XEN_PT_ERR(d, "Failed to write PCI_COMMAND val=0x%x!(rc: %d)\n", val, rc); + goto err_out; } } } @@ -908,6 +911,11 @@ out: s->hostaddr.bus, s->hostaddr.slot, s->hostaddr.function); return 0; + +err_out: + xen_pt_destroy(d); + assert(rc); + return rc; } static void xen_pt_unregister_device(PCIDevice *d) -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:38:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:38: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 1a4V1b-0000dY-A5; Thu, 03 Dec 2015 14:38:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1a-0000dL-1t for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:22 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 99/71-25435-DD350665; Thu, 03 Dec 2015 14:38:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449153499!8520535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24208 invoked from network); 3 Dec 2015 14:38:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:38:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1X-0002n8-D8 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V1X-0001XL-Ae for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:19 +0000 Date: Thu, 03 Dec 2015 14:38:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Don't slurp wholesale the PCI configuration registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6787aedc9043bffc5ee5b64c6d46b8fc7298a96 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jul 8 15:58:41 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:13 2015 +0000 xen/pt: Don't slurp wholesale the PCI configuration registers Instead we have the emulation registers ->init functions which consult the host values to see what the initial value should be and they are responsible for populating the dev.config. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index da9015c..aa96288 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -790,12 +790,7 @@ static int xen_pt_initfn(PCIDevice *d) } /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ - rc = xen_host_pci_get_block(&s->real_device, 0, d->config, - PCI_CONFIG_SPACE_SIZE); - if (rc < 0) { - XEN_PT_ERR(d,"Could not read PCI_CONFIG space! (rc:%d)\n", rc); - goto err_out; - } + memset(d->config, 0, PCI_CONFIG_SPACE_SIZE); s->memory_listener = xen_pt_memory_listener; s->io_listener = xen_pt_io_listener; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 03 14:38:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 03 Dec 2015 14:38: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 1a4V1b-0000dY-A5; Thu, 03 Dec 2015 14:38:23 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1a-0000dL-1t for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:22 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 99/71-25435-DD350665; Thu, 03 Dec 2015 14:38:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449153499!8520535!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24208 invoked from network); 3 Dec 2015 14:38:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 3 Dec 2015 14:38:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4V1X-0002n8-D8 for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4V1X-0001XL-Ae for xen-changelog@lists.xensource.com; Thu, 03 Dec 2015 14:38:19 +0000 Date: Thu, 03 Dec 2015 14:38:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/pt: Don't slurp wholesale the PCI configuration registers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f6787aedc9043bffc5ee5b64c6d46b8fc7298a96 Author: Konrad Rzeszutek Wilk AuthorDate: Wed Jul 8 15:58:41 2015 -0400 Commit: Stefano Stabellini CommitDate: Wed Dec 2 14:22:13 2015 +0000 xen/pt: Don't slurp wholesale the PCI configuration registers Instead we have the emulation registers ->init functions which consult the host values to see what the initial value should be and they are responsible for populating the dev.config. Reviewed-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Stefano Stabellini --- hw/xen/xen_pt.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c index da9015c..aa96288 100644 --- a/hw/xen/xen_pt.c +++ b/hw/xen/xen_pt.c @@ -790,12 +790,7 @@ static int xen_pt_initfn(PCIDevice *d) } /* Initialize virtualized PCI configuration (Extended 256 Bytes) */ - rc = xen_host_pci_get_block(&s->real_device, 0, d->config, - PCI_CONFIG_SPACE_SIZE); - if (rc < 0) { - XEN_PT_ERR(d,"Could not read PCI_CONFIG space! (rc:%d)\n", rc); - goto err_out; - } + memset(d->config, 0, PCI_CONFIG_SPACE_SIZE); s->memory_listener = xen_pt_memory_listener; s->io_listener = xen_pt_io_listener; -- generated by git-patchbot for /home/xen/git/qemu-xen.git#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 04 12:22:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12:22: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 1a4pNH-0000fH-Uv; Fri, 04 Dec 2015 12:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNH-0000fC-Bl for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:07 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 56/3B-01748-E6581665; Fri, 04 Dec 2015 12:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1449231724!1325747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37487 invoked from network); 4 Dec 2015 12:22:05 -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; 4 Dec 2015 12:22:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNE-0007Y4-Ol for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNE-0002w2-Dl for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:04 +0000 Date: Fri, 04 Dec 2015 12:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/PoD: Make p2m_pod_empty_cache() restartable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97549e503a2edc8476f9597400159bbe7262fc41 Author: Andrew Cooper AuthorDate: Tue Nov 10 12:15:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Nov 10 12:15:29 2015 +0100 x86/PoD: Make p2m_pod_empty_cache() restartable This avoids a long running operation when destroying a domain with a large PoD cache. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap master commit: 59a5061723ba47c0028cf48487e5de551c42a378 master date: 2015-11-02 15:33:38 +0100 --- xen/arch/x86/mm/p2m-pod.c | 16 +++++++++++----- xen/arch/x86/mm/paging.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 9196a5d..69ffc6a 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -375,11 +375,11 @@ out: return ret; } -void -p2m_pod_empty_cache(struct domain *d) +int p2m_pod_empty_cache(struct domain *d) { struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page; + unsigned int i; /* After this barrier no new PoD activities can happen. */ BUG_ON(!d->is_dying); @@ -389,8 +389,6 @@ p2m_pod_empty_cache(struct domain *d) while ( (page = page_list_remove_head(&p2m->pod.super)) ) { - int i; - for ( i = 0 ; i < SUPERPAGE_PAGES ; i++ ) { BUG_ON(page_get_owner(page + i) != d); @@ -398,19 +396,27 @@ p2m_pod_empty_cache(struct domain *d) } p2m->pod.count -= SUPERPAGE_PAGES; + + if ( hypercall_preempt_check() ) + goto out; } - while ( (page = page_list_remove_head(&p2m->pod.single)) ) + for ( i = 0; (page = page_list_remove_head(&p2m->pod.single)); ++i ) { BUG_ON(page_get_owner(page) != d); page_list_add_tail(page, &d->page_list); p2m->pod.count -= 1; + + if ( i && !(i & 511) && hypercall_preempt_check() ) + goto out; } BUG_ON(p2m->pod.count != 0); + out: unlock_page_alloc(p2m); + return p2m->pod.count ? -ERESTART : 0; } int diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 5becee8..dcff4fb 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -815,7 +815,7 @@ int paging_teardown(struct domain *d) return rc; /* Move populate-on-demand cache back to domain_list for destruction */ - p2m_pod_empty_cache(d); + rc = p2m_pod_empty_cache(d); return rc; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index e91a875..6ccc1ad 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -588,7 +588,7 @@ void p2m_pod_dump_data(struct domain *d); /* Move all pages from the populate-on-demand cache to the domain page_list * (usually in preparation for domain destruction) */ -void p2m_pod_empty_cache(struct domain *d); +int p2m_pod_empty_cache(struct domain *d); /* Set populate-on-demand cache size so that the total memory allocated to a * domain matches target */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 04 12:22:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12:22: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 1a4pNH-0000fH-Uv; Fri, 04 Dec 2015 12:22:07 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNH-0000fC-Bl for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:07 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 56/3B-01748-E6581665; Fri, 04 Dec 2015 12:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1449231724!1325747!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37487 invoked from network); 4 Dec 2015 12:22:05 -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; 4 Dec 2015 12:22:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNE-0007Y4-Ol for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNE-0002w2-Dl for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:04 +0000 Date: Fri, 04 Dec 2015 12:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/PoD: Make p2m_pod_empty_cache() restartable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 97549e503a2edc8476f9597400159bbe7262fc41 Author: Andrew Cooper AuthorDate: Tue Nov 10 12:15:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Nov 10 12:15:29 2015 +0100 x86/PoD: Make p2m_pod_empty_cache() restartable This avoids a long running operation when destroying a domain with a large PoD cache. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap master commit: 59a5061723ba47c0028cf48487e5de551c42a378 master date: 2015-11-02 15:33:38 +0100 --- xen/arch/x86/mm/p2m-pod.c | 16 +++++++++++----- xen/arch/x86/mm/paging.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index 9196a5d..69ffc6a 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -375,11 +375,11 @@ out: return ret; } -void -p2m_pod_empty_cache(struct domain *d) +int p2m_pod_empty_cache(struct domain *d) { struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page; + unsigned int i; /* After this barrier no new PoD activities can happen. */ BUG_ON(!d->is_dying); @@ -389,8 +389,6 @@ p2m_pod_empty_cache(struct domain *d) while ( (page = page_list_remove_head(&p2m->pod.super)) ) { - int i; - for ( i = 0 ; i < SUPERPAGE_PAGES ; i++ ) { BUG_ON(page_get_owner(page + i) != d); @@ -398,19 +396,27 @@ p2m_pod_empty_cache(struct domain *d) } p2m->pod.count -= SUPERPAGE_PAGES; + + if ( hypercall_preempt_check() ) + goto out; } - while ( (page = page_list_remove_head(&p2m->pod.single)) ) + for ( i = 0; (page = page_list_remove_head(&p2m->pod.single)); ++i ) { BUG_ON(page_get_owner(page) != d); page_list_add_tail(page, &d->page_list); p2m->pod.count -= 1; + + if ( i && !(i & 511) && hypercall_preempt_check() ) + goto out; } BUG_ON(p2m->pod.count != 0); + out: unlock_page_alloc(p2m); + return p2m->pod.count ? -ERESTART : 0; } int diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 5becee8..dcff4fb 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -815,7 +815,7 @@ int paging_teardown(struct domain *d) return rc; /* Move populate-on-demand cache back to domain_list for destruction */ - p2m_pod_empty_cache(d); + rc = p2m_pod_empty_cache(d); return rc; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index e91a875..6ccc1ad 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -588,7 +588,7 @@ void p2m_pod_dump_data(struct domain *d); /* Move all pages from the populate-on-demand cache to the domain page_list * (usually in preparation for domain destruction) */ -void p2m_pod_empty_cache(struct domain *d); +int p2m_pod_empty_cache(struct domain *d); /* Set populate-on-demand cache size so that the total memory allocated to a * domain matches target */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 04 12:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12: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 1a4pNS-0000g6-5O; Fri, 04 Dec 2015 12:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNR-0000fx-FL for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:17 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 6A/1F-03235-87581665; Fri, 04 Dec 2015 12:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449231735!8312759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43786 invoked from network); 4 Dec 2015 12:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Dec 2015 12:22:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNP-0007YC-7S for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNP-0002wP-3W for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:15 +0000 Date: Fri, 04 Dec 2015 12:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/vmx: improvements to vmentry failure handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a01d1c7ce27c21e31944ae34fd45a4581c202701 Author: Andrew Cooper AuthorDate: Tue Nov 10 12:16:11 2015 +0100 Commit: Jan Beulich CommitDate: Tue Nov 10 12:16:11 2015 +0100 x86/vmx: improvements to vmentry failure handling Combine the almost identical vm_launch_fail() and vm_resume_fail() into a single vmx_vmentry_failure(). Re-save all GPRs so that domain_crash() prints the real register values, rather than the stack frame of the vmx_vmentry_failure() call. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian master commit: bbcf0b218f64b1e3e2b66b0fbb623f51d9014e81 master date: 2015-11-03 18:14:02 +0100 --- xen/arch/x86/hvm/vmx/entry.S | 9 +++++---- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 2a4ed57..a5438a4 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -101,14 +101,15 @@ UNLIKELY_END(realmode) /*.Lvmx_resume:*/ VMRESUME - sti - call vm_resume_fail - ud2 + jmp .Lvmx_vmentry_fail .Lvmx_launch: VMLAUNCH + +.Lvmx_vmentry_fail: sti - call vm_launch_fail + SAVE_ALL + call vmx_vmentry_failure ud2 ENTRY(vmx_asm_do_vmentry) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 62e405f..e8402a2 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1588,21 +1588,14 @@ void vmx_destroy_vmcs(struct vcpu *v) free_xenheap_page(v->arch.hvm_vmx.msr_bitmap); } -void vm_launch_fail(void) -{ - unsigned long error; - - __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); - domain_crash_synchronous(); -} - -void vm_resume_fail(void) +void vmx_vmentry_failure(void) { + struct vcpu *curr = current; unsigned long error; __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); + gprintk(XENLOG_ERR, "VM%s error: %#lx\n", + curr->arch.hvm_vmx.launched ? "RESUME" : "LAUNCH", error); domain_crash_synchronous(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 04 12:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12: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 1a4pNS-0000g6-5O; Fri, 04 Dec 2015 12:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNR-0000fx-FL for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:17 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 6A/1F-03235-87581665; Fri, 04 Dec 2015 12:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449231735!8312759!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43786 invoked from network); 4 Dec 2015 12:22:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 4 Dec 2015 12:22:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNP-0007YC-7S for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNP-0002wP-3W for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:15 +0000 Date: Fri, 04 Dec 2015 12:22:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/vmx: improvements to vmentry failure handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a01d1c7ce27c21e31944ae34fd45a4581c202701 Author: Andrew Cooper AuthorDate: Tue Nov 10 12:16:11 2015 +0100 Commit: Jan Beulich CommitDate: Tue Nov 10 12:16:11 2015 +0100 x86/vmx: improvements to vmentry failure handling Combine the almost identical vm_launch_fail() and vm_resume_fail() into a single vmx_vmentry_failure(). Re-save all GPRs so that domain_crash() prints the real register values, rather than the stack frame of the vmx_vmentry_failure() call. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian master commit: bbcf0b218f64b1e3e2b66b0fbb623f51d9014e81 master date: 2015-11-03 18:14:02 +0100 --- xen/arch/x86/hvm/vmx/entry.S | 9 +++++---- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 2a4ed57..a5438a4 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -101,14 +101,15 @@ UNLIKELY_END(realmode) /*.Lvmx_resume:*/ VMRESUME - sti - call vm_resume_fail - ud2 + jmp .Lvmx_vmentry_fail .Lvmx_launch: VMLAUNCH + +.Lvmx_vmentry_fail: sti - call vm_launch_fail + SAVE_ALL + call vmx_vmentry_failure ud2 ENTRY(vmx_asm_do_vmentry) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 62e405f..e8402a2 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1588,21 +1588,14 @@ void vmx_destroy_vmcs(struct vcpu *v) free_xenheap_page(v->arch.hvm_vmx.msr_bitmap); } -void vm_launch_fail(void) -{ - unsigned long error; - - __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); - domain_crash_synchronous(); -} - -void vm_resume_fail(void) +void vmx_vmentry_failure(void) { + struct vcpu *curr = current; unsigned long error; __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); + gprintk(XENLOG_ERR, "VM%s error: %#lx\n", + curr->arch.hvm_vmx.launched ? "RESUME" : "LAUNCH", error); domain_crash_synchronous(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 04 12:22:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12:22:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNj-0000hP-AY; Fri, 04 Dec 2015 12:22:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNh-0000hE-Hs for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:33 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 37/5A-31069-88581665; Fri, 04 Dec 2015 12:22:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1449231751!8563649!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61044 invoked from network); 4 Dec 2015 12:22:31 -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; 4 Dec 2015 12:22:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNe-0007YJ-QB for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNZ-0002xW-GS for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:25 +0000 Date: Fri, 04 Dec 2015 12:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/HVM: always intercept #AC and #DB X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3b0c81ba143939282d99d7cdc041f95bae9c917 Author: Jan Beulich AuthorDate: Tue Nov 10 12:16:51 2015 +0100 Commit: Jan Beulich CommitDate: Tue Nov 10 12:16:51 2015 +0100 x86/HVM: always intercept #AC and #DB Both being benign exceptions, and both being possible to get triggered by exception delivery, this is required to prevent a guest from locking up a CPU (resulting from no other VM exits occurring once getting into such a loop). The specific scenarios: 1) #AC may be raised during exception delivery if the handler is set to be a ring-3 one by a 32-bit guest, and the stack is misaligned. This is CVE-2015-5307 / XSA-156. Reported-by: Benjamin Serebrin 2) #DB may be raised during exception delivery when a breakpoint got placed on a data structure involved in delivering the exception. This can result in an endless loop when a 64-bit guest uses a non-zero IST for the vector 1 IDT entry, but even without use of IST the time it takes until a contributory fault would get raised (results depending on the handler) may be quite long. This is CVE-2015-8104 / XSA-156. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: bd2239d9fa975a1ee5bcd27c218ae042cd0a57bc master date: 2015-11-10 12:03:08 +0100 --- xen/arch/x86/hvm/svm/svm.c | 15 +++++++++++---- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++----------- xen/include/asm-x86/hvm/hvm.h | 5 ++++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 8de41fa..364185a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1043,10 +1043,11 @@ static void noreturn svm_do_resume(struct vcpu *v) unlikely(v->arch.hvm_vcpu.debug_state_latch != debug_state) ) { uint32_t intercepts = vmcb_get_exception_intercepts(vmcb); - uint32_t mask = (1U << TRAP_debug) | (1U << TRAP_int3); + v->arch.hvm_vcpu.debug_state_latch = debug_state; vmcb_set_exception_intercepts( - vmcb, debug_state ? (intercepts | mask) : (intercepts & ~mask)); + vmcb, debug_state ? (intercepts | (1U << TRAP_int3)) + : (intercepts & ~(1U << TRAP_int3))); } if ( v->arch.hvm_svm.launch_core != smp_processor_id() ) @@ -2434,8 +2435,9 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto unexpected_exit_type; - domain_pause_for_debugger(); + hvm_inject_hw_exception(TRAP_debug, HVM_DELIVER_NO_ERROR_CODE); + else + domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: @@ -2483,6 +2485,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; } + case VMEXIT_EXCEPTION_AC: + HVMTRACE_1D(TRAP, TRAP_alignment_check); + hvm_inject_hw_exception(TRAP_alignment_check, vmcb->exitinfo1); + break; + case VMEXIT_EXCEPTION_UD: svm_vmexit_ud_intercept(regs); break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2582cdd..d3fa78f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1224,16 +1224,10 @@ static void vmx_update_host_cr3(struct vcpu *v) void vmx_update_debug_state(struct vcpu *v) { - unsigned long mask; - - mask = 1u << TRAP_int3; - if ( !cpu_has_monitor_trap_flag ) - mask |= 1u << TRAP_debug; - if ( v->arch.hvm_vcpu.debug_state_latch ) - v->arch.hvm_vmx.exception_bitmap |= mask; + v->arch.hvm_vmx.exception_bitmap |= 1U << TRAP_int3; else - v->arch.hvm_vmx.exception_bitmap &= ~mask; + v->arch.hvm_vmx.exception_bitmap &= ~(1U << TRAP_int3); vmx_vmcs_enter(v); vmx_update_exception_bitmap(v); @@ -3041,9 +3035,10 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) __vmread(EXIT_QUALIFICATION, &exit_qualification); HVMTRACE_1D(TRAP_DEBUG, exit_qualification); write_debugreg(6, exit_qualification | DR_STATUS_RESERVED_ONE); - if ( !v->domain->debugger_attached || cpu_has_monitor_trap_flag ) - goto exit_and_crash; - domain_pause_for_debugger(); + if ( !v->domain->debugger_attached ) + hvm_inject_hw_exception(vector, HVM_DELIVER_NO_ERROR_CODE); + else + domain_pause_for_debugger(); break; case TRAP_int3: { @@ -3108,6 +3103,11 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) hvm_inject_page_fault(regs->error_code, exit_qualification); break; + case TRAP_alignment_check: + HVMTRACE_1D(TRAP, vector); + __vmread(VM_EXIT_INTR_ERROR_CODE, &ecode); + hvm_inject_hw_exception(vector, ecode); + break; case TRAP_nmi: if ( MASK_EXTR(intr_info, INTR_INFO_INTR_TYPE_MASK) != X86_EVENTTYPE_NMI ) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 68b216c..a2c366d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -384,7 +384,10 @@ static inline int hvm_event_pending(struct vcpu *v) (X86_CR4_VMXE | X86_CR4_PAE | X86_CR4_MCE)) /* These exceptions must always be intercepted. */ -#define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) +#define HVM_TRAP_MASK ((1U << TRAP_debug) | \ + (1U << TRAP_invalid_op) | \ + (1U << TRAP_alignment_check) | \ + (1U << TRAP_machine_check)) /* * x86 event types. This enumeration is valid for: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 04 12:22:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12:22:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNj-0000hP-AY; Fri, 04 Dec 2015 12:22:35 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNh-0000hE-Hs for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:33 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 37/5A-31069-88581665; Fri, 04 Dec 2015 12:22:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1449231751!8563649!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61044 invoked from network); 4 Dec 2015 12:22:31 -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; 4 Dec 2015 12:22:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNe-0007YJ-QB for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNZ-0002xW-GS for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:25 +0000 Date: Fri, 04 Dec 2015 12:22:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] x86/HVM: always intercept #AC and #DB X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e3b0c81ba143939282d99d7cdc041f95bae9c917 Author: Jan Beulich AuthorDate: Tue Nov 10 12:16:51 2015 +0100 Commit: Jan Beulich CommitDate: Tue Nov 10 12:16:51 2015 +0100 x86/HVM: always intercept #AC and #DB Both being benign exceptions, and both being possible to get triggered by exception delivery, this is required to prevent a guest from locking up a CPU (resulting from no other VM exits occurring once getting into such a loop). The specific scenarios: 1) #AC may be raised during exception delivery if the handler is set to be a ring-3 one by a 32-bit guest, and the stack is misaligned. This is CVE-2015-5307 / XSA-156. Reported-by: Benjamin Serebrin 2) #DB may be raised during exception delivery when a breakpoint got placed on a data structure involved in delivering the exception. This can result in an endless loop when a 64-bit guest uses a non-zero IST for the vector 1 IDT entry, but even without use of IST the time it takes until a contributory fault would get raised (results depending on the handler) may be quite long. This is CVE-2015-8104 / XSA-156. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper master commit: bd2239d9fa975a1ee5bcd27c218ae042cd0a57bc master date: 2015-11-10 12:03:08 +0100 --- xen/arch/x86/hvm/svm/svm.c | 15 +++++++++++---- xen/arch/x86/hvm/vmx/vmx.c | 22 +++++++++++----------- xen/include/asm-x86/hvm/hvm.h | 5 ++++- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 8de41fa..364185a 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1043,10 +1043,11 @@ static void noreturn svm_do_resume(struct vcpu *v) unlikely(v->arch.hvm_vcpu.debug_state_latch != debug_state) ) { uint32_t intercepts = vmcb_get_exception_intercepts(vmcb); - uint32_t mask = (1U << TRAP_debug) | (1U << TRAP_int3); + v->arch.hvm_vcpu.debug_state_latch = debug_state; vmcb_set_exception_intercepts( - vmcb, debug_state ? (intercepts | mask) : (intercepts & ~mask)); + vmcb, debug_state ? (intercepts | (1U << TRAP_int3)) + : (intercepts & ~(1U << TRAP_int3))); } if ( v->arch.hvm_svm.launch_core != smp_processor_id() ) @@ -2434,8 +2435,9 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) case VMEXIT_EXCEPTION_DB: if ( !v->domain->debugger_attached ) - goto unexpected_exit_type; - domain_pause_for_debugger(); + hvm_inject_hw_exception(TRAP_debug, HVM_DELIVER_NO_ERROR_CODE); + else + domain_pause_for_debugger(); break; case VMEXIT_EXCEPTION_BP: @@ -2483,6 +2485,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; } + case VMEXIT_EXCEPTION_AC: + HVMTRACE_1D(TRAP, TRAP_alignment_check); + hvm_inject_hw_exception(TRAP_alignment_check, vmcb->exitinfo1); + break; + case VMEXIT_EXCEPTION_UD: svm_vmexit_ud_intercept(regs); break; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2582cdd..d3fa78f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1224,16 +1224,10 @@ static void vmx_update_host_cr3(struct vcpu *v) void vmx_update_debug_state(struct vcpu *v) { - unsigned long mask; - - mask = 1u << TRAP_int3; - if ( !cpu_has_monitor_trap_flag ) - mask |= 1u << TRAP_debug; - if ( v->arch.hvm_vcpu.debug_state_latch ) - v->arch.hvm_vmx.exception_bitmap |= mask; + v->arch.hvm_vmx.exception_bitmap |= 1U << TRAP_int3; else - v->arch.hvm_vmx.exception_bitmap &= ~mask; + v->arch.hvm_vmx.exception_bitmap &= ~(1U << TRAP_int3); vmx_vmcs_enter(v); vmx_update_exception_bitmap(v); @@ -3041,9 +3035,10 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) __vmread(EXIT_QUALIFICATION, &exit_qualification); HVMTRACE_1D(TRAP_DEBUG, exit_qualification); write_debugreg(6, exit_qualification | DR_STATUS_RESERVED_ONE); - if ( !v->domain->debugger_attached || cpu_has_monitor_trap_flag ) - goto exit_and_crash; - domain_pause_for_debugger(); + if ( !v->domain->debugger_attached ) + hvm_inject_hw_exception(vector, HVM_DELIVER_NO_ERROR_CODE); + else + domain_pause_for_debugger(); break; case TRAP_int3: { @@ -3108,6 +3103,11 @@ void vmx_vmexit_handler(struct cpu_user_regs *regs) hvm_inject_page_fault(regs->error_code, exit_qualification); break; + case TRAP_alignment_check: + HVMTRACE_1D(TRAP, vector); + __vmread(VM_EXIT_INTR_ERROR_CODE, &ecode); + hvm_inject_hw_exception(vector, ecode); + break; case TRAP_nmi: if ( MASK_EXTR(intr_info, INTR_INFO_INTR_TYPE_MASK) != X86_EVENTTYPE_NMI ) diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 68b216c..a2c366d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -384,7 +384,10 @@ static inline int hvm_event_pending(struct vcpu *v) (X86_CR4_VMXE | X86_CR4_PAE | X86_CR4_MCE)) /* These exceptions must always be intercepted. */ -#define HVM_TRAP_MASK ((1U << TRAP_machine_check) | (1U << TRAP_invalid_op)) +#define HVM_TRAP_MASK ((1U << TRAP_debug) | \ + (1U << TRAP_invalid_op) | \ + (1U << TRAP_alignment_check) | \ + (1U << TRAP_machine_check)) /* * x86 event types. This enumeration is valid for: -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 04 12:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12:22:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNz-0000k4-FD; Fri, 04 Dec 2015 12:22:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNx-0000jl-Nd for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:49 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id D1/EF-09834-59581665; Fri, 04 Dec 2015 12:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449231761!8751962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35075 invoked from network); 4 Dec 2015 12:22:42 -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; 4 Dec 2015 12:22:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNp-0007YS-8D for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNp-0002xt-3H for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:41 +0000 Date: Fri, 04 Dec 2015 12:22:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Config: Switch to unified qemu trees. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78833c04250416f1870c458309d3ac0e5cf915fd Author: Ian Campbell AuthorDate: Thu Sep 10 14:31:34 2015 +0100 Commit: Ian Jackson CommitDate: Wed Nov 18 17:05:28 2015 +0000 Config: Switch to unified qemu trees. Upstream qemu is now in qemu-xen.git and the trad fork is in qemu-xen-traditional.git. QEMU_UPSTREAM_REVISION is currently a tag and QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are required to those. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Conflicts: Config.mk Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 659d94d..ac7332b 100644 --- a/Config.mk +++ b/Config.mk @@ -242,14 +242,14 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.6-testing.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.6-testing.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.6-testing.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.6-testing.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 04 12:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Dec 2015 12:22:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNz-0000k4-FD; Fri, 04 Dec 2015 12:22:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNx-0000jl-Nd for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:49 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id D1/EF-09834-59581665; Fri, 04 Dec 2015 12:22:45 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449231761!8751962!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35075 invoked from network); 4 Dec 2015 12:22:42 -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; 4 Dec 2015 12:22:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a4pNp-0007YS-8D for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a4pNp-0002xt-3H for xen-changelog@lists.xensource.com; Fri, 04 Dec 2015 12:22:41 +0000 Date: Fri, 04 Dec 2015 12:22:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] Config: Switch to unified qemu trees. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78833c04250416f1870c458309d3ac0e5cf915fd Author: Ian Campbell AuthorDate: Thu Sep 10 14:31:34 2015 +0100 Commit: Ian Jackson CommitDate: Wed Nov 18 17:05:28 2015 +0000 Config: Switch to unified qemu trees. Upstream qemu is now in qemu-xen.git and the trad fork is in qemu-xen-traditional.git. QEMU_UPSTREAM_REVISION is currently a tag and QEMU_TRADITIONAL_REVISION is a specific revision, so no changes are required to those. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Conflicts: Config.mk Signed-off-by: Ian Jackson Acked-by: Ian Campbell --- Config.mk | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 659d94d..ac7332b 100644 --- a/Config.mk +++ b/Config.mk @@ -242,14 +242,14 @@ endif ifeq ($(GIT_HTTP),y) OVMF_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/ovmf.git -QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-upstream-4.6-testing.git -QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-4.6-testing.git +QEMU_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/qemu-xen.git +QEMU_TRADITIONAL_URL ?= http://xenbits.xen.org/git-http/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/seabios.git MINIOS_UPSTREAM_URL ?= http://xenbits.xen.org/git-http/mini-os.git else OVMF_UPSTREAM_URL ?= git://xenbits.xen.org/ovmf.git -QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-upstream-4.6-testing.git -QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-4.6-testing.git +QEMU_UPSTREAM_URL ?= git://xenbits.xen.org/qemu-xen.git +QEMU_TRADITIONAL_URL ?= git://xenbits.xen.org/qemu-xen-traditional.git SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 11:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dL3-0003FG-6x; Wed, 09 Dec 2015 11:55:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dL2-0003FB-4M for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:16 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 35/2B-12946-3A618665; Wed, 09 Dec 2015 11:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1449662113!9572111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15444 invoked from network); 9 Dec 2015 11:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 11:55:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dKq-0003qk-5N for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dKp-0001Ht-Au for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:03 +0000 Date: Wed, 09 Dec 2015 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91c15bfaec1764ce2896a393eabee1183afe1130 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:47:35 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 09 11:55:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dL3-0003FG-6x; Wed, 09 Dec 2015 11:55:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dL2-0003FB-4M for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:16 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 35/2B-12946-3A618665; Wed, 09 Dec 2015 11:55:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1449662113!9572111!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15444 invoked from network); 9 Dec 2015 11:55:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 11:55:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dKq-0003qk-5N for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dKp-0001Ht-Au for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:03 +0000 Date: Wed, 09 Dec 2015 11:55:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91c15bfaec1764ce2896a393eabee1183afe1130 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:47:35 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 09 11:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLF-0003Fo-BU; Wed, 09 Dec 2015 11:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLD-0003Fg-Eg for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:27 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 99/B0-01748-EA618665; Wed, 09 Dec 2015 11:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449662125!9766403!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40944 invoked from network); 9 Dec 2015 11:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 11:55:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLB-0003s2-0Z for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLA-0001Je-MN for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:24 +0000 Date: Wed, 09 Dec 2015 11:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.6] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:05 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 11:55:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLF-0003Fo-BU; Wed, 09 Dec 2015 11:55:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLD-0003Fg-Eg for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:27 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 99/B0-01748-EA618665; Wed, 09 Dec 2015 11:55:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449662125!9766403!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40944 invoked from network); 9 Dec 2015 11:55:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 11:55:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLB-0003s2-0Z for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLA-0001Je-MN for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:24 +0000 Date: Wed, 09 Dec 2015 11:55:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.6] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:05 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 11:55:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLQ-0003HB-G1; Wed, 09 Dec 2015 11:55:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLO-0003Gy-Qz for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:38 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 29/1C-14900-9B618665; Wed, 09 Dec 2015 11:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1449662136!9642382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60812 invoked from network); 9 Dec 2015 11:55:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 11:55:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLM-0003sD-Cw for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLM-0001KN-2b for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:36 +0000 Date: Wed, 09 Dec 2015 11:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.5] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3159615c393e0b981e00ecd0e06fcfd44235f2d4 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:12 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) (cherry picked from commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 11:55:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLQ-0003HB-G1; Wed, 09 Dec 2015 11:55:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLO-0003Gy-Qz for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:38 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 29/1C-14900-9B618665; Wed, 09 Dec 2015 11:55:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1449662136!9642382!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60812 invoked from network); 9 Dec 2015 11:55:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 11:55:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLM-0003sD-Cw for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLM-0001KN-2b for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:36 +0000 Date: Wed, 09 Dec 2015 11:55:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.5] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3159615c393e0b981e00ecd0e06fcfd44235f2d4 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:12 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) (cherry picked from commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 11:55:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLc-0003JE-Lj; Wed, 09 Dec 2015 11:55:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLa-0003IS-HS for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:50 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id C5/34-10115-5C618665; Wed, 09 Dec 2015 11:55:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1449662148!9545533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23155 invoked from network); 9 Dec 2015 11:55:49 -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; 9 Dec 2015 11:55:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLX-0003sL-T6 for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLX-0001L9-D3 for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:47 +0000 Date: Wed, 09 Dec 2015 11:55:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.4] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6425f5d8c25a4d6486435278bcccefd8810becf0 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:16 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) (cherry picked from commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7) (cherry picked from commit 3159615c393e0b981e00ecd0e06fcfd44235f2d4) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 09 11:55:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:55:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLc-0003JE-Lj; Wed, 09 Dec 2015 11:55:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLa-0003IS-HS for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:50 +0000 Received: from [193.109.254.147] by server-15.bemta-14.messagelabs.com id C5/34-10115-5C618665; Wed, 09 Dec 2015 11:55:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1449662148!9545533!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23155 invoked from network); 9 Dec 2015 11:55:49 -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; 9 Dec 2015 11:55:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLX-0003sL-T6 for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLX-0001L9-D3 for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:47 +0000 Date: Wed, 09 Dec 2015 11:55:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.4] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6425f5d8c25a4d6486435278bcccefd8810becf0 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:16 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) (cherry picked from commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7) (cherry picked from commit 3159615c393e0b981e00ecd0e06fcfd44235f2d4) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 09 11:56:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:56:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLp-0003L4-Rq; Wed, 09 Dec 2015 11:56:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLo-0003Kx-Ce for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:56:04 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 74/52-21571-3D618665; Wed, 09 Dec 2015 11:56:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449662159!4553884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43920 invoked from network); 9 Dec 2015 11:56:01 -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; 9 Dec 2015 11:56:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLj-0003sT-Lr for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLj-0001Ly-1b for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:59 +0000 Date: Wed, 09 Dec 2015 11:55:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.3] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d886904dd6875648b33d58bb7d2fe75b45e4ea12 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:22 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) (cherry picked from commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7) (cherry picked from commit 3159615c393e0b981e00ecd0e06fcfd44235f2d4) (cherry picked from commit 6425f5d8c25a4d6486435278bcccefd8810becf0) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 11:56:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 11:56:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLp-0003L4-Rq; Wed, 09 Dec 2015 11:56:05 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLo-0003Kx-Ce for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:56:04 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 74/52-21571-3D618665; Wed, 09 Dec 2015 11:56:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449662159!4553884!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43920 invoked from network); 9 Dec 2015 11:56:01 -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; 9 Dec 2015 11:56:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6dLj-0003sT-Lr for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6dLj-0001Ly-1b for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 11:55:59 +0000 Date: Wed, 09 Dec 2015 11:55:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.3] net: pcnet: add check to validate receive data size(CVE-2015-7504) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d886904dd6875648b33d58bb7d2fe75b45e4ea12 Author: Ian Jackson AuthorDate: Wed Dec 9 11:47:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:22 2015 +0000 net: pcnet: add check to validate receive data size(CVE-2015-7504) In loopback mode, pcnet_receive routine appends CRC code to the receive buffer. If the data size given is same as the buffer size, the appended CRC code overwrites 4 bytes after s->buffer. Added a check to avoid that. This is XSA-162. Reported-by: Qinghao Tang Signed-off-by: Prasad J Pandit (cherry picked from commit 91c15bfaec1764ce2896a393eabee1183afe1130) (cherry picked from commit aaaf657c8f6106da6d7e97ad0d08ed291cc895c7) (cherry picked from commit 3159615c393e0b981e00ecd0e06fcfd44235f2d4) (cherry picked from commit 6425f5d8c25a4d6486435278bcccefd8810becf0) --- hw/pcnet.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/pcnet.c b/hw/pcnet.c index 4e81267..6a101f2 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1153,7 +1153,7 @@ static void pcnet_receive(void *opaque, const uint8_t *buf, int size) uint32_t fcs = ~0; uint8_t *p = src; - while (p != &src[size-4]) + while (p != &src[size]) CRC(fcs, *p++); crc_err = (*(uint32_t *)p != htonl(fcs)); } @@ -1284,12 +1284,13 @@ static void pcnet_transmit(PCNetState *s) bcnt = 4096 - GET_FIELD(tmd.length, TMDL, BCNT); /* if multi-tmd packet outsizes s->buffer then skip it silently. - Note: this is not what real hw does */ - if (s->xmit_pos + bcnt > sizeof(s->buffer)) { - s->xmit_pos = -1; - goto txdone; + * Note: this is not what real hw does. + * Last four bytes of s->buffer are used to store CRC FCS code. + */ + if (s->xmit_pos + bcnt > sizeof(s->buffer) - 4) { + s->xmit_pos = -1; + goto txdone; } - s->phys_mem_read(s->dma_opaque, PHYSADDR(s, tmd.tbadr), s->buffer + s->xmit_pos, bcnt, CSR_BSWP(s)); s->xmit_pos += bcnt; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.3 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 12:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 12:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6J-0007IX-76; Wed, 09 Dec 2015 12:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6I-0007IK-3U for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:06 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 2E/7C-07165-51228665; Wed, 09 Dec 2015 12:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449665043!9822588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28435 invoked from network); 9 Dec 2015 12:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 12:44:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6F-0004PK-KJ for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6e6E-0005RM-OJ for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:03 +0000 Date: Wed, 09 Dec 2015 12:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] qemu-xen-traditional: Use xentoollog as a separate library X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fad9ed285835caef64bb8dab352e287ad8538c2 Author: Ian Campbell AuthorDate: Thu Dec 3 11:23:16 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 11:53:59 2015 +0000 qemu-xen-traditional: Use xentoollog as a separate library This has been split out of libxenctrl, so the build needs to be able to find the header and the library. QEMU does not use xtl_* itself so -rpath-link is sufficient to allow linking to libxenctrl.so (which links against libxentoollog). Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- xen-hooks.mak | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen-hooks.mak b/xen-hooks.mak index bc7f1f1..bf7f027 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,3 +1,4 @@ +CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/toollog/include CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS+= -I$(XEN_ROOT)/tools/include @@ -19,6 +20,7 @@ CFLAGS += $(CMDLINE_CFLAGS) LIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest LIBS += -L$(XEN_ROOT)/tools/xenstore -lxenstore +LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog LDFLAGS := $(CFLAGS) $(LDFLAGS) -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 09 12:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 12:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6J-0007IX-76; Wed, 09 Dec 2015 12:44:07 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6I-0007IK-3U for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:06 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 2E/7C-07165-51228665; Wed, 09 Dec 2015 12:44:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449665043!9822588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28435 invoked from network); 9 Dec 2015 12:44:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 9 Dec 2015 12:44:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6F-0004PK-KJ for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6e6E-0005RM-OJ for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:03 +0000 Date: Wed, 09 Dec 2015 12:44:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] qemu-xen-traditional: Use xentoollog as a separate library X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9fad9ed285835caef64bb8dab352e287ad8538c2 Author: Ian Campbell AuthorDate: Thu Dec 3 11:23:16 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 11:53:59 2015 +0000 qemu-xen-traditional: Use xentoollog as a separate library This has been split out of libxenctrl, so the build needs to be able to find the header and the library. QEMU does not use xtl_* itself so -rpath-link is sufficient to allow linking to libxenctrl.so (which links against libxentoollog). Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- xen-hooks.mak | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen-hooks.mak b/xen-hooks.mak index bc7f1f1..bf7f027 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,3 +1,4 @@ +CPPFLAGS+= -I$(XEN_ROOT)/tools/libs/toollog/include CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS+= -I$(XEN_ROOT)/tools/include @@ -19,6 +20,7 @@ CFLAGS += $(CMDLINE_CFLAGS) LIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest LIBS += -L$(XEN_ROOT)/tools/xenstore -lxenstore +LIBS += -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog LDFLAGS := $(CFLAGS) $(LDFLAGS) -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 09 12:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 12:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6U-0007Je-CL; Wed, 09 Dec 2015 12:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6T-0007JT-72 for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:17 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 2F/06-32615-02228665; Wed, 09 Dec 2015 12:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1449665055!9560561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44238 invoked from network); 9 Dec 2015 12:44:15 -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 2015 12:44:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6Q-0004PP-Uk for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6e6Q-0005Tz-PK for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:14 +0000 Date: Wed, 09 Dec 2015 12:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: Include libxentoollog with libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d25773c8afa2f4dbbb466116daeb60159ddd22bd Author: Ian Campbell AuthorDate: Thu Dec 3 11:23:25 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 11:55:28 2015 +0000 mini-os: Include libxentoollog with libxc libxentoollog has just been split out from libxc. From mini-os's point of view we don't care about the distinction, so keep things simple by just including libxentoollog if libxc is enabled. Signed-off-by: Ian Campbell Acked-by: Samuel Thibault Acked-by: Wei Liu --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 2cb5e51..daee46c 100644 --- a/Makefile +++ b/Makefile @@ -165,6 +165,7 @@ OBJS := $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) ifeq ($(libc),y) ifeq ($(CONFIG_XC),y) +APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/toollog -whole-archive -lxentoollog -no-whole-archive APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive endif APP_LDLIBS += -lpci -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 09 12:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Dec 2015 12:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6U-0007Je-CL; Wed, 09 Dec 2015 12:44:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6T-0007JT-72 for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:17 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 2F/06-32615-02228665; Wed, 09 Dec 2015 12:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1449665055!9560561!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44238 invoked from network); 9 Dec 2015 12:44:15 -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 2015 12:44:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a6e6Q-0004PP-Uk for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a6e6Q-0005Tz-PK for xen-changelog@lists.xensource.com; Wed, 09 Dec 2015 12:44:14 +0000 Date: Wed, 09 Dec 2015 12:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [mini-os master] mini-os: Include libxentoollog with libxc X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d25773c8afa2f4dbbb466116daeb60159ddd22bd Author: Ian Campbell AuthorDate: Thu Dec 3 11:23:25 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 11:55:28 2015 +0000 mini-os: Include libxentoollog with libxc libxentoollog has just been split out from libxc. From mini-os's point of view we don't care about the distinction, so keep things simple by just including libxentoollog if libxc is enabled. Signed-off-by: Ian Campbell Acked-by: Samuel Thibault Acked-by: Wei Liu --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 2cb5e51..daee46c 100644 --- a/Makefile +++ b/Makefile @@ -165,6 +165,7 @@ OBJS := $(filter-out $(OBJ_DIR)/lwip%.o $(LWO), $(OBJS)) ifeq ($(libc),y) ifeq ($(CONFIG_XC),y) +APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libs-$(MINIOS_TARGET_ARCH)/toollog -whole-archive -lxentoollog -no-whole-archive APP_LDLIBS += -L$(XEN_ROOT)/stubdom/libxc-$(MINIOS_TARGET_ARCH) -whole-archive -lxenguest -lxenctrl -no-whole-archive endif APP_LDLIBS += -lpci -- generated by git-patchbot for /home/xen/git/mini-os.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11: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 1a7JjO-0002fG-Hu; Fri, 11 Dec 2015 09:11:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjM-0002fB-TE for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:13 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 74/C7-21571-F239A665; Fri, 11 Dec 2015 09:11:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1449825066!4961757!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36032 invoked from network); 11 Dec 2015 09:11:10 -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; 11 Dec 2015 09:11:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjF-0000Ej-2F for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7JjE-0002qg-PF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:04 +0000 Date: Fri, 11 Dec 2015 09:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ce580f21f21625e72ac7977a2a359daba0bb7a9 Author: Jan Beulich AuthorDate: Tue Dec 8 14:05:20 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:05:20 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index a565c1b..26ee8e0 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1028,6 +1028,17 @@ with **crashinfo_maxaddr**. Specify the threshold below which Xen will inform dom0 that the quantity of free memory is getting low. Specifying `0` will disable this notification. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index b541f4a1..7bffc88 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -43,6 +43,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -55,7 +99,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -100,8 +144,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -272,7 +316,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -337,13 +381,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -362,16 +410,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 817c216..1520b41 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3e9be83..f32b6e8 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11: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 1a7JjT-0002gS-Mg; Fri, 11 Dec 2015 09:11:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjS-0002fu-K7 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:18 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id D8/44-03235-5339A665; Fri, 11 Dec 2015 09:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1449825076!10026614!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46501 invoked from network); 11 Dec 2015 09:11:17 -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; 11 Dec 2015 09:11:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjQ-0000En-0J for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7JjP-0002rv-SD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:15 +0000 Date: Fri, 11 Dec 2015 09:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2633d57c3aa849ccb5fb541d96aa953104f824c9 Author: Jan Beulich AuthorDate: Tue Dec 8 14:06:02 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:06:02 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 7bffc88..31d9803 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -372,7 +372,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -604,11 +604,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11: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 1a7JjT-0002gS-Mg; Fri, 11 Dec 2015 09:11:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjS-0002fu-K7 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:18 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id D8/44-03235-5339A665; Fri, 11 Dec 2015 09:11:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1449825076!10026614!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46501 invoked from network); 11 Dec 2015 09:11:17 -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; 11 Dec 2015 09:11:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjQ-0000En-0J for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7JjP-0002rv-SD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:15 +0000 Date: Fri, 11 Dec 2015 09:11:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2633d57c3aa849ccb5fb541d96aa953104f824c9 Author: Jan Beulich AuthorDate: Tue Dec 8 14:06:02 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:06:02 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 7bffc88..31d9803 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -372,7 +372,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -604,11 +604,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11: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 1a7JjO-0002fG-Hu; Fri, 11 Dec 2015 09:11:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjM-0002fB-TE for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:13 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 74/C7-21571-F239A665; Fri, 11 Dec 2015 09:11:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1449825066!4961757!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36032 invoked from network); 11 Dec 2015 09:11:10 -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; 11 Dec 2015 09:11:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7JjF-0000Ej-2F for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7JjE-0002qg-PF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:04 +0000 Date: Fri, 11 Dec 2015 09:11:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2ce580f21f21625e72ac7977a2a359daba0bb7a9 Author: Jan Beulich AuthorDate: Tue Dec 8 14:05:20 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:05:20 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index a565c1b..26ee8e0 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1028,6 +1028,17 @@ with **crashinfo_maxaddr**. Specify the threshold below which Xen will inform dom0 that the quantity of free memory is getting low. Specifying `0` will disable this notification. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index b541f4a1..7bffc88 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -43,6 +43,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -55,7 +99,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -100,8 +144,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -272,7 +316,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -337,13 +381,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -362,16 +410,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 817c216..1520b41 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3e9be83..f32b6e8 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjl-0002vE-R2; Fri, 11 Dec 2015 09:11:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjk-0002v7-Mk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:36 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 36/34-18316-7439A665; Fri, 11 Dec 2015 09:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1449825086!4837609!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55065 invoked from network); 11 Dec 2015 09:11:34 -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; 11 Dec 2015 09:11:34 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jja-0000Ew-A9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Jja-0002sH-5w for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:26 +0000 Date: Fri, 11 Dec 2015 09:11:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59543a7cc218e9d466810409088f3015f259078c Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:31:21 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index f5771da..278b9ed 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1484,6 +1484,9 @@ static void domcreate_complete(libxl__egc *egc, libxl_domain_config *const d_config = dcs->guest_config; libxl_domain_config *d_config_saved = &dcs->guest_config_saved; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 8019f4e..2da3ac4 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -750,9 +750,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjl-0002vE-R2; Fri, 11 Dec 2015 09:11:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjk-0002v7-Mk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:36 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 36/34-18316-7439A665; Fri, 11 Dec 2015 09:11:35 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1449825086!4837609!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55065 invoked from network); 11 Dec 2015 09:11:34 -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; 11 Dec 2015 09:11:34 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jja-0000Ew-A9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Jja-0002sH-5w for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:26 +0000 Date: Fri, 11 Dec 2015 09:11:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59543a7cc218e9d466810409088f3015f259078c Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:31:21 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index f5771da..278b9ed 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1484,6 +1484,9 @@ static void domcreate_complete(libxl__egc *egc, libxl_domain_config *const d_config = dcs->guest_config; libxl_domain_config *d_config_saved = &dcs->guest_config_saved; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 8019f4e..2da3ac4 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -750,9 +750,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjn-0002vp-Ve; Fri, 11 Dec 2015 09:11:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjn-0002vf-2p for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:39 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 3B/D4-30270-A439A665; Fri, 11 Dec 2015 09:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449825096!10030362!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21685 invoked from network); 11 Dec 2015 09:11:37 -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 2015 09:11:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjk-0000F6-Kr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Jjk-0002sd-GN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:36 +0000 Date: Fri, 11 Dec 2015 09:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 564c79d48c930a4a834a42515630b8723173e8b1 Author: Ian Jackson AuthorDate: Wed Dec 9 11:49:59 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:59 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index ac7332b..49d55b1 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= bc00cad75d8bcc3ba696992bec219c21db8406aa -# Tue Mar 11 10:19:23 2014 +0000 -# block-vvfat: fix resource leaks in read_directory() +QEMU_TRADITIONAL_REVISION ?= aaaf657c8f6106da6d7e97ad0d08ed291cc895c7 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjn-0002vp-Ve; Fri, 11 Dec 2015 09:11:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjn-0002vf-2p for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:39 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 3B/D4-30270-A439A665; Fri, 11 Dec 2015 09:11:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449825096!10030362!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21685 invoked from network); 11 Dec 2015 09:11:37 -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 2015 09:11:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjk-0000F6-Kr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Jjk-0002sd-GN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:36 +0000 Date: Fri, 11 Dec 2015 09:11:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 564c79d48c930a4a834a42515630b8723173e8b1 Author: Ian Jackson AuthorDate: Wed Dec 9 11:49:59 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:49:59 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index ac7332b..49d55b1 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= bc00cad75d8bcc3ba696992bec219c21db8406aa -# Tue Mar 11 10:19:23 2014 +0000 -# block-vvfat: fix resource leaks in read_directory() +QEMU_TRADITIONAL_REVISION ?= aaaf657c8f6106da6d7e97ad0d08ed291cc895c7 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjy-0002xR-3b; Fri, 11 Dec 2015 09:11:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjx-0002xF-8P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:49 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 55/AE-21901-4539A665; Fri, 11 Dec 2015 09:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1449825107!10026776!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51755 invoked from network); 11 Dec 2015 09:11:47 -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; 11 Dec 2015 09:11:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jju-0000FI-Su for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Jju-0002t2-RA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:46 +0000 Date: Fri, 11 Dec 2015 09:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 850bcd0f42e4912b6605a2caa42d5c466ed58bd1 Author: Jan Beulich AuthorDate: Wed Dec 9 13:55:15 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:55:15 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 31d9803..8baed72 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -55,8 +55,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -75,8 +73,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 09:11:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 09:11:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjy-0002xR-3b; Fri, 11 Dec 2015 09:11:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jjx-0002xF-8P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:49 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 55/AE-21901-4539A665; Fri, 11 Dec 2015 09:11:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1449825107!10026776!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51755 invoked from network); 11 Dec 2015 09:11:47 -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; 11 Dec 2015 09:11:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Jju-0000FI-Su for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Jju-0002t2-RA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 09:11:46 +0000 Date: Fri, 11 Dec 2015 09:11:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.6] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 850bcd0f42e4912b6605a2caa42d5c466ed58bd1 Author: Jan Beulich AuthorDate: Wed Dec 9 13:55:15 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:55:15 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 31d9803..8baed72 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -55,8 +55,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -75,8 +73,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:28:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:28:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mo5-000619-A5; Fri, 11 Dec 2015 12:28:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mo3-000614-L2 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:15 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id C1/21-31450-E51CA665; Fri, 11 Dec 2015 12:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1449836892!9843284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38914 invoked from network); 11 Dec 2015 12:28:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:28:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mnv-0002OY-1G for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mnu-0006nw-UQ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:06 +0000 Date: Fri, 11 Dec 2015 12:28:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: do proper return code checking of allocator in domain builder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc4ac9284dc93922369084a5c73751658c802ae9 Author: Juergen Gross AuthorDate: Tue Dec 1 18:14:54 2015 +0100 Commit: Ian Campbell CommitDate: Wed Dec 2 15:27:38 2015 +0000 libxc: do proper return code checking of allocator in domain builder Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxc/xc_dom_core.c | 7 ++++++- tools/libxc/xc_dom_x86.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index d0c6596..841e7dc 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -630,7 +630,7 @@ xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name) pfn = dom->pfn_alloc_end - dom->rambase_pfn; if ( xc_dom_chk_alloc_pages(dom, name, 1) ) - return (xen_pfn_t)-1; + return INVALID_PFN; DOMPRINTF("%-20s: %-12s : 0x%" PRIx64 " (pfn 0x%" PRIpfn ")", __FUNCTION__, name, start, pfn); @@ -1107,7 +1107,12 @@ int xc_dom_build_image(struct xc_dom_image *dom) if ( dom->arch_hooks->alloc_pgtables(dom) != 0 ) goto err; if ( dom->alloc_bootstack ) + { dom->bootstack_pfn = xc_dom_alloc_page(dom, "boot stack"); + if ( dom->bootstack_pfn == INVALID_PFN ) + goto err; + } + DOMPRINTF("%-20s: virt_alloc_end : 0x%" PRIx64 "", __FUNCTION__, dom->virt_alloc_end); DOMPRINTF("%-20s: virt_pgtab_end : 0x%" PRIx64 "", diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 7c77e69..71b042e 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -537,10 +537,20 @@ static int alloc_magic_pages(struct xc_dom_image *dom) { /* allocate special pages */ dom->start_info_pfn = xc_dom_alloc_page(dom, "start info"); + if ( dom->start_info_pfn == INVALID_PFN ) + return -1; dom->xenstore_pfn = xc_dom_alloc_page(dom, "xenstore"); + if ( dom->xenstore_pfn == INVALID_PFN ) + return -1; dom->console_pfn = xc_dom_alloc_page(dom, "console"); + if ( dom->console_pfn == INVALID_PFN ) + return -1; if ( xc_dom_feature_translated(dom) ) + { dom->shared_info_pfn = xc_dom_alloc_page(dom, "shared info"); + if ( dom->shared_info_pfn == INVALID_PFN ) + return -1; + } dom->alloc_bootstack = 1; return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:28:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:28:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mo5-000619-A5; Fri, 11 Dec 2015 12:28:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mo3-000614-L2 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:15 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id C1/21-31450-E51CA665; Fri, 11 Dec 2015 12:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1449836892!9843284!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38914 invoked from network); 11 Dec 2015 12:28:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:28:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mnv-0002OY-1G for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mnu-0006nw-UQ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:06 +0000 Date: Fri, 11 Dec 2015 12:28:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: do proper return code checking of allocator in domain builder X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fc4ac9284dc93922369084a5c73751658c802ae9 Author: Juergen Gross AuthorDate: Tue Dec 1 18:14:54 2015 +0100 Commit: Ian Campbell CommitDate: Wed Dec 2 15:27:38 2015 +0000 libxc: do proper return code checking of allocator in domain builder Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxc/xc_dom_core.c | 7 ++++++- tools/libxc/xc_dom_x86.c | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index d0c6596..841e7dc 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -630,7 +630,7 @@ xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name) pfn = dom->pfn_alloc_end - dom->rambase_pfn; if ( xc_dom_chk_alloc_pages(dom, name, 1) ) - return (xen_pfn_t)-1; + return INVALID_PFN; DOMPRINTF("%-20s: %-12s : 0x%" PRIx64 " (pfn 0x%" PRIpfn ")", __FUNCTION__, name, start, pfn); @@ -1107,7 +1107,12 @@ int xc_dom_build_image(struct xc_dom_image *dom) if ( dom->arch_hooks->alloc_pgtables(dom) != 0 ) goto err; if ( dom->alloc_bootstack ) + { dom->bootstack_pfn = xc_dom_alloc_page(dom, "boot stack"); + if ( dom->bootstack_pfn == INVALID_PFN ) + goto err; + } + DOMPRINTF("%-20s: virt_alloc_end : 0x%" PRIx64 "", __FUNCTION__, dom->virt_alloc_end); DOMPRINTF("%-20s: virt_pgtab_end : 0x%" PRIx64 "", diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 7c77e69..71b042e 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -537,10 +537,20 @@ static int alloc_magic_pages(struct xc_dom_image *dom) { /* allocate special pages */ dom->start_info_pfn = xc_dom_alloc_page(dom, "start info"); + if ( dom->start_info_pfn == INVALID_PFN ) + return -1; dom->xenstore_pfn = xc_dom_alloc_page(dom, "xenstore"); + if ( dom->xenstore_pfn == INVALID_PFN ) + return -1; dom->console_pfn = xc_dom_alloc_page(dom, "console"); + if ( dom->console_pfn == INVALID_PFN ) + return -1; if ( xc_dom_feature_translated(dom) ) + { dom->shared_info_pfn = xc_dom_alloc_page(dom, "shared info"); + if ( dom->shared_info_pfn == INVALID_PFN ) + return -1; + } dom->alloc_bootstack = 1; return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:28:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:28: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 1a7MoK-000627-FI; Fri, 11 Dec 2015 12:28:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MoI-00061x-RO for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:30 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 6B/11-21901-E61CA665; Fri, 11 Dec 2015 12:28:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1449836907!9828677!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27293 invoked from network); 11 Dec 2015 12:28:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:28:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mo5-0002Oc-Ba for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mo5-0006oZ-7Z for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:17 +0000 Date: Fri, 11 Dec 2015 12:28:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PCI: make all config space writes subject to XSM checking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 300bb048ca313da7edbf0cef8e6998ca3be5dc2c Author: Jan Beulich AuthorDate: Thu Dec 3 15:32:30 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:32:30 2015 +0100 x86/PCI: make all config space writes subject to XSM checking Now that we intercept them all, there's no reason not to also uniformly hand them to XSM. Reads (which are expected to be of less interest) get handled as before (MMCFG accesses un-audited). Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Andrew Cooper --- xen/arch/x86/pci.c | 8 +++++++- xen/arch/x86/traps.c | 8 +++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 5bcecbb..4b87cab 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -7,6 +7,7 @@ #include #include #include +#include static DEFINE_SPINLOCK(pci_config_lock); @@ -73,7 +74,12 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, uint32_t *data) { struct pci_dev *pdev; - int rc = 0; + int rc = xsm_pci_config_permission(XSM_HOOK, current->domain, bdf, + reg, reg + size - 1, 1); + + if ( rc < 0 ) + return rc; + ASSERT(!rc); /* * Avoid expensive operations when no hook is going to do anything diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e103834..e105b95 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1812,11 +1812,9 @@ static bool_t pci_cfg_ok(struct domain *currd, unsigned int start, start |= CF8_ADDR_HI(currd->arch.pci_cf8); } - if ( xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, - start, start + size - 1, !!write) != 0 ) - return 0; - - return !write || + return !write ? + xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, + start, start + size - 1, 0) == 0 : pci_conf_write_intercept(0, machine_bdf, start, size, write) >= 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:28:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:28: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 1a7MoK-000627-FI; Fri, 11 Dec 2015 12:28:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MoI-00061x-RO for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:30 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 6B/11-21901-E61CA665; Fri, 11 Dec 2015 12:28:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1449836907!9828677!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27293 invoked from network); 11 Dec 2015 12:28:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:28:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mo5-0002Oc-Ba for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mo5-0006oZ-7Z for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:17 +0000 Date: Fri, 11 Dec 2015 12:28:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PCI: make all config space writes subject to XSM checking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 300bb048ca313da7edbf0cef8e6998ca3be5dc2c Author: Jan Beulich AuthorDate: Thu Dec 3 15:32:30 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:32:30 2015 +0100 x86/PCI: make all config space writes subject to XSM checking Now that we intercept them all, there's no reason not to also uniformly hand them to XSM. Reads (which are expected to be of less interest) get handled as before (MMCFG accesses un-audited). Signed-off-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Andrew Cooper --- xen/arch/x86/pci.c | 8 +++++++- xen/arch/x86/traps.c | 8 +++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/pci.c b/xen/arch/x86/pci.c index 5bcecbb..4b87cab 100644 --- a/xen/arch/x86/pci.c +++ b/xen/arch/x86/pci.c @@ -7,6 +7,7 @@ #include #include #include +#include static DEFINE_SPINLOCK(pci_config_lock); @@ -73,7 +74,12 @@ int pci_conf_write_intercept(unsigned int seg, unsigned int bdf, uint32_t *data) { struct pci_dev *pdev; - int rc = 0; + int rc = xsm_pci_config_permission(XSM_HOOK, current->domain, bdf, + reg, reg + size - 1, 1); + + if ( rc < 0 ) + return rc; + ASSERT(!rc); /* * Avoid expensive operations when no hook is going to do anything diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e103834..e105b95 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1812,11 +1812,9 @@ static bool_t pci_cfg_ok(struct domain *currd, unsigned int start, start |= CF8_ADDR_HI(currd->arch.pci_cf8); } - if ( xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, - start, start + size - 1, !!write) != 0 ) - return 0; - - return !write || + return !write ? + xsm_pci_config_permission(XSM_HOOK, currd, machine_bdf, + start, start + size - 1, 0) == 0 : pci_conf_write_intercept(0, machine_bdf, start, size, write) >= 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:55:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:55:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NEk-0007A9-UA; Fri, 11 Dec 2015 12:55:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NEj-0007A2-Sb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:55:50 +0000 Content-Length: 7672 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id AB/BC-03235-4D7CA665; Fri, 11 Dec 2015 12:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449838535!10114465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25587 invoked from network); 11 Dec 2015 12:55:45 -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; 11 Dec 2015 12:55:45 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mov-0002PP-3o for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mou-0006sd-P0 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:09 +0000 Date: Fri, 11 Dec 2015 12:29:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/libxc: add an arch domain config parameter to xc_domain_create X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7692604678134621516==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7692604678134621516== Content-Length: 7405 Content-Transfer-Encoding: quoted-printable commit 0d0f28455d9c019475575d7a36f3c98fa4f0342d Author: Roger Pau Monne AuthorDate: Fri Nov 13 12:05:51 2015 +0100 Commit: Ian Campbell CommitDate: Thu Dec 3 15:00:53 2015 +0000 x86/libxc: add an arch domain config parameter to xc_domain_create With the addition of HVMlite the hypervisor now always requires a non-null arch domain config, which is different between HVM and PV guests. Add a new parameter to xc_domain_create that contains a pointer to an arch domain config. If the pointer is null, create a default arch domain config based on guest type. Fix all the in-tree callers to provide a null arch domain config in order to mimic previous behaviour. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 14 ++------- tools/libxc/xc_domain.c | 51 +++++++++++++------------------- tools/libxl/libxl_create.c | 5 +-- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- tools/python/xen/lowlevel/xc/xc.c | 2 +- tools/xenstore/init-xenstore-domain.c | 2 +- 6 files changed, 29 insertions(+), 47 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 2fec1fb..01a6dda 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -502,17 +502,9 @@ typedef union typedef struct xen_arch_domainconfig xc_domain_configuration_t; -int xc_domain_create_config(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid, - xc_domain_configuration_t *config); -int xc_domain_create(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid); +int xc_domain_create(xc_interface *xch, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid, xc_domain_configuration_t *config); /* Functions to produce a dump of a given domain diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 83afc75..96506d5 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -26,16 +26,31 @@ #include #include -int xc_domain_create_config(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid, - xc_domain_configuration_t *config) +int xc_domain_create(xc_interface *xch, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid, xc_domain_configuration_t *config) { + xc_domain_configuration_t lconfig; int err; DECLARE_DOMCTL; + if ( config =3D=3D NULL ) + { + memset(&lconfig, 0, sizeof(lconfig)); + +#if defined (__i386) || defined(__x86_64__) + if ( flags & XEN_DOMCTL_CDF_hvm_guest ) + lconfig.emulation_flags =3D XEN_X86_EMU_ALL; +#elif defined (__arm__) || defined(__aarch64__) + lconfig.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; + lconfig.nr_spis =3D 0; +#else +#error Architecture not supported +#endif + + config =3D &lconfig; + } + domctl.cmd =3D XEN_DOMCTL_createdomain; domctl.domain =3D (domid_t)*pdomid; domctl.u.createdomain.ssidref =3D ssidref; @@ -52,30 +67,6 @@ int xc_domain_create_config(xc_interface *xch, return 0; } -int xc_domain_create(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid) -{ - xc_domain_configuration_t config; - - memset(&config, 0, sizeof(config)); - -#if defined (__i386) || defined(__x86_64__) - /* No arch-specific configuration for now */ -#elif defined (__arm__) || defined(__aarch64__) - config.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; - config.nr_spis =3D 0; -#else - errno =3D ENOSYS; - return -1; -#endif - - return xc_domain_create_config(xch, ssidref, handle, - flags, pdomid, &config); -} - int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, xen_pfn_t start_pfn, xen_pfn_t nr_pfns) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 673e537..a1ccf23 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -528,9 +528,8 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, /* Valid domid here means we're soft resetting. */ if (!libxl_domid_valid_guest(*domid)) { - ret =3D xc_domain_create_config(ctx->xch, info->ssidref, - handle, flags, domid, - xc_config); + ret =3D xc_domain_create(ctx->xch, info->ssidref, handle, flags, domid, + xc_config); if (ret < 0) { LOGE(ERROR, "domain creation fail"); rc =3D ERROR_FAIL; diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index b7de615..393156c 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -175,7 +175,7 @@ CAMLprim value stub_xc_domain_create(value xch, value ssidref, } caml_enter_blocking_section(); - result =3D xc_domain_create(_H(xch), c_ssidref, h, c_flags, &domid); + result =3D xc_domain_create(_H(xch), c_ssidref, h, c_flags, &domid, NULL); caml_leave_blocking_section(); if (result < 0) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index d75f98c..6dd79e0 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -132,7 +132,7 @@ static PyObject *pyxc_domain_create(XcObject *self, } if ( (ret =3D xc_domain_create(self->xc_handle, ssidref, - handle, flags, &dom)) < 0 ) + handle, flags, &dom, NULL)) < 0 ) return pyxc_error_to_exception(self->xc_handle); if ( target ) diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/xenstore/init-xenstore-domain.c index 0d12169..297afe5 100644 --- a/tools/xenstore/init-xenstore-domain.c +++ b/tools/xenstore/init-xenstore-domain.c @@ -28,7 +28,7 @@ static int build(xc_interface *xch, int argc, char** argv) rv =3D xc_flask_context_to_sid(xch, argv[3], strlen(argv[3]), &ssid); if (rv) goto err; - rv =3D xc_domain_create(xch, ssid, handle, 0, &domid); + rv =3D xc_domain_create(xch, ssid, handle, 0, &domid, NULL); if (rv) goto err; rv =3D xc_domain_max_vcpus(xch, domid, 1); if (rv) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7692604678134621516== 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 --===============7692604678134621516==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:55:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:55:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NEk-0007A9-UA; Fri, 11 Dec 2015 12:55:50 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NEj-0007A2-Sb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:55:50 +0000 Content-Length: 7672 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id AB/BC-03235-4D7CA665; Fri, 11 Dec 2015 12:55:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449838535!10114465!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25587 invoked from network); 11 Dec 2015 12:55:45 -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; 11 Dec 2015 12:55:45 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mov-0002PP-3o for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mou-0006sd-P0 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:09 +0000 Date: Fri, 11 Dec 2015 12:29:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/libxc: add an arch domain config parameter to xc_domain_create X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============7692604678134621516==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============7692604678134621516== Content-Length: 7405 Content-Transfer-Encoding: quoted-printable commit 0d0f28455d9c019475575d7a36f3c98fa4f0342d Author: Roger Pau Monne AuthorDate: Fri Nov 13 12:05:51 2015 +0100 Commit: Ian Campbell CommitDate: Thu Dec 3 15:00:53 2015 +0000 x86/libxc: add an arch domain config parameter to xc_domain_create With the addition of HVMlite the hypervisor now always requires a non-null arch domain config, which is different between HVM and PV guests. Add a new parameter to xc_domain_create that contains a pointer to an arch domain config. If the pointer is null, create a default arch domain config based on guest type. Fix all the in-tree callers to provide a null arch domain config in order to mimic previous behaviour. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/include/xenctrl.h | 14 ++------- tools/libxc/xc_domain.c | 51 +++++++++++++------------------- tools/libxl/libxl_create.c | 5 +-- tools/ocaml/libs/xc/xenctrl_stubs.c | 2 +- tools/python/xen/lowlevel/xc/xc.c | 2 +- tools/xenstore/init-xenstore-domain.c | 2 +- 6 files changed, 29 insertions(+), 47 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 2fec1fb..01a6dda 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -502,17 +502,9 @@ typedef union typedef struct xen_arch_domainconfig xc_domain_configuration_t; -int xc_domain_create_config(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid, - xc_domain_configuration_t *config); -int xc_domain_create(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid); +int xc_domain_create(xc_interface *xch, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid, xc_domain_configuration_t *config); /* Functions to produce a dump of a given domain diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index 83afc75..96506d5 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -26,16 +26,31 @@ #include #include -int xc_domain_create_config(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid, - xc_domain_configuration_t *config) +int xc_domain_create(xc_interface *xch, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid, xc_domain_configuration_t *config) { + xc_domain_configuration_t lconfig; int err; DECLARE_DOMCTL; + if ( config =3D=3D NULL ) + { + memset(&lconfig, 0, sizeof(lconfig)); + +#if defined (__i386) || defined(__x86_64__) + if ( flags & XEN_DOMCTL_CDF_hvm_guest ) + lconfig.emulation_flags =3D XEN_X86_EMU_ALL; +#elif defined (__arm__) || defined(__aarch64__) + lconfig.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; + lconfig.nr_spis =3D 0; +#else +#error Architecture not supported +#endif + + config =3D &lconfig; + } + domctl.cmd =3D XEN_DOMCTL_createdomain; domctl.domain =3D (domid_t)*pdomid; domctl.u.createdomain.ssidref =3D ssidref; @@ -52,30 +67,6 @@ int xc_domain_create_config(xc_interface *xch, return 0; } -int xc_domain_create(xc_interface *xch, - uint32_t ssidref, - xen_domain_handle_t handle, - uint32_t flags, - uint32_t *pdomid) -{ - xc_domain_configuration_t config; - - memset(&config, 0, sizeof(config)); - -#if defined (__i386) || defined(__x86_64__) - /* No arch-specific configuration for now */ -#elif defined (__arm__) || defined(__aarch64__) - config.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; - config.nr_spis =3D 0; -#else - errno =3D ENOSYS; - return -1; -#endif - - return xc_domain_create_config(xch, ssidref, handle, - flags, pdomid, &config); -} - int xc_domain_cacheflush(xc_interface *xch, uint32_t domid, xen_pfn_t start_pfn, xen_pfn_t nr_pfns) { diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 673e537..a1ccf23 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -528,9 +528,8 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, /* Valid domid here means we're soft resetting. */ if (!libxl_domid_valid_guest(*domid)) { - ret =3D xc_domain_create_config(ctx->xch, info->ssidref, - handle, flags, domid, - xc_config); + ret =3D xc_domain_create(ctx->xch, info->ssidref, handle, flags, domid, + xc_config); if (ret < 0) { LOGE(ERROR, "domain creation fail"); rc =3D ERROR_FAIL; diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index b7de615..393156c 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -175,7 +175,7 @@ CAMLprim value stub_xc_domain_create(value xch, value ssidref, } caml_enter_blocking_section(); - result =3D xc_domain_create(_H(xch), c_ssidref, h, c_flags, &domid); + result =3D xc_domain_create(_H(xch), c_ssidref, h, c_flags, &domid, NULL); caml_leave_blocking_section(); if (result < 0) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index d75f98c..6dd79e0 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -132,7 +132,7 @@ static PyObject *pyxc_domain_create(XcObject *self, } if ( (ret =3D xc_domain_create(self->xc_handle, ssidref, - handle, flags, &dom)) < 0 ) + handle, flags, &dom, NULL)) < 0 ) return pyxc_error_to_exception(self->xc_handle); if ( target ) diff --git a/tools/xenstore/init-xenstore-domain.c b/tools/xenstore/init-xenstore-domain.c index 0d12169..297afe5 100644 --- a/tools/xenstore/init-xenstore-domain.c +++ b/tools/xenstore/init-xenstore-domain.c @@ -28,7 +28,7 @@ static int build(xc_interface *xch, int argc, char** argv) rv =3D xc_flask_context_to_sid(xch, argv[3], strlen(argv[3]), &ssid); if (rv) goto err; - rv =3D xc_domain_create(xch, ssid, handle, 0, &domid); + rv =3D xc_domain_create(xch, ssid, handle, 0, &domid, NULL); if (rv) goto err; rv =3D xc_domain_max_vcpus(xch, domid, 1); if (rv) goto err; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============7692604678134621516== 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 --===============7692604678134621516==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:57:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:57: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 1a7NGL-0007Qx-O6; Fri, 11 Dec 2015 12:57:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NGJ-0007Qo-R9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:57:27 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 5F/6F-31122-738CA665; Fri, 11 Dec 2015 12:57:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1449838586!4880287!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29031 invoked from network); 11 Dec 2015 12:57:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:57:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mok-0002Os-H8 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mok-0006rh-E9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:58 +0000 Date: Fri, 11 Dec 2015 12:28:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: fix clean to remove all *.o and .*.d files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68dc5813545c408b57221a2cb81b7e00dc9dc630 Author: Jonathan Creekmore AuthorDate: Thu Dec 3 15:35:09 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:35:09 2015 +0100 build: fix clean to remove all *.o and .*.d files In commit 8b6ef9c152edceabecc7f90c811cd538a7b7a110, several files in xen/common/compat were changed to be built using the Makefile in xen/common, by appending the compat prefix to the object files. Additionally, the xen/common/compat directory was removed from the subdirs-y variable, so it is no longer visited by the clean rule. This resulted in some object files and dependency files being generated by inclusion into obj-y, but not cleaned because they lived in a directory that was unvisited by the clean rules. Since there is a desire for all of the object files and dependency files to be cleaned, just search for all objects and dependency files and delete them on clean. The previous method of only tracking with the $(DEPS) and *.o in the clean rules had the disadvantage that, if the configuration changed between a build and a clean, some of the dependencies or objects could get left behind. This method does not have the same disadvantage. Signed-off-by: Jonathan Creekmore [dropped removal of *.o and $(DEPS) from xen/Rules.mk's clean rule] Acked-by: Jan Beulich --- xen/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 3a1de99..62c3a6e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -91,7 +91,8 @@ _clean: delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean $(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean - rm -f include/asm *.o $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET)-syms *~ core $(DEPS) + find . \( -name "*.o" -o -name ".*.d" \) -exec rm -f {} \; + rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET)-syms *~ core rm -f include/asm-*/asm-offsets.h rm -f .banner -- generated by git-patchbot for /home/xen/git/xen.git#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 11 12:57:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:57: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 1a7NGL-0007Qx-O6; Fri, 11 Dec 2015 12:57:29 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NGJ-0007Qo-R9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:57:27 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 5F/6F-31122-738CA665; Fri, 11 Dec 2015 12:57:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1449838586!4880287!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29031 invoked from network); 11 Dec 2015 12:57:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:57:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mok-0002Os-H8 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mok-0006rh-E9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:58 +0000 Date: Fri, 11 Dec 2015 12:28:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: fix clean to remove all *.o and .*.d files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68dc5813545c408b57221a2cb81b7e00dc9dc630 Author: Jonathan Creekmore AuthorDate: Thu Dec 3 15:35:09 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:35:09 2015 +0100 build: fix clean to remove all *.o and .*.d files In commit 8b6ef9c152edceabecc7f90c811cd538a7b7a110, several files in xen/common/compat were changed to be built using the Makefile in xen/common, by appending the compat prefix to the object files. Additionally, the xen/common/compat directory was removed from the subdirs-y variable, so it is no longer visited by the clean rule. This resulted in some object files and dependency files being generated by inclusion into obj-y, but not cleaned because they lived in a directory that was unvisited by the clean rules. Since there is a desire for all of the object files and dependency files to be cleaned, just search for all objects and dependency files and delete them on clean. The previous method of only tracking with the $(DEPS) and *.o in the clean rules had the disadvantage that, if the configuration changed between a build and a clean, some of the dependencies or objects could get left behind. This method does not have the same disadvantage. Signed-off-by: Jonathan Creekmore [dropped removal of *.o and $(DEPS) from xen/Rules.mk's clean rule] Acked-by: Jan Beulich --- xen/Makefile | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 3a1de99..62c3a6e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -91,7 +91,8 @@ _clean: delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean $(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean - rm -f include/asm *.o $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET)-syms *~ core $(DEPS) + find . \( -name "*.o" -o -name ".*.d" \) -exec rm -f {} \; + rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET)-syms *~ core rm -f include/asm-*/asm-offsets.h rm -f .banner -- generated by git-patchbot for /home/xen/git/xen.git#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 11 12:58:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NHg-0007Vi-Uj; Fri, 11 Dec 2015 12:58:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NHg-0007Vd-Cr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:58:52 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id AB/55-21571-B88CA665; Fri, 11 Dec 2015 12:58:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1449838671!4879031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25150 invoked from network); 11 Dec 2015 12:58:50 -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; 11 Dec 2015 12:58:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mpv-0002Qn-CQ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mpv-0006yQ-8H for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:11 +0000 Date: Fri, 11 Dec 2015 12:30:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 Author: Jan Beulich AuthorDate: Tue Dec 8 14:01:43 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:01:43 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e00a0b2..b6bf543 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -378,7 +378,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -610,11 +610,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:58:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:58:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NHg-0007Vi-Uj; Fri, 11 Dec 2015 12:58:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NHg-0007Vd-Cr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:58:52 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id AB/55-21571-B88CA665; Fri, 11 Dec 2015 12:58:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1449838671!4879031!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25150 invoked from network); 11 Dec 2015 12:58:50 -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; 11 Dec 2015 12:58:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mpv-0002Qn-CQ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mpv-0006yQ-8H for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:11 +0000 Date: Fri, 11 Dec 2015 12:30:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 Author: Jan Beulich AuthorDate: Tue Dec 8 14:01:43 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:01:43 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e00a0b2..b6bf543 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -378,7 +378,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -610,11 +610,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:59:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:59: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 1a7NI5-0007YP-4D; Fri, 11 Dec 2015 12:59:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NI3-0007YC-O6 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:59:15 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 4B/FB-32615-2A8CA665; Fri, 11 Dec 2015 12:59:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1449838738!9833366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59601 invoked from network); 11 Dec 2015 12:59:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:59:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mpl-0002Po-3f for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mpk-0006xA-VV for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:01 +0000 Date: Fri, 11 Dec 2015 12:30:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a578b316eb98975374d88f28904acf13dbcfac2 Author: Jan Beulich AuthorDate: Tue Dec 8 14:00:33 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:00:33 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 47d148a..3a10432 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1032,6 +1032,17 @@ with **crashinfo_maxaddr**. Specify the threshold below which Xen will inform dom0 that the quantity of free memory is getting low. Specifying `0` will disable this notification. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index a3bffb7..e00a0b2 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -43,6 +43,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -55,7 +99,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -100,8 +144,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -285,7 +329,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -343,13 +387,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -368,16 +416,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 817c216..1520b41 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 416a5c2..f25d92e 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 12:59:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 12:59: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 1a7NI5-0007YP-4D; Fri, 11 Dec 2015 12:59:17 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NI3-0007YC-O6 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:59:15 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 4B/FB-32615-2A8CA665; Fri, 11 Dec 2015 12:59:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1449838738!9833366!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59601 invoked from network); 11 Dec 2015 12:59:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 12:59:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mpl-0002Po-3f for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mpk-0006xA-VV for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:01 +0000 Date: Fri, 11 Dec 2015 12:30:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a578b316eb98975374d88f28904acf13dbcfac2 Author: Jan Beulich AuthorDate: Tue Dec 8 14:00:33 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:00:33 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 47d148a..3a10432 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1032,6 +1032,17 @@ with **crashinfo_maxaddr**. Specify the threshold below which Xen will inform dom0 that the quantity of free memory is getting low. Specifying `0` will disable this notification. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index a3bffb7..e00a0b2 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -43,6 +43,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -55,7 +99,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -100,8 +144,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -285,7 +329,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -343,13 +387,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -368,16 +416,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 817c216..1520b41 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 416a5c2..f25d92e 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:00:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:00: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 1a7NJ0-0007gC-1A; Fri, 11 Dec 2015 13:00:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NIy-0007ft-8D for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:00:12 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id BA/7B-13905-BD8CA665; Fri, 11 Dec 2015 13:00:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449838790!9851981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2252 invoked from network); 11 Dec 2015 13:00:07 -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; 11 Dec 2015 13:00:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mli-0002MF-3J for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mli-0006fD-2A for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:50 +0000 Date: Fri, 11 Dec 2015 12:25:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use correct return type for do_memory_op() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a27f1fb69d13c800dc438bc93ffdb437962c29fb Author: Juergen Gross AuthorDate: Fri Nov 27 10:00:51 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 1 12:10:11 2015 +0000 libxc: use correct return type for do_memory_op() Currently do_memory_op() is returning int, while the hypervisor is returning long. This will lead to wrong return informations as soon as e.g. a pfn larger than about 2 billion (8 TB) is returned. Use the correct long return type instead and correct the functions expecting a pfn via the return value of do_memory_op(). Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxc/xc_domain.c | 2 +- tools/libxc/xc_private.c | 2 +- tools/libxc/xc_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index e7278dd..83afc75 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -828,7 +828,7 @@ int xc_domain_get_tsc_info(xc_interface *xch, int xc_domain_maximum_gpfn(xc_interface *xch, domid_t domid, xen_pfn_t *gpfns) { - int rc = do_memory_op(xch, XENMEM_maximum_gpfn, &domid, sizeof(domid)); + long rc = do_memory_op(xch, XENMEM_maximum_gpfn, &domid, sizeof(domid)); if ( rc >= 0 ) { diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 7c39897..6c0c0d6 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -519,7 +519,7 @@ int xc_flush_mmu_updates(xc_interface *xch, struct xc_mmu *mmu) return flush_mmu_updates(xch, mmu); } -int do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len) +long do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len) { DECLARE_HYPERCALL; DECLARE_HYPERCALL_BOUNCE(arg, len, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 2df1d59..f603c15 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -374,7 +374,7 @@ static inline int do_multicall_op(xc_interface *xch, return ret; } -int do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len); +long do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len); void *xc_map_foreign_ranges(xc_interface *xch, uint32_t dom, size_t size, int prot, size_t chunksize, -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:00:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:00: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 1a7NJ0-0007gC-1A; Fri, 11 Dec 2015 13:00:14 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NIy-0007ft-8D for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:00:12 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id BA/7B-13905-BD8CA665; Fri, 11 Dec 2015 13:00:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449838790!9851981!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2252 invoked from network); 11 Dec 2015 13:00:07 -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; 11 Dec 2015 13:00:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mli-0002MF-3J for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mli-0006fD-2A for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:50 +0000 Date: Fri, 11 Dec 2015 12:25:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: use correct return type for do_memory_op() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a27f1fb69d13c800dc438bc93ffdb437962c29fb Author: Juergen Gross AuthorDate: Fri Nov 27 10:00:51 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 1 12:10:11 2015 +0000 libxc: use correct return type for do_memory_op() Currently do_memory_op() is returning int, while the hypervisor is returning long. This will lead to wrong return informations as soon as e.g. a pfn larger than about 2 billion (8 TB) is returned. Use the correct long return type instead and correct the functions expecting a pfn via the return value of do_memory_op(). Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxc/xc_domain.c | 2 +- tools/libxc/xc_private.c | 2 +- tools/libxc/xc_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c index e7278dd..83afc75 100644 --- a/tools/libxc/xc_domain.c +++ b/tools/libxc/xc_domain.c @@ -828,7 +828,7 @@ int xc_domain_get_tsc_info(xc_interface *xch, int xc_domain_maximum_gpfn(xc_interface *xch, domid_t domid, xen_pfn_t *gpfns) { - int rc = do_memory_op(xch, XENMEM_maximum_gpfn, &domid, sizeof(domid)); + long rc = do_memory_op(xch, XENMEM_maximum_gpfn, &domid, sizeof(domid)); if ( rc >= 0 ) { diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 7c39897..6c0c0d6 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -519,7 +519,7 @@ int xc_flush_mmu_updates(xc_interface *xch, struct xc_mmu *mmu) return flush_mmu_updates(xch, mmu); } -int do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len) +long do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len) { DECLARE_HYPERCALL; DECLARE_HYPERCALL_BOUNCE(arg, len, XC_HYPERCALL_BUFFER_BOUNCE_BOTH); diff --git a/tools/libxc/xc_private.h b/tools/libxc/xc_private.h index 2df1d59..f603c15 100644 --- a/tools/libxc/xc_private.h +++ b/tools/libxc/xc_private.h @@ -374,7 +374,7 @@ static inline int do_multicall_op(xc_interface *xch, return ret; } -int do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len); +long do_memory_op(xc_interface *xch, int cmd, void *arg, size_t len); void *xc_map_foreign_ranges(xc_interface *xch, uint32_t dom, size_t size, int prot, size_t chunksize, -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:00:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:00:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NJf-0007mh-5z; Fri, 11 Dec 2015 13:00:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NJd-0007lp-5h for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:00:53 +0000 Content-Length: 2571 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 6F/98-16870-409CA665; Fri, 11 Dec 2015 13:00:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449838833!10116855!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47104 invoked from network); 11 Dec 2015 13:00:51 -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; 11 Dec 2015 13:00:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Miq-0002I8-Uo for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Miq-0006Sj-Qg for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:52 +0000 Date: Fri, 11 Dec 2015 12:22:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] HVM/save: allow the usage of zeroextend and a fixup function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2716185675399573866==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2716185675399573866== Content-Length: 2160 Content-Transfer-Encoding: quoted-printable commit 4243baf61acf24d972eb456aea8353481af31100 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 15:51:00 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:51:00 2015 +0100 HVM/save: allow the usage of zeroextend and a fixup function With the current compat implementation in the save/restore context handling, only one compat structure is allowed, and using _zeroextend prevents the fixup function from being called. In order to allow for the compat handling layer to be able to handle different compat versions allow calling the fixup function with hvm_load_entry_zeroextend. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/include/xen/hvm/save.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/include/xen/hvm/save.h b/xen/include/xen/hvm/save.h index 51bc7d5..a9a78f9 100644 --- a/xen/include/xen/hvm/save.h +++ b/xen/include/xen/hvm/save.h @@ -64,7 +64,12 @@ void _hvm_read_entry(struct hvm_domain_context *h, =3D (struct hvm_save_descriptor *)&(_h)->data[(_h)->cur]; \ if ( (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH(_x), (_strict))) =3D=3D 0 ) \ + { \ _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH(_x)); \ + if ( HVM_SAVE_HAS_COMPAT(_x) && \ + desc->length !=3D HVM_SAVE_LENGTH(_x) ) \ + r =3D HVM_SAVE_FIX_COMPAT(_x, (_dst), desc->length); \ + } \ else if (HVM_SAVE_HAS_COMPAT(_x) \ && (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH_COMPAT(_x), (_strict))) =3D=3D 0 ) { \ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2716185675399573866== 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 --===============2716185675399573866==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:00:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:00:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NJf-0007mh-5z; Fri, 11 Dec 2015 13:00:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NJd-0007lp-5h for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:00:53 +0000 Content-Length: 2571 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 6F/98-16870-409CA665; Fri, 11 Dec 2015 13:00:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449838833!10116855!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47104 invoked from network); 11 Dec 2015 13:00:51 -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; 11 Dec 2015 13:00:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Miq-0002I8-Uo for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Miq-0006Sj-Qg for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:52 +0000 Date: Fri, 11 Dec 2015 12:22:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] HVM/save: allow the usage of zeroextend and a fixup function X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2716185675399573866==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2716185675399573866== Content-Length: 2160 Content-Transfer-Encoding: quoted-printable commit 4243baf61acf24d972eb456aea8353481af31100 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 15:51:00 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:51:00 2015 +0100 HVM/save: allow the usage of zeroextend and a fixup function With the current compat implementation in the save/restore context handling, only one compat structure is allowed, and using _zeroextend prevents the fixup function from being called. In order to allow for the compat handling layer to be able to handle different compat versions allow calling the fixup function with hvm_load_entry_zeroextend. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/include/xen/hvm/save.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/xen/include/xen/hvm/save.h b/xen/include/xen/hvm/save.h index 51bc7d5..a9a78f9 100644 --- a/xen/include/xen/hvm/save.h +++ b/xen/include/xen/hvm/save.h @@ -64,7 +64,12 @@ void _hvm_read_entry(struct hvm_domain_context *h, =3D (struct hvm_save_descriptor *)&(_h)->data[(_h)->cur]; \ if ( (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH(_x), (_strict))) =3D=3D 0 ) \ + { \ _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH(_x)); \ + if ( HVM_SAVE_HAS_COMPAT(_x) && \ + desc->length !=3D HVM_SAVE_LENGTH(_x) ) \ + r =3D HVM_SAVE_FIX_COMPAT(_x, (_dst), desc->length); \ + } \ else if (HVM_SAVE_HAS_COMPAT(_x) \ && (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH_COMPAT(_x), (_strict))) =3D=3D 0 ) { \ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2716185675399573866== 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 --===============2716185675399573866==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:01:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:01:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NK9-0007qX-B6; Fri, 11 Dec 2015 13:01:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NK7-0007qA-5K for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:01:23 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id E3/46-30270-229CA665; Fri, 11 Dec 2015 13:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449838873!10117182!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 639 invoked from network); 11 Dec 2015 13:01:20 -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; 11 Dec 2015 13:01:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mjx-0002JV-Oh for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mjx-0006X9-Ju for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:01 +0000 Date: Fri, 11 Dec 2015 12:24:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: properly macroize the two XRSTOR flavors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0d1ff9b9efc3d7539d394427c691afc9b3e49ba Author: Jan Beulich AuthorDate: Mon Nov 30 11:56:20 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:56:20 2015 +0100 x86: properly macroize the two XRSTOR flavors All they differ by is the REX64 prefix. Create a single macro covering both, at once allowing to get rid of the disconnect between the current partial macro and its two use sites. No change in generated code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/xstate.c | 48 +++++++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 262f850..b65da38 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -334,16 +334,6 @@ void xsave(struct vcpu *v, uint64_t mask) ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET] = word_size; } -#define XRSTOR_FIXUP ".section .fixup,\"ax\" \n" \ - "2: mov %[size],%%ecx \n" \ - " xor %[lmask_out],%[lmask_out] \n" \ - " rep stosb \n" \ - " lea %[mem],%[ptr] \n" \ - " mov %[lmask_in],%[lmask_out] \n" \ - " jmp 1b \n" \ - ".previous \n" \ - _ASM_EXTABLE(1b, 2b) - void xrstor(struct vcpu *v, uint64_t mask) { uint32_t hmask = mask >> 32; @@ -372,29 +362,33 @@ void xrstor(struct vcpu *v, uint64_t mask) */ switch ( __builtin_expect(ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET], 8) ) { +#define XRSTOR(pfx) \ + alternative_io("1: .byte " pfx "0x0f,0xae,0x2f\n" \ + " .section .fixup,\"ax\"\n" \ + "2: mov %[size],%%ecx\n" \ + " xor %[lmask_out],%[lmask_out]\n" \ + " rep stosb\n" \ + " lea %[mem],%[ptr]\n" \ + " mov %[lmask_in],%[lmask_out]\n" \ + " jmp 1b\n" \ + " .previous\n" \ + _ASM_EXTABLE(1b, 2b), \ + ".byte " pfx "0x0f,0xc7,0x1f\n", \ + X86_FEATURE_XSAVES, \ + ASM_OUTPUT2([ptr] "+&D" (ptr), [lmask_out] "+&a" (lmask)), \ + [mem] "m" (*ptr), [lmask_in] "g" (lmask), \ + [hmask] "d" (hmask), [size] "m" (xsave_cntxt_size) \ + : "ecx") + default: - alternative_io("1: .byte 0x48,0x0f,0xae,0x2f\n" - XRSTOR_FIXUP, - ".byte 0x48,0x0f,0xc7,0x1f\n", - X86_FEATURE_XSAVES, - ASM_OUTPUT2([ptr] "+&D" (ptr), [lmask_out] "+&a" (lmask)), - [mem] "m" (*ptr), [lmask_in] "g" (lmask), - [hmask] "d" (hmask), [size] "m" (xsave_cntxt_size) - : "ecx"); + XRSTOR("0x48,"); break; case 4: case 2: - alternative_io("1: .byte 0x0f,0xae,0x2f\n" - XRSTOR_FIXUP, - ".byte 0x0f,0xc7,0x1f\n", - X86_FEATURE_XSAVES, - ASM_OUTPUT2([ptr] "+&D" (ptr), [lmask_out] "+&a" (lmask)), - [mem] "m" (*ptr), [lmask_in] "g" (lmask), - [hmask] "d" (hmask), [size] "m" (xsave_cntxt_size) - : "ecx"); + XRSTOR(""); break; +#undef XRSTOR } } -#undef XRSTOR_FIXUP bool_t xsave_enabled(const struct vcpu *v) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:01:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:01:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NK9-0007qX-B6; Fri, 11 Dec 2015 13:01:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NK7-0007qA-5K for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:01:23 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id E3/46-30270-229CA665; Fri, 11 Dec 2015 13:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449838873!10117182!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 639 invoked from network); 11 Dec 2015 13:01:20 -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; 11 Dec 2015 13:01:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mjx-0002JV-Oh for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mjx-0006X9-Ju for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:01 +0000 Date: Fri, 11 Dec 2015 12:24:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: properly macroize the two XRSTOR flavors X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c0d1ff9b9efc3d7539d394427c691afc9b3e49ba Author: Jan Beulich AuthorDate: Mon Nov 30 11:56:20 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:56:20 2015 +0100 x86: properly macroize the two XRSTOR flavors All they differ by is the REX64 prefix. Create a single macro covering both, at once allowing to get rid of the disconnect between the current partial macro and its two use sites. No change in generated code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/xstate.c | 48 +++++++++++++++++++++--------------------------- 1 files changed, 21 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 262f850..b65da38 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -334,16 +334,6 @@ void xsave(struct vcpu *v, uint64_t mask) ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET] = word_size; } -#define XRSTOR_FIXUP ".section .fixup,\"ax\" \n" \ - "2: mov %[size],%%ecx \n" \ - " xor %[lmask_out],%[lmask_out] \n" \ - " rep stosb \n" \ - " lea %[mem],%[ptr] \n" \ - " mov %[lmask_in],%[lmask_out] \n" \ - " jmp 1b \n" \ - ".previous \n" \ - _ASM_EXTABLE(1b, 2b) - void xrstor(struct vcpu *v, uint64_t mask) { uint32_t hmask = mask >> 32; @@ -372,29 +362,33 @@ void xrstor(struct vcpu *v, uint64_t mask) */ switch ( __builtin_expect(ptr->fpu_sse.x[FPU_WORD_SIZE_OFFSET], 8) ) { +#define XRSTOR(pfx) \ + alternative_io("1: .byte " pfx "0x0f,0xae,0x2f\n" \ + " .section .fixup,\"ax\"\n" \ + "2: mov %[size],%%ecx\n" \ + " xor %[lmask_out],%[lmask_out]\n" \ + " rep stosb\n" \ + " lea %[mem],%[ptr]\n" \ + " mov %[lmask_in],%[lmask_out]\n" \ + " jmp 1b\n" \ + " .previous\n" \ + _ASM_EXTABLE(1b, 2b), \ + ".byte " pfx "0x0f,0xc7,0x1f\n", \ + X86_FEATURE_XSAVES, \ + ASM_OUTPUT2([ptr] "+&D" (ptr), [lmask_out] "+&a" (lmask)), \ + [mem] "m" (*ptr), [lmask_in] "g" (lmask), \ + [hmask] "d" (hmask), [size] "m" (xsave_cntxt_size) \ + : "ecx") + default: - alternative_io("1: .byte 0x48,0x0f,0xae,0x2f\n" - XRSTOR_FIXUP, - ".byte 0x48,0x0f,0xc7,0x1f\n", - X86_FEATURE_XSAVES, - ASM_OUTPUT2([ptr] "+&D" (ptr), [lmask_out] "+&a" (lmask)), - [mem] "m" (*ptr), [lmask_in] "g" (lmask), - [hmask] "d" (hmask), [size] "m" (xsave_cntxt_size) - : "ecx"); + XRSTOR("0x48,"); break; case 4: case 2: - alternative_io("1: .byte 0x0f,0xae,0x2f\n" - XRSTOR_FIXUP, - ".byte 0x0f,0xc7,0x1f\n", - X86_FEATURE_XSAVES, - ASM_OUTPUT2([ptr] "+&D" (ptr), [lmask_out] "+&a" (lmask)), - [mem] "m" (*ptr), [lmask_in] "g" (lmask), - [hmask] "d" (hmask), [size] "m" (xsave_cntxt_size) - : "ecx"); + XRSTOR(""); break; +#undef XRSTOR } } -#undef XRSTOR_FIXUP bool_t xsave_enabled(const struct vcpu *v) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:01:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:01:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKc-000813-GW; Fri, 11 Dec 2015 13:01:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKa-0007zQ-Lr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:01:52 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id AA/1C-16870-049CA665; Fri, 11 Dec 2015 13:01:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1449838889!10145754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44511 invoked from network); 11 Dec 2015 13:01:41 -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; 11 Dec 2015 13:01:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MkL-0002Jd-RD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MkL-0006Y9-P5 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:25 +0000 Date: Fri, 11 Dec 2015 12:24:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __cpuinitdata annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db62aaa1b9658031a5a6b3ecf67237275041d3c2 Author: Andrew Cooper AuthorDate: Mon Nov 30 11:57:34 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:57:34 2015 +0100 drop empty __cpuinitdata annotation Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 4 ++-- xen/arch/x86/cpu/intel_cacheinfo.c | 2 +- xen/arch/x86/numa.c | 2 +- xen/arch/x86/x86_64/mmconf-fam10h.c | 4 ++-- xen/include/xen/config.h | 1 - 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 74a0152..3ebcc86 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -332,7 +332,7 @@ static void disable_c1_ramping(void) } } -int force_mwait __cpuinitdata; +int force_mwait; static void disable_c1e(void *unused) { diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 6b320a7..16608b1 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -16,7 +16,7 @@ #include "cpu.h" -static bool_t __cpuinitdata use_xsave = 1; +static bool_t use_xsave = 1; boolean_param("xsave", use_xsave); bool_t __devinitdata opt_arat = 1; @@ -45,7 +45,7 @@ unsigned int paddr_bits __read_mostly = 36; */ u64 host_pat = 0x050100070406; -static unsigned int __cpuinitdata cleared_caps[NCAPINTS]; +static unsigned int cleared_caps[NCAPINTS]; void __init setup_clear_cpu_cap(unsigned int cap) { diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c index 48970c0..980aa59 100644 --- a/xen/arch/x86/cpu/intel_cacheinfo.c +++ b/xen/arch/x86/cpu/intel_cacheinfo.c @@ -27,7 +27,7 @@ struct _cache_table }; /* all the cache descriptor types we care about (no TLB or trace cache entries) */ -static struct _cache_table cache_table[] __cpuinitdata = +static struct _cache_table cache_table[] = { { 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */ { 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 7e492d4..6a8880f 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -42,7 +42,7 @@ nodeid_t cpu_to_node[NR_CPUS] __read_mostly = { /* * Keep BIOS's CPU2node information, should not be used for memory allocaion */ -nodeid_t apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { +nodeid_t apicid_to_node[MAX_LOCAL_APIC] = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index 65260f6..8bdd39e 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -23,9 +23,9 @@ struct pci_hostbridge_probe { u32 device; }; -static u64 __cpuinitdata fam10h_pci_mmconf_base; +static u64 fam10h_pci_mmconf_base; -static struct pci_hostbridge_probe pci_probes[] __cpuinitdata = { +static struct pci_hostbridge_probe pci_probes[] = { { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 }, { 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 }, }; diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 450be86..89a590e 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -84,7 +84,6 @@ #define mk_unsigned_long(x) x #endif /* !__ASSEMBLY__ */ -#define __cpuinitdata #define __cpuinit #ifdef FLASK_ENABLE -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:01:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:01:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKc-000813-GW; Fri, 11 Dec 2015 13:01:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKa-0007zQ-Lr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:01:52 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id AA/1C-16870-049CA665; Fri, 11 Dec 2015 13:01:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1449838889!10145754!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44511 invoked from network); 11 Dec 2015 13:01:41 -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; 11 Dec 2015 13:01:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MkL-0002Jd-RD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MkL-0006Y9-P5 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:25 +0000 Date: Fri, 11 Dec 2015 12:24:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __cpuinitdata annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit db62aaa1b9658031a5a6b3ecf67237275041d3c2 Author: Andrew Cooper AuthorDate: Mon Nov 30 11:57:34 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:57:34 2015 +0100 drop empty __cpuinitdata annotation Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/amd.c | 2 +- xen/arch/x86/cpu/common.c | 4 ++-- xen/arch/x86/cpu/intel_cacheinfo.c | 2 +- xen/arch/x86/numa.c | 2 +- xen/arch/x86/x86_64/mmconf-fam10h.c | 4 ++-- xen/include/xen/config.h | 1 - 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 74a0152..3ebcc86 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -332,7 +332,7 @@ static void disable_c1_ramping(void) } } -int force_mwait __cpuinitdata; +int force_mwait; static void disable_c1e(void *unused) { diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 6b320a7..16608b1 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -16,7 +16,7 @@ #include "cpu.h" -static bool_t __cpuinitdata use_xsave = 1; +static bool_t use_xsave = 1; boolean_param("xsave", use_xsave); bool_t __devinitdata opt_arat = 1; @@ -45,7 +45,7 @@ unsigned int paddr_bits __read_mostly = 36; */ u64 host_pat = 0x050100070406; -static unsigned int __cpuinitdata cleared_caps[NCAPINTS]; +static unsigned int cleared_caps[NCAPINTS]; void __init setup_clear_cpu_cap(unsigned int cap) { diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c index 48970c0..980aa59 100644 --- a/xen/arch/x86/cpu/intel_cacheinfo.c +++ b/xen/arch/x86/cpu/intel_cacheinfo.c @@ -27,7 +27,7 @@ struct _cache_table }; /* all the cache descriptor types we care about (no TLB or trace cache entries) */ -static struct _cache_table cache_table[] __cpuinitdata = +static struct _cache_table cache_table[] = { { 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */ { 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 7e492d4..6a8880f 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -42,7 +42,7 @@ nodeid_t cpu_to_node[NR_CPUS] __read_mostly = { /* * Keep BIOS's CPU2node information, should not be used for memory allocaion */ -nodeid_t apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { +nodeid_t apicid_to_node[MAX_LOCAL_APIC] = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index 65260f6..8bdd39e 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -23,9 +23,9 @@ struct pci_hostbridge_probe { u32 device; }; -static u64 __cpuinitdata fam10h_pci_mmconf_base; +static u64 fam10h_pci_mmconf_base; -static struct pci_hostbridge_probe pci_probes[] __cpuinitdata = { +static struct pci_hostbridge_probe pci_probes[] = { { 0, 0x18, PCI_VENDOR_ID_AMD, 0x1200 }, { 0xff, 0, PCI_VENDOR_ID_AMD, 0x1200 }, }; diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 450be86..89a590e 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -84,7 +84,6 @@ #define mk_unsigned_long(x) x #endif /* !__ASSEMBLY__ */ -#define __cpuinitdata #define __cpuinit #ifdef FLASK_ENABLE -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:02:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02: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 1a7NKo-00088Q-Kb; Fri, 11 Dec 2015 13:02:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKm-00088A-IM for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:04 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id D7/93-12831-B49CA665; Fri, 11 Dec 2015 13:02:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449838918!10100564!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47647 invoked from network); 11 Dec 2015 13:02:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:02:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MmN-0002My-62 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MmN-0006i0-1v for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:31 +0000 Date: Fri, 11 Dec 2015 12:26:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vmx: enable PML by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 484c14b7254e8d8936c05e3c28e332ea825c0155 Author: Kai Huang AuthorDate: Wed Dec 2 15:20:19 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:20:19 2015 +0100 x86/vmx: enable PML by default Since PML series were merged (but disabled by default) we have conducted lots of PML tests (live migration, GUI display) and PML has been working fine, therefore turn it on by default. Document of PML command line is adjusted accordingly as well. Signed-off-by: Kai Huang Tested-by: Robert Hu Tested-by: Xudong Hao Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper Acked-by: Kevin Tian --- docs/misc/xen-command-line.markdown | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index c103894..47d148a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -715,7 +715,7 @@ Controls EPT related features. > `pml` -> Default: `false` +> Default: `true` >> PML is a new hardware feature in Intel's Broadwell Server and further >> platforms which reduces hypervisor overhead of log-dirty mechanism by diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 7a7896e..dbf284d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -64,7 +64,7 @@ integer_param("ple_gap", ple_gap); static unsigned int __read_mostly ple_window = 4096; integer_param("ple_window", ple_window); -static bool_t __read_mostly opt_pml_enabled = 0; +static bool_t __read_mostly opt_pml_enabled = 1; static s8 __read_mostly opt_ept_ad = -1; /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:02:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02: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 1a7NKo-00088Q-Kb; Fri, 11 Dec 2015 13:02:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKm-00088A-IM for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:04 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id D7/93-12831-B49CA665; Fri, 11 Dec 2015 13:02:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449838918!10100564!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47647 invoked from network); 11 Dec 2015 13:02:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:02:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MmN-0002My-62 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MmN-0006i0-1v for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:31 +0000 Date: Fri, 11 Dec 2015 12:26:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vmx: enable PML by default X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 484c14b7254e8d8936c05e3c28e332ea825c0155 Author: Kai Huang AuthorDate: Wed Dec 2 15:20:19 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:20:19 2015 +0100 x86/vmx: enable PML by default Since PML series were merged (but disabled by default) we have conducted lots of PML tests (live migration, GUI display) and PML has been working fine, therefore turn it on by default. Document of PML command line is adjusted accordingly as well. Signed-off-by: Kai Huang Tested-by: Robert Hu Tested-by: Xudong Hao Reviewed-by: Andrew Cooper Tested-by: Andrew Cooper Acked-by: Kevin Tian --- docs/misc/xen-command-line.markdown | 2 +- xen/arch/x86/hvm/vmx/vmcs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index c103894..47d148a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -715,7 +715,7 @@ Controls EPT related features. > `pml` -> Default: `false` +> Default: `true` >> PML is a new hardware feature in Intel's Broadwell Server and further >> platforms which reduces hypervisor overhead of log-dirty mechanism by diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 7a7896e..dbf284d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -64,7 +64,7 @@ integer_param("ple_gap", ple_gap); static unsigned int __read_mostly ple_window = 4096; integer_param("ple_window", ple_window); -static bool_t __read_mostly opt_pml_enabled = 0; +static bool_t __read_mostly opt_pml_enabled = 1; static s8 __read_mostly opt_ept_ad = -1; /* -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:02:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKr-00089E-O5; Fri, 11 Dec 2015 13:02:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKp-00088s-TE for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:08 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 9C/D2-31450-F49CA665; Fri, 11 Dec 2015 13:02:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449838924!10120900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28823 invoked from network); 11 Dec 2015 13:02:05 -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 2015 13:02:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mj1-0002If-Gw for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mj1-0006TK-4W for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:03 +0000 Date: Fri, 11 Dec 2015 12:23:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: suppress bogus 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 commit 0ce647ad6f70c5ec0aeee66ce74429982b81911a Author: Jan Beulich AuthorDate: Thu Nov 26 15:51:49 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:51:49 2015 +0100 x86: suppress bogus log message The way we populate mpc_cpufeature is not compatible with modern CPUs, and hence the message printed using that information is useless/bogus. It's of interest only anyway when not using ACPI, so move it into MPS parsing code. This at once significantly reduces boot time logging on huge systems. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mpparse.c | 51 ++++++++++++++------------ xen/include/asm-x86/mach-generic/mach_apic.h | 10 ----- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index dc74e37..dc2b251 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -125,9 +125,9 @@ static int __init mpf_checksum(unsigned char *mp, int len) /* Return xen's logical cpu_id of the new added cpu or <0 if error */ static int __devinit MP_processor_info_x(struct mpc_config_processor *m, - u32 apicidx, bool_t hotplug) + u32 apicid, bool_t hotplug) { - int ver, apicid, cpu = 0; + int ver, cpu = 0; if (!(m->mpc_cpuflag & CPU_ENABLED)) { if (!hotplug) @@ -135,8 +135,6 @@ static int __devinit MP_processor_info_x(struct mpc_config_processor *m, return -EINVAL; } - apicid = mpc_apic_id(m, apicidx); - if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { Dprintk(" Bootup CPU\n"); boot_cpu_physical_apicid = apicid; @@ -340,11 +338,24 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) { struct mpc_config_processor *m= (struct mpc_config_processor *)mpt; - /* ACPI may have already provided this data */ - if (!acpi_lapic) - MP_processor_info(m); + mpt += sizeof(*m); count += sizeof(*m); + + /* ACPI may have already provided this data. */ + if (acpi_lapic) + break; + + printk("Processor #%02x %u:%u APIC version %u%s\n", + m->mpc_apicid, + MASK_EXTR(m->mpc_cpufeature, + CPU_FAMILY_MASK), + MASK_EXTR(m->mpc_cpufeature, + CPU_MODEL_MASK), + m->mpc_apicver, + m->mpc_cpuflag & CPU_ENABLED + ? "" : " [disabled]"); + MP_processor_info(m); break; } case MP_BUS: @@ -781,8 +792,15 @@ int __devinit mp_register_lapic ( bool_t enabled, bool_t hotplug) { - struct mpc_config_processor processor; - int boot_cpu = 0; + struct mpc_config_processor processor = { + .mpc_type = MP_PROCESSOR, + /* Note: We don't fill in fields not consumed anywhere. */ + .mpc_apicid = id, + .mpc_apicver = GET_APIC_VERSION(apic_read(APIC_LVR)), + .mpc_cpuflag = (enabled ? CPU_ENABLED : 0) | + (id == boot_cpu_physical_apicid ? + CPU_BOOTPROCESSOR : 0), + }; if (MAX_APICS <= id) { printk(KERN_WARNING "Processor #%d invalid (max %d)\n", @@ -790,21 +808,6 @@ int __devinit mp_register_lapic ( return -EINVAL; } - if (id == boot_cpu_physical_apicid) - boot_cpu = 1; - - processor.mpc_type = MP_PROCESSOR; - processor.mpc_apicid = id; - processor.mpc_apicver = GET_APIC_VERSION(apic_read(APIC_LVR)); - processor.mpc_cpuflag = (enabled ? CPU_ENABLED : 0); - processor.mpc_cpuflag |= (boot_cpu ? CPU_BOOTPROCESSOR : 0); - processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) | - (boot_cpu_data.x86_model << 4) | boot_cpu_data.x86_mask; - processor.mpc_featureflag - = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_FPU)]; - processor.mpc_reserved[0] = 0; - processor.mpc_reserved[1] = 0; - return MP_processor_info_x(&processor, id, hotplug); } diff --git a/xen/include/asm-x86/mach-generic/mach_apic.h b/xen/include/asm-x86/mach-generic/mach_apic.h index ef76456..03e9e8a 100644 --- a/xen/include/asm-x86/mach-generic/mach_apic.h +++ b/xen/include/asm-x86/mach-generic/mach_apic.h @@ -28,16 +28,6 @@ static inline void enable_apic_mode(void) extern u32 bios_cpu_apicid[]; -static inline int mpc_apic_id(struct mpc_config_processor *m, u32 apicid) -{ - printk("Processor #%d %d:%d APIC version %d\n", - apicid, - (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8, - (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, - m->mpc_apicver); - return apicid; -} - static inline int multi_timer_check(int apic, int irq) { return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:02:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKr-00089E-O5; Fri, 11 Dec 2015 13:02:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKp-00088s-TE for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:08 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 9C/D2-31450-F49CA665; Fri, 11 Dec 2015 13:02:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449838924!10120900!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28823 invoked from network); 11 Dec 2015 13:02:05 -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 2015 13:02:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mj1-0002If-Gw for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mj1-0006TK-4W for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:03 +0000 Date: Fri, 11 Dec 2015 12:23:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: suppress bogus 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 commit 0ce647ad6f70c5ec0aeee66ce74429982b81911a Author: Jan Beulich AuthorDate: Thu Nov 26 15:51:49 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:51:49 2015 +0100 x86: suppress bogus log message The way we populate mpc_cpufeature is not compatible with modern CPUs, and hence the message printed using that information is useless/bogus. It's of interest only anyway when not using ACPI, so move it into MPS parsing code. This at once significantly reduces boot time logging on huge systems. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mpparse.c | 51 ++++++++++++++------------ xen/include/asm-x86/mach-generic/mach_apic.h | 10 ----- 2 files changed, 27 insertions(+), 34 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index dc74e37..dc2b251 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -125,9 +125,9 @@ static int __init mpf_checksum(unsigned char *mp, int len) /* Return xen's logical cpu_id of the new added cpu or <0 if error */ static int __devinit MP_processor_info_x(struct mpc_config_processor *m, - u32 apicidx, bool_t hotplug) + u32 apicid, bool_t hotplug) { - int ver, apicid, cpu = 0; + int ver, cpu = 0; if (!(m->mpc_cpuflag & CPU_ENABLED)) { if (!hotplug) @@ -135,8 +135,6 @@ static int __devinit MP_processor_info_x(struct mpc_config_processor *m, return -EINVAL; } - apicid = mpc_apic_id(m, apicidx); - if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) { Dprintk(" Bootup CPU\n"); boot_cpu_physical_apicid = apicid; @@ -340,11 +338,24 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) { struct mpc_config_processor *m= (struct mpc_config_processor *)mpt; - /* ACPI may have already provided this data */ - if (!acpi_lapic) - MP_processor_info(m); + mpt += sizeof(*m); count += sizeof(*m); + + /* ACPI may have already provided this data. */ + if (acpi_lapic) + break; + + printk("Processor #%02x %u:%u APIC version %u%s\n", + m->mpc_apicid, + MASK_EXTR(m->mpc_cpufeature, + CPU_FAMILY_MASK), + MASK_EXTR(m->mpc_cpufeature, + CPU_MODEL_MASK), + m->mpc_apicver, + m->mpc_cpuflag & CPU_ENABLED + ? "" : " [disabled]"); + MP_processor_info(m); break; } case MP_BUS: @@ -781,8 +792,15 @@ int __devinit mp_register_lapic ( bool_t enabled, bool_t hotplug) { - struct mpc_config_processor processor; - int boot_cpu = 0; + struct mpc_config_processor processor = { + .mpc_type = MP_PROCESSOR, + /* Note: We don't fill in fields not consumed anywhere. */ + .mpc_apicid = id, + .mpc_apicver = GET_APIC_VERSION(apic_read(APIC_LVR)), + .mpc_cpuflag = (enabled ? CPU_ENABLED : 0) | + (id == boot_cpu_physical_apicid ? + CPU_BOOTPROCESSOR : 0), + }; if (MAX_APICS <= id) { printk(KERN_WARNING "Processor #%d invalid (max %d)\n", @@ -790,21 +808,6 @@ int __devinit mp_register_lapic ( return -EINVAL; } - if (id == boot_cpu_physical_apicid) - boot_cpu = 1; - - processor.mpc_type = MP_PROCESSOR; - processor.mpc_apicid = id; - processor.mpc_apicver = GET_APIC_VERSION(apic_read(APIC_LVR)); - processor.mpc_cpuflag = (enabled ? CPU_ENABLED : 0); - processor.mpc_cpuflag |= (boot_cpu ? CPU_BOOTPROCESSOR : 0); - processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) | - (boot_cpu_data.x86_model << 4) | boot_cpu_data.x86_mask; - processor.mpc_featureflag - = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_FPU)]; - processor.mpc_reserved[0] = 0; - processor.mpc_reserved[1] = 0; - return MP_processor_info_x(&processor, id, hotplug); } diff --git a/xen/include/asm-x86/mach-generic/mach_apic.h b/xen/include/asm-x86/mach-generic/mach_apic.h index ef76456..03e9e8a 100644 --- a/xen/include/asm-x86/mach-generic/mach_apic.h +++ b/xen/include/asm-x86/mach-generic/mach_apic.h @@ -28,16 +28,6 @@ static inline void enable_apic_mode(void) extern u32 bios_cpu_apicid[]; -static inline int mpc_apic_id(struct mpc_config_processor *m, u32 apicid) -{ - printk("Processor #%d %d:%d APIC version %d\n", - apicid, - (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8, - (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4, - m->mpc_apicver); - return apicid; -} - static inline int multi_timer_check(int apic, int irq) { return 0; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:02:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKy-0008BG-Vk; Fri, 11 Dec 2015 13:02:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKx-0008Ar-Vk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:16 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id D2/1E-06091-759CA665; Fri, 11 Dec 2015 13:02:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449838931!10100668!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50485 invoked from network); 11 Dec 2015 13:02:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:02:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mmh-0002N6-Ov for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mmh-0006iy-Mr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:51 +0000 Date: Fri, 11 Dec 2015 12:26:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: don't reuse ports that are still "busy" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78e24c269b0a4a8b864ece725e6d4209ed95dfa7 Author: David Vrabel AuthorDate: Wed Dec 2 15:21:46 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:21:46 2015 +0100 evtchn: don't reuse ports that are still "busy" When using the FIFO ABI a guest may close an event channel that is still LINKED. If this port is reused, subsequent events may be lost because they may become pending on the wrong queue. This could be fixed by requiring guests to only close event channels that are not linked. This is difficult since: a) irq cleanup in the guest may be done in a context that cannot wait for the event to be unlinked; b) the guest may attempt to rebind a PIRQ whose previous close is still pending; and c) existing guests already have the problematic behaviour. Instead, simply check a port is not "busy" (i.e., it's not linked) before reusing it. Guests should still drain any queues for VCPUs that are being offlined, or the port will become unusable until the VCPU is onlined and starts processing events again. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_channel.c | 3 ++- xen/common/event_fifo.c | 12 ++++++++++++ xen/include/xen/event.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 5a529a6..638dc5e 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -170,7 +170,8 @@ static int get_free_port(struct domain *d) { if ( port > d->max_evtchn_port ) return -ENOSPC; - if ( evtchn_from_port(d, port)->state == ECS_FREE ) + if ( evtchn_from_port(d, port)->state == ECS_FREE + && !evtchn_port_is_busy(d, port) ) return port; } diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index c9b7884..79c36ff 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -312,6 +312,17 @@ static bool_t evtchn_fifo_is_masked(struct domain *d, return test_bit(EVTCHN_FIFO_MASKED, word); } +static bool_t evtchn_fifo_is_busy(struct domain *d, evtchn_port_t port) +{ + event_word_t *word; + + word = evtchn_fifo_word_from_port(d, port); + if ( unlikely(!word) ) + return 0; + + return test_bit(EVTCHN_FIFO_LINKED, word); +} + static int evtchn_fifo_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) { @@ -351,6 +362,7 @@ static const struct evtchn_port_ops evtchn_port_ops_fifo = .unmask = evtchn_fifo_unmask, .is_pending = evtchn_fifo_is_pending, .is_masked = evtchn_fifo_is_masked, + .is_busy = evtchn_fifo_is_busy, .set_priority = evtchn_fifo_set_priority, .print_state = evtchn_fifo_print_state, }; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index b87924a..5008c80 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -139,6 +139,11 @@ struct evtchn_port_ops { void (*unmask)(struct domain *d, struct evtchn *evtchn); bool_t (*is_pending)(struct domain *d, const struct evtchn *evtchn); bool_t (*is_masked)(struct domain *d, const struct evtchn *evtchn); + /* + * Is the port unavailable because it's still being cleaned up + * after being closed? + */ + bool_t (*is_busy)(struct domain *d, evtchn_port_t port); int (*set_priority)(struct domain *d, struct evtchn *evtchn, unsigned int priority); void (*print_state)(struct domain *d, const struct evtchn *evtchn); @@ -181,6 +186,13 @@ static inline bool_t evtchn_port_is_masked(struct domain *d, return d->evtchn_port_ops->is_masked(d, evtchn); } +static inline bool_t evtchn_port_is_busy(struct domain *d, evtchn_port_t port) +{ + if ( d->evtchn_port_ops->is_busy ) + return d->evtchn_port_ops->is_busy(d, port); + return 0; +} + static inline int evtchn_port_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:02:17 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKy-0008BG-Vk; Fri, 11 Dec 2015 13:02:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NKx-0008Ar-Vk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:16 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id D2/1E-06091-759CA665; Fri, 11 Dec 2015 13:02:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449838931!10100668!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50485 invoked from network); 11 Dec 2015 13:02:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:02:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mmh-0002N6-Ov for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mmh-0006iy-Mr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:51 +0000 Date: Fri, 11 Dec 2015 12:26:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] evtchn: don't reuse ports that are still "busy" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78e24c269b0a4a8b864ece725e6d4209ed95dfa7 Author: David Vrabel AuthorDate: Wed Dec 2 15:21:46 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:21:46 2015 +0100 evtchn: don't reuse ports that are still "busy" When using the FIFO ABI a guest may close an event channel that is still LINKED. If this port is reused, subsequent events may be lost because they may become pending on the wrong queue. This could be fixed by requiring guests to only close event channels that are not linked. This is difficult since: a) irq cleanup in the guest may be done in a context that cannot wait for the event to be unlinked; b) the guest may attempt to rebind a PIRQ whose previous close is still pending; and c) existing guests already have the problematic behaviour. Instead, simply check a port is not "busy" (i.e., it's not linked) before reusing it. Guests should still drain any queues for VCPUs that are being offlined, or the port will become unusable until the VCPU is onlined and starts processing events again. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich --- xen/common/event_channel.c | 3 ++- xen/common/event_fifo.c | 12 ++++++++++++ xen/include/xen/event.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 5a529a6..638dc5e 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -170,7 +170,8 @@ static int get_free_port(struct domain *d) { if ( port > d->max_evtchn_port ) return -ENOSPC; - if ( evtchn_from_port(d, port)->state == ECS_FREE ) + if ( evtchn_from_port(d, port)->state == ECS_FREE + && !evtchn_port_is_busy(d, port) ) return port; } diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index c9b7884..79c36ff 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -312,6 +312,17 @@ static bool_t evtchn_fifo_is_masked(struct domain *d, return test_bit(EVTCHN_FIFO_MASKED, word); } +static bool_t evtchn_fifo_is_busy(struct domain *d, evtchn_port_t port) +{ + event_word_t *word; + + word = evtchn_fifo_word_from_port(d, port); + if ( unlikely(!word) ) + return 0; + + return test_bit(EVTCHN_FIFO_LINKED, word); +} + static int evtchn_fifo_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) { @@ -351,6 +362,7 @@ static const struct evtchn_port_ops evtchn_port_ops_fifo = .unmask = evtchn_fifo_unmask, .is_pending = evtchn_fifo_is_pending, .is_masked = evtchn_fifo_is_masked, + .is_busy = evtchn_fifo_is_busy, .set_priority = evtchn_fifo_set_priority, .print_state = evtchn_fifo_print_state, }; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index b87924a..5008c80 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -139,6 +139,11 @@ struct evtchn_port_ops { void (*unmask)(struct domain *d, struct evtchn *evtchn); bool_t (*is_pending)(struct domain *d, const struct evtchn *evtchn); bool_t (*is_masked)(struct domain *d, const struct evtchn *evtchn); + /* + * Is the port unavailable because it's still being cleaned up + * after being closed? + */ + bool_t (*is_busy)(struct domain *d, evtchn_port_t port); int (*set_priority)(struct domain *d, struct evtchn *evtchn, unsigned int priority); void (*print_state)(struct domain *d, const struct evtchn *evtchn); @@ -181,6 +186,13 @@ static inline bool_t evtchn_port_is_masked(struct domain *d, return d->evtchn_port_ops->is_masked(d, evtchn); } +static inline bool_t evtchn_port_is_busy(struct domain *d, evtchn_port_t port) +{ + if ( d->evtchn_port_ops->is_busy ) + return d->evtchn_port_ops->is_busy(d, port); + return 0; +} + static inline int evtchn_port_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:02:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02: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 1a7NLC-0008DT-3U; Fri, 11 Dec 2015 13:02:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NLA-0008DB-HK for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:28 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id B9/E4-12831-369CA665; Fri, 11 Dec 2015 13:02:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1449838937!9829958!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56009 invoked from network); 11 Dec 2015 13:02:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:02:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MqG-0002Qv-Mk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MqF-00070b-Tk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:32 +0000 Date: Fri, 11 Dec 2015 12:30:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce a template for devices with a controller X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95f2101a81747df03e3da6fd5a03b86474261564 Author: George Dunlap AuthorDate: Tue Dec 1 12:09:58 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 8 16:51:42 2015 +0000 libxl: Introduce a template for devices with a controller We have several outstanding patch series which add devices that have two levels: a controller and individual devices attached to that controller. In the interest of consistency, this patch introduces a section that sketches out a template for interfaces for such devices. Signed-off-by: George Dunlap Acked-by: Juergen Gross Acked-by: Olaf Hering Acked-by: Chun Yan Liu Acked-by: Ian Campbell --- tools/libxl/libxl.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 6b73848..981cb84 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1396,6 +1396,71 @@ void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); * * This function does not interact with the guest and therefore * cannot block on the guest. + * + * Controllers + * ----------- + * + * Most devices are treated individually. Some classes of device, + * however, like USB or SCSI, inherently have the need to have a + * hierarchy of different levels, with lower-level devices "attached" + * to higher-level ones. USB for instance has "controllers" at the + * top, which have buses, on which are devices, which consist of + * multiple interfaces. SCSI has "hosts" at the top, then buses, + * targets, and LUNs. + * + * In that case, for each , there will be a set of functions + * and types for each . For example, for =usb, there + * may be ctrl (controller) and dev (device), with ctrl being + * level 0. + * + * libxl_device__ will act more or + * less like top-level non-bus devices: they will either create or + * accept a libxl_devid which will be unique within the + * libxl_devid namespace. + * + * Lower-level devices must have a unique way to be identified. One + * way to do this would be to name it via the name of the next level + * up plus an index; for instance, . Another + * way would be to have another devid namespace for that level. This + * identifier will be used for queries and removals. + * + * Lower-level devices will include in their + * libxl_device_ struct a field referring to the unique + * index of the level above. For instance, libxl_device_usbdev might + * contain the controller devid. + * + * In the case where there are multiple different ways to implement a + * given device -- for instance, one which is fully PV and one which + * uses an emulator -- the controller will contain a field which + * specifies what type of implementation is used. The implementations + * of individual devices will be known by the controller to which they + * are attached. + * + * If libxl_device__add receives an empty reference to + * the level above, it may return an error. Or it may (but is not + * required to) automatically choose a suitable device in the level + * above to which to attach the new device at this level. It may also + * (but is not required to) automatically create a new device at the + * level above if no suitable devices exist. Each class should + * document its behavior. + * + * libxl_device__list will list all devices of + * at in the domain. For example, libxl_device_usbctrl_list + * will list all usb controllers; libxl_class_usbdev_list will list + * all usb devices across all controllers. + * + * For each class, the domain config file will contain a single list + * for each level. libxl will first iterate through the list of + * top-level devices, then iterate through each level down in turn, + * adding devices to devices in the level above. For instance, there + * will be one list for all usb controllers, and one list for all usb + * devices. + * + * If libxl_device__add automatically creates + * higher-level devices as necessary, then it is permissible for the + * higher-level lists to be empty and the device list to have devices + * with the field containing a reference to the higher level device + * uninitialized. */ /* Disks */ -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:02:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:02: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 1a7NLC-0008DT-3U; Fri, 11 Dec 2015 13:02:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NLA-0008DB-HK for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:02:28 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id B9/E4-12831-369CA665; Fri, 11 Dec 2015 13:02:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1449838937!9829958!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56009 invoked from network); 11 Dec 2015 13:02:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:02:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MqG-0002Qv-Mk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MqF-00070b-Tk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:32 +0000 Date: Fri, 11 Dec 2015 12:30:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Introduce a template for devices with a controller X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95f2101a81747df03e3da6fd5a03b86474261564 Author: George Dunlap AuthorDate: Tue Dec 1 12:09:58 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 8 16:51:42 2015 +0000 libxl: Introduce a template for devices with a controller We have several outstanding patch series which add devices that have two levels: a controller and individual devices attached to that controller. In the interest of consistency, this patch introduces a section that sketches out a template for interfaces for such devices. Signed-off-by: George Dunlap Acked-by: Juergen Gross Acked-by: Olaf Hering Acked-by: Chun Yan Liu Acked-by: Ian Campbell --- tools/libxl/libxl.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 65 insertions(+), 0 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 6b73848..981cb84 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1396,6 +1396,71 @@ void libxl_vtpminfo_list_free(libxl_vtpminfo *, int nr_vtpms); * * This function does not interact with the guest and therefore * cannot block on the guest. + * + * Controllers + * ----------- + * + * Most devices are treated individually. Some classes of device, + * however, like USB or SCSI, inherently have the need to have a + * hierarchy of different levels, with lower-level devices "attached" + * to higher-level ones. USB for instance has "controllers" at the + * top, which have buses, on which are devices, which consist of + * multiple interfaces. SCSI has "hosts" at the top, then buses, + * targets, and LUNs. + * + * In that case, for each , there will be a set of functions + * and types for each . For example, for =usb, there + * may be ctrl (controller) and dev (device), with ctrl being + * level 0. + * + * libxl_device__ will act more or + * less like top-level non-bus devices: they will either create or + * accept a libxl_devid which will be unique within the + * libxl_devid namespace. + * + * Lower-level devices must have a unique way to be identified. One + * way to do this would be to name it via the name of the next level + * up plus an index; for instance, . Another + * way would be to have another devid namespace for that level. This + * identifier will be used for queries and removals. + * + * Lower-level devices will include in their + * libxl_device_ struct a field referring to the unique + * index of the level above. For instance, libxl_device_usbdev might + * contain the controller devid. + * + * In the case where there are multiple different ways to implement a + * given device -- for instance, one which is fully PV and one which + * uses an emulator -- the controller will contain a field which + * specifies what type of implementation is used. The implementations + * of individual devices will be known by the controller to which they + * are attached. + * + * If libxl_device__add receives an empty reference to + * the level above, it may return an error. Or it may (but is not + * required to) automatically choose a suitable device in the level + * above to which to attach the new device at this level. It may also + * (but is not required to) automatically create a new device at the + * level above if no suitable devices exist. Each class should + * document its behavior. + * + * libxl_device__list will list all devices of + * at in the domain. For example, libxl_device_usbctrl_list + * will list all usb controllers; libxl_class_usbdev_list will list + * all usb devices across all controllers. + * + * For each class, the domain config file will contain a single list + * for each level. libxl will first iterate through the list of + * top-level devices, then iterate through each level down in turn, + * adding devices to devices in the level above. For instance, there + * will be one list for all usb controllers, and one list for all usb + * devices. + * + * If libxl_device__add automatically creates + * higher-level devices as necessary, then it is permissible for the + * higher-level lists to be empty and the device list to have devices + * with the field containing a reference to the higher level device + * uninitialized. */ /* Disks */ -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhU-0000mW-Od; Fri, 11 Dec 2015 13:25:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhS-0000mG-Lr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:30 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A3/F2-12831-9CECA665; Fri, 11 Dec 2015 13:25:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1449840327!10124057!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37717 invoked from network); 11 Dec 2015 13:25:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MlN-0002M7-KN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MlN-0006do-FF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:29 +0000 Date: Fri, 11 Dec 2015 12:25:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: implement libxl__xs_mknod using XS_WRITE rather than XS_MKDIR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53c3d93af03d13e7e2931a352211da4824bd44ed Author: Paul Durrant AuthorDate: Wed Nov 25 14:51:00 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:02:13 2015 +0000 libxl: implement libxl__xs_mknod using XS_WRITE rather than XS_MKDIR This patch modifies the implentation of libxl__xs_mknod() to use XS_WRITE rather than XS_MKDIR since passing an empty value to the former will ensure that the path is both existent and empty upon return, rather than merely existent. The function return type is also changed to a libxl error value rather than a boolean, it's declaration is accordingly moved into the 'checked' section in libxl_internal.h, and a comment is added to clarify its semantics. This patch also contains as small whitespace fix in the definition of libxl__xs_mknod() and the addition of 'ok' to CODING_STYLE as the canonical variable name for holding return values from boolean functions. Signed-off-by: Paul Durrant Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Jackson --- tools/libxl/CODING_STYLE | 1 + tools/libxl/libxl_internal.h | 9 +++++---- tools/libxl/libxl_xshelp.c | 24 ++++++++++++++++++------ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 919bcc6..522d1c9 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -35,6 +35,7 @@ The following local variable names should be used where applicable: int rc; /* a libxl error code - and not anything else */ int r; /* the return value from a system call (or libxc call) */ + bool ok; /* the success return value from a boolean function */ uint32_t domid; libxl__gc *gc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a671a61..d2bda0a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -680,10 +680,6 @@ _hidden char *libxl__xs_read(libxl__gc *gc, xs_transaction_t t, _hidden char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, const char *path, unsigned int *nb); /* On error: returns NULL, sets errno (no logging) */ -_hidden bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, - const char *path, struct xs_permissions *perms, - unsigned int num_perms); - _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); @@ -692,6 +688,11 @@ _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); * fails it logs and returns ERROR_FAIL. */ +/* On success, path will exist and will have an empty value */ +int libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, + const char *path, struct xs_permissions *perms, + unsigned int num_perms); + /* On success, *result_out came from the gc. * On error, *result_out is undefined. * ENOENT counts as success but sets *result_out=0 diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index cb6a559..8554ee5 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -147,14 +147,26 @@ char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, return ret; } -bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, - const char *path, struct xs_permissions *perms, - unsigned int num_perms) +int libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, + const char *path, struct xs_permissions *perms, + unsigned int num_perms) { libxl_ctx *ctx = libxl__gc_owner(gc); - if (!xs_mkdir(ctx->xsh, t, path)) - return false; - return xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + bool ok; + + ok = xs_write(ctx->xsh, t, path, "", 0); + if (!ok) { + LOGE(ERROR, "xenstore write failed: `%s' = ''", path); + return ERROR_FAIL; + } + + ok = xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + if (!ok) { + LOGE(ERROR, "xenstore set permissions failed on `%s'", path); + return ERROR_FAIL; + } + + return 0; } char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhU-0000me-SZ; Fri, 11 Dec 2015 13:25:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhT-0000mI-84 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:31 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 66/1C-00475-ACECA665; Fri, 11 Dec 2015 13:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1449840324!10511916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25938 invoked from network); 11 Dec 2015 13:25:26 -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 2015 13:25:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MpG-0002PX-1B for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MpF-0006ux-Qz for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:29 +0000 Date: Fri, 11 Dec 2015 12:29:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: refine nr_sockets calculation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4217080693f9a4831e290c7a31bc6b886be5ca12 Author: Jan Beulich AuthorDate: Tue Dec 8 09:45:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:45:29 2015 +0100 x86: refine nr_sockets calculation The previous variant didn't work for non-contiguous socket numbers. Reported-by: Ed Swierk Signed-off-by: Jan Beulich Tested-by: Ed Swierk Reviewed-by: Andrew Cooper --- xen/arch/x86/mpparse.c | 21 ++++++++------------- xen/include/asm-x86/mpspec.h | 13 +++++++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 22b11fb..ef6557c 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -89,19 +89,14 @@ void __init set_nr_cpu_ids(unsigned int max_cpus) void __init set_nr_sockets(void) { - /* - * Count the actual cpus in the socket 0 and use it to calculate nr_sockets - * so that the latter will be always >= the actual socket number in the - * system even when APIC IDs from MP table are too sparse. - */ - unsigned int cpus = bitmap_weight(phys_cpu_present_map.mask, - boot_cpu_data.x86_max_cores * - boot_cpu_data.x86_num_siblings); - - if ( cpus == 0 ) - cpus = 1; - - nr_sockets = DIV_ROUND_UP(num_processors + disabled_cpus, cpus); + nr_sockets = last_physid(phys_cpu_present_map) + / boot_cpu_data.x86_max_cores + / boot_cpu_data.x86_num_siblings + 1; + if (disabled_cpus) + nr_sockets += (disabled_cpus - 1) + / boot_cpu_data.x86_max_cores + / boot_cpu_data.x86_num_siblings + 1; + printk(XENLOG_DEBUG "nr_sockets: %u\n", nr_sockets); } /* diff --git a/xen/include/asm-x86/mpspec.h b/xen/include/asm-x86/mpspec.h index 8ae3cd5..e3e6f50 100644 --- a/xen/include/asm-x86/mpspec.h +++ b/xen/include/asm-x86/mpspec.h @@ -43,6 +43,19 @@ typedef struct physid_mask physid_mask_t; #define physid_isset(physid, map) test_bit(physid, (map).mask) #define physid_test_and_set(physid, map) test_and_set_bit(physid, (map).mask) +#define first_physid(map) find_first_bit((map).mask, \ + MAX_APICS) +#define next_physid(id, map) find_next_bit((map).mask, \ + MAX_APICS, (id) + 1) +#define last_physid(map) ({ \ + const unsigned long *mask = (map).mask; \ + unsigned int id, last = MAX_APICS; \ + for (id = find_first_bit(mask, MAX_APICS); id < MAX_APICS; \ + id = find_next_bit(mask, MAX_APICS, (id) + 1)) \ + last = id; \ + last; \ +}) + #define physids_and(dst, src1, src2) bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_APICS) #define physids_or(dst, src1, src2) bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_APICS) #define physids_clear(map) bitmap_zero((map).mask, MAX_APICS) -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhU-0000mW-Od; Fri, 11 Dec 2015 13:25:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhS-0000mG-Lr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:30 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id A3/F2-12831-9CECA665; Fri, 11 Dec 2015 13:25:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1449840327!10124057!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37717 invoked from network); 11 Dec 2015 13:25:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MlN-0002M7-KN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MlN-0006do-FF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:29 +0000 Date: Fri, 11 Dec 2015 12:25:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: implement libxl__xs_mknod using XS_WRITE rather than XS_MKDIR X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 53c3d93af03d13e7e2931a352211da4824bd44ed Author: Paul Durrant AuthorDate: Wed Nov 25 14:51:00 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:02:13 2015 +0000 libxl: implement libxl__xs_mknod using XS_WRITE rather than XS_MKDIR This patch modifies the implentation of libxl__xs_mknod() to use XS_WRITE rather than XS_MKDIR since passing an empty value to the former will ensure that the path is both existent and empty upon return, rather than merely existent. The function return type is also changed to a libxl error value rather than a boolean, it's declaration is accordingly moved into the 'checked' section in libxl_internal.h, and a comment is added to clarify its semantics. This patch also contains as small whitespace fix in the definition of libxl__xs_mknod() and the addition of 'ok' to CODING_STYLE as the canonical variable name for holding return values from boolean functions. Signed-off-by: Paul Durrant Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Jackson --- tools/libxl/CODING_STYLE | 1 + tools/libxl/libxl_internal.h | 9 +++++---- tools/libxl/libxl_xshelp.c | 24 ++++++++++++++++++------ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/tools/libxl/CODING_STYLE b/tools/libxl/CODING_STYLE index 919bcc6..522d1c9 100644 --- a/tools/libxl/CODING_STYLE +++ b/tools/libxl/CODING_STYLE @@ -35,6 +35,7 @@ The following local variable names should be used where applicable: int rc; /* a libxl error code - and not anything else */ int r; /* the return value from a system call (or libxc call) */ + bool ok; /* the success return value from a boolean function */ uint32_t domid; libxl__gc *gc; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index a671a61..d2bda0a 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -680,10 +680,6 @@ _hidden char *libxl__xs_read(libxl__gc *gc, xs_transaction_t t, _hidden char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, const char *path, unsigned int *nb); /* On error: returns NULL, sets errno (no logging) */ -_hidden bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, - const char *path, struct xs_permissions *perms, - unsigned int num_perms); - _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); @@ -692,6 +688,11 @@ _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); * fails it logs and returns ERROR_FAIL. */ +/* On success, path will exist and will have an empty value */ +int libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, + const char *path, struct xs_permissions *perms, + unsigned int num_perms); + /* On success, *result_out came from the gc. * On error, *result_out is undefined. * ENOENT counts as success but sets *result_out=0 diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index cb6a559..8554ee5 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -147,14 +147,26 @@ char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, return ret; } -bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, - const char *path, struct xs_permissions *perms, - unsigned int num_perms) +int libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, + const char *path, struct xs_permissions *perms, + unsigned int num_perms) { libxl_ctx *ctx = libxl__gc_owner(gc); - if (!xs_mkdir(ctx->xsh, t, path)) - return false; - return xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + bool ok; + + ok = xs_write(ctx->xsh, t, path, "", 0); + if (!ok) { + LOGE(ERROR, "xenstore write failed: `%s' = ''", path); + return ERROR_FAIL; + } + + ok = xs_set_permissions(ctx->xsh, t, path, perms, num_perms); + if (!ok) { + LOGE(ERROR, "xenstore set permissions failed on `%s'", path); + return ERROR_FAIL; + } + + return 0; } char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhU-0000me-SZ; Fri, 11 Dec 2015 13:25:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhT-0000mI-84 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:31 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 66/1C-00475-ACECA665; Fri, 11 Dec 2015 13:25:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1449840324!10511916!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25938 invoked from network); 11 Dec 2015 13:25:26 -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 2015 13:25:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MpG-0002PX-1B for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MpF-0006ux-Qz for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:29 +0000 Date: Fri, 11 Dec 2015 12:29:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: refine nr_sockets calculation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4217080693f9a4831e290c7a31bc6b886be5ca12 Author: Jan Beulich AuthorDate: Tue Dec 8 09:45:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:45:29 2015 +0100 x86: refine nr_sockets calculation The previous variant didn't work for non-contiguous socket numbers. Reported-by: Ed Swierk Signed-off-by: Jan Beulich Tested-by: Ed Swierk Reviewed-by: Andrew Cooper --- xen/arch/x86/mpparse.c | 21 ++++++++------------- xen/include/asm-x86/mpspec.h | 13 +++++++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 22b11fb..ef6557c 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -89,19 +89,14 @@ void __init set_nr_cpu_ids(unsigned int max_cpus) void __init set_nr_sockets(void) { - /* - * Count the actual cpus in the socket 0 and use it to calculate nr_sockets - * so that the latter will be always >= the actual socket number in the - * system even when APIC IDs from MP table are too sparse. - */ - unsigned int cpus = bitmap_weight(phys_cpu_present_map.mask, - boot_cpu_data.x86_max_cores * - boot_cpu_data.x86_num_siblings); - - if ( cpus == 0 ) - cpus = 1; - - nr_sockets = DIV_ROUND_UP(num_processors + disabled_cpus, cpus); + nr_sockets = last_physid(phys_cpu_present_map) + / boot_cpu_data.x86_max_cores + / boot_cpu_data.x86_num_siblings + 1; + if (disabled_cpus) + nr_sockets += (disabled_cpus - 1) + / boot_cpu_data.x86_max_cores + / boot_cpu_data.x86_num_siblings + 1; + printk(XENLOG_DEBUG "nr_sockets: %u\n", nr_sockets); } /* diff --git a/xen/include/asm-x86/mpspec.h b/xen/include/asm-x86/mpspec.h index 8ae3cd5..e3e6f50 100644 --- a/xen/include/asm-x86/mpspec.h +++ b/xen/include/asm-x86/mpspec.h @@ -43,6 +43,19 @@ typedef struct physid_mask physid_mask_t; #define physid_isset(physid, map) test_bit(physid, (map).mask) #define physid_test_and_set(physid, map) test_and_set_bit(physid, (map).mask) +#define first_physid(map) find_first_bit((map).mask, \ + MAX_APICS) +#define next_physid(id, map) find_next_bit((map).mask, \ + MAX_APICS, (id) + 1) +#define last_physid(map) ({ \ + const unsigned long *mask = (map).mask; \ + unsigned int id, last = MAX_APICS; \ + for (id = find_first_bit(mask, MAX_APICS); id < MAX_APICS; \ + id = find_next_bit(mask, MAX_APICS, (id) + 1)) \ + last = id; \ + last; \ +}) + #define physids_and(dst, src1, src2) bitmap_and((dst).mask, (src1).mask, (src2).mask, MAX_APICS) #define physids_or(dst, src1, src2) bitmap_or((dst).mask, (src1).mask, (src2).mask, MAX_APICS) #define physids_clear(map) bitmap_zero((map).mask, MAX_APICS) -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhc-0000oX-31; Fri, 11 Dec 2015 13:25:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhZ-0000o6-VW for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:38 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 06/35-32615-1DECA665; Fri, 11 Dec 2015 13:25:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1449840335!10127943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24674 invoked from network); 11 Dec 2015 13:25: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; 11 Dec 2015 13:25:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mls-0002MJ-DD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mls-0006fg-AJ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:00 +0000 Date: Fri, 11 Dec 2015 12:26:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: correct domain builder for 64 bit guest with 32 bit tools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 43e99d38cd9253267982f5c29205f2d273f7d65e Author: Juergen Gross AuthorDate: Tue Dec 1 08:49:49 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 1 12:12:19 2015 +0000 libxc: correct domain builder for 64 bit guest with 32 bit tools Commit 8c45adec18e0512c3d34dcafb13414ecba21be6a ("create unmapped initrd in domain builder if supported") introduced an error for building a 64 bit guest with a 32 bit toolset. The initrd start address and size where stored in an unsigned long instead of using a 64 bit type. Signed-off-by: Juergen Gross Tested-by: Boris Ostrovsky Acked-by: Wei Liu --- tools/libxc/include/xc_dom.h | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 2176216..fd8c5e8 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -98,9 +98,14 @@ struct xc_dom_image { xen_vaddr_t virt_alloc_end; xen_vaddr_t bsd_symtab_start; - /* initrd parameters as specified in start_info page */ - unsigned long initrd_start; - unsigned long initrd_len; + /* + * initrd parameters as specified in start_info page + * Depending on capabilities of the booted kernel this may be a virtual + * address or a pfn. Type is neutral and large enough to hold a virtual + * address of a 64 bit kernel even with 32 bit toolstack. + */ + uint64_t initrd_start; + uint64_t initrd_len; unsigned int alloc_bootstack; xen_vaddr_t virt_pgtab_end; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhc-0000oX-31; Fri, 11 Dec 2015 13:25:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NhZ-0000o6-VW for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:38 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 06/35-32615-1DECA665; Fri, 11 Dec 2015 13:25:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1449840335!10127943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24674 invoked from network); 11 Dec 2015 13:25: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; 11 Dec 2015 13:25:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mls-0002MJ-DD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mls-0006fg-AJ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:00 +0000 Date: Fri, 11 Dec 2015 12:26:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: correct domain builder for 64 bit guest with 32 bit tools X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 43e99d38cd9253267982f5c29205f2d273f7d65e Author: Juergen Gross AuthorDate: Tue Dec 1 08:49:49 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 1 12:12:19 2015 +0000 libxc: correct domain builder for 64 bit guest with 32 bit tools Commit 8c45adec18e0512c3d34dcafb13414ecba21be6a ("create unmapped initrd in domain builder if supported") introduced an error for building a 64 bit guest with a 32 bit toolset. The initrd start address and size where stored in an unsigned long instead of using a 64 bit type. Signed-off-by: Juergen Gross Tested-by: Boris Ostrovsky Acked-by: Wei Liu --- tools/libxc/include/xc_dom.h | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 2176216..fd8c5e8 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -98,9 +98,14 @@ struct xc_dom_image { xen_vaddr_t virt_alloc_end; xen_vaddr_t bsd_symtab_start; - /* initrd parameters as specified in start_info page */ - unsigned long initrd_start; - unsigned long initrd_len; + /* + * initrd parameters as specified in start_info page + * Depending on capabilities of the booted kernel this may be a virtual + * address or a pfn. Type is neutral and large enough to hold a virtual + * address of a 64 bit kernel even with 32 bit toolstack. + */ + uint64_t initrd_start; + uint64_t initrd_len; unsigned int alloc_bootstack; xen_vaddr_t virt_pgtab_end; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhc-0000oq-69; Fri, 11 Dec 2015 13:25:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhb-0000oF-2z for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:39 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 0D/9F-31069-1DECA665; Fri, 11 Dec 2015 13:25:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1449840332!9766377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42691 invoked from network); 11 Dec 2015 13:25:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:34 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mms-0002Nd-0e for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mmr-0006jc-UJ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:01 +0000 Date: Fri, 11 Dec 2015 12:27:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: restore original maintainership of arch VPMU files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 32225574b7b650627654326ae6fd02b1b807a25a Author: Boris Ostrovsky AuthorDate: Wed Dec 2 15:22:39 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:22:39 2015 +0100 MAINTAINERS: restore original maintainership of arch VPMU files It was lost when vpmu* files were moved from xen/arch/x86/hvm/{vmx|svm}/ to xen/arch/x86/cpu/ Suggested-by: Jan Beulich Signed-off-by: Boris Ostrovsky --- MAINTAINERS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b8e83c5..01f575c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,6 +117,7 @@ M: Suravee Suthikulpanit M: Aravind Gopalakrishnan S: Supported F: xen/arch/x86/hvm/svm/ +F: xen/arch/x86/cpu/vpmu_amd.c ARINC653 SCHEDULER M: Josh Whitehead @@ -205,6 +206,7 @@ S: Supported F: xen/arch/x86/hvm/vmx/ F: xen/arch/x86/mm/p2m-ept.c F: xen/include/asm-x86/hvm/vmx/ +F: xen/arch/x86/cpu/vpmu_intel.c IOMMU VENDOR INDEPENDENT CODE M: Jan Beulich -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhc-0000oq-69; Fri, 11 Dec 2015 13:25:40 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhb-0000oF-2z for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:39 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 0D/9F-31069-1DECA665; Fri, 11 Dec 2015 13:25:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1449840332!9766377!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42691 invoked from network); 11 Dec 2015 13:25:34 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:34 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mms-0002Nd-0e for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mmr-0006jc-UJ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:01 +0000 Date: Fri, 11 Dec 2015 12:27:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: restore original maintainership of arch VPMU files X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 32225574b7b650627654326ae6fd02b1b807a25a Author: Boris Ostrovsky AuthorDate: Wed Dec 2 15:22:39 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:22:39 2015 +0100 MAINTAINERS: restore original maintainership of arch VPMU files It was lost when vpmu* files were moved from xen/arch/x86/hvm/{vmx|svm}/ to xen/arch/x86/cpu/ Suggested-by: Jan Beulich Signed-off-by: Boris Ostrovsky --- MAINTAINERS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b8e83c5..01f575c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -117,6 +117,7 @@ M: Suravee Suthikulpanit M: Aravind Gopalakrishnan S: Supported F: xen/arch/x86/hvm/svm/ +F: xen/arch/x86/cpu/vpmu_amd.c ARINC653 SCHEDULER M: Josh Whitehead @@ -205,6 +206,7 @@ S: Supported F: xen/arch/x86/hvm/vmx/ F: xen/arch/x86/mm/p2m-ept.c F: xen/include/asm-x86/hvm/vmx/ +F: xen/arch/x86/cpu/vpmu_intel.c IOMMU VENDOR INDEPENDENT CODE M: Jan Beulich -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhe-0000q5-EJ; Fri, 11 Dec 2015 13:25:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhd-0000pM-7S for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:41 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id EC/D5-10678-4DECA665; Fri, 11 Dec 2015 13:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449840336!10200555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24511 invoked from network); 11 Dec 2015 13:25:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MpQ-0002Pb-Eb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MpQ-0006vh-BQ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:40 +0000 Date: Fri, 11 Dec 2015 12:29:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] svm: fix incorrect TSC scaling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11eeca65126e51f03a883907751d5ccbe4f35aa3 Author: Haozhong Zhang AuthorDate: Tue Dec 8 09:46:12 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:46:12 2015 +0100 svm: fix incorrect TSC scaling SVM TSC ratio is incorrectly used in the current svm_get_tsc_offset(). This patch replaces the scaling logic in svm_get_tsc_offset() with a correct implementation. Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky --- xen/arch/x86/hvm/svm/svm.c | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 9415fb1..e1fadc3 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -773,18 +773,41 @@ static int svm_get_guest_pat(struct vcpu *v, u64 *gpat) return 1; } -static uint64_t svm_get_tsc_offset(uint64_t host_tsc, uint64_t guest_tsc, - uint64_t ratio) +static uint64_t scale_tsc(uint64_t host_tsc, uint64_t ratio) { - uint64_t offset; + uint64_t mult, frac, scaled_host_tsc; + + if ( ratio == DEFAULT_TSC_RATIO ) + return host_tsc; + + /* + * Suppose the most significant 32 bits of host_tsc and ratio are + * tsc_h and mult, and the least 32 bits of them are tsc_l and frac, + * then + * host_tsc * ratio * 2^-32 + * = host_tsc * (mult * 2^32 + frac) * 2^-32 + * = host_tsc * mult + (tsc_h * 2^32 + tsc_l) * frac * 2^-32 + * = host_tsc * mult + tsc_h * frac + ((tsc_l * frac) >> 32) + * + * Multiplications in the last two terms are between 32-bit integers, + * so both of them can fit in 64-bit integers. + * + * Because mult is usually less than 10 in practice, it's very rare + * that host_tsc * mult can overflow a 64-bit integer. + */ + mult = ratio >> 32; + frac = ratio & ((1ULL << 32) - 1); + scaled_host_tsc = host_tsc * mult; + scaled_host_tsc += (host_tsc >> 32) * frac; + scaled_host_tsc += ((host_tsc & ((1ULL << 32) - 1)) * frac) >> 32; - if (ratio == DEFAULT_TSC_RATIO) - return guest_tsc - host_tsc; + return scaled_host_tsc; +} - /* calculate hi,lo parts in 64bits to prevent overflow */ - offset = (((host_tsc >> 32U) * (ratio >> 32U)) << 32U) + - (host_tsc & 0xffffffffULL) * (ratio & 0xffffffffULL); - return guest_tsc - offset; +static uint64_t svm_get_tsc_offset(uint64_t host_tsc, uint64_t guest_tsc, + uint64_t ratio) +{ + return guest_tsc - scale_tsc(host_tsc, ratio); } static void svm_set_tsc_offset(struct vcpu *v, u64 offset, u64 at_tsc) -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhe-0000q5-EJ; Fri, 11 Dec 2015 13:25:42 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhd-0000pM-7S for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:41 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id EC/D5-10678-4DECA665; Fri, 11 Dec 2015 13:25:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449840336!10200555!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24511 invoked from network); 11 Dec 2015 13:25:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MpQ-0002Pb-Eb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MpQ-0006vh-BQ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:40 +0000 Date: Fri, 11 Dec 2015 12:29:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] svm: fix incorrect TSC scaling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 11eeca65126e51f03a883907751d5ccbe4f35aa3 Author: Haozhong Zhang AuthorDate: Tue Dec 8 09:46:12 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:46:12 2015 +0100 svm: fix incorrect TSC scaling SVM TSC ratio is incorrectly used in the current svm_get_tsc_offset(). This patch replaces the scaling logic in svm_get_tsc_offset() with a correct implementation. Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky --- xen/arch/x86/hvm/svm/svm.c | 41 ++++++++++++++++++++++++++++++++--------- 1 files changed, 32 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 9415fb1..e1fadc3 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -773,18 +773,41 @@ static int svm_get_guest_pat(struct vcpu *v, u64 *gpat) return 1; } -static uint64_t svm_get_tsc_offset(uint64_t host_tsc, uint64_t guest_tsc, - uint64_t ratio) +static uint64_t scale_tsc(uint64_t host_tsc, uint64_t ratio) { - uint64_t offset; + uint64_t mult, frac, scaled_host_tsc; + + if ( ratio == DEFAULT_TSC_RATIO ) + return host_tsc; + + /* + * Suppose the most significant 32 bits of host_tsc and ratio are + * tsc_h and mult, and the least 32 bits of them are tsc_l and frac, + * then + * host_tsc * ratio * 2^-32 + * = host_tsc * (mult * 2^32 + frac) * 2^-32 + * = host_tsc * mult + (tsc_h * 2^32 + tsc_l) * frac * 2^-32 + * = host_tsc * mult + tsc_h * frac + ((tsc_l * frac) >> 32) + * + * Multiplications in the last two terms are between 32-bit integers, + * so both of them can fit in 64-bit integers. + * + * Because mult is usually less than 10 in practice, it's very rare + * that host_tsc * mult can overflow a 64-bit integer. + */ + mult = ratio >> 32; + frac = ratio & ((1ULL << 32) - 1); + scaled_host_tsc = host_tsc * mult; + scaled_host_tsc += (host_tsc >> 32) * frac; + scaled_host_tsc += ((host_tsc & ((1ULL << 32) - 1)) * frac) >> 32; - if (ratio == DEFAULT_TSC_RATIO) - return guest_tsc - host_tsc; + return scaled_host_tsc; +} - /* calculate hi,lo parts in 64bits to prevent overflow */ - offset = (((host_tsc >> 32U) * (ratio >> 32U)) << 32U) + - (host_tsc & 0xffffffffULL) * (ratio & 0xffffffffULL); - return guest_tsc - offset; +static uint64_t svm_get_tsc_offset(uint64_t host_tsc, uint64_t guest_tsc, + uint64_t ratio) +{ + return guest_tsc - scale_tsc(host_tsc, ratio); } static void svm_set_tsc_offset(struct vcpu *v, u64 offset, u64 at_tsc) -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhf-0000qx-IS; Fri, 11 Dec 2015 13:25:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhe-0000q4-NB for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:42 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 35/4F-12889-5DECA665; Fri, 11 Dec 2015 13:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449840338!10520404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43477 invoked from network); 11 Dec 2015 13:25:39 -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; 11 Dec 2015 13:25:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mnk-0002O1-Mb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mnk-0006nB-Gw for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:56 +0000 Date: Fri, 11 Dec 2015 12:27:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: replace INVALID_P2M_ENTRY by INVALID_PFN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89cafd42203363bc34dd3285b1aad7d63374c4b0 Author: Juergen Gross AuthorDate: Tue Dec 1 18:14:53 2015 +0100 Commit: Ian Campbell CommitDate: Wed Dec 2 15:27:38 2015 +0000 libxc: replace INVALID_P2M_ENTRY by INVALID_PFN INVALID_P2M_ENTRY is defined as (xen_pfn_t)-1 and is often used according to it's type for an invalid pfn. Change the name of the macro to INVALID_PFN. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxc/include/xc_dom.h | 2 +- tools/libxc/xc_compression.c | 10 +++++----- tools/libxc/xc_core.c | 4 ++-- tools/libxc/xc_dom_arm.c | 2 +- tools/libxc/xc_dom_core.c | 4 ++-- tools/libxc/xc_dom_x86.c | 2 +- tools/libxc/xc_offline_page.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 43a65ee..3c94b57 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -19,7 +19,7 @@ #include #include -#define INVALID_P2M_ENTRY ((xen_pfn_t)-1) +#define INVALID_PFN ((xen_pfn_t)-1) /* --- typedefs and structs ---------------------------------------- */ diff --git a/tools/libxc/xc_compression.c b/tools/libxc/xc_compression.c index b1b16e8..89c1114 100644 --- a/tools/libxc/xc_compression.c +++ b/tools/libxc/xc_compression.c @@ -217,7 +217,7 @@ char *get_cache_page(comp_ctx *ctx, xen_pfn_t pfn, /* If the list is full, evict a page from the tail end. */ item = ctx->page_list_tail; - if (item->pfn != INVALID_P2M_ENTRY) + if (item->pfn != INVALID_PFN) ctx->pfn2cache[item->pfn] = NULL; item->pfn = pfn; @@ -278,7 +278,7 @@ void invalidate_cache_page(comp_ctx *ctx, xen_pfn_t pfn) ctx->page_list_tail = item; } ctx->pfn2cache[pfn] = NULL; - (ctx->page_list_tail)->pfn = INVALID_P2M_ENTRY; + (ctx->page_list_tail)->pfn = INVALID_PFN; } } @@ -295,7 +295,7 @@ int xc_compression_add_page(xc_interface *xch, comp_ctx *ctx, /* pagetable page */ if (israw) invalidate_cache_page(ctx, pfn); - ctx->sendbuf_pfns[ctx->pfns_len] = israw ? INVALID_P2M_ENTRY : pfn; + ctx->sendbuf_pfns[ctx->pfns_len] = israw ? INVALID_PFN : pfn; memcpy(ctx->inputbuf + ctx->pfns_len * XC_PAGE_SIZE, page, XC_PAGE_SIZE); ctx->pfns_len++; @@ -329,7 +329,7 @@ int xc_compression_compress_pages(xc_interface *xch, comp_ctx *ctx, cache_copy = NULL; current_page = ctx->inputbuf + ctx->pfns_index * XC_PAGE_SIZE; - if (ctx->sendbuf_pfns[ctx->pfns_index] == INVALID_P2M_ENTRY) + if (ctx->sendbuf_pfns[ctx->pfns_index] == INVALID_PFN) israw = 1; else cache_copy = get_cache_page(ctx, @@ -518,7 +518,7 @@ comp_ctx *xc_compression_create_context(xc_interface *xch, for (i = 0; i < num_cache_pages; i++) { - ctx->cache[i].pfn = INVALID_P2M_ENTRY; + ctx->cache[i].pfn = INVALID_PFN; ctx->cache[i].page = ctx->cache_base + i * XC_PAGE_SIZE; ctx->cache[i].prev = (i == 0) ? NULL : &(ctx->cache[i - 1]); ctx->cache[i].next = ((i+1) == num_cache_pages)? NULL : diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c index 011336c..d792566 100644 --- a/tools/libxc/xc_core.c +++ b/tools/libxc/xc_core.c @@ -808,13 +808,13 @@ xc_domain_dumpcore_via_callback(xc_interface *xch, gmfn = p2m[i]; else gmfn = ((uint64_t *)p2m)[i]; - if ( gmfn == INVALID_P2M_ENTRY ) + if ( gmfn == INVALID_PFN ) continue; } else { gmfn = ((uint32_t *)p2m)[i]; - if ( gmfn == (uint32_t)INVALID_P2M_ENTRY ) + if ( gmfn == (uint32_t)INVALID_PFN ) continue; } diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index d9a6371..64a8b67 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -439,7 +439,7 @@ static int meminit(struct xc_dom_image *dom) if ( dom->p2m_host == NULL ) return -EINVAL; for ( pfn = 0; pfn < p2m_size; pfn++ ) - dom->p2m_host[pfn] = INVALID_P2M_ENTRY; + dom->p2m_host[pfn] = INVALID_PFN; /* setup initial p2m and allocate guest memory */ for ( i = 0; i < GUEST_RAM_BANKS && dom->rambank_size[i]; i++ ) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 8967970..d0c6596 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -971,7 +971,7 @@ int xc_dom_update_guest_p2m(struct xc_dom_image *dom) __FUNCTION__, dom->p2m_size); p2m_32 = dom->p2m_guest; for ( i = 0; i < dom->p2m_size; i++ ) - if ( dom->p2m_host[i] != INVALID_P2M_ENTRY ) + if ( dom->p2m_host[i] != INVALID_PFN ) p2m_32[i] = dom->p2m_host[i]; else p2m_32[i] = (uint32_t) - 1; @@ -981,7 +981,7 @@ int xc_dom_update_guest_p2m(struct xc_dom_image *dom) __FUNCTION__, dom->p2m_size); p2m_64 = dom->p2m_guest; for ( i = 0; i < dom->p2m_size; i++ ) - if ( dom->p2m_host[i] != INVALID_P2M_ENTRY ) + if ( dom->p2m_host[i] != INVALID_PFN ) p2m_64[i] = dom->p2m_host[i]; else p2m_64[i] = (uint64_t) - 1; diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 5ff33ca..7c77e69 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -1172,7 +1172,7 @@ static int meminit_pv(struct xc_dom_image *dom) if ( dom->p2m_host == NULL ) return -EINVAL; for ( pfn = 0; pfn < dom->p2m_size; pfn++ ) - dom->p2m_host[pfn] = INVALID_P2M_ENTRY; + dom->p2m_host[pfn] = INVALID_PFN; /* allocate guest memory */ for ( i = 0; i < nr_vmemranges; i++ ) diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 7bb522f..bc91d51 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -282,7 +282,7 @@ static int change_pte(xc_interface *xch, int domid, uint64_t pte, new_pte; int j; - if ( (table_mfn == INVALID_P2M_ENTRY) || + if ( (table_mfn == INVALID_PFN) || ((minfo->pfn_type[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhf-0000qx-IS; Fri, 11 Dec 2015 13:25:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhe-0000q4-NB for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:42 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 35/4F-12889-5DECA665; Fri, 11 Dec 2015 13:25:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449840338!10520404!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43477 invoked from network); 11 Dec 2015 13:25:39 -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; 11 Dec 2015 13:25:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mnk-0002O1-Mb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mnk-0006nB-Gw for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:56 +0000 Date: Fri, 11 Dec 2015 12:27:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: replace INVALID_P2M_ENTRY by INVALID_PFN X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 89cafd42203363bc34dd3285b1aad7d63374c4b0 Author: Juergen Gross AuthorDate: Tue Dec 1 18:14:53 2015 +0100 Commit: Ian Campbell CommitDate: Wed Dec 2 15:27:38 2015 +0000 libxc: replace INVALID_P2M_ENTRY by INVALID_PFN INVALID_P2M_ENTRY is defined as (xen_pfn_t)-1 and is often used according to it's type for an invalid pfn. Change the name of the macro to INVALID_PFN. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxc/include/xc_dom.h | 2 +- tools/libxc/xc_compression.c | 10 +++++----- tools/libxc/xc_core.c | 4 ++-- tools/libxc/xc_dom_arm.c | 2 +- tools/libxc/xc_dom_core.c | 4 ++-- tools/libxc/xc_dom_x86.c | 2 +- tools/libxc/xc_offline_page.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 43a65ee..3c94b57 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -19,7 +19,7 @@ #include #include -#define INVALID_P2M_ENTRY ((xen_pfn_t)-1) +#define INVALID_PFN ((xen_pfn_t)-1) /* --- typedefs and structs ---------------------------------------- */ diff --git a/tools/libxc/xc_compression.c b/tools/libxc/xc_compression.c index b1b16e8..89c1114 100644 --- a/tools/libxc/xc_compression.c +++ b/tools/libxc/xc_compression.c @@ -217,7 +217,7 @@ char *get_cache_page(comp_ctx *ctx, xen_pfn_t pfn, /* If the list is full, evict a page from the tail end. */ item = ctx->page_list_tail; - if (item->pfn != INVALID_P2M_ENTRY) + if (item->pfn != INVALID_PFN) ctx->pfn2cache[item->pfn] = NULL; item->pfn = pfn; @@ -278,7 +278,7 @@ void invalidate_cache_page(comp_ctx *ctx, xen_pfn_t pfn) ctx->page_list_tail = item; } ctx->pfn2cache[pfn] = NULL; - (ctx->page_list_tail)->pfn = INVALID_P2M_ENTRY; + (ctx->page_list_tail)->pfn = INVALID_PFN; } } @@ -295,7 +295,7 @@ int xc_compression_add_page(xc_interface *xch, comp_ctx *ctx, /* pagetable page */ if (israw) invalidate_cache_page(ctx, pfn); - ctx->sendbuf_pfns[ctx->pfns_len] = israw ? INVALID_P2M_ENTRY : pfn; + ctx->sendbuf_pfns[ctx->pfns_len] = israw ? INVALID_PFN : pfn; memcpy(ctx->inputbuf + ctx->pfns_len * XC_PAGE_SIZE, page, XC_PAGE_SIZE); ctx->pfns_len++; @@ -329,7 +329,7 @@ int xc_compression_compress_pages(xc_interface *xch, comp_ctx *ctx, cache_copy = NULL; current_page = ctx->inputbuf + ctx->pfns_index * XC_PAGE_SIZE; - if (ctx->sendbuf_pfns[ctx->pfns_index] == INVALID_P2M_ENTRY) + if (ctx->sendbuf_pfns[ctx->pfns_index] == INVALID_PFN) israw = 1; else cache_copy = get_cache_page(ctx, @@ -518,7 +518,7 @@ comp_ctx *xc_compression_create_context(xc_interface *xch, for (i = 0; i < num_cache_pages; i++) { - ctx->cache[i].pfn = INVALID_P2M_ENTRY; + ctx->cache[i].pfn = INVALID_PFN; ctx->cache[i].page = ctx->cache_base + i * XC_PAGE_SIZE; ctx->cache[i].prev = (i == 0) ? NULL : &(ctx->cache[i - 1]); ctx->cache[i].next = ((i+1) == num_cache_pages)? NULL : diff --git a/tools/libxc/xc_core.c b/tools/libxc/xc_core.c index 011336c..d792566 100644 --- a/tools/libxc/xc_core.c +++ b/tools/libxc/xc_core.c @@ -808,13 +808,13 @@ xc_domain_dumpcore_via_callback(xc_interface *xch, gmfn = p2m[i]; else gmfn = ((uint64_t *)p2m)[i]; - if ( gmfn == INVALID_P2M_ENTRY ) + if ( gmfn == INVALID_PFN ) continue; } else { gmfn = ((uint32_t *)p2m)[i]; - if ( gmfn == (uint32_t)INVALID_P2M_ENTRY ) + if ( gmfn == (uint32_t)INVALID_PFN ) continue; } diff --git a/tools/libxc/xc_dom_arm.c b/tools/libxc/xc_dom_arm.c index d9a6371..64a8b67 100644 --- a/tools/libxc/xc_dom_arm.c +++ b/tools/libxc/xc_dom_arm.c @@ -439,7 +439,7 @@ static int meminit(struct xc_dom_image *dom) if ( dom->p2m_host == NULL ) return -EINVAL; for ( pfn = 0; pfn < p2m_size; pfn++ ) - dom->p2m_host[pfn] = INVALID_P2M_ENTRY; + dom->p2m_host[pfn] = INVALID_PFN; /* setup initial p2m and allocate guest memory */ for ( i = 0; i < GUEST_RAM_BANKS && dom->rambank_size[i]; i++ ) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 8967970..d0c6596 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -971,7 +971,7 @@ int xc_dom_update_guest_p2m(struct xc_dom_image *dom) __FUNCTION__, dom->p2m_size); p2m_32 = dom->p2m_guest; for ( i = 0; i < dom->p2m_size; i++ ) - if ( dom->p2m_host[i] != INVALID_P2M_ENTRY ) + if ( dom->p2m_host[i] != INVALID_PFN ) p2m_32[i] = dom->p2m_host[i]; else p2m_32[i] = (uint32_t) - 1; @@ -981,7 +981,7 @@ int xc_dom_update_guest_p2m(struct xc_dom_image *dom) __FUNCTION__, dom->p2m_size); p2m_64 = dom->p2m_guest; for ( i = 0; i < dom->p2m_size; i++ ) - if ( dom->p2m_host[i] != INVALID_P2M_ENTRY ) + if ( dom->p2m_host[i] != INVALID_PFN ) p2m_64[i] = dom->p2m_host[i]; else p2m_64[i] = (uint64_t) - 1; diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 5ff33ca..7c77e69 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -1172,7 +1172,7 @@ static int meminit_pv(struct xc_dom_image *dom) if ( dom->p2m_host == NULL ) return -EINVAL; for ( pfn = 0; pfn < dom->p2m_size; pfn++ ) - dom->p2m_host[pfn] = INVALID_P2M_ENTRY; + dom->p2m_host[pfn] = INVALID_PFN; /* allocate guest memory */ for ( i = 0; i < nr_vmemranges; i++ ) diff --git a/tools/libxc/xc_offline_page.c b/tools/libxc/xc_offline_page.c index 7bb522f..bc91d51 100644 --- a/tools/libxc/xc_offline_page.c +++ b/tools/libxc/xc_offline_page.c @@ -282,7 +282,7 @@ static int change_pte(xc_interface *xch, int domid, uint64_t pte, new_pte; int j; - if ( (table_mfn == INVALID_P2M_ENTRY) || + if ( (table_mfn == INVALID_PFN) || ((minfo->pfn_type[i] & XEN_DOMCTL_PFINFO_LTAB_MASK) == XEN_DOMCTL_PFINFO_XTAB) ) continue; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhh-0000sL-PM; Fri, 11 Dec 2015 13:25:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhg-0000re-Rz for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:44 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id FB/85-32615-8DECA665; Fri, 11 Dec 2015 13:25:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449840342!10129589!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63237 invoked from network); 11 Dec 2015 13:25:43 -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 2015 13:25:43 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mn5-0002Nh-Ej for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mn5-0006kZ-6X for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:15 +0000 Date: Fri, 11 Dec 2015 12:27:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/build: disable default built-in rules and variables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2c4f313a7e62c7e559a469d4af4c3d03c49afa43 Author: Doug Goldstein AuthorDate: Wed Dec 2 15:22:56 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:22:56 2015 +0100 xen/build: disable default built-in rules and variables Disable the built-in rules and variables from GNU make to improve build performance and avoid awkward corner cases with the built-in rules. Currently none of the implicit rules are used but this is helpful to do when developing changes to the build system. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index fa9cf0a..3a1de99 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -15,6 +15,9 @@ export XEN_BUILD_HOST ?= $(shell hostname) export BASEDIR := $(CURDIR) export XEN_ROOT := $(BASEDIR)/.. +# Do not use make's built-in rules and variables +MAKEFLAGS += -rR + EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi .PHONY: default -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhh-0000sL-PM; Fri, 11 Dec 2015 13:25:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhg-0000re-Rz for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:44 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id FB/85-32615-8DECA665; Fri, 11 Dec 2015 13:25:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1449840342!10129589!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63237 invoked from network); 11 Dec 2015 13:25:43 -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 2015 13:25:43 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mn5-0002Nh-Ej for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mn5-0006kZ-6X for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:15 +0000 Date: Fri, 11 Dec 2015 12:27:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/build: disable default built-in rules and variables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2c4f313a7e62c7e559a469d4af4c3d03c49afa43 Author: Doug Goldstein AuthorDate: Wed Dec 2 15:22:56 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:22:56 2015 +0100 xen/build: disable default built-in rules and variables Disable the built-in rules and variables from GNU make to improve build performance and avoid awkward corner cases with the built-in rules. Currently none of the implicit rules are used but this is helpful to do when developing changes to the build system. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper Acked-by: Jan Beulich --- xen/Makefile | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index fa9cf0a..3a1de99 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -15,6 +15,9 @@ export XEN_BUILD_HOST ?= $(shell hostname) export BASEDIR := $(CURDIR) export XEN_ROOT := $(BASEDIR)/.. +# Do not use make's built-in rules and variables +MAKEFLAGS += -rR + EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi .PHONY: default -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25: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 1a7Nhj-0000tY-Ss; Fri, 11 Dec 2015 13:25:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhj-0000t2-1r for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:47 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 28/18-31443-ADECA665; Fri, 11 Dec 2015 13:25:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1449840343!10074190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2273 invoked from network); 11 Dec 2015 13:25:44 -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; 11 Dec 2015 13:25:44 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MiG-0002Hw-Qc for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MiG-0006QP-MS for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:16 +0000 Date: Fri, 11 Dec 2015 12:22:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: change the vt-d maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdead3f25b75772e954d9c93e3ba36c7a926a030 Author: Yang Zhang AuthorDate: Thu Nov 26 15:49:29 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:49:29 2015 +0100 MAINTAINERS: change the vt-d maintainer add Feng as the new maintainer of VT-d stuff Signed-off-by: Yang Zhang Acked-by: Kevin Tian --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e376646..b8e83c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -193,8 +193,8 @@ F: xen/arch/x86/tboot.c F: xen/include/asm-x86/tboot.h INTEL(R) VT FOR DIRECTED I/O (VT-D) -M: Yang Zhang M: Kevin Tian +M: Feng Wu S: Supported F: xen/drivers/passthrough/vtd/ -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25: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 1a7Nhj-0000tY-Ss; Fri, 11 Dec 2015 13:25:47 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhj-0000t2-1r for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:47 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 28/18-31443-ADECA665; Fri, 11 Dec 2015 13:25:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1449840343!10074190!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2273 invoked from network); 11 Dec 2015 13:25:44 -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; 11 Dec 2015 13:25:44 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MiG-0002Hw-Qc for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MiG-0006QP-MS for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:16 +0000 Date: Fri, 11 Dec 2015 12:22:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: change the vt-d maintainer X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bdead3f25b75772e954d9c93e3ba36c7a926a030 Author: Yang Zhang AuthorDate: Thu Nov 26 15:49:29 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:49:29 2015 +0100 MAINTAINERS: change the vt-d maintainer add Feng as the new maintainer of VT-d stuff Signed-off-by: Yang Zhang Acked-by: Kevin Tian --- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e376646..b8e83c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -193,8 +193,8 @@ F: xen/arch/x86/tboot.c F: xen/include/asm-x86/tboot.h INTEL(R) VT FOR DIRECTED I/O (VT-D) -M: Yang Zhang M: Kevin Tian +M: Feng Wu S: Supported F: xen/drivers/passthrough/vtd/ -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nho-0000v7-3V; Fri, 11 Dec 2015 13:25:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhm-0000uX-Jm for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:50 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 07/4A-19110-DDECA665; Fri, 11 Dec 2015 13:25:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1449840345!10508037!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45689 invoked from network); 11 Dec 2015 13:25:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MkB-0002JZ-HD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MkB-0006Xh-E2 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:15 +0000 Date: Fri, 11 Dec 2015 12:24:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop unused fastcall annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0249250f5f5ba2f781643a15fa4056bf1bd8b30d Author: Andrew Cooper AuthorDate: Mon Nov 30 11:57:04 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:57:04 2015 +0100 drop unused fastcall annotation Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/crypto/vmac.c | 3 --- xen/include/xen/config.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/crypto/vmac.c b/xen/crypto/vmac.c index 8f2f372..f3f2743 100644 --- a/xen/crypto/vmac.c +++ b/xen/crypto/vmac.c @@ -173,15 +173,12 @@ const uint64_t mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ #if __GNUC__ #define ALIGN(n) __attribute__ ((aligned(n))) #define NOINLINE __attribute__ ((noinline)) -#define FASTCALL #elif _MSC_VER #define ALIGN(n) __declspec(align(n)) #define NOINLINE __declspec(noinline) -#define FASTCALL __fastcall #else #define ALIGN(n) #define NOINLINE -#define FASTCALL #endif /* ----------------------------------------------------------------------- */ diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index f7258c7..450be86 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -84,7 +84,6 @@ #define mk_unsigned_long(x) x #endif /* !__ASSEMBLY__ */ -#define fastcall #define __cpuinitdata #define __cpuinit -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nho-0000v7-3V; Fri, 11 Dec 2015 13:25:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhm-0000uX-Jm for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:50 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 07/4A-19110-DDECA665; Fri, 11 Dec 2015 13:25:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1449840345!10508037!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45689 invoked from network); 11 Dec 2015 13:25:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MkB-0002JZ-HD for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MkB-0006Xh-E2 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:15 +0000 Date: Fri, 11 Dec 2015 12:24:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop unused fastcall annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0249250f5f5ba2f781643a15fa4056bf1bd8b30d Author: Andrew Cooper AuthorDate: Mon Nov 30 11:57:04 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:57:04 2015 +0100 drop unused fastcall annotation Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/crypto/vmac.c | 3 --- xen/include/xen/config.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/xen/crypto/vmac.c b/xen/crypto/vmac.c index 8f2f372..f3f2743 100644 --- a/xen/crypto/vmac.c +++ b/xen/crypto/vmac.c @@ -173,15 +173,12 @@ const uint64_t mpoly = UINT64_C(0x1fffffff1fffffff); /* Poly key mask */ #if __GNUC__ #define ALIGN(n) __attribute__ ((aligned(n))) #define NOINLINE __attribute__ ((noinline)) -#define FASTCALL #elif _MSC_VER #define ALIGN(n) __declspec(align(n)) #define NOINLINE __declspec(noinline) -#define FASTCALL __fastcall #else #define ALIGN(n) #define NOINLINE -#define FASTCALL #endif /* ----------------------------------------------------------------------- */ diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index f7258c7..450be86 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -84,7 +84,6 @@ #define mk_unsigned_long(x) x #endif /* !__ASSEMBLY__ */ -#define fastcall #define __cpuinitdata #define __cpuinit -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25: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 1a7Nhq-0000wB-7h; Fri, 11 Dec 2015 13:25:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nho-0000uy-1S for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:52 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 7E/15-10715-FDECA665; Fri, 11 Dec 2015 13:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1449840348!10530658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9653 invoked from network); 11 Dec 2015 13:25:49 -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; 11 Dec 2015 13:25:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mkg-0002Jl-EF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mkg-0006Zb-BN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:46 +0000 Date: Fri, 11 Dec 2015 12:24:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __devinit annotation, and aliased __pminit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea953e8fbdd17811d687d7d23a101b60d0631e12 Author: Andrew Cooper AuthorDate: Mon Nov 30 12:00:53 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 12:00:53 2015 +0100 drop empty __devinit annotation, and aliased __pminit x86 is the only architecture which uses __devinit, and also has CONFIG_HOTPLUG enabled, making the annotation empty. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/apic.c | 6 +++--- xen/arch/x86/cpu/amd.c | 6 +++--- xen/arch/x86/cpu/intel.c | 8 ++++---- xen/arch/x86/i8259.c | 2 +- xen/arch/x86/mpparse.c | 8 ++++---- xen/arch/x86/nmi.c | 12 +++++------- xen/arch/x86/setup.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_64/traps.c | 2 +- xen/include/xen/init.h | 2 -- 10 files changed, 23 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 67733c0..b9601ad 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -521,7 +521,7 @@ out: free_ioapic_entries(ioapic_entries); } -void __devinit setup_local_APIC(void) +void setup_local_APIC(void) { unsigned long oldvalue, value, ver, maxlvt; int i, j; @@ -1087,7 +1087,7 @@ static void __setup_APIC_LVTT(unsigned int clocks) apic_write_around(APIC_TMICT, clocks/APIC_DIVISOR); } -static void __devinit setup_APIC_timer(void) +static void setup_APIC_timer(void) { unsigned long flags; local_irq_save(flags); @@ -1199,7 +1199,7 @@ void __init setup_boot_APIC_clock(void) local_irq_restore(flags); } -void __devinit setup_secondary_APIC_clock(void) +void setup_secondary_APIC_clock(void) { setup_APIC_timer(); } diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3ebcc86..c51aa16 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -134,7 +134,7 @@ static const struct cpuidmask *__init noinline get_cpuidmask(const char *opt) * * The processor revision string parameter has precedene. */ -static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) +static void set_cpuidmask(const struct cpuinfo_x86 *c) { static unsigned int feat_ecx, feat_edx; static unsigned int extfeat_ecx, extfeat_edx; @@ -383,7 +383,7 @@ static void check_syscfg_dram_mod_en(void) wrmsrl(MSR_K8_SYSCFG, syscfg); } -static void __devinit amd_get_topology(struct cpuinfo_x86 *c) +static void amd_get_topology(struct cpuinfo_x86 *c) { int cpu; unsigned bits; @@ -424,7 +424,7 @@ static void __devinit amd_get_topology(struct cpuinfo_x86 *c) c->cpu_core_id); } -static void __devinit init_amd(struct cpuinfo_x86 *c) +static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 2eaae74..67dabc0 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,7 +49,7 @@ void set_cpuid_faulting(bool_t enable) * edx = 0xBFEBFBFF when executing CPUID.EAX = 1 normally. If you want to * 'rev down' to E8400, you can set these values in these Xen boot parameters. */ -static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) +static void set_cpuidmask(const struct cpuinfo_x86 *c) { static unsigned int msr_basic, msr_ext, msr_xsave; static enum { not_parsed, no_mask, set_mask } status; @@ -191,7 +191,7 @@ static void early_init_intel(struct cpuinfo_x86 *c) * Xeon 7400 erratum AAI65 (and further newer Xeons) * MONITOR/MWAIT may have excessive false wakeups */ -static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) +static void Intel_errata_workarounds(struct cpuinfo_x86 *c) { unsigned long lo, hi; @@ -214,7 +214,7 @@ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) /* * find out the number of processor cores on the die */ -static int __devinit num_cpu_cores(struct cpuinfo_x86 *c) +static int num_cpu_cores(struct cpuinfo_x86 *c) { unsigned int eax, ebx, ecx, edx; @@ -229,7 +229,7 @@ static int __devinit num_cpu_cores(struct cpuinfo_x86 *c) return 1; } -static void __devinit init_intel(struct cpuinfo_x86 *c) +static void init_intel(struct cpuinfo_x86 *c) { unsigned int l2 = 0; diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index c2c9005..aa266c2 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -283,7 +283,7 @@ int i8259A_suspend(void) return 0; } -void __devinit init_8259A(int auto_eoi) +void init_8259A(int auto_eoi) { unsigned long flags; diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 497a4e9..22b11fb 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -124,8 +124,8 @@ static int __init mpf_checksum(unsigned char *mp, int len) } /* Return xen's logical cpu_id of the new added cpu or <0 if error */ -static int __devinit MP_processor_info_x(struct mpc_config_processor *m, - u32 apicid, bool_t hotplug) +static int MP_processor_info_x(struct mpc_config_processor *m, + u32 apicid, bool_t hotplug) { int ver, cpu = 0; @@ -190,7 +190,7 @@ static int __devinit MP_processor_info_x(struct mpc_config_processor *m, return cpu; } -static int __devinit MP_processor_info(struct mpc_config_processor *m) +static int MP_processor_info(struct mpc_config_processor *m) { return MP_processor_info_x(m, m->mpc_apicid, 0); } @@ -787,7 +787,7 @@ void __init mp_register_lapic_address ( } -int __devinit mp_register_lapic ( +int mp_register_lapic ( u32 id, bool_t enabled, bool_t hotplug) diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 7520454..b1195a1 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -254,14 +254,12 @@ void release_lapic_nmi(void) enable_lapic_nmi_watchdog(); } -#define __pminit __devinit - /* * Activate the NMI watchdog via the local APIC. * Original code written by Keith Owens. */ -static void __pminit clear_msr_range(unsigned int base, unsigned int n) +static void clear_msr_range(unsigned int base, unsigned int n) { unsigned int i; @@ -279,7 +277,7 @@ static inline void write_watchdog_counter(const char *descr) wrmsrl(nmi_perfctr_msr, 0 - count); } -static void __pminit setup_k7_watchdog(void) +static void setup_k7_watchdog(void) { unsigned int evntsel; @@ -300,7 +298,7 @@ static void __pminit setup_k7_watchdog(void) wrmsr(MSR_K7_EVNTSEL0, evntsel, 0); } -static void __pminit setup_p6_watchdog(unsigned counter) +static void setup_p6_watchdog(unsigned counter) { unsigned int evntsel; @@ -321,7 +319,7 @@ static void __pminit setup_p6_watchdog(unsigned counter) wrmsr(MSR_P6_EVNTSEL(0), evntsel, 0); } -static int __pminit setup_p4_watchdog(void) +static int setup_p4_watchdog(void) { uint64_t misc_enable; @@ -359,7 +357,7 @@ static int __pminit setup_p4_watchdog(void) return 1; } -void __pminit setup_apic_nmi_watchdog(void) +void setup_apic_nmi_watchdog(void) { if ( nmi_watchdog == NMI_NONE ) return; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6714473..76c7b0f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -195,7 +195,7 @@ static void __init init_idle_domain(void) this_cpu(curr_vcpu) = current; } -void __devinit srat_detect_node(int cpu) +void srat_detect_node(int cpu) { nodeid_t node; u32 apicid = x86_cpu_to_apicid[cpu]; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index d29f828..e103834 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3616,7 +3616,7 @@ void load_TR(void) : "=m" (old_gdt) : "rm" (TSS_ENTRY << 3), "m" (tss_gdt) : "memory" ); } -void __devinit percpu_traps_init(void) +void percpu_traps_init(void) { subarch_percpu_traps_init(); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index b7c2759..26e2dd7 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -371,7 +371,7 @@ DEFINE_PER_CPU(struct stubs, stubs); void lstar_enter(void); void cstar_enter(void); -void __devinit subarch_percpu_traps_init(void) +void subarch_percpu_traps_init(void) { unsigned long stack_bottom = get_stack_bottom(); unsigned long stub_va = this_cpu(stubs.addr); diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index e411736..17fe550 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -118,11 +118,9 @@ extern struct kernel_param __setup_start, __setup_end; #endif /* __ASSEMBLY__ */ #ifdef CONFIG_HOTPLUG -#define __devinit #define __devexit #define __devexitdata #else -#define __devinit __init #define __devexit __exit #define __devexitdata __exitdata #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25: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 1a7Nhq-0000wB-7h; Fri, 11 Dec 2015 13:25:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nho-0000uy-1S for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:52 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 7E/15-10715-FDECA665; Fri, 11 Dec 2015 13:25:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1449840348!10530658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9653 invoked from network); 11 Dec 2015 13:25:49 -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; 11 Dec 2015 13:25:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mkg-0002Jl-EF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mkg-0006Zb-BN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:46 +0000 Date: Fri, 11 Dec 2015 12:24:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __devinit annotation, and aliased __pminit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ea953e8fbdd17811d687d7d23a101b60d0631e12 Author: Andrew Cooper AuthorDate: Mon Nov 30 12:00:53 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 12:00:53 2015 +0100 drop empty __devinit annotation, and aliased __pminit x86 is the only architecture which uses __devinit, and also has CONFIG_HOTPLUG enabled, making the annotation empty. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/apic.c | 6 +++--- xen/arch/x86/cpu/amd.c | 6 +++--- xen/arch/x86/cpu/intel.c | 8 ++++---- xen/arch/x86/i8259.c | 2 +- xen/arch/x86/mpparse.c | 8 ++++---- xen/arch/x86/nmi.c | 12 +++++------- xen/arch/x86/setup.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/arch/x86/x86_64/traps.c | 2 +- xen/include/xen/init.h | 2 -- 10 files changed, 23 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 67733c0..b9601ad 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -521,7 +521,7 @@ out: free_ioapic_entries(ioapic_entries); } -void __devinit setup_local_APIC(void) +void setup_local_APIC(void) { unsigned long oldvalue, value, ver, maxlvt; int i, j; @@ -1087,7 +1087,7 @@ static void __setup_APIC_LVTT(unsigned int clocks) apic_write_around(APIC_TMICT, clocks/APIC_DIVISOR); } -static void __devinit setup_APIC_timer(void) +static void setup_APIC_timer(void) { unsigned long flags; local_irq_save(flags); @@ -1199,7 +1199,7 @@ void __init setup_boot_APIC_clock(void) local_irq_restore(flags); } -void __devinit setup_secondary_APIC_clock(void) +void setup_secondary_APIC_clock(void) { setup_APIC_timer(); } diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 3ebcc86..c51aa16 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -134,7 +134,7 @@ static const struct cpuidmask *__init noinline get_cpuidmask(const char *opt) * * The processor revision string parameter has precedene. */ -static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) +static void set_cpuidmask(const struct cpuinfo_x86 *c) { static unsigned int feat_ecx, feat_edx; static unsigned int extfeat_ecx, extfeat_edx; @@ -383,7 +383,7 @@ static void check_syscfg_dram_mod_en(void) wrmsrl(MSR_K8_SYSCFG, syscfg); } -static void __devinit amd_get_topology(struct cpuinfo_x86 *c) +static void amd_get_topology(struct cpuinfo_x86 *c) { int cpu; unsigned bits; @@ -424,7 +424,7 @@ static void __devinit amd_get_topology(struct cpuinfo_x86 *c) c->cpu_core_id); } -static void __devinit init_amd(struct cpuinfo_x86 *c) +static void init_amd(struct cpuinfo_x86 *c) { u32 l, h; diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 2eaae74..67dabc0 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -49,7 +49,7 @@ void set_cpuid_faulting(bool_t enable) * edx = 0xBFEBFBFF when executing CPUID.EAX = 1 normally. If you want to * 'rev down' to E8400, you can set these values in these Xen boot parameters. */ -static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) +static void set_cpuidmask(const struct cpuinfo_x86 *c) { static unsigned int msr_basic, msr_ext, msr_xsave; static enum { not_parsed, no_mask, set_mask } status; @@ -191,7 +191,7 @@ static void early_init_intel(struct cpuinfo_x86 *c) * Xeon 7400 erratum AAI65 (and further newer Xeons) * MONITOR/MWAIT may have excessive false wakeups */ -static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) +static void Intel_errata_workarounds(struct cpuinfo_x86 *c) { unsigned long lo, hi; @@ -214,7 +214,7 @@ static void __devinit Intel_errata_workarounds(struct cpuinfo_x86 *c) /* * find out the number of processor cores on the die */ -static int __devinit num_cpu_cores(struct cpuinfo_x86 *c) +static int num_cpu_cores(struct cpuinfo_x86 *c) { unsigned int eax, ebx, ecx, edx; @@ -229,7 +229,7 @@ static int __devinit num_cpu_cores(struct cpuinfo_x86 *c) return 1; } -static void __devinit init_intel(struct cpuinfo_x86 *c) +static void init_intel(struct cpuinfo_x86 *c) { unsigned int l2 = 0; diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c index c2c9005..aa266c2 100644 --- a/xen/arch/x86/i8259.c +++ b/xen/arch/x86/i8259.c @@ -283,7 +283,7 @@ int i8259A_suspend(void) return 0; } -void __devinit init_8259A(int auto_eoi) +void init_8259A(int auto_eoi) { unsigned long flags; diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index 497a4e9..22b11fb 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -124,8 +124,8 @@ static int __init mpf_checksum(unsigned char *mp, int len) } /* Return xen's logical cpu_id of the new added cpu or <0 if error */ -static int __devinit MP_processor_info_x(struct mpc_config_processor *m, - u32 apicid, bool_t hotplug) +static int MP_processor_info_x(struct mpc_config_processor *m, + u32 apicid, bool_t hotplug) { int ver, cpu = 0; @@ -190,7 +190,7 @@ static int __devinit MP_processor_info_x(struct mpc_config_processor *m, return cpu; } -static int __devinit MP_processor_info(struct mpc_config_processor *m) +static int MP_processor_info(struct mpc_config_processor *m) { return MP_processor_info_x(m, m->mpc_apicid, 0); } @@ -787,7 +787,7 @@ void __init mp_register_lapic_address ( } -int __devinit mp_register_lapic ( +int mp_register_lapic ( u32 id, bool_t enabled, bool_t hotplug) diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index 7520454..b1195a1 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -254,14 +254,12 @@ void release_lapic_nmi(void) enable_lapic_nmi_watchdog(); } -#define __pminit __devinit - /* * Activate the NMI watchdog via the local APIC. * Original code written by Keith Owens. */ -static void __pminit clear_msr_range(unsigned int base, unsigned int n) +static void clear_msr_range(unsigned int base, unsigned int n) { unsigned int i; @@ -279,7 +277,7 @@ static inline void write_watchdog_counter(const char *descr) wrmsrl(nmi_perfctr_msr, 0 - count); } -static void __pminit setup_k7_watchdog(void) +static void setup_k7_watchdog(void) { unsigned int evntsel; @@ -300,7 +298,7 @@ static void __pminit setup_k7_watchdog(void) wrmsr(MSR_K7_EVNTSEL0, evntsel, 0); } -static void __pminit setup_p6_watchdog(unsigned counter) +static void setup_p6_watchdog(unsigned counter) { unsigned int evntsel; @@ -321,7 +319,7 @@ static void __pminit setup_p6_watchdog(unsigned counter) wrmsr(MSR_P6_EVNTSEL(0), evntsel, 0); } -static int __pminit setup_p4_watchdog(void) +static int setup_p4_watchdog(void) { uint64_t misc_enable; @@ -359,7 +357,7 @@ static int __pminit setup_p4_watchdog(void) return 1; } -void __pminit setup_apic_nmi_watchdog(void) +void setup_apic_nmi_watchdog(void) { if ( nmi_watchdog == NMI_NONE ) return; diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 6714473..76c7b0f 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -195,7 +195,7 @@ static void __init init_idle_domain(void) this_cpu(curr_vcpu) = current; } -void __devinit srat_detect_node(int cpu) +void srat_detect_node(int cpu) { nodeid_t node; u32 apicid = x86_cpu_to_apicid[cpu]; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index d29f828..e103834 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -3616,7 +3616,7 @@ void load_TR(void) : "=m" (old_gdt) : "rm" (TSS_ENTRY << 3), "m" (tss_gdt) : "memory" ); } -void __devinit percpu_traps_init(void) +void percpu_traps_init(void) { subarch_percpu_traps_init(); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index b7c2759..26e2dd7 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -371,7 +371,7 @@ DEFINE_PER_CPU(struct stubs, stubs); void lstar_enter(void); void cstar_enter(void); -void __devinit subarch_percpu_traps_init(void) +void subarch_percpu_traps_init(void) { unsigned long stack_bottom = get_stack_bottom(); unsigned long stub_va = this_cpu(stubs.addr); diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index e411736..17fe550 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -118,11 +118,9 @@ extern struct kernel_param __setup_start, __setup_end; #endif /* __ASSEMBLY__ */ #ifdef CONFIG_HOTPLUG -#define __devinit #define __devexit #define __devexitdata #else -#define __devinit __init #define __devexit __exit #define __devexitdata __exitdata #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhr-0000xB-GI; Fri, 11 Dec 2015 13:25:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhp-0000vl-8Q for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:53 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id DB/91-14900-0EECA665; Fri, 11 Dec 2015 13:25:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1449840347!2584737!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48918 invoked from network); 11 Dec 2015 13:25:48 -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; 11 Dec 2015 13:25:48 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mjd-0002Iu-4S for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MjY-0006VZ-1m for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:36 +0000 Date: Fri, 11 Dec 2015 12:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: introduce cpu_dev.c_early_init() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84f4c9b771b09973a8e1bea57d3db1e3ca660683 Author: Andrew Cooper AuthorDate: Mon Nov 30 11:54:11 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:54:11 2015 +0100 x86/cpu: introduce cpu_dev.c_early_init() The name is chosen to be consistent with Linux. Doing this allows early_intel_workaround() to be removed from common code. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 17 +++++++++++------ xen/arch/x86/cpu/cpu.h | 3 +-- xen/arch/x86/cpu/intel.c | 5 ++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e60929d..6b320a7 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -226,10 +226,8 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) /* Initialize the standard set of capabilities */ /* Note that the vendor-specific code below might override */ - /* Intel-defined flags: level 0x00000001 */ + /* Model and family information. */ cpuid(0x00000001, &eax, &ebx, &ecx, &edx); - c->x86_capability[cpufeat_word(X86_FEATURE_FPU)] = edx; - c->x86_capability[cpufeat_word(X86_FEATURE_XMM3)] = ecx; c->x86 = (eax >> 8) & 15; c->x86_model = (eax >> 4) & 15; if (c->x86 == 0xf) @@ -239,6 +237,16 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_mask = eax & 15; c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); c->phys_proc_id = c->apicid; + + if (this_cpu->c_early_init) + this_cpu->c_early_init(c); + + /* c_early_init() may have adjusted cpuid levels/features. Reread. */ + c->cpuid_level = cpuid_eax(0); + cpuid(0x00000001, &eax, &ebx, &ecx, &edx); + c->x86_capability[cpufeat_word(X86_FEATURE_FPU)] = edx; + c->x86_capability[cpufeat_word(X86_FEATURE_XMM3)] = ecx; + if ( cpu_has(c, X86_FEATURE_CLFLSH) ) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; @@ -258,9 +266,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) get_model_name(c); /* Default name */ } - /* Might lift BIOS max_leaf=3 limit. */ - early_intel_workaround(c); - /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) cpuid_count(0x00000007, 0, &tmp, diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index ed6cdf0..1877e7d 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -5,6 +5,7 @@ struct cpu_dev { /* some have two possibilities for cpuid string */ char * c_ident[2]; + void (*c_early_init)(struct cpuinfo_x86 *c); void (*c_init)(struct cpuinfo_x86 * c); }; @@ -17,5 +18,3 @@ extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; extern int get_model_name(struct cpuinfo_x86 *c); extern void display_cacheinfo(struct cpuinfo_x86 *c); - -extern void early_intel_workaround(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index c00657e..2eaae74 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -156,10 +156,8 @@ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) } } -void __devinit early_intel_workaround(struct cpuinfo_x86 *c) +static void early_init_intel(struct cpuinfo_x86 *c) { - if (c->x86_vendor != X86_VENDOR_INTEL) - return; /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; @@ -290,6 +288,7 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) static const struct cpu_dev intel_cpu_dev = { .c_vendor = "Intel", .c_ident = { "GenuineIntel" }, + .c_early_init = early_init_intel, .c_init = init_intel, }; -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhr-0000xB-GI; Fri, 11 Dec 2015 13:25:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhp-0000vl-8Q for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:53 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id DB/91-14900-0EECA665; Fri, 11 Dec 2015 13:25:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1449840347!2584737!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48918 invoked from network); 11 Dec 2015 13:25:48 -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; 11 Dec 2015 13:25:48 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mjd-0002Iu-4S for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MjY-0006VZ-1m for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:36 +0000 Date: Fri, 11 Dec 2015 12:23:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/cpu: introduce cpu_dev.c_early_init() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 84f4c9b771b09973a8e1bea57d3db1e3ca660683 Author: Andrew Cooper AuthorDate: Mon Nov 30 11:54:11 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:54:11 2015 +0100 x86/cpu: introduce cpu_dev.c_early_init() The name is chosen to be consistent with Linux. Doing this allows early_intel_workaround() to be removed from common code. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 17 +++++++++++------ xen/arch/x86/cpu/cpu.h | 3 +-- xen/arch/x86/cpu/intel.c | 5 ++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index e60929d..6b320a7 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -226,10 +226,8 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) /* Initialize the standard set of capabilities */ /* Note that the vendor-specific code below might override */ - /* Intel-defined flags: level 0x00000001 */ + /* Model and family information. */ cpuid(0x00000001, &eax, &ebx, &ecx, &edx); - c->x86_capability[cpufeat_word(X86_FEATURE_FPU)] = edx; - c->x86_capability[cpufeat_word(X86_FEATURE_XMM3)] = ecx; c->x86 = (eax >> 8) & 15; c->x86_model = (eax >> 4) & 15; if (c->x86 == 0xf) @@ -239,6 +237,16 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) c->x86_mask = eax & 15; c->apicid = phys_pkg_id((ebx >> 24) & 0xFF, 0); c->phys_proc_id = c->apicid; + + if (this_cpu->c_early_init) + this_cpu->c_early_init(c); + + /* c_early_init() may have adjusted cpuid levels/features. Reread. */ + c->cpuid_level = cpuid_eax(0); + cpuid(0x00000001, &eax, &ebx, &ecx, &edx); + c->x86_capability[cpufeat_word(X86_FEATURE_FPU)] = edx; + c->x86_capability[cpufeat_word(X86_FEATURE_XMM3)] = ecx; + if ( cpu_has(c, X86_FEATURE_CLFLSH) ) c->x86_clflush_size = ((ebx >> 8) & 0xff) * 8; @@ -258,9 +266,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) get_model_name(c); /* Default name */ } - /* Might lift BIOS max_leaf=3 limit. */ - early_intel_workaround(c); - /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) cpuid_count(0x00000007, 0, &tmp, diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index ed6cdf0..1877e7d 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -5,6 +5,7 @@ struct cpu_dev { /* some have two possibilities for cpuid string */ char * c_ident[2]; + void (*c_early_init)(struct cpuinfo_x86 *c); void (*c_init)(struct cpuinfo_x86 * c); }; @@ -17,5 +18,3 @@ extern unsigned int opt_cpuid_mask_ext_ecx, opt_cpuid_mask_ext_edx; extern int get_model_name(struct cpuinfo_x86 *c); extern void display_cacheinfo(struct cpuinfo_x86 *c); - -extern void early_intel_workaround(struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index c00657e..2eaae74 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -156,10 +156,8 @@ static void __devinit set_cpuidmask(const struct cpuinfo_x86 *c) } } -void __devinit early_intel_workaround(struct cpuinfo_x86 *c) +static void early_init_intel(struct cpuinfo_x86 *c) { - if (c->x86_vendor != X86_VENDOR_INTEL) - return; /* Netburst reports 64 bytes clflush size, but does IO in 128 bytes */ if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; @@ -290,6 +288,7 @@ static void __devinit init_intel(struct cpuinfo_x86 *c) static const struct cpu_dev intel_cpu_dev = { .c_vendor = "Intel", .c_ident = { "GenuineIntel" }, + .c_early_init = early_init_intel, .c_init = init_intel, }; -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:25:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhr-0000xW-Ma; Fri, 11 Dec 2015 13:25:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhq-0000w1-48 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:54 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id EC/7B-06091-1EECA665; Fri, 11 Dec 2015 13:25:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449840350!10109559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42861 invoked from network); 11 Dec 2015 13:25:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Moa-0002Oo-5u for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Moa-0006r0-3O for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:48 +0000 Date: Fri, 11 Dec 2015 12:28:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: __{cpu, dev}initdata drop follow-up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a5223f62d3adccd95877d50bf70306b4594df72 Author: Jan Beulich AuthorDate: Thu Dec 3 15:34:41 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:34:41 2015 +0100 x86: __{cpu,dev}initdata drop follow-up While reviewing those patches I noticed a few types that could do with tweaking. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 4 +--- xen/arch/x86/cpu/intel_cacheinfo.c | 2 +- xen/arch/x86/numa.c | 5 ++--- xen/include/asm-x86/acpi.h | 2 +- xen/include/asm-x86/numa.h | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index c51aa16..8ec841b 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -332,8 +332,6 @@ static void disable_c1_ramping(void) } } -int force_mwait; - static void disable_c1e(void *unused) { uint64_t msr_content; @@ -510,7 +508,7 @@ static void init_amd(struct cpuinfo_x86 *c) amd_get_topology(c); /* Pointless to use MWAIT on Family10 as it does not deep sleep. */ - if (c->x86 >= 0x10 && !force_mwait) + if (c->x86 == 0x10) __clear_bit(X86_FEATURE_MWAIT, c->x86_capability); if (!cpu_has_amd_erratum(c, AMD_ERRATUM_121)) diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c index 980aa59..bb02fe7 100644 --- a/xen/arch/x86/cpu/intel_cacheinfo.c +++ b/xen/arch/x86/cpu/intel_cacheinfo.c @@ -27,7 +27,7 @@ struct _cache_table }; /* all the cache descriptor types we care about (no TLB or trace cache entries) */ -static struct _cache_table cache_table[] = +static const struct _cache_table cache_table[] = { { 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */ { 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 9ba47b4..b7abc02 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -49,9 +49,8 @@ cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; -int numa_off = 0; - -int acpi_numa; +bool_t numa_off = 0; +s8 acpi_numa = 0; int srat_disabled(void) { diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index cf479a9..d3bde78 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -107,7 +107,7 @@ extern void acpi_reserve_bootmem(void); #define ARCH_HAS_POWER_INIT 1 -extern int acpi_numa; +extern s8 acpi_numa; extern int acpi_scan_nodes(u64 start, u64 end); #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index 0c5e5b4..9a2d7cc 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -30,7 +30,7 @@ extern nodeid_t pxm_to_node(unsigned int pxm); extern void numa_add_cpu(int cpu); extern void numa_init_array(void); -extern int numa_off; +extern bool_t numa_off; extern int srat_disabled(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:25:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:25:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhr-0000xW-Ma; Fri, 11 Dec 2015 13:25:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhq-0000w1-48 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:25:54 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id EC/7B-06091-1EECA665; Fri, 11 Dec 2015 13:25:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1449840350!10109559!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42861 invoked from network); 11 Dec 2015 13:25:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Moa-0002Oo-5u for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Moa-0006r0-3O for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:48 +0000 Date: Fri, 11 Dec 2015 12:28:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: __{cpu, dev}initdata drop follow-up X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7a5223f62d3adccd95877d50bf70306b4594df72 Author: Jan Beulich AuthorDate: Thu Dec 3 15:34:41 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:34:41 2015 +0100 x86: __{cpu,dev}initdata drop follow-up While reviewing those patches I noticed a few types that could do with tweaking. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/amd.c | 4 +--- xen/arch/x86/cpu/intel_cacheinfo.c | 2 +- xen/arch/x86/numa.c | 5 ++--- xen/include/asm-x86/acpi.h | 2 +- xen/include/asm-x86/numa.h | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index c51aa16..8ec841b 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -332,8 +332,6 @@ static void disable_c1_ramping(void) } } -int force_mwait; - static void disable_c1e(void *unused) { uint64_t msr_content; @@ -510,7 +508,7 @@ static void init_amd(struct cpuinfo_x86 *c) amd_get_topology(c); /* Pointless to use MWAIT on Family10 as it does not deep sleep. */ - if (c->x86 >= 0x10 && !force_mwait) + if (c->x86 == 0x10) __clear_bit(X86_FEATURE_MWAIT, c->x86_capability); if (!cpu_has_amd_erratum(c, AMD_ERRATUM_121)) diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c index 980aa59..bb02fe7 100644 --- a/xen/arch/x86/cpu/intel_cacheinfo.c +++ b/xen/arch/x86/cpu/intel_cacheinfo.c @@ -27,7 +27,7 @@ struct _cache_table }; /* all the cache descriptor types we care about (no TLB or trace cache entries) */ -static struct _cache_table cache_table[] = +static const struct _cache_table cache_table[] = { { 0x06, LVL_1_INST, 8 }, /* 4-way set assoc, 32 byte line size */ { 0x08, LVL_1_INST, 16 }, /* 4-way set assoc, 32 byte line size */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 9ba47b4..b7abc02 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -49,9 +49,8 @@ cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; -int numa_off = 0; - -int acpi_numa; +bool_t numa_off = 0; +s8 acpi_numa = 0; int srat_disabled(void) { diff --git a/xen/include/asm-x86/acpi.h b/xen/include/asm-x86/acpi.h index cf479a9..d3bde78 100644 --- a/xen/include/asm-x86/acpi.h +++ b/xen/include/asm-x86/acpi.h @@ -107,7 +107,7 @@ extern void acpi_reserve_bootmem(void); #define ARCH_HAS_POWER_INIT 1 -extern int acpi_numa; +extern s8 acpi_numa; extern int acpi_scan_nodes(u64 start, u64 end); #define NR_NODE_MEMBLKS (MAX_NUMNODES*2) diff --git a/xen/include/asm-x86/numa.h b/xen/include/asm-x86/numa.h index 0c5e5b4..9a2d7cc 100644 --- a/xen/include/asm-x86/numa.h +++ b/xen/include/asm-x86/numa.h @@ -30,7 +30,7 @@ extern nodeid_t pxm_to_node(unsigned int pxm); extern void numa_add_cpu(int cpu); extern void numa_init_array(void); -extern int numa_off; +extern bool_t numa_off; extern int srat_disabled(void); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhy-00013D-OB; Fri, 11 Dec 2015 13:26:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhw-00011N-WC for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:01 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 9D/E5-21901-8EECA665; Fri, 11 Dec 2015 13:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1449840358!9843748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54557 invoked from network); 11 Dec 2015 13:25:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MmX-0002N2-G6 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MmX-0006iZ-Df for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:41 +0000 Date: Fri, 11 Dec 2015 12:26:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: XSETBV intercept needs to check CPL on SVM only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e513d8f7bc3db90e66bd2ed963b3142f412b770d Author: Jan Beulich AuthorDate: Wed Dec 2 15:21:15 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:21:15 2015 +0100 x86/HVM: XSETBV intercept needs to check CPL on SVM only VMX doesn't need a software CPL check on the XSETBV intercept, and SVM can do that check without resorting to hvm_get_segment_register(). Clean up what is left of hvm_handle_xsetbv(), namely make it return a proper error code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/hvm/hvm.c | 19 ++++++------------- xen/arch/x86/hvm/svm/svm.c | 9 +++++---- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index db0aeba..af3d4d7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3153,22 +3153,15 @@ out: int hvm_handle_xsetbv(u32 index, u64 new_bv) { - struct segment_register sreg; - struct vcpu *curr = current; - - hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( sreg.attr.fields.dpl != 0 ) - goto err; + int rc; - hvm_event_crX(XCR0, new_bv, curr->arch.xcr0); + hvm_event_crX(XCR0, new_bv, current->arch.xcr0); - if ( handle_xsetbv(index, new_bv) ) - goto err; + rc = handle_xsetbv(index, new_bv); + if ( rc ) + hvm_inject_hw_exception(TRAP_gp_fault, 0); - return 0; -err: - hvm_inject_hw_exception(TRAP_gp_fault, 0); - return -1; + return rc; } int hvm_set_efer(uint64_t value) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 200a5df..9415fb1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2612,10 +2612,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; case VMEXIT_XSETBV: - if ( (inst_len = __get_instruction_length(current, INSTR_XSETBV))==0 ) - break; - if ( hvm_handle_xsetbv(regs->ecx, - (regs->rdx << 32) | regs->_eax) == 0 ) + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_gp_fault, 0); + else if ( (inst_len = __get_instruction_length(v, INSTR_XSETBV)) && + hvm_handle_xsetbv(regs->ecx, + (regs->rdx << 32) | regs->_eax) == 0 ) __update_guest_eip(regs, inst_len); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhy-00013D-OB; Fri, 11 Dec 2015 13:26:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhw-00011N-WC for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:01 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 9D/E5-21901-8EECA665; Fri, 11 Dec 2015 13:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1449840358!9843748!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54557 invoked from network); 11 Dec 2015 13:25:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MmX-0002N2-G6 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MmX-0006iZ-Df for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:41 +0000 Date: Fri, 11 Dec 2015 12:26:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: XSETBV intercept needs to check CPL on SVM only X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e513d8f7bc3db90e66bd2ed963b3142f412b770d Author: Jan Beulich AuthorDate: Wed Dec 2 15:21:15 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:21:15 2015 +0100 x86/HVM: XSETBV intercept needs to check CPL on SVM only VMX doesn't need a software CPL check on the XSETBV intercept, and SVM can do that check without resorting to hvm_get_segment_register(). Clean up what is left of hvm_handle_xsetbv(), namely make it return a proper error code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/hvm/hvm.c | 19 ++++++------------- xen/arch/x86/hvm/svm/svm.c | 9 +++++---- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index db0aeba..af3d4d7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3153,22 +3153,15 @@ out: int hvm_handle_xsetbv(u32 index, u64 new_bv) { - struct segment_register sreg; - struct vcpu *curr = current; - - hvm_get_segment_register(curr, x86_seg_ss, &sreg); - if ( sreg.attr.fields.dpl != 0 ) - goto err; + int rc; - hvm_event_crX(XCR0, new_bv, curr->arch.xcr0); + hvm_event_crX(XCR0, new_bv, current->arch.xcr0); - if ( handle_xsetbv(index, new_bv) ) - goto err; + rc = handle_xsetbv(index, new_bv); + if ( rc ) + hvm_inject_hw_exception(TRAP_gp_fault, 0); - return 0; -err: - hvm_inject_hw_exception(TRAP_gp_fault, 0); - return -1; + return rc; } int hvm_set_efer(uint64_t value) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 200a5df..9415fb1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -2612,10 +2612,11 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) break; case VMEXIT_XSETBV: - if ( (inst_len = __get_instruction_length(current, INSTR_XSETBV))==0 ) - break; - if ( hvm_handle_xsetbv(regs->ecx, - (regs->rdx << 32) | regs->_eax) == 0 ) + if ( vmcb_get_cpl(vmcb) ) + hvm_inject_hw_exception(TRAP_gp_fault, 0); + else if ( (inst_len = __get_instruction_length(v, INSTR_XSETBV)) && + hvm_handle_xsetbv(regs->ecx, + (regs->rdx << 32) | regs->_eax) == 0 ) __update_guest_eip(regs, inst_len); break; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhy-00013V-Rv; Fri, 11 Dec 2015 13:26:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhx-00011O-2n for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:01 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id A6/B7-29649-8EECA665; Fri, 11 Dec 2015 13:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449840356!10200648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28453 invoked from network); 11 Dec 2015 13:25:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:56 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MiW-0002I0-5J for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MiW-0006Qz-1e for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:32 +0000 Date: Fri, 11 Dec 2015 12:22:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: fix dependencies for files compiled from their parent directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 08f3fad0f30a7de35d60c2615c2ee56d3f7b77c8 Author: Jan Beulich AuthorDate: Thu Nov 26 15:50:07 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:50:07 2015 +0100 build: fix dependencies for files compiled from their parent directory The use of $(basename ...) here was wrong (yet I'm sure I tested it). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/Rules.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index e9d03b9..02db110 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -105,7 +105,7 @@ include Makefile DEPS = .*.d define gendep ifneq ($(1),$(subst /,:,$(1))) - DEPS += $(dir $(1)).$(basename $(notdir $(1))).d + DEPS += $(dir $(1)).$(notdir $(1)).d endif endef $(foreach o,$(filter-out %/,$(obj-y)),$(eval $(call gendep,$(o)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhy-00013V-Rv; Fri, 11 Dec 2015 13:26:02 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhx-00011O-2n for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:01 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id A6/B7-29649-8EECA665; Fri, 11 Dec 2015 13:26:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449840356!10200648!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28453 invoked from network); 11 Dec 2015 13:25:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:25:56 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MiW-0002I0-5J for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MiW-0006Qz-1e for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:32 +0000 Date: Fri, 11 Dec 2015 12:22:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: fix dependencies for files compiled from their parent directory X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 08f3fad0f30a7de35d60c2615c2ee56d3f7b77c8 Author: Jan Beulich AuthorDate: Thu Nov 26 15:50:07 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:50:07 2015 +0100 build: fix dependencies for files compiled from their parent directory The use of $(basename ...) here was wrong (yet I'm sure I tested it). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/Rules.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index e9d03b9..02db110 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -105,7 +105,7 @@ include Makefile DEPS = .*.d define gendep ifneq ($(1),$(subst /,:,$(1))) - DEPS += $(dir $(1)).$(basename $(notdir $(1))).d + DEPS += $(dir $(1)).$(notdir $(1)).d endif endef $(foreach o,$(filter-out %/,$(obj-y)),$(eval $(call gendep,$(o)))) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhz-00014c-V4; Fri, 11 Dec 2015 13:26:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhy-00012e-ES for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:02 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 00/44-12831-9EECA665; Fri, 11 Dec 2015 13:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1449840360!10127328!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24690 invoked from network); 11 Dec 2015 13:26:01 -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; 11 Dec 2015 13:26:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ml1-0002KM-8g for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ml0-0006b1-SL for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:07 +0000 Date: Fri, 11 Dec 2015 12:25:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait_idle: Skylake Client Support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c6cd64519f9bc270a7278128c94e4b66e3d2077 Author: Len Brown AuthorDate: Mon Nov 30 12:02:22 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 12:02:22 2015 +0100 mwait_idle: Skylake Client Support Skylake Client CPU idle Power states (C-states) are similar to the previous generation, Broadwell. However, Skylake does get its own table with updated worst-case latency and average energy-break-even residency values. Signed-off-by: Len Brown [Linux commit 493f133f47750aa5566fafa9403617e3f0506f8c] mwait_idle: Skylake Client Support - updated Addition of PC9 state, and minor tweaks to existing PC6 and PC8 states. Signed-off-by: Len Brown [Linux commit 135919a3a80565070b9645009e65f73e72c661c0] Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mwait-idle.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 07d8794..87f0e60 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -477,6 +477,58 @@ static const struct cpuidle_state bdw_cstates[] = { {} }; +static const struct cpuidle_state skl_cstates[] = { + { + .name = "C1-SKL", + .flags = MWAIT2flg(0x00), + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C1E-SKL", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { + .name = "C3-SKL", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 70, + .target_residency = 100, + }, + { + .name = "C6-SKL", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 85, + .target_residency = 200, + }, + { + .name = "C7s-SKL", + .flags = MWAIT2flg(0x33) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 124, + .target_residency = 800, + }, + { + .name = "C8-SKL", + .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 200, + .target_residency = 800, + }, + { + .name = "C9-SKL", + .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 480, + .target_residency = 5000, + }, + { + .name = "C10-SKL", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 890, + .target_residency = 5000, + }, + {} +}; + static const struct cpuidle_state atom_cstates[] = { { .name = "C1E-ATM", @@ -683,6 +735,11 @@ static const struct idle_cpu idle_cpu_bdw = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_skl = { + .state_table = skl_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_avn = { .state_table = avn_cstates, .disable_promotion_to_c1e = 1, @@ -718,6 +775,8 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = { ICPU(0x47, bdw), ICPU(0x4f, bdw), ICPU(0x56, bdw), + ICPU(0x4e, skl), + ICPU(0x5e, skl), {} }; -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhz-00014c-V4; Fri, 11 Dec 2015 13:26:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhy-00012e-ES for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:02 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 00/44-12831-9EECA665; Fri, 11 Dec 2015 13:26:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1449840360!10127328!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24690 invoked from network); 11 Dec 2015 13:26:01 -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; 11 Dec 2015 13:26:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ml1-0002KM-8g for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ml0-0006b1-SL for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:07 +0000 Date: Fri, 11 Dec 2015 12:25:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mwait_idle: Skylake Client Support X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c6cd64519f9bc270a7278128c94e4b66e3d2077 Author: Len Brown AuthorDate: Mon Nov 30 12:02:22 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 12:02:22 2015 +0100 mwait_idle: Skylake Client Support Skylake Client CPU idle Power states (C-states) are similar to the previous generation, Broadwell. However, Skylake does get its own table with updated worst-case latency and average energy-break-even residency values. Signed-off-by: Len Brown [Linux commit 493f133f47750aa5566fafa9403617e3f0506f8c] mwait_idle: Skylake Client Support - updated Addition of PC9 state, and minor tweaks to existing PC6 and PC8 states. Signed-off-by: Len Brown [Linux commit 135919a3a80565070b9645009e65f73e72c661c0] Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/cpu/mwait-idle.c | 59 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 07d8794..87f0e60 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -477,6 +477,58 @@ static const struct cpuidle_state bdw_cstates[] = { {} }; +static const struct cpuidle_state skl_cstates[] = { + { + .name = "C1-SKL", + .flags = MWAIT2flg(0x00), + .exit_latency = 2, + .target_residency = 2, + }, + { + .name = "C1E-SKL", + .flags = MWAIT2flg(0x01), + .exit_latency = 10, + .target_residency = 20, + }, + { + .name = "C3-SKL", + .flags = MWAIT2flg(0x10) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 70, + .target_residency = 100, + }, + { + .name = "C6-SKL", + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 85, + .target_residency = 200, + }, + { + .name = "C7s-SKL", + .flags = MWAIT2flg(0x33) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 124, + .target_residency = 800, + }, + { + .name = "C8-SKL", + .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 200, + .target_residency = 800, + }, + { + .name = "C9-SKL", + .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 480, + .target_residency = 5000, + }, + { + .name = "C10-SKL", + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, + .exit_latency = 890, + .target_residency = 5000, + }, + {} +}; + static const struct cpuidle_state atom_cstates[] = { { .name = "C1E-ATM", @@ -683,6 +735,11 @@ static const struct idle_cpu idle_cpu_bdw = { .disable_promotion_to_c1e = 1, }; +static const struct idle_cpu idle_cpu_skl = { + .state_table = skl_cstates, + .disable_promotion_to_c1e = 1, +}; + static const struct idle_cpu idle_cpu_avn = { .state_table = avn_cstates, .disable_promotion_to_c1e = 1, @@ -718,6 +775,8 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = { ICPU(0x47, bdw), ICPU(0x4f, bdw), ICPU(0x56, bdw), + ICPU(0x4e, skl), + ICPU(0x5e, skl), {} }; -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni1-00015h-3g; Fri, 11 Dec 2015 13:26:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhz-00010Y-6P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:03 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 3A/46-14715-7EECA665; Fri, 11 Dec 2015 13:25:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1449840357!10053867!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50113 invoked from network); 11 Dec 2015 13:25:58 -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; 11 Dec 2015 13:25:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mpa-0002Pk-ND for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mpa-0006wR-Ku for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:50 +0000 Date: Fri, 11 Dec 2015 12:29:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: fix domain type check in tsc_set_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c80d6f3c61eb0f8072f70b0a9a8c8c7adf17572 Author: Haozhong Zhang AuthorDate: Tue Dec 8 09:46:30 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:46:30 2015 +0100 x86/time: fix domain type check in tsc_set_info() Replace is_hvm_domain() in tsc_set_info() by has_hvm_container_domain() to keep consistent with other domain type checks in tsc_set_info(). Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 30d52c4..b5223cf 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1878,7 +1878,7 @@ void tsc_set_info(struct domain *d, break; } d->arch.incarnation = incarnation + 1; - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { hvm_set_rdtsc_exiting(d, d->arch.vtsc); if ( d->vcpu && d->vcpu[0] && incarnation == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni1-00015h-3g; Fri, 11 Dec 2015 13:26:05 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nhz-00010Y-6P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:03 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 3A/46-14715-7EECA665; Fri, 11 Dec 2015 13:25:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1449840357!10053867!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50113 invoked from network); 11 Dec 2015 13:25:58 -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; 11 Dec 2015 13:25:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mpa-0002Pk-ND for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mpa-0006wR-Ku for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:50 +0000 Date: Fri, 11 Dec 2015 12:29:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/time: fix domain type check in tsc_set_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3c80d6f3c61eb0f8072f70b0a9a8c8c7adf17572 Author: Haozhong Zhang AuthorDate: Tue Dec 8 09:46:30 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:46:30 2015 +0100 x86/time: fix domain type check in tsc_set_info() Replace is_hvm_domain() in tsc_set_info() by has_hvm_container_domain() to keep consistent with other domain type checks in tsc_set_info(). Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 30d52c4..b5223cf 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1878,7 +1878,7 @@ void tsc_set_info(struct domain *d, break; } d->arch.incarnation = incarnation + 1; - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { hvm_set_rdtsc_exiting(d, d->arch.vtsc); if ( d->vcpu && d->vcpu[0] && incarnation == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Ni2-00016j-7a; Fri, 11 Dec 2015 13:26:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni1-00015Y-Gb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:05 +0000 Content-Length: 1753 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 8B/41-25438-CEECA665; Fri, 11 Dec 2015 13:26:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1449840361!10489173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64633 invoked from network); 11 Dec 2015 13:26:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MoP-0002Ok-Se for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MoP-0006qO-R9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:37 +0000 Date: Fri, 11 Dec 2015 12:28:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make sure the HVM callback vector is correctly set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2430672059393870871==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2430672059393870871== Content-Length: 1336 Content-Transfer-Encoding: quoted-printable commit aff9115de591304a2ae26061ad0ba77f6d674ac9 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Dec 3 15:33:40 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:33:40 2015 +0100 x86: make sure the HVM callback vector is correctly set If certain devices (like the local or the io apic) are disabled some modes of operation of the HVM event channel callback cannot be used. Make sure Xen doesn't try to setup them. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Jan Beulich --- xen/arch/x86/hvm/irq.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 990a2ca..0f3ab6c 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -330,6 +330,10 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) (via_type > HVMIRQ_callback_vector) ) via_type =3D HVMIRQ_callback_none; + if ( via_type !=3D HVMIRQ_callback_vector && + (!has_vlapic(d) || !has_vioapic(d) || !has_vpic(d)) ) + return; + spin_lock(&d->arch.hvm_domain.irq_lock); /* Tear down old callback via. */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2430672059393870871== 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 --===============2430672059393870871==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Ni2-00016j-7a; Fri, 11 Dec 2015 13:26:06 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni1-00015Y-Gb for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:05 +0000 Content-Length: 1753 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 8B/41-25438-CEECA665; Fri, 11 Dec 2015 13:26:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1449840361!10489173!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64633 invoked from network); 11 Dec 2015 13:26:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MoP-0002Ok-Se for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MoP-0006qO-R9 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:37 +0000 Date: Fri, 11 Dec 2015 12:28:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make sure the HVM callback vector is correctly set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2430672059393870871==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2430672059393870871== Content-Length: 1336 Content-Transfer-Encoding: quoted-printable commit aff9115de591304a2ae26061ad0ba77f6d674ac9 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Dec 3 15:33:40 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:33:40 2015 +0100 x86: make sure the HVM callback vector is correctly set If certain devices (like the local or the io apic) are disabled some modes of operation of the HVM event channel callback cannot be used. Make sure Xen doesn't try to setup them. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Jan Beulich --- xen/arch/x86/hvm/irq.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 990a2ca..0f3ab6c 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -330,6 +330,10 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) (via_type > HVMIRQ_callback_vector) ) via_type =3D HVMIRQ_callback_none; + if ( via_type !=3D HVMIRQ_callback_vector && + (!has_vlapic(d) || !has_vioapic(d) || !has_vpic(d)) ) + return; + spin_lock(&d->arch.hvm_domain.irq_lock); /* Tear down old callback via. */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2430672059393870871== 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 --===============2430672059393870871==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni3-00018K-Eu; Fri, 11 Dec 2015 13:26:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni2-00016k-Mr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E0/0C-06091-EEECA665; Fri, 11 Dec 2015 13:26:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1449840364!10124260!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44397 invoked from network); 11 Dec 2015 13:26:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mq5-0002Qr-Mn for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mq5-0006z9-GT for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:21 +0000 Date: Fri, 11 Dec 2015 12:30:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40412e3c99722229f1ec93cd95fc8486d778f5df Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:30:53 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a1ccf23..42aae0f 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1479,6 +1479,9 @@ static void domcreate_complete(libxl__egc *egc, libxl_domain_config *const d_config = dcs->guest_config; libxl_domain_config *d_config_saved = &dcs->guest_config_saved; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 009ca9c..a1ebb49 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -770,9 +770,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:07 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni3-00018K-Eu; Fri, 11 Dec 2015 13:26:07 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni2-00016k-Mr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:06 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E0/0C-06091-EEECA665; Fri, 11 Dec 2015 13:26:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1449840364!10124260!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44397 invoked from network); 11 Dec 2015 13:26:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mq5-0002Qr-Mn for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mq5-0006z9-GT for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:21 +0000 Date: Fri, 11 Dec 2015 12:30:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 40412e3c99722229f1ec93cd95fc8486d778f5df Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:30:53 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a1ccf23..42aae0f 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1479,6 +1479,9 @@ static void domcreate_complete(libxl__egc *egc, libxl_domain_config *const d_config = dcs->guest_config; libxl_domain_config *d_config_saved = &dcs->guest_config_saved; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 009ca9c..a1ebb49 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -770,9 +770,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Ni6-0001BJ-Is; Fri, 11 Dec 2015 13:26:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni5-0001A5-Gd for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:09 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id B4/A1-09834-0FECA665; Fri, 11 Dec 2015 13:26:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1449840365!10500416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46906 invoked from network); 11 Dec 2015 13:26:07 -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 2015 13:26:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mp5-0002PT-Kz for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mp5-0006tP-EN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:19 +0000 Date: Fri, 11 Dec 2015 12:29:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "vVMX: use latched VMCS machine address" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 234524a095896d9b51bd72f8d8d12d87aabb22f3 Author: Jan Beulich AuthorDate: Tue Dec 8 09:43:59 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:43:59 2015 +0100 Revert "vVMX: use latched VMCS machine address" This reverts commit d02e84b9d9d16b6b56186f0dfdcb3c90b83c82a3, causing a regression on some systems. --- xen/arch/x86/hvm/vmx/intr.c | 4 +- xen/arch/x86/hvm/vmx/vmcs.c | 21 ++-- xen/arch/x86/hvm/vmx/vmx.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 308 ++++++++++++++++++++---------------- xen/include/asm-x86/hvm/vmx/vmcs.h | 10 +- xen/include/asm-x86/hvm/vmx/vvmx.h | 26 ++-- 6 files changed, 206 insertions(+), 169 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 8fca08c..56c40b1 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -191,13 +191,13 @@ static int nvmx_intr_intercept(struct vcpu *v, struct hvm_intack intack) if ( intack.source == hvm_intsrc_pic || intack.source == hvm_intsrc_lapic ) { - ctrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + ctrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); if ( !(ctrl & PIN_BASED_EXT_INTR_MASK) ) return 0; vmx_inject_extint(intack.vector, intack.source); - ctrl = get_vvmcs(v, VM_EXIT_CONTROLS); + ctrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, VM_EXIT_CONTROLS); if ( ctrl & VM_EXIT_ACK_INTR_ON_EXIT ) { /* for now, duplicate the ack path in vmx_intr_assist */ diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index dbf284d..edd4c8d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -934,36 +934,37 @@ void vmx_vmcs_switch(paddr_t from, paddr_t to) spin_unlock(&vmx->vmcs_lock); } -void virtual_vmcs_enter(const struct vcpu *v) +void virtual_vmcs_enter(void *vvmcs) { - __vmptrld(v->arch.hvm_vmx.vmcs_shadow_maddr); + __vmptrld(pfn_to_paddr(domain_page_map_to_mfn(vvmcs))); } -void virtual_vmcs_exit(const struct vcpu *v) +void virtual_vmcs_exit(void *vvmcs) { paddr_t cur = this_cpu(current_vmcs); - __vmpclear(v->arch.hvm_vmx.vmcs_shadow_maddr); + __vmpclear(pfn_to_paddr(domain_page_map_to_mfn(vvmcs))); if ( cur ) __vmptrld(cur); + } -u64 virtual_vmcs_vmread(const struct vcpu *v, u32 vmcs_encoding) +u64 virtual_vmcs_vmread(void *vvmcs, u32 vmcs_encoding) { u64 res; - virtual_vmcs_enter(v); + virtual_vmcs_enter(vvmcs); __vmread(vmcs_encoding, &res); - virtual_vmcs_exit(v); + virtual_vmcs_exit(vvmcs); return res; } -void virtual_vmcs_vmwrite(const struct vcpu *v, u32 vmcs_encoding, u64 val) +void virtual_vmcs_vmwrite(void *vvmcs, u32 vmcs_encoding, u64 val) { - virtual_vmcs_enter(v); + virtual_vmcs_enter(vvmcs); __vmwrite(vmcs_encoding, val); - virtual_vmcs_exit(v); + virtual_vmcs_exit(vvmcs); } /* diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2581e97..f7c5e4f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1477,7 +1477,8 @@ void vmx_inject_extint(int trap, uint8_t source) u32 pin_based_cntrl; if ( nestedhvm_vcpu_in_guestmode(v) ) { - pin_based_cntrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + pin_based_cntrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, + PIN_BASED_VM_EXEC_CONTROL); if ( pin_based_cntrl & PIN_BASED_EXT_INTR_MASK ) { nvmx_enqueue_n2_exceptions (v, INTR_INFO_VALID_MASK | @@ -1497,7 +1498,8 @@ void vmx_inject_nmi(void) u32 pin_based_cntrl; if ( nestedhvm_vcpu_in_guestmode(v) ) { - pin_based_cntrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + pin_based_cntrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, + PIN_BASED_VM_EXEC_CONTROL); if ( pin_based_cntrl & PIN_BASED_NMI_EXITING ) { nvmx_enqueue_n2_exceptions (v, INTR_INFO_VALID_MASK | diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index e48d872..ea1052e 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -175,7 +175,11 @@ int nvmx_vcpu_reset(struct vcpu *v) uint64_t nvmx_vcpu_eptp_base(struct vcpu *v) { - return get_vvmcs(v, EPT_POINTER) & PAGE_MASK; + uint64_t eptp_base; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + eptp_base = __get_vvmcs(nvcpu->nv_vvmcx, EPT_POINTER); + return eptp_base & PAGE_MASK; } bool_t nvmx_ept_enabled(struct vcpu *v) @@ -232,7 +236,7 @@ static int vvmcs_offset(u32 width, u32 type, u32 index) return offset; } -u64 get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding) +u64 __get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding) { union vmcs_encoding enc; u64 *content = (u64 *) vvmcs; @@ -262,12 +266,12 @@ u64 get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding) return res; } -u64 get_vvmcs_real(const struct vcpu *v, u32 encoding) +u64 __get_vvmcs_real(void *vvmcs, u32 vmcs_encoding) { - return virtual_vmcs_vmread(v, encoding); + return virtual_vmcs_vmread(vvmcs, vmcs_encoding); } -void set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val) +void __set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val) { union vmcs_encoding enc; u64 *content = (u64 *) vvmcs; @@ -303,9 +307,9 @@ void set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val) content[offset] = res; } -void set_vvmcs_real(const struct vcpu *v, u32 encoding, u64 val) +void __set_vvmcs_real(void *vvmcs, u32 vmcs_encoding, u64 val) { - virtual_vmcs_vmwrite(v, encoding, val); + virtual_vmcs_vmwrite(vvmcs, vmcs_encoding, val); } static unsigned long reg_read(struct cpu_user_regs *regs, @@ -327,20 +331,25 @@ static void reg_write(struct cpu_user_regs *regs, static inline u32 __n2_pin_exec_control(struct vcpu *v) { - return get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + return __get_vvmcs(nvcpu->nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); } static inline u32 __n2_exec_control(struct vcpu *v) { - return get_vvmcs(v, CPU_BASED_VM_EXEC_CONTROL); + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + return __get_vvmcs(nvcpu->nv_vvmcx, CPU_BASED_VM_EXEC_CONTROL); } static inline u32 __n2_secondary_exec_control(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u64 second_ctrl = 0; if ( __n2_exec_control(v) & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ) - second_ctrl = get_vvmcs(v, SECONDARY_VM_EXEC_CONTROL); + second_ctrl = __get_vvmcs(nvcpu->nv_vvmcx, SECONDARY_VM_EXEC_CONTROL); return second_ctrl; } @@ -493,17 +502,18 @@ static void vmreturn(struct cpu_user_regs *regs, enum vmx_ops_result ops_res) bool_t nvmx_intercepts_exception(struct vcpu *v, unsigned int trap, int error_code) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 exception_bitmap, pfec_match=0, pfec_mask=0; int r; ASSERT ( trap < 32 ); - exception_bitmap = get_vvmcs(v, EXCEPTION_BITMAP); + exception_bitmap = __get_vvmcs(nvcpu->nv_vvmcx, EXCEPTION_BITMAP); r = exception_bitmap & (1 << trap) ? 1: 0; if ( trap == TRAP_page_fault ) { - pfec_match = get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MATCH); - pfec_mask = get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MASK); + pfec_match = __get_vvmcs(nvcpu->nv_vvmcx, PAGE_FAULT_ERROR_CODE_MATCH); + pfec_mask = __get_vvmcs(nvcpu->nv_vvmcx, PAGE_FAULT_ERROR_CODE_MASK); if ( (error_code & pfec_mask) != pfec_match ) r = !r; } @@ -518,7 +528,9 @@ static inline u32 __shadow_control(struct vcpu *v, unsigned int field, u32 host_value) { - return get_vvmcs(v, field) | host_value; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + return (u32) __get_vvmcs(nvcpu->nv_vvmcx, field) | host_value; } static void set_shadow_control(struct vcpu *v, @@ -585,12 +597,13 @@ void nvmx_update_secondary_exec_control(struct vcpu *v, unsigned long host_cntrl) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); u32 apicv_bit = SECONDARY_EXEC_APIC_REGISTER_VIRT | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY; host_cntrl &= ~apicv_bit; - shadow_cntrl = get_vvmcs(v, SECONDARY_VM_EXEC_CONTROL); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, SECONDARY_VM_EXEC_CONTROL); /* No vAPIC-v support, so it shouldn't be set in vmcs12. */ ASSERT(!(shadow_cntrl & apicv_bit)); @@ -603,9 +616,10 @@ void nvmx_update_secondary_exec_control(struct vcpu *v, static void nvmx_update_pin_control(struct vcpu *v, unsigned long host_cntrl) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); host_cntrl &= ~PIN_BASED_POSTED_INTERRUPT; - shadow_cntrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); /* No vAPIC-v support, so it shouldn't be set in vmcs12. */ ASSERT(!(shadow_cntrl & PIN_BASED_POSTED_INTERRUPT)); @@ -617,8 +631,9 @@ static void nvmx_update_pin_control(struct vcpu *v, unsigned long host_cntrl) static void nvmx_update_exit_control(struct vcpu *v, unsigned long host_cntrl) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - shadow_cntrl = get_vvmcs(v, VM_EXIT_CONTROLS); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_CONTROLS); shadow_cntrl &= ~(VM_EXIT_SAVE_DEBUG_CNTRLS | VM_EXIT_LOAD_HOST_PAT | VM_EXIT_LOAD_HOST_EFER @@ -630,8 +645,9 @@ static void nvmx_update_exit_control(struct vcpu *v, unsigned long host_cntrl) static void nvmx_update_entry_control(struct vcpu *v) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - shadow_cntrl = get_vvmcs(v, VM_ENTRY_CONTROLS); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, VM_ENTRY_CONTROLS); shadow_cntrl &= ~(VM_ENTRY_LOAD_GUEST_PAT | VM_ENTRY_LOAD_GUEST_EFER | VM_ENTRY_LOAD_PERF_GLOBAL_CTRL); @@ -645,6 +661,7 @@ void nvmx_update_exception_bitmap(struct vcpu *v, unsigned long value) static void nvmx_update_apic_access_address(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 ctrl; ctrl = __n2_secondary_exec_control(v); @@ -654,7 +671,7 @@ static void nvmx_update_apic_access_address(struct vcpu *v) unsigned long apic_gpfn; struct page_info *apic_pg; - apic_gpfn = get_vvmcs(v, APIC_ACCESS_ADDR) >> PAGE_SHIFT; + apic_gpfn = __get_vvmcs(nvcpu->nv_vvmcx, APIC_ACCESS_ADDR) >> PAGE_SHIFT; apic_pg = get_page_from_gfn(v->domain, apic_gpfn, &p2mt, P2M_ALLOC); ASSERT(apic_pg && !p2m_is_paging(p2mt)); __vmwrite(APIC_ACCESS_ADDR, page_to_maddr(apic_pg)); @@ -666,6 +683,7 @@ static void nvmx_update_apic_access_address(struct vcpu *v) static void nvmx_update_virtual_apic_address(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 ctrl; ctrl = __n2_exec_control(v); @@ -675,7 +693,7 @@ static void nvmx_update_virtual_apic_address(struct vcpu *v) unsigned long vapic_gpfn; struct page_info *vapic_pg; - vapic_gpfn = get_vvmcs(v, VIRTUAL_APIC_PAGE_ADDR) >> PAGE_SHIFT; + vapic_gpfn = __get_vvmcs(nvcpu->nv_vvmcx, VIRTUAL_APIC_PAGE_ADDR) >> PAGE_SHIFT; vapic_pg = get_page_from_gfn(v->domain, vapic_gpfn, &p2mt, P2M_ALLOC); ASSERT(vapic_pg && !p2m_is_paging(p2mt)); __vmwrite(VIRTUAL_APIC_PAGE_ADDR, page_to_maddr(vapic_pg)); @@ -687,20 +705,23 @@ static void nvmx_update_virtual_apic_address(struct vcpu *v) static void nvmx_update_tpr_threshold(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 ctrl = __n2_exec_control(v); - if ( ctrl & CPU_BASED_TPR_SHADOW ) - __vmwrite(TPR_THRESHOLD, get_vvmcs(v, TPR_THRESHOLD)); + __vmwrite(TPR_THRESHOLD, __get_vvmcs(nvcpu->nv_vvmcx, TPR_THRESHOLD)); else __vmwrite(TPR_THRESHOLD, 0); } static void nvmx_update_pfec(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; + __vmwrite(PAGE_FAULT_ERROR_CODE_MASK, - get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MASK)); + __get_vvmcs(vvmcs, PAGE_FAULT_ERROR_CODE_MASK)); __vmwrite(PAGE_FAULT_ERROR_CODE_MATCH, - get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MATCH)); + __get_vvmcs(vvmcs, PAGE_FAULT_ERROR_CODE_MATCH)); } static void __clear_current_vvmcs(struct vcpu *v) @@ -718,7 +739,7 @@ static bool_t __must_check _map_msr_bitmap(struct vcpu *v) if ( nvmx->msrbitmap ) hvm_unmap_guest_frame(nvmx->msrbitmap, 1); - gpa = get_vvmcs(v, MSR_BITMAP); + gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, MSR_BITMAP); nvmx->msrbitmap = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); return nvmx->msrbitmap != NULL; @@ -733,7 +754,7 @@ static bool_t __must_check _map_io_bitmap(struct vcpu *v, u64 vmcs_reg) index = vmcs_reg == IO_BITMAP_A ? 0 : 1; if (nvmx->iobitmap[index]) hvm_unmap_guest_frame(nvmx->iobitmap[index], 1); - gpa = get_vvmcs(v, vmcs_reg); + gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, vmcs_reg); nvmx->iobitmap[index] = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); return nvmx->iobitmap[index] != NULL; @@ -756,7 +777,6 @@ static void nvmx_purge_vvmcs(struct vcpu *v) hvm_unmap_guest_frame(nvcpu->nv_vvmcx, 1); nvcpu->nv_vvmcx = NULL; nvcpu->nv_vvmcxaddr = VMCX_EADDR; - v->arch.hvm_vmx.vmcs_shadow_maddr = 0; for (i=0; i<2; i++) { if ( nvmx->iobitmap[i] ) { hvm_unmap_guest_frame(nvmx->iobitmap[i], 1); @@ -772,10 +792,11 @@ static void nvmx_purge_vvmcs(struct vcpu *v) u64 nvmx_get_tsc_offset(struct vcpu *v) { u64 offset = 0; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - if ( get_vvmcs(v, CPU_BASED_VM_EXEC_CONTROL) & + if ( __get_vvmcs(nvcpu->nv_vvmcx, CPU_BASED_VM_EXEC_CONTROL) & CPU_BASED_USE_TSC_OFFSETING ) - offset = get_vvmcs(v, TSC_OFFSET); + offset = __get_vvmcs(nvcpu->nv_vvmcx, TSC_OFFSET); return offset; } @@ -890,9 +911,12 @@ static struct vmcs_host_to_guest { {HOST_SYSENTER_EIP, GUEST_SYSENTER_EIP}, }; -static void vvmcs_to_shadow(const struct vcpu *v, unsigned int field) +static void vvmcs_to_shadow(void *vvmcs, unsigned int field) { - __vmwrite(field, get_vvmcs(v, field)); + u64 value; + + value = __get_vvmcs(vvmcs, field); + __vmwrite(field, value); } static void vvmcs_to_shadow_bulk(struct vcpu *v, unsigned int n, @@ -926,15 +950,15 @@ static void vvmcs_to_shadow_bulk(struct vcpu *v, unsigned int n, fallback: for ( i = 0; i < n; i++ ) - vvmcs_to_shadow(v, field[i]); + vvmcs_to_shadow(vvmcs, field[i]); } -static inline void shadow_to_vvmcs(const struct vcpu *v, unsigned int field) +static inline void shadow_to_vvmcs(void *vvmcs, unsigned int field) { unsigned long value; if ( __vmread_safe(field, &value) ) - set_vvmcs(v, field, value); + __set_vvmcs(vvmcs, field, value); } static void shadow_to_vvmcs_bulk(struct vcpu *v, unsigned int n, @@ -968,7 +992,7 @@ static void shadow_to_vvmcs_bulk(struct vcpu *v, unsigned int n, fallback: for ( i = 0; i < n; i++ ) - shadow_to_vvmcs(v, field[i]); + shadow_to_vvmcs(vvmcs, field[i]); } static void load_shadow_control(struct vcpu *v) @@ -993,6 +1017,7 @@ static void load_shadow_control(struct vcpu *v) static void load_shadow_guest_state(struct vcpu *v) { struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; u32 control; u64 cr_gh_mask, cr_read_shadow; @@ -1006,18 +1031,18 @@ static void load_shadow_guest_state(struct vcpu *v) vvmcs_to_shadow_bulk(v, ARRAY_SIZE(vmcs_gstate_field), vmcs_gstate_field); - nvcpu->guest_cr[0] = get_vvmcs(v, CR0_READ_SHADOW); - nvcpu->guest_cr[4] = get_vvmcs(v, CR4_READ_SHADOW); - hvm_set_cr0(get_vvmcs(v, GUEST_CR0), 1); - hvm_set_cr4(get_vvmcs(v, GUEST_CR4), 1); - hvm_set_cr3(get_vvmcs(v, GUEST_CR3), 1); + nvcpu->guest_cr[0] = __get_vvmcs(vvmcs, CR0_READ_SHADOW); + nvcpu->guest_cr[4] = __get_vvmcs(vvmcs, CR4_READ_SHADOW); + hvm_set_cr0(__get_vvmcs(vvmcs, GUEST_CR0), 1); + hvm_set_cr4(__get_vvmcs(vvmcs, GUEST_CR4), 1); + hvm_set_cr3(__get_vvmcs(vvmcs, GUEST_CR3), 1); - control = get_vvmcs(v, VM_ENTRY_CONTROLS); + control = __get_vvmcs(vvmcs, VM_ENTRY_CONTROLS); if ( control & VM_ENTRY_LOAD_GUEST_PAT ) - hvm_set_guest_pat(v, get_vvmcs(v, GUEST_PAT)); + hvm_set_guest_pat(v, __get_vvmcs(vvmcs, GUEST_PAT)); if ( control & VM_ENTRY_LOAD_PERF_GLOBAL_CTRL ) hvm_msr_write_intercept(MSR_CORE_PERF_GLOBAL_CTRL, - get_vvmcs(v, GUEST_PERF_GLOBAL_CTRL), 0); + __get_vvmcs(vvmcs, GUEST_PERF_GLOBAL_CTRL), 0); hvm_funcs.set_tsc_offset(v, v->arch.hvm_vcpu.cache_tsc_offset, 0); @@ -1028,14 +1053,14 @@ static void load_shadow_guest_state(struct vcpu *v) * guest host mask to 0xffffffff in shadow VMCS (follow the host L1 VMCS), * then calculate the corresponding read shadow separately for CR0 and CR4. */ - cr_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); - cr_read_shadow = (get_vvmcs(v, GUEST_CR0) & ~cr_gh_mask) | - (get_vvmcs(v, CR0_READ_SHADOW) & cr_gh_mask); + cr_gh_mask = __get_vvmcs(vvmcs, CR0_GUEST_HOST_MASK); + cr_read_shadow = (__get_vvmcs(vvmcs, GUEST_CR0) & ~cr_gh_mask) | + (__get_vvmcs(vvmcs, CR0_READ_SHADOW) & cr_gh_mask); __vmwrite(CR0_READ_SHADOW, cr_read_shadow); - cr_gh_mask = get_vvmcs(v, CR4_GUEST_HOST_MASK); - cr_read_shadow = (get_vvmcs(v, GUEST_CR4) & ~cr_gh_mask) | - (get_vvmcs(v, CR4_READ_SHADOW) & cr_gh_mask); + cr_gh_mask = __get_vvmcs(vvmcs, CR4_GUEST_HOST_MASK); + cr_read_shadow = (__get_vvmcs(vvmcs, GUEST_CR4) & ~cr_gh_mask) | + (__get_vvmcs(vvmcs, CR4_READ_SHADOW) & cr_gh_mask); __vmwrite(CR4_READ_SHADOW, cr_read_shadow); /* TODO: CR3 target control */ @@ -1059,11 +1084,11 @@ static uint64_t get_host_eptp(struct vcpu *v) return ept_get_eptp(ept_data); } -static bool_t nvmx_vpid_enabled(const struct vcpu *v) +static bool_t nvmx_vpid_enabled(struct nestedvcpu *nvcpu) { uint32_t second_cntl; - second_cntl = get_vvmcs(v, SECONDARY_VM_EXEC_CONTROL); + second_cntl = __get_vvmcs(nvcpu->nv_vvmcx, SECONDARY_VM_EXEC_CONTROL); if ( second_cntl & SECONDARY_EXEC_ENABLE_VPID ) return 1; return 0; @@ -1074,38 +1099,32 @@ static void nvmx_set_vmcs_pointer(struct vcpu *v, struct vmcs_struct *vvmcs) unsigned long vvmcs_mfn = domain_page_map_to_mfn(vvmcs); paddr_t vvmcs_maddr = vvmcs_mfn << PAGE_SHIFT; - if ( cpu_has_vmx_vmcs_shadowing ) - { - __vmpclear(vvmcs_maddr); - vvmcs->vmcs_revision_id |= VMCS_RID_TYPE_MASK; - __vmwrite(VMCS_LINK_POINTER, vvmcs_maddr); - __vmwrite(VMREAD_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmread_bitmap)); - __vmwrite(VMWRITE_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmwrite_bitmap)); - } + __vmpclear(vvmcs_maddr); + vvmcs->vmcs_revision_id |= VMCS_RID_TYPE_MASK; v->arch.hvm_vmx.vmcs_shadow_maddr = vvmcs_maddr; + __vmwrite(VMCS_LINK_POINTER, vvmcs_maddr); + __vmwrite(VMREAD_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmread_bitmap)); + __vmwrite(VMWRITE_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmwrite_bitmap)); } static void nvmx_clear_vmcs_pointer(struct vcpu *v, struct vmcs_struct *vvmcs) { - v->arch.hvm_vmx.vmcs_shadow_maddr = 0; + unsigned long vvmcs_mfn = domain_page_map_to_mfn(vvmcs); + paddr_t vvmcs_maddr = vvmcs_mfn << PAGE_SHIFT; - if ( cpu_has_vmx_vmcs_shadowing ) - { - unsigned long vvmcs_mfn = domain_page_map_to_mfn(vvmcs); - paddr_t vvmcs_maddr = vvmcs_mfn << PAGE_SHIFT; - - __vmpclear(vvmcs_maddr); - vvmcs->vmcs_revision_id &= ~VMCS_RID_TYPE_MASK; - __vmwrite(VMCS_LINK_POINTER, ~0ul); - __vmwrite(VMREAD_BITMAP, 0); - __vmwrite(VMWRITE_BITMAP, 0); - } + __vmpclear(vvmcs_maddr); + vvmcs->vmcs_revision_id &= ~VMCS_RID_TYPE_MASK; + v->arch.hvm_vmx.vmcs_shadow_maddr = 0; + __vmwrite(VMCS_LINK_POINTER, ~0ul); + __vmwrite(VMREAD_BITMAP, 0); + __vmwrite(VMWRITE_BITMAP, 0); } static void virtual_vmentry(struct cpu_user_regs *regs) { struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; unsigned long lm_l1, lm_l2; vmx_vmcs_switch(v->arch.hvm_vmx.vmcs_pa, nvcpu->nv_n2vmcx_pa); @@ -1124,7 +1143,8 @@ static void virtual_vmentry(struct cpu_user_regs *regs) * L1 exit_controls */ lm_l1 = !!hvm_long_mode_enabled(v); - lm_l2 = !!(get_vvmcs(v, VM_ENTRY_CONTROLS) & VM_ENTRY_IA32E_MODE); + lm_l2 = !!(__get_vvmcs(vvmcs, VM_ENTRY_CONTROLS) & + VM_ENTRY_IA32E_MODE); if ( lm_l2 ) v->arch.hvm_vcpu.guest_efer |= EFER_LMA | EFER_LME; @@ -1141,9 +1161,9 @@ static void virtual_vmentry(struct cpu_user_regs *regs) !(v->arch.hvm_vcpu.guest_efer & EFER_LMA) ) vvmcs_to_shadow_bulk(v, ARRAY_SIZE(gpdpte_fields), gpdpte_fields); - regs->eip = get_vvmcs(v, GUEST_RIP); - regs->esp = get_vvmcs(v, GUEST_RSP); - regs->eflags = get_vvmcs(v, GUEST_RFLAGS); + regs->eip = __get_vvmcs(vvmcs, GUEST_RIP); + regs->esp = __get_vvmcs(vvmcs, GUEST_RSP); + regs->eflags = __get_vvmcs(vvmcs, GUEST_RFLAGS); /* updating host cr0 to sync TS bit */ __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); @@ -1155,10 +1175,10 @@ static void virtual_vmentry(struct cpu_user_regs *regs) __vmwrite(EPT_POINTER, get_host_eptp(v)); /* nested VPID support! */ - if ( cpu_has_vmx_vpid && nvmx_vpid_enabled(v) ) + if ( cpu_has_vmx_vpid && nvmx_vpid_enabled(nvcpu) ) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); - uint32_t new_vpid = get_vvmcs(v, VIRTUAL_PROCESSOR_ID); + uint32_t new_vpid = __get_vvmcs(vvmcs, VIRTUAL_PROCESSOR_ID); if ( nvmx->guest_vpid != new_vpid ) { @@ -1171,29 +1191,34 @@ static void virtual_vmentry(struct cpu_user_regs *regs) static void sync_vvmcs_guest_state(struct vcpu *v, struct cpu_user_regs *regs) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; + /* copy shadow vmcs.gstate back to vvmcs.gstate */ shadow_to_vvmcs_bulk(v, ARRAY_SIZE(vmcs_gstate_field), vmcs_gstate_field); /* RIP, RSP are in user regs */ - set_vvmcs(v, GUEST_RIP, regs->eip); - set_vvmcs(v, GUEST_RSP, regs->esp); + __set_vvmcs(vvmcs, GUEST_RIP, regs->eip); + __set_vvmcs(vvmcs, GUEST_RSP, regs->esp); /* CR3 sync if exec doesn't want cr3 load exiting: i.e. nested EPT */ if ( !(__n2_exec_control(v) & CPU_BASED_CR3_LOAD_EXITING) ) - shadow_to_vvmcs(v, GUEST_CR3); + shadow_to_vvmcs(vvmcs, GUEST_CR3); } static void sync_vvmcs_ro(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + void *vvmcs = nvcpu->nv_vvmcx; shadow_to_vvmcs_bulk(v, ARRAY_SIZE(vmcs_ro_field), vmcs_ro_field); /* Adjust exit_reason/exit_qualifciation for violation case */ - if ( get_vvmcs(v, VM_EXIT_REASON) == EXIT_REASON_EPT_VIOLATION ) + if ( __get_vvmcs(vvmcs, VM_EXIT_REASON) == EXIT_REASON_EPT_VIOLATION ) { - set_vvmcs(v, EXIT_QUALIFICATION, nvmx->ept.exit_qual); - set_vvmcs(v, VM_EXIT_REASON, nvmx->ept.exit_reason); + __set_vvmcs(vvmcs, EXIT_QUALIFICATION, nvmx->ept.exit_qual); + __set_vvmcs(vvmcs, VM_EXIT_REASON, nvmx->ept.exit_reason); } } @@ -1201,32 +1226,34 @@ static void load_vvmcs_host_state(struct vcpu *v) { int i; u64 r; + void *vvmcs = vcpu_nestedhvm(v).nv_vvmcx; u32 control; for ( i = 0; i < ARRAY_SIZE(vmcs_h2g_field); i++ ) { - r = get_vvmcs(v, vmcs_h2g_field[i].host_field); + r = __get_vvmcs(vvmcs, vmcs_h2g_field[i].host_field); __vmwrite(vmcs_h2g_field[i].guest_field, r); } - hvm_set_cr0(get_vvmcs(v, HOST_CR0), 1); - hvm_set_cr4(get_vvmcs(v, HOST_CR4), 1); - hvm_set_cr3(get_vvmcs(v, HOST_CR3), 1); + hvm_set_cr0(__get_vvmcs(vvmcs, HOST_CR0), 1); + hvm_set_cr4(__get_vvmcs(vvmcs, HOST_CR4), 1); + hvm_set_cr3(__get_vvmcs(vvmcs, HOST_CR3), 1); - control = get_vvmcs(v, VM_EXIT_CONTROLS); + control = __get_vvmcs(vvmcs, VM_EXIT_CONTROLS); if ( control & VM_EXIT_LOAD_HOST_PAT ) - hvm_set_guest_pat(v, get_vvmcs(v, HOST_PAT)); + hvm_set_guest_pat(v, __get_vvmcs(vvmcs, HOST_PAT)); if ( control & VM_EXIT_LOAD_PERF_GLOBAL_CTRL ) hvm_msr_write_intercept(MSR_CORE_PERF_GLOBAL_CTRL, - get_vvmcs(v, HOST_PERF_GLOBAL_CTRL), 1); + __get_vvmcs(vvmcs, HOST_PERF_GLOBAL_CTRL), 1); hvm_funcs.set_tsc_offset(v, v->arch.hvm_vcpu.cache_tsc_offset, 0); - set_vvmcs(v, VM_ENTRY_INTR_INFO, 0); + __set_vvmcs(vvmcs, VM_ENTRY_INTR_INFO, 0); } static void sync_exception_state(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); if ( !(nvmx->intr.intr_info & INTR_INFO_VALID_MASK) ) @@ -1236,9 +1263,10 @@ static void sync_exception_state(struct vcpu *v) { case X86_EVENTTYPE_EXT_INTR: /* rename exit_reason to EXTERNAL_INTERRUPT */ - set_vvmcs(v, VM_EXIT_REASON, EXIT_REASON_EXTERNAL_INTERRUPT); - set_vvmcs(v, EXIT_QUALIFICATION, 0); - set_vvmcs(v, VM_EXIT_INTR_INFO, + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_REASON, + EXIT_REASON_EXTERNAL_INTERRUPT); + __set_vvmcs(nvcpu->nv_vvmcx, EXIT_QUALIFICATION, 0); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO, nvmx->intr.intr_info); break; @@ -1246,13 +1274,17 @@ static void sync_exception_state(struct vcpu *v) case X86_EVENTTYPE_SW_INTERRUPT: case X86_EVENTTYPE_SW_EXCEPTION: /* throw to L1 */ - set_vvmcs(v, VM_EXIT_INTR_INFO, nvmx->intr.intr_info); - set_vvmcs(v, VM_EXIT_INTR_ERROR_CODE, nvmx->intr.error_code); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO, + nvmx->intr.intr_info); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_ERROR_CODE, + nvmx->intr.error_code); break; case X86_EVENTTYPE_NMI: - set_vvmcs(v, VM_EXIT_REASON, EXIT_REASON_EXCEPTION_NMI); - set_vvmcs(v, EXIT_QUALIFICATION, 0); - set_vvmcs(v, VM_EXIT_INTR_INFO, nvmx->intr.intr_info); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_REASON, + EXIT_REASON_EXCEPTION_NMI); + __set_vvmcs(nvcpu->nv_vvmcx, EXIT_QUALIFICATION, 0); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO, + nvmx->intr.intr_info); break; default: gdprintk(XENLOG_ERR, "Exception state %lx not handled\n", @@ -1264,8 +1296,9 @@ static void sync_exception_state(struct vcpu *v) static void nvmx_update_apicv(struct vcpu *v) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); - unsigned long reason = get_vvmcs(v, VM_EXIT_REASON); - uint32_t intr_info = get_vvmcs(v, VM_EXIT_INTR_INFO); + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + unsigned long reason = __get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_REASON); + uint32_t intr_info = __get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO); if ( reason == EXIT_REASON_EXTERNAL_INTERRUPT && nvmx->intr.source == hvm_intsrc_lapic && @@ -1311,7 +1344,8 @@ static void virtual_vmexit(struct cpu_user_regs *regs) nvcpu->nv_vmswitch_in_progress = 1; lm_l2 = !!hvm_long_mode_enabled(v); - lm_l1 = !!(get_vvmcs(v, VM_EXIT_CONTROLS) & VM_EXIT_IA32E_MODE); + lm_l1 = !!(__get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_CONTROLS) & + VM_EXIT_IA32E_MODE); if ( lm_l1 ) v->arch.hvm_vcpu.guest_efer |= EFER_LMA | EFER_LME; @@ -1327,8 +1361,8 @@ static void virtual_vmexit(struct cpu_user_regs *regs) if ( lm_l1 != lm_l2 ) paging_update_paging_modes(v); - regs->eip = get_vvmcs(v, HOST_RIP); - regs->esp = get_vvmcs(v, HOST_RSP); + regs->eip = __get_vvmcs(nvcpu->nv_vvmcx, HOST_RIP); + regs->esp = __get_vvmcs(nvcpu->nv_vvmcx, HOST_RSP); /* VM exit clears all bits except bit 1 */ regs->eflags = 0x2; @@ -1505,6 +1539,7 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) { bool_t launched; struct vcpu *v = current; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); int rc = vmx_inst_check_privilege(regs, 0); @@ -1518,7 +1553,7 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) } launched = vvmcs_launched(&nvmx->launched_list, - PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr)); + domain_page_map_to_mfn(nvcpu->nv_vvmcx)); if ( !launched ) { vmreturn (regs, VMFAIL_VALID); return X86EMUL_OKAY; @@ -1530,6 +1565,7 @@ int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { bool_t launched; struct vcpu *v = current; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); int rc = vmx_inst_check_privilege(regs, 0); @@ -1543,7 +1579,7 @@ int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) } launched = vvmcs_launched(&nvmx->launched_list, - PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr)); + domain_page_map_to_mfn(nvcpu->nv_vvmcx)); if ( launched ) { vmreturn (regs, VMFAIL_VALID); return X86EMUL_OKAY; @@ -1553,7 +1589,7 @@ int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) if ( rc == X86EMUL_OKAY ) { if ( set_vvmcs_launched(&nvmx->launched_list, - PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr)) < 0 ) + domain_page_map_to_mfn(nvcpu->nv_vvmcx)) < 0 ) return X86EMUL_UNHANDLEABLE; } } @@ -1608,7 +1644,8 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) } } - nvmx_set_vmcs_pointer(v, nvcpu->nv_vvmcx); + if ( cpu_has_vmx_vmcs_shadowing ) + nvmx_set_vmcs_pointer(v, nvcpu->nv_vvmcx); vmreturn(regs, VMSUCCEED); @@ -1657,10 +1694,10 @@ int nvmx_handle_vmclear(struct cpu_user_regs *regs) rc = VMFAIL_INVALID; else if ( gpa == nvcpu->nv_vvmcxaddr ) { - unsigned long mfn = PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr); - - nvmx_clear_vmcs_pointer(v, nvcpu->nv_vvmcx); - clear_vvmcs_launched(&nvmx->launched_list, mfn); + if ( cpu_has_vmx_vmcs_shadowing ) + nvmx_clear_vmcs_pointer(v, nvcpu->nv_vvmcx); + clear_vvmcs_launched(&nvmx->launched_list, + domain_page_map_to_mfn(nvcpu->nv_vvmcx)); nvmx_purge_vvmcs(v); } else @@ -1689,6 +1726,7 @@ int nvmx_handle_vmread(struct cpu_user_regs *regs) { struct vcpu *v = current; struct vmx_inst_decoded decode; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u64 value = 0; int rc; @@ -1696,7 +1734,7 @@ int nvmx_handle_vmread(struct cpu_user_regs *regs) if ( rc != X86EMUL_OKAY ) return rc; - value = get_vvmcs(v, reg_read(regs, decode.reg2)); + value = __get_vvmcs(nvcpu->nv_vvmcx, reg_read(regs, decode.reg2)); switch ( decode.type ) { case VMX_INST_MEMREG_TYPE_MEMORY: @@ -1717,6 +1755,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) { struct vcpu *v = current; struct vmx_inst_decoded decode; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); unsigned long operand; u64 vmcs_encoding; bool_t okay = 1; @@ -1726,7 +1765,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) return X86EMUL_EXCEPTION; vmcs_encoding = reg_read(regs, decode.reg2); - set_vvmcs(v, vmcs_encoding, operand); + __set_vvmcs(nvcpu->nv_vvmcx, vmcs_encoding, operand); switch ( vmcs_encoding & ~VMCS_HIGH(0) ) { @@ -2158,7 +2197,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, } else if ( (intr_info & valid_mask) == valid_mask ) { - exec_bitmap = get_vvmcs(v, EXCEPTION_BITMAP); + exec_bitmap =__get_vvmcs(nvcpu->nv_vvmcx, EXCEPTION_BITMAP); if ( exec_bitmap & (1 << vector) ) nvcpu->nv_vmexit_pending = 1; @@ -2277,7 +2316,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, * special handler is needed if L1 doesn't intercept rdtsc, * avoiding changing guest_tsc and messing up timekeeping in L1 */ - tsc = hvm_get_guest_tsc(v) + get_vvmcs(v, TSC_OFFSET); + tsc = hvm_get_guest_tsc(v); + tsc += __get_vvmcs(nvcpu->nv_vvmcx, TSC_OFFSET); regs->eax = (uint32_t)tsc; regs->edx = (uint32_t)(tsc >> 32); update_guest_eip(); @@ -2366,7 +2406,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, val = *reg; if ( cr == 0 ) { - u64 cr0_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); + u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); __vmread(CR0_READ_SHADOW, &old_val); changed_bits = old_val ^ val; @@ -2374,15 +2414,14 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr0 = get_vvmcs(v, GUEST_CR0); - - set_vvmcs(v, GUEST_CR0, - (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); + u64 guest_cr0 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0, + (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); } } else if ( cr == 4 ) { - u64 cr4_gh_mask = get_vvmcs(v, CR4_GUEST_HOST_MASK); + u64 cr4_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR4_GUEST_HOST_MASK); __vmread(CR4_READ_SHADOW, &old_val); changed_bits = old_val ^ val; @@ -2390,10 +2429,9 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr4 = get_vvmcs(v, GUEST_CR4); - - set_vvmcs(v, GUEST_CR4, - (guest_cr4 & cr4_gh_mask) | (val & ~cr4_gh_mask)); + u64 guest_cr4 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR4); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR4, + (guest_cr4 & cr4_gh_mask) | (val & ~cr4_gh_mask)); } } else @@ -2402,21 +2440,20 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, } case VMX_CONTROL_REG_ACCESS_TYPE_CLTS: { - u64 cr0_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); + u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); if ( cr0_gh_mask & X86_CR0_TS ) nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr0 = get_vvmcs(v, GUEST_CR0); - - set_vvmcs(v, GUEST_CR0, (guest_cr0 & ~X86_CR0_TS)); + u64 guest_cr0 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0, (guest_cr0 & ~X86_CR0_TS)); } break; } case VMX_CONTROL_REG_ACCESS_TYPE_LMSW: { - u64 cr0_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); + u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); __vmread(CR0_READ_SHADOW, &old_val); old_val &= X86_CR0_PE|X86_CR0_MP|X86_CR0_EM|X86_CR0_TS; @@ -2427,9 +2464,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr0 = get_vvmcs(v, GUEST_CR0); - - set_vvmcs(v, GUEST_CR0, (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); + u64 guest_cr0 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0, (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); } break; } @@ -2481,7 +2517,7 @@ void nvmx_set_cr_read_shadow(struct vcpu *v, unsigned int cr) if ( !nestedhvm_vmswitch_in_progress(v) ) { unsigned long virtual_cr_mask = - get_vvmcs(v, mask_field); + __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, mask_field); /* * We get here when L2 changed cr in a way that did not change @@ -2493,7 +2529,7 @@ void nvmx_set_cr_read_shadow(struct vcpu *v, unsigned int cr) */ v->arch.hvm_vcpu.guest_cr[cr] &= ~virtual_cr_mask; v->arch.hvm_vcpu.guest_cr[cr] |= virtual_cr_mask & - get_vvmcs(v, cr_field); + __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, cr_field); } /* nvcpu.guest_cr is what L2 write to cr actually. */ diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index b3b0946..a8d4d5b 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -105,7 +105,7 @@ struct arch_vmx_struct { /* Physical address of VMCS. */ paddr_t vmcs_pa; /* VMCS shadow machine address. */ - paddr_t vmcs_shadow_maddr; + paddr_t vmcs_shadow_maddr; /* Protects remote usage of VMCS (VMPTRLD/VMCLEAR). */ spinlock_t vmcs_lock; @@ -506,10 +506,10 @@ void vmx_vmcs_switch(paddr_t from, paddr_t to); void vmx_set_eoi_exit_bitmap(struct vcpu *v, u8 vector); void vmx_clear_eoi_exit_bitmap(struct vcpu *v, u8 vector); int vmx_check_msr_bitmap(unsigned long *msr_bitmap, u32 msr, int access_type); -void virtual_vmcs_enter(const struct vcpu *); -void virtual_vmcs_exit(const struct vcpu *); -u64 virtual_vmcs_vmread(const struct vcpu *, u32 encoding); -void virtual_vmcs_vmwrite(const struct vcpu *, u32 encoding, u64 val); +void virtual_vmcs_enter(void *vvmcs); +void virtual_vmcs_exit(void *vvmcs); +u64 virtual_vmcs_vmread(void *vvmcs, u32 vmcs_encoding); +void virtual_vmcs_vmwrite(void *vvmcs, u32 vmcs_encoding, u64 val); static inline int vmx_add_guest_msr(u32 msr) { diff --git a/xen/include/asm-x86/hvm/vmx/vvmx.h b/xen/include/asm-x86/hvm/vmx/vvmx.h index aca8b4b..60fdc21 100644 --- a/xen/include/asm-x86/hvm/vmx/vvmx.h +++ b/xen/include/asm-x86/hvm/vmx/vvmx.h @@ -181,20 +181,18 @@ enum vvmcs_encoding_type { VVMCS_TYPE_HSTATE, }; -u64 get_vvmcs_virtual(void *vvmcs, u32 encoding); -u64 get_vvmcs_real(const struct vcpu *, u32 encoding); -void set_vvmcs_virtual(void *vvmcs, u32 encoding, u64 val); -void set_vvmcs_real(const struct vcpu *, u32 encoding, u64 val); - -#define get_vvmcs(vcpu, encoding) \ - (cpu_has_vmx_vmcs_shadowing ? \ - get_vvmcs_real(vcpu, encoding) : \ - get_vvmcs_virtual(vcpu_nestedhvm(vcpu).nv_vvmcx, encoding)) - -#define set_vvmcs(vcpu, encoding, val) \ - (cpu_has_vmx_vmcs_shadowing ? \ - set_vvmcs_real(vcpu, encoding, val) : \ - set_vvmcs_virtual(vcpu_nestedhvm(vcpu).nv_vvmcx, encoding, val)) +u64 __get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding); +u64 __get_vvmcs_real(void *vvmcs, u32 vmcs_encoding); +void __set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val); +void __set_vvmcs_real(void *vvmcs, u32 vmcs_encoding, u64 val); + +#define __get_vvmcs(_vvmcs, _vmcs_encoding) \ + (cpu_has_vmx_vmcs_shadowing ? __get_vvmcs_real(_vvmcs, _vmcs_encoding) \ + : __get_vvmcs_virtual(_vvmcs, _vmcs_encoding)) + +#define __set_vvmcs(_vvmcs, _vmcs_encoding, _val) \ + (cpu_has_vmx_vmcs_shadowing ? __set_vvmcs_real(_vvmcs, _vmcs_encoding, _val) \ + : __set_vvmcs_virtual(_vvmcs, _vmcs_encoding, _val)) uint64_t get_shadow_eptp(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Ni6-0001BJ-Is; Fri, 11 Dec 2015 13:26:10 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni5-0001A5-Gd for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:09 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id B4/A1-09834-0FECA665; Fri, 11 Dec 2015 13:26:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1449840365!10500416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46906 invoked from network); 11 Dec 2015 13:26:07 -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 2015 13:26:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mp5-0002PT-Kz for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mp5-0006tP-EN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:29:19 +0000 Date: Fri, 11 Dec 2015 12:29:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "vVMX: use latched VMCS machine address" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 234524a095896d9b51bd72f8d8d12d87aabb22f3 Author: Jan Beulich AuthorDate: Tue Dec 8 09:43:59 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 09:43:59 2015 +0100 Revert "vVMX: use latched VMCS machine address" This reverts commit d02e84b9d9d16b6b56186f0dfdcb3c90b83c82a3, causing a regression on some systems. --- xen/arch/x86/hvm/vmx/intr.c | 4 +- xen/arch/x86/hvm/vmx/vmcs.c | 21 ++-- xen/arch/x86/hvm/vmx/vmx.c | 6 +- xen/arch/x86/hvm/vmx/vvmx.c | 308 ++++++++++++++++++++---------------- xen/include/asm-x86/hvm/vmx/vmcs.h | 10 +- xen/include/asm-x86/hvm/vmx/vvmx.h | 26 ++-- 6 files changed, 206 insertions(+), 169 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c index 8fca08c..56c40b1 100644 --- a/xen/arch/x86/hvm/vmx/intr.c +++ b/xen/arch/x86/hvm/vmx/intr.c @@ -191,13 +191,13 @@ static int nvmx_intr_intercept(struct vcpu *v, struct hvm_intack intack) if ( intack.source == hvm_intsrc_pic || intack.source == hvm_intsrc_lapic ) { - ctrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + ctrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); if ( !(ctrl & PIN_BASED_EXT_INTR_MASK) ) return 0; vmx_inject_extint(intack.vector, intack.source); - ctrl = get_vvmcs(v, VM_EXIT_CONTROLS); + ctrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, VM_EXIT_CONTROLS); if ( ctrl & VM_EXIT_ACK_INTR_ON_EXIT ) { /* for now, duplicate the ack path in vmx_intr_assist */ diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index dbf284d..edd4c8d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -934,36 +934,37 @@ void vmx_vmcs_switch(paddr_t from, paddr_t to) spin_unlock(&vmx->vmcs_lock); } -void virtual_vmcs_enter(const struct vcpu *v) +void virtual_vmcs_enter(void *vvmcs) { - __vmptrld(v->arch.hvm_vmx.vmcs_shadow_maddr); + __vmptrld(pfn_to_paddr(domain_page_map_to_mfn(vvmcs))); } -void virtual_vmcs_exit(const struct vcpu *v) +void virtual_vmcs_exit(void *vvmcs) { paddr_t cur = this_cpu(current_vmcs); - __vmpclear(v->arch.hvm_vmx.vmcs_shadow_maddr); + __vmpclear(pfn_to_paddr(domain_page_map_to_mfn(vvmcs))); if ( cur ) __vmptrld(cur); + } -u64 virtual_vmcs_vmread(const struct vcpu *v, u32 vmcs_encoding) +u64 virtual_vmcs_vmread(void *vvmcs, u32 vmcs_encoding) { u64 res; - virtual_vmcs_enter(v); + virtual_vmcs_enter(vvmcs); __vmread(vmcs_encoding, &res); - virtual_vmcs_exit(v); + virtual_vmcs_exit(vvmcs); return res; } -void virtual_vmcs_vmwrite(const struct vcpu *v, u32 vmcs_encoding, u64 val) +void virtual_vmcs_vmwrite(void *vvmcs, u32 vmcs_encoding, u64 val) { - virtual_vmcs_enter(v); + virtual_vmcs_enter(vvmcs); __vmwrite(vmcs_encoding, val); - virtual_vmcs_exit(v); + virtual_vmcs_exit(vvmcs); } /* diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2581e97..f7c5e4f 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1477,7 +1477,8 @@ void vmx_inject_extint(int trap, uint8_t source) u32 pin_based_cntrl; if ( nestedhvm_vcpu_in_guestmode(v) ) { - pin_based_cntrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + pin_based_cntrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, + PIN_BASED_VM_EXEC_CONTROL); if ( pin_based_cntrl & PIN_BASED_EXT_INTR_MASK ) { nvmx_enqueue_n2_exceptions (v, INTR_INFO_VALID_MASK | @@ -1497,7 +1498,8 @@ void vmx_inject_nmi(void) u32 pin_based_cntrl; if ( nestedhvm_vcpu_in_guestmode(v) ) { - pin_based_cntrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + pin_based_cntrl = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, + PIN_BASED_VM_EXEC_CONTROL); if ( pin_based_cntrl & PIN_BASED_NMI_EXITING ) { nvmx_enqueue_n2_exceptions (v, INTR_INFO_VALID_MASK | diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index e48d872..ea1052e 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -175,7 +175,11 @@ int nvmx_vcpu_reset(struct vcpu *v) uint64_t nvmx_vcpu_eptp_base(struct vcpu *v) { - return get_vvmcs(v, EPT_POINTER) & PAGE_MASK; + uint64_t eptp_base; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + eptp_base = __get_vvmcs(nvcpu->nv_vvmcx, EPT_POINTER); + return eptp_base & PAGE_MASK; } bool_t nvmx_ept_enabled(struct vcpu *v) @@ -232,7 +236,7 @@ static int vvmcs_offset(u32 width, u32 type, u32 index) return offset; } -u64 get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding) +u64 __get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding) { union vmcs_encoding enc; u64 *content = (u64 *) vvmcs; @@ -262,12 +266,12 @@ u64 get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding) return res; } -u64 get_vvmcs_real(const struct vcpu *v, u32 encoding) +u64 __get_vvmcs_real(void *vvmcs, u32 vmcs_encoding) { - return virtual_vmcs_vmread(v, encoding); + return virtual_vmcs_vmread(vvmcs, vmcs_encoding); } -void set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val) +void __set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val) { union vmcs_encoding enc; u64 *content = (u64 *) vvmcs; @@ -303,9 +307,9 @@ void set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val) content[offset] = res; } -void set_vvmcs_real(const struct vcpu *v, u32 encoding, u64 val) +void __set_vvmcs_real(void *vvmcs, u32 vmcs_encoding, u64 val) { - virtual_vmcs_vmwrite(v, encoding, val); + virtual_vmcs_vmwrite(vvmcs, vmcs_encoding, val); } static unsigned long reg_read(struct cpu_user_regs *regs, @@ -327,20 +331,25 @@ static void reg_write(struct cpu_user_regs *regs, static inline u32 __n2_pin_exec_control(struct vcpu *v) { - return get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + return __get_vvmcs(nvcpu->nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); } static inline u32 __n2_exec_control(struct vcpu *v) { - return get_vvmcs(v, CPU_BASED_VM_EXEC_CONTROL); + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + return __get_vvmcs(nvcpu->nv_vvmcx, CPU_BASED_VM_EXEC_CONTROL); } static inline u32 __n2_secondary_exec_control(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u64 second_ctrl = 0; if ( __n2_exec_control(v) & CPU_BASED_ACTIVATE_SECONDARY_CONTROLS ) - second_ctrl = get_vvmcs(v, SECONDARY_VM_EXEC_CONTROL); + second_ctrl = __get_vvmcs(nvcpu->nv_vvmcx, SECONDARY_VM_EXEC_CONTROL); return second_ctrl; } @@ -493,17 +502,18 @@ static void vmreturn(struct cpu_user_regs *regs, enum vmx_ops_result ops_res) bool_t nvmx_intercepts_exception(struct vcpu *v, unsigned int trap, int error_code) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 exception_bitmap, pfec_match=0, pfec_mask=0; int r; ASSERT ( trap < 32 ); - exception_bitmap = get_vvmcs(v, EXCEPTION_BITMAP); + exception_bitmap = __get_vvmcs(nvcpu->nv_vvmcx, EXCEPTION_BITMAP); r = exception_bitmap & (1 << trap) ? 1: 0; if ( trap == TRAP_page_fault ) { - pfec_match = get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MATCH); - pfec_mask = get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MASK); + pfec_match = __get_vvmcs(nvcpu->nv_vvmcx, PAGE_FAULT_ERROR_CODE_MATCH); + pfec_mask = __get_vvmcs(nvcpu->nv_vvmcx, PAGE_FAULT_ERROR_CODE_MASK); if ( (error_code & pfec_mask) != pfec_match ) r = !r; } @@ -518,7 +528,9 @@ static inline u32 __shadow_control(struct vcpu *v, unsigned int field, u32 host_value) { - return get_vvmcs(v, field) | host_value; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + + return (u32) __get_vvmcs(nvcpu->nv_vvmcx, field) | host_value; } static void set_shadow_control(struct vcpu *v, @@ -585,12 +597,13 @@ void nvmx_update_secondary_exec_control(struct vcpu *v, unsigned long host_cntrl) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); u32 apicv_bit = SECONDARY_EXEC_APIC_REGISTER_VIRT | SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY; host_cntrl &= ~apicv_bit; - shadow_cntrl = get_vvmcs(v, SECONDARY_VM_EXEC_CONTROL); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, SECONDARY_VM_EXEC_CONTROL); /* No vAPIC-v support, so it shouldn't be set in vmcs12. */ ASSERT(!(shadow_cntrl & apicv_bit)); @@ -603,9 +616,10 @@ void nvmx_update_secondary_exec_control(struct vcpu *v, static void nvmx_update_pin_control(struct vcpu *v, unsigned long host_cntrl) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); host_cntrl &= ~PIN_BASED_POSTED_INTERRUPT; - shadow_cntrl = get_vvmcs(v, PIN_BASED_VM_EXEC_CONTROL); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, PIN_BASED_VM_EXEC_CONTROL); /* No vAPIC-v support, so it shouldn't be set in vmcs12. */ ASSERT(!(shadow_cntrl & PIN_BASED_POSTED_INTERRUPT)); @@ -617,8 +631,9 @@ static void nvmx_update_pin_control(struct vcpu *v, unsigned long host_cntrl) static void nvmx_update_exit_control(struct vcpu *v, unsigned long host_cntrl) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - shadow_cntrl = get_vvmcs(v, VM_EXIT_CONTROLS); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_CONTROLS); shadow_cntrl &= ~(VM_EXIT_SAVE_DEBUG_CNTRLS | VM_EXIT_LOAD_HOST_PAT | VM_EXIT_LOAD_HOST_EFER @@ -630,8 +645,9 @@ static void nvmx_update_exit_control(struct vcpu *v, unsigned long host_cntrl) static void nvmx_update_entry_control(struct vcpu *v) { u32 shadow_cntrl; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - shadow_cntrl = get_vvmcs(v, VM_ENTRY_CONTROLS); + shadow_cntrl = __get_vvmcs(nvcpu->nv_vvmcx, VM_ENTRY_CONTROLS); shadow_cntrl &= ~(VM_ENTRY_LOAD_GUEST_PAT | VM_ENTRY_LOAD_GUEST_EFER | VM_ENTRY_LOAD_PERF_GLOBAL_CTRL); @@ -645,6 +661,7 @@ void nvmx_update_exception_bitmap(struct vcpu *v, unsigned long value) static void nvmx_update_apic_access_address(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 ctrl; ctrl = __n2_secondary_exec_control(v); @@ -654,7 +671,7 @@ static void nvmx_update_apic_access_address(struct vcpu *v) unsigned long apic_gpfn; struct page_info *apic_pg; - apic_gpfn = get_vvmcs(v, APIC_ACCESS_ADDR) >> PAGE_SHIFT; + apic_gpfn = __get_vvmcs(nvcpu->nv_vvmcx, APIC_ACCESS_ADDR) >> PAGE_SHIFT; apic_pg = get_page_from_gfn(v->domain, apic_gpfn, &p2mt, P2M_ALLOC); ASSERT(apic_pg && !p2m_is_paging(p2mt)); __vmwrite(APIC_ACCESS_ADDR, page_to_maddr(apic_pg)); @@ -666,6 +683,7 @@ static void nvmx_update_apic_access_address(struct vcpu *v) static void nvmx_update_virtual_apic_address(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 ctrl; ctrl = __n2_exec_control(v); @@ -675,7 +693,7 @@ static void nvmx_update_virtual_apic_address(struct vcpu *v) unsigned long vapic_gpfn; struct page_info *vapic_pg; - vapic_gpfn = get_vvmcs(v, VIRTUAL_APIC_PAGE_ADDR) >> PAGE_SHIFT; + vapic_gpfn = __get_vvmcs(nvcpu->nv_vvmcx, VIRTUAL_APIC_PAGE_ADDR) >> PAGE_SHIFT; vapic_pg = get_page_from_gfn(v->domain, vapic_gpfn, &p2mt, P2M_ALLOC); ASSERT(vapic_pg && !p2m_is_paging(p2mt)); __vmwrite(VIRTUAL_APIC_PAGE_ADDR, page_to_maddr(vapic_pg)); @@ -687,20 +705,23 @@ static void nvmx_update_virtual_apic_address(struct vcpu *v) static void nvmx_update_tpr_threshold(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u32 ctrl = __n2_exec_control(v); - if ( ctrl & CPU_BASED_TPR_SHADOW ) - __vmwrite(TPR_THRESHOLD, get_vvmcs(v, TPR_THRESHOLD)); + __vmwrite(TPR_THRESHOLD, __get_vvmcs(nvcpu->nv_vvmcx, TPR_THRESHOLD)); else __vmwrite(TPR_THRESHOLD, 0); } static void nvmx_update_pfec(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; + __vmwrite(PAGE_FAULT_ERROR_CODE_MASK, - get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MASK)); + __get_vvmcs(vvmcs, PAGE_FAULT_ERROR_CODE_MASK)); __vmwrite(PAGE_FAULT_ERROR_CODE_MATCH, - get_vvmcs(v, PAGE_FAULT_ERROR_CODE_MATCH)); + __get_vvmcs(vvmcs, PAGE_FAULT_ERROR_CODE_MATCH)); } static void __clear_current_vvmcs(struct vcpu *v) @@ -718,7 +739,7 @@ static bool_t __must_check _map_msr_bitmap(struct vcpu *v) if ( nvmx->msrbitmap ) hvm_unmap_guest_frame(nvmx->msrbitmap, 1); - gpa = get_vvmcs(v, MSR_BITMAP); + gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, MSR_BITMAP); nvmx->msrbitmap = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); return nvmx->msrbitmap != NULL; @@ -733,7 +754,7 @@ static bool_t __must_check _map_io_bitmap(struct vcpu *v, u64 vmcs_reg) index = vmcs_reg == IO_BITMAP_A ? 0 : 1; if (nvmx->iobitmap[index]) hvm_unmap_guest_frame(nvmx->iobitmap[index], 1); - gpa = get_vvmcs(v, vmcs_reg); + gpa = __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, vmcs_reg); nvmx->iobitmap[index] = hvm_map_guest_frame_ro(gpa >> PAGE_SHIFT, 1); return nvmx->iobitmap[index] != NULL; @@ -756,7 +777,6 @@ static void nvmx_purge_vvmcs(struct vcpu *v) hvm_unmap_guest_frame(nvcpu->nv_vvmcx, 1); nvcpu->nv_vvmcx = NULL; nvcpu->nv_vvmcxaddr = VMCX_EADDR; - v->arch.hvm_vmx.vmcs_shadow_maddr = 0; for (i=0; i<2; i++) { if ( nvmx->iobitmap[i] ) { hvm_unmap_guest_frame(nvmx->iobitmap[i], 1); @@ -772,10 +792,11 @@ static void nvmx_purge_vvmcs(struct vcpu *v) u64 nvmx_get_tsc_offset(struct vcpu *v) { u64 offset = 0; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); - if ( get_vvmcs(v, CPU_BASED_VM_EXEC_CONTROL) & + if ( __get_vvmcs(nvcpu->nv_vvmcx, CPU_BASED_VM_EXEC_CONTROL) & CPU_BASED_USE_TSC_OFFSETING ) - offset = get_vvmcs(v, TSC_OFFSET); + offset = __get_vvmcs(nvcpu->nv_vvmcx, TSC_OFFSET); return offset; } @@ -890,9 +911,12 @@ static struct vmcs_host_to_guest { {HOST_SYSENTER_EIP, GUEST_SYSENTER_EIP}, }; -static void vvmcs_to_shadow(const struct vcpu *v, unsigned int field) +static void vvmcs_to_shadow(void *vvmcs, unsigned int field) { - __vmwrite(field, get_vvmcs(v, field)); + u64 value; + + value = __get_vvmcs(vvmcs, field); + __vmwrite(field, value); } static void vvmcs_to_shadow_bulk(struct vcpu *v, unsigned int n, @@ -926,15 +950,15 @@ static void vvmcs_to_shadow_bulk(struct vcpu *v, unsigned int n, fallback: for ( i = 0; i < n; i++ ) - vvmcs_to_shadow(v, field[i]); + vvmcs_to_shadow(vvmcs, field[i]); } -static inline void shadow_to_vvmcs(const struct vcpu *v, unsigned int field) +static inline void shadow_to_vvmcs(void *vvmcs, unsigned int field) { unsigned long value; if ( __vmread_safe(field, &value) ) - set_vvmcs(v, field, value); + __set_vvmcs(vvmcs, field, value); } static void shadow_to_vvmcs_bulk(struct vcpu *v, unsigned int n, @@ -968,7 +992,7 @@ static void shadow_to_vvmcs_bulk(struct vcpu *v, unsigned int n, fallback: for ( i = 0; i < n; i++ ) - shadow_to_vvmcs(v, field[i]); + shadow_to_vvmcs(vvmcs, field[i]); } static void load_shadow_control(struct vcpu *v) @@ -993,6 +1017,7 @@ static void load_shadow_control(struct vcpu *v) static void load_shadow_guest_state(struct vcpu *v) { struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; u32 control; u64 cr_gh_mask, cr_read_shadow; @@ -1006,18 +1031,18 @@ static void load_shadow_guest_state(struct vcpu *v) vvmcs_to_shadow_bulk(v, ARRAY_SIZE(vmcs_gstate_field), vmcs_gstate_field); - nvcpu->guest_cr[0] = get_vvmcs(v, CR0_READ_SHADOW); - nvcpu->guest_cr[4] = get_vvmcs(v, CR4_READ_SHADOW); - hvm_set_cr0(get_vvmcs(v, GUEST_CR0), 1); - hvm_set_cr4(get_vvmcs(v, GUEST_CR4), 1); - hvm_set_cr3(get_vvmcs(v, GUEST_CR3), 1); + nvcpu->guest_cr[0] = __get_vvmcs(vvmcs, CR0_READ_SHADOW); + nvcpu->guest_cr[4] = __get_vvmcs(vvmcs, CR4_READ_SHADOW); + hvm_set_cr0(__get_vvmcs(vvmcs, GUEST_CR0), 1); + hvm_set_cr4(__get_vvmcs(vvmcs, GUEST_CR4), 1); + hvm_set_cr3(__get_vvmcs(vvmcs, GUEST_CR3), 1); - control = get_vvmcs(v, VM_ENTRY_CONTROLS); + control = __get_vvmcs(vvmcs, VM_ENTRY_CONTROLS); if ( control & VM_ENTRY_LOAD_GUEST_PAT ) - hvm_set_guest_pat(v, get_vvmcs(v, GUEST_PAT)); + hvm_set_guest_pat(v, __get_vvmcs(vvmcs, GUEST_PAT)); if ( control & VM_ENTRY_LOAD_PERF_GLOBAL_CTRL ) hvm_msr_write_intercept(MSR_CORE_PERF_GLOBAL_CTRL, - get_vvmcs(v, GUEST_PERF_GLOBAL_CTRL), 0); + __get_vvmcs(vvmcs, GUEST_PERF_GLOBAL_CTRL), 0); hvm_funcs.set_tsc_offset(v, v->arch.hvm_vcpu.cache_tsc_offset, 0); @@ -1028,14 +1053,14 @@ static void load_shadow_guest_state(struct vcpu *v) * guest host mask to 0xffffffff in shadow VMCS (follow the host L1 VMCS), * then calculate the corresponding read shadow separately for CR0 and CR4. */ - cr_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); - cr_read_shadow = (get_vvmcs(v, GUEST_CR0) & ~cr_gh_mask) | - (get_vvmcs(v, CR0_READ_SHADOW) & cr_gh_mask); + cr_gh_mask = __get_vvmcs(vvmcs, CR0_GUEST_HOST_MASK); + cr_read_shadow = (__get_vvmcs(vvmcs, GUEST_CR0) & ~cr_gh_mask) | + (__get_vvmcs(vvmcs, CR0_READ_SHADOW) & cr_gh_mask); __vmwrite(CR0_READ_SHADOW, cr_read_shadow); - cr_gh_mask = get_vvmcs(v, CR4_GUEST_HOST_MASK); - cr_read_shadow = (get_vvmcs(v, GUEST_CR4) & ~cr_gh_mask) | - (get_vvmcs(v, CR4_READ_SHADOW) & cr_gh_mask); + cr_gh_mask = __get_vvmcs(vvmcs, CR4_GUEST_HOST_MASK); + cr_read_shadow = (__get_vvmcs(vvmcs, GUEST_CR4) & ~cr_gh_mask) | + (__get_vvmcs(vvmcs, CR4_READ_SHADOW) & cr_gh_mask); __vmwrite(CR4_READ_SHADOW, cr_read_shadow); /* TODO: CR3 target control */ @@ -1059,11 +1084,11 @@ static uint64_t get_host_eptp(struct vcpu *v) return ept_get_eptp(ept_data); } -static bool_t nvmx_vpid_enabled(const struct vcpu *v) +static bool_t nvmx_vpid_enabled(struct nestedvcpu *nvcpu) { uint32_t second_cntl; - second_cntl = get_vvmcs(v, SECONDARY_VM_EXEC_CONTROL); + second_cntl = __get_vvmcs(nvcpu->nv_vvmcx, SECONDARY_VM_EXEC_CONTROL); if ( second_cntl & SECONDARY_EXEC_ENABLE_VPID ) return 1; return 0; @@ -1074,38 +1099,32 @@ static void nvmx_set_vmcs_pointer(struct vcpu *v, struct vmcs_struct *vvmcs) unsigned long vvmcs_mfn = domain_page_map_to_mfn(vvmcs); paddr_t vvmcs_maddr = vvmcs_mfn << PAGE_SHIFT; - if ( cpu_has_vmx_vmcs_shadowing ) - { - __vmpclear(vvmcs_maddr); - vvmcs->vmcs_revision_id |= VMCS_RID_TYPE_MASK; - __vmwrite(VMCS_LINK_POINTER, vvmcs_maddr); - __vmwrite(VMREAD_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmread_bitmap)); - __vmwrite(VMWRITE_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmwrite_bitmap)); - } + __vmpclear(vvmcs_maddr); + vvmcs->vmcs_revision_id |= VMCS_RID_TYPE_MASK; v->arch.hvm_vmx.vmcs_shadow_maddr = vvmcs_maddr; + __vmwrite(VMCS_LINK_POINTER, vvmcs_maddr); + __vmwrite(VMREAD_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmread_bitmap)); + __vmwrite(VMWRITE_BITMAP, page_to_maddr(v->arch.hvm_vmx.vmwrite_bitmap)); } static void nvmx_clear_vmcs_pointer(struct vcpu *v, struct vmcs_struct *vvmcs) { - v->arch.hvm_vmx.vmcs_shadow_maddr = 0; + unsigned long vvmcs_mfn = domain_page_map_to_mfn(vvmcs); + paddr_t vvmcs_maddr = vvmcs_mfn << PAGE_SHIFT; - if ( cpu_has_vmx_vmcs_shadowing ) - { - unsigned long vvmcs_mfn = domain_page_map_to_mfn(vvmcs); - paddr_t vvmcs_maddr = vvmcs_mfn << PAGE_SHIFT; - - __vmpclear(vvmcs_maddr); - vvmcs->vmcs_revision_id &= ~VMCS_RID_TYPE_MASK; - __vmwrite(VMCS_LINK_POINTER, ~0ul); - __vmwrite(VMREAD_BITMAP, 0); - __vmwrite(VMWRITE_BITMAP, 0); - } + __vmpclear(vvmcs_maddr); + vvmcs->vmcs_revision_id &= ~VMCS_RID_TYPE_MASK; + v->arch.hvm_vmx.vmcs_shadow_maddr = 0; + __vmwrite(VMCS_LINK_POINTER, ~0ul); + __vmwrite(VMREAD_BITMAP, 0); + __vmwrite(VMWRITE_BITMAP, 0); } static void virtual_vmentry(struct cpu_user_regs *regs) { struct vcpu *v = current; struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; unsigned long lm_l1, lm_l2; vmx_vmcs_switch(v->arch.hvm_vmx.vmcs_pa, nvcpu->nv_n2vmcx_pa); @@ -1124,7 +1143,8 @@ static void virtual_vmentry(struct cpu_user_regs *regs) * L1 exit_controls */ lm_l1 = !!hvm_long_mode_enabled(v); - lm_l2 = !!(get_vvmcs(v, VM_ENTRY_CONTROLS) & VM_ENTRY_IA32E_MODE); + lm_l2 = !!(__get_vvmcs(vvmcs, VM_ENTRY_CONTROLS) & + VM_ENTRY_IA32E_MODE); if ( lm_l2 ) v->arch.hvm_vcpu.guest_efer |= EFER_LMA | EFER_LME; @@ -1141,9 +1161,9 @@ static void virtual_vmentry(struct cpu_user_regs *regs) !(v->arch.hvm_vcpu.guest_efer & EFER_LMA) ) vvmcs_to_shadow_bulk(v, ARRAY_SIZE(gpdpte_fields), gpdpte_fields); - regs->eip = get_vvmcs(v, GUEST_RIP); - regs->esp = get_vvmcs(v, GUEST_RSP); - regs->eflags = get_vvmcs(v, GUEST_RFLAGS); + regs->eip = __get_vvmcs(vvmcs, GUEST_RIP); + regs->esp = __get_vvmcs(vvmcs, GUEST_RSP); + regs->eflags = __get_vvmcs(vvmcs, GUEST_RFLAGS); /* updating host cr0 to sync TS bit */ __vmwrite(HOST_CR0, v->arch.hvm_vmx.host_cr0); @@ -1155,10 +1175,10 @@ static void virtual_vmentry(struct cpu_user_regs *regs) __vmwrite(EPT_POINTER, get_host_eptp(v)); /* nested VPID support! */ - if ( cpu_has_vmx_vpid && nvmx_vpid_enabled(v) ) + if ( cpu_has_vmx_vpid && nvmx_vpid_enabled(nvcpu) ) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); - uint32_t new_vpid = get_vvmcs(v, VIRTUAL_PROCESSOR_ID); + uint32_t new_vpid = __get_vvmcs(vvmcs, VIRTUAL_PROCESSOR_ID); if ( nvmx->guest_vpid != new_vpid ) { @@ -1171,29 +1191,34 @@ static void virtual_vmentry(struct cpu_user_regs *regs) static void sync_vvmcs_guest_state(struct vcpu *v, struct cpu_user_regs *regs) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + void *vvmcs = nvcpu->nv_vvmcx; + /* copy shadow vmcs.gstate back to vvmcs.gstate */ shadow_to_vvmcs_bulk(v, ARRAY_SIZE(vmcs_gstate_field), vmcs_gstate_field); /* RIP, RSP are in user regs */ - set_vvmcs(v, GUEST_RIP, regs->eip); - set_vvmcs(v, GUEST_RSP, regs->esp); + __set_vvmcs(vvmcs, GUEST_RIP, regs->eip); + __set_vvmcs(vvmcs, GUEST_RSP, regs->esp); /* CR3 sync if exec doesn't want cr3 load exiting: i.e. nested EPT */ if ( !(__n2_exec_control(v) & CPU_BASED_CR3_LOAD_EXITING) ) - shadow_to_vvmcs(v, GUEST_CR3); + shadow_to_vvmcs(vvmcs, GUEST_CR3); } static void sync_vvmcs_ro(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); + void *vvmcs = nvcpu->nv_vvmcx; shadow_to_vvmcs_bulk(v, ARRAY_SIZE(vmcs_ro_field), vmcs_ro_field); /* Adjust exit_reason/exit_qualifciation for violation case */ - if ( get_vvmcs(v, VM_EXIT_REASON) == EXIT_REASON_EPT_VIOLATION ) + if ( __get_vvmcs(vvmcs, VM_EXIT_REASON) == EXIT_REASON_EPT_VIOLATION ) { - set_vvmcs(v, EXIT_QUALIFICATION, nvmx->ept.exit_qual); - set_vvmcs(v, VM_EXIT_REASON, nvmx->ept.exit_reason); + __set_vvmcs(vvmcs, EXIT_QUALIFICATION, nvmx->ept.exit_qual); + __set_vvmcs(vvmcs, VM_EXIT_REASON, nvmx->ept.exit_reason); } } @@ -1201,32 +1226,34 @@ static void load_vvmcs_host_state(struct vcpu *v) { int i; u64 r; + void *vvmcs = vcpu_nestedhvm(v).nv_vvmcx; u32 control; for ( i = 0; i < ARRAY_SIZE(vmcs_h2g_field); i++ ) { - r = get_vvmcs(v, vmcs_h2g_field[i].host_field); + r = __get_vvmcs(vvmcs, vmcs_h2g_field[i].host_field); __vmwrite(vmcs_h2g_field[i].guest_field, r); } - hvm_set_cr0(get_vvmcs(v, HOST_CR0), 1); - hvm_set_cr4(get_vvmcs(v, HOST_CR4), 1); - hvm_set_cr3(get_vvmcs(v, HOST_CR3), 1); + hvm_set_cr0(__get_vvmcs(vvmcs, HOST_CR0), 1); + hvm_set_cr4(__get_vvmcs(vvmcs, HOST_CR4), 1); + hvm_set_cr3(__get_vvmcs(vvmcs, HOST_CR3), 1); - control = get_vvmcs(v, VM_EXIT_CONTROLS); + control = __get_vvmcs(vvmcs, VM_EXIT_CONTROLS); if ( control & VM_EXIT_LOAD_HOST_PAT ) - hvm_set_guest_pat(v, get_vvmcs(v, HOST_PAT)); + hvm_set_guest_pat(v, __get_vvmcs(vvmcs, HOST_PAT)); if ( control & VM_EXIT_LOAD_PERF_GLOBAL_CTRL ) hvm_msr_write_intercept(MSR_CORE_PERF_GLOBAL_CTRL, - get_vvmcs(v, HOST_PERF_GLOBAL_CTRL), 1); + __get_vvmcs(vvmcs, HOST_PERF_GLOBAL_CTRL), 1); hvm_funcs.set_tsc_offset(v, v->arch.hvm_vcpu.cache_tsc_offset, 0); - set_vvmcs(v, VM_ENTRY_INTR_INFO, 0); + __set_vvmcs(vvmcs, VM_ENTRY_INTR_INFO, 0); } static void sync_exception_state(struct vcpu *v) { + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); if ( !(nvmx->intr.intr_info & INTR_INFO_VALID_MASK) ) @@ -1236,9 +1263,10 @@ static void sync_exception_state(struct vcpu *v) { case X86_EVENTTYPE_EXT_INTR: /* rename exit_reason to EXTERNAL_INTERRUPT */ - set_vvmcs(v, VM_EXIT_REASON, EXIT_REASON_EXTERNAL_INTERRUPT); - set_vvmcs(v, EXIT_QUALIFICATION, 0); - set_vvmcs(v, VM_EXIT_INTR_INFO, + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_REASON, + EXIT_REASON_EXTERNAL_INTERRUPT); + __set_vvmcs(nvcpu->nv_vvmcx, EXIT_QUALIFICATION, 0); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO, nvmx->intr.intr_info); break; @@ -1246,13 +1274,17 @@ static void sync_exception_state(struct vcpu *v) case X86_EVENTTYPE_SW_INTERRUPT: case X86_EVENTTYPE_SW_EXCEPTION: /* throw to L1 */ - set_vvmcs(v, VM_EXIT_INTR_INFO, nvmx->intr.intr_info); - set_vvmcs(v, VM_EXIT_INTR_ERROR_CODE, nvmx->intr.error_code); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO, + nvmx->intr.intr_info); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_ERROR_CODE, + nvmx->intr.error_code); break; case X86_EVENTTYPE_NMI: - set_vvmcs(v, VM_EXIT_REASON, EXIT_REASON_EXCEPTION_NMI); - set_vvmcs(v, EXIT_QUALIFICATION, 0); - set_vvmcs(v, VM_EXIT_INTR_INFO, nvmx->intr.intr_info); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_REASON, + EXIT_REASON_EXCEPTION_NMI); + __set_vvmcs(nvcpu->nv_vvmcx, EXIT_QUALIFICATION, 0); + __set_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO, + nvmx->intr.intr_info); break; default: gdprintk(XENLOG_ERR, "Exception state %lx not handled\n", @@ -1264,8 +1296,9 @@ static void sync_exception_state(struct vcpu *v) static void nvmx_update_apicv(struct vcpu *v) { struct nestedvmx *nvmx = &vcpu_2_nvmx(v); - unsigned long reason = get_vvmcs(v, VM_EXIT_REASON); - uint32_t intr_info = get_vvmcs(v, VM_EXIT_INTR_INFO); + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); + unsigned long reason = __get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_REASON); + uint32_t intr_info = __get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_INTR_INFO); if ( reason == EXIT_REASON_EXTERNAL_INTERRUPT && nvmx->intr.source == hvm_intsrc_lapic && @@ -1311,7 +1344,8 @@ static void virtual_vmexit(struct cpu_user_regs *regs) nvcpu->nv_vmswitch_in_progress = 1; lm_l2 = !!hvm_long_mode_enabled(v); - lm_l1 = !!(get_vvmcs(v, VM_EXIT_CONTROLS) & VM_EXIT_IA32E_MODE); + lm_l1 = !!(__get_vvmcs(nvcpu->nv_vvmcx, VM_EXIT_CONTROLS) & + VM_EXIT_IA32E_MODE); if ( lm_l1 ) v->arch.hvm_vcpu.guest_efer |= EFER_LMA | EFER_LME; @@ -1327,8 +1361,8 @@ static void virtual_vmexit(struct cpu_user_regs *regs) if ( lm_l1 != lm_l2 ) paging_update_paging_modes(v); - regs->eip = get_vvmcs(v, HOST_RIP); - regs->esp = get_vvmcs(v, HOST_RSP); + regs->eip = __get_vvmcs(nvcpu->nv_vvmcx, HOST_RIP); + regs->esp = __get_vvmcs(nvcpu->nv_vvmcx, HOST_RSP); /* VM exit clears all bits except bit 1 */ regs->eflags = 0x2; @@ -1505,6 +1539,7 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) { bool_t launched; struct vcpu *v = current; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); int rc = vmx_inst_check_privilege(regs, 0); @@ -1518,7 +1553,7 @@ int nvmx_handle_vmresume(struct cpu_user_regs *regs) } launched = vvmcs_launched(&nvmx->launched_list, - PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr)); + domain_page_map_to_mfn(nvcpu->nv_vvmcx)); if ( !launched ) { vmreturn (regs, VMFAIL_VALID); return X86EMUL_OKAY; @@ -1530,6 +1565,7 @@ int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) { bool_t launched; struct vcpu *v = current; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); struct nestedvmx *nvmx = &vcpu_2_nvmx(v); int rc = vmx_inst_check_privilege(regs, 0); @@ -1543,7 +1579,7 @@ int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) } launched = vvmcs_launched(&nvmx->launched_list, - PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr)); + domain_page_map_to_mfn(nvcpu->nv_vvmcx)); if ( launched ) { vmreturn (regs, VMFAIL_VALID); return X86EMUL_OKAY; @@ -1553,7 +1589,7 @@ int nvmx_handle_vmlaunch(struct cpu_user_regs *regs) if ( rc == X86EMUL_OKAY ) { if ( set_vvmcs_launched(&nvmx->launched_list, - PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr)) < 0 ) + domain_page_map_to_mfn(nvcpu->nv_vvmcx)) < 0 ) return X86EMUL_UNHANDLEABLE; } } @@ -1608,7 +1644,8 @@ int nvmx_handle_vmptrld(struct cpu_user_regs *regs) } } - nvmx_set_vmcs_pointer(v, nvcpu->nv_vvmcx); + if ( cpu_has_vmx_vmcs_shadowing ) + nvmx_set_vmcs_pointer(v, nvcpu->nv_vvmcx); vmreturn(regs, VMSUCCEED); @@ -1657,10 +1694,10 @@ int nvmx_handle_vmclear(struct cpu_user_regs *regs) rc = VMFAIL_INVALID; else if ( gpa == nvcpu->nv_vvmcxaddr ) { - unsigned long mfn = PFN_DOWN(v->arch.hvm_vmx.vmcs_shadow_maddr); - - nvmx_clear_vmcs_pointer(v, nvcpu->nv_vvmcx); - clear_vvmcs_launched(&nvmx->launched_list, mfn); + if ( cpu_has_vmx_vmcs_shadowing ) + nvmx_clear_vmcs_pointer(v, nvcpu->nv_vvmcx); + clear_vvmcs_launched(&nvmx->launched_list, + domain_page_map_to_mfn(nvcpu->nv_vvmcx)); nvmx_purge_vvmcs(v); } else @@ -1689,6 +1726,7 @@ int nvmx_handle_vmread(struct cpu_user_regs *regs) { struct vcpu *v = current; struct vmx_inst_decoded decode; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); u64 value = 0; int rc; @@ -1696,7 +1734,7 @@ int nvmx_handle_vmread(struct cpu_user_regs *regs) if ( rc != X86EMUL_OKAY ) return rc; - value = get_vvmcs(v, reg_read(regs, decode.reg2)); + value = __get_vvmcs(nvcpu->nv_vvmcx, reg_read(regs, decode.reg2)); switch ( decode.type ) { case VMX_INST_MEMREG_TYPE_MEMORY: @@ -1717,6 +1755,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) { struct vcpu *v = current; struct vmx_inst_decoded decode; + struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v); unsigned long operand; u64 vmcs_encoding; bool_t okay = 1; @@ -1726,7 +1765,7 @@ int nvmx_handle_vmwrite(struct cpu_user_regs *regs) return X86EMUL_EXCEPTION; vmcs_encoding = reg_read(regs, decode.reg2); - set_vvmcs(v, vmcs_encoding, operand); + __set_vvmcs(nvcpu->nv_vvmcx, vmcs_encoding, operand); switch ( vmcs_encoding & ~VMCS_HIGH(0) ) { @@ -2158,7 +2197,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, } else if ( (intr_info & valid_mask) == valid_mask ) { - exec_bitmap = get_vvmcs(v, EXCEPTION_BITMAP); + exec_bitmap =__get_vvmcs(nvcpu->nv_vvmcx, EXCEPTION_BITMAP); if ( exec_bitmap & (1 << vector) ) nvcpu->nv_vmexit_pending = 1; @@ -2277,7 +2316,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, * special handler is needed if L1 doesn't intercept rdtsc, * avoiding changing guest_tsc and messing up timekeeping in L1 */ - tsc = hvm_get_guest_tsc(v) + get_vvmcs(v, TSC_OFFSET); + tsc = hvm_get_guest_tsc(v); + tsc += __get_vvmcs(nvcpu->nv_vvmcx, TSC_OFFSET); regs->eax = (uint32_t)tsc; regs->edx = (uint32_t)(tsc >> 32); update_guest_eip(); @@ -2366,7 +2406,7 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, val = *reg; if ( cr == 0 ) { - u64 cr0_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); + u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); __vmread(CR0_READ_SHADOW, &old_val); changed_bits = old_val ^ val; @@ -2374,15 +2414,14 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr0 = get_vvmcs(v, GUEST_CR0); - - set_vvmcs(v, GUEST_CR0, - (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); + u64 guest_cr0 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0, + (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); } } else if ( cr == 4 ) { - u64 cr4_gh_mask = get_vvmcs(v, CR4_GUEST_HOST_MASK); + u64 cr4_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR4_GUEST_HOST_MASK); __vmread(CR4_READ_SHADOW, &old_val); changed_bits = old_val ^ val; @@ -2390,10 +2429,9 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr4 = get_vvmcs(v, GUEST_CR4); - - set_vvmcs(v, GUEST_CR4, - (guest_cr4 & cr4_gh_mask) | (val & ~cr4_gh_mask)); + u64 guest_cr4 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR4); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR4, + (guest_cr4 & cr4_gh_mask) | (val & ~cr4_gh_mask)); } } else @@ -2402,21 +2440,20 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, } case VMX_CONTROL_REG_ACCESS_TYPE_CLTS: { - u64 cr0_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); + u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); if ( cr0_gh_mask & X86_CR0_TS ) nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr0 = get_vvmcs(v, GUEST_CR0); - - set_vvmcs(v, GUEST_CR0, (guest_cr0 & ~X86_CR0_TS)); + u64 guest_cr0 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0, (guest_cr0 & ~X86_CR0_TS)); } break; } case VMX_CONTROL_REG_ACCESS_TYPE_LMSW: { - u64 cr0_gh_mask = get_vvmcs(v, CR0_GUEST_HOST_MASK); + u64 cr0_gh_mask = __get_vvmcs(nvcpu->nv_vvmcx, CR0_GUEST_HOST_MASK); __vmread(CR0_READ_SHADOW, &old_val); old_val &= X86_CR0_PE|X86_CR0_MP|X86_CR0_EM|X86_CR0_TS; @@ -2427,9 +2464,8 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, nvcpu->nv_vmexit_pending = 1; else { - u64 guest_cr0 = get_vvmcs(v, GUEST_CR0); - - set_vvmcs(v, GUEST_CR0, (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); + u64 guest_cr0 = __get_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0); + __set_vvmcs(nvcpu->nv_vvmcx, GUEST_CR0, (guest_cr0 & cr0_gh_mask) | (val & ~cr0_gh_mask)); } break; } @@ -2481,7 +2517,7 @@ void nvmx_set_cr_read_shadow(struct vcpu *v, unsigned int cr) if ( !nestedhvm_vmswitch_in_progress(v) ) { unsigned long virtual_cr_mask = - get_vvmcs(v, mask_field); + __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, mask_field); /* * We get here when L2 changed cr in a way that did not change @@ -2493,7 +2529,7 @@ void nvmx_set_cr_read_shadow(struct vcpu *v, unsigned int cr) */ v->arch.hvm_vcpu.guest_cr[cr] &= ~virtual_cr_mask; v->arch.hvm_vcpu.guest_cr[cr] |= virtual_cr_mask & - get_vvmcs(v, cr_field); + __get_vvmcs(vcpu_nestedhvm(v).nv_vvmcx, cr_field); } /* nvcpu.guest_cr is what L2 write to cr actually. */ diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index b3b0946..a8d4d5b 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -105,7 +105,7 @@ struct arch_vmx_struct { /* Physical address of VMCS. */ paddr_t vmcs_pa; /* VMCS shadow machine address. */ - paddr_t vmcs_shadow_maddr; + paddr_t vmcs_shadow_maddr; /* Protects remote usage of VMCS (VMPTRLD/VMCLEAR). */ spinlock_t vmcs_lock; @@ -506,10 +506,10 @@ void vmx_vmcs_switch(paddr_t from, paddr_t to); void vmx_set_eoi_exit_bitmap(struct vcpu *v, u8 vector); void vmx_clear_eoi_exit_bitmap(struct vcpu *v, u8 vector); int vmx_check_msr_bitmap(unsigned long *msr_bitmap, u32 msr, int access_type); -void virtual_vmcs_enter(const struct vcpu *); -void virtual_vmcs_exit(const struct vcpu *); -u64 virtual_vmcs_vmread(const struct vcpu *, u32 encoding); -void virtual_vmcs_vmwrite(const struct vcpu *, u32 encoding, u64 val); +void virtual_vmcs_enter(void *vvmcs); +void virtual_vmcs_exit(void *vvmcs); +u64 virtual_vmcs_vmread(void *vvmcs, u32 vmcs_encoding); +void virtual_vmcs_vmwrite(void *vvmcs, u32 vmcs_encoding, u64 val); static inline int vmx_add_guest_msr(u32 msr) { diff --git a/xen/include/asm-x86/hvm/vmx/vvmx.h b/xen/include/asm-x86/hvm/vmx/vvmx.h index aca8b4b..60fdc21 100644 --- a/xen/include/asm-x86/hvm/vmx/vvmx.h +++ b/xen/include/asm-x86/hvm/vmx/vvmx.h @@ -181,20 +181,18 @@ enum vvmcs_encoding_type { VVMCS_TYPE_HSTATE, }; -u64 get_vvmcs_virtual(void *vvmcs, u32 encoding); -u64 get_vvmcs_real(const struct vcpu *, u32 encoding); -void set_vvmcs_virtual(void *vvmcs, u32 encoding, u64 val); -void set_vvmcs_real(const struct vcpu *, u32 encoding, u64 val); - -#define get_vvmcs(vcpu, encoding) \ - (cpu_has_vmx_vmcs_shadowing ? \ - get_vvmcs_real(vcpu, encoding) : \ - get_vvmcs_virtual(vcpu_nestedhvm(vcpu).nv_vvmcx, encoding)) - -#define set_vvmcs(vcpu, encoding, val) \ - (cpu_has_vmx_vmcs_shadowing ? \ - set_vvmcs_real(vcpu, encoding, val) : \ - set_vvmcs_virtual(vcpu_nestedhvm(vcpu).nv_vvmcx, encoding, val)) +u64 __get_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding); +u64 __get_vvmcs_real(void *vvmcs, u32 vmcs_encoding); +void __set_vvmcs_virtual(void *vvmcs, u32 vmcs_encoding, u64 val); +void __set_vvmcs_real(void *vvmcs, u32 vmcs_encoding, u64 val); + +#define __get_vvmcs(_vvmcs, _vmcs_encoding) \ + (cpu_has_vmx_vmcs_shadowing ? __get_vvmcs_real(_vvmcs, _vmcs_encoding) \ + : __get_vvmcs_virtual(_vvmcs, _vmcs_encoding)) + +#define __set_vvmcs(_vvmcs, _vmcs_encoding, _val) \ + (cpu_has_vmx_vmcs_shadowing ? __set_vvmcs_real(_vvmcs, _vmcs_encoding, _val) \ + : __set_vvmcs_virtual(_vvmcs, _vmcs_encoding, _val)) uint64_t get_shadow_eptp(struct vcpu *v); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Ni7-0001Cb-Rt; Fri, 11 Dec 2015 13:26:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni6-0001Aj-Ae for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:10 +0000 Content-Length: 4789 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 45/5E-13487-1FECA665; Fri, 11 Dec 2015 13:26:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1449840368!10089362!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29077 invoked from network); 11 Dec 2015 13:26:09 -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; 11 Dec 2015 13:26:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mig-0002I4-Jr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mig-0006SA-Cg for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:42 +0000 Date: Fri, 11 Dec 2015 12:22:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] HVM/save: pass a size parameter to the HVM compat functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3895648665772144948==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3895648665772144948== Content-Length: 4426 Content-Transfer-Encoding: quoted-printable commit fafa16e3d006d6d5f62b71374991360697db2467 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 15:50:36 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:50:36 2015 +0100 HVM/save: pass a size parameter to the HVM compat functions In order to cope with types having multiple compat versions pass a size parameter to the fixup function so we can identify which compat version Xen is dealing with. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/include/public/arch-x86/hvm/save.h | 2 +- xen/include/public/hvm/save.h | 10 ++++++---- xen/include/xen/hvm/save.h | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h index efb0b62..29d513c 100644 --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -268,7 +268,7 @@ struct hvm_hw_cpu_compat { uint32_t error_code; }; -static inline int _hvm_hw_fix_cpu(void *h) { +static inline int _hvm_hw_fix_cpu(void *h, uint32_t size) { union hvm_hw_cpu_union { struct hvm_hw_cpu nat; diff --git a/xen/include/public/hvm/save.h b/xen/include/public/hvm/save.h index cc8b5fd..0bd240d 100644 --- a/xen/include/public/hvm/save.h +++ b/xen/include/public/hvm/save.h @@ -63,13 +63,15 @@ struct hvm_save_descriptor { #ifdef __XEN__ # define DECLARE_HVM_SAVE_TYPE_COMPAT(_x, _code, _type, _ctype, _fix) \ - static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h) { return _fix(h); } \ - struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[2];}; \ + static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h, uint32_t size) \ + { return _fix(h, size); } \ + struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[2];}; \ struct __HVM_SAVE_TYPE_COMPAT_##_x { _ctype t; } # include /* BUG() */ # define DECLARE_HVM_SAVE_TYPE(_x, _code, _type) \ - static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h) { BUG(); return -1; } \ + static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h, uint32_t size) \ + { BUG(); return -1; } \ struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[1];}; \ struct __HVM_SAVE_TYPE_COMPAT_##_x { _type t; } #else @@ -89,7 +91,7 @@ struct hvm_save_descriptor { # define HVM_SAVE_LENGTH_COMPAT(_x) (sizeof (HVM_SAVE_TYPE_COMPAT(_x))) # define HVM_SAVE_HAS_COMPAT(_x) (sizeof (((struct __HVM_SAVE_TYPE_##_x *)(0))->cpt)-1) -# define HVM_SAVE_FIX_COMPAT(_x, _dst) __HVM_SAVE_FIX_COMPAT_##_x(_dst) +# define HVM_SAVE_FIX_COMPAT(_x, _dst, _size) __HVM_SAVE_FIX_COMPAT_##_x(_dst, _size) #endif /* diff --git a/xen/include/xen/hvm/save.h b/xen/include/xen/hvm/save.h index aa27a50..51bc7d5 100644 --- a/xen/include/xen/hvm/save.h +++ b/xen/include/xen/hvm/save.h @@ -60,6 +60,8 @@ void _hvm_read_entry(struct hvm_domain_context *h, */ #define _hvm_load_entry(_x, _h, _dst, _strict) ({ \ int r; \ + struct hvm_save_descriptor *desc \ + =3D (struct hvm_save_descriptor *)&(_h)->data[(_h)->cur]; \ if ( (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH(_x), (_strict))) =3D=3D 0 ) \ _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH(_x)); \ @@ -67,7 +69,7 @@ void _hvm_read_entry(struct hvm_domain_context *h, && (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH_COMPAT(_x), (_strict))) =3D=3D 0 ) { \ _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH_COMPAT(_x)); \ - r=3DHVM_SAVE_FIX_COMPAT(_x, (_dst)); \ + r =3D HVM_SAVE_FIX_COMPAT(_x, (_dst), desc->length); \ } \ r; }) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3895648665772144948== 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 --===============3895648665772144948==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Ni7-0001Cb-Rt; Fri, 11 Dec 2015 13:26:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ni6-0001Aj-Ae for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:10 +0000 Content-Length: 4789 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 45/5E-13487-1FECA665; Fri, 11 Dec 2015 13:26:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1449840368!10089362!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29077 invoked from network); 11 Dec 2015 13:26:09 -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; 11 Dec 2015 13:26:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mig-0002I4-Jr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mig-0006SA-Cg for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:42 +0000 Date: Fri, 11 Dec 2015 12:22:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] HVM/save: pass a size parameter to the HVM compat functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============3895648665772144948==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3895648665772144948== Content-Length: 4426 Content-Transfer-Encoding: quoted-printable commit fafa16e3d006d6d5f62b71374991360697db2467 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 15:50:36 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:50:36 2015 +0100 HVM/save: pass a size parameter to the HVM compat functions In order to cope with types having multiple compat versions pass a size parameter to the fixup function so we can identify which compat version Xen is dealing with. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/include/public/arch-x86/hvm/save.h | 2 +- xen/include/public/hvm/save.h | 10 ++++++---- xen/include/xen/hvm/save.h | 4 +++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/include/public/arch-x86/hvm/save.h b/xen/include/public/arch-x86/hvm/save.h index efb0b62..29d513c 100644 --- a/xen/include/public/arch-x86/hvm/save.h +++ b/xen/include/public/arch-x86/hvm/save.h @@ -268,7 +268,7 @@ struct hvm_hw_cpu_compat { uint32_t error_code; }; -static inline int _hvm_hw_fix_cpu(void *h) { +static inline int _hvm_hw_fix_cpu(void *h, uint32_t size) { union hvm_hw_cpu_union { struct hvm_hw_cpu nat; diff --git a/xen/include/public/hvm/save.h b/xen/include/public/hvm/save.h index cc8b5fd..0bd240d 100644 --- a/xen/include/public/hvm/save.h +++ b/xen/include/public/hvm/save.h @@ -63,13 +63,15 @@ struct hvm_save_descriptor { #ifdef __XEN__ # define DECLARE_HVM_SAVE_TYPE_COMPAT(_x, _code, _type, _ctype, _fix) \ - static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h) { return _fix(h); } \ - struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[2];}; \ + static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h, uint32_t size) \ + { return _fix(h, size); } \ + struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[2];}; \ struct __HVM_SAVE_TYPE_COMPAT_##_x { _ctype t; } # include /* BUG() */ # define DECLARE_HVM_SAVE_TYPE(_x, _code, _type) \ - static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h) { BUG(); return -1; } \ + static inline int __HVM_SAVE_FIX_COMPAT_##_x(void *h, uint32_t size) \ + { BUG(); return -1; } \ struct __HVM_SAVE_TYPE_##_x { _type t; char c[_code]; char cpt[1];}; \ struct __HVM_SAVE_TYPE_COMPAT_##_x { _type t; } #else @@ -89,7 +91,7 @@ struct hvm_save_descriptor { # define HVM_SAVE_LENGTH_COMPAT(_x) (sizeof (HVM_SAVE_TYPE_COMPAT(_x))) # define HVM_SAVE_HAS_COMPAT(_x) (sizeof (((struct __HVM_SAVE_TYPE_##_x *)(0))->cpt)-1) -# define HVM_SAVE_FIX_COMPAT(_x, _dst) __HVM_SAVE_FIX_COMPAT_##_x(_dst) +# define HVM_SAVE_FIX_COMPAT(_x, _dst, _size) __HVM_SAVE_FIX_COMPAT_##_x(_dst, _size) #endif /* diff --git a/xen/include/xen/hvm/save.h b/xen/include/xen/hvm/save.h index aa27a50..51bc7d5 100644 --- a/xen/include/xen/hvm/save.h +++ b/xen/include/xen/hvm/save.h @@ -60,6 +60,8 @@ void _hvm_read_entry(struct hvm_domain_context *h, */ #define _hvm_load_entry(_x, _h, _dst, _strict) ({ \ int r; \ + struct hvm_save_descriptor *desc \ + =3D (struct hvm_save_descriptor *)&(_h)->data[(_h)->cur]; \ if ( (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH(_x), (_strict))) =3D=3D 0 ) \ _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH(_x)); \ @@ -67,7 +69,7 @@ void _hvm_read_entry(struct hvm_domain_context *h, && (r =3D _hvm_check_entry((_h), HVM_SAVE_CODE(_x), \ HVM_SAVE_LENGTH_COMPAT(_x), (_strict))) =3D=3D 0 ) { \ _hvm_read_entry((_h), (_dst), HVM_SAVE_LENGTH_COMPAT(_x)); \ - r=3DHVM_SAVE_FIX_COMPAT(_x, (_dst)); \ + r =3D HVM_SAVE_FIX_COMPAT(_x, (_dst), desc->length); \ } \ r; }) -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3895648665772144948== 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 --===============3895648665772144948==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiF-0001H4-3u; Fri, 11 Dec 2015 13:26:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiD-0001GF-Rj for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:18 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 18/97-10678-9FECA665; Fri, 11 Dec 2015 13:26:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1449840374!10074356!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19992 invoked from network); 11 Dec 2015 13:26:15 -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; 11 Dec 2015 13:26:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mqm-0002RZ-G7 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mqm-00073r-19 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:04 +0000 Date: Fri, 11 Dec 2015 12:31:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: try to find last used pfn when migrating X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91e204d37f44913913776d0a89279721694f8b32 Author: Juergen Gross AuthorDate: Wed Dec 2 08:42:17 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 8 16:56:18 2015 +0000 libxc: try to find last used pfn when migrating For migration the last used pfn of a guest is needed to size the logdirty bitmap and as an upper bound of the page loop. Unfortunately there are pv-kernels advertising a much higher maximum pfn as they are really using in order to support memory hotplug. This will lead to allocation of much more memory in Xen tools during migration as really needed. Try to find the last used guest pfn of a pv-domu by scanning the p2m tree from the last entry towards it's start and search for an entry not being invalid. Normally the mid pages of the p2m tree containing all invalid entries are being reused, so we can just scan the top page for identical entries and skip them but the first one. Signed-off-by: Juergen Gross Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper [ ijc -- added errno = E2BIG to one error path ] Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 14 ++++++++---- tools/libxc/xc_sr_common_x86_pv.c | 19 +---------------- tools/libxc/xc_sr_save.c | 24 +++------------------ tools/libxc/xc_sr_save_x86_hvm.c | 15 +++++++++++++ tools/libxc/xc_sr_save_x86_pv.c | 41 ++++++++++++++++++++++++++++++++++-- 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 64f6082..9aecde2 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -54,9 +54,11 @@ struct xc_sr_save_ops void **page); /** - * Set up local environment to restore a domain. This is called before - * any records are written to the stream. (Typically querying running - * domain state, setting up mappings etc.) + * Set up local environment to save a domain. (Typically querying + * running domain state, setting up mappings etc.) + * + * This is called once before any common setup has occurred, allowing for + * guest-specific adjustments to be made to common state. */ int (*setup)(struct xc_sr_context *ctx); @@ -121,8 +123,10 @@ struct xc_sr_restore_ops int (*localise_page)(struct xc_sr_context *ctx, uint32_t type, void *page); /** - * Set up local environment to restore a domain. This is called before - * any records are read from the stream. + * Set up local environment to restore a domain. + * + * This is called once before any common setup has occurred, allowing for + * guest-specific adjustments to be made to common state. */ int (*setup)(struct xc_sr_context *ctx); diff --git a/tools/libxc/xc_sr_common_x86_pv.c b/tools/libxc/xc_sr_common_x86_pv.c index eb68c07..f233c87 100644 --- a/tools/libxc/xc_sr_common_x86_pv.c +++ b/tools/libxc/xc_sr_common_x86_pv.c @@ -68,8 +68,7 @@ uint64_t mfn_to_cr3(struct xc_sr_context *ctx, xen_pfn_t _mfn) int x86_pv_domain_info(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - unsigned int guest_width, guest_levels, fpp; - xen_pfn_t max_pfn; + unsigned int guest_width, guest_levels; /* Get the domain width */ if ( xc_domain_get_guest_width(xch, ctx->domid, &guest_width) ) @@ -89,25 +88,9 @@ int x86_pv_domain_info(struct xc_sr_context *ctx) } ctx->x86_pv.width = guest_width; ctx->x86_pv.levels = guest_levels; - fpp = PAGE_SIZE / ctx->x86_pv.width; DPRINTF("%d bits, %d levels", guest_width * 8, guest_levels); - /* Get the domain's size */ - if ( xc_domain_maximum_gpfn(xch, ctx->domid, &max_pfn) < 0 ) - { - PERROR("Unable to obtain guests max pfn"); - return -1; - } - - if ( max_pfn > 0 ) - { - ctx->x86_pv.max_pfn = max_pfn; - ctx->x86_pv.p2m_frames = (ctx->x86_pv.max_pfn + fpp) / fpp; - - DPRINTF("max_pfn %#lx, p2m_frames %d", max_pfn, ctx->x86_pv.p2m_frames); - } - return 0; } diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 0c12e56..cefcef5 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -677,6 +677,10 @@ static int setup(struct xc_sr_context *ctx) DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, &ctx->save.dirty_bitmap_hbuf); + rc = ctx->save.ops.setup(ctx); + if ( rc ) + goto err; + dirty_bitmap = xc_hypercall_buffer_alloc_pages( xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * @@ -692,10 +696,6 @@ static int setup(struct xc_sr_context *ctx) goto err; } - rc = ctx->save.ops.setup(ctx); - if ( rc ) - goto err; - rc = 0; err: @@ -824,7 +824,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags, struct save_callbacks* callbacks, int hvm) { - xen_pfn_t nr_pfns; struct xc_sr_context ctx = { .xch = xch, @@ -869,21 +868,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, ctx.domid = dom; - if ( xc_domain_nr_gpfns(xch, dom, &nr_pfns) < 0 ) - { - PERROR("Unable to obtain the guest p2m size"); - return -1; - } - - ctx.save.p2m_size = nr_pfns; - - if ( ctx.save.p2m_size > ~XEN_DOMCTL_PFINFO_LTAB_MASK ) - { - errno = E2BIG; - ERROR("Cannot save this big a guest"); - return -1; - } - if ( ctx.dominfo.hvm ) { ctx.save.ops = save_ops_x86_hvm; diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index cdee774..f3d6cee 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -135,6 +135,21 @@ static int x86_hvm_normalise_page(struct xc_sr_context *ctx, static int x86_hvm_setup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; + xen_pfn_t nr_pfns; + + if ( xc_domain_nr_gpfns(xch, ctx->domid, &nr_pfns) < 0 ) + { + PERROR("Unable to obtain the guest p2m size"); + return -1; + } + if ( nr_pfns > ~XEN_DOMCTL_PFINFO_LTAB_MASK ) + { + errno = E2BIG; + PERROR("Cannot save this big a guest"); + return -1; + } + + ctx->save.p2m_size = nr_pfns; if ( ctx->save.callbacks->switch_qemu_logdirty( ctx->domid, 1, ctx->save.callbacks->data) ) diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c index f63f40b..c8d6f0b 100644 --- a/tools/libxc/xc_sr_save_x86_pv.c +++ b/tools/libxc/xc_sr_save_x86_pv.c @@ -83,8 +83,8 @@ static int map_p2m(struct xc_sr_context *ctx) */ xc_interface *xch = ctx->xch; int rc = -1; - unsigned x, fpp, fll_entries, fl_entries; - xen_pfn_t fll_mfn; + unsigned x, saved_x, fpp, fll_entries, fl_entries; + xen_pfn_t fll_mfn, saved_mfn, max_pfn; xen_pfn_t *local_fll = NULL; void *guest_fll = NULL; @@ -94,9 +94,15 @@ static int map_p2m(struct xc_sr_context *ctx) void *guest_fl = NULL; size_t local_fl_size; + ctx->x86_pv.max_pfn = GET_FIELD(ctx->x86_pv.shinfo, arch.max_pfn, + ctx->x86_pv.width) - 1; fpp = PAGE_SIZE / ctx->x86_pv.width; fll_entries = (ctx->x86_pv.max_pfn / (fpp * fpp)) + 1; - fl_entries = (ctx->x86_pv.max_pfn / fpp) + 1; + if ( fll_entries > fpp ) + { + ERROR("max_pfn %#lx too large for p2m tree", ctx->x86_pv.max_pfn); + goto err; + } fll_mfn = GET_FIELD(ctx->x86_pv.shinfo, arch.pfn_to_mfn_frame_list_list, ctx->x86_pv.width); @@ -131,6 +137,8 @@ static int map_p2m(struct xc_sr_context *ctx) } /* Check for bad mfns in frame list list. */ + saved_mfn = 0; + saved_x = 0; for ( x = 0; x < fll_entries; ++x ) { if ( local_fll[x] == 0 || local_fll[x] > ctx->x86_pv.max_mfn ) @@ -139,8 +147,35 @@ static int map_p2m(struct xc_sr_context *ctx) local_fll[x], x, fll_entries); goto err; } + if ( local_fll[x] != saved_mfn ) + { + saved_mfn = local_fll[x]; + saved_x = x; + } } + /* + * Check for actual lower max_pfn: + * If the trailing entries of the frame list list were all the same we can + * assume they all reference mid pages all referencing p2m pages with all + * invalid entries. Otherwise there would be multiple pfns referencing all + * the same mfn which can't work across migration, as this sharing would be + * broken by the migration process. + * Adjust max_pfn if possible to avoid allocating much larger areas as + * needed for p2m and logdirty map. + */ + max_pfn = (saved_x + 1) * fpp * fpp - 1; + if ( max_pfn < ctx->x86_pv.max_pfn ) + { + ctx->x86_pv.max_pfn = max_pfn; + fll_entries = (ctx->x86_pv.max_pfn / (fpp * fpp)) + 1; + } + ctx->x86_pv.p2m_frames = (ctx->x86_pv.max_pfn + fpp) / fpp; + DPRINTF("max_pfn %#lx, p2m_frames %d", ctx->x86_pv.max_pfn, + ctx->x86_pv.p2m_frames); + ctx->save.p2m_size = ctx->x86_pv.max_pfn + 1; + fl_entries = (ctx->x86_pv.max_pfn / fpp) + 1; + /* Map the guest mid p2m frames. */ guest_fl = xc_map_foreign_pages(xch, ctx->domid, PROT_READ, local_fll, fll_entries); -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiF-0001H4-3u; Fri, 11 Dec 2015 13:26:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiD-0001GF-Rj for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:18 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 18/97-10678-9FECA665; Fri, 11 Dec 2015 13:26:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1449840374!10074356!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19992 invoked from network); 11 Dec 2015 13:26:15 -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; 11 Dec 2015 13:26:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mqm-0002RZ-G7 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mqm-00073r-19 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:04 +0000 Date: Fri, 11 Dec 2015 12:31:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: try to find last used pfn when migrating X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 91e204d37f44913913776d0a89279721694f8b32 Author: Juergen Gross AuthorDate: Wed Dec 2 08:42:17 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 8 16:56:18 2015 +0000 libxc: try to find last used pfn when migrating For migration the last used pfn of a guest is needed to size the logdirty bitmap and as an upper bound of the page loop. Unfortunately there are pv-kernels advertising a much higher maximum pfn as they are really using in order to support memory hotplug. This will lead to allocation of much more memory in Xen tools during migration as really needed. Try to find the last used guest pfn of a pv-domu by scanning the p2m tree from the last entry towards it's start and search for an entry not being invalid. Normally the mid pages of the p2m tree containing all invalid entries are being reused, so we can just scan the top page for identical entries and skip them but the first one. Signed-off-by: Juergen Gross Reviewed-by: Wei Liu Reviewed-by: Andrew Cooper [ ijc -- added errno = E2BIG to one error path ] Acked-by: Ian Campbell --- tools/libxc/xc_sr_common.h | 14 ++++++++---- tools/libxc/xc_sr_common_x86_pv.c | 19 +---------------- tools/libxc/xc_sr_save.c | 24 +++------------------ tools/libxc/xc_sr_save_x86_hvm.c | 15 +++++++++++++ tools/libxc/xc_sr_save_x86_pv.c | 41 ++++++++++++++++++++++++++++++++++-- 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 64f6082..9aecde2 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -54,9 +54,11 @@ struct xc_sr_save_ops void **page); /** - * Set up local environment to restore a domain. This is called before - * any records are written to the stream. (Typically querying running - * domain state, setting up mappings etc.) + * Set up local environment to save a domain. (Typically querying + * running domain state, setting up mappings etc.) + * + * This is called once before any common setup has occurred, allowing for + * guest-specific adjustments to be made to common state. */ int (*setup)(struct xc_sr_context *ctx); @@ -121,8 +123,10 @@ struct xc_sr_restore_ops int (*localise_page)(struct xc_sr_context *ctx, uint32_t type, void *page); /** - * Set up local environment to restore a domain. This is called before - * any records are read from the stream. + * Set up local environment to restore a domain. + * + * This is called once before any common setup has occurred, allowing for + * guest-specific adjustments to be made to common state. */ int (*setup)(struct xc_sr_context *ctx); diff --git a/tools/libxc/xc_sr_common_x86_pv.c b/tools/libxc/xc_sr_common_x86_pv.c index eb68c07..f233c87 100644 --- a/tools/libxc/xc_sr_common_x86_pv.c +++ b/tools/libxc/xc_sr_common_x86_pv.c @@ -68,8 +68,7 @@ uint64_t mfn_to_cr3(struct xc_sr_context *ctx, xen_pfn_t _mfn) int x86_pv_domain_info(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; - unsigned int guest_width, guest_levels, fpp; - xen_pfn_t max_pfn; + unsigned int guest_width, guest_levels; /* Get the domain width */ if ( xc_domain_get_guest_width(xch, ctx->domid, &guest_width) ) @@ -89,25 +88,9 @@ int x86_pv_domain_info(struct xc_sr_context *ctx) } ctx->x86_pv.width = guest_width; ctx->x86_pv.levels = guest_levels; - fpp = PAGE_SIZE / ctx->x86_pv.width; DPRINTF("%d bits, %d levels", guest_width * 8, guest_levels); - /* Get the domain's size */ - if ( xc_domain_maximum_gpfn(xch, ctx->domid, &max_pfn) < 0 ) - { - PERROR("Unable to obtain guests max pfn"); - return -1; - } - - if ( max_pfn > 0 ) - { - ctx->x86_pv.max_pfn = max_pfn; - ctx->x86_pv.p2m_frames = (ctx->x86_pv.max_pfn + fpp) / fpp; - - DPRINTF("max_pfn %#lx, p2m_frames %d", max_pfn, ctx->x86_pv.p2m_frames); - } - return 0; } diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 0c12e56..cefcef5 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -677,6 +677,10 @@ static int setup(struct xc_sr_context *ctx) DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap, &ctx->save.dirty_bitmap_hbuf); + rc = ctx->save.ops.setup(ctx); + if ( rc ) + goto err; + dirty_bitmap = xc_hypercall_buffer_alloc_pages( xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * @@ -692,10 +696,6 @@ static int setup(struct xc_sr_context *ctx) goto err; } - rc = ctx->save.ops.setup(ctx); - if ( rc ) - goto err; - rc = 0; err: @@ -824,7 +824,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, uint32_t max_iters, uint32_t max_factor, uint32_t flags, struct save_callbacks* callbacks, int hvm) { - xen_pfn_t nr_pfns; struct xc_sr_context ctx = { .xch = xch, @@ -869,21 +868,6 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, ctx.domid = dom; - if ( xc_domain_nr_gpfns(xch, dom, &nr_pfns) < 0 ) - { - PERROR("Unable to obtain the guest p2m size"); - return -1; - } - - ctx.save.p2m_size = nr_pfns; - - if ( ctx.save.p2m_size > ~XEN_DOMCTL_PFINFO_LTAB_MASK ) - { - errno = E2BIG; - ERROR("Cannot save this big a guest"); - return -1; - } - if ( ctx.dominfo.hvm ) { ctx.save.ops = save_ops_x86_hvm; diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index cdee774..f3d6cee 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -135,6 +135,21 @@ static int x86_hvm_normalise_page(struct xc_sr_context *ctx, static int x86_hvm_setup(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; + xen_pfn_t nr_pfns; + + if ( xc_domain_nr_gpfns(xch, ctx->domid, &nr_pfns) < 0 ) + { + PERROR("Unable to obtain the guest p2m size"); + return -1; + } + if ( nr_pfns > ~XEN_DOMCTL_PFINFO_LTAB_MASK ) + { + errno = E2BIG; + PERROR("Cannot save this big a guest"); + return -1; + } + + ctx->save.p2m_size = nr_pfns; if ( ctx->save.callbacks->switch_qemu_logdirty( ctx->domid, 1, ctx->save.callbacks->data) ) diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c index f63f40b..c8d6f0b 100644 --- a/tools/libxc/xc_sr_save_x86_pv.c +++ b/tools/libxc/xc_sr_save_x86_pv.c @@ -83,8 +83,8 @@ static int map_p2m(struct xc_sr_context *ctx) */ xc_interface *xch = ctx->xch; int rc = -1; - unsigned x, fpp, fll_entries, fl_entries; - xen_pfn_t fll_mfn; + unsigned x, saved_x, fpp, fll_entries, fl_entries; + xen_pfn_t fll_mfn, saved_mfn, max_pfn; xen_pfn_t *local_fll = NULL; void *guest_fll = NULL; @@ -94,9 +94,15 @@ static int map_p2m(struct xc_sr_context *ctx) void *guest_fl = NULL; size_t local_fl_size; + ctx->x86_pv.max_pfn = GET_FIELD(ctx->x86_pv.shinfo, arch.max_pfn, + ctx->x86_pv.width) - 1; fpp = PAGE_SIZE / ctx->x86_pv.width; fll_entries = (ctx->x86_pv.max_pfn / (fpp * fpp)) + 1; - fl_entries = (ctx->x86_pv.max_pfn / fpp) + 1; + if ( fll_entries > fpp ) + { + ERROR("max_pfn %#lx too large for p2m tree", ctx->x86_pv.max_pfn); + goto err; + } fll_mfn = GET_FIELD(ctx->x86_pv.shinfo, arch.pfn_to_mfn_frame_list_list, ctx->x86_pv.width); @@ -131,6 +137,8 @@ static int map_p2m(struct xc_sr_context *ctx) } /* Check for bad mfns in frame list list. */ + saved_mfn = 0; + saved_x = 0; for ( x = 0; x < fll_entries; ++x ) { if ( local_fll[x] == 0 || local_fll[x] > ctx->x86_pv.max_mfn ) @@ -139,8 +147,35 @@ static int map_p2m(struct xc_sr_context *ctx) local_fll[x], x, fll_entries); goto err; } + if ( local_fll[x] != saved_mfn ) + { + saved_mfn = local_fll[x]; + saved_x = x; + } } + /* + * Check for actual lower max_pfn: + * If the trailing entries of the frame list list were all the same we can + * assume they all reference mid pages all referencing p2m pages with all + * invalid entries. Otherwise there would be multiple pfns referencing all + * the same mfn which can't work across migration, as this sharing would be + * broken by the migration process. + * Adjust max_pfn if possible to avoid allocating much larger areas as + * needed for p2m and logdirty map. + */ + max_pfn = (saved_x + 1) * fpp * fpp - 1; + if ( max_pfn < ctx->x86_pv.max_pfn ) + { + ctx->x86_pv.max_pfn = max_pfn; + fll_entries = (ctx->x86_pv.max_pfn / (fpp * fpp)) + 1; + } + ctx->x86_pv.p2m_frames = (ctx->x86_pv.max_pfn + fpp) / fpp; + DPRINTF("max_pfn %#lx, p2m_frames %d", ctx->x86_pv.max_pfn, + ctx->x86_pv.p2m_frames); + ctx->save.p2m_size = ctx->x86_pv.max_pfn + 1; + fl_entries = (ctx->x86_pv.max_pfn / fpp) + 1; + /* Map the guest mid p2m frames. */ guest_fl = xc_map_foreign_pages(xch, ctx->domid, PROT_READ, local_fll, fll_entries); -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiH-0001In-7h; Fri, 11 Dec 2015 13:26:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiG-0001Ho-1P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:20 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id EB/EA-19110-BFECA665; Fri, 11 Dec 2015 13:26:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1449840376!10188522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56321 invoked from network); 11 Dec 2015 13:26:18 -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; 11 Dec 2015 13:26:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MmC-0002Mu-S4 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MmC-0006gy-Qk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:20 +0000 Date: Fri, 11 Dec 2015 12:26:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ept: remove unnecessary sync after resolving misconfigured entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cea357ba4b3335ca5279ee9c00838f85575d5842 Author: David Vrabel AuthorDate: Wed Dec 2 15:19:53 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:19:53 2015 +0100 x86/ept: remove unnecessary sync after resolving misconfigured entries When using EPT, type changes are done with the following steps: 1. Set entry as invalid (misconfigured) by settings a reserved memory type. 2. Flush all EPT and combined translations (ept_sync_domain()). 3. Fixup misconfigured entries as required (on EPT_MISCONFIG vmexits or when explicitly setting an entry. Since resolve_misconfig() only updates entries that were misconfigured, there is no need to invalidate any translations since the hardware does not cache misconfigured translations (vol 3, section 28.3.2). Remove the unnecessary (and very expensive) ept_sync_domain() calls). Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/mm/p2m-ept.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 8fabb44..eef0372 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -644,7 +644,6 @@ bool_t ept_handle_misconfig(uint64_t gpa) spurious = curr->arch.hvm_vmx.ept_spurious_misconfig; rc = resolve_misconfig(p2m, PFN_DOWN(gpa)); curr->arch.hvm_vmx.ept_spurious_misconfig = 0; - ept_sync_domain(p2m); p2m_unlock(p2m); @@ -671,7 +670,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, bool_t need_modify_vtd_table = 1; bool_t vtd_pte_present = 0; unsigned int iommu_flags = p2m_get_iommu_flags(p2mt); - enum { sync_off, sync_on, sync_check } needs_sync = sync_check; + bool_t needs_sync = 1; ept_entry_t old_entry = { .epte = 0 }; ept_entry_t new_entry = { .epte = 0 }; struct ept_data *ept = &p2m->ept; @@ -692,12 +691,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* Carry out any eventually pending earlier changes first. */ ret = resolve_misconfig(p2m, gfn); if ( ret < 0 ) - { - ept_sync_domain(p2m); return ret; - } - if ( ret > 0 ) - needs_sync = sync_on; ASSERT((target == 2 && hap_has_1gb) || (target == 1 && hap_has_2mb) || @@ -740,8 +734,8 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* We reached the target level. */ /* No need to flush if the old entry wasn't valid */ - if ( needs_sync == sync_check && !is_epte_present(ept_entry) ) - needs_sync = sync_off; + if ( !is_epte_present(ept_entry) ) + needs_sync = 0; /* If we're replacing a non-leaf entry with a leaf entry (1GiB or 2MiB), * the intermediate tables will be freed below after the ept flush @@ -822,7 +816,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, p2m->max_mapped_pfn = gfn + (1UL << order) - 1; out: - if ( needs_sync != sync_off ) + if ( needs_sync ) ept_sync_domain(p2m); /* For host p2m, may need to change VT-d page table.*/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiH-0001In-7h; Fri, 11 Dec 2015 13:26:21 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiG-0001Ho-1P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:20 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id EB/EA-19110-BFECA665; Fri, 11 Dec 2015 13:26:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1449840376!10188522!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56321 invoked from network); 11 Dec 2015 13:26:18 -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; 11 Dec 2015 13:26:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MmC-0002Mu-S4 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MmC-0006gy-Qk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:20 +0000 Date: Fri, 11 Dec 2015 12:26:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ept: remove unnecessary sync after resolving misconfigured entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cea357ba4b3335ca5279ee9c00838f85575d5842 Author: David Vrabel AuthorDate: Wed Dec 2 15:19:53 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 2 15:19:53 2015 +0100 x86/ept: remove unnecessary sync after resolving misconfigured entries When using EPT, type changes are done with the following steps: 1. Set entry as invalid (misconfigured) by settings a reserved memory type. 2. Flush all EPT and combined translations (ept_sync_domain()). 3. Fixup misconfigured entries as required (on EPT_MISCONFIG vmexits or when explicitly setting an entry. Since resolve_misconfig() only updates entries that were misconfigured, there is no need to invalidate any translations since the hardware does not cache misconfigured translations (vol 3, section 28.3.2). Remove the unnecessary (and very expensive) ept_sync_domain() calls). Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/mm/p2m-ept.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 8fabb44..eef0372 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -644,7 +644,6 @@ bool_t ept_handle_misconfig(uint64_t gpa) spurious = curr->arch.hvm_vmx.ept_spurious_misconfig; rc = resolve_misconfig(p2m, PFN_DOWN(gpa)); curr->arch.hvm_vmx.ept_spurious_misconfig = 0; - ept_sync_domain(p2m); p2m_unlock(p2m); @@ -671,7 +670,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, bool_t need_modify_vtd_table = 1; bool_t vtd_pte_present = 0; unsigned int iommu_flags = p2m_get_iommu_flags(p2mt); - enum { sync_off, sync_on, sync_check } needs_sync = sync_check; + bool_t needs_sync = 1; ept_entry_t old_entry = { .epte = 0 }; ept_entry_t new_entry = { .epte = 0 }; struct ept_data *ept = &p2m->ept; @@ -692,12 +691,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* Carry out any eventually pending earlier changes first. */ ret = resolve_misconfig(p2m, gfn); if ( ret < 0 ) - { - ept_sync_domain(p2m); return ret; - } - if ( ret > 0 ) - needs_sync = sync_on; ASSERT((target == 2 && hap_has_1gb) || (target == 1 && hap_has_2mb) || @@ -740,8 +734,8 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* We reached the target level. */ /* No need to flush if the old entry wasn't valid */ - if ( needs_sync == sync_check && !is_epte_present(ept_entry) ) - needs_sync = sync_off; + if ( !is_epte_present(ept_entry) ) + needs_sync = 0; /* If we're replacing a non-leaf entry with a leaf entry (1GiB or 2MiB), * the intermediate tables will be freed below after the ept flush @@ -822,7 +816,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, p2m->max_mapped_pfn = gfn + (1UL << order) - 1; out: - if ( needs_sync != sync_off ) + if ( needs_sync ) ept_sync_domain(p2m); /* For host p2m, may need to change VT-d page table.*/ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiK-0001Kh-CO; Fri, 11 Dec 2015 13:26:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiI-0001Jf-JI for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:22 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 15/F0-12889-DFECA665; Fri, 11 Dec 2015 13:26:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449840378!10520640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52907 invoked from network); 11 Dec 2015 13:26:20 -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; 11 Dec 2015 13:26:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mm2-0002Mq-LP for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mm2-0006gR-Jg for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:10 +0000 Date: Fri, 11 Dec 2015 12:26:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: refactor memory allocation functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8eb0ec277ae387e78d685523e0fee633e46f046 Author: Wei Liu AuthorDate: Tue Dec 1 11:39:16 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:13:33 2015 +0000 libxc: refactor memory allocation functions There were some problems with the original memory allocation functions: 1. xc_dom_alloc_segment and xc_dom_alloc_pad ended up calling xc_dom_chk_alloc_pages while xc_dom_alloc_page open-coded everything. 2. xc_dom_alloc_pad didn't call dom->allocate. Refactor the code so that: 1. xc_dom_alloc_{segment,pad,page} end up calling xc_dom_chk_alloc_pages. 2. xc_dom_chk_alloc_pages calls dom->allocate. This way we avoid scattering dom->allocate over multiple locations and open-coding. Also change the return type of xc_dom_alloc_page to xen_pfn_t and return an invalid pfn when xc_dom_chk_alloc_pages fails. Signed-off-by: Wei Liu Reviewed-by: Juergen Gross Acked-by: Ian Campbell Tested-by: Ian Campbell --- tools/libxc/include/xc_dom.h | 2 +- tools/libxc/xc_dom_core.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index fd8c5e8..43a65ee 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -355,7 +355,7 @@ char *xc_dom_strdup(struct xc_dom_image *dom, const char *str); /* --- alloc memory pool ------------------------------------------- */ -int xc_dom_alloc_page(struct xc_dom_image *dom, char *name); +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name); int xc_dom_alloc_segment(struct xc_dom_image *dom, struct xc_dom_seg *seg, char *name, xen_vaddr_t start, xen_vaddr_t size); diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 5d6c3ba..8967970 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -555,6 +555,9 @@ static int xc_dom_chk_alloc_pages(struct xc_dom_image *dom, char *name, dom->pfn_alloc_end += pages; dom->virt_alloc_end += pages * page_size; + if ( dom->allocate ) + dom->allocate(dom); + return 0; } @@ -602,9 +605,6 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, if ( xc_dom_chk_alloc_pages(dom, name, pages) ) return -1; - if (dom->allocate) - dom->allocate(dom); - /* map and clear pages */ ptr = xc_dom_seg_to_ptr(dom, seg); if ( ptr == NULL ) @@ -621,18 +621,16 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, return 0; } -int xc_dom_alloc_page(struct xc_dom_image *dom, char *name) +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name) { - unsigned int page_size = XC_DOM_PAGE_SIZE(dom); xen_vaddr_t start; xen_pfn_t pfn; start = dom->virt_alloc_end; pfn = dom->pfn_alloc_end - dom->rambase_pfn; - dom->virt_alloc_end += page_size; - dom->pfn_alloc_end++; - if ( dom->allocate ) - dom->allocate(dom); + + if ( xc_dom_chk_alloc_pages(dom, name, 1) ) + return (xen_pfn_t)-1; DOMPRINTF("%-20s: %-12s : 0x%" PRIx64 " (pfn 0x%" PRIpfn ")", __FUNCTION__, name, start, pfn); -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiK-0001Kh-CO; Fri, 11 Dec 2015 13:26:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiI-0001Jf-JI for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:22 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 15/F0-12889-DFECA665; Fri, 11 Dec 2015 13:26:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1449840378!10520640!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52907 invoked from network); 11 Dec 2015 13:26:20 -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; 11 Dec 2015 13:26:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mm2-0002Mq-LP for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mm2-0006gR-Jg for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:26:10 +0000 Date: Fri, 11 Dec 2015 12:26:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: refactor memory allocation functions X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c8eb0ec277ae387e78d685523e0fee633e46f046 Author: Wei Liu AuthorDate: Tue Dec 1 11:39:16 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:13:33 2015 +0000 libxc: refactor memory allocation functions There were some problems with the original memory allocation functions: 1. xc_dom_alloc_segment and xc_dom_alloc_pad ended up calling xc_dom_chk_alloc_pages while xc_dom_alloc_page open-coded everything. 2. xc_dom_alloc_pad didn't call dom->allocate. Refactor the code so that: 1. xc_dom_alloc_{segment,pad,page} end up calling xc_dom_chk_alloc_pages. 2. xc_dom_chk_alloc_pages calls dom->allocate. This way we avoid scattering dom->allocate over multiple locations and open-coding. Also change the return type of xc_dom_alloc_page to xen_pfn_t and return an invalid pfn when xc_dom_chk_alloc_pages fails. Signed-off-by: Wei Liu Reviewed-by: Juergen Gross Acked-by: Ian Campbell Tested-by: Ian Campbell --- tools/libxc/include/xc_dom.h | 2 +- tools/libxc/xc_dom_core.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index fd8c5e8..43a65ee 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -355,7 +355,7 @@ char *xc_dom_strdup(struct xc_dom_image *dom, const char *str); /* --- alloc memory pool ------------------------------------------- */ -int xc_dom_alloc_page(struct xc_dom_image *dom, char *name); +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name); int xc_dom_alloc_segment(struct xc_dom_image *dom, struct xc_dom_seg *seg, char *name, xen_vaddr_t start, xen_vaddr_t size); diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 5d6c3ba..8967970 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -555,6 +555,9 @@ static int xc_dom_chk_alloc_pages(struct xc_dom_image *dom, char *name, dom->pfn_alloc_end += pages; dom->virt_alloc_end += pages * page_size; + if ( dom->allocate ) + dom->allocate(dom); + return 0; } @@ -602,9 +605,6 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, if ( xc_dom_chk_alloc_pages(dom, name, pages) ) return -1; - if (dom->allocate) - dom->allocate(dom); - /* map and clear pages */ ptr = xc_dom_seg_to_ptr(dom, seg); if ( ptr == NULL ) @@ -621,18 +621,16 @@ int xc_dom_alloc_segment(struct xc_dom_image *dom, return 0; } -int xc_dom_alloc_page(struct xc_dom_image *dom, char *name) +xen_pfn_t xc_dom_alloc_page(struct xc_dom_image *dom, char *name) { - unsigned int page_size = XC_DOM_PAGE_SIZE(dom); xen_vaddr_t start; xen_pfn_t pfn; start = dom->virt_alloc_end; pfn = dom->pfn_alloc_end - dom->rambase_pfn; - dom->virt_alloc_end += page_size; - dom->pfn_alloc_end++; - if ( dom->allocate ) - dom->allocate(dom); + + if ( xc_dom_chk_alloc_pages(dom, name, 1) ) + return (xen_pfn_t)-1; DOMPRINTF("%-20s: %-12s : 0x%" PRIx64 " (pfn 0x%" PRIpfn ")", __FUNCTION__, name, start, pfn); -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiL-0001Ld-H9; Fri, 11 Dec 2015 13:26:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiJ-0001K8-Jm for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:23 +0000 Content-Length: 6131 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 91/67-14715-EFECA665; Fri, 11 Dec 2015 13:26:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1449840381!10054014!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54674 invoked from network); 11 Dec 2015 13:26:21 -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; 11 Dec 2015 13:26:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MjD-0002Ij-Ak for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MjD-0006Tr-6x for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:15 +0000 Date: Fri, 11 Dec 2015 12:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vlapic: fixes for HVM code when running without a vlapic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5278958850626855443==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5278958850626855443== Content-Length: 5824 Content-Transfer-Encoding: quoted-printable commit 302a8519fb8537f619569873d605f65eb18f4bdc Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 16:00:56 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 16:00:56 2015 +0100 x86/vlapic: fixes for HVM code when running without a vlapic The HVM related code (SVM, VMX) generally assumed that a local apic is always present. With the introduction of a HVM mode were the local apic can be removed, some of this broken code paths arised. The SVM exit/resume paths unconditionally checked the state of the lapic, which is wrong if it's been disabled by hardware, fix this by adding the necessary checks. On the VMX side, make sure we don't add mappings for a local apic if it's disabled. In the generic vlapic code, add checks to prevent setting the TSC deadline timer if the lapic is disabled, and also prevent trying to inject interrupts from the PIC is the lapic is also disabled. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Boris Ostrovsky Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 18 ++++++++++-------- xen/arch/x86/hvm/vlapic.c | 7 ++++++- xen/arch/x86/hvm/vmx/vmx.c | 4 +++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e2db4db..200a5df 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1035,6 +1035,7 @@ static void noreturn svm_do_resume(struct vcpu *v) struct vmcb_struct *vmcb =3D v->arch.hvm_svm.vmcb; bool_t debug_state =3D v->domain->debugger_attached; bool_t vcpu_guestmode =3D 0; + struct vlapic *vlapic =3D vcpu_vlapic(v); if ( nestedhvm_enabled(v->domain) && nestedhvm_vcpu_in_guestmode(v) ) vcpu_guestmode =3D 1; @@ -1059,14 +1060,14 @@ static void noreturn svm_do_resume(struct vcpu *v) hvm_asid_flush_vcpu(v); } - if ( !vcpu_guestmode ) + if ( !vcpu_guestmode && !vlapic_hw_disabled(vlapic) ) { vintr_t intr; /* Reflect the vlapic's TPR in the hardware vtpr */ intr =3D vmcb_get_vintr(vmcb); intr.fields.tpr =3D - (vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI) & 0xFF) >> 4; + (vlapic_get_reg(vlapic, APIC_TASKPRI) & 0xFF) >> 4; vmcb_set_vintr(vmcb, intr); } @@ -2258,6 +2259,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) int inst_len, rc; vintr_t intr; bool_t vcpu_guestmode =3D 0; + struct vlapic *vlapic =3D vcpu_vlapic(v); hvm_invalidate_regs_fields(regs); @@ -2275,11 +2277,12 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) * NB. We need to preserve the low bits of the TPR to make checked builds * of Windows work, even though they don't actually do anything. */ - if ( !vcpu_guestmode ) { + if ( !vcpu_guestmode && !vlapic_hw_disabled(vlapic) ) + { intr =3D vmcb_get_vintr(vmcb); - vlapic_set_reg(vcpu_vlapic(v), APIC_TASKPRI, + vlapic_set_reg(vlapic, APIC_TASKPRI, ((intr.fields.tpr & 0x0F) << 4) | - (vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI) & 0x0F)); + (vlapic_get_reg(vlapic, APIC_TASKPRI) & 0x0F)); } exit_reason =3D vmcb->exitcode; @@ -2667,14 +2670,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) } out: - if ( vcpu_guestmode ) - /* Don't clobber TPR of the nested guest. */ + if ( vcpu_guestmode || vlapic_hw_disabled(vlapic) ) return; /* The exit may have updated the TPR: reflect this in the hardware vtpr */ intr =3D vmcb_get_vintr(vmcb); intr.fields.tpr =3D - (vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI) & 0xFF) >> 4; + (vlapic_get_reg(vlapic, APIC_TASKPRI) & 0xFF) >> 4; vmcb_set_vintr(vmcb, intr); } diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 9b7c871..15d59f6 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1037,7 +1037,9 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) uint64_t guest_tsc; struct vcpu *v =3D vlapic_vcpu(vlapic); - /* may need to exclude some other conditions like vlapic->hw.disabled */ + if ( vlapic_hw_disabled(vlapic) ) + return; + if ( !vlapic_lvtt_tdt(vlapic) ) { HVM_DBG_LOG(DBG_LEVEL_VLAPIC_TIMER, "ignore tsc deadline msr write"); @@ -1113,6 +1115,9 @@ static int __vlapic_accept_pic_intr(struct vcpu *v) int vlapic_accept_pic_intr(struct vcpu *v) { + if ( vlapic_hw_disabled(vcpu_vlapic(v)) ) + return 0; + TRACE_2D(TRC_HVM_EMUL_LAPIC_PIC_INTR, (v =3D=3D v->domain->arch.hvm_domain.i8259_target), v =3F __vlapic_accept_pic_intr(v) : -1); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9ad6d82..3eeccbb 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2429,9 +2429,11 @@ static void vmx_install_vlapic_mapping(struct vcpu *v) { paddr_t virt_page_ma, apic_page_ma; - if ( !cpu_has_vmx_virtualize_apic_accesses ) + if ( v->domain->arch.hvm_domain.vmx.apic_access_mfn =3D=3D 0 ) return; + ASSERT(cpu_has_vmx_virtualize_apic_accesses); + virt_page_ma =3D page_to_maddr(vcpu_vlapic(v)->regs_page); apic_page_ma =3D v->domain->arch.hvm_domain.vmx.apic_access_mfn; apic_page_ma <<=3D PAGE_SHIFT; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5278958850626855443== 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 --===============5278958850626855443==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiL-0001Ld-H9; Fri, 11 Dec 2015 13:26:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiJ-0001K8-Jm for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:23 +0000 Content-Length: 6131 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 91/67-14715-EFECA665; Fri, 11 Dec 2015 13:26:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1449840381!10054014!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54674 invoked from network); 11 Dec 2015 13:26:21 -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; 11 Dec 2015 13:26:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MjD-0002Ij-Ak for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MjD-0006Tr-6x for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:15 +0000 Date: Fri, 11 Dec 2015 12:23:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vlapic: fixes for HVM code when running without a vlapic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5278958850626855443==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5278958850626855443== Content-Length: 5824 Content-Transfer-Encoding: quoted-printable commit 302a8519fb8537f619569873d605f65eb18f4bdc Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 16:00:56 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 16:00:56 2015 +0100 x86/vlapic: fixes for HVM code when running without a vlapic The HVM related code (SVM, VMX) generally assumed that a local apic is always present. With the introduction of a HVM mode were the local apic can be removed, some of this broken code paths arised. The SVM exit/resume paths unconditionally checked the state of the lapic, which is wrong if it's been disabled by hardware, fix this by adding the necessary checks. On the VMX side, make sure we don't add mappings for a local apic if it's disabled. In the generic vlapic code, add checks to prevent setting the TSC deadline timer if the lapic is disabled, and also prevent trying to inject interrupts from the PIC is the lapic is also disabled. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Boris Ostrovsky Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 18 ++++++++++-------- xen/arch/x86/hvm/vlapic.c | 7 ++++++- xen/arch/x86/hvm/vmx/vmx.c | 4 +++- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e2db4db..200a5df 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1035,6 +1035,7 @@ static void noreturn svm_do_resume(struct vcpu *v) struct vmcb_struct *vmcb =3D v->arch.hvm_svm.vmcb; bool_t debug_state =3D v->domain->debugger_attached; bool_t vcpu_guestmode =3D 0; + struct vlapic *vlapic =3D vcpu_vlapic(v); if ( nestedhvm_enabled(v->domain) && nestedhvm_vcpu_in_guestmode(v) ) vcpu_guestmode =3D 1; @@ -1059,14 +1060,14 @@ static void noreturn svm_do_resume(struct vcpu *v) hvm_asid_flush_vcpu(v); } - if ( !vcpu_guestmode ) + if ( !vcpu_guestmode && !vlapic_hw_disabled(vlapic) ) { vintr_t intr; /* Reflect the vlapic's TPR in the hardware vtpr */ intr =3D vmcb_get_vintr(vmcb); intr.fields.tpr =3D - (vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI) & 0xFF) >> 4; + (vlapic_get_reg(vlapic, APIC_TASKPRI) & 0xFF) >> 4; vmcb_set_vintr(vmcb, intr); } @@ -2258,6 +2259,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) int inst_len, rc; vintr_t intr; bool_t vcpu_guestmode =3D 0; + struct vlapic *vlapic =3D vcpu_vlapic(v); hvm_invalidate_regs_fields(regs); @@ -2275,11 +2277,12 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) * NB. We need to preserve the low bits of the TPR to make checked builds * of Windows work, even though they don't actually do anything. */ - if ( !vcpu_guestmode ) { + if ( !vcpu_guestmode && !vlapic_hw_disabled(vlapic) ) + { intr =3D vmcb_get_vintr(vmcb); - vlapic_set_reg(vcpu_vlapic(v), APIC_TASKPRI, + vlapic_set_reg(vlapic, APIC_TASKPRI, ((intr.fields.tpr & 0x0F) << 4) | - (vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI) & 0x0F)); + (vlapic_get_reg(vlapic, APIC_TASKPRI) & 0x0F)); } exit_reason =3D vmcb->exitcode; @@ -2667,14 +2670,13 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) } out: - if ( vcpu_guestmode ) - /* Don't clobber TPR of the nested guest. */ + if ( vcpu_guestmode || vlapic_hw_disabled(vlapic) ) return; /* The exit may have updated the TPR: reflect this in the hardware vtpr */ intr =3D vmcb_get_vintr(vmcb); intr.fields.tpr =3D - (vlapic_get_reg(vcpu_vlapic(v), APIC_TASKPRI) & 0xFF) >> 4; + (vlapic_get_reg(vlapic, APIC_TASKPRI) & 0xFF) >> 4; vmcb_set_vintr(vmcb, intr); } diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 9b7c871..15d59f6 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -1037,7 +1037,9 @@ void vlapic_tdt_msr_set(struct vlapic *vlapic, uint64_t value) uint64_t guest_tsc; struct vcpu *v =3D vlapic_vcpu(vlapic); - /* may need to exclude some other conditions like vlapic->hw.disabled */ + if ( vlapic_hw_disabled(vlapic) ) + return; + if ( !vlapic_lvtt_tdt(vlapic) ) { HVM_DBG_LOG(DBG_LEVEL_VLAPIC_TIMER, "ignore tsc deadline msr write"); @@ -1113,6 +1115,9 @@ static int __vlapic_accept_pic_intr(struct vcpu *v) int vlapic_accept_pic_intr(struct vcpu *v) { + if ( vlapic_hw_disabled(vcpu_vlapic(v)) ) + return 0; + TRACE_2D(TRC_HVM_EMUL_LAPIC_PIC_INTR, (v =3D=3D v->domain->arch.hvm_domain.i8259_target), v =3F __vlapic_accept_pic_intr(v) : -1); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 9ad6d82..3eeccbb 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2429,9 +2429,11 @@ static void vmx_install_vlapic_mapping(struct vcpu *v) { paddr_t virt_page_ma, apic_page_ma; - if ( !cpu_has_vmx_virtualize_apic_accesses ) + if ( v->domain->arch.hvm_domain.vmx.apic_access_mfn =3D=3D 0 ) return; + ASSERT(cpu_has_vmx_virtualize_apic_accesses); + virt_page_ma =3D page_to_maddr(vcpu_vlapic(v)->regs_page); apic_page_ma =3D v->domain->arch.hvm_domain.vmx.apic_access_mfn; apic_page_ma <<=3D PAGE_SHIFT; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5278958850626855443== 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 --===============5278958850626855443==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiM-0001Ms-Os; Fri, 11 Dec 2015 13:26:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiL-0001LS-IA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:25 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 8F/8E-03235-00FCA665; Fri, 11 Dec 2015 13:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449840382!10126353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16328 invoked from network); 11 Dec 2015 13:26:23 -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; 11 Dec 2015 13:26:23 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MlX-0002MB-Sn for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MlX-0006ei-Qv for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:39 +0000 Date: Fri, 11 Dec 2015 12:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ocaml/xc: add softreset shutdown reason X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc41036da8d9075c9b9d57685b6b81f0f964369f Author: Wei Liu AuthorDate: Mon Nov 16 12:43:19 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:09:45 2015 +0000 ocaml/xc: add softreset shutdown reason According to public/sched.h, there is a new shutdown_reason called soft_reset. Propagate that value to ocaml. Signed-off-by: Wei Liu Acked-by: David Scott --- tools/ocaml/libs/xc/xenctrl.ml | 2 +- tools/ocaml/libs/xc/xenctrl.mli | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index beb95b8..41d228d 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -89,7 +89,7 @@ type compile_info = compile_date : string; } -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog | Soft_reset type domain_create_flag = CDF_HVM | CDF_HAP diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 8928a2e..b4a175b 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -61,7 +61,7 @@ type compile_info = { compile_domain : string; compile_date : string; } -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog | Soft_reset type domain_create_flag = CDF_HVM | CDF_HAP -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiM-0001Ms-Os; Fri, 11 Dec 2015 13:26:26 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiL-0001LS-IA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:25 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 8F/8E-03235-00FCA665; Fri, 11 Dec 2015 13:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449840382!10126353!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16328 invoked from network); 11 Dec 2015 13:26:23 -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; 11 Dec 2015 13:26:23 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MlX-0002MB-Sn for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MlX-0006ei-Qv for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:39 +0000 Date: Fri, 11 Dec 2015 12:25:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] ocaml/xc: add softreset shutdown reason X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc41036da8d9075c9b9d57685b6b81f0f964369f Author: Wei Liu AuthorDate: Mon Nov 16 12:43:19 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:09:45 2015 +0000 ocaml/xc: add softreset shutdown reason According to public/sched.h, there is a new shutdown_reason called soft_reset. Propagate that value to ocaml. Signed-off-by: Wei Liu Acked-by: David Scott --- tools/ocaml/libs/xc/xenctrl.ml | 2 +- tools/ocaml/libs/xc/xenctrl.mli | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index beb95b8..41d228d 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -89,7 +89,7 @@ type compile_info = compile_date : string; } -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog | Soft_reset type domain_create_flag = CDF_HVM | CDF_HAP diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 8928a2e..b4a175b 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -61,7 +61,7 @@ type compile_info = { compile_domain : string; compile_date : string; } -type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog +type shutdown_reason = Poweroff | Reboot | Suspend | Crash | Watchdog | Soft_reset type domain_create_flag = CDF_HVM | CDF_HAP -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiO-0001Oi-SV; Fri, 11 Dec 2015 13:26:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiN-0001Nb-Nx for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:27 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 11/32-09834-30FCA665; Fri, 11 Dec 2015 13:26:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1449840385!10471673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6038 invoked from network); 11 Dec 2015 13:26:26 -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 2015 13:26:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mqb-0002R3-Iu for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mqb-00072g-Cv for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:53 +0000 Date: Fri, 11 Dec 2015 12:30:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Fix regression in xendomains initscript: test for privcmd char device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ec68500009322fc148742d9aa85596e03c3c2be Author: Sander Eikelenboom AuthorDate: Tue Dec 8 16:07:03 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 8 16:54:40 2015 +0000 Fix regression in xendomains initscript: test for privcmd char device Since commit: "xendomains initscript: test for privcmd char device" (1367e9e5ba4d1612e303123ec0bbf961100fcfa1) due to incorrect negation the xendomains initscript bails out early when both: "/dev/xen/privcmd" and "/proc/xen/privcmd" are present in dom0. Signed-off-by: Sander Eikelenboom Acked-by: Ian Jackson --- tools/hotplug/Linux/xendomains.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index 686f061..dfe0b33 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -45,7 +45,7 @@ fi # Correct exit code would probably be 5, but it's enough # if xend complains if we're not running as privileged domain -if ! [ -e /dev/xen/privcmd ] || [ -e /proc/xen/privcmd ]; then +if [ ! -e /dev/xen/privcmd ] && [ ! -e /proc/xen/privcmd ]; then exit 0 fi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiO-0001Oi-SV; Fri, 11 Dec 2015 13:26:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiN-0001Nb-Nx for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:27 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 11/32-09834-30FCA665; Fri, 11 Dec 2015 13:26:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1449840385!10471673!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6038 invoked from network); 11 Dec 2015 13:26:26 -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 2015 13:26:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mqb-0002R3-Iu for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:53 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mqb-00072g-Cv for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:53 +0000 Date: Fri, 11 Dec 2015 12:30:53 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Fix regression in xendomains initscript: test for privcmd char device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ec68500009322fc148742d9aa85596e03c3c2be Author: Sander Eikelenboom AuthorDate: Tue Dec 8 16:07:03 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 8 16:54:40 2015 +0000 Fix regression in xendomains initscript: test for privcmd char device Since commit: "xendomains initscript: test for privcmd char device" (1367e9e5ba4d1612e303123ec0bbf961100fcfa1) due to incorrect negation the xendomains initscript bails out early when both: "/dev/xen/privcmd" and "/proc/xen/privcmd" are present in dom0. Signed-off-by: Sander Eikelenboom Acked-by: Ian Jackson --- tools/hotplug/Linux/xendomains.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index 686f061..dfe0b33 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -45,7 +45,7 @@ fi # Correct exit code would probably be 5, but it's enough # if xend complains if we're not running as privileged domain -if ! [ -e /dev/xen/privcmd ] || [ -e /proc/xen/privcmd ]; then +if [ ! -e /dev/xen/privcmd ] && [ ! -e /proc/xen/privcmd ]; then exit 0 fi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiQ-0001Pu-09; Fri, 11 Dec 2015 13:26:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiO-0001OP-Nr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:28 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 4E/18-24856-40FCA665; Fri, 11 Dec 2015 13:26:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449840386!9861847!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14716 invoked from network); 11 Dec 2015 13:26:27 -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; 11 Dec 2015 13:26:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MnF-0002Nl-NN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MnF-0006l3-LU for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:25 +0000 Date: Fri, 11 Dec 2015 12:27:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: prefer using privcmd character device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 013396f93ee2d4ec416f701ae420c683b7327230 Author: Doug Goldstein AuthorDate: Tue Dec 1 13:27:53 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 2 15:23:14 2015 +0000 libxc: prefer using privcmd character device Prefer using the character device over the proc file if the character device exists. This follows similar conversions of xenbus to avoid issues with FMODE_ATOMIC_POS added in Linux 3.14 and newer. CC: Ian Jackson CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu Signed-off-by: Doug Goldstein Acked-by: Wei Liu --- tools/libxc/xc_linux_osdep.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 76c55ff..c3a3a14 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -46,7 +46,13 @@ static xc_osdep_handle linux_privcmd_open(xc_interface *xch) { int flags, saved_errno; - int fd = open("/proc/xen/privcmd", O_RDWR); + int fd = open("/dev/xen/privcmd", O_RDWR); /* prefer this newer interface */ + + if ( fd == -1 && ( errno == ENOENT || errno == ENXIO || errno == ENODEV )) + { + /* Fallback to /proc/xen/privcmd */ + fd = open("/proc/xen/privcmd", O_RDWR); + } if ( fd == -1 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7NiQ-0001Pu-09; Fri, 11 Dec 2015 13:26:30 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiO-0001OP-Nr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:28 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 4E/18-24856-40FCA665; Fri, 11 Dec 2015 13:26:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449840386!9861847!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14716 invoked from network); 11 Dec 2015 13:26:27 -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; 11 Dec 2015 13:26:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MnF-0002Nl-NN for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MnF-0006l3-LU for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:25 +0000 Date: Fri, 11 Dec 2015 12:27:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: prefer using privcmd character device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 013396f93ee2d4ec416f701ae420c683b7327230 Author: Doug Goldstein AuthorDate: Tue Dec 1 13:27:53 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 2 15:23:14 2015 +0000 libxc: prefer using privcmd character device Prefer using the character device over the proc file if the character device exists. This follows similar conversions of xenbus to avoid issues with FMODE_ATOMIC_POS added in Linux 3.14 and newer. CC: Ian Jackson CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu Signed-off-by: Doug Goldstein Acked-by: Wei Liu --- tools/libxc/xc_linux_osdep.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 76c55ff..c3a3a14 100644 --- a/tools/libxc/xc_linux_osdep.c +++ b/tools/libxc/xc_linux_osdep.c @@ -46,7 +46,13 @@ static xc_osdep_handle linux_privcmd_open(xc_interface *xch) { int flags, saved_errno; - int fd = open("/proc/xen/privcmd", O_RDWR); + int fd = open("/dev/xen/privcmd", O_RDWR); /* prefer this newer interface */ + + if ( fd == -1 && ( errno == ENOENT || errno == ENXIO || errno == ENODEV )) + { + /* Fallback to /proc/xen/privcmd */ + fd = open("/proc/xen/privcmd", O_RDWR); + } if ( fd == -1 ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiS-0001Rm-4d; Fri, 11 Dec 2015 13:26:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiQ-0001QV-Ne for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:30 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id AA/A6-10715-50FCA665; Fri, 11 Dec 2015 13:26:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1449840387!10535560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4196 invoked from network); 11 Dec 2015 13:26:28 -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; 11 Dec 2015 13:26:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MkW-0002Jh-67 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MkW-0006Z7-3i for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:36 +0000 Date: Fri, 11 Dec 2015 12:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __devinitdata annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9c8958b4b3c74de376c6dc0d37fe6cb411049dc Author: Andrew Cooper AuthorDate: Mon Nov 30 11:58:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:58:09 2015 +0100 drop empty __devinitdata annotation x86 is the only architecture which uses __devinitdata, and also has CONFIG_HOTPLUG enabled, making the annotation empty. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 12 ++++++------ xen/arch/x86/mpparse.c | 2 +- xen/arch/x86/numa.c | 4 ++-- xen/arch/x86/traps.c | 2 +- xen/include/xen/init.h | 2 -- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 16608b1..310ec85 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -19,20 +19,20 @@ static bool_t use_xsave = 1; boolean_param("xsave", use_xsave); -bool_t __devinitdata opt_arat = 1; +bool_t opt_arat = 1; boolean_param("arat", opt_arat); -unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u; +unsigned int opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); -unsigned int __devinitdata opt_cpuid_mask_edx = ~0u; +unsigned int opt_cpuid_mask_edx = ~0u; integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); -unsigned int __devinitdata opt_cpuid_mask_xsave_eax = ~0u; +unsigned int opt_cpuid_mask_xsave_eax = ~0u; integer_param("cpuid_mask_xsave_eax", opt_cpuid_mask_xsave_eax); -unsigned int __devinitdata opt_cpuid_mask_ext_ecx = ~0u; +unsigned int opt_cpuid_mask_ext_ecx = ~0u; integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); -unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u; +unsigned int opt_cpuid_mask_ext_edx = ~0u; integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx); const struct cpu_dev *__read_mostly cpu_devs[X86_VENDOR_NUM] = {}; diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index dc2b251..497a4e9 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -61,7 +61,7 @@ unsigned long __read_mostly mp_lapic_addr; unsigned int __read_mostly boot_cpu_physical_apicid = BAD_APICID; /* Internal processor count */ -static unsigned int __devinitdata num_processors; +static unsigned int num_processors; static unsigned int __initdata disabled_cpus; /* Bitmask of physically existing CPUs */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 6a8880f..9ba47b4 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -49,9 +49,9 @@ cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; -int numa_off __devinitdata = 0; +int numa_off = 0; -int acpi_numa __devinitdata; +int acpi_numa; int srat_disabled(void) { diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 075f98e..d29f828 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -108,7 +108,7 @@ void (*ioemul_handle_quirk)( static int debug_stack_lines = 20; integer_param("debug_stack_lines", debug_stack_lines); -static bool_t __devinitdata opt_ler; +static bool_t opt_ler; boolean_param("ler", opt_ler); #define stack_words_per_line 4 diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index b3bced3..e411736 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -119,12 +119,10 @@ extern struct kernel_param __setup_start, __setup_end; #ifdef CONFIG_HOTPLUG #define __devinit -#define __devinitdata #define __devexit #define __devexitdata #else #define __devinit __init -#define __devinitdata __initdata #define __devexit __exit #define __devexitdata __exitdata #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiS-0001Rm-4d; Fri, 11 Dec 2015 13:26:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiQ-0001QV-Ne for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:30 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id AA/A6-10715-50FCA665; Fri, 11 Dec 2015 13:26:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1449840387!10535560!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4196 invoked from network); 11 Dec 2015 13:26:28 -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; 11 Dec 2015 13:26:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MkW-0002Jh-67 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MkW-0006Z7-3i for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:36 +0000 Date: Fri, 11 Dec 2015 12:24:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __devinitdata annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9c8958b4b3c74de376c6dc0d37fe6cb411049dc Author: Andrew Cooper AuthorDate: Mon Nov 30 11:58:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:58:09 2015 +0100 drop empty __devinitdata annotation x86 is the only architecture which uses __devinitdata, and also has CONFIG_HOTPLUG enabled, making the annotation empty. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 12 ++++++------ xen/arch/x86/mpparse.c | 2 +- xen/arch/x86/numa.c | 4 ++-- xen/arch/x86/traps.c | 2 +- xen/include/xen/init.h | 2 -- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 16608b1..310ec85 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -19,20 +19,20 @@ static bool_t use_xsave = 1; boolean_param("xsave", use_xsave); -bool_t __devinitdata opt_arat = 1; +bool_t opt_arat = 1; boolean_param("arat", opt_arat); -unsigned int __devinitdata opt_cpuid_mask_ecx = ~0u; +unsigned int opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); -unsigned int __devinitdata opt_cpuid_mask_edx = ~0u; +unsigned int opt_cpuid_mask_edx = ~0u; integer_param("cpuid_mask_edx", opt_cpuid_mask_edx); -unsigned int __devinitdata opt_cpuid_mask_xsave_eax = ~0u; +unsigned int opt_cpuid_mask_xsave_eax = ~0u; integer_param("cpuid_mask_xsave_eax", opt_cpuid_mask_xsave_eax); -unsigned int __devinitdata opt_cpuid_mask_ext_ecx = ~0u; +unsigned int opt_cpuid_mask_ext_ecx = ~0u; integer_param("cpuid_mask_ext_ecx", opt_cpuid_mask_ext_ecx); -unsigned int __devinitdata opt_cpuid_mask_ext_edx = ~0u; +unsigned int opt_cpuid_mask_ext_edx = ~0u; integer_param("cpuid_mask_ext_edx", opt_cpuid_mask_ext_edx); const struct cpu_dev *__read_mostly cpu_devs[X86_VENDOR_NUM] = {}; diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index dc2b251..497a4e9 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -61,7 +61,7 @@ unsigned long __read_mostly mp_lapic_addr; unsigned int __read_mostly boot_cpu_physical_apicid = BAD_APICID; /* Internal processor count */ -static unsigned int __devinitdata num_processors; +static unsigned int num_processors; static unsigned int __initdata disabled_cpus; /* Bitmask of physically existing CPUs */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index 6a8880f..9ba47b4 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -49,9 +49,9 @@ cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly; nodemask_t __read_mostly node_online_map = { { [0] = 1UL } }; -int numa_off __devinitdata = 0; +int numa_off = 0; -int acpi_numa __devinitdata; +int acpi_numa; int srat_disabled(void) { diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 075f98e..d29f828 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -108,7 +108,7 @@ void (*ioemul_handle_quirk)( static int debug_stack_lines = 20; integer_param("debug_stack_lines", debug_stack_lines); -static bool_t __devinitdata opt_ler; +static bool_t opt_ler; boolean_param("ler", opt_ler); #define stack_words_per_line 4 diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index b3bced3..e411736 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -119,12 +119,10 @@ extern struct kernel_param __setup_start, __setup_end; #ifdef CONFIG_HOTPLUG #define __devinit -#define __devinitdata #define __devexit #define __devexitdata #else #define __devinit __init -#define __devinitdata __initdata #define __devexit __exit #define __devexitdata __exitdata #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiS-0001S7-7I; Fri, 11 Dec 2015 13:26:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiR-0001Qn-7P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:31 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 7D/78-10678-60FCA665; Fri, 11 Dec 2015 13:26:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1449840384!10048929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 871 invoked from network); 11 Dec 2015 13:26:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:24 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mjn-0002Iy-CU for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mjn-0006W6-B2 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:51 +0000 Date: Fri, 11 Dec 2015 12:23:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop dummy input from alternative_{input, io}() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b2e4b844826588924ef7581b475f0a5b6b11bcd Author: Jan Beulich AuthorDate: Mon Nov 30 11:55:49 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:55:49 2015 +0100 x86: drop dummy input from alternative_{input,io}() We don't need the claimed API compatibility. No change in generated code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/include/asm-x86/alternative.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h index 7ddbd76..7d11354 100644 --- a/xen/include/asm-x86/alternative.h +++ b/xen/include/asm-x86/alternative.h @@ -83,16 +83,15 @@ extern void alternative_instructions(void); * Best is to use constraints that are fixed size (like (%1) ... "r") * If you use variable sized constraints like "m" or "g" in the * replacement make sure to pad to the worst case length. - * Leaving an unused argument 0 to keep API compatibility. */ #define alternative_input(oldinstr, newinstr, feature, input...) \ asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : : "i" (0), ## input) + : : input) /* Like alternative_input, but with a single output argument */ #define alternative_io(oldinstr, newinstr, feature, output, input...) \ asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : output : "i" (0), ## input) + : output : input) /* Use this macro(s) if you need more than one output parameter. */ #define ASM_OUTPUT2(a...) a -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiS-0001S7-7I; Fri, 11 Dec 2015 13:26:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiR-0001Qn-7P for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:31 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 7D/78-10678-60FCA665; Fri, 11 Dec 2015 13:26:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1449840384!10048929!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 871 invoked from network); 11 Dec 2015 13:26:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:24 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mjn-0002Iy-CU for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:51 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mjn-0006W6-B2 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:51 +0000 Date: Fri, 11 Dec 2015 12:23:51 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: drop dummy input from alternative_{input, io}() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0b2e4b844826588924ef7581b475f0a5b6b11bcd Author: Jan Beulich AuthorDate: Mon Nov 30 11:55:49 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 11:55:49 2015 +0100 x86: drop dummy input from alternative_{input,io}() We don't need the claimed API compatibility. No change in generated code. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/include/asm-x86/alternative.h | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h index 7ddbd76..7d11354 100644 --- a/xen/include/asm-x86/alternative.h +++ b/xen/include/asm-x86/alternative.h @@ -83,16 +83,15 @@ extern void alternative_instructions(void); * Best is to use constraints that are fixed size (like (%1) ... "r") * If you use variable sized constraints like "m" or "g" in the * replacement make sure to pad to the worst case length. - * Leaving an unused argument 0 to keep API compatibility. */ #define alternative_input(oldinstr, newinstr, feature, input...) \ asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : : "i" (0), ## input) + : : input) /* Like alternative_input, but with a single output argument */ #define alternative_io(oldinstr, newinstr, feature, output, input...) \ asm volatile (ALTERNATIVE(oldinstr, newinstr, feature) \ - : output : "i" (0), ## input) + : output : input) /* Use this macro(s) if you need more than one output parameter. */ #define ASM_OUTPUT2(a...) a -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiU-0001Tw-CE; Fri, 11 Dec 2015 13:26:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiT-0001Nb-2G for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:33 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E5/42-09834-80FCA665; Fri, 11 Dec 2015 13:26:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1449840389!10489328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5512 invoked from network); 11 Dec 2015 13:26:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mi6-0002Hs-Gk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mi5-0006Pt-QY for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:06 +0000 Date: Fri, 11 Dec 2015 12:22:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: flush remote tlbs by hypercall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b38d426ad09b3e142f474c1dadfd6d6903664a48 Author: Paul Durrant AuthorDate: Thu Nov 26 15:48:41 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:48:41 2015 +0100 x86/viridian: flush remote tlbs by hypercall The Microsoft Hypervisor Top Level Functional Spec. (section 3.4) defines two bits in CPUID leaf 0x40000004:EAX for the hypervisor to recommend whether or not to issue a hypercall for local or remote TLB flush. Whilst it's doubtful whether using a hypercall for local TLB flush would be any more efficient than a specific INVLPG VMEXIT, a remote TLB flush may well be more efficiently done. This is because the alternative mechanism is to IPI all the vCPUs in question which (in the absence of APIC virtualisation) will require emulation and scheduling of the vCPUs only to have them immediately VMEXIT for local TLB flush. This patch therefore adds a viridian option which, if selected, enables the hypercall for remote TLB flush and implements it using ASID invalidation for targetted vCPUs followed by an IPI only to the set of CPUs that happened to be running a targetted vCPU (which may be the empty set). The flush may be more severe than requested since the hypercall can request flush only for a specific address space (CR3) but Xen neither keeps a mapping of ASID to guest CR3 nor allows invalidation of a specific ASID, but on a host with contended CPUs performance is still likely to be better than a more specific flush using IPIs. The implementation of the patch introduces per-vCPU viridian_init() and viridian_deinit() functions to allow a scratch cpumask to be allocated. This avoids needing to put this potentially large data structure on stack during hypercall processing. It also modifies the hypercall input and output bit-fields to allow a check for the 'fast' calling convention, and a white-space fix in the definition of HVMPV_feature_mask (to remove hard tabs). Signed-off-by: Paul Durrant Reviewed-by: Jan Beulich Acked-by: Wei Liu --- docs/man/xl.cfg.pod.5 | 6 ++ tools/libxl/libxl_dom.c | 3 + tools/libxl/libxl_types.idl | 1 + xen/arch/x86/hvm/hvm.c | 12 ++++ xen/arch/x86/hvm/viridian.c | 123 ++++++++++++++++++++++++++++++++---- xen/include/asm-x86/hvm/viridian.h | 4 + xen/include/asm-x86/perfc_defn.h | 1 + xen/include/public/hvm/params.h | 13 +++- 8 files changed, 146 insertions(+), 17 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 2aca8dd..3b695bd 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1466,6 +1466,12 @@ This set incorporates the Partition Reference TSC MSR. This enlightenment can improve performance of Windows 7 and Windows Server 2008 R2 onwards. +=item B + +This set incorporates use of hypercalls for remote TLB flushing. +This enlightenment may improve performance of Windows guests running +on hosts with higher levels of (physical) CPU contention. + =item B This is a special value that enables the default set of groups, which diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 44d481b..009ca9c 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -251,6 +251,9 @@ static int hvm_set_viridian_features(libxl__gc *gc, uint32_t domid, if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_REFERENCE_TSC)) mask |= HVMPV_reference_tsc; + if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_HCALL_REMOTE_TLB_FLUSH)) + mask |= HVMPV_hcall_remote_tlb_flush; + if (mask != 0 && xc_hvm_param_set(CTX->xch, domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 6808f2b..cf3730f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -219,6 +219,7 @@ libxl_viridian_enlightenment = Enumeration("viridian_enlightenment", [ (1, "freq"), (2, "time_ref_count"), (3, "reference_tsc"), + (4, "hcall_remote_tlb_flush"), ]) libxl_hdtype = Enumeration("hdtype", [ diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6c2b512..db0aeba 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2457,6 +2457,13 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( rc != 0 ) goto fail6; + if ( is_viridian_domain(d) ) + { + rc = viridian_vcpu_init(v); + if ( rc != 0 ) + goto fail7; + } + if ( v->vcpu_id == 0 ) { /* NB. All these really belong in hvm_domain_initialise(). */ @@ -2473,6 +2480,8 @@ int hvm_vcpu_initialise(struct vcpu *v) return 0; + fail7: + hvm_all_ioreq_servers_remove_vcpu(v->domain, v); fail6: nestedhvm_vcpu_destroy(v); fail5: @@ -2489,6 +2498,9 @@ int hvm_vcpu_initialise(struct vcpu *v) void hvm_vcpu_destroy(struct vcpu *v) { + if ( is_viridian_domain(v->domain) ) + viridian_vcpu_deinit(v); + hvm_all_ioreq_servers_remove_vcpu(v->domain, v); if ( hvm_altp2m_supported() ) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 2f22783..df6f26d 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -33,9 +33,15 @@ /* Viridian Hypercall Status Codes. */ #define HV_STATUS_SUCCESS 0x0000 #define HV_STATUS_INVALID_HYPERCALL_CODE 0x0002 +#define HV_STATUS_INVALID_PARAMETER 0x0005 -/* Viridian Hypercall Codes and Parameters. */ -#define HvNotifyLongSpinWait 8 +/* Viridian Hypercall Codes. */ +#define HvFlushVirtualAddressSpace 2 +#define HvFlushVirtualAddressList 3 +#define HvNotifyLongSpinWait 8 + +/* Viridian Hypercall Flags. */ +#define HV_FLUSH_ALL_PROCESSORS 1 /* Viridian CPUID 4000003, Viridian MSR availability. */ #define CPUID3A_MSR_TIME_REF_COUNT (1 << 1) @@ -46,8 +52,9 @@ #define CPUID3A_MSR_FREQ (1 << 11) /* Viridian CPUID 4000004, Implementation Recommendations. */ -#define CPUID4A_MSR_BASED_APIC (1 << 3) -#define CPUID4A_RELAX_TIMER_INT (1 << 5) +#define CPUID4A_HCALL_REMOTE_TLB_FLUSH (1 << 2) +#define CPUID4A_MSR_BASED_APIC (1 << 3) +#define CPUID4A_RELAX_TIMER_INT (1 << 5) /* Viridian CPUID 4000006, Implementation HW features detected and in use. */ #define CPUID6A_APIC_OVERLAY (1 << 0) @@ -107,6 +114,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, (d->arch.hvm_domain.viridian.guest_os_id.fields.os < 4) ) break; *eax = CPUID4A_RELAX_TIMER_INT; + if ( viridian_feature_mask(d) & HVMPV_hcall_remote_tlb_flush ) + *eax |= CPUID4A_HCALL_REMOTE_TLB_FLUSH; if ( !cpu_has_vmx_apic_reg_virt ) *eax |= CPUID4A_MSR_BASED_APIC; *ebx = 2047; /* long spin count */ @@ -512,9 +521,22 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) return 1; } +int viridian_vcpu_init(struct vcpu *v) +{ + return alloc_cpumask_var(&v->arch.hvm_vcpu.viridian.flush_cpumask) ? + 0 : -ENOMEM; +} + +void viridian_vcpu_deinit(struct vcpu *v) +{ + free_cpumask_var(v->arch.hvm_vcpu.viridian.flush_cpumask); +} + int viridian_hypercall(struct cpu_user_regs *regs) { - int mode = hvm_guest_x86_mode(current); + struct vcpu *curr = current; + struct domain *currd = curr->domain; + int mode = hvm_guest_x86_mode(curr); unsigned long input_params_gpa, output_params_gpa; uint16_t status = HV_STATUS_SUCCESS; @@ -522,11 +544,12 @@ int viridian_hypercall(struct cpu_user_regs *regs) uint64_t raw; struct { uint16_t call_code; - uint16_t rsvd1; - unsigned rep_count:12; - unsigned rsvd2:4; - unsigned rep_start:12; - unsigned rsvd3:4; + uint16_t fast:1; + uint16_t rsvd1:15; + uint16_t rep_count:12; + uint16_t rsvd2:4; + uint16_t rep_start:12; + uint16_t rsvd3:4; }; } input; @@ -535,12 +558,12 @@ int viridian_hypercall(struct cpu_user_regs *regs) struct { uint16_t result; uint16_t rsvd1; - unsigned rep_complete:12; - unsigned rsvd2:20; + uint32_t rep_complete:12; + uint32_t rsvd2:20; }; } output = { 0 }; - ASSERT(is_viridian_domain(current->domain)); + ASSERT(is_viridian_domain(currd)); switch ( mode ) { @@ -561,10 +584,84 @@ int viridian_hypercall(struct cpu_user_regs *regs) switch ( input.call_code ) { case HvNotifyLongSpinWait: + /* + * See Microsoft Hypervisor Top Level Spec. section 18.5.1. + */ perfc_incr(mshv_call_long_wait); do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); status = HV_STATUS_SUCCESS; break; + + case HvFlushVirtualAddressSpace: + case HvFlushVirtualAddressList: + { + cpumask_t *pcpu_mask; + struct vcpu *v; + struct { + uint64_t address_space; + uint64_t flags; + uint64_t vcpu_mask; + } input_params; + + /* + * See Microsoft Hypervisor Top Level Spec. sections 12.4.2 + * and 12.4.3. + */ + perfc_incr(mshv_flush); + + /* These hypercalls should never use the fast-call convention. */ + status = HV_STATUS_INVALID_PARAMETER; + if ( input.fast ) + break; + + /* Get input parameters. */ + if ( hvm_copy_from_guest_phys(&input_params, input_params_gpa, + sizeof(input_params)) != HVMCOPY_okay ) + break; + + /* + * It is not clear from the spec. if we are supposed to + * include current virtual CPU in the set or not in this case, + * so err on the safe side. + */ + if ( input_params.flags & HV_FLUSH_ALL_PROCESSORS ) + input_params.vcpu_mask = ~0ul; + + pcpu_mask = curr->arch.hvm_vcpu.viridian.flush_cpumask; + cpumask_clear(pcpu_mask); + + /* + * For each specified virtual CPU flush all ASIDs to invalidate + * TLB entries the next time it is scheduled and then, if it + * is currently running, add its physical CPU to a mask of + * those which need to be interrupted to force a flush. + */ + for_each_vcpu ( currd, v ) + { + if ( v->vcpu_id >= (sizeof(input_params.vcpu_mask) * 8) ) + break; + + if ( !(input_params.vcpu_mask & (1ul << v->vcpu_id)) ) + continue; + + hvm_asid_flush_vcpu(v); + if ( v->is_running ) + __cpumask_set_cpu(v->processor, pcpu_mask); + } + + /* + * Since ASIDs have now been flushed it just remains to + * force any CPUs currently running target vCPUs out of non- + * root mode. It's possible that re-scheduling has taken place + * so we may unnecessarily IPI some CPUs. + */ + if ( !cpumask_empty(pcpu_mask) ) + flush_tlb_mask(pcpu_mask); + + status = HV_STATUS_SUCCESS; + break; + } + default: status = HV_STATUS_INVALID_HYPERCALL_CODE; break; diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index c4319d7..2eec85e 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -22,6 +22,7 @@ union viridian_apic_assist struct viridian_vcpu { union viridian_apic_assist apic_assist; + cpumask_var_t flush_cpumask; }; union viridian_guest_os_id @@ -117,6 +118,9 @@ viridian_hypercall(struct cpu_user_regs *regs); void viridian_time_ref_count_freeze(struct domain *d); void viridian_time_ref_count_thaw(struct domain *d); +int viridian_vcpu_init(struct vcpu *v); +void viridian_vcpu_deinit(struct vcpu *v); + #endif /* __ASM_X86_HVM_VIRIDIAN_H__ */ /* diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index 9ef092e..aac9331 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -115,6 +115,7 @@ PERFCOUNTER(mshv_call_sw_addr_space, "MS Hv Switch Address Space") PERFCOUNTER(mshv_call_flush_tlb_list, "MS Hv Flush TLB list") PERFCOUNTER(mshv_call_flush_tlb_all, "MS Hv Flush TLB all") PERFCOUNTER(mshv_call_long_wait, "MS Hv Notify long wait") +PERFCOUNTER(mshv_call_flush, "MS Hv Flush TLB") PERFCOUNTER(mshv_rdmsr_osid, "MS Hv rdmsr Guest OS ID") PERFCOUNTER(mshv_rdmsr_hc_page, "MS Hv rdmsr hypercall page") PERFCOUNTER(mshv_rdmsr_vp_index, "MS Hv rdmsr vp index") diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index 356dfd3..b437444 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -98,11 +98,16 @@ #define _HVMPV_reference_tsc 3 #define HVMPV_reference_tsc (1 << _HVMPV_reference_tsc) +/* Use Hypercall for remote TLB flush */ +#define _HVMPV_hcall_remote_tlb_flush 4 +#define HVMPV_hcall_remote_tlb_flush (1 << _HVMPV_hcall_remote_tlb_flush) + #define HVMPV_feature_mask \ - (HVMPV_base_freq | \ - HVMPV_no_freq | \ - HVMPV_time_ref_count | \ - HVMPV_reference_tsc) + (HVMPV_base_freq | \ + HVMPV_no_freq | \ + HVMPV_time_ref_count | \ + HVMPV_reference_tsc | \ + HVMPV_hcall_remote_tlb_flush) #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiU-0001Tw-CE; Fri, 11 Dec 2015 13:26:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiT-0001Nb-2G for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:33 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id E5/42-09834-80FCA665; Fri, 11 Dec 2015 13:26:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1449840389!10489328!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5512 invoked from network); 11 Dec 2015 13:26:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mi6-0002Hs-Gk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mi5-0006Pt-QY for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:22:06 +0000 Date: Fri, 11 Dec 2015 12:22:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/viridian: flush remote tlbs by hypercall X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b38d426ad09b3e142f474c1dadfd6d6903664a48 Author: Paul Durrant AuthorDate: Thu Nov 26 15:48:41 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 15:48:41 2015 +0100 x86/viridian: flush remote tlbs by hypercall The Microsoft Hypervisor Top Level Functional Spec. (section 3.4) defines two bits in CPUID leaf 0x40000004:EAX for the hypervisor to recommend whether or not to issue a hypercall for local or remote TLB flush. Whilst it's doubtful whether using a hypercall for local TLB flush would be any more efficient than a specific INVLPG VMEXIT, a remote TLB flush may well be more efficiently done. This is because the alternative mechanism is to IPI all the vCPUs in question which (in the absence of APIC virtualisation) will require emulation and scheduling of the vCPUs only to have them immediately VMEXIT for local TLB flush. This patch therefore adds a viridian option which, if selected, enables the hypercall for remote TLB flush and implements it using ASID invalidation for targetted vCPUs followed by an IPI only to the set of CPUs that happened to be running a targetted vCPU (which may be the empty set). The flush may be more severe than requested since the hypercall can request flush only for a specific address space (CR3) but Xen neither keeps a mapping of ASID to guest CR3 nor allows invalidation of a specific ASID, but on a host with contended CPUs performance is still likely to be better than a more specific flush using IPIs. The implementation of the patch introduces per-vCPU viridian_init() and viridian_deinit() functions to allow a scratch cpumask to be allocated. This avoids needing to put this potentially large data structure on stack during hypercall processing. It also modifies the hypercall input and output bit-fields to allow a check for the 'fast' calling convention, and a white-space fix in the definition of HVMPV_feature_mask (to remove hard tabs). Signed-off-by: Paul Durrant Reviewed-by: Jan Beulich Acked-by: Wei Liu --- docs/man/xl.cfg.pod.5 | 6 ++ tools/libxl/libxl_dom.c | 3 + tools/libxl/libxl_types.idl | 1 + xen/arch/x86/hvm/hvm.c | 12 ++++ xen/arch/x86/hvm/viridian.c | 123 ++++++++++++++++++++++++++++++++---- xen/include/asm-x86/hvm/viridian.h | 4 + xen/include/asm-x86/perfc_defn.h | 1 + xen/include/public/hvm/params.h | 13 +++- 8 files changed, 146 insertions(+), 17 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 2aca8dd..3b695bd 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1466,6 +1466,12 @@ This set incorporates the Partition Reference TSC MSR. This enlightenment can improve performance of Windows 7 and Windows Server 2008 R2 onwards. +=item B + +This set incorporates use of hypercalls for remote TLB flushing. +This enlightenment may improve performance of Windows guests running +on hosts with higher levels of (physical) CPU contention. + =item B This is a special value that enables the default set of groups, which diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 44d481b..009ca9c 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -251,6 +251,9 @@ static int hvm_set_viridian_features(libxl__gc *gc, uint32_t domid, if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_REFERENCE_TSC)) mask |= HVMPV_reference_tsc; + if (libxl_bitmap_test(&enlightenments, LIBXL_VIRIDIAN_ENLIGHTENMENT_HCALL_REMOTE_TLB_FLUSH)) + mask |= HVMPV_hcall_remote_tlb_flush; + if (mask != 0 && xc_hvm_param_set(CTX->xch, domid, diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 6808f2b..cf3730f 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -219,6 +219,7 @@ libxl_viridian_enlightenment = Enumeration("viridian_enlightenment", [ (1, "freq"), (2, "time_ref_count"), (3, "reference_tsc"), + (4, "hcall_remote_tlb_flush"), ]) libxl_hdtype = Enumeration("hdtype", [ diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 6c2b512..db0aeba 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2457,6 +2457,13 @@ int hvm_vcpu_initialise(struct vcpu *v) if ( rc != 0 ) goto fail6; + if ( is_viridian_domain(d) ) + { + rc = viridian_vcpu_init(v); + if ( rc != 0 ) + goto fail7; + } + if ( v->vcpu_id == 0 ) { /* NB. All these really belong in hvm_domain_initialise(). */ @@ -2473,6 +2480,8 @@ int hvm_vcpu_initialise(struct vcpu *v) return 0; + fail7: + hvm_all_ioreq_servers_remove_vcpu(v->domain, v); fail6: nestedhvm_vcpu_destroy(v); fail5: @@ -2489,6 +2498,9 @@ int hvm_vcpu_initialise(struct vcpu *v) void hvm_vcpu_destroy(struct vcpu *v) { + if ( is_viridian_domain(v->domain) ) + viridian_vcpu_deinit(v); + hvm_all_ioreq_servers_remove_vcpu(v->domain, v); if ( hvm_altp2m_supported() ) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 2f22783..df6f26d 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -33,9 +33,15 @@ /* Viridian Hypercall Status Codes. */ #define HV_STATUS_SUCCESS 0x0000 #define HV_STATUS_INVALID_HYPERCALL_CODE 0x0002 +#define HV_STATUS_INVALID_PARAMETER 0x0005 -/* Viridian Hypercall Codes and Parameters. */ -#define HvNotifyLongSpinWait 8 +/* Viridian Hypercall Codes. */ +#define HvFlushVirtualAddressSpace 2 +#define HvFlushVirtualAddressList 3 +#define HvNotifyLongSpinWait 8 + +/* Viridian Hypercall Flags. */ +#define HV_FLUSH_ALL_PROCESSORS 1 /* Viridian CPUID 4000003, Viridian MSR availability. */ #define CPUID3A_MSR_TIME_REF_COUNT (1 << 1) @@ -46,8 +52,9 @@ #define CPUID3A_MSR_FREQ (1 << 11) /* Viridian CPUID 4000004, Implementation Recommendations. */ -#define CPUID4A_MSR_BASED_APIC (1 << 3) -#define CPUID4A_RELAX_TIMER_INT (1 << 5) +#define CPUID4A_HCALL_REMOTE_TLB_FLUSH (1 << 2) +#define CPUID4A_MSR_BASED_APIC (1 << 3) +#define CPUID4A_RELAX_TIMER_INT (1 << 5) /* Viridian CPUID 4000006, Implementation HW features detected and in use. */ #define CPUID6A_APIC_OVERLAY (1 << 0) @@ -107,6 +114,8 @@ int cpuid_viridian_leaves(unsigned int leaf, unsigned int *eax, (d->arch.hvm_domain.viridian.guest_os_id.fields.os < 4) ) break; *eax = CPUID4A_RELAX_TIMER_INT; + if ( viridian_feature_mask(d) & HVMPV_hcall_remote_tlb_flush ) + *eax |= CPUID4A_HCALL_REMOTE_TLB_FLUSH; if ( !cpu_has_vmx_apic_reg_virt ) *eax |= CPUID4A_MSR_BASED_APIC; *ebx = 2047; /* long spin count */ @@ -512,9 +521,22 @@ int rdmsr_viridian_regs(uint32_t idx, uint64_t *val) return 1; } +int viridian_vcpu_init(struct vcpu *v) +{ + return alloc_cpumask_var(&v->arch.hvm_vcpu.viridian.flush_cpumask) ? + 0 : -ENOMEM; +} + +void viridian_vcpu_deinit(struct vcpu *v) +{ + free_cpumask_var(v->arch.hvm_vcpu.viridian.flush_cpumask); +} + int viridian_hypercall(struct cpu_user_regs *regs) { - int mode = hvm_guest_x86_mode(current); + struct vcpu *curr = current; + struct domain *currd = curr->domain; + int mode = hvm_guest_x86_mode(curr); unsigned long input_params_gpa, output_params_gpa; uint16_t status = HV_STATUS_SUCCESS; @@ -522,11 +544,12 @@ int viridian_hypercall(struct cpu_user_regs *regs) uint64_t raw; struct { uint16_t call_code; - uint16_t rsvd1; - unsigned rep_count:12; - unsigned rsvd2:4; - unsigned rep_start:12; - unsigned rsvd3:4; + uint16_t fast:1; + uint16_t rsvd1:15; + uint16_t rep_count:12; + uint16_t rsvd2:4; + uint16_t rep_start:12; + uint16_t rsvd3:4; }; } input; @@ -535,12 +558,12 @@ int viridian_hypercall(struct cpu_user_regs *regs) struct { uint16_t result; uint16_t rsvd1; - unsigned rep_complete:12; - unsigned rsvd2:20; + uint32_t rep_complete:12; + uint32_t rsvd2:20; }; } output = { 0 }; - ASSERT(is_viridian_domain(current->domain)); + ASSERT(is_viridian_domain(currd)); switch ( mode ) { @@ -561,10 +584,84 @@ int viridian_hypercall(struct cpu_user_regs *regs) switch ( input.call_code ) { case HvNotifyLongSpinWait: + /* + * See Microsoft Hypervisor Top Level Spec. section 18.5.1. + */ perfc_incr(mshv_call_long_wait); do_sched_op(SCHEDOP_yield, guest_handle_from_ptr(NULL, void)); status = HV_STATUS_SUCCESS; break; + + case HvFlushVirtualAddressSpace: + case HvFlushVirtualAddressList: + { + cpumask_t *pcpu_mask; + struct vcpu *v; + struct { + uint64_t address_space; + uint64_t flags; + uint64_t vcpu_mask; + } input_params; + + /* + * See Microsoft Hypervisor Top Level Spec. sections 12.4.2 + * and 12.4.3. + */ + perfc_incr(mshv_flush); + + /* These hypercalls should never use the fast-call convention. */ + status = HV_STATUS_INVALID_PARAMETER; + if ( input.fast ) + break; + + /* Get input parameters. */ + if ( hvm_copy_from_guest_phys(&input_params, input_params_gpa, + sizeof(input_params)) != HVMCOPY_okay ) + break; + + /* + * It is not clear from the spec. if we are supposed to + * include current virtual CPU in the set or not in this case, + * so err on the safe side. + */ + if ( input_params.flags & HV_FLUSH_ALL_PROCESSORS ) + input_params.vcpu_mask = ~0ul; + + pcpu_mask = curr->arch.hvm_vcpu.viridian.flush_cpumask; + cpumask_clear(pcpu_mask); + + /* + * For each specified virtual CPU flush all ASIDs to invalidate + * TLB entries the next time it is scheduled and then, if it + * is currently running, add its physical CPU to a mask of + * those which need to be interrupted to force a flush. + */ + for_each_vcpu ( currd, v ) + { + if ( v->vcpu_id >= (sizeof(input_params.vcpu_mask) * 8) ) + break; + + if ( !(input_params.vcpu_mask & (1ul << v->vcpu_id)) ) + continue; + + hvm_asid_flush_vcpu(v); + if ( v->is_running ) + __cpumask_set_cpu(v->processor, pcpu_mask); + } + + /* + * Since ASIDs have now been flushed it just remains to + * force any CPUs currently running target vCPUs out of non- + * root mode. It's possible that re-scheduling has taken place + * so we may unnecessarily IPI some CPUs. + */ + if ( !cpumask_empty(pcpu_mask) ) + flush_tlb_mask(pcpu_mask); + + status = HV_STATUS_SUCCESS; + break; + } + default: status = HV_STATUS_INVALID_HYPERCALL_CODE; break; diff --git a/xen/include/asm-x86/hvm/viridian.h b/xen/include/asm-x86/hvm/viridian.h index c4319d7..2eec85e 100644 --- a/xen/include/asm-x86/hvm/viridian.h +++ b/xen/include/asm-x86/hvm/viridian.h @@ -22,6 +22,7 @@ union viridian_apic_assist struct viridian_vcpu { union viridian_apic_assist apic_assist; + cpumask_var_t flush_cpumask; }; union viridian_guest_os_id @@ -117,6 +118,9 @@ viridian_hypercall(struct cpu_user_regs *regs); void viridian_time_ref_count_freeze(struct domain *d); void viridian_time_ref_count_thaw(struct domain *d); +int viridian_vcpu_init(struct vcpu *v); +void viridian_vcpu_deinit(struct vcpu *v); + #endif /* __ASM_X86_HVM_VIRIDIAN_H__ */ /* diff --git a/xen/include/asm-x86/perfc_defn.h b/xen/include/asm-x86/perfc_defn.h index 9ef092e..aac9331 100644 --- a/xen/include/asm-x86/perfc_defn.h +++ b/xen/include/asm-x86/perfc_defn.h @@ -115,6 +115,7 @@ PERFCOUNTER(mshv_call_sw_addr_space, "MS Hv Switch Address Space") PERFCOUNTER(mshv_call_flush_tlb_list, "MS Hv Flush TLB list") PERFCOUNTER(mshv_call_flush_tlb_all, "MS Hv Flush TLB all") PERFCOUNTER(mshv_call_long_wait, "MS Hv Notify long wait") +PERFCOUNTER(mshv_call_flush, "MS Hv Flush TLB") PERFCOUNTER(mshv_rdmsr_osid, "MS Hv rdmsr Guest OS ID") PERFCOUNTER(mshv_rdmsr_hc_page, "MS Hv rdmsr hypercall page") PERFCOUNTER(mshv_rdmsr_vp_index, "MS Hv rdmsr vp index") diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index 356dfd3..b437444 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -98,11 +98,16 @@ #define _HVMPV_reference_tsc 3 #define HVMPV_reference_tsc (1 << _HVMPV_reference_tsc) +/* Use Hypercall for remote TLB flush */ +#define _HVMPV_hcall_remote_tlb_flush 4 +#define HVMPV_hcall_remote_tlb_flush (1 << _HVMPV_hcall_remote_tlb_flush) + #define HVMPV_feature_mask \ - (HVMPV_base_freq | \ - HVMPV_no_freq | \ - HVMPV_time_ref_count | \ - HVMPV_reference_tsc) + (HVMPV_base_freq | \ + HVMPV_no_freq | \ + HVMPV_time_ref_count | \ + HVMPV_reference_tsc | \ + HVMPV_hcall_remote_tlb_flush) #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiX-0001WK-J3; Fri, 11 Dec 2015 13:26:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiV-0001Uu-Qi for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:35 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 96/18-16618-A0FCA665; Fri, 11 Dec 2015 13:26:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1449840392!8531321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15796 invoked from network); 11 Dec 2015 13:26:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:33 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MoF-0002Og-Jt for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MoF-0006pD-I4 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:27 +0000 Date: Fri, 11 Dec 2015 12:28:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: drop unneeded Ivybridge quirk workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a10307b3912e65bbdd9184ba5fe849d252b75f92 Author: Jan Beulich AuthorDate: Thu Dec 3 15:33:10 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:33:10 2015 +0100 VT-d: drop unneeded Ivybridge quirk workaround We've been told by Intel that server chipsets don't need the workaround anymore starting with Ivybridge (Xeon E5/E7 v2); the second half of the workaround was missing anyway. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/quirks.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 1888843..49df41d 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -432,7 +432,6 @@ void pci_vtd_quirk(const struct pci_dev *pdev) * - This can cause system failure upon non-fatal VT-d faults. * - Potential security issue if malicious guest trigger VT-d faults. */ - case 0x0e28: /* Xeon-E5v2 (IvyBridge) */ case 0x342e: /* Tylersburg chipset (Nehalem / Westmere systems) */ case 0x3728: /* Xeon C5500/C3500 (JasperForest) */ case 0x3c28: /* Sandybridge */ -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:37 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiX-0001WK-J3; Fri, 11 Dec 2015 13:26:37 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiV-0001Uu-Qi for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:35 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 96/18-16618-A0FCA665; Fri, 11 Dec 2015 13:26:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1449840392!8531321!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15796 invoked from network); 11 Dec 2015 13:26:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:33 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MoF-0002Og-Jt for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MoF-0006pD-I4 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:28:27 +0000 Date: Fri, 11 Dec 2015 12:28:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: drop unneeded Ivybridge quirk workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a10307b3912e65bbdd9184ba5fe849d252b75f92 Author: Jan Beulich AuthorDate: Thu Dec 3 15:33:10 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 3 15:33:10 2015 +0100 VT-d: drop unneeded Ivybridge quirk workaround We've been told by Intel that server chipsets don't need the workaround anymore starting with Ivybridge (Xeon E5/E7 v2); the second half of the workaround was missing anyway. Signed-off-by: Jan Beulich Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/quirks.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 1888843..49df41d 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -432,7 +432,6 @@ void pci_vtd_quirk(const struct pci_dev *pdev) * - This can cause system failure upon non-fatal VT-d faults. * - Potential security issue if malicious guest trigger VT-d faults. */ - case 0x0e28: /* Xeon-E5v2 (IvyBridge) */ case 0x342e: /* Tylersburg chipset (Nehalem / Westmere systems) */ case 0x3728: /* Xeon C5500/C3500 (JasperForest) */ case 0x3c28: /* Sandybridge */ -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nib-0001ZE-MQ; Fri, 11 Dec 2015 13:26:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiZ-0001Xk-RX for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:40 +0000 Content-Length: 6831 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 74/E0-28228-F0FCA665; Fri, 11 Dec 2015 13:26:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1449840393!10552094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26732 invoked from network); 11 Dec 2015 13:26:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:35 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MjN-0002In-RZ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MjN-0006UO-PA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:25 +0000 Date: Fri, 11 Dec 2015 12:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow disabling the emulated local apic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3239791083795723492==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3239791083795723492== Content-Length: 6579 Content-Transfer-Encoding: quoted-printable commit b1d398b67781140d1c6efd05778d0ad4103b2a32 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 16:01:27 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 16:01:27 2015 +0100 x86: allow disabling the emulated local apic Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/vlapic.c | 27 ++++++++++++++++++++++++--- xen/arch/x86/hvm/vmsi.c | 12 ++++++++++++ xen/arch/x86/hvm/vmx/vmcs.c | 5 ++++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++++++ 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 15d59f6..01a8430 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -988,6 +988,9 @@ static void set_x2apic_id(struct vlapic *vlapic) bool_t vlapic_msr_set(struct vlapic *vlapic, uint64_t value) { + if ( !has_vlapic(vlapic_domain(vlapic)) ) + return 0; + if ( (vlapic->hw.apic_base_msr ^ value) & MSR_IA32_APICBASE_ENABLE ) { if ( unlikely(value & MSR_IA32_APICBASE_EXTD) ) @@ -1200,6 +1203,9 @@ void vlapic_reset(struct vlapic *vlapic) struct vcpu *v =3D vlapic_vcpu(vlapic); int i; + if ( !has_vlapic(v->domain) ) + return; + vlapic_set_reg(vlapic, APIC_ID, (v->vcpu_id * 2) << 24); vlapic_set_reg(vlapic, APIC_LVR, VLAPIC_VERSION); @@ -1265,6 +1271,9 @@ static int lapic_save_hidden(struct domain *d, hvm_domain_context_t *h) struct vlapic *s; int rc =3D 0; + if ( !has_vlapic(d) ) + return 0; + for_each_vcpu ( d, v ) { s =3D vcpu_vlapic(v); @@ -1281,6 +1290,9 @@ static int lapic_save_regs(struct domain *d, hvm_domain_context_t *h) struct vlapic *s; int rc =3D 0; + if ( !has_vlapic(d) ) + return 0; + for_each_vcpu ( d, v ) { if ( hvm_funcs.sync_pir_to_irr ) @@ -1328,7 +1340,10 @@ static int lapic_load_hidden(struct domain *d, hvm_domain_context_t *h) uint16_t vcpuid; struct vcpu *v; struct vlapic *s; - + + if ( !has_vlapic(d) ) + return -ENODEV; + /* Which vlapic to load=3F */ vcpuid =3D hvm_load_instance(h); if ( vcpuid >=3D d->max_vcpus || (v =3D d->vcpu[vcpuid]) =3D=3D NULL ) @@ -1360,7 +1375,10 @@ static int lapic_load_regs(struct domain *d, hvm_domain_context_t *h) uint16_t vcpuid; struct vcpu *v; struct vlapic *s; - + + if ( !has_vlapic(d) ) + return -ENODEV; + /* Which vlapic to load=3F */ vcpuid =3D hvm_load_instance(h); if ( vcpuid >=3D d->max_vcpus || (v =3D d->vcpu[vcpuid]) =3D=3D NULL ) @@ -1399,7 +1417,7 @@ int vlapic_init(struct vcpu *v) HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "%d", v->vcpu_id); - if ( is_pvh_vcpu(v) ) + if ( !has_vlapic(v->domain) ) { vlapic->hw.disabled =3D VLAPIC_HW_DISABLED; return 0; @@ -1452,6 +1470,9 @@ void vlapic_destroy(struct vcpu *v) { struct vlapic *vlapic =3D vcpu_vlapic(v); + if ( !has_vlapic(v->domain) ) + return; + tasklet_kill(&vlapic->init_sipi.tasklet); TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index ac838a9..499151e 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -391,6 +391,9 @@ int msixtbl_pt_register(struct domain *d, struct pirq *pirq, uint64_t gtable) ASSERT(spin_is_locked(&pcidevs_lock)); ASSERT(spin_is_locked(&d->event_lock)); + if ( !has_vlapic(d) ) + return -ENODEV; + /* * xmalloc() with irq_disabled causes the failure of check_lock() * for xenpool->lock. So we allocate an entry beforehand. @@ -446,6 +449,9 @@ void msixtbl_pt_unregister(struct domain *d, struct pirq *pirq) ASSERT(spin_is_locked(&pcidevs_lock)); ASSERT(spin_is_locked(&d->event_lock)); + if ( !has_vlapic(d) ) + return; + irq_desc =3D pirq_spin_lock_irq_desc(pirq, NULL); if ( !irq_desc ) return; @@ -482,6 +488,9 @@ found: void msixtbl_init(struct domain *d) { + if ( !has_vlapic(d) ) + return; + INIT_LIST_HEAD(&d->arch.hvm_domain.msixtbl_list); spin_lock_init(&d->arch.hvm_domain.msixtbl_list_lock); @@ -493,6 +502,9 @@ void msixtbl_pt_cleanup(struct domain *d) struct msixtbl_entry *entry, *temp; unsigned long flags; + if ( !has_vlapic(d) ) + return; + /* msixtbl_list_lock must be acquired with irq_disabled for check_lock() */ local_irq_save(flags); spin_lock(&d->arch.hvm_domain.msixtbl_list_lock); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 000d06e..7a7896e 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1035,7 +1035,7 @@ static int construct_vmcs(struct vcpu *v) ~(SECONDARY_EXEC_ENABLE_VM_FUNCTIONS | SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS); - if ( is_pvh_domain(d) ) + if ( !has_vlapic(d) ) { /* Disable virtual apics, TPR */ v->arch.hvm_vmx.secondary_exec_control &=3D @@ -1047,7 +1047,10 @@ static int construct_vmcs(struct vcpu *v) /* In turn, disable posted interrupts. */ __vmwrite(PIN_BASED_VM_EXEC_CONTROL, vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + } + if ( is_pvh_domain(d) ) + { /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 3eeccbb..2581e97 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -89,6 +89,9 @@ static int vmx_domain_initialise(struct domain *d) { int rc; + if ( !has_vlapic(d) ) + return 0; + if ( (rc =3D vmx_alloc_vlapic_mapping(d)) !=3D 0 ) return rc; @@ -97,6 +100,9 @@ static int vmx_domain_initialise(struct domain *d) static void vmx_domain_destroy(struct domain *d) { + if ( !has_vlapic(d) ) + return; + vmx_free_vlapic_mapping(d); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3239791083795723492== 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 --===============3239791083795723492==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nib-0001ZE-MQ; Fri, 11 Dec 2015 13:26:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7NiZ-0001Xk-RX for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:40 +0000 Content-Length: 6831 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id 74/E0-28228-F0FCA665; Fri, 11 Dec 2015 13:26:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1449840393!10552094!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26732 invoked from network); 11 Dec 2015 13:26:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:35 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MjN-0002In-RZ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MjN-0006UO-PA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:23:25 +0000 Date: Fri, 11 Dec 2015 12:23:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow disabling the emulated local apic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3239791083795723492==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============3239791083795723492== Content-Length: 6579 Content-Transfer-Encoding: quoted-printable commit b1d398b67781140d1c6efd05778d0ad4103b2a32 Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Nov 26 16:01:27 2015 +0100 Commit: Jan Beulich CommitDate: Thu Nov 26 16:01:27 2015 +0100 x86: allow disabling the emulated local apic Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/vlapic.c | 27 ++++++++++++++++++++++++--- xen/arch/x86/hvm/vmsi.c | 12 ++++++++++++ xen/arch/x86/hvm/vmx/vmcs.c | 5 ++++- xen/arch/x86/hvm/vmx/vmx.c | 6 ++++++ 4 files changed, 46 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 15d59f6..01a8430 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -988,6 +988,9 @@ static void set_x2apic_id(struct vlapic *vlapic) bool_t vlapic_msr_set(struct vlapic *vlapic, uint64_t value) { + if ( !has_vlapic(vlapic_domain(vlapic)) ) + return 0; + if ( (vlapic->hw.apic_base_msr ^ value) & MSR_IA32_APICBASE_ENABLE ) { if ( unlikely(value & MSR_IA32_APICBASE_EXTD) ) @@ -1200,6 +1203,9 @@ void vlapic_reset(struct vlapic *vlapic) struct vcpu *v =3D vlapic_vcpu(vlapic); int i; + if ( !has_vlapic(v->domain) ) + return; + vlapic_set_reg(vlapic, APIC_ID, (v->vcpu_id * 2) << 24); vlapic_set_reg(vlapic, APIC_LVR, VLAPIC_VERSION); @@ -1265,6 +1271,9 @@ static int lapic_save_hidden(struct domain *d, hvm_domain_context_t *h) struct vlapic *s; int rc =3D 0; + if ( !has_vlapic(d) ) + return 0; + for_each_vcpu ( d, v ) { s =3D vcpu_vlapic(v); @@ -1281,6 +1290,9 @@ static int lapic_save_regs(struct domain *d, hvm_domain_context_t *h) struct vlapic *s; int rc =3D 0; + if ( !has_vlapic(d) ) + return 0; + for_each_vcpu ( d, v ) { if ( hvm_funcs.sync_pir_to_irr ) @@ -1328,7 +1340,10 @@ static int lapic_load_hidden(struct domain *d, hvm_domain_context_t *h) uint16_t vcpuid; struct vcpu *v; struct vlapic *s; - + + if ( !has_vlapic(d) ) + return -ENODEV; + /* Which vlapic to load=3F */ vcpuid =3D hvm_load_instance(h); if ( vcpuid >=3D d->max_vcpus || (v =3D d->vcpu[vcpuid]) =3D=3D NULL ) @@ -1360,7 +1375,10 @@ static int lapic_load_regs(struct domain *d, hvm_domain_context_t *h) uint16_t vcpuid; struct vcpu *v; struct vlapic *s; - + + if ( !has_vlapic(d) ) + return -ENODEV; + /* Which vlapic to load=3F */ vcpuid =3D hvm_load_instance(h); if ( vcpuid >=3D d->max_vcpus || (v =3D d->vcpu[vcpuid]) =3D=3D NULL ) @@ -1399,7 +1417,7 @@ int vlapic_init(struct vcpu *v) HVM_DBG_LOG(DBG_LEVEL_VLAPIC, "%d", v->vcpu_id); - if ( is_pvh_vcpu(v) ) + if ( !has_vlapic(v->domain) ) { vlapic->hw.disabled =3D VLAPIC_HW_DISABLED; return 0; @@ -1452,6 +1470,9 @@ void vlapic_destroy(struct vcpu *v) { struct vlapic *vlapic =3D vcpu_vlapic(v); + if ( !has_vlapic(v->domain) ) + return; + tasklet_kill(&vlapic->init_sipi.tasklet); TRACE_0D(TRC_HVM_EMUL_LAPIC_STOP_TIMER); destroy_periodic_time(&vlapic->pt); diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c index ac838a9..499151e 100644 --- a/xen/arch/x86/hvm/vmsi.c +++ b/xen/arch/x86/hvm/vmsi.c @@ -391,6 +391,9 @@ int msixtbl_pt_register(struct domain *d, struct pirq *pirq, uint64_t gtable) ASSERT(spin_is_locked(&pcidevs_lock)); ASSERT(spin_is_locked(&d->event_lock)); + if ( !has_vlapic(d) ) + return -ENODEV; + /* * xmalloc() with irq_disabled causes the failure of check_lock() * for xenpool->lock. So we allocate an entry beforehand. @@ -446,6 +449,9 @@ void msixtbl_pt_unregister(struct domain *d, struct pirq *pirq) ASSERT(spin_is_locked(&pcidevs_lock)); ASSERT(spin_is_locked(&d->event_lock)); + if ( !has_vlapic(d) ) + return; + irq_desc =3D pirq_spin_lock_irq_desc(pirq, NULL); if ( !irq_desc ) return; @@ -482,6 +488,9 @@ found: void msixtbl_init(struct domain *d) { + if ( !has_vlapic(d) ) + return; + INIT_LIST_HEAD(&d->arch.hvm_domain.msixtbl_list); spin_lock_init(&d->arch.hvm_domain.msixtbl_list_lock); @@ -493,6 +502,9 @@ void msixtbl_pt_cleanup(struct domain *d) struct msixtbl_entry *entry, *temp; unsigned long flags; + if ( !has_vlapic(d) ) + return; + /* msixtbl_list_lock must be acquired with irq_disabled for check_lock() */ local_irq_save(flags); spin_lock(&d->arch.hvm_domain.msixtbl_list_lock); diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 000d06e..7a7896e 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1035,7 +1035,7 @@ static int construct_vmcs(struct vcpu *v) ~(SECONDARY_EXEC_ENABLE_VM_FUNCTIONS | SECONDARY_EXEC_ENABLE_VIRT_EXCEPTIONS); - if ( is_pvh_domain(d) ) + if ( !has_vlapic(d) ) { /* Disable virtual apics, TPR */ v->arch.hvm_vmx.secondary_exec_control &=3D @@ -1047,7 +1047,10 @@ static int construct_vmcs(struct vcpu *v) /* In turn, disable posted interrupts. */ __vmwrite(PIN_BASED_VM_EXEC_CONTROL, vmx_pin_based_exec_control & ~PIN_BASED_POSTED_INTERRUPT); + } + if ( is_pvh_domain(d) ) + { /* Unrestricted guest (real mode for EPT) */ v->arch.hvm_vmx.secondary_exec_control &=3D ~SECONDARY_EXEC_UNRESTRICTED_GUEST; diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 3eeccbb..2581e97 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -89,6 +89,9 @@ static int vmx_domain_initialise(struct domain *d) { int rc; + if ( !has_vlapic(d) ) + return 0; + if ( (rc =3D vmx_alloc_vlapic_mapping(d)) !=3D 0 ) return rc; @@ -97,6 +100,9 @@ static int vmx_domain_initialise(struct domain *d) static void vmx_domain_destroy(struct domain *d) { + if ( !has_vlapic(d) ) + return; + vmx_free_vlapic_mapping(d); } -- generated by git-patchbot for /home/xen/git/xen.git#master --===============3239791083795723492== 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 --===============3239791083795723492==-- From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nic-0001aE-S9; Fri, 11 Dec 2015 13:26:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nib-0001Ya-88 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:41 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 75/DE-24494-01FCA665; Fri, 11 Dec 2015 13:26:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449840397!9861878!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16437 invoked from network); 11 Dec 2015 13:26:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mna-0002Nx-AT for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mna-0006mj-7L for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:46 +0000 Date: Fri, 11 Dec 2015 12:27:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xendomains initscript: test for privcmd char device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1367e9e5ba4d1612e303123ec0bbf961100fcfa1 Author: Doug Goldstein AuthorDate: Tue Dec 1 13:27:55 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 2 15:24:23 2015 +0000 xendomains initscript: test for privcmd char device Allow the init script to continue if either the character device or the proc file is available. CC: Ian Jackson CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu Signed-off-by: Doug Goldstein Acked-by: Ian Jackson --- tools/hotplug/Linux/xendomains.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index 0603842..686f061 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -45,7 +45,7 @@ fi # Correct exit code would probably be 5, but it's enough # if xend complains if we're not running as privileged domain -if ! [ -e /proc/xen/privcmd ]; then +if ! [ -e /dev/xen/privcmd ] || [ -e /proc/xen/privcmd ]; then exit 0 fi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:42 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nic-0001aE-S9; Fri, 11 Dec 2015 13:26:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nib-0001Ya-88 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:41 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 75/DE-24494-01FCA665; Fri, 11 Dec 2015 13:26:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1449840397!9861878!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16437 invoked from network); 11 Dec 2015 13:26:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mna-0002Nx-AT for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mna-0006mj-7L for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:46 +0000 Date: Fri, 11 Dec 2015 12:27:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xendomains initscript: test for privcmd char device X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1367e9e5ba4d1612e303123ec0bbf961100fcfa1 Author: Doug Goldstein AuthorDate: Tue Dec 1 13:27:55 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 2 15:24:23 2015 +0000 xendomains initscript: test for privcmd char device Allow the init script to continue if either the character device or the proc file is available. CC: Ian Jackson CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu Signed-off-by: Doug Goldstein Acked-by: Ian Jackson --- tools/hotplug/Linux/xendomains.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/hotplug/Linux/xendomains.in b/tools/hotplug/Linux/xendomains.in index 0603842..686f061 100644 --- a/tools/hotplug/Linux/xendomains.in +++ b/tools/hotplug/Linux/xendomains.in @@ -45,7 +45,7 @@ fi # Correct exit code would probably be 5, but it's enough # if xend complains if we're not running as privileged domain -if ! [ -e /proc/xen/privcmd ]; then +if ! [ -e /dev/xen/privcmd ] || [ -e /proc/xen/privcmd ]; then exit 0 fi -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 13:26:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nid-0001bE-WD; Fri, 11 Dec 2015 13:26:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nic-0001Zo-Oc for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:42 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id B3/82-09834-01FCA665; Fri, 11 Dec 2015 13:26:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1449840398!9579025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39310 invoked from network); 11 Dec 2015 13:26:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mkq-0002Jp-M0 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mkq-0006aK-Jn for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:56 +0000 Date: Fri, 11 Dec 2015 12:24:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop unused __devexit{, data} and CONFIG_HOTPLUG X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59dfd694c87dbca781bb45ade86cef4a8b5d7aaf Author: Andrew Cooper AuthorDate: Mon Nov 30 12:01:21 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 12:01:21 2015 +0100 drop unused __devexit{,data} and CONFIG_HOTPLUG Signed-off-by: Andrew Cooper Also CONFIG_HOTPLUG_CPU. Signed-off-by: Jan Beulich --- xen/include/asm-x86/config.h | 3 --- xen/include/xen/init.h | 8 -------- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 52f7ca8..416a5c2 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -44,9 +44,6 @@ #define CONFIG_VGA 1 #define CONFIG_VIDEO 1 -#define CONFIG_HOTPLUG 1 -#define CONFIG_HOTPLUG_CPU 1 - #define CONFIG_XENOPROF 1 #define CONFIG_WATCHDOG 1 diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index 17fe550..7072013 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -117,14 +117,6 @@ extern struct kernel_param __setup_start, __setup_end; #endif /* __ASSEMBLY__ */ -#ifdef CONFIG_HOTPLUG -#define __devexit -#define __devexitdata -#else -#define __devexit __exit -#define __devexitdata __exitdata -#endif - #ifdef CONFIG_LATE_HWDOM #define __hwdom_init #define __hwdom_initdata __read_mostly -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nid-0001bE-WD; Fri, 11 Dec 2015 13:26:44 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nic-0001Zo-Oc for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:42 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id B3/82-09834-01FCA665; Fri, 11 Dec 2015 13:26:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1449840398!9579025!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39310 invoked from network); 11 Dec 2015 13:26:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mkq-0002Jp-M0 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mkq-0006aK-Jn for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:24:56 +0000 Date: Fri, 11 Dec 2015 12:24:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop unused __devexit{, data} and CONFIG_HOTPLUG X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 59dfd694c87dbca781bb45ade86cef4a8b5d7aaf Author: Andrew Cooper AuthorDate: Mon Nov 30 12:01:21 2015 +0100 Commit: Jan Beulich CommitDate: Mon Nov 30 12:01:21 2015 +0100 drop unused __devexit{,data} and CONFIG_HOTPLUG Signed-off-by: Andrew Cooper Also CONFIG_HOTPLUG_CPU. Signed-off-by: Jan Beulich --- xen/include/asm-x86/config.h | 3 --- xen/include/xen/init.h | 8 -------- 2 files changed, 0 insertions(+), 11 deletions(-) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 52f7ca8..416a5c2 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -44,9 +44,6 @@ #define CONFIG_VGA 1 #define CONFIG_VIDEO 1 -#define CONFIG_HOTPLUG 1 -#define CONFIG_HOTPLUG_CPU 1 - #define CONFIG_XENOPROF 1 #define CONFIG_WATCHDOG 1 diff --git a/xen/include/xen/init.h b/xen/include/xen/init.h index 17fe550..7072013 100644 --- a/xen/include/xen/init.h +++ b/xen/include/xen/init.h @@ -117,14 +117,6 @@ extern struct kernel_param __setup_start, __setup_end; #endif /* __ASSEMBLY__ */ -#ifdef CONFIG_HOTPLUG -#define __devexit -#define __devexitdata -#else -#define __devexit __exit -#define __devexitdata __exitdata -#endif - #ifdef CONFIG_LATE_HWDOM #define __hwdom_init #define __hwdom_initdata __read_mostly -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nie-0001bW-2w; Fri, 11 Dec 2015 13:26:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nic-0001Zr-Q5 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:42 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id E6/B0-22142-11FCA665; Fri, 11 Dec 2015 13:26:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1449840400!10127526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32179 invoked from network); 11 Dec 2015 13:26:41 -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; 11 Dec 2015 13:26:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MqR-0002Qz-7p for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MqR-00071m-2I for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:43 +0000 Date: Fri, 11 Dec 2015 12:30:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Identify problematic file in error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0091eb7f40b2b0a6567263d1cc097c2529084045 Author: Andrew Cooper AuthorDate: Mon Dec 7 13:09:08 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 8 16:53:49 2015 +0000 tools/libxc: Identify problematic file in error messages Error messages along the lines of: xc: error: panic: xc_dom_core.c:207: failed to open file: No such file or directory: Internal error are of very little use. Include the filename in the error messages, so the user does not have to resort to debug level logging to identify the problem. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_core.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 841e7dc..2061ba6 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -203,16 +203,16 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, fd = open(filename, O_RDONLY); if ( fd == -1 ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to open file: %s", - strerror(errno)); + "failed to open file '%s': %s", + filename, strerror(errno)); goto err; } if ( (lseek(fd, 0, SEEK_SET) == -1) || ((offset = lseek(fd, 0, SEEK_END)) == -1) ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to seek on file: %s", - strerror(errno)); + "failed to seek on file '%s': %s", + filename, strerror(errno)); goto err; } @@ -239,8 +239,8 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, MAP_SHARED, fd, 0); if ( block->ptr == MAP_FAILED ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to mmap file: %s", - strerror(errno)); + "failed to mmap file '%s': %s", + filename, strerror(errno)); goto err; } -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nie-0001bW-2w; Fri, 11 Dec 2015 13:26:44 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nic-0001Zr-Q5 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:42 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id E6/B0-22142-11FCA665; Fri, 11 Dec 2015 13:26:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1449840400!10127526!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32179 invoked from network); 11 Dec 2015 13:26:41 -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; 11 Dec 2015 13:26:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MqR-0002Qz-7p for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MqR-00071m-2I for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:30:43 +0000 Date: Fri, 11 Dec 2015 12:30:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/libxc: Identify problematic file in error messages X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0091eb7f40b2b0a6567263d1cc097c2529084045 Author: Andrew Cooper AuthorDate: Mon Dec 7 13:09:08 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 8 16:53:49 2015 +0000 tools/libxc: Identify problematic file in error messages Error messages along the lines of: xc: error: panic: xc_dom_core.c:207: failed to open file: No such file or directory: Internal error are of very little use. Include the filename in the error messages, so the user does not have to resort to debug level logging to identify the problem. Signed-off-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_core.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c index 841e7dc..2061ba6 100644 --- a/tools/libxc/xc_dom_core.c +++ b/tools/libxc/xc_dom_core.c @@ -203,16 +203,16 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, fd = open(filename, O_RDONLY); if ( fd == -1 ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to open file: %s", - strerror(errno)); + "failed to open file '%s': %s", + filename, strerror(errno)); goto err; } if ( (lseek(fd, 0, SEEK_SET) == -1) || ((offset = lseek(fd, 0, SEEK_END)) == -1) ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to seek on file: %s", - strerror(errno)); + "failed to seek on file '%s': %s", + filename, strerror(errno)); goto err; } @@ -239,8 +239,8 @@ void *xc_dom_malloc_filemap(struct xc_dom_image *dom, MAP_SHARED, fd, 0); if ( block->ptr == MAP_FAILED ) { xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, - "failed to mmap file: %s", - strerror(errno)); + "failed to mmap file '%s': %s", + filename, strerror(errno)); goto err; } -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nig-0001dT-AY; Fri, 11 Dec 2015 13:26:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nie-0001c8-S7 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:44 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D6/1E-23747-31FCA665; Fri, 11 Dec 2015 13:26:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1449840401!478239!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12303 invoked from network); 11 Dec 2015 13:26:42 -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; 11 Dec 2015 13:26:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mqw-0002Rd-VO for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mqw-00074v-Kt for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:14 +0000 Date: Fri, 11 Dec 2015 12:31:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a841b1b1286d122fd472b43db3c423b9876262e5 Author: Ian Jackson AuthorDate: Wed Dec 9 11:48:27 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:48:27 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 64fcf1b..216a642 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= bc00cad75d8bcc3ba696992bec219c21db8406aa -# Tue Mar 11 10:19:23 2014 +0000 -# block-vvfat: fix resource leaks in read_directory() +QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nig-0001dT-AY; Fri, 11 Dec 2015 13:26:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nie-0001c8-S7 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:44 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id D6/1E-23747-31FCA665; Fri, 11 Dec 2015 13:26:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1449840401!478239!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 12303 invoked from network); 11 Dec 2015 13:26:42 -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; 11 Dec 2015 13:26:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Mqw-0002Rd-VO for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Mqw-00074v-Kt for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:31:14 +0000 Date: Fri, 11 Dec 2015 12:31:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a841b1b1286d122fd472b43db3c423b9876262e5 Author: Ian Jackson AuthorDate: Wed Dec 9 11:48:27 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:48:27 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 64fcf1b..216a642 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= bc00cad75d8bcc3ba696992bec219c21db8406aa -# Tue Mar 11 10:19:23 2014 +0000 -# block-vvfat: fix resource leaks in read_directory() +QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nig-0001dp-F3; Fri, 11 Dec 2015 13:26:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nie-0001cA-Sx for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:45 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 57/76-03763-31FCA665; Fri, 11 Dec 2015 13:26:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1449840395!2584985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61367 invoked from network); 11 Dec 2015 13:26:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MnQ-0002Np-2X for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MnP-0006mB-Tm for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:36 +0000 Date: Fri, 11 Dec 2015 12:27:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update outdated header comment on privcmd.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9021863e9dd186a0bf0673b263990852254d8b3e Author: Doug Goldstein AuthorDate: Tue Dec 1 13:27:54 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 2 15:24:14 2015 +0000 tools: update outdated header comment on privcmd.h The BSDs have always accessed privcmd via /dev/xen/privcmd while Linux has used /proc/xen/privcmd but things are shifting to /dev/xen/privcmd as well. CC: Ian Jackson CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu Signed-off-by: Doug Goldstein Acked-by: Ian Jackson --- tools/include/xen-sys/FreeBSD/privcmd.h | 2 +- tools/include/xen-sys/Linux/privcmd.h | 2 +- tools/include/xen-sys/NetBSD/privcmd.h | 2 +- tools/include/xen-sys/NetBSDRump/privcmd.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/include/xen-sys/FreeBSD/privcmd.h b/tools/include/xen-sys/FreeBSD/privcmd.h index 0434d4d..cf1241f 100644 --- a/tools/include/xen-sys/FreeBSD/privcmd.h +++ b/tools/include/xen-sys/FreeBSD/privcmd.h @@ -1,7 +1,7 @@ /****************************************************************************** * privcmd.h * - * Interface to /proc/xen/privcmd. + * Interface to /dev/xen/privcmd. * * Copyright (c) 2003-2005, K A Fraser * diff --git a/tools/include/xen-sys/Linux/privcmd.h b/tools/include/xen-sys/Linux/privcmd.h index 5be860a..e4e666a 100644 --- a/tools/include/xen-sys/Linux/privcmd.h +++ b/tools/include/xen-sys/Linux/privcmd.h @@ -1,7 +1,7 @@ /****************************************************************************** * privcmd.h * - * Interface to /proc/xen/privcmd. + * Interface to /dev/xen/privcmd. * * Copyright (c) 2003-2005, K A Fraser * diff --git a/tools/include/xen-sys/NetBSD/privcmd.h b/tools/include/xen-sys/NetBSD/privcmd.h index 1296b30..555bad9 100644 --- a/tools/include/xen-sys/NetBSD/privcmd.h +++ b/tools/include/xen-sys/NetBSD/privcmd.h @@ -30,7 +30,7 @@ #ifndef __NetBSD_PRIVCMD_H__ #define __NetBSD_PRIVCMD_H__ -/* Interface to /proc/xen/privcmd */ +/* Interface to /dev/xen/privcmd */ typedef struct privcmd_hypercall { diff --git a/tools/include/xen-sys/NetBSDRump/privcmd.h b/tools/include/xen-sys/NetBSDRump/privcmd.h index 1296b30..555bad9 100644 --- a/tools/include/xen-sys/NetBSDRump/privcmd.h +++ b/tools/include/xen-sys/NetBSDRump/privcmd.h @@ -30,7 +30,7 @@ #ifndef __NetBSD_PRIVCMD_H__ #define __NetBSD_PRIVCMD_H__ -/* Interface to /proc/xen/privcmd */ +/* Interface to /dev/xen/privcmd */ typedef struct privcmd_hypercall { -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nig-0001dp-F3; Fri, 11 Dec 2015 13:26:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nie-0001cA-Sx for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:45 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id 57/76-03763-31FCA665; Fri, 11 Dec 2015 13:26:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1449840395!2584985!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61367 invoked from network); 11 Dec 2015 13:26:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MnQ-0002Np-2X for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MnP-0006mB-Tm for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:27:36 +0000 Date: Fri, 11 Dec 2015 12:27:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: update outdated header comment on privcmd.h X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9021863e9dd186a0bf0673b263990852254d8b3e Author: Doug Goldstein AuthorDate: Tue Dec 1 13:27:54 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 2 15:24:14 2015 +0000 tools: update outdated header comment on privcmd.h The BSDs have always accessed privcmd via /dev/xen/privcmd while Linux has used /proc/xen/privcmd but things are shifting to /dev/xen/privcmd as well. CC: Ian Jackson CC: Stefano Stabellini CC: Ian Campbell CC: Wei Liu Signed-off-by: Doug Goldstein Acked-by: Ian Jackson --- tools/include/xen-sys/FreeBSD/privcmd.h | 2 +- tools/include/xen-sys/Linux/privcmd.h | 2 +- tools/include/xen-sys/NetBSD/privcmd.h | 2 +- tools/include/xen-sys/NetBSDRump/privcmd.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/include/xen-sys/FreeBSD/privcmd.h b/tools/include/xen-sys/FreeBSD/privcmd.h index 0434d4d..cf1241f 100644 --- a/tools/include/xen-sys/FreeBSD/privcmd.h +++ b/tools/include/xen-sys/FreeBSD/privcmd.h @@ -1,7 +1,7 @@ /****************************************************************************** * privcmd.h * - * Interface to /proc/xen/privcmd. + * Interface to /dev/xen/privcmd. * * Copyright (c) 2003-2005, K A Fraser * diff --git a/tools/include/xen-sys/Linux/privcmd.h b/tools/include/xen-sys/Linux/privcmd.h index 5be860a..e4e666a 100644 --- a/tools/include/xen-sys/Linux/privcmd.h +++ b/tools/include/xen-sys/Linux/privcmd.h @@ -1,7 +1,7 @@ /****************************************************************************** * privcmd.h * - * Interface to /proc/xen/privcmd. + * Interface to /dev/xen/privcmd. * * Copyright (c) 2003-2005, K A Fraser * diff --git a/tools/include/xen-sys/NetBSD/privcmd.h b/tools/include/xen-sys/NetBSD/privcmd.h index 1296b30..555bad9 100644 --- a/tools/include/xen-sys/NetBSD/privcmd.h +++ b/tools/include/xen-sys/NetBSD/privcmd.h @@ -30,7 +30,7 @@ #ifndef __NetBSD_PRIVCMD_H__ #define __NetBSD_PRIVCMD_H__ -/* Interface to /proc/xen/privcmd */ +/* Interface to /dev/xen/privcmd */ typedef struct privcmd_hypercall { diff --git a/tools/include/xen-sys/NetBSDRump/privcmd.h b/tools/include/xen-sys/NetBSDRump/privcmd.h index 1296b30..555bad9 100644 --- a/tools/include/xen-sys/NetBSDRump/privcmd.h +++ b/tools/include/xen-sys/NetBSDRump/privcmd.h @@ -30,7 +30,7 @@ #ifndef __NetBSD_PRIVCMD_H__ #define __NetBSD_PRIVCMD_H__ -/* Interface to /proc/xen/privcmd */ +/* Interface to /dev/xen/privcmd */ typedef struct privcmd_hypercall { -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nij-0001gk-MT; Fri, 11 Dec 2015 13:26:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nii-0001fT-82 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:48 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 61/3B-32641-71FCA665; Fri, 11 Dec 2015 13:26:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449840403!10200924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40880 invoked from network); 11 Dec 2015 13:26:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:44 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MlD-0002KQ-89 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MlD-0006cV-6v for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:19 +0000 Date: Fri, 11 Dec 2015 12:25:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: replace libxl__xs_mkdir() with libxl__xs_mknod() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b6b5e7cbb881259db387c95da32ac695efa992e1 Author: Paul Durrant AuthorDate: Wed Nov 25 14:50:59 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:02:09 2015 +0000 libxl: replace libxl__xs_mkdir() with libxl__xs_mknod() This patch is purely cosmetic, it contains no functional change. A change in the implementation of libxl__xs_mknod() will be made in a subsequent patch. Signed-off-by: Paul Durrant Acked-by: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl_create.c | 26 +++++++++++++------------- tools/libxl/libxl_internal.h | 2 +- tools/libxl/libxl_xshelp.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 8770486..673e537 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -583,43 +583,43 @@ retry_transaction: t = xs_transaction_start(ctx->xsh); xs_rm(ctx->xsh, t, dom_path); - libxl__xs_mkdir(gc, t, dom_path, roperm, ARRAY_SIZE(roperm)); + libxl__xs_mknod(gc, t, dom_path, roperm, ARRAY_SIZE(roperm)); xs_rm(ctx->xsh, t, vm_path); - libxl__xs_mkdir(gc, t, vm_path, roperm, ARRAY_SIZE(roperm)); + libxl__xs_mknod(gc, t, vm_path, roperm, ARRAY_SIZE(roperm)); xs_rm(ctx->xsh, t, libxl_path); - libxl__xs_mkdir(gc, t, libxl_path, noperm, ARRAY_SIZE(noperm)); + libxl__xs_mknod(gc, t, libxl_path, noperm, ARRAY_SIZE(noperm)); xs_write(ctx->xsh, t, GCSPRINTF("%s/vm", dom_path), vm_path, strlen(vm_path)); rc = libxl__domain_rename(gc, *domid, 0, info->name, t); if (rc) goto out; - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/cpu", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/memory", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/device", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/control", dom_path), roperm, ARRAY_SIZE(roperm)); if (info->type == LIBXL_DOMAIN_TYPE_HVM) - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/hvmloader", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/control/shutdown", dom_path), rwperm, ARRAY_SIZE(rwperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/device/suspend/event-channel", dom_path), rwperm, ARRAY_SIZE(rwperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/data", dom_path), rwperm, ARRAY_SIZE(rwperm)); @@ -628,13 +628,13 @@ retry_transaction: * Create a local "libxl" directory for each guest, since we might want * to use libxl from inside the guest */ - libxl__xs_mkdir(gc, t, GCSPRINTF("%s/libxl", dom_path), rwperm, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/libxl", dom_path), rwperm, ARRAY_SIZE(rwperm)); /* * Create a local "device-model" directory for each guest, since we * might want to use Qemu from inside the guest */ - libxl__xs_mkdir(gc, t, GCSPRINTF("%s/device-model", dom_path), rwperm, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/device-model", dom_path), rwperm, ARRAY_SIZE(rwperm)); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 58d07cd..a671a61 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -680,7 +680,7 @@ _hidden char *libxl__xs_read(libxl__gc *gc, xs_transaction_t t, _hidden char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, const char *path, unsigned int *nb); /* On error: returns NULL, sets errno (no logging) */ -_hidden bool libxl__xs_mkdir(libxl__gc *gc, xs_transaction_t t, +_hidden bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, const char *path, struct xs_permissions *perms, unsigned int num_perms); diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index bc60b9a..cb6a559 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -147,7 +147,7 @@ char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, return ret; } -bool libxl__xs_mkdir(libxl__gc *gc, xs_transaction_t t, +bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, const char *path, struct xs_permissions *perms, unsigned int num_perms) { -- generated by git-patchbot for /home/xen/git/xen.git#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 11 13:26:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 13:26: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 1a7Nij-0001gk-MT; Fri, 11 Dec 2015 13:26:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Nii-0001fT-82 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 13:26:48 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 61/3B-32641-71FCA665; Fri, 11 Dec 2015 13:26:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1449840403!10200924!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40880 invoked from network); 11 Dec 2015 13:26:44 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 13:26:44 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7MlD-0002KQ-89 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7MlD-0006cV-6v for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 12:25:19 +0000 Date: Fri, 11 Dec 2015 12:25:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: replace libxl__xs_mkdir() with libxl__xs_mknod() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b6b5e7cbb881259db387c95da32ac695efa992e1 Author: Paul Durrant AuthorDate: Wed Nov 25 14:50:59 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 1 12:02:09 2015 +0000 libxl: replace libxl__xs_mkdir() with libxl__xs_mknod() This patch is purely cosmetic, it contains no functional change. A change in the implementation of libxl__xs_mknod() will be made in a subsequent patch. Signed-off-by: Paul Durrant Acked-by: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl_create.c | 26 +++++++++++++------------- tools/libxl/libxl_internal.h | 2 +- tools/libxl/libxl_xshelp.c | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 8770486..673e537 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -583,43 +583,43 @@ retry_transaction: t = xs_transaction_start(ctx->xsh); xs_rm(ctx->xsh, t, dom_path); - libxl__xs_mkdir(gc, t, dom_path, roperm, ARRAY_SIZE(roperm)); + libxl__xs_mknod(gc, t, dom_path, roperm, ARRAY_SIZE(roperm)); xs_rm(ctx->xsh, t, vm_path); - libxl__xs_mkdir(gc, t, vm_path, roperm, ARRAY_SIZE(roperm)); + libxl__xs_mknod(gc, t, vm_path, roperm, ARRAY_SIZE(roperm)); xs_rm(ctx->xsh, t, libxl_path); - libxl__xs_mkdir(gc, t, libxl_path, noperm, ARRAY_SIZE(noperm)); + libxl__xs_mknod(gc, t, libxl_path, noperm, ARRAY_SIZE(noperm)); xs_write(ctx->xsh, t, GCSPRINTF("%s/vm", dom_path), vm_path, strlen(vm_path)); rc = libxl__domain_rename(gc, *domid, 0, info->name, t); if (rc) goto out; - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/cpu", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/memory", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/device", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/control", dom_path), roperm, ARRAY_SIZE(roperm)); if (info->type == LIBXL_DOMAIN_TYPE_HVM) - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/hvmloader", dom_path), roperm, ARRAY_SIZE(roperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/control/shutdown", dom_path), rwperm, ARRAY_SIZE(rwperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/device/suspend/event-channel", dom_path), rwperm, ARRAY_SIZE(rwperm)); - libxl__xs_mkdir(gc, t, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/data", dom_path), rwperm, ARRAY_SIZE(rwperm)); @@ -628,13 +628,13 @@ retry_transaction: * Create a local "libxl" directory for each guest, since we might want * to use libxl from inside the guest */ - libxl__xs_mkdir(gc, t, GCSPRINTF("%s/libxl", dom_path), rwperm, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/libxl", dom_path), rwperm, ARRAY_SIZE(rwperm)); /* * Create a local "device-model" directory for each guest, since we * might want to use Qemu from inside the guest */ - libxl__xs_mkdir(gc, t, GCSPRINTF("%s/device-model", dom_path), rwperm, + libxl__xs_mknod(gc, t, GCSPRINTF("%s/device-model", dom_path), rwperm, ARRAY_SIZE(rwperm)); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 58d07cd..a671a61 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -680,7 +680,7 @@ _hidden char *libxl__xs_read(libxl__gc *gc, xs_transaction_t t, _hidden char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, const char *path, unsigned int *nb); /* On error: returns NULL, sets errno (no logging) */ -_hidden bool libxl__xs_mkdir(libxl__gc *gc, xs_transaction_t t, +_hidden bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, const char *path, struct xs_permissions *perms, unsigned int num_perms); diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index bc60b9a..cb6a559 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -147,7 +147,7 @@ char **libxl__xs_directory(libxl__gc *gc, xs_transaction_t t, return ret; } -bool libxl__xs_mkdir(libxl__gc *gc, xs_transaction_t t, +bool libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, const char *path, struct xs_permissions *perms, unsigned int num_perms) { -- generated by git-patchbot for /home/xen/git/xen.git#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 11 14:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovb-0007aj-0w; Fri, 11 Dec 2015 14:44:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OvZ-0007ae-3d for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:09 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 38/D4-31122-831EA665; Fri, 11 Dec 2015 14:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1449845045!5024689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42141 invoked from network); 11 Dec 2015 14:44:07 -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; 11 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OvT-0003ys-SF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7OvT-0005jJ-MX for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:03 +0000 Date: Fri, 11 Dec 2015 14:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0d450965b4c6aab28857f70ff1f78ba981bafbe Author: Jan Beulich AuthorDate: Tue Dec 8 14:08:41 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:08:41 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 13f03ad..84bca2a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -948,6 +948,17 @@ with **crashinfo_maxaddr**. Specify the threshold below which Xen will inform dom0 that the quantity of free memory is getting low. Specifying `0` will disable this notification. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index 29986a6..2b5ba85 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -43,6 +43,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -55,7 +99,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -100,8 +144,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -272,7 +316,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -337,13 +381,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -362,16 +410,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 264e2c1..82ea362 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3802721..2f835bf 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovb-0007aj-0w; Fri, 11 Dec 2015 14:44:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OvZ-0007ae-3d for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:09 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 38/D4-31122-831EA665; Fri, 11 Dec 2015 14:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1449845045!5024689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42141 invoked from network); 11 Dec 2015 14:44:07 -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; 11 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OvT-0003ys-SF for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7OvT-0005jJ-MX for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:03 +0000 Date: Fri, 11 Dec 2015 14:44:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0d450965b4c6aab28857f70ff1f78ba981bafbe Author: Jan Beulich AuthorDate: Tue Dec 8 14:08:41 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:08:41 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 13f03ad..84bca2a 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -948,6 +948,17 @@ with **crashinfo_maxaddr**. Specify the threshold below which Xen will inform dom0 that the quantity of free memory is getting low. Specifying `0` will disable this notification. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index 29986a6..2b5ba85 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -43,6 +43,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -55,7 +99,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -100,8 +144,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -272,7 +316,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -337,13 +381,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -362,16 +410,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 264e2c1..82ea362 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_IRQ_HAS_MULTIPLE_ACTION 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3802721..2f835bf 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovj-0007bu-5H; Fri, 11 Dec 2015 14:44:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovi-0007bl-3N for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:18 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 8E/E5-13905-141EA665; Fri, 11 Dec 2015 14:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449845055!10146899!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55388 invoked from network); 11 Dec 2015 14:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 14:44:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovf-0003yw-Ij for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ovf-0005k0-Fs for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:15 +0000 Date: Fri, 11 Dec 2015 14:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 746534ff5e60a8f4fcc250ccab39f9a1fd382f55 Author: Jan Beulich AuthorDate: Tue Dec 8 14:09:20 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:09:20 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 2b5ba85..394eecf 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -372,7 +372,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -603,11 +603,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovj-0007bu-5H; Fri, 11 Dec 2015 14:44:19 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovi-0007bl-3N for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:18 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 8E/E5-13905-141EA665; Fri, 11 Dec 2015 14:44:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1449845055!10146899!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55388 invoked from network); 11 Dec 2015 14:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 14:44:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovf-0003yw-Ij for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ovf-0005k0-Fs for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:15 +0000 Date: Fri, 11 Dec 2015 14:44:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 746534ff5e60a8f4fcc250ccab39f9a1fd382f55 Author: Jan Beulich AuthorDate: Tue Dec 8 14:09:20 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:09:20 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 2b5ba85..394eecf 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -372,7 +372,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -603,11 +603,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovt-0007dI-8b; Fri, 11 Dec 2015 14:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovs-0007dB-CR for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:28 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 6B/F9-10678-B41EA665; Fri, 11 Dec 2015 14:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1449845066!9531644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40681 invoked from network); 11 Dec 2015 14:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 14:44:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovp-0003z8-VR for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ovp-0005kf-QA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:25 +0000 Date: Fri, 11 Dec 2015 14:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42f4d98f218a7100e1746371e2389e15f0e9b1cb Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:31:33 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell (cherry picked from commit 59543a7cc218e9d466810409088f3015f259078c) --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 6f87d1c..b6fa4b0 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1435,6 +1435,9 @@ static void domcreate_complete(libxl__egc *egc, libxl_domain_config *const d_config = dcs->guest_config; libxl_domain_config *d_config_saved = &dcs->guest_config_saved; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4ee3248..137df83 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -627,9 +627,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovt-0007dI-8b; Fri, 11 Dec 2015 14:44:29 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovs-0007dB-CR for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:28 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 6B/F9-10678-B41EA665; Fri, 11 Dec 2015 14:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1449845066!9531644!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40681 invoked from network); 11 Dec 2015 14:44:27 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 14:44:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ovp-0003z8-VR for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ovp-0005kf-QA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:25 +0000 Date: Fri, 11 Dec 2015 14:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 42f4d98f218a7100e1746371e2389e15f0e9b1cb Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:31:33 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell (cherry picked from commit 59543a7cc218e9d466810409088f3015f259078c) --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 6f87d1c..b6fa4b0 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1435,6 +1435,9 @@ static void domcreate_complete(libxl__egc *egc, libxl_domain_config *const d_config = dcs->guest_config; libxl_domain_config *d_config_saved = &dcs->guest_config_saved; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 4ee3248..137df83 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -627,9 +627,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ow5-0007et-Dd; Fri, 11 Dec 2015 14:44:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ow4-0007ej-NC for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:40 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 0D/85-31122-851EA665; Fri, 11 Dec 2015 14:44:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449845076!5030333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8666 invoked from network); 11 Dec 2015 14:44:39 -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; 11 Dec 2015 14:44:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ow0-0003zG-CE for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ow0-0005l8-87 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:36 +0000 Date: Fri, 11 Dec 2015 14:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b248662bfbb746b0c777a25d66e88388a94ad972 Author: Ian Jackson AuthorDate: Wed Dec 9 11:50:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:50:11 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 0076c3f..d11c211 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.2 -# Mon Jun 30 10:07:54 2014 +0200 -# vnc: limit client_cut_text msg payload size +QEMU_TRADITIONAL_REVISION ?= 3159615c393e0b981e00ecd0e06fcfd44235f2d4 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ow5-0007et-Dd; Fri, 11 Dec 2015 14:44:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ow4-0007ej-NC for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:40 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 0D/85-31122-851EA665; Fri, 11 Dec 2015 14:44:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449845076!5030333!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8666 invoked from network); 11 Dec 2015 14:44:39 -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; 11 Dec 2015 14:44:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7Ow0-0003zG-CE for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7Ow0-0005l8-87 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:36 +0000 Date: Fri, 11 Dec 2015 14:44:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b248662bfbb746b0c777a25d66e88388a94ad972 Author: Ian Jackson AuthorDate: Wed Dec 9 11:50:11 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:50:11 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 0076c3f..d11c211 100644 --- a/Config.mk +++ b/Config.mk @@ -260,9 +260,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.7.5 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.5.2 -# Mon Jun 30 10:07:54 2014 +0200 -# vnc: limit client_cut_text msg payload size +QEMU_TRADITIONAL_REVISION ?= 3159615c393e0b981e00ecd0e06fcfd44235f2d4 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OwE-0007gb-Ki; Fri, 11 Dec 2015 14:44:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OwD-0007gM-5t for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:49 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 02/50-29649-061EA665; Fri, 11 Dec 2015 14:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1449845086!499693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2323 invoked from network); 11 Dec 2015 14:44:47 -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; 11 Dec 2015 14:44:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OwA-0003zN-NA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7OwA-0005li-IZ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:46 +0000 Date: Fri, 11 Dec 2015 14:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a84cecd5c70e5db264ad94cbb29af26e6d1b7c40 Author: Jan Beulich AuthorDate: Wed Dec 9 13:55:58 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:55:58 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 394eecf..a64b18b 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -55,8 +55,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -75,8 +73,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 14:44:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 14:44:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OwE-0007gb-Ki; Fri, 11 Dec 2015 14:44:50 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OwD-0007gM-5t for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:49 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id 02/50-29649-061EA665; Fri, 11 Dec 2015 14:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1449845086!499693!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2323 invoked from network); 11 Dec 2015 14:44:47 -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; 11 Dec 2015 14:44:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7OwA-0003zN-NA for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7OwA-0005li-IZ for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 14:44:46 +0000 Date: Fri, 11 Dec 2015 14:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a84cecd5c70e5db264ad94cbb29af26e6d1b7c40 Author: Jan Beulich AuthorDate: Wed Dec 9 13:55:58 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:55:58 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 394eecf..a64b18b 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -55,8 +55,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -75,8 +73,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 11 15:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22: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 1a7PWK-00032U-Q9; Fri, 11 Dec 2015 15:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWJ-00031M-0b for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:07 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 63/AD-24856-E1AEA665; Fri, 11 Dec 2015 15:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1449847324!9896943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62100 invoked from network); 11 Dec 2015 15:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 15:22:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWG-0004PF-6b for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWF-0000CQ-Tk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:04 +0000 Date: Fri, 11 Dec 2015 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3278c1d066c56076307a5766d9dd788e46e46421 Author: Jan Beulich AuthorDate: Tue Dec 8 14:12:50 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:12:50 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 963936c..f1f70fb 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -612,6 +612,17 @@ which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination with **crashinfo_maxaddr**. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index d2623d4..9859ec8 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -42,6 +42,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -54,7 +98,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -99,8 +143,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -237,7 +281,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -295,13 +339,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -320,16 +368,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index e3cfaf1..5d32ed8 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_VIDEO 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 9d76a04..22c6298 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- 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 11 15:22:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22: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 1a7PWK-00032U-Q9; Fri, 11 Dec 2015 15:22:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWJ-00031M-0b for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:07 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 63/AD-24856-E1AEA665; Fri, 11 Dec 2015 15:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1449847324!9896943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62100 invoked from network); 11 Dec 2015 15:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 15:22:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWG-0004PF-6b for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWF-0000CQ-Tk for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:04 +0000 Date: Fri, 11 Dec 2015 15:22:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3278c1d066c56076307a5766d9dd788e46e46421 Author: Jan Beulich AuthorDate: Tue Dec 8 14:12:50 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:12:50 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 963936c..f1f70fb 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -612,6 +612,17 @@ which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination with **crashinfo_maxaddr**. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index d2623d4..9859ec8 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -42,6 +42,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -54,7 +98,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -99,8 +143,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -237,7 +281,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -295,13 +339,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -320,16 +368,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index e3cfaf1..5d32ed8 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -39,6 +39,10 @@ #define CONFIG_VIDEO 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 9d76a04..22c6298 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -28,9 +28,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- 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 11 15:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWT-00035Z-Vi; Fri, 11 Dec 2015 15:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWT-00034X-5I for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F6/75-09570-82AEA665; Fri, 11 Dec 2015 15:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1449847334!2615869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 315 invoked from network); 11 Dec 2015 15:22:15 -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; 11 Dec 2015 15:22:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWQ-0004PN-NO for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWQ-0000DC-Dh for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:14 +0000 Date: Fri, 11 Dec 2015 15:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b60a4b27188d8d688189b6cddb607df7fde850f Author: Jan Beulich AuthorDate: Tue Dec 8 14:13:48 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:13:48 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 9859ec8..938867a 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -330,7 +330,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -561,11 +561,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- 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 11 15:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWT-00035Z-Vi; Fri, 11 Dec 2015 15:22:17 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWT-00034X-5I for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id F6/75-09570-82AEA665; Fri, 11 Dec 2015 15:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1449847334!2615869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 315 invoked from network); 11 Dec 2015 15:22:15 -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; 11 Dec 2015 15:22:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWQ-0004PN-NO for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWQ-0000DC-Dh for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:14 +0000 Date: Fri, 11 Dec 2015 15:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3b60a4b27188d8d688189b6cddb607df7fde850f Author: Jan Beulich AuthorDate: Tue Dec 8 14:13:48 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:13:48 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 9859ec8..938867a 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -330,7 +330,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -561,11 +561,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- 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 11 15:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWe-00039o-4f; Fri, 11 Dec 2015 15:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWd-00039R-GL for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:27 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 65/EC-22089-23AEA665; Fri, 11 Dec 2015 15:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1449847345!9868949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27525 invoked from network); 11 Dec 2015 15:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 15:22:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWb-0004PV-0m for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWa-0000DZ-U4 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:24 +0000 Date: Fri, 11 Dec 2015 15:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c0ac70ad56add34a691cbf657f9c0878f6c00a3 Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:32:13 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell (cherry picked from commit 62dc4c1a96eb9b40ec23bdd1656ece913f540871) --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index aaab584..022a2c0 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1197,6 +1197,9 @@ static void domcreate_complete(libxl__egc *egc, STATE_AO_GC(dcs->ao); libxl_domain_config *const d_config = dcs->guest_config; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index ec4ebe4..a574b66 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -420,9 +420,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- 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 11 15:22:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWe-00039o-4f; Fri, 11 Dec 2015 15:22:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWd-00039R-GL for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:27 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 65/EC-22089-23AEA665; Fri, 11 Dec 2015 15:22:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1449847345!9868949!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27525 invoked from network); 11 Dec 2015 15:22:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 15:22:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWb-0004PV-0m for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWa-0000DZ-U4 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:24 +0000 Date: Fri, 11 Dec 2015 15:22:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1c0ac70ad56add34a691cbf657f9c0878f6c00a3 Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:32:13 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell (cherry picked from commit 62dc4c1a96eb9b40ec23bdd1656ece913f540871) --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index aaab584..022a2c0 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1197,6 +1197,9 @@ static void domcreate_complete(libxl__egc *egc, STATE_AO_GC(dcs->ao); libxl_domain_config *const d_config = dcs->guest_config; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index ec4ebe4..a574b66 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -420,9 +420,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- 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 11 15:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWo-0003Dc-9S; Fri, 11 Dec 2015 15: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 1a7PWn-0003DI-Hr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:37 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 8A/FF-03235-C3AEA665; Fri, 11 Dec 2015 15:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1449847355!9882273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13523 invoked from network); 11 Dec 2015 15:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 15:22:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWl-0004Pd-9Y for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWl-0000E6-6d for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:35 +0000 Date: Fri, 11 Dec 2015 15:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a7aff4ea160d29faae0ff34c5a993f3efaf68c0 Author: Ian Jackson AuthorDate: Wed Dec 9 11:50:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:50:35 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 10bd71c..9f0acf0 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4 -# Mon Jun 30 10:07:54 2014 +0200 -# vnc: limit client_cut_text msg payload size +QEMU_TAG ?= d886904dd6875648b33d58bb7d2fe75b45e4ea12 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- 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 11 15:22:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWo-0003Dc-9S; Fri, 11 Dec 2015 15: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 1a7PWn-0003DI-Hr for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:37 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 8A/FF-03235-C3AEA665; Fri, 11 Dec 2015 15:22:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1449847355!9882273!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13523 invoked from network); 11 Dec 2015 15:22:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 11 Dec 2015 15:22:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWl-0004Pd-9Y for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWl-0000E6-6d for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:35 +0000 Date: Fri, 11 Dec 2015 15:22:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4a7aff4ea160d29faae0ff34c5a993f3efaf68c0 Author: Ian Jackson AuthorDate: Wed Dec 9 11:50:35 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:50:35 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 10bd71c..9f0acf0 100644 --- a/Config.mk +++ b/Config.mk @@ -224,9 +224,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 1e5099d596b6f7a977d4bc040a54edc2a6a3c6a4 -# Mon Jun 30 10:07:54 2014 +0200 -# vnc: limit client_cut_text msg payload size +QEMU_TAG ?= d886904dd6875648b33d58bb7d2fe75b45e4ea12 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- 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 11 15:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PX1-0003Gm-DS; Fri, 11 Dec 2015 15:22:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PX0-0003GQ-39 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:50 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id B5/7B-28791-94AEA665; Fri, 11 Dec 2015 15:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1449847365!10544758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1022 invoked from network); 11 Dec 2015 15:22:46 -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 2015 15:22:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWv-0004Pl-IU for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWv-0000Ee-Ga for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:45 +0000 Date: Fri, 11 Dec 2015 15:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54dd84062d4e0f0298508826fc06990415da431e Author: Jan Beulich AuthorDate: Wed Dec 9 13:58:21 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:58:21 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 938867a..d6d293e 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -54,8 +54,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -74,8 +72,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- 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 11 15:22:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 11 Dec 2015 15:22:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PX1-0003Gm-DS; Fri, 11 Dec 2015 15:22:51 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PX0-0003GQ-39 for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:50 +0000 Received: from [193.109.254.147] by server-1.bemta-14.messagelabs.com id B5/7B-28791-94AEA665; Fri, 11 Dec 2015 15:22:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1449847365!10544758!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1022 invoked from network); 11 Dec 2015 15:22:46 -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 2015 15:22:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7PWv-0004Pl-IU for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7PWv-0000Ee-Ga for xen-changelog@lists.xensource.com; Fri, 11 Dec 2015 15:22:45 +0000 Date: Fri, 11 Dec 2015 15:22:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.3] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 54dd84062d4e0f0298508826fc06990415da431e Author: Jan Beulich AuthorDate: Wed Dec 9 13:58:21 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:58:21 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index 938867a..d6d293e 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -54,8 +54,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -74,8 +72,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- 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 12 05:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSa-0005xg-9W; Sat, 12 Dec 2015 05:11:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSZ-0005xb-AF for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id AE/B9-18316-A6CAB665; Sat, 12 Dec 2015 05:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1449897064!5112027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46198 invoked from network); 12 Dec 2015 05:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSV-0004Dn-NE for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cSV-0000ju-CB for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:03 +0000 Date: Sat, 12 Dec 2015 05:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcbb31d041ccdb8331e7dc556e2abcd5d7ea7d5f Author: Jan Beulich AuthorDate: Tue Dec 8 14:10:34 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:10:34 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 2ebb7c6..3d2ebc7 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -653,6 +653,17 @@ which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination with **crashinfo_maxaddr**. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index 701c5fb..a286266 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -46,6 +46,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -58,7 +102,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -103,8 +147,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -269,7 +313,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -334,13 +378,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -359,16 +407,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 5b7b1a8..26805cb 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -37,6 +37,10 @@ #define CONFIG_VIDEO 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3f7f852..1fdcb5b 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -29,9 +29,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSa-0005xg-9W; Sat, 12 Dec 2015 05:11:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSZ-0005xb-AF for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id AE/B9-18316-A6CAB665; Sat, 12 Dec 2015 05:11:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1449897064!5112027!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46198 invoked from network); 12 Dec 2015 05:11:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSV-0004Dn-NE for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cSV-0000ju-CB for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:03 +0000 Date: Sat, 12 Dec 2015 05:11:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] memory: split and tighten maximum order permitted in memops X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dcbb31d041ccdb8331e7dc556e2abcd5d7ea7d5f Author: Jan Beulich AuthorDate: Tue Dec 8 14:10:34 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:10:34 2015 +0100 memory: split and tighten maximum order permitted in memops Introduce and enforce separate limits for ordinary DomU, DomU with pass-through device(s), control domain, and hardware domain. The DomU defaults were determined based on what so far was allowed by multipage_allocation_permitted(). The x86 hwdom default was chosen based on linux-2.6.18-xen.hg c/s 1102:82782f1361a9 indicating 2Mb is not enough, plus some slack. The ARM hwdom default was chosen to allow 2Mb (order-9) mappings, plus a little bit of slack. This is CVE-2015-8338 / XSA-158. Reported-by: Julien Grall Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: 4a578b316eb98975374d88f28904acf13dbcfac2 master date: 2015-12-08 14:00:33 +0100 --- docs/misc/xen-command-line.markdown | 11 +++++ xen/common/memory.c | 72 ++++++++++++++++++++++++++-------- xen/include/asm-arm/config.h | 4 ++ xen/include/asm-arm/iocap.h | 4 -- xen/include/asm-x86/config.h | 5 ++- xen/include/asm-x86/iocap.h | 5 -- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 2ebb7c6..3d2ebc7 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -653,6 +653,17 @@ which data structures should be deliberately allocated in low memory, so the crash kernel may find find them. Should be used in combination with **crashinfo_maxaddr**. +### memop-max-order +> `= [][,[][,[][,]]]` + +> x86 default: `9,18,12,12` +> ARM default: `9,18,10,10` + +Change the maximum order permitted for allocation (or allocation-like) +requests issued by the various kinds of domains (in this order: +ordinary DomU, control domain, hardware domain, and - when supported +by the platform - DomU with pass-through device assigned). + ### max\_cstate > `= ` diff --git a/xen/common/memory.c b/xen/common/memory.c index 701c5fb..a286266 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -46,6 +46,50 @@ struct memop_args { int preempted; /* Was the hypercall preempted? */ }; +#ifndef CONFIG_CTLDOM_MAX_ORDER +#define CONFIG_CTLDOM_MAX_ORDER CONFIG_PAGEALLOC_MAX_ORDER +#endif +#ifndef CONFIG_PTDOM_MAX_ORDER +#define CONFIG_PTDOM_MAX_ORDER CONFIG_HWDOM_MAX_ORDER +#endif + +static unsigned int __read_mostly domu_max_order = CONFIG_DOMU_MAX_ORDER; +static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; +static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; +#ifdef HAS_PASSTHROUGH +static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; +#else +# define ptdom_max_order domu_max_order +#endif +static void __init parse_max_order(const char *s) +{ + if ( *s != ',' ) + domu_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + ctldom_max_order = simple_strtoul(s, &s, 0); + if ( *s == ',' && *++s != ',' ) + hwdom_max_order = simple_strtoul(s, &s, 0); +#ifdef HAS_PASSTHROUGH + if ( *s == ',' && *++s != ',' ) + ptdom_max_order = simple_strtoul(s, &s, 0); +#endif +} +custom_param("memop-max-order", parse_max_order); + +static unsigned int max_order(const struct domain *d) +{ + unsigned int order = cache_flush_permitted(d) ? domu_max_order + : ptdom_max_order; + + if ( is_control_domain(d) && order < ctldom_max_order ) + order = ctldom_max_order; + + if ( is_hardware_domain(d) && order < hwdom_max_order ) + order = hwdom_max_order; + + return min(order, MAX_ORDER + 0U); +} + static void increase_reservation(struct memop_args *a) { struct page_info *page; @@ -58,7 +102,7 @@ static void increase_reservation(struct memop_args *a) a->nr_extents-1) ) return; - if ( !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -103,8 +147,8 @@ static void populate_physmap(struct memop_args *a) a->nr_extents-1) ) return; - if ( a->memflags & MEMF_populate_on_demand ? a->extent_order > MAX_ORDER : - !multipage_allocation_permitted(current->domain, a->extent_order) ) + if ( a->extent_order > (a->memflags & MEMF_populate_on_demand ? MAX_ORDER : + max_order(current->domain)) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -269,7 +313,7 @@ static void decrease_reservation(struct memop_args *a) if ( !guest_handle_subrange_okay(a->extent_list, a->nr_done, a->nr_extents-1) || - a->extent_order > MAX_ORDER ) + a->extent_order > max_order(current->domain) ) return; for ( i = a->nr_done; i < a->nr_extents; i++ ) @@ -334,13 +378,17 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) if ( copy_from_guest(&exch, arg, 1) ) return -EFAULT; + if ( max(exch.in.extent_order, exch.out.extent_order) > + max_order(current->domain) ) + { + rc = -EPERM; + goto fail_early; + } + /* Various sanity checks. */ if ( (exch.nr_exchanged > exch.in.nr_extents) || /* Input and output domain identifiers match? */ (exch.in.domid != exch.out.domid) || - /* Extent orders are sensible? */ - (exch.in.extent_order > MAX_ORDER) || - (exch.out.extent_order > MAX_ORDER) || /* Sizes of input and output lists do not overflow a long? */ ((~0UL >> exch.in.extent_order) < exch.in.nr_extents) || ((~0UL >> exch.out.extent_order) < exch.out.nr_extents) || @@ -359,16 +407,6 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) goto fail_early; } - /* Only privileged guests can allocate multi-page contiguous extents. */ - if ( !multipage_allocation_permitted(current->domain, - exch.in.extent_order) || - !multipage_allocation_permitted(current->domain, - exch.out.extent_order) ) - { - rc = -EPERM; - goto fail_early; - } - if ( exch.in.extent_order <= exch.out.extent_order ) { in_chunk_order = exch.out.extent_order - exch.in.extent_order; diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index 5b7b1a8..26805cb 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -37,6 +37,10 @@ #define CONFIG_VIDEO 1 +#define CONFIG_PAGEALLOC_MAX_ORDER 18 +#define CONFIG_DOMU_MAX_ORDER 9 +#define CONFIG_HWDOM_MAX_ORDER 10 + #define OPT_CONSOLE_STR "dtuart" #ifdef MAX_PHYS_CPUS diff --git a/xen/include/asm-arm/iocap.h b/xen/include/asm-arm/iocap.h index 22cfa41..276fefb 100644 --- a/xen/include/asm-arm/iocap.h +++ b/xen/include/asm-arm/iocap.h @@ -4,10 +4,6 @@ #define cache_flush_permitted(d) \ (!rangeset_is_empty((d)->iomem_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps)) - #endif /* diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 3f7f852..1fdcb5b 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -29,9 +29,12 @@ #define CONFIG_NUMA 1 #define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 -#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) #define CONFIG_DOMAIN_PAGE 1 +#define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) +#define CONFIG_DOMU_MAX_ORDER PAGETABLE_ORDER +#define CONFIG_HWDOM_MAX_ORDER 12 + /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). */ #define CONFIG_X86_L1_CACHE_SHIFT 7 diff --git a/xen/include/asm-x86/iocap.h b/xen/include/asm-x86/iocap.h index 591ae17..eee4722 100644 --- a/xen/include/asm-x86/iocap.h +++ b/xen/include/asm-x86/iocap.h @@ -18,9 +18,4 @@ (!rangeset_is_empty((d)->iomem_caps) || \ !rangeset_is_empty((d)->arch.ioport_caps)) -#define multipage_allocation_permitted(d, order) \ - (((order) <= 9) || /* allow 2MB superpages */ \ - !rangeset_is_empty((d)->iomem_caps) || \ - !rangeset_is_empty((d)->arch.ioport_caps)) - #endif /* __X86_IOCAP_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11: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 1a7cSk-0005yK-Dt; Sat, 12 Dec 2015 05:11:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSj-0005yD-Ha for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:17 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 4A/1A-25435-47CAB665; Sat, 12 Dec 2015 05:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1449897075!10661586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64395 invoked from network); 12 Dec 2015 05:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSg-0004Dv-TQ for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cSg-0000kI-Qo for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:14 +0000 Date: Sat, 12 Dec 2015 05:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2432628c93b8a2c819d4b827c4379fb30a20d489 Author: Jan Beulich AuthorDate: Tue Dec 8 14:11:08 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:11:08 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index a286266..e2cfa05 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -369,7 +369,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -600,11 +600,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11: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 1a7cSk-0005yK-Dt; Sat, 12 Dec 2015 05:11:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSj-0005yD-Ha for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:17 +0000 Received: from [193.109.254.147] by server-3.bemta-14.messagelabs.com id 4A/1A-25435-47CAB665; Sat, 12 Dec 2015 05:11:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1449897075!10661586!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64395 invoked from network); 12 Dec 2015 05:11:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSg-0004Dv-TQ for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cSg-0000kI-Qo for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:14 +0000 Date: Sat, 12 Dec 2015 05:11:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] memory: fix XENMEM_exchange error handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2432628c93b8a2c819d4b827c4379fb30a20d489 Author: Jan Beulich AuthorDate: Tue Dec 8 14:11:08 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 8 14:11:08 2015 +0100 memory: fix XENMEM_exchange error handling assign_pages() can fail due to the domain getting killed in parallel, which should not result in a hypervisor crash. Reported-by: Julien Grall Also delete a redundant put_gfn() - all relevant paths leading to the "fail" label already do this (and there are also paths where it was plain wrong). All of the put_gfn()-s got introduced by 51032ca058 ("Modify naming of queries into the p2m"), including the otherwise unneeded initializer for k (with even a kind of misleading comment - the compiler warning could actually have served as a hint that the use is wrong). This is CVE-2015-8339 + CVE-2015-8340 / XSA-159. Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: eedecb3cf0b2ce1ffc2eb08f3c73f88d42c382c9 master date: 2015-12-08 14:01:43 +0100 --- xen/common/memory.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index a286266..e2cfa05 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -369,7 +369,7 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) PAGE_LIST_HEAD(out_chunk_list); unsigned long in_chunk_order, out_chunk_order; xen_pfn_t gpfn, gmfn, mfn; - unsigned long i, j, k = 0; /* gcc ... */ + unsigned long i, j, k; unsigned int memflags = 0; long rc = 0; struct domain *d; @@ -600,11 +600,12 @@ static long memory_exchange(XEN_GUEST_HANDLE_PARAM(xen_memory_exchange_t) arg) fail: /* Reassign any input pages we managed to steal. */ while ( (page = page_list_remove_head(&in_chunk_list)) ) - { - put_gfn(d, gmfn + k--); if ( assign_pages(d, page, 0, MEMF_no_refcount) ) - BUG(); - } + { + BUG_ON(!d->is_dying); + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + } dying: rcu_unlock_domain(d); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSu-0005zo-J0; Sat, 12 Dec 2015 05:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSt-0005zb-CO for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:27 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 62/8D-31122-E7CAB665; Sat, 12 Dec 2015 05:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449897085!5110630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37613 invoked from network); 12 Dec 2015 05:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSr-0004E3-6Q for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cSr-0000kg-3H for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:25 +0000 Date: Sat, 12 Dec 2015 05:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62dc4c1a96eb9b40ec23bdd1656ece913f540871 Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:31:45 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e3350d5..5292c15 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1295,6 +1295,9 @@ static void domcreate_complete(libxl__egc *egc, STATE_AO_GC(dcs->ao); libxl_domain_config *const d_config = dcs->guest_config; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 52bc01a..978a1eb 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -451,9 +451,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSu-0005zo-J0; Sat, 12 Dec 2015 05:11:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSt-0005zb-CO for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:27 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 62/8D-31122-E7CAB665; Sat, 12 Dec 2015 05:11:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449897085!5110630!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37613 invoked from network); 12 Dec 2015 05:11:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cSr-0004E3-6Q for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cSr-0000kg-3H for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:25 +0000 Date: Sat, 12 Dec 2015 05:11:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] libxl: Fix bootloader-related virtual memory leak on pv build failure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 62dc4c1a96eb9b40ec23bdd1656ece913f540871 Author: Ian Jackson AuthorDate: Wed Nov 18 15:34:54 2015 +0000 Commit: Ian Jackson CommitDate: Tue Dec 8 15:31:45 2015 +0000 libxl: Fix bootloader-related virtual memory leak on pv build failure The bootloader may call libxl__file_reference_map(), which mmap's the pv_kernel and pv_ramdisk into process memory. This was only unmapped, however, on the success path of libxl__build_pv(). If there were a failure anywhere between libxl_bootloader.c:parse_bootloader_result() and the end of libxl__build_pv(), the calls to libxl__file_reference_unmap() would be skipped, leaking the mapped virtual memory. Ideally this would be fixed by adding the unmap calls to the destruction path for libxl__domain_build_state. Unfortunately the lifetime of the libxl__domain_build_state is opaque, and it doesn't have a proper destruction path. But, the only thing in it that isn't from the gc are these bootloader references, and they are only ever set for one libxl__domain_build_state, the one which is libxl__domain_create_state.build_state. So we can clean up in the exit path from libxl__domain_create_*, which always comes through domcreate_complete. Remove the now-redundant unmaps in libxl__build_pv's success path. This is XSA-160. Signed-off-by: George Dunlap Signed-off-by: Ian Jackson Tested-by: George Dunlap Acked-by: Ian Campbell --- tools/libxl/libxl_create.c | 3 +++ tools/libxl/libxl_dom.c | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e3350d5..5292c15 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1295,6 +1295,9 @@ static void domcreate_complete(libxl__egc *egc, STATE_AO_GC(dcs->ao); libxl_domain_config *const d_config = dcs->guest_config; + libxl__file_reference_unmap(&dcs->build_state.pv_kernel); + libxl__file_reference_unmap(&dcs->build_state.pv_ramdisk); + if (!rc && d_config->b_info.exec_ssidref) rc = xc_flask_relabel_domain(CTX->xch, dcs->guest_domid, d_config->b_info.exec_ssidref); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 52bc01a..978a1eb 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -451,9 +451,6 @@ int libxl__build_pv(libxl__gc *gc, uint32_t domid, state->store_mfn = xc_dom_p2m_host(dom, dom->xenstore_pfn); } - libxl__file_reference_unmap(&state->pv_kernel); - libxl__file_reference_unmap(&state->pv_ramdisk); - ret = 0; out: xc_dom_release(dom); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cT5-00061v-N2; Sat, 12 Dec 2015 05:11:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cT4-00061d-7Q for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:38 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id F5/92-14900-98CAB665; Sat, 12 Dec 2015 05:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1449897095!10159293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39926 invoked from network); 12 Dec 2015 05:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cT1-0004EB-HU for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cT1-0000l9-Eb for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:35 +0000 Date: Sat, 12 Dec 2015 05:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5202998a6c16b10f8570a5bada00c37b62c8596f Author: Ian Jackson AuthorDate: Wed Dec 9 11:50:24 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:50:24 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 273150b..c2aff43 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 5ae0569d964ad1a6d8dc781e5566d39210a5d063 -# Mon Jun 30 10:07:54 2014 +0200 -# vnc: limit client_cut_text msg payload size +QEMU_TAG ?= 6425f5d8c25a4d6486435278bcccefd8810becf0 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cT5-00061v-N2; Sat, 12 Dec 2015 05:11:39 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cT4-00061d-7Q for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:38 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id F5/92-14900-98CAB665; Sat, 12 Dec 2015 05:11:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1449897095!10159293!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39926 invoked from network); 12 Dec 2015 05:11:36 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:36 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cT1-0004EB-HU for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cT1-0000l9-Eb for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:35 +0000 Date: Sat, 12 Dec 2015 05:11:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5202998a6c16b10f8570a5bada00c37b62c8596f Author: Ian Jackson AuthorDate: Wed Dec 9 11:50:24 2015 +0000 Commit: Ian Jackson CommitDate: Wed Dec 9 11:50:24 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 273150b..c2aff43 100644 --- a/Config.mk +++ b/Config.mk @@ -246,9 +246,9 @@ ETHERBOOT_NICS ?= rtl8139 8086100e # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git CONFIG_QEMU ?= $(QEMU_REMOTE) -QEMU_TAG ?= 5ae0569d964ad1a6d8dc781e5566d39210a5d063 -# Mon Jun 30 10:07:54 2014 +0200 -# vnc: limit client_cut_text msg payload size +QEMU_TAG ?= 6425f5d8c25a4d6486435278bcccefd8810becf0 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Short answer -- do not enable this unless you know what you are # doing and are prepared for some pain. -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cTE-00063u-Qs; Sat, 12 Dec 2015 05:11:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cTD-00063X-LI for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:47 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 81/9D-31122-39CAB665; Sat, 12 Dec 2015 05:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449897105!5110658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38019 invoked from network); 12 Dec 2015 05:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cTB-0004EJ-Pk for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cTB-0000mI-Nl for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:45 +0000 Date: Sat, 12 Dec 2015 05:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8fc45c1ce8ee883a9422ac471256c7c6125cef25 Author: Jan Beulich AuthorDate: Wed Dec 9 13:56:40 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:56:40 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e2cfa05..55db10b 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -58,8 +58,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -78,8 +76,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 12 05:11:48 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 12 Dec 2015 05:11:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cTE-00063u-Qs; Sat, 12 Dec 2015 05:11:48 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cTD-00063X-LI for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:47 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 81/9D-31122-39CAB665; Sat, 12 Dec 2015 05:11:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1449897105!5110658!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38019 invoked from network); 12 Dec 2015 05:11:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-7.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 12 Dec 2015 05:11:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a7cTB-0004EJ-Pk for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a7cTB-0000mI-Nl for xen-changelog@lists.xensource.com; Sat, 12 Dec 2015 05:11:45 +0000 Date: Sat, 12 Dec 2015 05:11:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8fc45c1ce8ee883a9422ac471256c7c6125cef25 Author: Jan Beulich AuthorDate: Wed Dec 9 13:56:40 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:56:40 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell master commit: ff841cead287d7913901ba5c4e7628a6958b5bea master date: 2015-12-09 13:53:13 +0100 --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index e2cfa05..55db10b 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -58,8 +58,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -78,8 +76,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- 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 16 04:44:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wg-00006G-3S; Wed, 16 Dec 2015 04:44:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wf-00006B-0l for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:09 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 67/7B-18316-81CE0765; Wed, 16 Dec 2015 04:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450241044!5569075!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43649 invoked from network); 16 Dec 2015 04:44:05 -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; 16 Dec 2015 04:44:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wa-0005S7-El for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93wa-0001aw-2O for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:04 +0000 Date: Wed, 16 Dec 2015 04:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mce-test: do not include libxenguest internal headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c6dd439ade5f9c2463fe0ff3adf291dec6fc2172 Author: Ian Campbell AuthorDate: Thu Dec 3 11:21:59 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:36:46 2015 +0000 mce-test: do not include libxenguest internal headers As far as I can tell there is no requirement for these and it builds fine without them. Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/tests/mce-test/tools/Makefile | 2 -- tools/tests/mce-test/tools/xen-mceinj.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 924e4dd..0e92ac2 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -3,8 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) -# xen-mceinj.c incorrectly use libxc internals -CFLAGS += -I$(XEN_ROOT)/tools/libxc CFLAGS += $(CFLAGS_libxenguest) CFLAGS += $(CFLAGS_libxenstore) CFLAGS += $(CFLAGS_xeninclude) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 31cdb04..d22f0ad 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -31,12 +31,10 @@ #include #include -#include #include #include #include #include -#include #include #define MCi_type_CTL 0x0 -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wg-00006G-3S; Wed, 16 Dec 2015 04:44:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wf-00006B-0l for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:09 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 67/7B-18316-81CE0765; Wed, 16 Dec 2015 04:44:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450241044!5569075!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43649 invoked from network); 16 Dec 2015 04:44:05 -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; 16 Dec 2015 04:44:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wa-0005S7-El for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93wa-0001aw-2O for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:04 +0000 Date: Wed, 16 Dec 2015 04:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] mce-test: do not include libxenguest internal headers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c6dd439ade5f9c2463fe0ff3adf291dec6fc2172 Author: Ian Campbell AuthorDate: Thu Dec 3 11:21:59 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:36:46 2015 +0000 mce-test: do not include libxenguest internal headers As far as I can tell there is no requirement for these and it builds fine without them. Signed-off-by: Ian Campbell Reviewed-by: Andrew Cooper Acked-by: Wei Liu --- tools/tests/mce-test/tools/Makefile | 2 -- tools/tests/mce-test/tools/xen-mceinj.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/tests/mce-test/tools/Makefile b/tools/tests/mce-test/tools/Makefile index 924e4dd..0e92ac2 100644 --- a/tools/tests/mce-test/tools/Makefile +++ b/tools/tests/mce-test/tools/Makefile @@ -3,8 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk CFLAGS += -Werror CFLAGS += $(CFLAGS_libxenctrl) -# xen-mceinj.c incorrectly use libxc internals -CFLAGS += -I$(XEN_ROOT)/tools/libxc CFLAGS += $(CFLAGS_libxenguest) CFLAGS += $(CFLAGS_libxenstore) CFLAGS += $(CFLAGS_xeninclude) diff --git a/tools/tests/mce-test/tools/xen-mceinj.c b/tools/tests/mce-test/tools/xen-mceinj.c index 31cdb04..d22f0ad 100644 --- a/tools/tests/mce-test/tools/xen-mceinj.c +++ b/tools/tests/mce-test/tools/xen-mceinj.c @@ -31,12 +31,10 @@ #include #include -#include #include #include #include #include -#include #include #define MCi_type_CTL 0x0 -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wo-00006p-9C; Wed, 16 Dec 2015 04:44:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wn-00006g-J4 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:17 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 75/37-25438-02CE0765; Wed, 16 Dec 2015 04:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1450241055!11226542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8645 invoked from network); 16 Dec 2015 04:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:44:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wl-0005SF-1x for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93wk-0001bT-OO for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:14 +0000 Date: Wed, 16 Dec 2015 04:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: simplify compile/link of test apps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9fc6f36d54b5cbaad57e78e43a6763cbb802608 Author: Ian Campbell AuthorDate: Thu Dec 3 11:22:00 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:36:53 2015 +0000 tools/ocaml: simplify compile/link of test apps xtl doesn't require the full LDLIBS_libxenctrl, just the -L and xenlight.cmxa, the latter which contains LDLIBS_libxenctrl as needed. Fixing this avoids the need to be concerned about LDLIBS_libxenctrl becoming more than one word in the future. Since the tests are pure ocaml (no C components) CFLAGS and LIBS_xenlight are not required. Signed-off-by: Ian Campbell Acked-by: David Scott Acked-by: Wei Liu Cc: David Scott --- tools/ocaml/test/Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile index b75726f..30a304b 100644 --- a/tools/ocaml/test/Makefile +++ b/tools/ocaml/test/Makefile @@ -2,9 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make -CFLAGS += $(CFLAGS_libxenlight) CFLAGS += $(APPEND_CFLAGS) -LIBS_xenlight = $(LDLIBS_libxenlight) OCAMLINCLUDE += \ -I $(OCAML_TOPLEVEL)/libs/xentoollog \ @@ -16,7 +14,7 @@ PROGRAMS = xtl send_debug_keys list_domains raise_exception dmesg xtl_LIBS = \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xentoollog $(OCAML_TOPLEVEL)/libs/xentoollog/xentoollog.cmxa \ - -cclib $(LDLIBS_libxenctrl) + -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xl $(OCAML_TOPLEVEL)/libs/xl/xenlight.cmxa xtl_OBJS = xtl -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wo-00006p-9C; Wed, 16 Dec 2015 04:44:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wn-00006g-J4 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:17 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 75/37-25438-02CE0765; Wed, 16 Dec 2015 04:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1450241055!11226542!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8645 invoked from network); 16 Dec 2015 04:44:16 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:44:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wl-0005SF-1x for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93wk-0001bT-OO for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:14 +0000 Date: Wed, 16 Dec 2015 04:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/ocaml: simplify compile/link of test apps X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b9fc6f36d54b5cbaad57e78e43a6763cbb802608 Author: Ian Campbell AuthorDate: Thu Dec 3 11:22:00 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:36:53 2015 +0000 tools/ocaml: simplify compile/link of test apps xtl doesn't require the full LDLIBS_libxenctrl, just the -L and xenlight.cmxa, the latter which contains LDLIBS_libxenctrl as needed. Fixing this avoids the need to be concerned about LDLIBS_libxenctrl becoming more than one word in the future. Since the tests are pure ocaml (no C components) CFLAGS and LIBS_xenlight are not required. Signed-off-by: Ian Campbell Acked-by: David Scott Acked-by: Wei Liu Cc: David Scott --- tools/ocaml/test/Makefile | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/tools/ocaml/test/Makefile b/tools/ocaml/test/Makefile index b75726f..30a304b 100644 --- a/tools/ocaml/test/Makefile +++ b/tools/ocaml/test/Makefile @@ -2,9 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. OCAML_TOPLEVEL = $(CURDIR)/.. include $(OCAML_TOPLEVEL)/common.make -CFLAGS += $(CFLAGS_libxenlight) CFLAGS += $(APPEND_CFLAGS) -LIBS_xenlight = $(LDLIBS_libxenlight) OCAMLINCLUDE += \ -I $(OCAML_TOPLEVEL)/libs/xentoollog \ @@ -16,7 +14,7 @@ PROGRAMS = xtl send_debug_keys list_domains raise_exception dmesg xtl_LIBS = \ -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xentoollog $(OCAML_TOPLEVEL)/libs/xentoollog/xentoollog.cmxa \ - -cclib $(LDLIBS_libxenctrl) + -ccopt -L -ccopt $(OCAML_TOPLEVEL)/libs/xl $(OCAML_TOPLEVEL)/libs/xl/xenlight.cmxa xtl_OBJS = xtl -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wz-000088-EV; Wed, 16 Dec 2015 04:44:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wy-00007y-3v for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:28 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 63/A0-16618-B2CE0765; Wed, 16 Dec 2015 04:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1450241065!10315773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 348 invoked from network); 16 Dec 2015 04:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:44:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wv-0005SR-Gz for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93wv-0001bz-At for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:25 +0000 Date: Wed, 16 Dec 2015 04:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Rules.mk: Properly handle libraries with recursive dependencies. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78fb69ad932e012cd27ce9b5b7f8733d08b8061f Author: Ian Campbell AuthorDate: Thu Dec 3 11:22:01 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:36:59 2015 +0000 tools/Rules.mk: Properly handle libraries with recursive dependencies. In tree libraries which link against other in tree libraries in a way which is opaque to their callers need special handling, specifically correct use of -Wl,-rpath-link for the recusively used libraries. Currently this is rather simple, but up coming changes are going to introduce transitive dependencies more than 1 step deep. Introduce a SHDEPS idiom to contain all the recursive deps for a library and include those in both LDLIBS (for linking) and SHLIB (for recursive uses). Try and document the whole thing. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/Rules.mk | 74 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 62 insertions(+), 12 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index ffa5fd3..37b0aaf 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -34,25 +34,72 @@ INSTALL_SHLIB = : install-shlib-unsupported-fail SYMLINK_SHLIB = : symlink-shlib-unsupported-fail endif +# Compiling and linking against in tree libraries. +# +# In order to compile and link against an in-tree library various +# cpp/compiler/linker options are required. +# +# For example consider a library "libfoo" which itself uses two other +# libraries: +# libbar - whose use is entirely internal to libfoo and not exposed +# to users of libfoo at all. +# libbaz - whose use is entirely internal to libfoo but libfoo's +# public headers include one or more of libbaz's +# public headers. Users of libfoo are therefore transitively +# using libbaz's header but not linking against libbaz. +# +# SHDEPS_libfoo: Flags for linking recursive dependencies of +# libfoo. Must contain SHLIB for every library which +# libfoo links against. So must contain both +# $(SHLIB_libbar) and $(SHLIB_libbaz). +# +# SHLIB_libfoo: Flags for recursively linking against libfoo. Must +# contains SHDEPS_libfoo and: +# -Wl,-rpath-link= +# +# CFLAGS_libfoo: Flags for compiling against libfoo. Must add the +# directories containing libfoo's headers to the +# include path. Must recursively include +# $(CFLAGS_libbaz), to satisfy the transitive inclusion +# of the headers but not $(CFLAGS_libbar) since none of +# libbar's headers are required to build against +# libfoo. +# +# LDLIBS_libfoo: Flags for linking against libfoo. Must contain +# $(SHDEPS_libfoo) and the path to libfoo.so +# +# Consumers of libfoo should include $(CFLAGS_libfoo) and +# $(LDLIBS_libfoo) in their appropriate directories. They should not +# include any CFLAGS or LDLIBS relating to libbar or libbaz unless +# they use those libraries directly (not via libfoo) too. +# +# Consumers of libfoo should not directly use $(SHDEPS_libfoo) or +# $(SHLIB_libfoo) + CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) +SHDEPS_libxenctrl = LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) -LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest$(libextension) -SHLIB_libxenguest = -Wl,-rpath-link=$(XEN_LIBXC) +SHDEPS_libxenguest = +LDLIBS_libxenguest = $(SHDEPS_libxenguest) $(XEN_LIBXC)/libxenguest$(libextension) +SHLIB_libxenguest = $(SHDEPS_libxenguest) -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenstore = -I$(XEN_XENSTORE)/include $(CFLAGS_xeninclude) -LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore$(libextension) -SHLIB_libxenstore = -Wl,-rpath-link=$(XEN_XENSTORE) +SHDEPS_libxenstore = +LDLIBS_libxenstore = $(SHDEPS_libxenguest) $(XEN_XENSTORE)/libxenstore$(libextension) +SHLIB_libxenstore = $(SHDEPS_libxenguest) -Wl,-rpath-link=$(XEN_XENSTORE) CFLAGS_libxenstat = -I$(XEN_LIBXENSTAT) -LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/libxenstat$(libextension) -SHLIB_libxenstat = -Wl,-rpath-link=$(XEN_LIBXENSTAT) +SHDEPS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) +LDLIBS_libxenstat = $(SHDEPS_libxenstat) $(XEN_LIBXENSTAT)/libxenstat$(libextension) +SHLIB_libxenstat = $(SHDEPS_libxenstat) -Wl,-rpath-link=$(XEN_LIBXENSTAT) CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) -LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBVCHAN)/libxenvchan$(libextension) -SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) +SHDEPS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) +LDLIBS_libxenvchan = $(SHDEPS_libxenvchan) $(XEN_LIBVCHAN)/libxenvchan$(libextension) +SHLIB_libxenvchan = $(SHDEPS_libxenvchan) -Wl,-rpath-link=$(XEN_LIBVCHAN) ifeq ($(debug),y) # Disable optimizations and enable debugging information for macros @@ -65,17 +112,20 @@ LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) ifeq ($(LIBXL_BLKTAP),y) CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) -LDLIBS_libblktapctl = $(XEN_BLKTAP2)/control/libblktapctl$(libextension) -SHLIB_libblktapctl = -Wl,-rpath-link=$(XEN_BLKTAP2)/control +SHDEPS_libblktapctl = +LDLIBS_libblktapctl = $(SHDEPS_libblktapctl) $(XEN_BLKTAP2)/control/libblktapctl$(libextension) +SHLIB_libblktapctl = $(SHDEPS_libblktapctl) -Wl,-rpath-link=$(XEN_BLKTAP2)/control else CFLAGS_libblktapctl = +SHDEPS_libblktapctl = LDLIBS_libblktapctl = SHLIB_libblktapctl = endif CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) -LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight$(libextension) $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) -SHLIB_libxenlight = -Wl,-rpath-link=$(XEN_XENLIGHT) +SHDEPS_libxenlight = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) +LDLIBS_libxenlight = $(SHDEPS_libxenlight) $(XEN_XENLIGHT)/libxenlight$(libextension) +SHLIB_libxenlight = $(SHDEPS_libxenlight) -Wl,-rpath-link=$(XEN_XENLIGHT) CFLAGS += -D__XEN_TOOLS__ -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wz-000088-EV; Wed, 16 Dec 2015 04:44:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wy-00007y-3v for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:28 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 63/A0-16618-B2CE0765; Wed, 16 Dec 2015 04:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1450241065!10315773!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 348 invoked from network); 16 Dec 2015 04:44:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:44:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93wv-0005SR-Gz for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93wv-0001bz-At for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:25 +0000 Date: Wed, 16 Dec 2015 04:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/Rules.mk: Properly handle libraries with recursive dependencies. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 78fb69ad932e012cd27ce9b5b7f8733d08b8061f Author: Ian Campbell AuthorDate: Thu Dec 3 11:22:01 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:36:59 2015 +0000 tools/Rules.mk: Properly handle libraries with recursive dependencies. In tree libraries which link against other in tree libraries in a way which is opaque to their callers need special handling, specifically correct use of -Wl,-rpath-link for the recusively used libraries. Currently this is rather simple, but up coming changes are going to introduce transitive dependencies more than 1 step deep. Introduce a SHDEPS idiom to contain all the recursive deps for a library and include those in both LDLIBS (for linking) and SHLIB (for recursive uses). Try and document the whole thing. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu --- tools/Rules.mk | 74 ++++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 62 insertions(+), 12 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index ffa5fd3..37b0aaf 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -34,25 +34,72 @@ INSTALL_SHLIB = : install-shlib-unsupported-fail SYMLINK_SHLIB = : symlink-shlib-unsupported-fail endif +# Compiling and linking against in tree libraries. +# +# In order to compile and link against an in-tree library various +# cpp/compiler/linker options are required. +# +# For example consider a library "libfoo" which itself uses two other +# libraries: +# libbar - whose use is entirely internal to libfoo and not exposed +# to users of libfoo at all. +# libbaz - whose use is entirely internal to libfoo but libfoo's +# public headers include one or more of libbaz's +# public headers. Users of libfoo are therefore transitively +# using libbaz's header but not linking against libbaz. +# +# SHDEPS_libfoo: Flags for linking recursive dependencies of +# libfoo. Must contain SHLIB for every library which +# libfoo links against. So must contain both +# $(SHLIB_libbar) and $(SHLIB_libbaz). +# +# SHLIB_libfoo: Flags for recursively linking against libfoo. Must +# contains SHDEPS_libfoo and: +# -Wl,-rpath-link= +# +# CFLAGS_libfoo: Flags for compiling against libfoo. Must add the +# directories containing libfoo's headers to the +# include path. Must recursively include +# $(CFLAGS_libbaz), to satisfy the transitive inclusion +# of the headers but not $(CFLAGS_libbar) since none of +# libbar's headers are required to build against +# libfoo. +# +# LDLIBS_libfoo: Flags for linking against libfoo. Must contain +# $(SHDEPS_libfoo) and the path to libfoo.so +# +# Consumers of libfoo should include $(CFLAGS_libfoo) and +# $(LDLIBS_libfoo) in their appropriate directories. They should not +# include any CFLAGS or LDLIBS relating to libbar or libbaz unless +# they use those libraries directly (not via libfoo) too. +# +# Consumers of libfoo should not directly use $(SHDEPS_libfoo) or +# $(SHLIB_libfoo) + CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) +SHDEPS_libxenctrl = LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) -LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest$(libextension) -SHLIB_libxenguest = -Wl,-rpath-link=$(XEN_LIBXC) +SHDEPS_libxenguest = +LDLIBS_libxenguest = $(SHDEPS_libxenguest) $(XEN_LIBXC)/libxenguest$(libextension) +SHLIB_libxenguest = $(SHDEPS_libxenguest) -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenstore = -I$(XEN_XENSTORE)/include $(CFLAGS_xeninclude) -LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore$(libextension) -SHLIB_libxenstore = -Wl,-rpath-link=$(XEN_XENSTORE) +SHDEPS_libxenstore = +LDLIBS_libxenstore = $(SHDEPS_libxenguest) $(XEN_XENSTORE)/libxenstore$(libextension) +SHLIB_libxenstore = $(SHDEPS_libxenguest) -Wl,-rpath-link=$(XEN_XENSTORE) CFLAGS_libxenstat = -I$(XEN_LIBXENSTAT) -LDLIBS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBXENSTAT)/libxenstat$(libextension) -SHLIB_libxenstat = -Wl,-rpath-link=$(XEN_LIBXENSTAT) +SHDEPS_libxenstat = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) +LDLIBS_libxenstat = $(SHDEPS_libxenstat) $(XEN_LIBXENSTAT)/libxenstat$(libextension) +SHLIB_libxenstat = $(SHDEPS_libxenstat) -Wl,-rpath-link=$(XEN_LIBXENSTAT) CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) -LDLIBS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(XEN_LIBVCHAN)/libxenvchan$(libextension) -SHLIB_libxenvchan = -Wl,-rpath-link=$(XEN_LIBVCHAN) +SHDEPS_libxenvchan = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) +LDLIBS_libxenvchan = $(SHDEPS_libxenvchan) $(XEN_LIBVCHAN)/libxenvchan$(libextension) +SHLIB_libxenvchan = $(SHDEPS_libxenvchan) -Wl,-rpath-link=$(XEN_LIBVCHAN) ifeq ($(debug),y) # Disable optimizations and enable debugging information for macros @@ -65,17 +112,20 @@ LIBXL_BLKTAP ?= $(CONFIG_BLKTAP2) ifeq ($(LIBXL_BLKTAP),y) CFLAGS_libblktapctl = -I$(XEN_BLKTAP2)/control -I$(XEN_BLKTAP2)/include $(CFLAGS_xeninclude) -LDLIBS_libblktapctl = $(XEN_BLKTAP2)/control/libblktapctl$(libextension) -SHLIB_libblktapctl = -Wl,-rpath-link=$(XEN_BLKTAP2)/control +SHDEPS_libblktapctl = +LDLIBS_libblktapctl = $(SHDEPS_libblktapctl) $(XEN_BLKTAP2)/control/libblktapctl$(libextension) +SHLIB_libblktapctl = $(SHDEPS_libblktapctl) -Wl,-rpath-link=$(XEN_BLKTAP2)/control else CFLAGS_libblktapctl = +SHDEPS_libblktapctl = LDLIBS_libblktapctl = SHLIB_libblktapctl = endif CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) -LDLIBS_libxenlight = $(XEN_XENLIGHT)/libxenlight$(libextension) $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) -SHLIB_libxenlight = -Wl,-rpath-link=$(XEN_XENLIGHT) +SHDEPS_libxenlight = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libblktapctl) +LDLIBS_libxenlight = $(SHDEPS_libxenlight) $(XEN_XENLIGHT)/libxenlight$(libextension) +SHLIB_libxenlight = $(SHDEPS_libxenlight) -Wl,-rpath-link=$(XEN_XENLIGHT) CFLAGS += -D__XEN_TOOLS__ -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xB-00009e-Kq; Wed, 16 Dec 2015 04:44:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93x9-00009H-Uk for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:40 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 10/BD-02804-73CE0765; Wed, 16 Dec 2015 04:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1450241076!10904397!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19650 invoked from network); 16 Dec 2015 04:44:37 -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; 16 Dec 2015 04:44:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93x6-0005SZ-0V for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93x5-0001cj-RT for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:35 +0000 Date: Wed, 16 Dec 2015 04:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Refactor "xentoollog" into its own library X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7d3afbb44b47af9103be0b914afd588a84d9e62 Author: Ian Campbell AuthorDate: Thu Dec 3 11:22:02 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:37:00 2015 +0000 tools: Refactor "xentoollog" into its own library In attempting to disaggregate libxenctrl I found that many of the pieces were going to want access to this library, so split it out (as it probably should always have been). Various build adjustments are needed. In particular things which use xtl_* themselves now need to explicity link against the library. This has a nice side effect which is that users of libxl no longer need to link against libxenctrl just to create a logger, which was counter to the principal that applications using libxl shouldn't be required to look behind the curtain. This means that xl no longer links against libxenctrl. The new library uses a version script to ensure that only expected symbols are exported and to version them such that ABI guarantees can be kept in the future. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu [ ijc -- Update QEMU_TRADITIONAL_REVISION and MINIOS_UPSTREAM_REVISION ] --- .gitignore | 1 + Config.mk | 12 +- stubdom/Makefile | 24 ++++- stubdom/grub/Makefile | 1 + tools/Makefile | 3 + tools/Rules.mk | 14 ++- tools/libs/Makefile | 7 + tools/libs/toollog/Makefile | 59 +++++++++ tools/libs/toollog/include/xentoollog.h | 136 +++++++++++++++++++++ tools/libs/toollog/libxentoollog.map | 12 ++ tools/libs/toollog/xtl_core.c | 83 +++++++++++++ tools/libs/toollog/xtl_logger_stdio.c | 192 ++++++++++++++++++++++++++++++ tools/libxc/Makefile | 7 +- tools/libxc/include/xentoollog.h | 136 --------------------- tools/libxc/xtl_core.c | 83 ------------- tools/libxc/xtl_logger_stdio.c | 192 ------------------------------ tools/libxl/Makefile | 15 ++- tools/ocaml/libs/xentoollog/Makefile | 6 +- tools/ocaml/libs/xentoollog/genlevels.py | 2 +- tools/python/setup.py | 5 +- tools/xenpaging/Makefile | 2 +- 21 files changed, 552 insertions(+), 440 deletions(-) diff --git a/.gitignore b/.gitignore index 91e1430..a2c85e1 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ stubdom/gcc-* stubdom/include stubdom/ioemu stubdom/xenstore +stubdom/libxentoollog-* stubdom/libxc-* stubdom/lwip-* stubdom/mini-os-* diff --git a/Config.mk b/Config.mk index 216a642..8fc7767 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= bccd90071e863ec22216a000f1a07035e2f226ff -# Mon Nov 23 16:34:31 2015 +0000 -# Add a .gitignore +MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd +# Thu Dec 3 11:23:25 2015 +0000 +# mini-os: Include libxentoollog with libxc SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 # Tue Nov 17 09:18:44 2015 -0500 @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 -# Wed Dec 9 11:47:35 2015 +0000 -# net: pcnet: add check to validate receive data size(CVE-2015-7504) +QEMU_TRADITIONAL_REVISION ?= 9fad9ed285835caef64bb8dab352e287ad8538c2 +# Thu Dec 3 11:23:16 2015 +0000 +# qemu-xen-traditional: Use xentoollog as a separate library # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. diff --git a/stubdom/Makefile b/stubdom/Makefile index e1359cf..9c923dd 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -313,6 +313,11 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) ln -sf $(wildcard $(XEN_ROOT)/tools/include/xen-foreign/*) include/xen-foreign/ && \ $(MAKE) DESTDIR= -C include/xen-foreign/ && \ ( [ -h include/xen/foreign ] || ln -sf ../xen-foreign include/xen/foreign ) + mkdir -p libs-$(XEN_TARGET_ARCH)/toollog + [ -h libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || ( cd libs-$(XEN_TARGET_ARCH)/toollog && \ + ln -sf $(XEN_ROOT)/tools/libs/toollog/include/*.h . && \ + ln -sf $(XEN_ROOT)/tools/libs/toollog/*.c . && \ + ln -sf $(XEN_ROOT)/tools/libs/toollog/Makefile . ) mkdir -p libxc-$(XEN_TARGET_ARCH) [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \ ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \ @@ -336,12 +341,23 @@ $(TARGETS_MINIOS): mini-os-%: done ####### +# libxentoollog +####### + +.PHONY: libxentoollog +libxentoollog: libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a +libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a: $(NEWLIB_STAMPFILE) + $(MAKE) -C $(XEN_ROOT)/tools/include + $(MAKE) DESTDIR= -C $(MINI_OS) links + CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog + +####### # libxc ####### .PHONY: libxc libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a -libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib +libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: libxentoollog cross-zlib $(MAKE) -C $(XEN_ROOT)/tools/include $(MAKE) DESTDIR= -C $(MINI_OS) links CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH) @@ -515,6 +531,11 @@ clean: $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) rm -f $(STUBDOMPATH) + [ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean + [ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean + [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean + [ ! -e libs-$(XEN_TARGET_ARCH)/call/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/call clean + [ ! -e libs-$(XEN_TARGET_ARCH)/foreignmemory/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/foreignmemory clean [ ! -e libxc-$(XEN_TARGET_ARCH)/Makefile ] || $(MAKE) DESTDIR= -C libxc-$(XEN_TARGET_ARCH) clean -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean @@ -525,6 +546,7 @@ crossclean: clean rm -fr $(CROSS_ROOT) rm -fr newlib-$(XEN_TARGET_ARCH) rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) + rm -fr libs-$(XEN_TARGET_ARCH) rm -fr libxc-$(XEN_TARGET_ARCH) ioemu xenstore rm -fr gmp-$(XEN_TARGET_ARCH) rm -fr polarssl-$(XEN_TARGET_ARCH) diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile index 934cc4c..26dff45 100644 --- a/stubdom/grub/Makefile +++ b/stubdom/grub/Makefile @@ -5,6 +5,7 @@ vpath %.c ../grub-upstream BOOT=$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o +DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libs/toollog/include DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/include -I. DEF_CPPFLAGS += -I../grub-upstream/stage1 DEF_CPPFLAGS += -I../grub-upstream/stage2 diff --git a/tools/Makefile b/tools/Makefile index 820ca40..9f74ac7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := SUBDIRS-y += include +SUBDIRS-y += libs SUBDIRS-y += libxc SUBDIRS-$(FLASK_ENABLE) += flask SUBDIRS-y += xenstore @@ -248,12 +249,14 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --includedir=$(LIBEXEC_INC) \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ + -I$(XEN_ROOT)/tools/libs/toollog/include \ -I$(XEN_ROOT)/tools/libxc/include \ -I$(XEN_ROOT)/tools/xenstore/include \ -I$(XEN_ROOT)/tools/xenstore/compat/include \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore \ + -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \ $(QEMU_UPSTREAM_RPATH)" \ --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ diff --git a/tools/Rules.mk b/tools/Rules.mk index 37b0aaf..0652e4b 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -10,6 +10,7 @@ export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install XEN_INCLUDE = $(XEN_ROOT)/tools/include +XEN_LIBXENTOOLLOG = $(XEN_ROOT)/tools/libs/toollog XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore @@ -76,10 +77,15 @@ endif # Consumers of libfoo should not directly use $(SHDEPS_libfoo) or # $(SHLIB_libfoo) -CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) -SHDEPS_libxenctrl = -LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) -SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) +CFLAGS_libxentoollog = -I$(XEN_LIBXENTOOLLOG)/include $(CFLAGS_xeninclude) +SHDEPS_libxentoollog = +LDLIBS_libxentoollog = $(XEN_LIBXENTOOLLOG)/libxentoollog$(libextension) +SHLIB_libxentoollog = -Wl,-rpath-link=$(XEN_LIBXENTOOLLOG) + +CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_xeninclude) +SHDEPS_libxenctrl = $(SHLIB_libxentoollog) +LDLIBS_libxenctrl = $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libextension) +SHLIB_libxenctrl = $(SHDEPS_libxenctrl) -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) SHDEPS_libxenguest = diff --git a/tools/libs/Makefile b/tools/libs/Makefile new file mode 100644 index 0000000..73be500 --- /dev/null +++ b/tools/libs/Makefile @@ -0,0 +1,7 @@ +XEN_ROOT = $(CURDIR)/../.. +include $(XEN_ROOT)/tools/Rules.mk + +SUBDIRS-y := +SUBDIRS-y += toollog + +all clean install distclean: %: subdirs-% diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile new file mode 100644 index 0000000..bd12403 --- /dev/null +++ b/tools/libs/toollog/Makefile @@ -0,0 +1,59 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +MAJOR = 1 +MINOR = 0 +SHLIB_LDFLAGS += -Wl,--version-script=libxentoollog.map + +CFLAGS += -Werror -Wmissing-prototypes +CFLAGS += -I./include + +SRCS-y += xtl_core.c +SRCS-y += xtl_logger_stdio.c + +LIB_OBJS := $(patsubst %.c,%.o,$(SRCS-y)) +PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS-y)) + +LIB := libxentoollog.a +ifneq ($(nosharedlibs),y) +LIB += libxentoollog.so +endif + +.PHONY: all +all: build + +.PHONY: build +build: + $(MAKE) libs + +.PHONY: libs +libs: $(LIB) + +libxentoollog.a: $(LIB_OBJS) + $(AR) rc $@ $^ + +libxentoollog.so: libxentoollog.so.$(MAJOR) + $(SYMLINK_SHLIB) $< $@ +libxentoollog.so.$(MAJOR): libxentoollog.so.$(MAJOR).$(MINOR) + $(SYMLINK_SHLIB) $< $@ + +libxentoollog.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) + +.PHONY: install +install: build + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxentoollog.a $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR) + $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoollog.so + $(INSTALL_DATA) include/xentoollog.h $(DESTDIR)$(includedir) + +.PHONY: TAGS +TAGS: + etags -t *.c *.h + +.PHONY: clean +clean: + rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) diff --git a/tools/libs/toollog/include/xentoollog.h b/tools/libs/toollog/include/xentoollog.h new file mode 100644 index 0000000..853e9c7 --- /dev/null +++ b/tools/libs/toollog/include/xentoollog.h @@ -0,0 +1,136 @@ +/* + * xentoollog.h + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#ifndef XENTOOLLOG_H +#define XENTOOLLOG_H + +#include +#include + + +/*---------- common declarations and types ----------*/ + +typedef enum xentoollog_level { + XTL_NONE, /* sentinel etc, never used for logging */ + XTL_DEBUG, + XTL_VERBOSE, + XTL_DETAIL, + XTL_PROGRESS, /* also used for "progress" messages */ + XTL_INFO, + XTL_NOTICE, + XTL_WARN, + XTL_ERROR, + XTL_CRITICAL, + XTL_NUM_LEVELS +} xentoollog_level; + +typedef struct xentoollog_logger xentoollog_logger; +struct xentoollog_logger { + void (*vmessage)(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xl", may be 0 */, + const char *format /* without level, context, \n */, + va_list al) + __attribute__((format(printf,5,0))); + void (*progress)(struct xentoollog_logger *logger, + const char *context /* see above */, + const char *doing_what /* no \r,\n */, + int percent, unsigned long done, unsigned long total) + /* null function pointer is ok. + * will always be called with done==0 for each new + * context/doing_what */; + void (*destroy)(struct xentoollog_logger *logger); + /* each logger can put its necessary data here */ +}; + + +/*---------- facilities for consuming log messages ----------*/ + +#define XTL_STDIOSTREAM_SHOW_PID 001u +#define XTL_STDIOSTREAM_SHOW_DATE 002u +#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u +#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ +#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ + +typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags); + /* may return 0 if malloc fails, in which case error was logged */ + /* destroy on this logger does not close the file */ + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, + xentoollog_level min_level); +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, + unsigned set_flags, unsigned clear_flags); + /* if set_flags and clear_flags overlap, set_flags takes precedence */ + +void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); + + +/*---------- facilities for generating log messages ----------*/ + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl", may be 0 */, + const char *format /* does not contain \n */, + va_list) __attribute__((format(printf,5,0))); + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) __attribute__((format(printf,5,6))); + +void xtl_progress(struct xentoollog_logger *logger, + const char *context /* see above, may be 0 */, + const char *doing_what, + unsigned long done, unsigned long total); + + +/*---------- facilities for defining log message consumers ----------*/ + +const char *xtl_level_to_string(xentoollog_level); /* never fails */ + + +#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ + xentoollog_logger_##LOGGER *new_consumer; \ + \ + (buffer).vtable.vmessage = LOGGER##_vmessage; \ + (buffer).vtable.progress = LOGGER##_progress; \ + (buffer).vtable.destroy = LOGGER##_destroy; \ + \ + new_consumer = malloc(sizeof(*new_consumer)); \ + if (!new_consumer) { \ + xtl_log((xentoollog_logger*)&buffer, \ + XTL_CRITICAL, errno, "xtl", \ + "failed to allocate memory for new message logger"); \ + } else { \ + *new_consumer = buffer; \ + } \ + \ + new_consumer; \ +}); + + +#endif /* XENTOOLLOG_H */ diff --git a/tools/libs/toollog/libxentoollog.map b/tools/libs/toollog/libxentoollog.map new file mode 100644 index 0000000..c183cf5 --- /dev/null +++ b/tools/libs/toollog/libxentoollog.map @@ -0,0 +1,12 @@ +VERS_1.0 { + global: + xtl_createlogger_stdiostream; + xtl_level_to_string; + xtl_log; + xtl_logger_destroy; + xtl_logv; + xtl_progress; + xtl_stdiostream_adjust_flags; + xtl_stdiostream_set_minlevel; + local: *; /* Do not expose anything by default */ +}; diff --git a/tools/libs/toollog/xtl_core.c b/tools/libs/toollog/xtl_core.c new file mode 100644 index 0000000..c4724a0 --- /dev/null +++ b/tools/libs/toollog/xtl_core.c @@ -0,0 +1,83 @@ +/* + * xtl_core.c + * + * core code including functions for generating log messages + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include + +static const char *level_strings[XTL_NUM_LEVELS]= { + "[BUG:XTL_NONE]", + "debug", "verbose", "detail", /* normally off by default */ + "progress", "info", "notice", /* not a problem */ + "warning", "error", "critical" /* problems and errors */ +}; + +const char *xtl_level_to_string(xentoollog_level level) { + assert(level >= 0 && level < XTL_NUM_LEVELS); + return level_strings[level]; +} + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + va_list al) { + int errno_save = errno; + assert(level > XTL_NONE && level < XTL_NUM_LEVELS); + logger->vmessage(logger,level,errnoval,context,format,al); + errno = errno_save; +} + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) { + va_list al; + va_start(al,format); + xtl_logv(logger,level,errnoval,context,format,al); + va_end(al); +} + +void xtl_progress(struct xentoollog_logger *logger, + const char *context, const char *doing_what, + unsigned long done, unsigned long total) { + int percent = 0; + + if (!logger->progress) return; + + if ( total ) + percent = (total < LONG_MAX/100) + ? (done * 100) / total + : done / ((total + 99) / 100); + + logger->progress(logger, context, doing_what, percent, done, total); +} + +void xtl_logger_destroy(struct xentoollog_logger *logger) { + if (!logger) return; + logger->destroy(logger); +} diff --git a/tools/libs/toollog/xtl_logger_stdio.c b/tools/libs/toollog/xtl_logger_stdio.c new file mode 100644 index 0000000..0cd9206 --- /dev/null +++ b/tools/libs/toollog/xtl_logger_stdio.c @@ -0,0 +1,192 @@ +/* + * xtl_logger_stdio.c + * + * log message consumer that writes to stdio + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include +#include +#include +#include + +struct xentoollog_logger_stdiostream { + xentoollog_logger vtable; + FILE *f; + xentoollog_level min_level; + unsigned flags; + int progress_erase_len, progress_last_percent; + bool progress_use_cr; +}; + +static void progress_erase(xentoollog_logger_stdiostream *lg) { + if (lg->progress_erase_len) + fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); +} + +static void stdiostream_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + + if (level < lg->min_level) + return; + + progress_erase(lg); + + if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { + struct tm lt_buf; + time_t now = time(0); + struct tm *lt= localtime_r(&now, <_buf); + if (lt != NULL) + fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", + lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, + lt->tm_hour, lt->tm_min, lt->tm_sec, + tzname[!!lt->tm_isdst]); + else + fprintf(lg->f, "[localtime_r failed: %d] ", errno); + } + if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) + fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); + + if (context) + fprintf(lg->f, "%s: ", context); + + fprintf(lg->f, "%s: ", xtl_level_to_string(level)); + + vfprintf(lg->f, format, al); + + if (errnoval >= 0) + fprintf(lg->f, ": %s", strerror(errnoval)); + + putc('\n', lg->f); + fflush(lg->f); +} + +static void stdiostream_message(struct xentoollog_logger *logger_in, + xentoollog_level level, + const char *context, + const char *format, ...) +{ + va_list al; + va_start(al,format); + stdiostream_vmessage(logger_in, level, -1, context, format, al); + va_end(al); +} + +static void stdiostream_progress(struct xentoollog_logger *logger_in, + const char *context, + const char *doing_what, int percent, + unsigned long done, unsigned long total) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + int newpel, extra_erase; + xentoollog_level this_level; + + if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + return; + + if (percent < lg->progress_last_percent) { + this_level = XTL_PROGRESS; + } else if (percent == lg->progress_last_percent) { + return; + } else if (percent < lg->progress_last_percent + 5) { + this_level = XTL_DETAIL; + } else { + this_level = XTL_PROGRESS; + } + + if (this_level < lg->min_level) + return; + + lg->progress_last_percent = percent; + + if (!lg->progress_use_cr) { + stdiostream_message(logger_in, this_level, context, + "%s: %lu/%lu %3d%%", + doing_what, done, total, percent); + return; + } + + if (lg->progress_erase_len) + putc('\r', lg->f); + + newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", + context?context:"", context?": ":"", + doing_what, done, total, percent, + done == total ? "\n" : ""); + + extra_erase = lg->progress_erase_len - newpel; + if (extra_erase > 0) + fprintf(lg->f, "%*s\r", extra_erase, ""); + + lg->progress_erase_len = newpel; +} + +static void stdiostream_destroy(struct xentoollog_logger *logger_in) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + progress_erase(lg); + free(lg); +} + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, + xentoollog_level min_level) { + lg->min_level = min_level; +} + +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, + unsigned set_flags, unsigned clear_flags) { + unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; + if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + progress_erase(lg); + lg->flags = new_flags; +} + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags) { + xentoollog_logger_stdiostream newlogger; + + newlogger.f = f; + newlogger.min_level = min_level; + newlogger.flags = flags; + + switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | + XTL_STDIOSTREAM_PROGRESS_NO_CR)) { + case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; + case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; + case 0: + newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; + break; + default: + errno = EINVAL; + return 0; + } + + if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); + + newlogger.progress_erase_len = 0; + newlogger.progress_last_percent = 0; + + return XTL_NEW_LOGGER(stdiostream, newlogger); +} diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 818f2e4..940708f 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -39,8 +39,6 @@ CTRL_SRCS-y += xc_memshr.c CTRL_SRCS-y += xc_hcall_buf.c CTRL_SRCS-y += xc_foreign_memory.c CTRL_SRCS-y += xc_kexec.c -CTRL_SRCS-y += xtl_core.c -CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-y += xc_resource.c CTRL_SRCS-$(CONFIG_X86) += xc_psr.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c @@ -112,6 +110,7 @@ CFLAGS += -I. -I./include $(CFLAGS_xeninclude) CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE CFLAGS += $(PTHREAD_CFLAGS) +CFLAGS += $(CFLAGS_libxentoollog) CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y)) CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y)) @@ -165,7 +164,7 @@ install: build $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so - $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) @@ -208,7 +207,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) # libxenguest diff --git a/tools/libxc/include/xentoollog.h b/tools/libxc/include/xentoollog.h deleted file mode 100644 index 853e9c7..0000000 --- a/tools/libxc/include/xentoollog.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * xentoollog.h - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#ifndef XENTOOLLOG_H -#define XENTOOLLOG_H - -#include -#include - - -/*---------- common declarations and types ----------*/ - -typedef enum xentoollog_level { - XTL_NONE, /* sentinel etc, never used for logging */ - XTL_DEBUG, - XTL_VERBOSE, - XTL_DETAIL, - XTL_PROGRESS, /* also used for "progress" messages */ - XTL_INFO, - XTL_NOTICE, - XTL_WARN, - XTL_ERROR, - XTL_CRITICAL, - XTL_NUM_LEVELS -} xentoollog_level; - -typedef struct xentoollog_logger xentoollog_logger; -struct xentoollog_logger { - void (*vmessage)(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xl", may be 0 */, - const char *format /* without level, context, \n */, - va_list al) - __attribute__((format(printf,5,0))); - void (*progress)(struct xentoollog_logger *logger, - const char *context /* see above */, - const char *doing_what /* no \r,\n */, - int percent, unsigned long done, unsigned long total) - /* null function pointer is ok. - * will always be called with done==0 for each new - * context/doing_what */; - void (*destroy)(struct xentoollog_logger *logger); - /* each logger can put its necessary data here */ -}; - - -/*---------- facilities for consuming log messages ----------*/ - -#define XTL_STDIOSTREAM_SHOW_PID 001u -#define XTL_STDIOSTREAM_SHOW_DATE 002u -#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u -#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ -#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ - -typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags); - /* may return 0 if malloc fails, in which case error was logged */ - /* destroy on this logger does not close the file */ - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, - xentoollog_level min_level); -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, - unsigned set_flags, unsigned clear_flags); - /* if set_flags and clear_flags overlap, set_flags takes precedence */ - -void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); - - -/*---------- facilities for generating log messages ----------*/ - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl", may be 0 */, - const char *format /* does not contain \n */, - va_list) __attribute__((format(printf,5,0))); - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) __attribute__((format(printf,5,6))); - -void xtl_progress(struct xentoollog_logger *logger, - const char *context /* see above, may be 0 */, - const char *doing_what, - unsigned long done, unsigned long total); - - -/*---------- facilities for defining log message consumers ----------*/ - -const char *xtl_level_to_string(xentoollog_level); /* never fails */ - - -#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ - xentoollog_logger_##LOGGER *new_consumer; \ - \ - (buffer).vtable.vmessage = LOGGER##_vmessage; \ - (buffer).vtable.progress = LOGGER##_progress; \ - (buffer).vtable.destroy = LOGGER##_destroy; \ - \ - new_consumer = malloc(sizeof(*new_consumer)); \ - if (!new_consumer) { \ - xtl_log((xentoollog_logger*)&buffer, \ - XTL_CRITICAL, errno, "xtl", \ - "failed to allocate memory for new message logger"); \ - } else { \ - *new_consumer = buffer; \ - } \ - \ - new_consumer; \ -}); - - -#endif /* XENTOOLLOG_H */ diff --git a/tools/libxc/xtl_core.c b/tools/libxc/xtl_core.c deleted file mode 100644 index c4724a0..0000000 --- a/tools/libxc/xtl_core.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * xtl_core.c - * - * core code including functions for generating log messages - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include - -static const char *level_strings[XTL_NUM_LEVELS]= { - "[BUG:XTL_NONE]", - "debug", "verbose", "detail", /* normally off by default */ - "progress", "info", "notice", /* not a problem */ - "warning", "error", "critical" /* problems and errors */ -}; - -const char *xtl_level_to_string(xentoollog_level level) { - assert(level >= 0 && level < XTL_NUM_LEVELS); - return level_strings[level]; -} - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - va_list al) { - int errno_save = errno; - assert(level > XTL_NONE && level < XTL_NUM_LEVELS); - logger->vmessage(logger,level,errnoval,context,format,al); - errno = errno_save; -} - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) { - va_list al; - va_start(al,format); - xtl_logv(logger,level,errnoval,context,format,al); - va_end(al); -} - -void xtl_progress(struct xentoollog_logger *logger, - const char *context, const char *doing_what, - unsigned long done, unsigned long total) { - int percent = 0; - - if (!logger->progress) return; - - if ( total ) - percent = (total < LONG_MAX/100) - ? (done * 100) / total - : done / ((total + 99) / 100); - - logger->progress(logger, context, doing_what, percent, done, total); -} - -void xtl_logger_destroy(struct xentoollog_logger *logger) { - if (!logger) return; - logger->destroy(logger); -} diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c deleted file mode 100644 index 0cd9206..0000000 --- a/tools/libxc/xtl_logger_stdio.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * xtl_logger_stdio.c - * - * log message consumer that writes to stdio - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include -#include -#include -#include - -struct xentoollog_logger_stdiostream { - xentoollog_logger vtable; - FILE *f; - xentoollog_level min_level; - unsigned flags; - int progress_erase_len, progress_last_percent; - bool progress_use_cr; -}; - -static void progress_erase(xentoollog_logger_stdiostream *lg) { - if (lg->progress_erase_len) - fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); -} - -static void stdiostream_vmessage(xentoollog_logger *logger_in, - xentoollog_level level, - int errnoval, - const char *context, - const char *format, - va_list al) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - - if (level < lg->min_level) - return; - - progress_erase(lg); - - if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { - struct tm lt_buf; - time_t now = time(0); - struct tm *lt= localtime_r(&now, <_buf); - if (lt != NULL) - fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", - lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, - lt->tm_hour, lt->tm_min, lt->tm_sec, - tzname[!!lt->tm_isdst]); - else - fprintf(lg->f, "[localtime_r failed: %d] ", errno); - } - if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) - fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); - - if (context) - fprintf(lg->f, "%s: ", context); - - fprintf(lg->f, "%s: ", xtl_level_to_string(level)); - - vfprintf(lg->f, format, al); - - if (errnoval >= 0) - fprintf(lg->f, ": %s", strerror(errnoval)); - - putc('\n', lg->f); - fflush(lg->f); -} - -static void stdiostream_message(struct xentoollog_logger *logger_in, - xentoollog_level level, - const char *context, - const char *format, ...) -{ - va_list al; - va_start(al,format); - stdiostream_vmessage(logger_in, level, -1, context, format, al); - va_end(al); -} - -static void stdiostream_progress(struct xentoollog_logger *logger_in, - const char *context, - const char *doing_what, int percent, - unsigned long done, unsigned long total) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - int newpel, extra_erase; - xentoollog_level this_level; - - if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - return; - - if (percent < lg->progress_last_percent) { - this_level = XTL_PROGRESS; - } else if (percent == lg->progress_last_percent) { - return; - } else if (percent < lg->progress_last_percent + 5) { - this_level = XTL_DETAIL; - } else { - this_level = XTL_PROGRESS; - } - - if (this_level < lg->min_level) - return; - - lg->progress_last_percent = percent; - - if (!lg->progress_use_cr) { - stdiostream_message(logger_in, this_level, context, - "%s: %lu/%lu %3d%%", - doing_what, done, total, percent); - return; - } - - if (lg->progress_erase_len) - putc('\r', lg->f); - - newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", - context?context:"", context?": ":"", - doing_what, done, total, percent, - done == total ? "\n" : ""); - - extra_erase = lg->progress_erase_len - newpel; - if (extra_erase > 0) - fprintf(lg->f, "%*s\r", extra_erase, ""); - - lg->progress_erase_len = newpel; -} - -static void stdiostream_destroy(struct xentoollog_logger *logger_in) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - progress_erase(lg); - free(lg); -} - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, - xentoollog_level min_level) { - lg->min_level = min_level; -} - -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, - unsigned set_flags, unsigned clear_flags) { - unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; - if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - progress_erase(lg); - lg->flags = new_flags; -} - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags) { - xentoollog_logger_stdiostream newlogger; - - newlogger.f = f; - newlogger.min_level = min_level; - newlogger.flags = flags; - - switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | - XTL_STDIOSTREAM_PROGRESS_NO_CR)) { - case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; - case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; - case 0: - newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; - break; - default: - errno = EINVAL; - return 0; - } - - if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); - - newlogger.progress_erase_len = 0; - newlogger.progress_last_percent = 0; - - return XTL_NEW_LOGGER(stdiostream, newlogger); -} diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 6ff5bee..2abae0c 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -20,11 +20,12 @@ LIBUUID_LIBS += -luuid endif LIBXL_LIBS = -LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) ifeq ($(CONFIG_REMUS_NETBUF),y) LIBXL_LIBS += $(LIBNL3_LIBS) endif +CFLAGS_LIBXL += $(CFLAGS_libxentoollog) CFLAGS_LIBXL += $(CFLAGS_libxenctrl) CFLAGS_LIBXL += $(CFLAGS_libxenguest) CFLAGS_LIBXL += $(CFLAGS_libxenstore) @@ -149,7 +150,7 @@ CFLAGS_XL += -Wshadow XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ - CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h + CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. @@ -253,19 +254,19 @@ libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ xl: $(XL_OBJS) libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) testidl: testidl.o libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) $(PKG_CONFIG): % : %.in Makefile @sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < $< > $@.new diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile index 666eb66..8ae0a78 100644 --- a/tools/ocaml/libs/xentoollog/Makefile +++ b/tools/ocaml/libs/xentoollog/Makefile @@ -5,7 +5,7 @@ include $(TOPLEVEL)/common.make # allow mixed declarations and code CFLAGS += -Wno-declaration-after-statement -CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +CFLAGS += $(CFLAGS_libxentoollog) CFLAGS += $(APPEND_CFLAGS) OCAMLINCLUDE += @@ -13,7 +13,7 @@ OBJS = xentoollog INTF = xentoollog.cmi LIBS = xentoollog.cma xentoollog.cmxa -LIBS_xentoollog = $(LDLIBS_libxenctrl) +LIBS_xentoollog = $(LDLIBS_libxentoollog) xentoollog_OBJS = $(OBJS) xentoollog_C_OBJS = xentoollog_stubs @@ -49,7 +49,7 @@ xentoollog.mli: xentoollog.mli.in _xtl_levels.mli.in libs: $(LIBS) -_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libxc/include/xentoollog.h +_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libs/toollog/include/xentoollog.h $(PYTHON) genlevels.py _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc .PHONY: install diff --git a/tools/ocaml/libs/xentoollog/genlevels.py b/tools/ocaml/libs/xentoollog/genlevels.py index 65d334f..8c233c5 100755 --- a/tools/ocaml/libs/xentoollog/genlevels.py +++ b/tools/ocaml/libs/xentoollog/genlevels.py @@ -3,7 +3,7 @@ import sys def read_levels(): - f = open('../../../libxc/include/xentoollog.h', 'r') + f = open('../../../libs/toollog/include/xentoollog.h', 'r') levels = [] record = False diff --git a/tools/python/setup.py b/tools/python/setup.py index fdba866..9771cc4 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -7,16 +7,17 @@ XEN_ROOT = "../.." extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] PATH_XEN = XEN_ROOT + "/tools/include" +PATH_LIBXENTOOLLOG = XEN_ROOT + "/tools/libs/toollog" PATH_LIBXC = XEN_ROOT + "/tools/libxc" PATH_LIBXL = XEN_ROOT + "/tools/libxl" PATH_XENSTORE = XEN_ROOT + "/tools/xenstore" xc = Extension("xc", extra_compile_args = extra_compile_args, - include_dirs = [ PATH_XEN, PATH_LIBXC + "/include", "xen/lowlevel/xc" ], + include_dirs = [ PATH_XEN, PATH_LIBXENTOOLLOG + "/include", PATH_LIBXC + "/include", "xen/lowlevel/xc" ], library_dirs = [ PATH_LIBXC ], libraries = [ "xenctrl", "xenguest" ], - depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so" ], + depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so", "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ], sources = [ "xen/lowlevel/xc/xc.c" ]) xs = Extension("xs", diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 2407a30..e63d894 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk # xenpaging.c and file_ops.c incorrectly use libxc internals CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS) -I$(XEN_ROOT)/tools/libxc -LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) +LDLIBS += $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) LDFLAGS += $(PTHREAD_LDFLAGS) POLICY = default -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xB-00009e-Kq; Wed, 16 Dec 2015 04:44:41 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93x9-00009H-Uk for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:40 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 10/BD-02804-73CE0765; Wed, 16 Dec 2015 04:44:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1450241076!10904397!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19650 invoked from network); 16 Dec 2015 04:44:37 -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; 16 Dec 2015 04:44:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93x6-0005SZ-0V for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93x5-0001cj-RT for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:35 +0000 Date: Wed, 16 Dec 2015 04:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: Refactor "xentoollog" into its own library X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c7d3afbb44b47af9103be0b914afd588a84d9e62 Author: Ian Campbell AuthorDate: Thu Dec 3 11:22:02 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 9 12:37:00 2015 +0000 tools: Refactor "xentoollog" into its own library In attempting to disaggregate libxenctrl I found that many of the pieces were going to want access to this library, so split it out (as it probably should always have been). Various build adjustments are needed. In particular things which use xtl_* themselves now need to explicity link against the library. This has a nice side effect which is that users of libxl no longer need to link against libxenctrl just to create a logger, which was counter to the principal that applications using libxl shouldn't be required to look behind the curtain. This means that xl no longer links against libxenctrl. The new library uses a version script to ensure that only expected symbols are exported and to version them such that ABI guarantees can be kept in the future. Signed-off-by: Ian Campbell Acked-by: Ian Jackson Acked-by: Wei Liu [ ijc -- Update QEMU_TRADITIONAL_REVISION and MINIOS_UPSTREAM_REVISION ] --- .gitignore | 1 + Config.mk | 12 +- stubdom/Makefile | 24 ++++- stubdom/grub/Makefile | 1 + tools/Makefile | 3 + tools/Rules.mk | 14 ++- tools/libs/Makefile | 7 + tools/libs/toollog/Makefile | 59 +++++++++ tools/libs/toollog/include/xentoollog.h | 136 +++++++++++++++++++++ tools/libs/toollog/libxentoollog.map | 12 ++ tools/libs/toollog/xtl_core.c | 83 +++++++++++++ tools/libs/toollog/xtl_logger_stdio.c | 192 ++++++++++++++++++++++++++++++ tools/libxc/Makefile | 7 +- tools/libxc/include/xentoollog.h | 136 --------------------- tools/libxc/xtl_core.c | 83 ------------- tools/libxc/xtl_logger_stdio.c | 192 ------------------------------ tools/libxl/Makefile | 15 ++- tools/ocaml/libs/xentoollog/Makefile | 6 +- tools/ocaml/libs/xentoollog/genlevels.py | 2 +- tools/python/setup.py | 5 +- tools/xenpaging/Makefile | 2 +- 21 files changed, 552 insertions(+), 440 deletions(-) diff --git a/.gitignore b/.gitignore index 91e1430..a2c85e1 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,7 @@ stubdom/gcc-* stubdom/include stubdom/ioemu stubdom/xenstore +stubdom/libxentoollog-* stubdom/libxc-* stubdom/lwip-* stubdom/mini-os-* diff --git a/Config.mk b/Config.mk index 216a642..8fc7767 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= bccd90071e863ec22216a000f1a07035e2f226ff -# Mon Nov 23 16:34:31 2015 +0000 -# Add a .gitignore +MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd +# Thu Dec 3 11:23:25 2015 +0000 +# mini-os: Include libxentoollog with libxc SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 # Tue Nov 17 09:18:44 2015 -0500 @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 -# Wed Dec 9 11:47:35 2015 +0000 -# net: pcnet: add check to validate receive data size(CVE-2015-7504) +QEMU_TRADITIONAL_REVISION ?= 9fad9ed285835caef64bb8dab352e287ad8538c2 +# Thu Dec 3 11:23:16 2015 +0000 +# qemu-xen-traditional: Use xentoollog as a separate library # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. diff --git a/stubdom/Makefile b/stubdom/Makefile index e1359cf..9c923dd 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -313,6 +313,11 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) ln -sf $(wildcard $(XEN_ROOT)/tools/include/xen-foreign/*) include/xen-foreign/ && \ $(MAKE) DESTDIR= -C include/xen-foreign/ && \ ( [ -h include/xen/foreign ] || ln -sf ../xen-foreign include/xen/foreign ) + mkdir -p libs-$(XEN_TARGET_ARCH)/toollog + [ -h libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || ( cd libs-$(XEN_TARGET_ARCH)/toollog && \ + ln -sf $(XEN_ROOT)/tools/libs/toollog/include/*.h . && \ + ln -sf $(XEN_ROOT)/tools/libs/toollog/*.c . && \ + ln -sf $(XEN_ROOT)/tools/libs/toollog/Makefile . ) mkdir -p libxc-$(XEN_TARGET_ARCH) [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \ ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \ @@ -336,12 +341,23 @@ $(TARGETS_MINIOS): mini-os-%: done ####### +# libxentoollog +####### + +.PHONY: libxentoollog +libxentoollog: libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a +libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a: $(NEWLIB_STAMPFILE) + $(MAKE) -C $(XEN_ROOT)/tools/include + $(MAKE) DESTDIR= -C $(MINI_OS) links + CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog + +####### # libxc ####### .PHONY: libxc libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a -libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib +libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: libxentoollog cross-zlib $(MAKE) -C $(XEN_ROOT)/tools/include $(MAKE) DESTDIR= -C $(MINI_OS) links CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH) @@ -515,6 +531,11 @@ clean: $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) rm -f $(STUBDOMPATH) + [ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean + [ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean + [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean + [ ! -e libs-$(XEN_TARGET_ARCH)/call/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/call clean + [ ! -e libs-$(XEN_TARGET_ARCH)/foreignmemory/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/foreignmemory clean [ ! -e libxc-$(XEN_TARGET_ARCH)/Makefile ] || $(MAKE) DESTDIR= -C libxc-$(XEN_TARGET_ARCH) clean -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean @@ -525,6 +546,7 @@ crossclean: clean rm -fr $(CROSS_ROOT) rm -fr newlib-$(XEN_TARGET_ARCH) rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) + rm -fr libs-$(XEN_TARGET_ARCH) rm -fr libxc-$(XEN_TARGET_ARCH) ioemu xenstore rm -fr gmp-$(XEN_TARGET_ARCH) rm -fr polarssl-$(XEN_TARGET_ARCH) diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile index 934cc4c..26dff45 100644 --- a/stubdom/grub/Makefile +++ b/stubdom/grub/Makefile @@ -5,6 +5,7 @@ vpath %.c ../grub-upstream BOOT=$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o +DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libs/toollog/include DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/include -I. DEF_CPPFLAGS += -I../grub-upstream/stage1 DEF_CPPFLAGS += -I../grub-upstream/stage2 diff --git a/tools/Makefile b/tools/Makefile index 820ca40..9f74ac7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,6 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := SUBDIRS-y += include +SUBDIRS-y += libs SUBDIRS-y += libxc SUBDIRS-$(FLASK_ENABLE) += flask SUBDIRS-y += xenstore @@ -248,12 +249,14 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --includedir=$(LIBEXEC_INC) \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ + -I$(XEN_ROOT)/tools/libs/toollog/include \ -I$(XEN_ROOT)/tools/libxc/include \ -I$(XEN_ROOT)/tools/xenstore/include \ -I$(XEN_ROOT)/tools/xenstore/compat/include \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore \ + -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \ $(QEMU_UPSTREAM_RPATH)" \ --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ diff --git a/tools/Rules.mk b/tools/Rules.mk index 37b0aaf..0652e4b 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -10,6 +10,7 @@ export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install XEN_INCLUDE = $(XEN_ROOT)/tools/include +XEN_LIBXENTOOLLOG = $(XEN_ROOT)/tools/libs/toollog XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore @@ -76,10 +77,15 @@ endif # Consumers of libfoo should not directly use $(SHDEPS_libfoo) or # $(SHLIB_libfoo) -CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) -SHDEPS_libxenctrl = -LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) -SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) +CFLAGS_libxentoollog = -I$(XEN_LIBXENTOOLLOG)/include $(CFLAGS_xeninclude) +SHDEPS_libxentoollog = +LDLIBS_libxentoollog = $(XEN_LIBXENTOOLLOG)/libxentoollog$(libextension) +SHLIB_libxentoollog = -Wl,-rpath-link=$(XEN_LIBXENTOOLLOG) + +CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_xeninclude) +SHDEPS_libxenctrl = $(SHLIB_libxentoollog) +LDLIBS_libxenctrl = $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libextension) +SHLIB_libxenctrl = $(SHDEPS_libxenctrl) -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) SHDEPS_libxenguest = diff --git a/tools/libs/Makefile b/tools/libs/Makefile new file mode 100644 index 0000000..73be500 --- /dev/null +++ b/tools/libs/Makefile @@ -0,0 +1,7 @@ +XEN_ROOT = $(CURDIR)/../.. +include $(XEN_ROOT)/tools/Rules.mk + +SUBDIRS-y := +SUBDIRS-y += toollog + +all clean install distclean: %: subdirs-% diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile new file mode 100644 index 0000000..bd12403 --- /dev/null +++ b/tools/libs/toollog/Makefile @@ -0,0 +1,59 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +MAJOR = 1 +MINOR = 0 +SHLIB_LDFLAGS += -Wl,--version-script=libxentoollog.map + +CFLAGS += -Werror -Wmissing-prototypes +CFLAGS += -I./include + +SRCS-y += xtl_core.c +SRCS-y += xtl_logger_stdio.c + +LIB_OBJS := $(patsubst %.c,%.o,$(SRCS-y)) +PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS-y)) + +LIB := libxentoollog.a +ifneq ($(nosharedlibs),y) +LIB += libxentoollog.so +endif + +.PHONY: all +all: build + +.PHONY: build +build: + $(MAKE) libs + +.PHONY: libs +libs: $(LIB) + +libxentoollog.a: $(LIB_OBJS) + $(AR) rc $@ $^ + +libxentoollog.so: libxentoollog.so.$(MAJOR) + $(SYMLINK_SHLIB) $< $@ +libxentoollog.so.$(MAJOR): libxentoollog.so.$(MAJOR).$(MINOR) + $(SYMLINK_SHLIB) $< $@ + +libxentoollog.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map + $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) + +.PHONY: install +install: build + $(INSTALL_DIR) $(DESTDIR)$(libdir) + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxentoollog.a $(DESTDIR)$(libdir) + $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR) + $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoollog.so + $(INSTALL_DATA) include/xentoollog.h $(DESTDIR)$(includedir) + +.PHONY: TAGS +TAGS: + etags -t *.c *.h + +.PHONY: clean +clean: + rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) diff --git a/tools/libs/toollog/include/xentoollog.h b/tools/libs/toollog/include/xentoollog.h new file mode 100644 index 0000000..853e9c7 --- /dev/null +++ b/tools/libs/toollog/include/xentoollog.h @@ -0,0 +1,136 @@ +/* + * xentoollog.h + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#ifndef XENTOOLLOG_H +#define XENTOOLLOG_H + +#include +#include + + +/*---------- common declarations and types ----------*/ + +typedef enum xentoollog_level { + XTL_NONE, /* sentinel etc, never used for logging */ + XTL_DEBUG, + XTL_VERBOSE, + XTL_DETAIL, + XTL_PROGRESS, /* also used for "progress" messages */ + XTL_INFO, + XTL_NOTICE, + XTL_WARN, + XTL_ERROR, + XTL_CRITICAL, + XTL_NUM_LEVELS +} xentoollog_level; + +typedef struct xentoollog_logger xentoollog_logger; +struct xentoollog_logger { + void (*vmessage)(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xl", may be 0 */, + const char *format /* without level, context, \n */, + va_list al) + __attribute__((format(printf,5,0))); + void (*progress)(struct xentoollog_logger *logger, + const char *context /* see above */, + const char *doing_what /* no \r,\n */, + int percent, unsigned long done, unsigned long total) + /* null function pointer is ok. + * will always be called with done==0 for each new + * context/doing_what */; + void (*destroy)(struct xentoollog_logger *logger); + /* each logger can put its necessary data here */ +}; + + +/*---------- facilities for consuming log messages ----------*/ + +#define XTL_STDIOSTREAM_SHOW_PID 001u +#define XTL_STDIOSTREAM_SHOW_DATE 002u +#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u +#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ +#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ + +typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags); + /* may return 0 if malloc fails, in which case error was logged */ + /* destroy on this logger does not close the file */ + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, + xentoollog_level min_level); +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, + unsigned set_flags, unsigned clear_flags); + /* if set_flags and clear_flags overlap, set_flags takes precedence */ + +void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); + + +/*---------- facilities for generating log messages ----------*/ + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl", may be 0 */, + const char *format /* does not contain \n */, + va_list) __attribute__((format(printf,5,0))); + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) __attribute__((format(printf,5,6))); + +void xtl_progress(struct xentoollog_logger *logger, + const char *context /* see above, may be 0 */, + const char *doing_what, + unsigned long done, unsigned long total); + + +/*---------- facilities for defining log message consumers ----------*/ + +const char *xtl_level_to_string(xentoollog_level); /* never fails */ + + +#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ + xentoollog_logger_##LOGGER *new_consumer; \ + \ + (buffer).vtable.vmessage = LOGGER##_vmessage; \ + (buffer).vtable.progress = LOGGER##_progress; \ + (buffer).vtable.destroy = LOGGER##_destroy; \ + \ + new_consumer = malloc(sizeof(*new_consumer)); \ + if (!new_consumer) { \ + xtl_log((xentoollog_logger*)&buffer, \ + XTL_CRITICAL, errno, "xtl", \ + "failed to allocate memory for new message logger"); \ + } else { \ + *new_consumer = buffer; \ + } \ + \ + new_consumer; \ +}); + + +#endif /* XENTOOLLOG_H */ diff --git a/tools/libs/toollog/libxentoollog.map b/tools/libs/toollog/libxentoollog.map new file mode 100644 index 0000000..c183cf5 --- /dev/null +++ b/tools/libs/toollog/libxentoollog.map @@ -0,0 +1,12 @@ +VERS_1.0 { + global: + xtl_createlogger_stdiostream; + xtl_level_to_string; + xtl_log; + xtl_logger_destroy; + xtl_logv; + xtl_progress; + xtl_stdiostream_adjust_flags; + xtl_stdiostream_set_minlevel; + local: *; /* Do not expose anything by default */ +}; diff --git a/tools/libs/toollog/xtl_core.c b/tools/libs/toollog/xtl_core.c new file mode 100644 index 0000000..c4724a0 --- /dev/null +++ b/tools/libs/toollog/xtl_core.c @@ -0,0 +1,83 @@ +/* + * xtl_core.c + * + * core code including functions for generating log messages + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include + +static const char *level_strings[XTL_NUM_LEVELS]= { + "[BUG:XTL_NONE]", + "debug", "verbose", "detail", /* normally off by default */ + "progress", "info", "notice", /* not a problem */ + "warning", "error", "critical" /* problems and errors */ +}; + +const char *xtl_level_to_string(xentoollog_level level) { + assert(level >= 0 && level < XTL_NUM_LEVELS); + return level_strings[level]; +} + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + va_list al) { + int errno_save = errno; + assert(level > XTL_NONE && level < XTL_NUM_LEVELS); + logger->vmessage(logger,level,errnoval,context,format,al); + errno = errno_save; +} + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) { + va_list al; + va_start(al,format); + xtl_logv(logger,level,errnoval,context,format,al); + va_end(al); +} + +void xtl_progress(struct xentoollog_logger *logger, + const char *context, const char *doing_what, + unsigned long done, unsigned long total) { + int percent = 0; + + if (!logger->progress) return; + + if ( total ) + percent = (total < LONG_MAX/100) + ? (done * 100) / total + : done / ((total + 99) / 100); + + logger->progress(logger, context, doing_what, percent, done, total); +} + +void xtl_logger_destroy(struct xentoollog_logger *logger) { + if (!logger) return; + logger->destroy(logger); +} diff --git a/tools/libs/toollog/xtl_logger_stdio.c b/tools/libs/toollog/xtl_logger_stdio.c new file mode 100644 index 0000000..0cd9206 --- /dev/null +++ b/tools/libs/toollog/xtl_logger_stdio.c @@ -0,0 +1,192 @@ +/* + * xtl_logger_stdio.c + * + * log message consumer that writes to stdio + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include +#include +#include +#include + +struct xentoollog_logger_stdiostream { + xentoollog_logger vtable; + FILE *f; + xentoollog_level min_level; + unsigned flags; + int progress_erase_len, progress_last_percent; + bool progress_use_cr; +}; + +static void progress_erase(xentoollog_logger_stdiostream *lg) { + if (lg->progress_erase_len) + fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); +} + +static void stdiostream_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + + if (level < lg->min_level) + return; + + progress_erase(lg); + + if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { + struct tm lt_buf; + time_t now = time(0); + struct tm *lt= localtime_r(&now, <_buf); + if (lt != NULL) + fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", + lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, + lt->tm_hour, lt->tm_min, lt->tm_sec, + tzname[!!lt->tm_isdst]); + else + fprintf(lg->f, "[localtime_r failed: %d] ", errno); + } + if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) + fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); + + if (context) + fprintf(lg->f, "%s: ", context); + + fprintf(lg->f, "%s: ", xtl_level_to_string(level)); + + vfprintf(lg->f, format, al); + + if (errnoval >= 0) + fprintf(lg->f, ": %s", strerror(errnoval)); + + putc('\n', lg->f); + fflush(lg->f); +} + +static void stdiostream_message(struct xentoollog_logger *logger_in, + xentoollog_level level, + const char *context, + const char *format, ...) +{ + va_list al; + va_start(al,format); + stdiostream_vmessage(logger_in, level, -1, context, format, al); + va_end(al); +} + +static void stdiostream_progress(struct xentoollog_logger *logger_in, + const char *context, + const char *doing_what, int percent, + unsigned long done, unsigned long total) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + int newpel, extra_erase; + xentoollog_level this_level; + + if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + return; + + if (percent < lg->progress_last_percent) { + this_level = XTL_PROGRESS; + } else if (percent == lg->progress_last_percent) { + return; + } else if (percent < lg->progress_last_percent + 5) { + this_level = XTL_DETAIL; + } else { + this_level = XTL_PROGRESS; + } + + if (this_level < lg->min_level) + return; + + lg->progress_last_percent = percent; + + if (!lg->progress_use_cr) { + stdiostream_message(logger_in, this_level, context, + "%s: %lu/%lu %3d%%", + doing_what, done, total, percent); + return; + } + + if (lg->progress_erase_len) + putc('\r', lg->f); + + newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", + context?context:"", context?": ":"", + doing_what, done, total, percent, + done == total ? "\n" : ""); + + extra_erase = lg->progress_erase_len - newpel; + if (extra_erase > 0) + fprintf(lg->f, "%*s\r", extra_erase, ""); + + lg->progress_erase_len = newpel; +} + +static void stdiostream_destroy(struct xentoollog_logger *logger_in) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + progress_erase(lg); + free(lg); +} + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, + xentoollog_level min_level) { + lg->min_level = min_level; +} + +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, + unsigned set_flags, unsigned clear_flags) { + unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; + if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + progress_erase(lg); + lg->flags = new_flags; +} + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags) { + xentoollog_logger_stdiostream newlogger; + + newlogger.f = f; + newlogger.min_level = min_level; + newlogger.flags = flags; + + switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | + XTL_STDIOSTREAM_PROGRESS_NO_CR)) { + case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; + case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; + case 0: + newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; + break; + default: + errno = EINVAL; + return 0; + } + + if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); + + newlogger.progress_erase_len = 0; + newlogger.progress_last_percent = 0; + + return XTL_NEW_LOGGER(stdiostream, newlogger); +} diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 818f2e4..940708f 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -39,8 +39,6 @@ CTRL_SRCS-y += xc_memshr.c CTRL_SRCS-y += xc_hcall_buf.c CTRL_SRCS-y += xc_foreign_memory.c CTRL_SRCS-y += xc_kexec.c -CTRL_SRCS-y += xtl_core.c -CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-y += xc_resource.c CTRL_SRCS-$(CONFIG_X86) += xc_psr.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c @@ -112,6 +110,7 @@ CFLAGS += -I. -I./include $(CFLAGS_xeninclude) CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE CFLAGS += $(PTHREAD_CFLAGS) +CFLAGS += $(CFLAGS_libxentoollog) CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y)) CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y)) @@ -165,7 +164,7 @@ install: build $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so - $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) @@ -208,7 +207,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) # libxenguest diff --git a/tools/libxc/include/xentoollog.h b/tools/libxc/include/xentoollog.h deleted file mode 100644 index 853e9c7..0000000 --- a/tools/libxc/include/xentoollog.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * xentoollog.h - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#ifndef XENTOOLLOG_H -#define XENTOOLLOG_H - -#include -#include - - -/*---------- common declarations and types ----------*/ - -typedef enum xentoollog_level { - XTL_NONE, /* sentinel etc, never used for logging */ - XTL_DEBUG, - XTL_VERBOSE, - XTL_DETAIL, - XTL_PROGRESS, /* also used for "progress" messages */ - XTL_INFO, - XTL_NOTICE, - XTL_WARN, - XTL_ERROR, - XTL_CRITICAL, - XTL_NUM_LEVELS -} xentoollog_level; - -typedef struct xentoollog_logger xentoollog_logger; -struct xentoollog_logger { - void (*vmessage)(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xl", may be 0 */, - const char *format /* without level, context, \n */, - va_list al) - __attribute__((format(printf,5,0))); - void (*progress)(struct xentoollog_logger *logger, - const char *context /* see above */, - const char *doing_what /* no \r,\n */, - int percent, unsigned long done, unsigned long total) - /* null function pointer is ok. - * will always be called with done==0 for each new - * context/doing_what */; - void (*destroy)(struct xentoollog_logger *logger); - /* each logger can put its necessary data here */ -}; - - -/*---------- facilities for consuming log messages ----------*/ - -#define XTL_STDIOSTREAM_SHOW_PID 001u -#define XTL_STDIOSTREAM_SHOW_DATE 002u -#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u -#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ -#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ - -typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags); - /* may return 0 if malloc fails, in which case error was logged */ - /* destroy on this logger does not close the file */ - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, - xentoollog_level min_level); -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, - unsigned set_flags, unsigned clear_flags); - /* if set_flags and clear_flags overlap, set_flags takes precedence */ - -void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); - - -/*---------- facilities for generating log messages ----------*/ - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl", may be 0 */, - const char *format /* does not contain \n */, - va_list) __attribute__((format(printf,5,0))); - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) __attribute__((format(printf,5,6))); - -void xtl_progress(struct xentoollog_logger *logger, - const char *context /* see above, may be 0 */, - const char *doing_what, - unsigned long done, unsigned long total); - - -/*---------- facilities for defining log message consumers ----------*/ - -const char *xtl_level_to_string(xentoollog_level); /* never fails */ - - -#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ - xentoollog_logger_##LOGGER *new_consumer; \ - \ - (buffer).vtable.vmessage = LOGGER##_vmessage; \ - (buffer).vtable.progress = LOGGER##_progress; \ - (buffer).vtable.destroy = LOGGER##_destroy; \ - \ - new_consumer = malloc(sizeof(*new_consumer)); \ - if (!new_consumer) { \ - xtl_log((xentoollog_logger*)&buffer, \ - XTL_CRITICAL, errno, "xtl", \ - "failed to allocate memory for new message logger"); \ - } else { \ - *new_consumer = buffer; \ - } \ - \ - new_consumer; \ -}); - - -#endif /* XENTOOLLOG_H */ diff --git a/tools/libxc/xtl_core.c b/tools/libxc/xtl_core.c deleted file mode 100644 index c4724a0..0000000 --- a/tools/libxc/xtl_core.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * xtl_core.c - * - * core code including functions for generating log messages - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include - -static const char *level_strings[XTL_NUM_LEVELS]= { - "[BUG:XTL_NONE]", - "debug", "verbose", "detail", /* normally off by default */ - "progress", "info", "notice", /* not a problem */ - "warning", "error", "critical" /* problems and errors */ -}; - -const char *xtl_level_to_string(xentoollog_level level) { - assert(level >= 0 && level < XTL_NUM_LEVELS); - return level_strings[level]; -} - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - va_list al) { - int errno_save = errno; - assert(level > XTL_NONE && level < XTL_NUM_LEVELS); - logger->vmessage(logger,level,errnoval,context,format,al); - errno = errno_save; -} - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) { - va_list al; - va_start(al,format); - xtl_logv(logger,level,errnoval,context,format,al); - va_end(al); -} - -void xtl_progress(struct xentoollog_logger *logger, - const char *context, const char *doing_what, - unsigned long done, unsigned long total) { - int percent = 0; - - if (!logger->progress) return; - - if ( total ) - percent = (total < LONG_MAX/100) - ? (done * 100) / total - : done / ((total + 99) / 100); - - logger->progress(logger, context, doing_what, percent, done, total); -} - -void xtl_logger_destroy(struct xentoollog_logger *logger) { - if (!logger) return; - logger->destroy(logger); -} diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c deleted file mode 100644 index 0cd9206..0000000 --- a/tools/libxc/xtl_logger_stdio.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * xtl_logger_stdio.c - * - * log message consumer that writes to stdio - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include -#include -#include -#include - -struct xentoollog_logger_stdiostream { - xentoollog_logger vtable; - FILE *f; - xentoollog_level min_level; - unsigned flags; - int progress_erase_len, progress_last_percent; - bool progress_use_cr; -}; - -static void progress_erase(xentoollog_logger_stdiostream *lg) { - if (lg->progress_erase_len) - fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); -} - -static void stdiostream_vmessage(xentoollog_logger *logger_in, - xentoollog_level level, - int errnoval, - const char *context, - const char *format, - va_list al) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - - if (level < lg->min_level) - return; - - progress_erase(lg); - - if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { - struct tm lt_buf; - time_t now = time(0); - struct tm *lt= localtime_r(&now, <_buf); - if (lt != NULL) - fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", - lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, - lt->tm_hour, lt->tm_min, lt->tm_sec, - tzname[!!lt->tm_isdst]); - else - fprintf(lg->f, "[localtime_r failed: %d] ", errno); - } - if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) - fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); - - if (context) - fprintf(lg->f, "%s: ", context); - - fprintf(lg->f, "%s: ", xtl_level_to_string(level)); - - vfprintf(lg->f, format, al); - - if (errnoval >= 0) - fprintf(lg->f, ": %s", strerror(errnoval)); - - putc('\n', lg->f); - fflush(lg->f); -} - -static void stdiostream_message(struct xentoollog_logger *logger_in, - xentoollog_level level, - const char *context, - const char *format, ...) -{ - va_list al; - va_start(al,format); - stdiostream_vmessage(logger_in, level, -1, context, format, al); - va_end(al); -} - -static void stdiostream_progress(struct xentoollog_logger *logger_in, - const char *context, - const char *doing_what, int percent, - unsigned long done, unsigned long total) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - int newpel, extra_erase; - xentoollog_level this_level; - - if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - return; - - if (percent < lg->progress_last_percent) { - this_level = XTL_PROGRESS; - } else if (percent == lg->progress_last_percent) { - return; - } else if (percent < lg->progress_last_percent + 5) { - this_level = XTL_DETAIL; - } else { - this_level = XTL_PROGRESS; - } - - if (this_level < lg->min_level) - return; - - lg->progress_last_percent = percent; - - if (!lg->progress_use_cr) { - stdiostream_message(logger_in, this_level, context, - "%s: %lu/%lu %3d%%", - doing_what, done, total, percent); - return; - } - - if (lg->progress_erase_len) - putc('\r', lg->f); - - newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", - context?context:"", context?": ":"", - doing_what, done, total, percent, - done == total ? "\n" : ""); - - extra_erase = lg->progress_erase_len - newpel; - if (extra_erase > 0) - fprintf(lg->f, "%*s\r", extra_erase, ""); - - lg->progress_erase_len = newpel; -} - -static void stdiostream_destroy(struct xentoollog_logger *logger_in) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - progress_erase(lg); - free(lg); -} - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, - xentoollog_level min_level) { - lg->min_level = min_level; -} - -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, - unsigned set_flags, unsigned clear_flags) { - unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; - if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - progress_erase(lg); - lg->flags = new_flags; -} - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags) { - xentoollog_logger_stdiostream newlogger; - - newlogger.f = f; - newlogger.min_level = min_level; - newlogger.flags = flags; - - switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | - XTL_STDIOSTREAM_PROGRESS_NO_CR)) { - case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; - case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; - case 0: - newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; - break; - default: - errno = EINVAL; - return 0; - } - - if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); - - newlogger.progress_erase_len = 0; - newlogger.progress_last_percent = 0; - - return XTL_NEW_LOGGER(stdiostream, newlogger); -} diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 6ff5bee..2abae0c 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -20,11 +20,12 @@ LIBUUID_LIBS += -luuid endif LIBXL_LIBS = -LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) ifeq ($(CONFIG_REMUS_NETBUF),y) LIBXL_LIBS += $(LIBNL3_LIBS) endif +CFLAGS_LIBXL += $(CFLAGS_libxentoollog) CFLAGS_LIBXL += $(CFLAGS_libxenctrl) CFLAGS_LIBXL += $(CFLAGS_libxenguest) CFLAGS_LIBXL += $(CFLAGS_libxenstore) @@ -149,7 +150,7 @@ CFLAGS_XL += -Wshadow XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ - CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h + CFLAGS += $(CFLAGS_libxentoollog) $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. @@ -253,19 +254,19 @@ libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ xl: $(XL_OBJS) libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) testidl: testidl.o libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) $(PKG_CONFIG): % : %.in Makefile @sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < $< > $@.new diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile index 666eb66..8ae0a78 100644 --- a/tools/ocaml/libs/xentoollog/Makefile +++ b/tools/ocaml/libs/xentoollog/Makefile @@ -5,7 +5,7 @@ include $(TOPLEVEL)/common.make # allow mixed declarations and code CFLAGS += -Wno-declaration-after-statement -CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) +CFLAGS += $(CFLAGS_libxentoollog) CFLAGS += $(APPEND_CFLAGS) OCAMLINCLUDE += @@ -13,7 +13,7 @@ OBJS = xentoollog INTF = xentoollog.cmi LIBS = xentoollog.cma xentoollog.cmxa -LIBS_xentoollog = $(LDLIBS_libxenctrl) +LIBS_xentoollog = $(LDLIBS_libxentoollog) xentoollog_OBJS = $(OBJS) xentoollog_C_OBJS = xentoollog_stubs @@ -49,7 +49,7 @@ xentoollog.mli: xentoollog.mli.in _xtl_levels.mli.in libs: $(LIBS) -_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libxc/include/xentoollog.h +_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libs/toollog/include/xentoollog.h $(PYTHON) genlevels.py _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc .PHONY: install diff --git a/tools/ocaml/libs/xentoollog/genlevels.py b/tools/ocaml/libs/xentoollog/genlevels.py index 65d334f..8c233c5 100755 --- a/tools/ocaml/libs/xentoollog/genlevels.py +++ b/tools/ocaml/libs/xentoollog/genlevels.py @@ -3,7 +3,7 @@ import sys def read_levels(): - f = open('../../../libxc/include/xentoollog.h', 'r') + f = open('../../../libs/toollog/include/xentoollog.h', 'r') levels = [] record = False diff --git a/tools/python/setup.py b/tools/python/setup.py index fdba866..9771cc4 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -7,16 +7,17 @@ XEN_ROOT = "../.." extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] PATH_XEN = XEN_ROOT + "/tools/include" +PATH_LIBXENTOOLLOG = XEN_ROOT + "/tools/libs/toollog" PATH_LIBXC = XEN_ROOT + "/tools/libxc" PATH_LIBXL = XEN_ROOT + "/tools/libxl" PATH_XENSTORE = XEN_ROOT + "/tools/xenstore" xc = Extension("xc", extra_compile_args = extra_compile_args, - include_dirs = [ PATH_XEN, PATH_LIBXC + "/include", "xen/lowlevel/xc" ], + include_dirs = [ PATH_XEN, PATH_LIBXENTOOLLOG + "/include", PATH_LIBXC + "/include", "xen/lowlevel/xc" ], library_dirs = [ PATH_LIBXC ], libraries = [ "xenctrl", "xenguest" ], - depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so" ], + depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so", "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ], sources = [ "xen/lowlevel/xc/xc.c" ]) xs = Extension("xs", diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index 2407a30..e63d894 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk # xenpaging.c and file_ops.c incorrectly use libxc internals CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS) -I$(XEN_ROOT)/tools/libxc -LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) +LDLIBS += $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) LDFLAGS += $(PTHREAD_LDFLAGS) POLICY = default -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xL-0000BY-Vz; Wed, 16 Dec 2015 04:44:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xK-0000BF-QI for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:50 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 32/E9-14900-14CE0765; Wed, 16 Dec 2015 04:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1450241086!1379933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31518 invoked from network); 16 Dec 2015 04:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:44:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xG-0005Sh-8p for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xG-0001e5-7J for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:46 +0000 Date: Wed, 16 Dec 2015 04:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff841cead287d7913901ba5c4e7628a6958b5bea Author: Jan Beulich AuthorDate: Wed Dec 9 13:53:13 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:53:13 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index b6bf543..efb6e1a 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -55,8 +55,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -75,8 +73,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- generated by git-patchbot for /home/xen/git/xen.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 16 04:44:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:44:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xL-0000BY-Vz; Wed, 16 Dec 2015 04:44:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xK-0000BF-QI for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:50 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 32/E9-14900-14CE0765; Wed, 16 Dec 2015 04:44:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1450241086!1379933!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31518 invoked from network); 16 Dec 2015 04:44:47 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:44:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xG-0005Sh-8p for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xG-0001e5-7J for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:46 +0000 Date: Wed, 16 Dec 2015 04:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] memory: fix XSA-158 fix X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ff841cead287d7913901ba5c4e7628a6958b5bea Author: Jan Beulich AuthorDate: Wed Dec 9 13:53:13 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 9 13:53:13 2015 +0100 memory: fix XSA-158 fix For one the uses of domu_max_order and ptdom_max_order were swapped. And then gcc warns about an unused result of a __must_check function in the control part of a conditional expression when both other expressions can be determined by the compiler to produce the same value (see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68039), which happens when HAS_PASSTHROUGH is undefined (i.e. for ARM on 4.4 and older). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/common/memory.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/xen/common/memory.c b/xen/common/memory.c index b6bf543..efb6e1a 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -55,8 +55,6 @@ static unsigned int __read_mostly ctldom_max_order = CONFIG_CTLDOM_MAX_ORDER; static unsigned int __read_mostly hwdom_max_order = CONFIG_HWDOM_MAX_ORDER; #ifdef HAS_PASSTHROUGH static unsigned int __read_mostly ptdom_max_order = CONFIG_PTDOM_MAX_ORDER; -#else -# define ptdom_max_order domu_max_order #endif static void __init parse_max_order(const char *s) { @@ -75,8 +73,12 @@ custom_param("memop-max-order", parse_max_order); static unsigned int max_order(const struct domain *d) { - unsigned int order = cache_flush_permitted(d) ? domu_max_order - : ptdom_max_order; + unsigned int order = domu_max_order; + +#ifdef HAS_PASSTHROUGH + if ( cache_flush_permitted(d) && order < ptdom_max_order ) + order = ptdom_max_order; +#endif if ( is_control_domain(d) && order < ctldom_max_order ) order = ctldom_max_order; -- generated by git-patchbot for /home/xen/git/xen.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 16 04:45:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xW-0000DT-5y; Wed, 16 Dec 2015 04:45:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xU-0000D3-GJ for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:00 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 0F/4E-24494-B4CE0765; Wed, 16 Dec 2015 04:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1450241096!10998359!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30297 invoked from network); 16 Dec 2015 04:44:57 -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; 16 Dec 2015 04:44:57 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xQ-0005Sp-MJ for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xQ-0001ek-GP for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:56 +0000 Date: Wed, 16 Dec 2015 04:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "tools: Refactor "xentoollog" into its own library" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec0712576198633dd7fbfe25290b030d5a23b252 Author: Ian Campbell AuthorDate: Thu Dec 10 10:21:34 2015 +0000 Commit: Ian Campbell CommitDate: Thu Dec 10 10:21:34 2015 +0000 Revert "tools: Refactor "xentoollog" into its own library" This reverts commit c7d3afbb44b47af9103be0b914afd588a84d9e62 which broke the libvirt build, since libvirt uses xtl_* and hence needs updating to link against the new library when necessary. Signed-off-by: Ian Campbell --- .gitignore | 1 - Config.mk | 12 +- stubdom/Makefile | 24 +---- stubdom/grub/Makefile | 1 - tools/Makefile | 3 - tools/Rules.mk | 14 +-- tools/libs/Makefile | 7 - tools/libs/toollog/Makefile | 59 --------- tools/libs/toollog/include/xentoollog.h | 136 --------------------- tools/libs/toollog/libxentoollog.map | 12 -- tools/libs/toollog/xtl_core.c | 83 ------------- tools/libs/toollog/xtl_logger_stdio.c | 192 ------------------------------ tools/libxc/Makefile | 7 +- tools/libxc/include/xentoollog.h | 136 +++++++++++++++++++++ tools/libxc/xtl_core.c | 83 +++++++++++++ tools/libxc/xtl_logger_stdio.c | 192 ++++++++++++++++++++++++++++++ tools/libxl/Makefile | 15 +-- tools/ocaml/libs/xentoollog/Makefile | 6 +- tools/ocaml/libs/xentoollog/genlevels.py | 2 +- tools/python/setup.py | 5 +- tools/xenpaging/Makefile | 2 +- 21 files changed, 440 insertions(+), 552 deletions(-) diff --git a/.gitignore b/.gitignore index a2c85e1..91e1430 100644 --- a/.gitignore +++ b/.gitignore @@ -58,7 +58,6 @@ stubdom/gcc-* stubdom/include stubdom/ioemu stubdom/xenstore -stubdom/libxentoollog-* stubdom/libxc-* stubdom/lwip-* stubdom/mini-os-* diff --git a/Config.mk b/Config.mk index 8fc7767..216a642 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd -# Thu Dec 3 11:23:25 2015 +0000 -# mini-os: Include libxentoollog with libxc +MINIOS_UPSTREAM_REVISION ?= bccd90071e863ec22216a000f1a07035e2f226ff +# Mon Nov 23 16:34:31 2015 +0000 +# Add a .gitignore SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 # Tue Nov 17 09:18:44 2015 -0500 @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 9fad9ed285835caef64bb8dab352e287ad8538c2 -# Thu Dec 3 11:23:16 2015 +0000 -# qemu-xen-traditional: Use xentoollog as a separate library +QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. diff --git a/stubdom/Makefile b/stubdom/Makefile index 9c923dd..e1359cf 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -313,11 +313,6 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) ln -sf $(wildcard $(XEN_ROOT)/tools/include/xen-foreign/*) include/xen-foreign/ && \ $(MAKE) DESTDIR= -C include/xen-foreign/ && \ ( [ -h include/xen/foreign ] || ln -sf ../xen-foreign include/xen/foreign ) - mkdir -p libs-$(XEN_TARGET_ARCH)/toollog - [ -h libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || ( cd libs-$(XEN_TARGET_ARCH)/toollog && \ - ln -sf $(XEN_ROOT)/tools/libs/toollog/include/*.h . && \ - ln -sf $(XEN_ROOT)/tools/libs/toollog/*.c . && \ - ln -sf $(XEN_ROOT)/tools/libs/toollog/Makefile . ) mkdir -p libxc-$(XEN_TARGET_ARCH) [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \ ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \ @@ -341,23 +336,12 @@ $(TARGETS_MINIOS): mini-os-%: done ####### -# libxentoollog -####### - -.PHONY: libxentoollog -libxentoollog: libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a -libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a: $(NEWLIB_STAMPFILE) - $(MAKE) -C $(XEN_ROOT)/tools/include - $(MAKE) DESTDIR= -C $(MINI_OS) links - CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog - -####### # libxc ####### .PHONY: libxc libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a -libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: libxentoollog cross-zlib +libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib $(MAKE) -C $(XEN_ROOT)/tools/include $(MAKE) DESTDIR= -C $(MINI_OS) links CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH) @@ -531,11 +515,6 @@ clean: $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) rm -f $(STUBDOMPATH) - [ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean - [ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean - [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean - [ ! -e libs-$(XEN_TARGET_ARCH)/call/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/call clean - [ ! -e libs-$(XEN_TARGET_ARCH)/foreignmemory/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/foreignmemory clean [ ! -e libxc-$(XEN_TARGET_ARCH)/Makefile ] || $(MAKE) DESTDIR= -C libxc-$(XEN_TARGET_ARCH) clean -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean @@ -546,7 +525,6 @@ crossclean: clean rm -fr $(CROSS_ROOT) rm -fr newlib-$(XEN_TARGET_ARCH) rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) - rm -fr libs-$(XEN_TARGET_ARCH) rm -fr libxc-$(XEN_TARGET_ARCH) ioemu xenstore rm -fr gmp-$(XEN_TARGET_ARCH) rm -fr polarssl-$(XEN_TARGET_ARCH) diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile index 26dff45..934cc4c 100644 --- a/stubdom/grub/Makefile +++ b/stubdom/grub/Makefile @@ -5,7 +5,6 @@ vpath %.c ../grub-upstream BOOT=$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o -DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libs/toollog/include DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/include -I. DEF_CPPFLAGS += -I../grub-upstream/stage1 DEF_CPPFLAGS += -I../grub-upstream/stage2 diff --git a/tools/Makefile b/tools/Makefile index 9f74ac7..820ca40 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := SUBDIRS-y += include -SUBDIRS-y += libs SUBDIRS-y += libxc SUBDIRS-$(FLASK_ENABLE) += flask SUBDIRS-y += xenstore @@ -249,14 +248,12 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --includedir=$(LIBEXEC_INC) \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ - -I$(XEN_ROOT)/tools/libs/toollog/include \ -I$(XEN_ROOT)/tools/libxc/include \ -I$(XEN_ROOT)/tools/xenstore/include \ -I$(XEN_ROOT)/tools/xenstore/compat/include \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \ $(QEMU_UPSTREAM_RPATH)" \ --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ diff --git a/tools/Rules.mk b/tools/Rules.mk index 0652e4b..37b0aaf 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -10,7 +10,6 @@ export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install XEN_INCLUDE = $(XEN_ROOT)/tools/include -XEN_LIBXENTOOLLOG = $(XEN_ROOT)/tools/libs/toollog XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore @@ -77,15 +76,10 @@ endif # Consumers of libfoo should not directly use $(SHDEPS_libfoo) or # $(SHLIB_libfoo) -CFLAGS_libxentoollog = -I$(XEN_LIBXENTOOLLOG)/include $(CFLAGS_xeninclude) -SHDEPS_libxentoollog = -LDLIBS_libxentoollog = $(XEN_LIBXENTOOLLOG)/libxentoollog$(libextension) -SHLIB_libxentoollog = -Wl,-rpath-link=$(XEN_LIBXENTOOLLOG) - -CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_xeninclude) -SHDEPS_libxenctrl = $(SHLIB_libxentoollog) -LDLIBS_libxenctrl = $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libextension) -SHLIB_libxenctrl = $(SHDEPS_libxenctrl) -Wl,-rpath-link=$(XEN_LIBXC) +CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) +SHDEPS_libxenctrl = +LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) +SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) SHDEPS_libxenguest = diff --git a/tools/libs/Makefile b/tools/libs/Makefile deleted file mode 100644 index 73be500..0000000 --- a/tools/libs/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -SUBDIRS-y := -SUBDIRS-y += toollog - -all clean install distclean: %: subdirs-% diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile deleted file mode 100644 index bd12403..0000000 --- a/tools/libs/toollog/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -MAJOR = 1 -MINOR = 0 -SHLIB_LDFLAGS += -Wl,--version-script=libxentoollog.map - -CFLAGS += -Werror -Wmissing-prototypes -CFLAGS += -I./include - -SRCS-y += xtl_core.c -SRCS-y += xtl_logger_stdio.c - -LIB_OBJS := $(patsubst %.c,%.o,$(SRCS-y)) -PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS-y)) - -LIB := libxentoollog.a -ifneq ($(nosharedlibs),y) -LIB += libxentoollog.so -endif - -.PHONY: all -all: build - -.PHONY: build -build: - $(MAKE) libs - -.PHONY: libs -libs: $(LIB) - -libxentoollog.a: $(LIB_OBJS) - $(AR) rc $@ $^ - -libxentoollog.so: libxentoollog.so.$(MAJOR) - $(SYMLINK_SHLIB) $< $@ -libxentoollog.so.$(MAJOR): libxentoollog.so.$(MAJOR).$(MINOR) - $(SYMLINK_SHLIB) $< $@ - -libxentoollog.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) - -.PHONY: install -install: build - $(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) - $(INSTALL_DATA) libxentoollog.a $(DESTDIR)$(libdir) - $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR) - $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoollog.so - $(INSTALL_DATA) include/xentoollog.h $(DESTDIR)$(includedir) - -.PHONY: TAGS -TAGS: - etags -t *.c *.h - -.PHONY: clean -clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) diff --git a/tools/libs/toollog/include/xentoollog.h b/tools/libs/toollog/include/xentoollog.h deleted file mode 100644 index 853e9c7..0000000 --- a/tools/libs/toollog/include/xentoollog.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * xentoollog.h - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#ifndef XENTOOLLOG_H -#define XENTOOLLOG_H - -#include -#include - - -/*---------- common declarations and types ----------*/ - -typedef enum xentoollog_level { - XTL_NONE, /* sentinel etc, never used for logging */ - XTL_DEBUG, - XTL_VERBOSE, - XTL_DETAIL, - XTL_PROGRESS, /* also used for "progress" messages */ - XTL_INFO, - XTL_NOTICE, - XTL_WARN, - XTL_ERROR, - XTL_CRITICAL, - XTL_NUM_LEVELS -} xentoollog_level; - -typedef struct xentoollog_logger xentoollog_logger; -struct xentoollog_logger { - void (*vmessage)(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xl", may be 0 */, - const char *format /* without level, context, \n */, - va_list al) - __attribute__((format(printf,5,0))); - void (*progress)(struct xentoollog_logger *logger, - const char *context /* see above */, - const char *doing_what /* no \r,\n */, - int percent, unsigned long done, unsigned long total) - /* null function pointer is ok. - * will always be called with done==0 for each new - * context/doing_what */; - void (*destroy)(struct xentoollog_logger *logger); - /* each logger can put its necessary data here */ -}; - - -/*---------- facilities for consuming log messages ----------*/ - -#define XTL_STDIOSTREAM_SHOW_PID 001u -#define XTL_STDIOSTREAM_SHOW_DATE 002u -#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u -#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ -#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ - -typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags); - /* may return 0 if malloc fails, in which case error was logged */ - /* destroy on this logger does not close the file */ - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, - xentoollog_level min_level); -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, - unsigned set_flags, unsigned clear_flags); - /* if set_flags and clear_flags overlap, set_flags takes precedence */ - -void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); - - -/*---------- facilities for generating log messages ----------*/ - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl", may be 0 */, - const char *format /* does not contain \n */, - va_list) __attribute__((format(printf,5,0))); - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) __attribute__((format(printf,5,6))); - -void xtl_progress(struct xentoollog_logger *logger, - const char *context /* see above, may be 0 */, - const char *doing_what, - unsigned long done, unsigned long total); - - -/*---------- facilities for defining log message consumers ----------*/ - -const char *xtl_level_to_string(xentoollog_level); /* never fails */ - - -#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ - xentoollog_logger_##LOGGER *new_consumer; \ - \ - (buffer).vtable.vmessage = LOGGER##_vmessage; \ - (buffer).vtable.progress = LOGGER##_progress; \ - (buffer).vtable.destroy = LOGGER##_destroy; \ - \ - new_consumer = malloc(sizeof(*new_consumer)); \ - if (!new_consumer) { \ - xtl_log((xentoollog_logger*)&buffer, \ - XTL_CRITICAL, errno, "xtl", \ - "failed to allocate memory for new message logger"); \ - } else { \ - *new_consumer = buffer; \ - } \ - \ - new_consumer; \ -}); - - -#endif /* XENTOOLLOG_H */ diff --git a/tools/libs/toollog/libxentoollog.map b/tools/libs/toollog/libxentoollog.map deleted file mode 100644 index c183cf5..0000000 --- a/tools/libs/toollog/libxentoollog.map +++ /dev/null @@ -1,12 +0,0 @@ -VERS_1.0 { - global: - xtl_createlogger_stdiostream; - xtl_level_to_string; - xtl_log; - xtl_logger_destroy; - xtl_logv; - xtl_progress; - xtl_stdiostream_adjust_flags; - xtl_stdiostream_set_minlevel; - local: *; /* Do not expose anything by default */ -}; diff --git a/tools/libs/toollog/xtl_core.c b/tools/libs/toollog/xtl_core.c deleted file mode 100644 index c4724a0..0000000 --- a/tools/libs/toollog/xtl_core.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * xtl_core.c - * - * core code including functions for generating log messages - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include - -static const char *level_strings[XTL_NUM_LEVELS]= { - "[BUG:XTL_NONE]", - "debug", "verbose", "detail", /* normally off by default */ - "progress", "info", "notice", /* not a problem */ - "warning", "error", "critical" /* problems and errors */ -}; - -const char *xtl_level_to_string(xentoollog_level level) { - assert(level >= 0 && level < XTL_NUM_LEVELS); - return level_strings[level]; -} - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - va_list al) { - int errno_save = errno; - assert(level > XTL_NONE && level < XTL_NUM_LEVELS); - logger->vmessage(logger,level,errnoval,context,format,al); - errno = errno_save; -} - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) { - va_list al; - va_start(al,format); - xtl_logv(logger,level,errnoval,context,format,al); - va_end(al); -} - -void xtl_progress(struct xentoollog_logger *logger, - const char *context, const char *doing_what, - unsigned long done, unsigned long total) { - int percent = 0; - - if (!logger->progress) return; - - if ( total ) - percent = (total < LONG_MAX/100) - ? (done * 100) / total - : done / ((total + 99) / 100); - - logger->progress(logger, context, doing_what, percent, done, total); -} - -void xtl_logger_destroy(struct xentoollog_logger *logger) { - if (!logger) return; - logger->destroy(logger); -} diff --git a/tools/libs/toollog/xtl_logger_stdio.c b/tools/libs/toollog/xtl_logger_stdio.c deleted file mode 100644 index 0cd9206..0000000 --- a/tools/libs/toollog/xtl_logger_stdio.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * xtl_logger_stdio.c - * - * log message consumer that writes to stdio - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include -#include -#include -#include - -struct xentoollog_logger_stdiostream { - xentoollog_logger vtable; - FILE *f; - xentoollog_level min_level; - unsigned flags; - int progress_erase_len, progress_last_percent; - bool progress_use_cr; -}; - -static void progress_erase(xentoollog_logger_stdiostream *lg) { - if (lg->progress_erase_len) - fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); -} - -static void stdiostream_vmessage(xentoollog_logger *logger_in, - xentoollog_level level, - int errnoval, - const char *context, - const char *format, - va_list al) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - - if (level < lg->min_level) - return; - - progress_erase(lg); - - if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { - struct tm lt_buf; - time_t now = time(0); - struct tm *lt= localtime_r(&now, <_buf); - if (lt != NULL) - fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", - lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, - lt->tm_hour, lt->tm_min, lt->tm_sec, - tzname[!!lt->tm_isdst]); - else - fprintf(lg->f, "[localtime_r failed: %d] ", errno); - } - if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) - fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); - - if (context) - fprintf(lg->f, "%s: ", context); - - fprintf(lg->f, "%s: ", xtl_level_to_string(level)); - - vfprintf(lg->f, format, al); - - if (errnoval >= 0) - fprintf(lg->f, ": %s", strerror(errnoval)); - - putc('\n', lg->f); - fflush(lg->f); -} - -static void stdiostream_message(struct xentoollog_logger *logger_in, - xentoollog_level level, - const char *context, - const char *format, ...) -{ - va_list al; - va_start(al,format); - stdiostream_vmessage(logger_in, level, -1, context, format, al); - va_end(al); -} - -static void stdiostream_progress(struct xentoollog_logger *logger_in, - const char *context, - const char *doing_what, int percent, - unsigned long done, unsigned long total) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - int newpel, extra_erase; - xentoollog_level this_level; - - if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - return; - - if (percent < lg->progress_last_percent) { - this_level = XTL_PROGRESS; - } else if (percent == lg->progress_last_percent) { - return; - } else if (percent < lg->progress_last_percent + 5) { - this_level = XTL_DETAIL; - } else { - this_level = XTL_PROGRESS; - } - - if (this_level < lg->min_level) - return; - - lg->progress_last_percent = percent; - - if (!lg->progress_use_cr) { - stdiostream_message(logger_in, this_level, context, - "%s: %lu/%lu %3d%%", - doing_what, done, total, percent); - return; - } - - if (lg->progress_erase_len) - putc('\r', lg->f); - - newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", - context?context:"", context?": ":"", - doing_what, done, total, percent, - done == total ? "\n" : ""); - - extra_erase = lg->progress_erase_len - newpel; - if (extra_erase > 0) - fprintf(lg->f, "%*s\r", extra_erase, ""); - - lg->progress_erase_len = newpel; -} - -static void stdiostream_destroy(struct xentoollog_logger *logger_in) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - progress_erase(lg); - free(lg); -} - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, - xentoollog_level min_level) { - lg->min_level = min_level; -} - -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, - unsigned set_flags, unsigned clear_flags) { - unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; - if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - progress_erase(lg); - lg->flags = new_flags; -} - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags) { - xentoollog_logger_stdiostream newlogger; - - newlogger.f = f; - newlogger.min_level = min_level; - newlogger.flags = flags; - - switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | - XTL_STDIOSTREAM_PROGRESS_NO_CR)) { - case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; - case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; - case 0: - newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; - break; - default: - errno = EINVAL; - return 0; - } - - if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); - - newlogger.progress_erase_len = 0; - newlogger.progress_last_percent = 0; - - return XTL_NEW_LOGGER(stdiostream, newlogger); -} diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 940708f..818f2e4 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -39,6 +39,8 @@ CTRL_SRCS-y += xc_memshr.c CTRL_SRCS-y += xc_hcall_buf.c CTRL_SRCS-y += xc_foreign_memory.c CTRL_SRCS-y += xc_kexec.c +CTRL_SRCS-y += xtl_core.c +CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-y += xc_resource.c CTRL_SRCS-$(CONFIG_X86) += xc_psr.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c @@ -110,7 +112,6 @@ CFLAGS += -I. -I./include $(CFLAGS_xeninclude) CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE CFLAGS += $(PTHREAD_CFLAGS) -CFLAGS += $(CFLAGS_libxentoollog) CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y)) CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y)) @@ -164,7 +165,7 @@ install: build $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so - $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) @@ -207,7 +208,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) # libxenguest diff --git a/tools/libxc/include/xentoollog.h b/tools/libxc/include/xentoollog.h new file mode 100644 index 0000000..853e9c7 --- /dev/null +++ b/tools/libxc/include/xentoollog.h @@ -0,0 +1,136 @@ +/* + * xentoollog.h + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#ifndef XENTOOLLOG_H +#define XENTOOLLOG_H + +#include +#include + + +/*---------- common declarations and types ----------*/ + +typedef enum xentoollog_level { + XTL_NONE, /* sentinel etc, never used for logging */ + XTL_DEBUG, + XTL_VERBOSE, + XTL_DETAIL, + XTL_PROGRESS, /* also used for "progress" messages */ + XTL_INFO, + XTL_NOTICE, + XTL_WARN, + XTL_ERROR, + XTL_CRITICAL, + XTL_NUM_LEVELS +} xentoollog_level; + +typedef struct xentoollog_logger xentoollog_logger; +struct xentoollog_logger { + void (*vmessage)(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xl", may be 0 */, + const char *format /* without level, context, \n */, + va_list al) + __attribute__((format(printf,5,0))); + void (*progress)(struct xentoollog_logger *logger, + const char *context /* see above */, + const char *doing_what /* no \r,\n */, + int percent, unsigned long done, unsigned long total) + /* null function pointer is ok. + * will always be called with done==0 for each new + * context/doing_what */; + void (*destroy)(struct xentoollog_logger *logger); + /* each logger can put its necessary data here */ +}; + + +/*---------- facilities for consuming log messages ----------*/ + +#define XTL_STDIOSTREAM_SHOW_PID 001u +#define XTL_STDIOSTREAM_SHOW_DATE 002u +#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u +#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ +#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ + +typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags); + /* may return 0 if malloc fails, in which case error was logged */ + /* destroy on this logger does not close the file */ + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, + xentoollog_level min_level); +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, + unsigned set_flags, unsigned clear_flags); + /* if set_flags and clear_flags overlap, set_flags takes precedence */ + +void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); + + +/*---------- facilities for generating log messages ----------*/ + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl", may be 0 */, + const char *format /* does not contain \n */, + va_list) __attribute__((format(printf,5,0))); + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) __attribute__((format(printf,5,6))); + +void xtl_progress(struct xentoollog_logger *logger, + const char *context /* see above, may be 0 */, + const char *doing_what, + unsigned long done, unsigned long total); + + +/*---------- facilities for defining log message consumers ----------*/ + +const char *xtl_level_to_string(xentoollog_level); /* never fails */ + + +#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ + xentoollog_logger_##LOGGER *new_consumer; \ + \ + (buffer).vtable.vmessage = LOGGER##_vmessage; \ + (buffer).vtable.progress = LOGGER##_progress; \ + (buffer).vtable.destroy = LOGGER##_destroy; \ + \ + new_consumer = malloc(sizeof(*new_consumer)); \ + if (!new_consumer) { \ + xtl_log((xentoollog_logger*)&buffer, \ + XTL_CRITICAL, errno, "xtl", \ + "failed to allocate memory for new message logger"); \ + } else { \ + *new_consumer = buffer; \ + } \ + \ + new_consumer; \ +}); + + +#endif /* XENTOOLLOG_H */ diff --git a/tools/libxc/xtl_core.c b/tools/libxc/xtl_core.c new file mode 100644 index 0000000..c4724a0 --- /dev/null +++ b/tools/libxc/xtl_core.c @@ -0,0 +1,83 @@ +/* + * xtl_core.c + * + * core code including functions for generating log messages + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include + +static const char *level_strings[XTL_NUM_LEVELS]= { + "[BUG:XTL_NONE]", + "debug", "verbose", "detail", /* normally off by default */ + "progress", "info", "notice", /* not a problem */ + "warning", "error", "critical" /* problems and errors */ +}; + +const char *xtl_level_to_string(xentoollog_level level) { + assert(level >= 0 && level < XTL_NUM_LEVELS); + return level_strings[level]; +} + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + va_list al) { + int errno_save = errno; + assert(level > XTL_NONE && level < XTL_NUM_LEVELS); + logger->vmessage(logger,level,errnoval,context,format,al); + errno = errno_save; +} + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) { + va_list al; + va_start(al,format); + xtl_logv(logger,level,errnoval,context,format,al); + va_end(al); +} + +void xtl_progress(struct xentoollog_logger *logger, + const char *context, const char *doing_what, + unsigned long done, unsigned long total) { + int percent = 0; + + if (!logger->progress) return; + + if ( total ) + percent = (total < LONG_MAX/100) + ? (done * 100) / total + : done / ((total + 99) / 100); + + logger->progress(logger, context, doing_what, percent, done, total); +} + +void xtl_logger_destroy(struct xentoollog_logger *logger) { + if (!logger) return; + logger->destroy(logger); +} diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c new file mode 100644 index 0000000..0cd9206 --- /dev/null +++ b/tools/libxc/xtl_logger_stdio.c @@ -0,0 +1,192 @@ +/* + * xtl_logger_stdio.c + * + * log message consumer that writes to stdio + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include +#include +#include +#include + +struct xentoollog_logger_stdiostream { + xentoollog_logger vtable; + FILE *f; + xentoollog_level min_level; + unsigned flags; + int progress_erase_len, progress_last_percent; + bool progress_use_cr; +}; + +static void progress_erase(xentoollog_logger_stdiostream *lg) { + if (lg->progress_erase_len) + fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); +} + +static void stdiostream_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + + if (level < lg->min_level) + return; + + progress_erase(lg); + + if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { + struct tm lt_buf; + time_t now = time(0); + struct tm *lt= localtime_r(&now, <_buf); + if (lt != NULL) + fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", + lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, + lt->tm_hour, lt->tm_min, lt->tm_sec, + tzname[!!lt->tm_isdst]); + else + fprintf(lg->f, "[localtime_r failed: %d] ", errno); + } + if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) + fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); + + if (context) + fprintf(lg->f, "%s: ", context); + + fprintf(lg->f, "%s: ", xtl_level_to_string(level)); + + vfprintf(lg->f, format, al); + + if (errnoval >= 0) + fprintf(lg->f, ": %s", strerror(errnoval)); + + putc('\n', lg->f); + fflush(lg->f); +} + +static void stdiostream_message(struct xentoollog_logger *logger_in, + xentoollog_level level, + const char *context, + const char *format, ...) +{ + va_list al; + va_start(al,format); + stdiostream_vmessage(logger_in, level, -1, context, format, al); + va_end(al); +} + +static void stdiostream_progress(struct xentoollog_logger *logger_in, + const char *context, + const char *doing_what, int percent, + unsigned long done, unsigned long total) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + int newpel, extra_erase; + xentoollog_level this_level; + + if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + return; + + if (percent < lg->progress_last_percent) { + this_level = XTL_PROGRESS; + } else if (percent == lg->progress_last_percent) { + return; + } else if (percent < lg->progress_last_percent + 5) { + this_level = XTL_DETAIL; + } else { + this_level = XTL_PROGRESS; + } + + if (this_level < lg->min_level) + return; + + lg->progress_last_percent = percent; + + if (!lg->progress_use_cr) { + stdiostream_message(logger_in, this_level, context, + "%s: %lu/%lu %3d%%", + doing_what, done, total, percent); + return; + } + + if (lg->progress_erase_len) + putc('\r', lg->f); + + newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", + context?context:"", context?": ":"", + doing_what, done, total, percent, + done == total ? "\n" : ""); + + extra_erase = lg->progress_erase_len - newpel; + if (extra_erase > 0) + fprintf(lg->f, "%*s\r", extra_erase, ""); + + lg->progress_erase_len = newpel; +} + +static void stdiostream_destroy(struct xentoollog_logger *logger_in) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + progress_erase(lg); + free(lg); +} + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, + xentoollog_level min_level) { + lg->min_level = min_level; +} + +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, + unsigned set_flags, unsigned clear_flags) { + unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; + if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + progress_erase(lg); + lg->flags = new_flags; +} + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags) { + xentoollog_logger_stdiostream newlogger; + + newlogger.f = f; + newlogger.min_level = min_level; + newlogger.flags = flags; + + switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | + XTL_STDIOSTREAM_PROGRESS_NO_CR)) { + case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; + case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; + case 0: + newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; + break; + default: + errno = EINVAL; + return 0; + } + + if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); + + newlogger.progress_erase_len = 0; + newlogger.progress_last_percent = 0; + + return XTL_NEW_LOGGER(stdiostream, newlogger); +} diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 2abae0c..6ff5bee 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -20,12 +20,11 @@ LIBUUID_LIBS += -luuid endif LIBXL_LIBS = -LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) ifeq ($(CONFIG_REMUS_NETBUF),y) LIBXL_LIBS += $(LIBNL3_LIBS) endif -CFLAGS_LIBXL += $(CFLAGS_libxentoollog) CFLAGS_LIBXL += $(CFLAGS_libxenctrl) CFLAGS_LIBXL += $(CFLAGS_libxenguest) CFLAGS_LIBXL += $(CFLAGS_libxenstore) @@ -150,7 +149,7 @@ CFLAGS_XL += -Wshadow XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ - CFLAGS += $(CFLAGS_libxentoollog) + CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. @@ -254,19 +253,19 @@ libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ xl: $(XL_OBJS) libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) testidl: testidl.o libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) $(PKG_CONFIG): % : %.in Makefile @sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < $< > $@.new diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile index 8ae0a78..666eb66 100644 --- a/tools/ocaml/libs/xentoollog/Makefile +++ b/tools/ocaml/libs/xentoollog/Makefile @@ -5,7 +5,7 @@ include $(TOPLEVEL)/common.make # allow mixed declarations and code CFLAGS += -Wno-declaration-after-statement -CFLAGS += $(CFLAGS_libxentoollog) +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) CFLAGS += $(APPEND_CFLAGS) OCAMLINCLUDE += @@ -13,7 +13,7 @@ OBJS = xentoollog INTF = xentoollog.cmi LIBS = xentoollog.cma xentoollog.cmxa -LIBS_xentoollog = $(LDLIBS_libxentoollog) +LIBS_xentoollog = $(LDLIBS_libxenctrl) xentoollog_OBJS = $(OBJS) xentoollog_C_OBJS = xentoollog_stubs @@ -49,7 +49,7 @@ xentoollog.mli: xentoollog.mli.in _xtl_levels.mli.in libs: $(LIBS) -_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libs/toollog/include/xentoollog.h +_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libxc/include/xentoollog.h $(PYTHON) genlevels.py _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc .PHONY: install diff --git a/tools/ocaml/libs/xentoollog/genlevels.py b/tools/ocaml/libs/xentoollog/genlevels.py index 8c233c5..65d334f 100755 --- a/tools/ocaml/libs/xentoollog/genlevels.py +++ b/tools/ocaml/libs/xentoollog/genlevels.py @@ -3,7 +3,7 @@ import sys def read_levels(): - f = open('../../../libs/toollog/include/xentoollog.h', 'r') + f = open('../../../libxc/include/xentoollog.h', 'r') levels = [] record = False diff --git a/tools/python/setup.py b/tools/python/setup.py index 9771cc4..fdba866 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -7,17 +7,16 @@ XEN_ROOT = "../.." extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] PATH_XEN = XEN_ROOT + "/tools/include" -PATH_LIBXENTOOLLOG = XEN_ROOT + "/tools/libs/toollog" PATH_LIBXC = XEN_ROOT + "/tools/libxc" PATH_LIBXL = XEN_ROOT + "/tools/libxl" PATH_XENSTORE = XEN_ROOT + "/tools/xenstore" xc = Extension("xc", extra_compile_args = extra_compile_args, - include_dirs = [ PATH_XEN, PATH_LIBXENTOOLLOG + "/include", PATH_LIBXC + "/include", "xen/lowlevel/xc" ], + include_dirs = [ PATH_XEN, PATH_LIBXC + "/include", "xen/lowlevel/xc" ], library_dirs = [ PATH_LIBXC ], libraries = [ "xenctrl", "xenguest" ], - depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so", "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ], + depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so" ], sources = [ "xen/lowlevel/xc/xc.c" ]) xs = Extension("xs", diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index e63d894..2407a30 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk # xenpaging.c and file_ops.c incorrectly use libxc internals CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS) -I$(XEN_ROOT)/tools/libxc -LDLIBS += $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) +LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) LDFLAGS += $(PTHREAD_LDFLAGS) POLICY = default -- generated by git-patchbot for /home/xen/git/xen.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 16 04:45:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xW-0000DT-5y; Wed, 16 Dec 2015 04:45:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xU-0000D3-GJ for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:00 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 0F/4E-24494-B4CE0765; Wed, 16 Dec 2015 04:44:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1450241096!10998359!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30297 invoked from network); 16 Dec 2015 04:44:57 -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; 16 Dec 2015 04:44:57 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xQ-0005Sp-MJ for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xQ-0001ek-GP for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:44:56 +0000 Date: Wed, 16 Dec 2015 04:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] Revert "tools: Refactor "xentoollog" into its own library" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec0712576198633dd7fbfe25290b030d5a23b252 Author: Ian Campbell AuthorDate: Thu Dec 10 10:21:34 2015 +0000 Commit: Ian Campbell CommitDate: Thu Dec 10 10:21:34 2015 +0000 Revert "tools: Refactor "xentoollog" into its own library" This reverts commit c7d3afbb44b47af9103be0b914afd588a84d9e62 which broke the libvirt build, since libvirt uses xtl_* and hence needs updating to link against the new library when necessary. Signed-off-by: Ian Campbell --- .gitignore | 1 - Config.mk | 12 +- stubdom/Makefile | 24 +---- stubdom/grub/Makefile | 1 - tools/Makefile | 3 - tools/Rules.mk | 14 +-- tools/libs/Makefile | 7 - tools/libs/toollog/Makefile | 59 --------- tools/libs/toollog/include/xentoollog.h | 136 --------------------- tools/libs/toollog/libxentoollog.map | 12 -- tools/libs/toollog/xtl_core.c | 83 ------------- tools/libs/toollog/xtl_logger_stdio.c | 192 ------------------------------ tools/libxc/Makefile | 7 +- tools/libxc/include/xentoollog.h | 136 +++++++++++++++++++++ tools/libxc/xtl_core.c | 83 +++++++++++++ tools/libxc/xtl_logger_stdio.c | 192 ++++++++++++++++++++++++++++++ tools/libxl/Makefile | 15 +-- tools/ocaml/libs/xentoollog/Makefile | 6 +- tools/ocaml/libs/xentoollog/genlevels.py | 2 +- tools/python/setup.py | 5 +- tools/xenpaging/Makefile | 2 +- 21 files changed, 440 insertions(+), 552 deletions(-) diff --git a/.gitignore b/.gitignore index a2c85e1..91e1430 100644 --- a/.gitignore +++ b/.gitignore @@ -58,7 +58,6 @@ stubdom/gcc-* stubdom/include stubdom/ioemu stubdom/xenstore -stubdom/libxentoollog-* stubdom/libxc-* stubdom/lwip-* stubdom/mini-os-* diff --git a/Config.mk b/Config.mk index 8fc7767..216a642 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= d25773c8afa2f4dbbb466116daeb60159ddd22bd -# Thu Dec 3 11:23:25 2015 +0000 -# mini-os: Include libxentoollog with libxc +MINIOS_UPSTREAM_REVISION ?= bccd90071e863ec22216a000f1a07035e2f226ff +# Mon Nov 23 16:34:31 2015 +0000 +# Add a .gitignore SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 # Tue Nov 17 09:18:44 2015 -0500 @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 9fad9ed285835caef64bb8dab352e287ad8538c2 -# Thu Dec 3 11:23:16 2015 +0000 -# qemu-xen-traditional: Use xentoollog as a separate library +QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 +# Wed Dec 9 11:47:35 2015 +0000 +# net: pcnet: add check to validate receive data size(CVE-2015-7504) # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. diff --git a/stubdom/Makefile b/stubdom/Makefile index 9c923dd..e1359cf 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -313,11 +313,6 @@ mk-headers-$(XEN_TARGET_ARCH): $(IOEMU_LINKFARM_TARGET) ln -sf $(wildcard $(XEN_ROOT)/tools/include/xen-foreign/*) include/xen-foreign/ && \ $(MAKE) DESTDIR= -C include/xen-foreign/ && \ ( [ -h include/xen/foreign ] || ln -sf ../xen-foreign include/xen/foreign ) - mkdir -p libs-$(XEN_TARGET_ARCH)/toollog - [ -h libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || ( cd libs-$(XEN_TARGET_ARCH)/toollog && \ - ln -sf $(XEN_ROOT)/tools/libs/toollog/include/*.h . && \ - ln -sf $(XEN_ROOT)/tools/libs/toollog/*.c . && \ - ln -sf $(XEN_ROOT)/tools/libs/toollog/Makefile . ) mkdir -p libxc-$(XEN_TARGET_ARCH) [ -h libxc-$(XEN_TARGET_ARCH)/Makefile ] || ( cd libxc-$(XEN_TARGET_ARCH) && \ ln -sf $(XEN_ROOT)/tools/libxc/*.h . && \ @@ -341,23 +336,12 @@ $(TARGETS_MINIOS): mini-os-%: done ####### -# libxentoollog -####### - -.PHONY: libxentoollog -libxentoollog: libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a -libs-$(XEN_TARGET_ARCH)/toollog/libxentoollog.a: $(NEWLIB_STAMPFILE) - $(MAKE) -C $(XEN_ROOT)/tools/include - $(MAKE) DESTDIR= -C $(MINI_OS) links - CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog - -####### # libxc ####### .PHONY: libxc libxc: libxc-$(XEN_TARGET_ARCH)/libxenctrl.a libxc-$(XEN_TARGET_ARCH)/libxenguest.a -libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: libxentoollog cross-zlib +libxc-$(XEN_TARGET_ARCH)/libxenctrl.a: cross-zlib $(MAKE) -C $(XEN_ROOT)/tools/include $(MAKE) DESTDIR= -C $(MINI_OS) links CPPFLAGS="$(TARGET_CPPFLAGS)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= CONFIG_LIBXC_MINIOS=y -C libxc-$(XEN_TARGET_ARCH) @@ -531,11 +515,6 @@ clean: $(MAKE) -C vtpmmgr clean rm -fr grub-$(XEN_TARGET_ARCH) rm -f $(STUBDOMPATH) - [ ! -e libs-$(XEN_TARGET_ARCH)/toollog/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/toollog clean - [ ! -e libs-$(XEN_TARGET_ARCH)/evtchn/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/evtchn clean - [ ! -e libs-$(XEN_TARGET_ARCH)/gnttab/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/gnttab clean - [ ! -e libs-$(XEN_TARGET_ARCH)/call/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/call clean - [ ! -e libs-$(XEN_TARGET_ARCH)/foreignmemory/Makefile ] || $(MAKE) DESTDIR= -C libs-$(XEN_TARGET_ARCH)/foreignmemory clean [ ! -e libxc-$(XEN_TARGET_ARCH)/Makefile ] || $(MAKE) DESTDIR= -C libxc-$(XEN_TARGET_ARCH) clean -[ ! -d ioemu ] || $(MAKE) DESTDIR= -C ioemu clean -[ ! -d xenstore ] || $(MAKE) DESTDIR= -C xenstore clean @@ -546,7 +525,6 @@ crossclean: clean rm -fr $(CROSS_ROOT) rm -fr newlib-$(XEN_TARGET_ARCH) rm -fr zlib-$(XEN_TARGET_ARCH) pciutils-$(XEN_TARGET_ARCH) - rm -fr libs-$(XEN_TARGET_ARCH) rm -fr libxc-$(XEN_TARGET_ARCH) ioemu xenstore rm -fr gmp-$(XEN_TARGET_ARCH) rm -fr polarssl-$(XEN_TARGET_ARCH) diff --git a/stubdom/grub/Makefile b/stubdom/grub/Makefile index 26dff45..934cc4c 100644 --- a/stubdom/grub/Makefile +++ b/stubdom/grub/Makefile @@ -5,7 +5,6 @@ vpath %.c ../grub-upstream BOOT=$(OBJ_DIR)/boot-$(XEN_TARGET_ARCH).o -DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libs/toollog/include DEF_CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include -I$(XEN_ROOT)/tools/include -I. DEF_CPPFLAGS += -I../grub-upstream/stage1 DEF_CPPFLAGS += -I../grub-upstream/stage2 diff --git a/tools/Makefile b/tools/Makefile index 9f74ac7..820ca40 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -3,7 +3,6 @@ include $(XEN_ROOT)/tools/Rules.mk SUBDIRS-y := SUBDIRS-y += include -SUBDIRS-y += libs SUBDIRS-y += libxc SUBDIRS-$(FLASK_ENABLE) += flask SUBDIRS-y += xenstore @@ -249,14 +248,12 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --includedir=$(LIBEXEC_INC) \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ - -I$(XEN_ROOT)/tools/libs/toollog/include \ -I$(XEN_ROOT)/tools/libxc/include \ -I$(XEN_ROOT)/tools/xenstore/include \ -I$(XEN_ROOT)/tools/xenstore/compat/include \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore \ - -Wl,-rpath-link=$(XEN_ROOT)/tools/libs/toollog \ $(QEMU_UPSTREAM_RPATH)" \ --bindir=$(LIBEXEC_BIN) \ --datadir=$(SHAREDIR)/qemu-xen \ diff --git a/tools/Rules.mk b/tools/Rules.mk index 0652e4b..37b0aaf 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -10,7 +10,6 @@ export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install XEN_INCLUDE = $(XEN_ROOT)/tools/include -XEN_LIBXENTOOLLOG = $(XEN_ROOT)/tools/libs/toollog XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl XEN_XENSTORE = $(XEN_ROOT)/tools/xenstore @@ -77,15 +76,10 @@ endif # Consumers of libfoo should not directly use $(SHDEPS_libfoo) or # $(SHLIB_libfoo) -CFLAGS_libxentoollog = -I$(XEN_LIBXENTOOLLOG)/include $(CFLAGS_xeninclude) -SHDEPS_libxentoollog = -LDLIBS_libxentoollog = $(XEN_LIBXENTOOLLOG)/libxentoollog$(libextension) -SHLIB_libxentoollog = -Wl,-rpath-link=$(XEN_LIBXENTOOLLOG) - -CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_xeninclude) -SHDEPS_libxenctrl = $(SHLIB_libxentoollog) -LDLIBS_libxenctrl = $(SHDEPS_libxenctrl) $(XEN_LIBXC)/libxenctrl$(libextension) -SHLIB_libxenctrl = $(SHDEPS_libxenctrl) -Wl,-rpath-link=$(XEN_LIBXC) +CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) +SHDEPS_libxenctrl = +LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl$(libextension) +SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) CFLAGS_libxenguest = -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) SHDEPS_libxenguest = diff --git a/tools/libs/Makefile b/tools/libs/Makefile deleted file mode 100644 index 73be500..0000000 --- a/tools/libs/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -XEN_ROOT = $(CURDIR)/../.. -include $(XEN_ROOT)/tools/Rules.mk - -SUBDIRS-y := -SUBDIRS-y += toollog - -all clean install distclean: %: subdirs-% diff --git a/tools/libs/toollog/Makefile b/tools/libs/toollog/Makefile deleted file mode 100644 index bd12403..0000000 --- a/tools/libs/toollog/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -XEN_ROOT = $(CURDIR)/../../.. -include $(XEN_ROOT)/tools/Rules.mk - -MAJOR = 1 -MINOR = 0 -SHLIB_LDFLAGS += -Wl,--version-script=libxentoollog.map - -CFLAGS += -Werror -Wmissing-prototypes -CFLAGS += -I./include - -SRCS-y += xtl_core.c -SRCS-y += xtl_logger_stdio.c - -LIB_OBJS := $(patsubst %.c,%.o,$(SRCS-y)) -PIC_OBJS := $(patsubst %.c,%.opic,$(SRCS-y)) - -LIB := libxentoollog.a -ifneq ($(nosharedlibs),y) -LIB += libxentoollog.so -endif - -.PHONY: all -all: build - -.PHONY: build -build: - $(MAKE) libs - -.PHONY: libs -libs: $(LIB) - -libxentoollog.a: $(LIB_OBJS) - $(AR) rc $@ $^ - -libxentoollog.so: libxentoollog.so.$(MAJOR) - $(SYMLINK_SHLIB) $< $@ -libxentoollog.so.$(MAJOR): libxentoollog.so.$(MAJOR).$(MINOR) - $(SYMLINK_SHLIB) $< $@ - -libxentoollog.so.$(MAJOR).$(MINOR): $(PIC_OBJS) libxentoollog.map - $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxentoollog.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(PIC_OBJS) $(APPEND_LDFLAGS) - -.PHONY: install -install: build - $(INSTALL_DIR) $(DESTDIR)$(libdir) - $(INSTALL_DIR) $(DESTDIR)$(includedir) - $(INSTALL_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) - $(INSTALL_DATA) libxentoollog.a $(DESTDIR)$(libdir) - $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxentoollog.so.$(MAJOR) - $(SYMLINK_SHLIB) libxentoollog.so.$(MAJOR) $(DESTDIR)$(libdir)/libxentoollog.so - $(INSTALL_DATA) include/xentoollog.h $(DESTDIR)$(includedir) - -.PHONY: TAGS -TAGS: - etags -t *.c *.h - -.PHONY: clean -clean: - rm -rf *.rpm $(LIB) *~ $(DEPS) $(LIB_OBJS) $(PIC_OBJS) diff --git a/tools/libs/toollog/include/xentoollog.h b/tools/libs/toollog/include/xentoollog.h deleted file mode 100644 index 853e9c7..0000000 --- a/tools/libs/toollog/include/xentoollog.h +++ /dev/null @@ -1,136 +0,0 @@ -/* - * xentoollog.h - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#ifndef XENTOOLLOG_H -#define XENTOOLLOG_H - -#include -#include - - -/*---------- common declarations and types ----------*/ - -typedef enum xentoollog_level { - XTL_NONE, /* sentinel etc, never used for logging */ - XTL_DEBUG, - XTL_VERBOSE, - XTL_DETAIL, - XTL_PROGRESS, /* also used for "progress" messages */ - XTL_INFO, - XTL_NOTICE, - XTL_WARN, - XTL_ERROR, - XTL_CRITICAL, - XTL_NUM_LEVELS -} xentoollog_level; - -typedef struct xentoollog_logger xentoollog_logger; -struct xentoollog_logger { - void (*vmessage)(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xl", may be 0 */, - const char *format /* without level, context, \n */, - va_list al) - __attribute__((format(printf,5,0))); - void (*progress)(struct xentoollog_logger *logger, - const char *context /* see above */, - const char *doing_what /* no \r,\n */, - int percent, unsigned long done, unsigned long total) - /* null function pointer is ok. - * will always be called with done==0 for each new - * context/doing_what */; - void (*destroy)(struct xentoollog_logger *logger); - /* each logger can put its necessary data here */ -}; - - -/*---------- facilities for consuming log messages ----------*/ - -#define XTL_STDIOSTREAM_SHOW_PID 001u -#define XTL_STDIOSTREAM_SHOW_DATE 002u -#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u -#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ -#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ - -typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags); - /* may return 0 if malloc fails, in which case error was logged */ - /* destroy on this logger does not close the file */ - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, - xentoollog_level min_level); -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, - unsigned set_flags, unsigned clear_flags); - /* if set_flags and clear_flags overlap, set_flags takes precedence */ - -void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); - - -/*---------- facilities for generating log messages ----------*/ - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl", may be 0 */, - const char *format /* does not contain \n */, - va_list) __attribute__((format(printf,5,0))); - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) __attribute__((format(printf,5,6))); - -void xtl_progress(struct xentoollog_logger *logger, - const char *context /* see above, may be 0 */, - const char *doing_what, - unsigned long done, unsigned long total); - - -/*---------- facilities for defining log message consumers ----------*/ - -const char *xtl_level_to_string(xentoollog_level); /* never fails */ - - -#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ - xentoollog_logger_##LOGGER *new_consumer; \ - \ - (buffer).vtable.vmessage = LOGGER##_vmessage; \ - (buffer).vtable.progress = LOGGER##_progress; \ - (buffer).vtable.destroy = LOGGER##_destroy; \ - \ - new_consumer = malloc(sizeof(*new_consumer)); \ - if (!new_consumer) { \ - xtl_log((xentoollog_logger*)&buffer, \ - XTL_CRITICAL, errno, "xtl", \ - "failed to allocate memory for new message logger"); \ - } else { \ - *new_consumer = buffer; \ - } \ - \ - new_consumer; \ -}); - - -#endif /* XENTOOLLOG_H */ diff --git a/tools/libs/toollog/libxentoollog.map b/tools/libs/toollog/libxentoollog.map deleted file mode 100644 index c183cf5..0000000 --- a/tools/libs/toollog/libxentoollog.map +++ /dev/null @@ -1,12 +0,0 @@ -VERS_1.0 { - global: - xtl_createlogger_stdiostream; - xtl_level_to_string; - xtl_log; - xtl_logger_destroy; - xtl_logv; - xtl_progress; - xtl_stdiostream_adjust_flags; - xtl_stdiostream_set_minlevel; - local: *; /* Do not expose anything by default */ -}; diff --git a/tools/libs/toollog/xtl_core.c b/tools/libs/toollog/xtl_core.c deleted file mode 100644 index c4724a0..0000000 --- a/tools/libs/toollog/xtl_core.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * xtl_core.c - * - * core code including functions for generating log messages - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include - -static const char *level_strings[XTL_NUM_LEVELS]= { - "[BUG:XTL_NONE]", - "debug", "verbose", "detail", /* normally off by default */ - "progress", "info", "notice", /* not a problem */ - "warning", "error", "critical" /* problems and errors */ -}; - -const char *xtl_level_to_string(xentoollog_level level) { - assert(level >= 0 && level < XTL_NUM_LEVELS); - return level_strings[level]; -} - -void xtl_logv(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - va_list al) { - int errno_save = errno; - assert(level > XTL_NONE && level < XTL_NUM_LEVELS); - logger->vmessage(logger,level,errnoval,context,format,al); - errno = errno_save; -} - -void xtl_log(struct xentoollog_logger *logger, - xentoollog_level level, - int errnoval /* or -1 */, - const char *context /* eg "xc", "xenstore", "xl" */, - const char *format /* does not contain \n */, - ...) { - va_list al; - va_start(al,format); - xtl_logv(logger,level,errnoval,context,format,al); - va_end(al); -} - -void xtl_progress(struct xentoollog_logger *logger, - const char *context, const char *doing_what, - unsigned long done, unsigned long total) { - int percent = 0; - - if (!logger->progress) return; - - if ( total ) - percent = (total < LONG_MAX/100) - ? (done * 100) / total - : done / ((total + 99) / 100); - - logger->progress(logger, context, doing_what, percent, done, total); -} - -void xtl_logger_destroy(struct xentoollog_logger *logger) { - if (!logger) return; - logger->destroy(logger); -} diff --git a/tools/libs/toollog/xtl_logger_stdio.c b/tools/libs/toollog/xtl_logger_stdio.c deleted file mode 100644 index 0cd9206..0000000 --- a/tools/libs/toollog/xtl_logger_stdio.c +++ /dev/null @@ -1,192 +0,0 @@ -/* - * xtl_logger_stdio.c - * - * log message consumer that writes to stdio - * - * Copyright (c) 2010 Citrix - * Part of a generic logging interface used by various dom0 userland libraries. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; If not, see . - */ - -#include "xentoollog.h" - -#include -#include -#include -#include -#include -#include - -struct xentoollog_logger_stdiostream { - xentoollog_logger vtable; - FILE *f; - xentoollog_level min_level; - unsigned flags; - int progress_erase_len, progress_last_percent; - bool progress_use_cr; -}; - -static void progress_erase(xentoollog_logger_stdiostream *lg) { - if (lg->progress_erase_len) - fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); -} - -static void stdiostream_vmessage(xentoollog_logger *logger_in, - xentoollog_level level, - int errnoval, - const char *context, - const char *format, - va_list al) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - - if (level < lg->min_level) - return; - - progress_erase(lg); - - if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { - struct tm lt_buf; - time_t now = time(0); - struct tm *lt= localtime_r(&now, <_buf); - if (lt != NULL) - fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", - lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, - lt->tm_hour, lt->tm_min, lt->tm_sec, - tzname[!!lt->tm_isdst]); - else - fprintf(lg->f, "[localtime_r failed: %d] ", errno); - } - if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) - fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); - - if (context) - fprintf(lg->f, "%s: ", context); - - fprintf(lg->f, "%s: ", xtl_level_to_string(level)); - - vfprintf(lg->f, format, al); - - if (errnoval >= 0) - fprintf(lg->f, ": %s", strerror(errnoval)); - - putc('\n', lg->f); - fflush(lg->f); -} - -static void stdiostream_message(struct xentoollog_logger *logger_in, - xentoollog_level level, - const char *context, - const char *format, ...) -{ - va_list al; - va_start(al,format); - stdiostream_vmessage(logger_in, level, -1, context, format, al); - va_end(al); -} - -static void stdiostream_progress(struct xentoollog_logger *logger_in, - const char *context, - const char *doing_what, int percent, - unsigned long done, unsigned long total) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - int newpel, extra_erase; - xentoollog_level this_level; - - if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - return; - - if (percent < lg->progress_last_percent) { - this_level = XTL_PROGRESS; - } else if (percent == lg->progress_last_percent) { - return; - } else if (percent < lg->progress_last_percent + 5) { - this_level = XTL_DETAIL; - } else { - this_level = XTL_PROGRESS; - } - - if (this_level < lg->min_level) - return; - - lg->progress_last_percent = percent; - - if (!lg->progress_use_cr) { - stdiostream_message(logger_in, this_level, context, - "%s: %lu/%lu %3d%%", - doing_what, done, total, percent); - return; - } - - if (lg->progress_erase_len) - putc('\r', lg->f); - - newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", - context?context:"", context?": ":"", - doing_what, done, total, percent, - done == total ? "\n" : ""); - - extra_erase = lg->progress_erase_len - newpel; - if (extra_erase > 0) - fprintf(lg->f, "%*s\r", extra_erase, ""); - - lg->progress_erase_len = newpel; -} - -static void stdiostream_destroy(struct xentoollog_logger *logger_in) { - xentoollog_logger_stdiostream *lg = (void*)logger_in; - progress_erase(lg); - free(lg); -} - -void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, - xentoollog_level min_level) { - lg->min_level = min_level; -} - -void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, - unsigned set_flags, unsigned clear_flags) { - unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; - if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) - progress_erase(lg); - lg->flags = new_flags; -} - -xentoollog_logger_stdiostream *xtl_createlogger_stdiostream - (FILE *f, xentoollog_level min_level, unsigned flags) { - xentoollog_logger_stdiostream newlogger; - - newlogger.f = f; - newlogger.min_level = min_level; - newlogger.flags = flags; - - switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | - XTL_STDIOSTREAM_PROGRESS_NO_CR)) { - case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; - case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; - case 0: - newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; - break; - default: - errno = EINVAL; - return 0; - } - - if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); - - newlogger.progress_erase_len = 0; - newlogger.progress_last_percent = 0; - - return XTL_NEW_LOGGER(stdiostream, newlogger); -} diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 940708f..818f2e4 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -39,6 +39,8 @@ CTRL_SRCS-y += xc_memshr.c CTRL_SRCS-y += xc_hcall_buf.c CTRL_SRCS-y += xc_foreign_memory.c CTRL_SRCS-y += xc_kexec.c +CTRL_SRCS-y += xtl_core.c +CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-y += xc_resource.c CTRL_SRCS-$(CONFIG_X86) += xc_psr.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c @@ -110,7 +112,6 @@ CFLAGS += -I. -I./include $(CFLAGS_xeninclude) CFLAGS-$(CONFIG_Linux) += -D_GNU_SOURCE CFLAGS += $(PTHREAD_CFLAGS) -CFLAGS += $(CFLAGS_libxentoollog) CTRL_LIB_OBJS := $(patsubst %.c,%.o,$(CTRL_SRCS-y)) CTRL_PIC_OBJS := $(patsubst %.c,%.opic,$(CTRL_SRCS-y)) @@ -164,7 +165,7 @@ install: build $(INSTALL_DATA) libxenctrl.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenctrl.so.$(MAJOR) $(SYMLINK_SHLIB) libxenctrl.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenctrl.so - $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) include/xenctrl.h include/xenctrlosdep.h include/xentoollog.h $(DESTDIR)$(includedir) $(INSTALL_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) $(INSTALL_DATA) libxenguest.a $(DESTDIR)$(libdir) $(SYMLINK_SHLIB) libxenguest.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenguest.so.$(MAJOR) @@ -207,7 +208,7 @@ libxenctrl.so.$(MAJOR): libxenctrl.so.$(MAJOR).$(MINOR) $(SYMLINK_SHLIB) $< $@ libxenctrl.so.$(MAJOR).$(MINOR): $(CTRL_PIC_OBJS) - $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(LDLIBS_libxentoollog) $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenctrl.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $^ $(DLOPEN_LIBS) $(PTHREAD_LIBS) $(APPEND_LDFLAGS) # libxenguest diff --git a/tools/libxc/include/xentoollog.h b/tools/libxc/include/xentoollog.h new file mode 100644 index 0000000..853e9c7 --- /dev/null +++ b/tools/libxc/include/xentoollog.h @@ -0,0 +1,136 @@ +/* + * xentoollog.h + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#ifndef XENTOOLLOG_H +#define XENTOOLLOG_H + +#include +#include + + +/*---------- common declarations and types ----------*/ + +typedef enum xentoollog_level { + XTL_NONE, /* sentinel etc, never used for logging */ + XTL_DEBUG, + XTL_VERBOSE, + XTL_DETAIL, + XTL_PROGRESS, /* also used for "progress" messages */ + XTL_INFO, + XTL_NOTICE, + XTL_WARN, + XTL_ERROR, + XTL_CRITICAL, + XTL_NUM_LEVELS +} xentoollog_level; + +typedef struct xentoollog_logger xentoollog_logger; +struct xentoollog_logger { + void (*vmessage)(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xl", may be 0 */, + const char *format /* without level, context, \n */, + va_list al) + __attribute__((format(printf,5,0))); + void (*progress)(struct xentoollog_logger *logger, + const char *context /* see above */, + const char *doing_what /* no \r,\n */, + int percent, unsigned long done, unsigned long total) + /* null function pointer is ok. + * will always be called with done==0 for each new + * context/doing_what */; + void (*destroy)(struct xentoollog_logger *logger); + /* each logger can put its necessary data here */ +}; + + +/*---------- facilities for consuming log messages ----------*/ + +#define XTL_STDIOSTREAM_SHOW_PID 001u +#define XTL_STDIOSTREAM_SHOW_DATE 002u +#define XTL_STDIOSTREAM_HIDE_PROGRESS 004u +#define XTL_STDIOSTREAM_PROGRESS_USE_CR 010u /* default is to */ +#define XTL_STDIOSTREAM_PROGRESS_NO_CR 020u /* use \r to ttys */ + +typedef struct xentoollog_logger_stdiostream xentoollog_logger_stdiostream; + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags); + /* may return 0 if malloc fails, in which case error was logged */ + /* destroy on this logger does not close the file */ + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream*, + xentoollog_level min_level); +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream*, + unsigned set_flags, unsigned clear_flags); + /* if set_flags and clear_flags overlap, set_flags takes precedence */ + +void xtl_logger_destroy(struct xentoollog_logger *logger /* 0 is ok */); + + +/*---------- facilities for generating log messages ----------*/ + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl", may be 0 */, + const char *format /* does not contain \n */, + va_list) __attribute__((format(printf,5,0))); + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) __attribute__((format(printf,5,6))); + +void xtl_progress(struct xentoollog_logger *logger, + const char *context /* see above, may be 0 */, + const char *doing_what, + unsigned long done, unsigned long total); + + +/*---------- facilities for defining log message consumers ----------*/ + +const char *xtl_level_to_string(xentoollog_level); /* never fails */ + + +#define XTL_NEW_LOGGER(LOGGER,buffer) ({ \ + xentoollog_logger_##LOGGER *new_consumer; \ + \ + (buffer).vtable.vmessage = LOGGER##_vmessage; \ + (buffer).vtable.progress = LOGGER##_progress; \ + (buffer).vtable.destroy = LOGGER##_destroy; \ + \ + new_consumer = malloc(sizeof(*new_consumer)); \ + if (!new_consumer) { \ + xtl_log((xentoollog_logger*)&buffer, \ + XTL_CRITICAL, errno, "xtl", \ + "failed to allocate memory for new message logger"); \ + } else { \ + *new_consumer = buffer; \ + } \ + \ + new_consumer; \ +}); + + +#endif /* XENTOOLLOG_H */ diff --git a/tools/libxc/xtl_core.c b/tools/libxc/xtl_core.c new file mode 100644 index 0000000..c4724a0 --- /dev/null +++ b/tools/libxc/xtl_core.c @@ -0,0 +1,83 @@ +/* + * xtl_core.c + * + * core code including functions for generating log messages + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include + +static const char *level_strings[XTL_NUM_LEVELS]= { + "[BUG:XTL_NONE]", + "debug", "verbose", "detail", /* normally off by default */ + "progress", "info", "notice", /* not a problem */ + "warning", "error", "critical" /* problems and errors */ +}; + +const char *xtl_level_to_string(xentoollog_level level) { + assert(level >= 0 && level < XTL_NUM_LEVELS); + return level_strings[level]; +} + +void xtl_logv(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + va_list al) { + int errno_save = errno; + assert(level > XTL_NONE && level < XTL_NUM_LEVELS); + logger->vmessage(logger,level,errnoval,context,format,al); + errno = errno_save; +} + +void xtl_log(struct xentoollog_logger *logger, + xentoollog_level level, + int errnoval /* or -1 */, + const char *context /* eg "xc", "xenstore", "xl" */, + const char *format /* does not contain \n */, + ...) { + va_list al; + va_start(al,format); + xtl_logv(logger,level,errnoval,context,format,al); + va_end(al); +} + +void xtl_progress(struct xentoollog_logger *logger, + const char *context, const char *doing_what, + unsigned long done, unsigned long total) { + int percent = 0; + + if (!logger->progress) return; + + if ( total ) + percent = (total < LONG_MAX/100) + ? (done * 100) / total + : done / ((total + 99) / 100); + + logger->progress(logger, context, doing_what, percent, done, total); +} + +void xtl_logger_destroy(struct xentoollog_logger *logger) { + if (!logger) return; + logger->destroy(logger); +} diff --git a/tools/libxc/xtl_logger_stdio.c b/tools/libxc/xtl_logger_stdio.c new file mode 100644 index 0000000..0cd9206 --- /dev/null +++ b/tools/libxc/xtl_logger_stdio.c @@ -0,0 +1,192 @@ +/* + * xtl_logger_stdio.c + * + * log message consumer that writes to stdio + * + * Copyright (c) 2010 Citrix + * Part of a generic logging interface used by various dom0 userland libraries. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see . + */ + +#include "xentoollog.h" + +#include +#include +#include +#include +#include +#include + +struct xentoollog_logger_stdiostream { + xentoollog_logger vtable; + FILE *f; + xentoollog_level min_level; + unsigned flags; + int progress_erase_len, progress_last_percent; + bool progress_use_cr; +}; + +static void progress_erase(xentoollog_logger_stdiostream *lg) { + if (lg->progress_erase_len) + fprintf(lg->f, "\r%*s\r", lg->progress_erase_len, ""); +} + +static void stdiostream_vmessage(xentoollog_logger *logger_in, + xentoollog_level level, + int errnoval, + const char *context, + const char *format, + va_list al) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + + if (level < lg->min_level) + return; + + progress_erase(lg); + + if (lg->flags & XTL_STDIOSTREAM_SHOW_DATE) { + struct tm lt_buf; + time_t now = time(0); + struct tm *lt= localtime_r(&now, <_buf); + if (lt != NULL) + fprintf(lg->f, "%04d-%02d-%02d %02d:%02d:%02d %s ", + lt->tm_year+1900, lt->tm_mon+1, lt->tm_mday, + lt->tm_hour, lt->tm_min, lt->tm_sec, + tzname[!!lt->tm_isdst]); + else + fprintf(lg->f, "[localtime_r failed: %d] ", errno); + } + if (lg->flags & XTL_STDIOSTREAM_SHOW_PID) + fprintf(lg->f, "[%lu] ", (unsigned long)getpid()); + + if (context) + fprintf(lg->f, "%s: ", context); + + fprintf(lg->f, "%s: ", xtl_level_to_string(level)); + + vfprintf(lg->f, format, al); + + if (errnoval >= 0) + fprintf(lg->f, ": %s", strerror(errnoval)); + + putc('\n', lg->f); + fflush(lg->f); +} + +static void stdiostream_message(struct xentoollog_logger *logger_in, + xentoollog_level level, + const char *context, + const char *format, ...) +{ + va_list al; + va_start(al,format); + stdiostream_vmessage(logger_in, level, -1, context, format, al); + va_end(al); +} + +static void stdiostream_progress(struct xentoollog_logger *logger_in, + const char *context, + const char *doing_what, int percent, + unsigned long done, unsigned long total) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + int newpel, extra_erase; + xentoollog_level this_level; + + if (lg->flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + return; + + if (percent < lg->progress_last_percent) { + this_level = XTL_PROGRESS; + } else if (percent == lg->progress_last_percent) { + return; + } else if (percent < lg->progress_last_percent + 5) { + this_level = XTL_DETAIL; + } else { + this_level = XTL_PROGRESS; + } + + if (this_level < lg->min_level) + return; + + lg->progress_last_percent = percent; + + if (!lg->progress_use_cr) { + stdiostream_message(logger_in, this_level, context, + "%s: %lu/%lu %3d%%", + doing_what, done, total, percent); + return; + } + + if (lg->progress_erase_len) + putc('\r', lg->f); + + newpel = fprintf(lg->f, "%s%s" "%s: %lu/%lu %3d%%%s", + context?context:"", context?": ":"", + doing_what, done, total, percent, + done == total ? "\n" : ""); + + extra_erase = lg->progress_erase_len - newpel; + if (extra_erase > 0) + fprintf(lg->f, "%*s\r", extra_erase, ""); + + lg->progress_erase_len = newpel; +} + +static void stdiostream_destroy(struct xentoollog_logger *logger_in) { + xentoollog_logger_stdiostream *lg = (void*)logger_in; + progress_erase(lg); + free(lg); +} + +void xtl_stdiostream_set_minlevel(xentoollog_logger_stdiostream *lg, + xentoollog_level min_level) { + lg->min_level = min_level; +} + +void xtl_stdiostream_adjust_flags(xentoollog_logger_stdiostream *lg, + unsigned set_flags, unsigned clear_flags) { + unsigned new_flags = (lg->flags & ~clear_flags) | set_flags; + if (new_flags & XTL_STDIOSTREAM_HIDE_PROGRESS) + progress_erase(lg); + lg->flags = new_flags; +} + +xentoollog_logger_stdiostream *xtl_createlogger_stdiostream + (FILE *f, xentoollog_level min_level, unsigned flags) { + xentoollog_logger_stdiostream newlogger; + + newlogger.f = f; + newlogger.min_level = min_level; + newlogger.flags = flags; + + switch (flags & (XTL_STDIOSTREAM_PROGRESS_USE_CR | + XTL_STDIOSTREAM_PROGRESS_NO_CR)) { + case XTL_STDIOSTREAM_PROGRESS_USE_CR: newlogger.progress_use_cr = 1; break; + case XTL_STDIOSTREAM_PROGRESS_NO_CR: newlogger.progress_use_cr = 0; break; + case 0: + newlogger.progress_use_cr = isatty(fileno(newlogger.f)) > 0; + break; + default: + errno = EINVAL; + return 0; + } + + if (newlogger.flags & XTL_STDIOSTREAM_SHOW_DATE) tzset(); + + newlogger.progress_erase_len = 0; + newlogger.progress_last_percent = 0; + + return XTL_NEW_LOGGER(stdiostream, newlogger); +} diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 2abae0c..6ff5bee 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -20,12 +20,11 @@ LIBUUID_LIBS += -luuid endif LIBXL_LIBS = -LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS = $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libblktapctl) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) ifeq ($(CONFIG_REMUS_NETBUF),y) LIBXL_LIBS += $(LIBNL3_LIBS) endif -CFLAGS_LIBXL += $(CFLAGS_libxentoollog) CFLAGS_LIBXL += $(CFLAGS_libxenctrl) CFLAGS_LIBXL += $(CFLAGS_libxenguest) CFLAGS_LIBXL += $(CFLAGS_libxenstore) @@ -150,7 +149,7 @@ CFLAGS_XL += -Wshadow XL_OBJS = xl.o xl_cmdimpl.o xl_cmdtable.o xl_sxp.o $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \ - CFLAGS += $(CFLAGS_libxentoollog) + CFLAGS += $(CFLAGS_libxenctrl) # For xentoollog.h $(XL_OBJS): CFLAGS += $(CFLAGS_XL) $(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it. @@ -254,19 +253,19 @@ libxlutil.a: $(LIBXLU_OBJS) $(AR) rcs libxlutil.a $^ xl: $(XL_OBJS) libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XL_OBJS) libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) xen-init-dom0: $(XEN_INIT_DOM0_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(XEN_INIT_DOM0_OBJS) $(LDLIBS_libxenstore) $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) test_%: test_%.o test_common.o libxlutil.so libxenlight_test.so - $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxentoollog) -lyajl $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $^ $(filter-out %libxenlight.so, $(LDLIBS_libxenlight)) $(LDLIBS_libxenctrl) -lyajl $(APPEND_LDFLAGS) libxl-save-helper: $(SAVE_HELPER_OBJS) libxenlight.so - $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ $(SAVE_HELPER_OBJS) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(APPEND_LDFLAGS) testidl: testidl.o libxlutil.so libxenlight.so - $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) $(APPEND_LDFLAGS) + $(CC) $(LDFLAGS) -o $@ testidl.o libxlutil.so $(LDLIBS_libxenlight) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) $(PKG_CONFIG): % : %.in Makefile @sed -e 's/@@version@@/$(MAJOR).$(MINOR)/g' < $< > $@.new diff --git a/tools/ocaml/libs/xentoollog/Makefile b/tools/ocaml/libs/xentoollog/Makefile index 8ae0a78..666eb66 100644 --- a/tools/ocaml/libs/xentoollog/Makefile +++ b/tools/ocaml/libs/xentoollog/Makefile @@ -5,7 +5,7 @@ include $(TOPLEVEL)/common.make # allow mixed declarations and code CFLAGS += -Wno-declaration-after-statement -CFLAGS += $(CFLAGS_libxentoollog) +CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenguest) CFLAGS += $(APPEND_CFLAGS) OCAMLINCLUDE += @@ -13,7 +13,7 @@ OBJS = xentoollog INTF = xentoollog.cmi LIBS = xentoollog.cma xentoollog.cmxa -LIBS_xentoollog = $(LDLIBS_libxentoollog) +LIBS_xentoollog = $(LDLIBS_libxenctrl) xentoollog_OBJS = $(OBJS) xentoollog_C_OBJS = xentoollog_stubs @@ -49,7 +49,7 @@ xentoollog.mli: xentoollog.mli.in _xtl_levels.mli.in libs: $(LIBS) -_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libs/toollog/include/xentoollog.h +_xtl_levels.ml.in _xtl_levels.mli.in _xtl_levels.inc: genlevels.py $(XEN_ROOT)/tools/libxc/include/xentoollog.h $(PYTHON) genlevels.py _xtl_levels.mli.in _xtl_levels.ml.in _xtl_levels.inc .PHONY: install diff --git a/tools/ocaml/libs/xentoollog/genlevels.py b/tools/ocaml/libs/xentoollog/genlevels.py index 8c233c5..65d334f 100755 --- a/tools/ocaml/libs/xentoollog/genlevels.py +++ b/tools/ocaml/libs/xentoollog/genlevels.py @@ -3,7 +3,7 @@ import sys def read_levels(): - f = open('../../../libs/toollog/include/xentoollog.h', 'r') + f = open('../../../libxc/include/xentoollog.h', 'r') levels = [] record = False diff --git a/tools/python/setup.py b/tools/python/setup.py index 9771cc4..fdba866 100644 --- a/tools/python/setup.py +++ b/tools/python/setup.py @@ -7,17 +7,16 @@ XEN_ROOT = "../.." extra_compile_args = [ "-fno-strict-aliasing", "-Werror" ] PATH_XEN = XEN_ROOT + "/tools/include" -PATH_LIBXENTOOLLOG = XEN_ROOT + "/tools/libs/toollog" PATH_LIBXC = XEN_ROOT + "/tools/libxc" PATH_LIBXL = XEN_ROOT + "/tools/libxl" PATH_XENSTORE = XEN_ROOT + "/tools/xenstore" xc = Extension("xc", extra_compile_args = extra_compile_args, - include_dirs = [ PATH_XEN, PATH_LIBXENTOOLLOG + "/include", PATH_LIBXC + "/include", "xen/lowlevel/xc" ], + include_dirs = [ PATH_XEN, PATH_LIBXC + "/include", "xen/lowlevel/xc" ], library_dirs = [ PATH_LIBXC ], libraries = [ "xenctrl", "xenguest" ], - depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so", "-Wl,-rpath-link="+PATH_LIBXENTOOLLOG ], + depends = [ PATH_LIBXC + "/libxenctrl.so", PATH_LIBXC + "/libxenguest.so" ], sources = [ "xen/lowlevel/xc/xc.c" ]) xs = Extension("xs", diff --git a/tools/xenpaging/Makefile b/tools/xenpaging/Makefile index e63d894..2407a30 100644 --- a/tools/xenpaging/Makefile +++ b/tools/xenpaging/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/Rules.mk # xenpaging.c and file_ops.c incorrectly use libxc internals CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(PTHREAD_CFLAGS) -I$(XEN_ROOT)/tools/libxc -LDLIBS += $(LDLIBS_libxentoollog) $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) +LDLIBS += $(LDLIBS_libxenctrl) $(LDLIBS_libxenstore) $(PTHREAD_LIBS) LDFLAGS += $(PTHREAD_LDFLAGS) POLICY = default -- generated by git-patchbot for /home/xen/git/xen.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 16 04:45:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xg-0000G8-GY; Wed, 16 Dec 2015 04:45:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xe-0000Fn-KB for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:10 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 91/BB-18316-55CE0765; Wed, 16 Dec 2015 04:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450241108!5697179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.9 required=7.0 tests=BODY_RANDOM_LONG,URG_BIZ X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24029 invoked from network); 16 Dec 2015 04:45:08 -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; 16 Dec 2015 04:45:08 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xa-0005Tu-UK for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xa-0001g7-S0 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:06 +0000 Date: Wed, 16 Dec 2015 04:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d Posted-intterrupt (PI) design X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b59f4b6e78bc5685171df12c7a27d09ad04caaa0 Author: Feng Wu AuthorDate: Thu Dec 10 13:11:25 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:11:25 2015 +0100 VT-d Posted-intterrupt (PI) design Add the design doc for VT-d PI. Signed-off-by: Feng Wu Reviewed-by: Kevin Tian Reviewed-by: Konrad Rzeszutek Wilk --- docs/misc/vtd-pi.txt | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 336 insertions(+), 0 deletions(-) diff --git a/docs/misc/vtd-pi.txt b/docs/misc/vtd-pi.txt new file mode 100644 index 0000000..d14b208 --- /dev/null +++ b/docs/misc/vtd-pi.txt @@ -0,0 +1,336 @@ +Authors: Feng Wu + +VT-d Posted-interrupt (PI) design for XEN + +Important Definitions +================== +VT-d posted-interrupts: posted-interrupts support in root-complex side +CPU-side posted-interrupts: posted-interrupts support in CPU side +IRTE: Interrupt Remapping Table Entry +Posted-interrupt Descriptor Address: the address of the posted-interrupt descriptor +Virtual Vector: the guest vector of the interrupt +URG: indicates if the interrupt is urgent + +Posted-interrupt descriptor: +The Posted Interrupt Descriptor hosts the following fields: +Posted Interrupt Request (PIR): Provide storage for posting (recording) interrupts (one bit +per vector, for up to 256 vectors). + +Outstanding Notification (ON): Indicate if there is a notification event outstanding (not +processed by processor or software) for this Posted Interrupt Descriptor. When this field is 0, +hardware modifies it from 0 to 1 when generating a notification event, and the entity receiving +the notification event (processor or software) resets it as part of posted interrupt processing. + +Suppress Notification (SN): Indicate if a notification event is to be suppressed (not +generated) for non-urgent interrupt requests (interrupts processed through an IRTE with +URG=0). + +Notification Vector (NV): Specify the vector for notification event (interrupt). + +Notification Destination (NDST): Specify the physical APIC-ID of the destination logical +processor for the notification event. + +Background +========== +With the development of virtualization, there are more and more device +assignment requirements. However, today when a VM is running with +assigned devices (such as, NIC), external interrupt handling for the assigned +devices always needs VMM intervention. + +VT-d Posted-interrupt is a more enhanced method to handle interrupts +in the virtualization environment. Interrupt posting is the process by +which an interrupt request is recorded in a memory-resident +posted-interrupt-descriptor structure by the root-complex or software, +followed by an optional notification event issued to the CPU. + +With VT-d Posted-interrupt we can get the following advantages: +- Direct delivery of external interrupts to running vCPUs without VMM +intervention +- Decrease the interrupt migration complexity. On vCPU migration, software +can atomically co-migrate all interrupts targeting the migrating vCPU. For +virtual machines with assigned devices, migrating a vCPU across pCPUs +either incurs the overhead of forwarding interrupts in software (e.g. via VMM +generated IPIs), or complexity to independently migrate each interrupt targeting +the vCPU to the new pCPU. However, after enabling VT-d PI, the destination vCPU +of an external interrupt from assigned devices is stored in the IRTE (i.e. +Posted-interrupt Descriptor Address), when vCPU is migrated to another pCPU, +we will set this new pCPU in the 'NDST' field of Posted-interrupt descriptor, this +make the interrupt migration automatic. + +Here is what Xen currently does for external interrupts from assigned devices: + +When a VM is running and an external interrupt from an assigned device occurs +for it. VM-EXIT happens, then: + +vmx_do_extint() --> do_IRQ() --> __do_IRQ_guest() --> hvm_do_IRQ_dpci() --> +raise_softirq_for(pirq_dpci) --> raise_softirq(HVM_DPCI_SOFTIRQ) + +softirq HVM_DPCI_SOFTIRQ is bound to dpci_softirq() + +dpci_softirq() --> hvm_dirq_assist() --> vmsi_deliver_pirq() --> vmsi_deliver() --> +vmsi_inj_irq() --> vlapic_set_irq() + +vlapic_set_irq() does the following things: +1. If CPU-side posted-interrupt is supported, call vmx_deliver_posted_intr() to deliver +the virtual interrupt via posted-interrupt infrastructure. +2. Else if CPU-side posted-interrupt is not supported, set the related vIRR in vLAPIC +page and call vcpu_kick() to kick the related vCPU. Before VM-Entry, vmx_intr_assist() +will help to inject the interrupt to guests. + +However, after VT-d PI is supported, when a guest is running in non-root and an +external interrupt from an assigned device occurs for it. no VM-Exit is needed, +the guest can handle this totally in non-root mode, thus avoiding all the above +code flow. + +Posted-interrupt Introduction +======================== +There are two components in the Posted-interrupt architecture: +Processor Support and Root-Complex Support + +- Processor Support +Posted-interrupt processing is a feature by which a processor processes +the virtual interrupts by recording them as pending on the virtual-APIC +page. + +Posted-interrupt processing is enabled by setting the process posted +interrupts VM-execution control. The processing is performed in response +to the arrival of an interrupt with the posted-interrupt notification vector. +In response to such an interrupt, the processor processes virtual interrupts +recorded in a data structure called a posted-interrupt descriptor. + +More information about APICv and CPU-side Posted-interrupt, please refer +to Chapter "APIC VIRTUALIZATION AND VIRTUAL INTERRUPTS", and Section +"POSTED-INTERRUPT PROCESSING" in the Intel SDM: +http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf + +- Root-Complex Support +Interrupt posting is the process by which an interrupt request (from IOAPIC +or MSI/MSIx capable sources) is recorded in a memory-resident +posted-interrupt-descriptor structure by the root-complex, followed by +an optional notification event issued to the CPU complex. The interrupt +request arriving at the root-complex carry the identity of the interrupt +request source and a 'remapping-index'. The remapping-index is used to +look-up an entry from the memory-resident interrupt-remap-table. Unlike +interrupt-remapping, the interrupt-remap-table-entry for a posted-interrupt, +specifies a virtual-vector and a pointer to the posted-interrupt descriptor. +The virtual-vector specifies the vector of the interrupt to be recorded in +the posted-interrupt descriptor. The posted-interrupt descriptor hosts storage +for the virtual-vectors and contains the attributes of the notification event +(interrupt) to be issued to the CPU complex to inform CPU/software about pending +interrupts recorded in the posted-interrupt descriptor. + +More information about VT-d PI, please refer to +http://www.intel.com/content/www/us/en/intelligent-systems/intel-technology/vt-directed-io-spec.html + +Design Overview +============== +In this design, we will cover the following items: +1. Add a variable to control whether enable VT-d posted-interrupt or not. +2. VT-d PI feature detection. +3. Extend posted-interrupt descriptor structure to cover VT-d PI specific items. +4. Extend IRTE structure to support VT-d PI. +5. Introduce a new global vector which is used for waking up the blocked vCPU. +6. Update IRTE when guest modifies the interrupt configuration (MSI/MSIx configuration). +7. Update posted-interrupt descriptor during vCPU scheduling. +8. How to wakeup blocked vCPU when an interrupt is posted for it (wakeup notification handler). +9. New boot command line for Xen, which controls VT-d PI feature by user. +10. Multicast/broadcast and lowest priority interrupts consideration. + + +Implementation details +=================== +- New variable to control VT-d PI + +Like variable 'iommu_intremap' for interrupt remapping, it is very straightforward +to add a new one 'iommu_intpost' for posted-interrupt. 'iommu_intpost' is set +only when interrupt remapping and VT-d posted-interrupt are both enabled. + +- VT-d PI feature detection. +Bit 59 in VT-d Capability Register is used to report VT-d Posted-interrupt support. + +- Extend posted-interrupt descriptor structure to cover VT-d PI specific items. +Here is the new structure for posted-interrupt descriptor: + +struct pi_desc { + DECLARE_BITMAP(pir, NR_VECTORS); + union { + struct + { + u16 on : 1, /* bit 256 - Outstanding Notification */ + sn : 1, /* bit 257 - Suppress Notification */ + rsvd_1 : 14; /* bit 271:258 - Reserved */ + u8 nv; /* bit 279:272 - Notification Vector */ + u8 rsvd_2; /* bit 287:280 - Reserved */ + u32 ndst; /* bit 319:288 - Notification Destination */ + }; + u64 control; + }; + u32 rsvd[6]; +} __attribute__ ((aligned (64))); + +- Extend IRTE structure to support VT-d PI. + +Here is the new structure for IRTE: +/* interrupt remap entry */ +struct iremap_entry { + union { + struct { u64 lo, hi; }; + struct { + u16 p : 1, + fpd : 1, + dm : 1, + rh : 1, + tm : 1, + dlm : 3, + avail : 4, + res_1 : 4; + u8 vector; + u8 res_2; + u32 dst; + u16 sid; + u16 sq : 2, + svt : 2, + res_3 : 12; + u32 res_4 : 32; + } remap; + struct { + u16 p : 1, + fpd : 1, + res_1 : 6, + avail : 4, + res_2 : 2, + urg : 1, + im : 1; + u8 vector; + u8 res_3; + u32 res_4 : 6, + pda_l : 26; + u16 sid; + u16 sq : 2, + svt : 2, + res_5 : 12; + u32 pda_h; + } post; + }; +}; + +- Introduce a new global vector which is used to wake up the blocked vCPU. + +Currently, there is a global vector 'posted_intr_vector', which is used as the +global notification vector for all vCPUs in the system. This vector is stored in +VMCS and CPU considers it as a _special_ vector, uses it to notify the related +pCPU when an interrupt is recorded in the posted-interrupt descriptor. + +This existing global vector is a _special_ vector to CPU, CPU handle it in a +_special_ way compared to normal vectors, please refer to 29.6 in Intel SDM +http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf +for more information about how CPU handles it. + +After having VT-d PI, VT-d engine can issue notification event when the +assigned devices issue interrupts. We need add a new global vector to +wakeup the blocked vCPU, please refer to later section in this design for +how to use this new global vector. + +- Update IRTE when guest modifies the interrupt configuration (MSI/MSIx configuration). +After VT-d PI is introduced, the format of IRTE is changed as follows: + Descriptor Address: the address of the posted-interrupt descriptor + Virtual Vector: the guest vector of the interrupt + URG: indicates if the interrupt is urgent + Other fields continue to have the same meaning + +'Descriptor Address' tells the destination vCPU of this interrupt, since +each vCPU has a dedicated posted-interrupt descriptor. + +'Virtual Vector' tells the guest vector of the interrupt. + +When guest changes the configuration of the interrupts, such as, the +cpu affinity, or the vector, we need to update the associated IRTE accordingly. + +- Update posted-interrupt descriptor during vCPU scheduling + +The basic idea here is: +1. When vCPU is running + - Set 'NV' to 'posted_intr_vector'. + - Clear 'SN' to accept posted-interrupts. + - Set 'NDST' to the pCPU on which the vCPU will be running. +2. When vCPU is blocked + - Set 'NV' to ' pi_wakeup_vector ', so we can wake up the + related vCPU when posted-interrupt happens for it. + Please refer to the above section about the new global vector. + - Clear 'SN' to accept posted-interrupts +3. When vCPU is preempted or sleeping + - Set 'SN' to suppress non-urgent interrupts + (Currently, we only support non-urgent interrupts) + When vCPU is preempted or sleep, it doesn't need to accept + posted-interrupt notification event since we don't change the behavior + of scheduler when the interrupt occurs, we still need wait for the next + scheduling of the vCPU. When external interrupts from assigned devices occur, + the interrupts are recorded in PIR, and will be synced to IRR before VM-Entry. + - Set 'NV' to 'posted_intr_vector'. + +- How to wakeup blocked vCPU when an interrupt is posted for it (wakeup notification handler). + +Here is the scenario for the usage of the new global vector: + +1. vCPU0 is running on pCPU0 +2. vCPU0 is blocked and vCPU1 is currently running on pCPU0 +3. An external interrupt from an assigned device occurs for vCPU0, if we +still use 'posted_intr_vector' as the notification vector for vCPU0, the +notification event for vCPU0 (the event will go to pCPU1) will be consumed +by vCPU1 incorrectly (remember this is a special vector to CPU). The worst +case is that vCPU0 will never be woken up again since the wakeup event +for it is always consumed by other vCPUs incorrectly. So we need introduce +another global vector, naming 'pi_wakeup_vector' to wake up the blocked vCPU. + +After using 'pi_wakeup_vector' for vCPU0, VT-d engine will issue notification +event using this new vector. Since this new vector is not a SPECIAL one to CPU, +it is just a normal vector. To CPU, it just receives an normal external interrupt, +then we can get control in the handler of this new vector. In this case, hypervisor +can do something in it, such as wakeup the blocked vCPU. + +Here are what we do for the blocked vCPU: +1. Define a per-cpu list 'pi_blocked_vcpu', which stored the blocked +vCPU on the pCPU. +2. When the vCPU is going to block, insert the vCPU +to the per-cpu list belonging to the pCPU it was running. +3. When the vCPU is unblocked, remove the vCPU from the related pCPU list. + +In the handler of 'pi_wakeup_vector', we do: +1. Get the physical CPU. +2. Iterate the list 'pi_blocked_vcpu' of the current pCPU, if 'ON' is set, +we unblock the associated vCPU. + +When the vCPU is blocked, we change the posted-interrupts descriptor and +put it in the pCPU's blocking list, we don't change the status of posted- +interrupts descriptor back when the vCPU is unblocked or the blocking +operation directly returns since there are events to be delivered. Instead, +we do it exactly before VM-Entry. + +- New boot command line for Xen, which controls VT-d PI feature by user. + +Like 'intremap' for interrupt remapping, we add a new boot command line +'intpost' for posted-interrupts. + +- Multicast/broadcast and lowest priority interrupts consideration. + +With VT-d PI, the destination vCPU information of an external interrupt +from assigned devices is stored in IRTE, this makes the following +consideration of the design: +1. Multicast/broadcast interrupts cannot be posted. +2. For lowest-priority interrupts, new Intel CPU/Chipset/root-complex +(starting from Nehalem) ignore TPR value, and instead supported two other +ways (configurable by BIOS) on how the handle lowest priority interrupts: + A) Round robin: In this method, the chipset simply delivers lowest priority +interrupts in a round-robin manner across all the available logical CPUs. While +this provides good load balancing, this was not the best thing to do always as +interrupts from the same device (like NIC) will start running on all the CPUs +thrashing caches and taking locks. This led to the next scheme. + B) Vector hashing: In this method, hardware would apply a hash function +on the vector value in the interrupt request, and use that hash to pick a logical +CPU to route the lowest priority interrupt. This way, a given vector always goes +to the same logical CPU, avoiding the thrashing problem above. + +So, gist of above is that, lowest priority interrupts has never been delivered as +"lowest priority" in physical hardware. + +Vector hashing is used in this design. -- generated by git-patchbot for /home/xen/git/xen.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 16 04:45:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xg-0000G8-GY; Wed, 16 Dec 2015 04:45:12 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xe-0000Fn-KB for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:10 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 91/BB-18316-55CE0765; Wed, 16 Dec 2015 04:45:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450241108!5697179!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.9 required=7.0 tests=BODY_RANDOM_LONG,URG_BIZ X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24029 invoked from network); 16 Dec 2015 04:45:08 -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; 16 Dec 2015 04:45:08 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xa-0005Tu-UK for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:07 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xa-0001g7-S0 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:06 +0000 Date: Wed, 16 Dec 2015 04:45:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d Posted-intterrupt (PI) design X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b59f4b6e78bc5685171df12c7a27d09ad04caaa0 Author: Feng Wu AuthorDate: Thu Dec 10 13:11:25 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:11:25 2015 +0100 VT-d Posted-intterrupt (PI) design Add the design doc for VT-d PI. Signed-off-by: Feng Wu Reviewed-by: Kevin Tian Reviewed-by: Konrad Rzeszutek Wilk --- docs/misc/vtd-pi.txt | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 336 insertions(+), 0 deletions(-) diff --git a/docs/misc/vtd-pi.txt b/docs/misc/vtd-pi.txt new file mode 100644 index 0000000..d14b208 --- /dev/null +++ b/docs/misc/vtd-pi.txt @@ -0,0 +1,336 @@ +Authors: Feng Wu + +VT-d Posted-interrupt (PI) design for XEN + +Important Definitions +================== +VT-d posted-interrupts: posted-interrupts support in root-complex side +CPU-side posted-interrupts: posted-interrupts support in CPU side +IRTE: Interrupt Remapping Table Entry +Posted-interrupt Descriptor Address: the address of the posted-interrupt descriptor +Virtual Vector: the guest vector of the interrupt +URG: indicates if the interrupt is urgent + +Posted-interrupt descriptor: +The Posted Interrupt Descriptor hosts the following fields: +Posted Interrupt Request (PIR): Provide storage for posting (recording) interrupts (one bit +per vector, for up to 256 vectors). + +Outstanding Notification (ON): Indicate if there is a notification event outstanding (not +processed by processor or software) for this Posted Interrupt Descriptor. When this field is 0, +hardware modifies it from 0 to 1 when generating a notification event, and the entity receiving +the notification event (processor or software) resets it as part of posted interrupt processing. + +Suppress Notification (SN): Indicate if a notification event is to be suppressed (not +generated) for non-urgent interrupt requests (interrupts processed through an IRTE with +URG=0). + +Notification Vector (NV): Specify the vector for notification event (interrupt). + +Notification Destination (NDST): Specify the physical APIC-ID of the destination logical +processor for the notification event. + +Background +========== +With the development of virtualization, there are more and more device +assignment requirements. However, today when a VM is running with +assigned devices (such as, NIC), external interrupt handling for the assigned +devices always needs VMM intervention. + +VT-d Posted-interrupt is a more enhanced method to handle interrupts +in the virtualization environment. Interrupt posting is the process by +which an interrupt request is recorded in a memory-resident +posted-interrupt-descriptor structure by the root-complex or software, +followed by an optional notification event issued to the CPU. + +With VT-d Posted-interrupt we can get the following advantages: +- Direct delivery of external interrupts to running vCPUs without VMM +intervention +- Decrease the interrupt migration complexity. On vCPU migration, software +can atomically co-migrate all interrupts targeting the migrating vCPU. For +virtual machines with assigned devices, migrating a vCPU across pCPUs +either incurs the overhead of forwarding interrupts in software (e.g. via VMM +generated IPIs), or complexity to independently migrate each interrupt targeting +the vCPU to the new pCPU. However, after enabling VT-d PI, the destination vCPU +of an external interrupt from assigned devices is stored in the IRTE (i.e. +Posted-interrupt Descriptor Address), when vCPU is migrated to another pCPU, +we will set this new pCPU in the 'NDST' field of Posted-interrupt descriptor, this +make the interrupt migration automatic. + +Here is what Xen currently does for external interrupts from assigned devices: + +When a VM is running and an external interrupt from an assigned device occurs +for it. VM-EXIT happens, then: + +vmx_do_extint() --> do_IRQ() --> __do_IRQ_guest() --> hvm_do_IRQ_dpci() --> +raise_softirq_for(pirq_dpci) --> raise_softirq(HVM_DPCI_SOFTIRQ) + +softirq HVM_DPCI_SOFTIRQ is bound to dpci_softirq() + +dpci_softirq() --> hvm_dirq_assist() --> vmsi_deliver_pirq() --> vmsi_deliver() --> +vmsi_inj_irq() --> vlapic_set_irq() + +vlapic_set_irq() does the following things: +1. If CPU-side posted-interrupt is supported, call vmx_deliver_posted_intr() to deliver +the virtual interrupt via posted-interrupt infrastructure. +2. Else if CPU-side posted-interrupt is not supported, set the related vIRR in vLAPIC +page and call vcpu_kick() to kick the related vCPU. Before VM-Entry, vmx_intr_assist() +will help to inject the interrupt to guests. + +However, after VT-d PI is supported, when a guest is running in non-root and an +external interrupt from an assigned device occurs for it. no VM-Exit is needed, +the guest can handle this totally in non-root mode, thus avoiding all the above +code flow. + +Posted-interrupt Introduction +======================== +There are two components in the Posted-interrupt architecture: +Processor Support and Root-Complex Support + +- Processor Support +Posted-interrupt processing is a feature by which a processor processes +the virtual interrupts by recording them as pending on the virtual-APIC +page. + +Posted-interrupt processing is enabled by setting the process posted +interrupts VM-execution control. The processing is performed in response +to the arrival of an interrupt with the posted-interrupt notification vector. +In response to such an interrupt, the processor processes virtual interrupts +recorded in a data structure called a posted-interrupt descriptor. + +More information about APICv and CPU-side Posted-interrupt, please refer +to Chapter "APIC VIRTUALIZATION AND VIRTUAL INTERRUPTS", and Section +"POSTED-INTERRUPT PROCESSING" in the Intel SDM: +http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf + +- Root-Complex Support +Interrupt posting is the process by which an interrupt request (from IOAPIC +or MSI/MSIx capable sources) is recorded in a memory-resident +posted-interrupt-descriptor structure by the root-complex, followed by +an optional notification event issued to the CPU complex. The interrupt +request arriving at the root-complex carry the identity of the interrupt +request source and a 'remapping-index'. The remapping-index is used to +look-up an entry from the memory-resident interrupt-remap-table. Unlike +interrupt-remapping, the interrupt-remap-table-entry for a posted-interrupt, +specifies a virtual-vector and a pointer to the posted-interrupt descriptor. +The virtual-vector specifies the vector of the interrupt to be recorded in +the posted-interrupt descriptor. The posted-interrupt descriptor hosts storage +for the virtual-vectors and contains the attributes of the notification event +(interrupt) to be issued to the CPU complex to inform CPU/software about pending +interrupts recorded in the posted-interrupt descriptor. + +More information about VT-d PI, please refer to +http://www.intel.com/content/www/us/en/intelligent-systems/intel-technology/vt-directed-io-spec.html + +Design Overview +============== +In this design, we will cover the following items: +1. Add a variable to control whether enable VT-d posted-interrupt or not. +2. VT-d PI feature detection. +3. Extend posted-interrupt descriptor structure to cover VT-d PI specific items. +4. Extend IRTE structure to support VT-d PI. +5. Introduce a new global vector which is used for waking up the blocked vCPU. +6. Update IRTE when guest modifies the interrupt configuration (MSI/MSIx configuration). +7. Update posted-interrupt descriptor during vCPU scheduling. +8. How to wakeup blocked vCPU when an interrupt is posted for it (wakeup notification handler). +9. New boot command line for Xen, which controls VT-d PI feature by user. +10. Multicast/broadcast and lowest priority interrupts consideration. + + +Implementation details +=================== +- New variable to control VT-d PI + +Like variable 'iommu_intremap' for interrupt remapping, it is very straightforward +to add a new one 'iommu_intpost' for posted-interrupt. 'iommu_intpost' is set +only when interrupt remapping and VT-d posted-interrupt are both enabled. + +- VT-d PI feature detection. +Bit 59 in VT-d Capability Register is used to report VT-d Posted-interrupt support. + +- Extend posted-interrupt descriptor structure to cover VT-d PI specific items. +Here is the new structure for posted-interrupt descriptor: + +struct pi_desc { + DECLARE_BITMAP(pir, NR_VECTORS); + union { + struct + { + u16 on : 1, /* bit 256 - Outstanding Notification */ + sn : 1, /* bit 257 - Suppress Notification */ + rsvd_1 : 14; /* bit 271:258 - Reserved */ + u8 nv; /* bit 279:272 - Notification Vector */ + u8 rsvd_2; /* bit 287:280 - Reserved */ + u32 ndst; /* bit 319:288 - Notification Destination */ + }; + u64 control; + }; + u32 rsvd[6]; +} __attribute__ ((aligned (64))); + +- Extend IRTE structure to support VT-d PI. + +Here is the new structure for IRTE: +/* interrupt remap entry */ +struct iremap_entry { + union { + struct { u64 lo, hi; }; + struct { + u16 p : 1, + fpd : 1, + dm : 1, + rh : 1, + tm : 1, + dlm : 3, + avail : 4, + res_1 : 4; + u8 vector; + u8 res_2; + u32 dst; + u16 sid; + u16 sq : 2, + svt : 2, + res_3 : 12; + u32 res_4 : 32; + } remap; + struct { + u16 p : 1, + fpd : 1, + res_1 : 6, + avail : 4, + res_2 : 2, + urg : 1, + im : 1; + u8 vector; + u8 res_3; + u32 res_4 : 6, + pda_l : 26; + u16 sid; + u16 sq : 2, + svt : 2, + res_5 : 12; + u32 pda_h; + } post; + }; +}; + +- Introduce a new global vector which is used to wake up the blocked vCPU. + +Currently, there is a global vector 'posted_intr_vector', which is used as the +global notification vector for all vCPUs in the system. This vector is stored in +VMCS and CPU considers it as a _special_ vector, uses it to notify the related +pCPU when an interrupt is recorded in the posted-interrupt descriptor. + +This existing global vector is a _special_ vector to CPU, CPU handle it in a +_special_ way compared to normal vectors, please refer to 29.6 in Intel SDM +http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-software-developer-manual-325462.pdf +for more information about how CPU handles it. + +After having VT-d PI, VT-d engine can issue notification event when the +assigned devices issue interrupts. We need add a new global vector to +wakeup the blocked vCPU, please refer to later section in this design for +how to use this new global vector. + +- Update IRTE when guest modifies the interrupt configuration (MSI/MSIx configuration). +After VT-d PI is introduced, the format of IRTE is changed as follows: + Descriptor Address: the address of the posted-interrupt descriptor + Virtual Vector: the guest vector of the interrupt + URG: indicates if the interrupt is urgent + Other fields continue to have the same meaning + +'Descriptor Address' tells the destination vCPU of this interrupt, since +each vCPU has a dedicated posted-interrupt descriptor. + +'Virtual Vector' tells the guest vector of the interrupt. + +When guest changes the configuration of the interrupts, such as, the +cpu affinity, or the vector, we need to update the associated IRTE accordingly. + +- Update posted-interrupt descriptor during vCPU scheduling + +The basic idea here is: +1. When vCPU is running + - Set 'NV' to 'posted_intr_vector'. + - Clear 'SN' to accept posted-interrupts. + - Set 'NDST' to the pCPU on which the vCPU will be running. +2. When vCPU is blocked + - Set 'NV' to ' pi_wakeup_vector ', so we can wake up the + related vCPU when posted-interrupt happens for it. + Please refer to the above section about the new global vector. + - Clear 'SN' to accept posted-interrupts +3. When vCPU is preempted or sleeping + - Set 'SN' to suppress non-urgent interrupts + (Currently, we only support non-urgent interrupts) + When vCPU is preempted or sleep, it doesn't need to accept + posted-interrupt notification event since we don't change the behavior + of scheduler when the interrupt occurs, we still need wait for the next + scheduling of the vCPU. When external interrupts from assigned devices occur, + the interrupts are recorded in PIR, and will be synced to IRR before VM-Entry. + - Set 'NV' to 'posted_intr_vector'. + +- How to wakeup blocked vCPU when an interrupt is posted for it (wakeup notification handler). + +Here is the scenario for the usage of the new global vector: + +1. vCPU0 is running on pCPU0 +2. vCPU0 is blocked and vCPU1 is currently running on pCPU0 +3. An external interrupt from an assigned device occurs for vCPU0, if we +still use 'posted_intr_vector' as the notification vector for vCPU0, the +notification event for vCPU0 (the event will go to pCPU1) will be consumed +by vCPU1 incorrectly (remember this is a special vector to CPU). The worst +case is that vCPU0 will never be woken up again since the wakeup event +for it is always consumed by other vCPUs incorrectly. So we need introduce +another global vector, naming 'pi_wakeup_vector' to wake up the blocked vCPU. + +After using 'pi_wakeup_vector' for vCPU0, VT-d engine will issue notification +event using this new vector. Since this new vector is not a SPECIAL one to CPU, +it is just a normal vector. To CPU, it just receives an normal external interrupt, +then we can get control in the handler of this new vector. In this case, hypervisor +can do something in it, such as wakeup the blocked vCPU. + +Here are what we do for the blocked vCPU: +1. Define a per-cpu list 'pi_blocked_vcpu', which stored the blocked +vCPU on the pCPU. +2. When the vCPU is going to block, insert the vCPU +to the per-cpu list belonging to the pCPU it was running. +3. When the vCPU is unblocked, remove the vCPU from the related pCPU list. + +In the handler of 'pi_wakeup_vector', we do: +1. Get the physical CPU. +2. Iterate the list 'pi_blocked_vcpu' of the current pCPU, if 'ON' is set, +we unblock the associated vCPU. + +When the vCPU is blocked, we change the posted-interrupts descriptor and +put it in the pCPU's blocking list, we don't change the status of posted- +interrupts descriptor back when the vCPU is unblocked or the blocking +operation directly returns since there are events to be delivered. Instead, +we do it exactly before VM-Entry. + +- New boot command line for Xen, which controls VT-d PI feature by user. + +Like 'intremap' for interrupt remapping, we add a new boot command line +'intpost' for posted-interrupts. + +- Multicast/broadcast and lowest priority interrupts consideration. + +With VT-d PI, the destination vCPU information of an external interrupt +from assigned devices is stored in IRTE, this makes the following +consideration of the design: +1. Multicast/broadcast interrupts cannot be posted. +2. For lowest-priority interrupts, new Intel CPU/Chipset/root-complex +(starting from Nehalem) ignore TPR value, and instead supported two other +ways (configurable by BIOS) on how the handle lowest priority interrupts: + A) Round robin: In this method, the chipset simply delivers lowest priority +interrupts in a round-robin manner across all the available logical CPUs. While +this provides good load balancing, this was not the best thing to do always as +interrupts from the same device (like NIC) will start running on all the CPUs +thrashing caches and taking locks. This led to the next scheme. + B) Vector hashing: In this method, hardware would apply a hash function +on the vector value in the interrupt request, and use that hash to pick a logical +CPU to route the lowest priority interrupt. This way, a given vector always goes +to the same logical CPU, avoiding the thrashing problem above. + +So, gist of above is that, lowest priority interrupts has never been delivered as +"lowest priority" in physical hardware. + +Vector hashing is used in this design. -- generated by git-patchbot for /home/xen/git/xen.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 16 04:45:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45: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 1a93xp-0000HO-Kk; Wed, 16 Dec 2015 04:45:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xo-0000HE-FN for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:20 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id E5/0A-03235-F5CE0765; Wed, 16 Dec 2015 04:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1450241118!10706879!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34809 invoked from network); 16 Dec 2015 04:45:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:45:19 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xm-0005U5-5g for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xm-0001gh-3n for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:18 +0000 Date: Wed, 16 Dec 2015 04:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmx: suppress posting interrupts when 'SN' is set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3019170b2a371075cde819089763c4fdefaf69a Author: Feng Wu AuthorDate: Thu Dec 10 13:12:06 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:12:06 2015 +0100 vmx: suppress posting interrupts when 'SN' is set Currently, we don't support urgent interrupt, all interrupts are recognized as non-urgent interrupt, so we cannot send posted-interrupt when 'SN' is set. Signed-off-by: Feng Wu Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Acked-by: --- xen/arch/x86/hvm/vmx/vmx.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f7c5e4f..bc7d370 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1726,8 +1726,35 @@ static void vmx_deliver_posted_intr(struct vcpu *v, u8 vector) */ pi_set_on(&v->arch.hvm_vmx.pi_desc); } - else if ( !pi_test_and_set_on(&v->arch.hvm_vmx.pi_desc) ) + else { + struct pi_desc old, new, prev; + + prev.control = v->arch.hvm_vmx.pi_desc.control; + + do { + /* + * Currently, we don't support urgent interrupt, all + * interrupts are recognized as non-urgent interrupt, + * Besides that, if 'ON' is already set, no need to + * sent posted-interrupts notification event as well, + * according to hardware behavior. + */ + if ( pi_test_sn(&prev) || pi_test_on(&prev) ) + { + vcpu_kick(v); + return; + } + + old.control = v->arch.hvm_vmx.pi_desc.control & + ~((1 << POSTED_INTR_ON) | (1 << POSTED_INTR_SN)); + new.control = v->arch.hvm_vmx.pi_desc.control | + (1 << POSTED_INTR_ON); + + prev.control = cmpxchg(&v->arch.hvm_vmx.pi_desc.control, + old.control, new.control); + } while ( prev.control != old.control ); + __vmx_deliver_posted_interrupt(v); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:45:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45: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 1a93xp-0000HO-Kk; Wed, 16 Dec 2015 04:45:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xo-0000HE-FN for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:20 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id E5/0A-03235-F5CE0765; Wed, 16 Dec 2015 04:45:19 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1450241118!10706879!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 34809 invoked from network); 16 Dec 2015 04:45:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:45:19 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xm-0005U5-5g for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xm-0001gh-3n for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:18 +0000 Date: Wed, 16 Dec 2015 04:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmx: suppress posting interrupts when 'SN' is set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a3019170b2a371075cde819089763c4fdefaf69a Author: Feng Wu AuthorDate: Thu Dec 10 13:12:06 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:12:06 2015 +0100 vmx: suppress posting interrupts when 'SN' is set Currently, we don't support urgent interrupt, all interrupts are recognized as non-urgent interrupt, so we cannot send posted-interrupt when 'SN' is set. Signed-off-by: Feng Wu Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Acked-by: --- xen/arch/x86/hvm/vmx/vmx.c | 29 ++++++++++++++++++++++++++++- 1 files changed, 28 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index f7c5e4f..bc7d370 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1726,8 +1726,35 @@ static void vmx_deliver_posted_intr(struct vcpu *v, u8 vector) */ pi_set_on(&v->arch.hvm_vmx.pi_desc); } - else if ( !pi_test_and_set_on(&v->arch.hvm_vmx.pi_desc) ) + else { + struct pi_desc old, new, prev; + + prev.control = v->arch.hvm_vmx.pi_desc.control; + + do { + /* + * Currently, we don't support urgent interrupt, all + * interrupts are recognized as non-urgent interrupt, + * Besides that, if 'ON' is already set, no need to + * sent posted-interrupts notification event as well, + * according to hardware behavior. + */ + if ( pi_test_sn(&prev) || pi_test_on(&prev) ) + { + vcpu_kick(v); + return; + } + + old.control = v->arch.hvm_vmx.pi_desc.control & + ~((1 << POSTED_INTR_ON) | (1 << POSTED_INTR_SN)); + new.control = v->arch.hvm_vmx.pi_desc.control | + (1 << POSTED_INTR_ON); + + prev.control = cmpxchg(&v->arch.hvm_vmx.pi_desc.control, + old.control, new.control); + } while ( prev.control != old.control ); + __vmx_deliver_posted_interrupt(v); return; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:45:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45: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 1a93xz-0000Iy-PY; Wed, 16 Dec 2015 04:45:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xz-0000Im-3W for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:31 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 79/00-13487-A6CE0765; Wed, 16 Dec 2015 04:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1450241128!11013102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39675 invoked from network); 16 Dec 2015 04:45:29 -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; 16 Dec 2015 04:45:29 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xw-0005UD-IU for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xw-0001hM-Co for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:28 +0000 Date: Wed, 16 Dec 2015 04:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vt-d: add API to update IRTE when VT-d PI is used X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83ea922929df0a006c7e58070938b88502981ba7 Author: Feng Wu AuthorDate: Thu Dec 10 13:13:01 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:13:01 2015 +0100 vt-d: add API to update IRTE when VT-d PI is used This patch adds an API which is used to update the IRTE for posted-interrupt when guest changes MSI/MSI-X information. Signed-off-by: Feng Wu Reviewed-by: Jan Beulich Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/intremap.c | 126 ++++++++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/iommu.h | 6 ++ xen/include/asm-x86/iommu.h | 2 + 3 files changed, 134 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index ed9fb82..0a48cd4 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -905,3 +905,129 @@ void iommu_disable_x2apic_IR(void) for_each_drhd_unit ( drhd ) disable_qinval(drhd->iommu); } + +static void setup_posted_irte( + struct iremap_entry *new_ire, const struct iremap_entry *old_ire, + const struct pi_desc *pi_desc, const uint8_t gvec) +{ + memset(new_ire, sizeof(*new_ire), 0); + + /* + * 'im' filed decides whether the irte is in posted format (with value 1) + * or remapped format (with value 0), if the old irte is in remapped format, + * we copy things from remapped part in 'struct iremap_entry', otherwise, + * we copy from posted part. + */ + if ( !old_ire->remap.im ) + { + new_ire->post.p = old_ire->remap.p; + new_ire->post.fpd = old_ire->remap.fpd; + new_ire->post.sid = old_ire->remap.sid; + new_ire->post.sq = old_ire->remap.sq; + new_ire->post.svt = old_ire->remap.svt; + } + else + { + new_ire->post.p = old_ire->post.p; + new_ire->post.fpd = old_ire->post.fpd; + new_ire->post.sid = old_ire->post.sid; + new_ire->post.sq = old_ire->post.sq; + new_ire->post.svt = old_ire->post.svt; + new_ire->post.urg = old_ire->post.urg; + } + + new_ire->post.im = 1; + new_ire->post.vector = gvec; + new_ire->post.pda_l = virt_to_maddr(pi_desc) >> (32 - PDA_LOW_BIT); + new_ire->post.pda_h = virt_to_maddr(pi_desc) >> 32; +} + +/* + * This function is used to update the IRTE for posted-interrupt + * when guest changes MSI/MSI-X information. + */ +int pi_update_irte(const struct vcpu *v, const struct pirq *pirq, + const uint8_t gvec) +{ + struct irq_desc *desc; + const struct msi_desc *msi_desc; + int remap_index; + int rc = 0; + const struct pci_dev *pci_dev; + const struct acpi_drhd_unit *drhd; + struct iommu *iommu; + struct ir_ctrl *ir_ctrl; + struct iremap_entry *iremap_entries = NULL, *p = NULL; + struct iremap_entry new_ire, old_ire; + const struct pi_desc *pi_desc = &v->arch.hvm_vmx.pi_desc; + __uint128_t ret; + + desc = pirq_spin_lock_irq_desc(pirq, NULL); + if ( !desc ) + return -EINVAL; + + msi_desc = desc->msi_desc; + if ( !msi_desc ) + { + rc = -ENODEV; + goto unlock_out; + } + + pci_dev = msi_desc->dev; + if ( !pci_dev ) + { + rc = -ENODEV; + goto unlock_out; + } + + remap_index = msi_desc->remap_index; + + spin_unlock_irq(&desc->lock); + + ASSERT(spin_is_locked(&pcidevs_lock)); + + /* + * FIXME: For performance reasons we should store the 'iommu' pointer in + * 'struct msi_desc' in some other place, so we don't need to waste + * time searching it here. + */ + drhd = acpi_find_matched_drhd_unit(pci_dev); + if ( !drhd ) + return -ENODEV; + + iommu = drhd->iommu; + ir_ctrl = iommu_ir_ctrl(iommu); + if ( !ir_ctrl ) + return -ENODEV; + + spin_lock_irq(&ir_ctrl->iremap_lock); + + GET_IREMAP_ENTRY(ir_ctrl->iremap_maddr, remap_index, iremap_entries, p); + + old_ire = *p; + + /* Setup/Update interrupt remapping table entry. */ + setup_posted_irte(&new_ire, &old_ire, pi_desc, gvec); + ret = cmpxchg16b(p, &old_ire, &new_ire); + + /* + * In the above, we use cmpxchg16 to atomically update the 128-bit IRTE, + * and the hardware cannot update the IRTE behind us, so the return value + * of cmpxchg16 should be the same as old_ire. This ASSERT validate it. + */ + ASSERT(ret == old_ire.val); + + iommu_flush_cache_entry(p, sizeof(*p)); + iommu_flush_iec_index(iommu, 0, remap_index); + + unmap_vtd_domain_page(iremap_entries); + + spin_unlock_irq(&ir_ctrl->iremap_lock); + + return 0; + + unlock_out: + spin_unlock_irq(&desc->lock); + + return rc; +} diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index b440b69..c55ee08 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -323,6 +323,12 @@ struct iremap_entry { }; }; +/* + * Posted-interrupt descriptor address is 64 bits with 64-byte aligned, only + * the upper 26 bits of lest significiant 32 bits is available. + */ +#define PDA_LOW_BIT 26 + /* Max intr remapping table page order is 8, as max number of IRTEs is 64K */ #define IREMAP_PAGE_ORDER 8 diff --git a/xen/include/asm-x86/iommu.h b/xen/include/asm-x86/iommu.h index 7e24b1a..f22b3a5 100644 --- a/xen/include/asm-x86/iommu.h +++ b/xen/include/asm-x86/iommu.h @@ -31,6 +31,8 @@ bool_t iommu_supports_eim(void); int iommu_enable_x2apic_IR(void); void iommu_disable_x2apic_IR(void); +int pi_update_irte(const struct vcpu *v, const struct pirq *pirq, const uint8_t gvec); + #endif /* !__ARCH_X86_IOMMU_H__ */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:45:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45: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 1a93xz-0000Iy-PY; Wed, 16 Dec 2015 04:45:31 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xz-0000Im-3W for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:31 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 79/00-13487-A6CE0765; Wed, 16 Dec 2015 04:45:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1450241128!11013102!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39675 invoked from network); 16 Dec 2015 04:45:29 -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; 16 Dec 2015 04:45:29 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93xw-0005UD-IU for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:28 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93xw-0001hM-Co for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:28 +0000 Date: Wed, 16 Dec 2015 04:45:28 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vt-d: add API to update IRTE when VT-d PI is used X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 83ea922929df0a006c7e58070938b88502981ba7 Author: Feng Wu AuthorDate: Thu Dec 10 13:13:01 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:13:01 2015 +0100 vt-d: add API to update IRTE when VT-d PI is used This patch adds an API which is used to update the IRTE for posted-interrupt when guest changes MSI/MSI-X information. Signed-off-by: Feng Wu Reviewed-by: Jan Beulich Acked-by: Kevin Tian --- xen/drivers/passthrough/vtd/intremap.c | 126 ++++++++++++++++++++++++++++++++ xen/drivers/passthrough/vtd/iommu.h | 6 ++ xen/include/asm-x86/iommu.h | 2 + 3 files changed, 134 insertions(+), 0 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index ed9fb82..0a48cd4 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -905,3 +905,129 @@ void iommu_disable_x2apic_IR(void) for_each_drhd_unit ( drhd ) disable_qinval(drhd->iommu); } + +static void setup_posted_irte( + struct iremap_entry *new_ire, const struct iremap_entry *old_ire, + const struct pi_desc *pi_desc, const uint8_t gvec) +{ + memset(new_ire, sizeof(*new_ire), 0); + + /* + * 'im' filed decides whether the irte is in posted format (with value 1) + * or remapped format (with value 0), if the old irte is in remapped format, + * we copy things from remapped part in 'struct iremap_entry', otherwise, + * we copy from posted part. + */ + if ( !old_ire->remap.im ) + { + new_ire->post.p = old_ire->remap.p; + new_ire->post.fpd = old_ire->remap.fpd; + new_ire->post.sid = old_ire->remap.sid; + new_ire->post.sq = old_ire->remap.sq; + new_ire->post.svt = old_ire->remap.svt; + } + else + { + new_ire->post.p = old_ire->post.p; + new_ire->post.fpd = old_ire->post.fpd; + new_ire->post.sid = old_ire->post.sid; + new_ire->post.sq = old_ire->post.sq; + new_ire->post.svt = old_ire->post.svt; + new_ire->post.urg = old_ire->post.urg; + } + + new_ire->post.im = 1; + new_ire->post.vector = gvec; + new_ire->post.pda_l = virt_to_maddr(pi_desc) >> (32 - PDA_LOW_BIT); + new_ire->post.pda_h = virt_to_maddr(pi_desc) >> 32; +} + +/* + * This function is used to update the IRTE for posted-interrupt + * when guest changes MSI/MSI-X information. + */ +int pi_update_irte(const struct vcpu *v, const struct pirq *pirq, + const uint8_t gvec) +{ + struct irq_desc *desc; + const struct msi_desc *msi_desc; + int remap_index; + int rc = 0; + const struct pci_dev *pci_dev; + const struct acpi_drhd_unit *drhd; + struct iommu *iommu; + struct ir_ctrl *ir_ctrl; + struct iremap_entry *iremap_entries = NULL, *p = NULL; + struct iremap_entry new_ire, old_ire; + const struct pi_desc *pi_desc = &v->arch.hvm_vmx.pi_desc; + __uint128_t ret; + + desc = pirq_spin_lock_irq_desc(pirq, NULL); + if ( !desc ) + return -EINVAL; + + msi_desc = desc->msi_desc; + if ( !msi_desc ) + { + rc = -ENODEV; + goto unlock_out; + } + + pci_dev = msi_desc->dev; + if ( !pci_dev ) + { + rc = -ENODEV; + goto unlock_out; + } + + remap_index = msi_desc->remap_index; + + spin_unlock_irq(&desc->lock); + + ASSERT(spin_is_locked(&pcidevs_lock)); + + /* + * FIXME: For performance reasons we should store the 'iommu' pointer in + * 'struct msi_desc' in some other place, so we don't need to waste + * time searching it here. + */ + drhd = acpi_find_matched_drhd_unit(pci_dev); + if ( !drhd ) + return -ENODEV; + + iommu = drhd->iommu; + ir_ctrl = iommu_ir_ctrl(iommu); + if ( !ir_ctrl ) + return -ENODEV; + + spin_lock_irq(&ir_ctrl->iremap_lock); + + GET_IREMAP_ENTRY(ir_ctrl->iremap_maddr, remap_index, iremap_entries, p); + + old_ire = *p; + + /* Setup/Update interrupt remapping table entry. */ + setup_posted_irte(&new_ire, &old_ire, pi_desc, gvec); + ret = cmpxchg16b(p, &old_ire, &new_ire); + + /* + * In the above, we use cmpxchg16 to atomically update the 128-bit IRTE, + * and the hardware cannot update the IRTE behind us, so the return value + * of cmpxchg16 should be the same as old_ire. This ASSERT validate it. + */ + ASSERT(ret == old_ire.val); + + iommu_flush_cache_entry(p, sizeof(*p)); + iommu_flush_iec_index(iommu, 0, remap_index); + + unmap_vtd_domain_page(iremap_entries); + + spin_unlock_irq(&ir_ctrl->iremap_lock); + + return 0; + + unlock_out: + spin_unlock_irq(&desc->lock); + + return rc; +} diff --git a/xen/drivers/passthrough/vtd/iommu.h b/xen/drivers/passthrough/vtd/iommu.h index b440b69..c55ee08 100644 --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -323,6 +323,12 @@ struct iremap_entry { }; }; +/* + * Posted-interrupt descriptor address is 64 bits with 64-byte aligned, only + * the upper 26 bits of lest significiant 32 bits is available. + */ +#define PDA_LOW_BIT 26 + /* Max intr remapping table page order is 8, as max number of IRTEs is 64K */ #define IREMAP_PAGE_ORDER 8 diff --git a/xen/include/asm-x86/iommu.h b/xen/include/asm-x86/iommu.h index 7e24b1a..f22b3a5 100644 --- a/xen/include/asm-x86/iommu.h +++ b/xen/include/asm-x86/iommu.h @@ -31,6 +31,8 @@ bool_t iommu_supports_eim(void); int iommu_enable_x2apic_IR(void); void iommu_disable_x2apic_IR(void); +int pi_update_irte(const struct vcpu *v, const struct pirq *pirq, const uint8_t gvec); + #endif /* !__ARCH_X86_IOMMU_H__ */ /* * Local variables: -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:45:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45: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 1a93yB-0000LC-33; Wed, 16 Dec 2015 04:45:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93y9-0000L1-Ca for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:41 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 42/53-13475-47CE0765; Wed, 16 Dec 2015 04:45:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450241139!11271682!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50304 invoked from network); 16 Dec 2015 04:45:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:45:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93y6-0005UL-ST for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93y6-0001i0-Pk for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:38 +0000 Date: Wed, 16 Dec 2015 04:45:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pass-through: update IRTE according to guest interrupt config changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35a1caf8b6b5d026be83ed2aac0192a0c7274740 Author: Feng Wu AuthorDate: Thu Dec 10 13:13:33 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:13:33 2015 +0100 pass-through: update IRTE according to guest interrupt config changes When guest changes its interrupt configuration (such as, vector, etc.) for direct-assigned devices, we need to update the associated IRTE with the new guest vector, so external interrupts from the assigned devices can be injected to guests without VM-Exit. For lowest-priority interrupts, we use vector-hashing mechamisn to find the destination vCPU. This follows the hardware behavior, since modern Intel CPUs use vector hashing to handle the lowest-priority interrupt. For multicast/broadcast vCPU, we cannot handle it via interrupt posting, still use interrupt remapping. Signed-off-by: Feng Wu Acked-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/io.c | 123 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 122 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index bda9374..6b1ee6a 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -25,6 +25,7 @@ #include #include #include +#include static DEFINE_PER_CPU(struct list_head, dpci_list); @@ -198,6 +199,108 @@ void free_hvm_irq_dpci(struct hvm_irq_dpci *dpci) xfree(dpci); } +/* + * This routine handles lowest-priority interrupts using vector-hashing + * mechanism. As an example, modern Intel CPUs use this method to handle + * lowest-priority interrupts. + * + * Here is the details about the vector-hashing mechanism: + * 1. For lowest-priority interrupts, store all the possible destination + * vCPUs in an array. + * 2. Use "gvec % max number of destination vCPUs" to find the right + * destination vCPU in the array for the lowest-priority interrupt. + */ +static struct vcpu *vector_hashing_dest(const struct domain *d, + uint32_t dest_id, + bool_t dest_mode, + uint8_t gvec) + +{ + unsigned long *dest_vcpu_bitmap; + unsigned int dest_vcpus = 0; + struct vcpu *v, *dest = NULL; + unsigned int i; + + dest_vcpu_bitmap = xzalloc_array(unsigned long, + BITS_TO_LONGS(d->max_vcpus)); + if ( !dest_vcpu_bitmap ) + return NULL; + + for_each_vcpu ( d, v ) + { + if ( !vlapic_match_dest(vcpu_vlapic(v), NULL, APIC_DEST_NOSHORT, + dest_id, dest_mode) ) + continue; + + __set_bit(v->vcpu_id, dest_vcpu_bitmap); + dest_vcpus++; + } + + if ( dest_vcpus != 0 ) + { + unsigned int mod = gvec % dest_vcpus; + unsigned int idx = 0; + + for ( i = 0; i <= mod; i++ ) + { + idx = find_next_bit(dest_vcpu_bitmap, d->max_vcpus, idx) + 1; + BUG_ON(idx >= d->max_vcpus); + } + + dest = d->vcpu[idx - 1]; + } + + xfree(dest_vcpu_bitmap); + + return dest; +} + +/* + * The purpose of this routine is to find the right destination vCPU for + * an interrupt which will be delivered by VT-d posted-interrupt. There + * are several cases as below: + * + * - For lowest-priority interrupts, use vector-hashing mechanism to find + * the destination. + * - Otherwise, for single destination interrupt, it is straightforward to + * find the destination vCPU and return true. + * - For multicast/broadcast vCPU, we cannot handle it via interrupt posting, + * so return NULL. + */ +static struct vcpu *pi_find_dest_vcpu(const struct domain *d, uint32_t dest_id, + bool_t dest_mode, uint8_t delivery_mode, + uint8_t gvec) +{ + unsigned int dest_vcpus = 0; + struct vcpu *v, *dest = NULL; + + switch ( delivery_mode ) + { + case dest_LowestPrio: + return vector_hashing_dest(d, dest_id, dest_mode, gvec); + case dest_Fixed: + for_each_vcpu ( d, v ) + { + if ( !vlapic_match_dest(vcpu_vlapic(v), NULL, APIC_DEST_NOSHORT, + dest_id, dest_mode) ) + continue; + + dest_vcpus++; + dest = v; + } + + /* For fixed mode, we only handle single-destination interrupts. */ + if ( dest_vcpus == 1 ) + return dest; + + break; + default: + break; + } + + return NULL; +} + int pt_irq_create_bind( struct domain *d, xen_domctl_bind_pt_irq_t *pt_irq_bind) { @@ -256,7 +359,7 @@ int pt_irq_create_bind( { case PT_IRQ_TYPE_MSI: { - uint8_t dest, dest_mode; + uint8_t dest, dest_mode, delivery_mode; int dest_vcpu_id; if ( !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) @@ -329,11 +432,29 @@ int pt_irq_create_bind( /* Calculate dest_vcpu_id for MSI-type pirq migration. */ dest = pirq_dpci->gmsi.gflags & VMSI_DEST_ID_MASK; dest_mode = !!(pirq_dpci->gmsi.gflags & VMSI_DM_MASK); + delivery_mode = (pirq_dpci->gmsi.gflags & VMSI_DELIV_MASK) >> + GFLAGS_SHIFT_DELIV_MODE; + dest_vcpu_id = hvm_girq_dest_2_vcpu_id(d, dest, dest_mode); pirq_dpci->gmsi.dest_vcpu_id = dest_vcpu_id; spin_unlock(&d->event_lock); if ( dest_vcpu_id >= 0 ) hvm_migrate_pirqs(d->vcpu[dest_vcpu_id]); + + /* Use interrupt posting if it is supported. */ + if ( iommu_intpost ) + { + const struct vcpu *vcpu = pi_find_dest_vcpu(d, dest, dest_mode, + delivery_mode, pirq_dpci->gmsi.gvec); + + if ( vcpu ) + pi_update_irte( vcpu, info, pirq_dpci->gmsi.gvec ); + else + dprintk(XENLOG_G_INFO, + "%pv: deliver interrupt in remapping mode,gvec:%02x\n", + vcpu, pirq_dpci->gmsi.gvec); + } + 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 Wed Dec 16 04:45:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45: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 1a93yB-0000LC-33; Wed, 16 Dec 2015 04:45:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93y9-0000L1-Ca for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:41 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 42/53-13475-47CE0765; Wed, 16 Dec 2015 04:45:40 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450241139!11271682!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50304 invoked from network); 16 Dec 2015 04:45:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:45:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93y6-0005UL-ST for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93y6-0001i0-Pk for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:38 +0000 Date: Wed, 16 Dec 2015 04:45:38 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] pass-through: update IRTE according to guest interrupt config changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 35a1caf8b6b5d026be83ed2aac0192a0c7274740 Author: Feng Wu AuthorDate: Thu Dec 10 13:13:33 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:13:33 2015 +0100 pass-through: update IRTE according to guest interrupt config changes When guest changes its interrupt configuration (such as, vector, etc.) for direct-assigned devices, we need to update the associated IRTE with the new guest vector, so external interrupts from the assigned devices can be injected to guests without VM-Exit. For lowest-priority interrupts, we use vector-hashing mechamisn to find the destination vCPU. This follows the hardware behavior, since modern Intel CPUs use vector hashing to handle the lowest-priority interrupt. For multicast/broadcast vCPU, we cannot handle it via interrupt posting, still use interrupt remapping. Signed-off-by: Feng Wu Acked-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/drivers/passthrough/io.c | 123 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 122 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c index bda9374..6b1ee6a 100644 --- a/xen/drivers/passthrough/io.c +++ b/xen/drivers/passthrough/io.c @@ -25,6 +25,7 @@ #include #include #include +#include static DEFINE_PER_CPU(struct list_head, dpci_list); @@ -198,6 +199,108 @@ void free_hvm_irq_dpci(struct hvm_irq_dpci *dpci) xfree(dpci); } +/* + * This routine handles lowest-priority interrupts using vector-hashing + * mechanism. As an example, modern Intel CPUs use this method to handle + * lowest-priority interrupts. + * + * Here is the details about the vector-hashing mechanism: + * 1. For lowest-priority interrupts, store all the possible destination + * vCPUs in an array. + * 2. Use "gvec % max number of destination vCPUs" to find the right + * destination vCPU in the array for the lowest-priority interrupt. + */ +static struct vcpu *vector_hashing_dest(const struct domain *d, + uint32_t dest_id, + bool_t dest_mode, + uint8_t gvec) + +{ + unsigned long *dest_vcpu_bitmap; + unsigned int dest_vcpus = 0; + struct vcpu *v, *dest = NULL; + unsigned int i; + + dest_vcpu_bitmap = xzalloc_array(unsigned long, + BITS_TO_LONGS(d->max_vcpus)); + if ( !dest_vcpu_bitmap ) + return NULL; + + for_each_vcpu ( d, v ) + { + if ( !vlapic_match_dest(vcpu_vlapic(v), NULL, APIC_DEST_NOSHORT, + dest_id, dest_mode) ) + continue; + + __set_bit(v->vcpu_id, dest_vcpu_bitmap); + dest_vcpus++; + } + + if ( dest_vcpus != 0 ) + { + unsigned int mod = gvec % dest_vcpus; + unsigned int idx = 0; + + for ( i = 0; i <= mod; i++ ) + { + idx = find_next_bit(dest_vcpu_bitmap, d->max_vcpus, idx) + 1; + BUG_ON(idx >= d->max_vcpus); + } + + dest = d->vcpu[idx - 1]; + } + + xfree(dest_vcpu_bitmap); + + return dest; +} + +/* + * The purpose of this routine is to find the right destination vCPU for + * an interrupt which will be delivered by VT-d posted-interrupt. There + * are several cases as below: + * + * - For lowest-priority interrupts, use vector-hashing mechanism to find + * the destination. + * - Otherwise, for single destination interrupt, it is straightforward to + * find the destination vCPU and return true. + * - For multicast/broadcast vCPU, we cannot handle it via interrupt posting, + * so return NULL. + */ +static struct vcpu *pi_find_dest_vcpu(const struct domain *d, uint32_t dest_id, + bool_t dest_mode, uint8_t delivery_mode, + uint8_t gvec) +{ + unsigned int dest_vcpus = 0; + struct vcpu *v, *dest = NULL; + + switch ( delivery_mode ) + { + case dest_LowestPrio: + return vector_hashing_dest(d, dest_id, dest_mode, gvec); + case dest_Fixed: + for_each_vcpu ( d, v ) + { + if ( !vlapic_match_dest(vcpu_vlapic(v), NULL, APIC_DEST_NOSHORT, + dest_id, dest_mode) ) + continue; + + dest_vcpus++; + dest = v; + } + + /* For fixed mode, we only handle single-destination interrupts. */ + if ( dest_vcpus == 1 ) + return dest; + + break; + default: + break; + } + + return NULL; +} + int pt_irq_create_bind( struct domain *d, xen_domctl_bind_pt_irq_t *pt_irq_bind) { @@ -256,7 +359,7 @@ int pt_irq_create_bind( { case PT_IRQ_TYPE_MSI: { - uint8_t dest, dest_mode; + uint8_t dest, dest_mode, delivery_mode; int dest_vcpu_id; if ( !(pirq_dpci->flags & HVM_IRQ_DPCI_MAPPED) ) @@ -329,11 +432,29 @@ int pt_irq_create_bind( /* Calculate dest_vcpu_id for MSI-type pirq migration. */ dest = pirq_dpci->gmsi.gflags & VMSI_DEST_ID_MASK; dest_mode = !!(pirq_dpci->gmsi.gflags & VMSI_DM_MASK); + delivery_mode = (pirq_dpci->gmsi.gflags & VMSI_DELIV_MASK) >> + GFLAGS_SHIFT_DELIV_MODE; + dest_vcpu_id = hvm_girq_dest_2_vcpu_id(d, dest, dest_mode); pirq_dpci->gmsi.dest_vcpu_id = dest_vcpu_id; spin_unlock(&d->event_lock); if ( dest_vcpu_id >= 0 ) hvm_migrate_pirqs(d->vcpu[dest_vcpu_id]); + + /* Use interrupt posting if it is supported. */ + if ( iommu_intpost ) + { + const struct vcpu *vcpu = pi_find_dest_vcpu(d, dest, dest_mode, + delivery_mode, pirq_dpci->gmsi.gvec); + + if ( vcpu ) + pi_update_irte( vcpu, info, pirq_dpci->gmsi.gvec ); + else + dprintk(XENLOG_G_INFO, + "%pv: deliver interrupt in remapping mode,gvec:%02x\n", + vcpu, pirq_dpci->gmsi.gvec); + } + 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 Wed Dec 16 04:45:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yK-0000MW-7U; Wed, 16 Dec 2015 04:45:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yJ-0000MK-Ch for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:51 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 22/5F-21571-E7CE0765; Wed, 16 Dec 2015 04:45:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1450241149!5691627!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51424 invoked from network); 16 Dec 2015 04:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:45:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yH-0005UT-6F for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yH-0001jI-4S for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:49 +0000 Date: Wed, 16 Dec 2015 04:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmx: properly handle notification event when vCPU is running X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e78c98f727660643ac1a4a1f3788bea8019ab5a4 Author: Feng Wu AuthorDate: Thu Dec 10 13:14:04 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:14:04 2015 +0100 vmx: properly handle notification event when vCPU is running When a vCPU is running in Root mode and a notification event has been injected to it. we need to set VCPU_KICK_SOFTIRQ for the current cpu, so the pending interrupt in PIRR will be synced to vIRR before VM-Exit in time. Signed-off-by: Feng Wu Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index bc7d370..47d5649 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2022,6 +2022,53 @@ static struct hvm_function_table __initdata vmx_function_table = { .altp2m_vcpu_emulate_vmfunc = vmx_vcpu_emulate_vmfunc, }; +/* Handle VT-d posted-interrupt when VCPU is running. */ +static void pi_notification_interrupt(struct cpu_user_regs *regs) +{ + ack_APIC_irq(); + this_cpu(irq_count)++; + + /* + * We get here when a vCPU is running in root-mode (such as via hypercall, + * or any other reasons which can result in VM-Exit), and before vCPU is + * back to non-root, external interrupts from an assigned device happen + * and a notification event is delivered to this logical CPU. + * + * we need to set VCPU_KICK_SOFTIRQ for the current cpu, just like + * __vmx_deliver_posted_interrupt(). So the pending interrupt in PIRR will + * be synced to vIRR before VM-Exit in time. + * + * Please refer to the following code fragments from + * xen/arch/x86/hvm/vmx/entry.S: + * + * .Lvmx_do_vmentry + * + * ...... + * + * point 1 + * + * cli + * cmp %ecx,(%rdx,%rax,1) + * jnz .Lvmx_process_softirqs + * + * ...... + * + * je .Lvmx_launch + * + * ...... + * + * .Lvmx_process_softirqs: + * sti + * call do_softirq + * jmp .Lvmx_do_vmentry + * + * If VT-d engine issues a notification event at point 1 above, it cannot + * be delivered to the guest during this VM-entry without raising the + * softirq in this notification handler. + */ + raise_softirq(VCPU_KICK_SOFTIRQ); +} + const struct hvm_function_table * __init start_vmx(void) { set_in_cr4(X86_CR4_VMXE); @@ -2059,7 +2106,12 @@ const struct hvm_function_table * __init start_vmx(void) } if ( cpu_has_vmx_posted_intr_processing ) - alloc_direct_apic_vector(&posted_intr_vector, event_check_interrupt); + { + if ( iommu_intpost ) + alloc_direct_apic_vector(&posted_intr_vector, pi_notification_interrupt); + else + alloc_direct_apic_vector(&posted_intr_vector, event_check_interrupt); + } else { vmx_function_table.deliver_posted_intr = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:45:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:45:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yK-0000MW-7U; Wed, 16 Dec 2015 04:45:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yJ-0000MK-Ch for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:51 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 22/5F-21571-E7CE0765; Wed, 16 Dec 2015 04:45:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1450241149!5691627!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51424 invoked from network); 16 Dec 2015 04:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:45:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yH-0005UT-6F for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yH-0001jI-4S for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:49 +0000 Date: Wed, 16 Dec 2015 04:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] vmx: properly handle notification event when vCPU is running X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e78c98f727660643ac1a4a1f3788bea8019ab5a4 Author: Feng Wu AuthorDate: Thu Dec 10 13:14:04 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:14:04 2015 +0100 vmx: properly handle notification event when vCPU is running When a vCPU is running in Root mode and a notification event has been injected to it. we need to set VCPU_KICK_SOFTIRQ for the current cpu, so the pending interrupt in PIRR will be synced to vIRR before VM-Exit in time. Signed-off-by: Feng Wu Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 54 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index bc7d370..47d5649 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2022,6 +2022,53 @@ static struct hvm_function_table __initdata vmx_function_table = { .altp2m_vcpu_emulate_vmfunc = vmx_vcpu_emulate_vmfunc, }; +/* Handle VT-d posted-interrupt when VCPU is running. */ +static void pi_notification_interrupt(struct cpu_user_regs *regs) +{ + ack_APIC_irq(); + this_cpu(irq_count)++; + + /* + * We get here when a vCPU is running in root-mode (such as via hypercall, + * or any other reasons which can result in VM-Exit), and before vCPU is + * back to non-root, external interrupts from an assigned device happen + * and a notification event is delivered to this logical CPU. + * + * we need to set VCPU_KICK_SOFTIRQ for the current cpu, just like + * __vmx_deliver_posted_interrupt(). So the pending interrupt in PIRR will + * be synced to vIRR before VM-Exit in time. + * + * Please refer to the following code fragments from + * xen/arch/x86/hvm/vmx/entry.S: + * + * .Lvmx_do_vmentry + * + * ...... + * + * point 1 + * + * cli + * cmp %ecx,(%rdx,%rax,1) + * jnz .Lvmx_process_softirqs + * + * ...... + * + * je .Lvmx_launch + * + * ...... + * + * .Lvmx_process_softirqs: + * sti + * call do_softirq + * jmp .Lvmx_do_vmentry + * + * If VT-d engine issues a notification event at point 1 above, it cannot + * be delivered to the guest during this VM-entry without raising the + * softirq in this notification handler. + */ + raise_softirq(VCPU_KICK_SOFTIRQ); +} + const struct hvm_function_table * __init start_vmx(void) { set_in_cr4(X86_CR4_VMXE); @@ -2059,7 +2106,12 @@ const struct hvm_function_table * __init start_vmx(void) } if ( cpu_has_vmx_posted_intr_processing ) - alloc_direct_apic_vector(&posted_intr_vector, event_check_interrupt); + { + if ( iommu_intpost ) + alloc_direct_apic_vector(&posted_intr_vector, pi_notification_interrupt); + else + alloc_direct_apic_vector(&posted_intr_vector, event_check_interrupt); + } else { vmx_function_table.deliver_posted_intr = NULL; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yV-0000Nz-Bw; Wed, 16 Dec 2015 04:46:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yT-0000No-SB for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:02 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 97/BC-06091-98CE0765; Wed, 16 Dec 2015 04:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1450241159!10706935!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36979 invoked from network); 16 Dec 2015 04:46:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:00 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yR-0005Ub-GW for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yR-0001jx-ER for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:59 +0000 Date: Wed, 16 Dec 2015 04:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fixup IRQs when CPUs go down during shutdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e509b8e09c00f42348f176c0d88528f53d07ab66 Author: Ross Lagerwall AuthorDate: Thu Dec 10 13:14:53 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:14:53 2015 +0100 x86: fixup IRQs when CPUs go down during shutdown Commit fc0c3fa2ad5c ("x86/IO-APIC: fix setup of Xen internally used IRQs (take 2)") introduced a regression on some hardware where Xen would hang during shutdown, repeating the following message: APIC error on CPU0: 08(08), Receive accept error This appears to be because an interrupt (in this case from the serial console) destined for a CPU other than the boot CPU is left unhandled so an APIC error on CPU 0 is generated instead. To fix this, before taking down the non-boot CPUs, call fixup_irqs() with a CPU mask of only the boot CPU to reset the IRQ affinities correctly. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/irq.c | 28 ++++++++++++++++++---------- xen/arch/x86/smp.c | 4 ++++ xen/arch/x86/smpboot.c | 3 ++- xen/include/asm-x86/irq.h | 5 +++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 5f515a0..1228568 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2328,14 +2328,12 @@ static int __init setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* A cpu has been removed from cpu_online_mask. Re-set irq affinities. */ -void fixup_irqs(void) +/* Reset irq affinities to match the given CPU mask. */ +void fixup_irqs(const cpumask_t *mask, bool_t verbose) { - unsigned int irq, sp; + unsigned int irq; static int warned; struct irq_desc *desc; - irq_guest_action_t *action; - struct pending_eoi *peoi; for ( irq = 0; irq < nr_irqs; irq++ ) { @@ -2355,21 +2353,20 @@ void fixup_irqs(void) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && vector <= LAST_HIPRIORITY_VECTOR ) - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, - &cpu_online_map); + cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); cpumask_copy(&affinity, desc->affinity); - if ( !desc->action || cpumask_subset(&affinity, &cpu_online_map) ) + if ( !desc->action || cpumask_subset(&affinity, mask) ) { spin_unlock(&desc->lock); continue; } - cpumask_and(&affinity, &affinity, &cpu_online_map); + cpumask_and(&affinity, &affinity, mask); if ( cpumask_empty(&affinity) ) { break_affinity = 1; - cpumask_copy(&affinity, &cpu_online_map); + cpumask_copy(&affinity, mask); } if ( desc->handler->disable ) @@ -2385,6 +2382,9 @@ void fixup_irqs(void) spin_unlock(&desc->lock); + if ( !verbose ) + continue; + if ( break_affinity && set_affinity ) printk("Broke affinity for irq %i\n", irq); else if ( !set_affinity ) @@ -2395,6 +2395,14 @@ void fixup_irqs(void) local_irq_enable(); mdelay(1); local_irq_disable(); +} + +void fixup_eoi(void) +{ + unsigned int irq, sp; + struct irq_desc *desc; + irq_guest_action_t *action; + struct pending_eoi *peoi; /* Clean up cpu_eoi_map of every interrupt to exclude this CPU. */ for ( irq = 0; irq < nr_irqs; irq++ ) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 50ff6c2..988b9c2 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -299,6 +299,10 @@ void smp_send_stop(void) { int timeout = 10; + local_irq_disable(); + fixup_irqs(cpumask_of(smp_processor_id()), 0); + local_irq_enable(); + smp_call_function(stop_this_cpu, NULL, 0); /* Wait 10ms for all other CPUs to go offline. */ diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 5d48bac..1eb16cb 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -922,7 +922,8 @@ void __cpu_disable(void) /* It's now safe to remove this processor from the online map */ cpumask_clear_cpu(cpu, &cpu_online_map); - fixup_irqs(); + fixup_irqs(&cpu_online_map, 1); + fixup_eoi(); if ( cpu_disable_scheduler(cpu) ) BUG(); diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index fcf37a3..7efdd37 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -148,8 +148,9 @@ int map_domain_emuirq_pirq(struct domain *d, int pirq, int irq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); bool_t hvm_domain_use_pirq(const struct domain *, const struct pirq *); -/* A cpu has been removed from cpu_online_mask. Re-set irq affinities. */ -void fixup_irqs(void); +/* Reset irq affinities to match the given CPU mask. */ +void fixup_irqs(const cpumask_t *mask, bool_t verbose); +void fixup_eoi(void); int init_irq_data(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 16 04:46:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yV-0000Nz-Bw; Wed, 16 Dec 2015 04:46:03 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yT-0000No-SB for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:02 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id 97/BC-06091-98CE0765; Wed, 16 Dec 2015 04:46:01 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1450241159!10706935!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36979 invoked from network); 16 Dec 2015 04:46:00 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:00 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yR-0005Ub-GW for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:59 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yR-0001jx-ER for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:45:59 +0000 Date: Wed, 16 Dec 2015 04:45:59 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: fixup IRQs when CPUs go down during shutdown X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e509b8e09c00f42348f176c0d88528f53d07ab66 Author: Ross Lagerwall AuthorDate: Thu Dec 10 13:14:53 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:14:53 2015 +0100 x86: fixup IRQs when CPUs go down during shutdown Commit fc0c3fa2ad5c ("x86/IO-APIC: fix setup of Xen internally used IRQs (take 2)") introduced a regression on some hardware where Xen would hang during shutdown, repeating the following message: APIC error on CPU0: 08(08), Receive accept error This appears to be because an interrupt (in this case from the serial console) destined for a CPU other than the boot CPU is left unhandled so an APIC error on CPU 0 is generated instead. To fix this, before taking down the non-boot CPUs, call fixup_irqs() with a CPU mask of only the boot CPU to reset the IRQ affinities correctly. Signed-off-by: Ross Lagerwall Reviewed-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/irq.c | 28 ++++++++++++++++++---------- xen/arch/x86/smp.c | 4 ++++ xen/arch/x86/smpboot.c | 3 ++- xen/include/asm-x86/irq.h | 5 +++-- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 5f515a0..1228568 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2328,14 +2328,12 @@ static int __init setup_dump_irqs(void) } __initcall(setup_dump_irqs); -/* A cpu has been removed from cpu_online_mask. Re-set irq affinities. */ -void fixup_irqs(void) +/* Reset irq affinities to match the given CPU mask. */ +void fixup_irqs(const cpumask_t *mask, bool_t verbose) { - unsigned int irq, sp; + unsigned int irq; static int warned; struct irq_desc *desc; - irq_guest_action_t *action; - struct pending_eoi *peoi; for ( irq = 0; irq < nr_irqs; irq++ ) { @@ -2355,21 +2353,20 @@ void fixup_irqs(void) vector = irq_to_vector(irq); if ( vector >= FIRST_HIPRIORITY_VECTOR && vector <= LAST_HIPRIORITY_VECTOR ) - cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, - &cpu_online_map); + cpumask_and(desc->arch.cpu_mask, desc->arch.cpu_mask, mask); cpumask_copy(&affinity, desc->affinity); - if ( !desc->action || cpumask_subset(&affinity, &cpu_online_map) ) + if ( !desc->action || cpumask_subset(&affinity, mask) ) { spin_unlock(&desc->lock); continue; } - cpumask_and(&affinity, &affinity, &cpu_online_map); + cpumask_and(&affinity, &affinity, mask); if ( cpumask_empty(&affinity) ) { break_affinity = 1; - cpumask_copy(&affinity, &cpu_online_map); + cpumask_copy(&affinity, mask); } if ( desc->handler->disable ) @@ -2385,6 +2382,9 @@ void fixup_irqs(void) spin_unlock(&desc->lock); + if ( !verbose ) + continue; + if ( break_affinity && set_affinity ) printk("Broke affinity for irq %i\n", irq); else if ( !set_affinity ) @@ -2395,6 +2395,14 @@ void fixup_irqs(void) local_irq_enable(); mdelay(1); local_irq_disable(); +} + +void fixup_eoi(void) +{ + unsigned int irq, sp; + struct irq_desc *desc; + irq_guest_action_t *action; + struct pending_eoi *peoi; /* Clean up cpu_eoi_map of every interrupt to exclude this CPU. */ for ( irq = 0; irq < nr_irqs; irq++ ) diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c index 50ff6c2..988b9c2 100644 --- a/xen/arch/x86/smp.c +++ b/xen/arch/x86/smp.c @@ -299,6 +299,10 @@ void smp_send_stop(void) { int timeout = 10; + local_irq_disable(); + fixup_irqs(cpumask_of(smp_processor_id()), 0); + local_irq_enable(); + smp_call_function(stop_this_cpu, NULL, 0); /* Wait 10ms for all other CPUs to go offline. */ diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 5d48bac..1eb16cb 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -922,7 +922,8 @@ void __cpu_disable(void) /* It's now safe to remove this processor from the online map */ cpumask_clear_cpu(cpu, &cpu_online_map); - fixup_irqs(); + fixup_irqs(&cpu_online_map, 1); + fixup_eoi(); if ( cpu_disable_scheduler(cpu) ) BUG(); diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h index fcf37a3..7efdd37 100644 --- a/xen/include/asm-x86/irq.h +++ b/xen/include/asm-x86/irq.h @@ -148,8 +148,9 @@ int map_domain_emuirq_pirq(struct domain *d, int pirq, int irq); int unmap_domain_pirq_emuirq(struct domain *d, int pirq); bool_t hvm_domain_use_pirq(const struct domain *, const struct pirq *); -/* A cpu has been removed from cpu_online_mask. Re-set irq affinities. */ -void fixup_irqs(void); +/* Reset irq affinities to match the given CPU mask. */ +void fixup_irqs(const cpumask_t *mask, bool_t verbose); +void fixup_eoi(void); int init_irq_data(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 16 04:46:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46: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 1a93yf-0000Pv-Fw; Wed, 16 Dec 2015 04:46:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93ye-0000Pj-5f for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:12 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 05/6B-31122-39CE0765; Wed, 16 Dec 2015 04:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1450241169!5570291!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40684 invoked from network); 16 Dec 2015 04:46:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yb-0005VC-Or for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yb-0001kg-MX for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:09 +0000 Date: Wed, 16 Dec 2015 04:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: support only versions 2 through 4 of architectural performance monitoring X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00e248ce7f25d1e7705c87403065e1f6fd440dc8 Author: Boris Ostrovsky AuthorDate: Thu Dec 10 13:15:35 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:15:35 2015 +0100 x86/VPMU: support only versions 2 through 4 of architectural performance monitoring We need to have at least version 2 since it's the first version to support various control and status registers (such as MSR_CORE_PERF_GLOBAL_CTRL) that VPMU relies on always having. We don't fully emulate version 4 but since it's back compatible with earlier versions we can fall back to v3. At this point there is no compatibility statement for v5 so anything above 4 is not supported. For guests querying PMU version via CPUID leaf 0xa clip it at v3. With explicit testing for PMU version we can now remove CPUID model check. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/cpu/vpmu_intel.c | 80 +++++++++++++++------------------------- 1 files changed, 30 insertions(+), 50 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index d5ea7fe..c27f095 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -733,11 +733,11 @@ static void core2_vpmu_do_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { - if (input == 0x1) + switch ( input ) { - struct vpmu_struct *vpmu = vcpu_vpmu(current); + case 0x1: - if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_DS) ) + if ( vpmu_is_set(vcpu_vpmu(current), VPMU_CPU_HAS_DS) ) { /* Switch on the 'Debug Store' feature in CPUID.EAX[1]:EDX[21] */ *edx |= cpufeat_mask(X86_FEATURE_DS); @@ -746,6 +746,13 @@ static void core2_vpmu_do_cpuid(unsigned int input, if ( cpu_has(¤t_cpu_data, X86_FEATURE_DSCPL) ) *ecx |= cpufeat_mask(X86_FEATURE_DSCPL); } + break; + + case 0xa: + /* Report at most version 3 since that's all we currently emulate */ + if ( MASK_EXTR(*eax, PMU_VERSION_MASK) > 3 ) + *eax = (*eax & ~PMU_VERSION_MASK) | MASK_INSR(3, PMU_VERSION_MASK); + break; } } @@ -955,59 +962,32 @@ int vmx_vpmu_initialise(struct vcpu *v) int __init core2_vpmu_init(void) { u64 caps; + unsigned int version = 0; - if ( current_cpu_data.x86 != 6 ) + if ( current_cpu_data.cpuid_level >= 0xa ) + version = MASK_EXTR(cpuid_eax(0xa), PMU_VERSION_MASK); + + switch ( version ) { - printk(XENLOG_WARNING "VPMU: only family 6 is supported\n"); + case 4: + printk(XENLOG_INFO "VPMU: PMU version 4 is not fully supported. " + "Emulating version 3\n"); + /* FALLTHROUGH */ + + case 2: + case 3: + break; + + default: + printk(XENLOG_WARNING "VPMU: PMU version %u is not supported\n", + version); return -EINVAL; } - switch ( current_cpu_data.x86_model ) + if ( current_cpu_data.x86 != 6 ) { - /* Core2: */ - case 0x0f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ - case 0x16: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ - case 0x17: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ - case 0x1d: /* six-core 45 nm xeon "Dunnington" */ - - case 0x2a: /* SandyBridge */ - case 0x2d: /* SandyBridge, "Romley-EP" */ - - /* Nehalem: */ - case 0x1a: /* 45 nm nehalem, "Bloomfield" */ - case 0x1e: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ - case 0x2e: /* 45 nm nehalem-ex, "Beckton" */ - - /* Westmere: */ - case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ - case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x2f: /* 32 nm Westmere-EX */ - - case 0x3a: /* IvyBridge */ - case 0x3e: /* IvyBridge EP */ - - /* Haswell: */ - case 0x3c: - case 0x3f: - case 0x45: - case 0x46: - - /* Broadwell */ - case 0x3d: - case 0x4f: - case 0x56: - - /* future: */ - case 0x4e: - - /* next gen Xeon Phi */ - case 0x57: - break; - - default: - printk(XENLOG_WARNING "VPMU: Unsupported CPU model %#x\n", - current_cpu_data.x86_model); - return -EINVAL; + printk(XENLOG_WARNING "VPMU: only family 6 is supported\n"); + return -EINVAL; } arch_pmc_cnt = core2_get_arch_pmc_count(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46: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 1a93yf-0000Pv-Fw; Wed, 16 Dec 2015 04:46:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93ye-0000Pj-5f for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:12 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 05/6B-31122-39CE0765; Wed, 16 Dec 2015 04:46:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1450241169!5570291!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40684 invoked from network); 16 Dec 2015 04:46:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yb-0005VC-Or for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:09 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yb-0001kg-MX for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:09 +0000 Date: Wed, 16 Dec 2015 04:46:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/VPMU: support only versions 2 through 4 of architectural performance monitoring X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 00e248ce7f25d1e7705c87403065e1f6fd440dc8 Author: Boris Ostrovsky AuthorDate: Thu Dec 10 13:15:35 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:15:35 2015 +0100 x86/VPMU: support only versions 2 through 4 of architectural performance monitoring We need to have at least version 2 since it's the first version to support various control and status registers (such as MSR_CORE_PERF_GLOBAL_CTRL) that VPMU relies on always having. We don't fully emulate version 4 but since it's back compatible with earlier versions we can fall back to v3. At this point there is no compatibility statement for v5 so anything above 4 is not supported. For guests querying PMU version via CPUID leaf 0xa clip it at v3. With explicit testing for PMU version we can now remove CPUID model check. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/cpu/vpmu_intel.c | 80 +++++++++++++++------------------------- 1 files changed, 30 insertions(+), 50 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index d5ea7fe..c27f095 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -733,11 +733,11 @@ static void core2_vpmu_do_cpuid(unsigned int input, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { - if (input == 0x1) + switch ( input ) { - struct vpmu_struct *vpmu = vcpu_vpmu(current); + case 0x1: - if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_DS) ) + if ( vpmu_is_set(vcpu_vpmu(current), VPMU_CPU_HAS_DS) ) { /* Switch on the 'Debug Store' feature in CPUID.EAX[1]:EDX[21] */ *edx |= cpufeat_mask(X86_FEATURE_DS); @@ -746,6 +746,13 @@ static void core2_vpmu_do_cpuid(unsigned int input, if ( cpu_has(¤t_cpu_data, X86_FEATURE_DSCPL) ) *ecx |= cpufeat_mask(X86_FEATURE_DSCPL); } + break; + + case 0xa: + /* Report at most version 3 since that's all we currently emulate */ + if ( MASK_EXTR(*eax, PMU_VERSION_MASK) > 3 ) + *eax = (*eax & ~PMU_VERSION_MASK) | MASK_INSR(3, PMU_VERSION_MASK); + break; } } @@ -955,59 +962,32 @@ int vmx_vpmu_initialise(struct vcpu *v) int __init core2_vpmu_init(void) { u64 caps; + unsigned int version = 0; - if ( current_cpu_data.x86 != 6 ) + if ( current_cpu_data.cpuid_level >= 0xa ) + version = MASK_EXTR(cpuid_eax(0xa), PMU_VERSION_MASK); + + switch ( version ) { - printk(XENLOG_WARNING "VPMU: only family 6 is supported\n"); + case 4: + printk(XENLOG_INFO "VPMU: PMU version 4 is not fully supported. " + "Emulating version 3\n"); + /* FALLTHROUGH */ + + case 2: + case 3: + break; + + default: + printk(XENLOG_WARNING "VPMU: PMU version %u is not supported\n", + version); return -EINVAL; } - switch ( current_cpu_data.x86_model ) + if ( current_cpu_data.x86 != 6 ) { - /* Core2: */ - case 0x0f: /* original 65 nm celeron/pentium/core2/xeon, "Merom"/"Conroe" */ - case 0x16: /* single-core 65 nm celeron/core2solo "Merom-L"/"Conroe-L" */ - case 0x17: /* 45 nm celeron/core2/xeon "Penryn"/"Wolfdale" */ - case 0x1d: /* six-core 45 nm xeon "Dunnington" */ - - case 0x2a: /* SandyBridge */ - case 0x2d: /* SandyBridge, "Romley-EP" */ - - /* Nehalem: */ - case 0x1a: /* 45 nm nehalem, "Bloomfield" */ - case 0x1e: /* 45 nm nehalem, "Lynnfield", "Clarksfield", "Jasper Forest" */ - case 0x2e: /* 45 nm nehalem-ex, "Beckton" */ - - /* Westmere: */ - case 0x25: /* 32 nm nehalem, "Clarkdale", "Arrandale" */ - case 0x2c: /* 32 nm nehalem, "Gulftown", "Westmere-EP" */ - case 0x2f: /* 32 nm Westmere-EX */ - - case 0x3a: /* IvyBridge */ - case 0x3e: /* IvyBridge EP */ - - /* Haswell: */ - case 0x3c: - case 0x3f: - case 0x45: - case 0x46: - - /* Broadwell */ - case 0x3d: - case 0x4f: - case 0x56: - - /* future: */ - case 0x4e: - - /* next gen Xeon Phi */ - case 0x57: - break; - - default: - printk(XENLOG_WARNING "VPMU: Unsupported CPU model %#x\n", - current_cpu_data.x86_model); - return -EINVAL; + printk(XENLOG_WARNING "VPMU: only family 6 is supported\n"); + return -EINVAL; } arch_pmc_cnt = core2_get_arch_pmc_count(); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yp-0000R8-Kl; Wed, 16 Dec 2015 04:46:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yo-0000Qw-4b for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:22 +0000 Content-Length: 1990 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 88/FB-18316-D9CE0765; Wed, 16 Dec 2015 04:46:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1450241180!5691666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52711 invoked from network); 16 Dec 2015 04:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93ym-0005VK-3U for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93ym-0001l8-1R for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:20 +0000 Date: Wed, 16 Dec 2015 04:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: loosen up the ASSERT in hvm_cr4_guest_reserved_bits and hvm_efer_valid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6494491537947942137==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6494491537947942137== Content-Length: 1579 Content-Transfer-Encoding: quoted-printable commit 323b2261c124166a7551a2f18387bf0d493f793c Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Dec 10 13:16:15 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:16:15 2015 +0100 x86/hvm: loosen up the ASSERT in hvm_cr4_guest_reserved_bits and hvm_efer_valid Loosen up the condition so we make sure that the current vcpu belongs to the same domain. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index af3d4d7..92d57ff 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1842,7 +1842,7 @@ static const char * hvm_efer_valid(const struct vcpu *v, uint64_t value, { unsigned int level; - ASSERT(v =3D=3D current); + ASSERT(v->domain =3D=3D current->domain); hvm_cpuid(0x80000000, &level, NULL, NULL, NULL); if ( level >=3D 0x80000001 ) { @@ -1912,7 +1912,7 @@ static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, { unsigned int level; - ASSERT(v =3D=3D current); + ASSERT(v->domain =3D=3D current->domain); hvm_cpuid(0, &level, NULL, NULL, NULL); if ( level >=3D 1 ) hvm_cpuid(1, NULL, NULL, &leaf1_ecx, &leaf1_edx); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6494491537947942137== 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 --===============6494491537947942137==-- From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yp-0000R8-Kl; Wed, 16 Dec 2015 04:46:23 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yo-0000Qw-4b for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:22 +0000 Content-Length: 1990 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 88/FB-18316-D9CE0765; Wed, 16 Dec 2015 04:46:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1450241180!5691666!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52711 invoked from network); 16 Dec 2015 04:46:21 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93ym-0005VK-3U for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93ym-0001l8-1R for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:20 +0000 Date: Wed, 16 Dec 2015 04:46:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: loosen up the ASSERT in hvm_cr4_guest_reserved_bits and hvm_efer_valid X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6494491537947942137==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6494491537947942137== Content-Length: 1579 Content-Transfer-Encoding: quoted-printable commit 323b2261c124166a7551a2f18387bf0d493f793c Author: Roger Pau Monn=C3=A9 AuthorDate: Thu Dec 10 13:16:15 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:16:15 2015 +0100 x86/hvm: loosen up the ASSERT in hvm_cr4_guest_reserved_bits and hvm_efer_valid Loosen up the condition so we make sure that the current vcpu belongs to the same domain. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index af3d4d7..92d57ff 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1842,7 +1842,7 @@ static const char * hvm_efer_valid(const struct vcpu *v, uint64_t value, { unsigned int level; - ASSERT(v =3D=3D current); + ASSERT(v->domain =3D=3D current->domain); hvm_cpuid(0x80000000, &level, NULL, NULL, NULL); if ( level >=3D 0x80000001 ) { @@ -1912,7 +1912,7 @@ static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, { unsigned int level; - ASSERT(v =3D=3D current); + ASSERT(v->domain =3D=3D current->domain); hvm_cpuid(0, &level, NULL, NULL, NULL); if ( level >=3D 1 ) hvm_cpuid(1, NULL, NULL, &leaf1_ecx, &leaf1_edx); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6494491537947942137== 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 --===============6494491537947942137==-- From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93z0-0000T2-B1; Wed, 16 Dec 2015 04:46:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yy-0000Sg-Vr for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:33 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 14/49-30270-8ACE0765; Wed, 16 Dec 2015 04:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1450241190!10961235!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14362 invoked from network); 16 Dec 2015 04:46:31 -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; 16 Dec 2015 04:46:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yw-0005VS-CF for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yw-0001lU-A2 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:30 +0000 Date: Wed, 16 Dec 2015 04:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: re-enable NX if disabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7cc65a9e8178124464760fe6a6bf2ab3726db877 Author: Jan Beulich AuthorDate: Thu Dec 10 13:17:21 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:17:21 2015 +0100 x86: re-enable NX if disabled I noticed Linux 4.4 doing this universally now, and I think it's a good idea to override such anti-security BIOS settings (we certainly have no compatibility problem due to NX being enabled). Secondary changes: - no need to check supported extended CPUID level for leaves 80000000 and 80000001 (required on x86-64) - no need to update c->cpuid_level in early_init_intel() (done anyway in generic_identify()) - alignment of trampoline data items Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/boot/trampoline.S | 22 ++++++++++++++++++++++ xen/arch/x86/cpu/common.c | 18 +++++++++--------- xen/arch/x86/cpu/intel.c | 25 ++++++++++++++++--------- xen/include/asm-x86/msr-index.h | 1 + xen/include/asm-x86/processor.h | 1 + 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index c8f32cd..b013614 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -32,9 +32,13 @@ GLOBAL(trampoline_realmode_entry) lmsw %ax # CR0.PE = 1 (enter protected mode) ljmpl $BOOT_CS32,$bootsym_rel(trampoline_protmode_entry,6) + .balign 8 + .word 0 idt_48: .word 0, 0, 0 # base = limit = 0 + .word 0 gdt_48: .word 6*8-1 .long bootsym_rel(trampoline_gdt,4) + trampoline_gdt: /* 0x0000: unused */ .quad 0x0000000000000000 @@ -56,6 +60,9 @@ trampoline_gdt: .long trampoline_gdt + BOOT_PSEUDORM_DS + 2 - . .popsection +GLOBAL(trampoline_misc_enable_off) + .quad 0 + GLOBAL(cpuid_ext_features) .long 0 @@ -84,6 +91,21 @@ trampoline_protmode_entry: add bootsym_rel(trampoline_xen_phys_start,4,%eax) mov %eax,%cr3 + /* Adjust IA32_MISC_ENABLE if needed (for NX enabling below). */ + mov bootsym_rel(trampoline_misc_enable_off,4,%esi) + mov bootsym_rel(trampoline_misc_enable_off+4,4,%edi) + mov %esi,%eax + or %edi,%eax + jz 1f + mov $MSR_IA32_MISC_ENABLE,%ecx + rdmsr + not %esi + not %edi + and %esi,%eax + and %edi,%edx + wrmsr +1: + /* Set up EFER (Extended Feature Enable Register). */ mov bootsym_rel(cpuid_ext_features,4,%edi) movl $MSR_EFER,%ecx diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 310ec85..07566d9 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -256,15 +256,15 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) /* AMD-defined flags: level 0x80000001 */ c->extended_cpuid_level = cpuid_eax(0x80000000); - if ( (c->extended_cpuid_level & 0xffff0000) == 0x80000000 ) { - if ( c->extended_cpuid_level >= 0x80000001 ) - cpuid(0x80000001, &tmp, &tmp, - &c->x86_capability[cpufeat_word(X86_FEATURE_LAHF_LM)], - &c->x86_capability[cpufeat_word(X86_FEATURE_SYSCALL)]); - - if ( c->extended_cpuid_level >= 0x80000004 ) - get_model_name(c); /* Default name */ - } + cpuid(0x80000001, &tmp, &tmp, + &c->x86_capability[cpufeat_word(X86_FEATURE_LAHF_LM)], + &c->x86_capability[cpufeat_word(X86_FEATURE_SYSCALL)]); + if (c == &boot_cpu_data) + bootsym(cpuid_ext_features) = + c->x86_capability[cpufeat_word(X86_FEATURE_NX)]; + + if (c->extended_cpuid_level >= 0x80000004) + get_model_name(c); /* Default name */ /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 67dabc0..d4f574b 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -162,19 +162,26 @@ static void early_init_intel(struct cpuinfo_x86 *c) if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; - /* Unmask CPUID levels if masked: */ + /* Unmask CPUID levels and NX if masked: */ if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) { - u64 misc_enable; + u64 misc_enable, disable; rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) { - misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID; - wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - c->cpuid_level = cpuid_eax(0); - if (opt_cpu_info || c == &boot_cpu_data) - printk(KERN_INFO "revised cpuid level: %d\n", - c->cpuid_level); + disable = misc_enable & (MSR_IA32_MISC_ENABLE_LIMIT_CPUID | + MSR_IA32_MISC_ENABLE_XD_DISABLE); + if (disable) { + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); + bootsym(trampoline_misc_enable_off) |= disable; + } + + if (disable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) + printk(KERN_INFO "revised cpuid level: %d\n", + cpuid_eax(0)); + if (disable & MSR_IA32_MISC_ENABLE_XD_DISABLE) { + write_efer(read_efer() | EFER_NX); + printk(KERN_INFO + "re-enabled NX (Execute Disable) protection\n"); } } diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index b8ad93c..2b97861 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -322,6 +322,7 @@ #define MSR_IA32_MISC_ENABLE_MONITOR_ENABLE (1<<18) #define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1<<22) #define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1<<23) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << 34) #define MSR_IA32_TSC_DEADLINE 0x000006E0 #define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 3f8411f..26ba141 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -216,6 +216,7 @@ extern void set_cpuid_faulting(bool_t enable); extern u64 host_pat; extern bool_t opt_cpu_info; extern u32 cpuid_ext_features; +extern u64 trampoline_misc_enable_off; /* Maximum width of physical addresses supported by the hardware */ extern unsigned int paddr_bits; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93z0-0000T2-B1; Wed, 16 Dec 2015 04:46:34 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yy-0000Sg-Vr for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:33 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 14/49-30270-8ACE0765; Wed, 16 Dec 2015 04:46:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1450241190!10961235!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14362 invoked from network); 16 Dec 2015 04:46:31 -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; 16 Dec 2015 04:46:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93yw-0005VS-CF for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:30 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93yw-0001lU-A2 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:30 +0000 Date: Wed, 16 Dec 2015 04:46:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: re-enable NX if disabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7cc65a9e8178124464760fe6a6bf2ab3726db877 Author: Jan Beulich AuthorDate: Thu Dec 10 13:17:21 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:17:21 2015 +0100 x86: re-enable NX if disabled I noticed Linux 4.4 doing this universally now, and I think it's a good idea to override such anti-security BIOS settings (we certainly have no compatibility problem due to NX being enabled). Secondary changes: - no need to check supported extended CPUID level for leaves 80000000 and 80000001 (required on x86-64) - no need to update c->cpuid_level in early_init_intel() (done anyway in generic_identify()) - alignment of trampoline data items Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/boot/trampoline.S | 22 ++++++++++++++++++++++ xen/arch/x86/cpu/common.c | 18 +++++++++--------- xen/arch/x86/cpu/intel.c | 25 ++++++++++++++++--------- xen/include/asm-x86/msr-index.h | 1 + xen/include/asm-x86/processor.h | 1 + 5 files changed, 49 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S index c8f32cd..b013614 100644 --- a/xen/arch/x86/boot/trampoline.S +++ b/xen/arch/x86/boot/trampoline.S @@ -32,9 +32,13 @@ GLOBAL(trampoline_realmode_entry) lmsw %ax # CR0.PE = 1 (enter protected mode) ljmpl $BOOT_CS32,$bootsym_rel(trampoline_protmode_entry,6) + .balign 8 + .word 0 idt_48: .word 0, 0, 0 # base = limit = 0 + .word 0 gdt_48: .word 6*8-1 .long bootsym_rel(trampoline_gdt,4) + trampoline_gdt: /* 0x0000: unused */ .quad 0x0000000000000000 @@ -56,6 +60,9 @@ trampoline_gdt: .long trampoline_gdt + BOOT_PSEUDORM_DS + 2 - . .popsection +GLOBAL(trampoline_misc_enable_off) + .quad 0 + GLOBAL(cpuid_ext_features) .long 0 @@ -84,6 +91,21 @@ trampoline_protmode_entry: add bootsym_rel(trampoline_xen_phys_start,4,%eax) mov %eax,%cr3 + /* Adjust IA32_MISC_ENABLE if needed (for NX enabling below). */ + mov bootsym_rel(trampoline_misc_enable_off,4,%esi) + mov bootsym_rel(trampoline_misc_enable_off+4,4,%edi) + mov %esi,%eax + or %edi,%eax + jz 1f + mov $MSR_IA32_MISC_ENABLE,%ecx + rdmsr + not %esi + not %edi + and %esi,%eax + and %edi,%edx + wrmsr +1: + /* Set up EFER (Extended Feature Enable Register). */ mov bootsym_rel(cpuid_ext_features,4,%edi) movl $MSR_EFER,%ecx diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 310ec85..07566d9 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -256,15 +256,15 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) /* AMD-defined flags: level 0x80000001 */ c->extended_cpuid_level = cpuid_eax(0x80000000); - if ( (c->extended_cpuid_level & 0xffff0000) == 0x80000000 ) { - if ( c->extended_cpuid_level >= 0x80000001 ) - cpuid(0x80000001, &tmp, &tmp, - &c->x86_capability[cpufeat_word(X86_FEATURE_LAHF_LM)], - &c->x86_capability[cpufeat_word(X86_FEATURE_SYSCALL)]); - - if ( c->extended_cpuid_level >= 0x80000004 ) - get_model_name(c); /* Default name */ - } + cpuid(0x80000001, &tmp, &tmp, + &c->x86_capability[cpufeat_word(X86_FEATURE_LAHF_LM)], + &c->x86_capability[cpufeat_word(X86_FEATURE_SYSCALL)]); + if (c == &boot_cpu_data) + bootsym(cpuid_ext_features) = + c->x86_capability[cpufeat_word(X86_FEATURE_NX)]; + + if (c->extended_cpuid_level >= 0x80000004) + get_model_name(c); /* Default name */ /* Intel-defined flags: level 0x00000007 */ if ( c->cpuid_level >= 0x00000007 ) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 67dabc0..d4f574b 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -162,19 +162,26 @@ static void early_init_intel(struct cpuinfo_x86 *c) if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; - /* Unmask CPUID levels if masked: */ + /* Unmask CPUID levels and NX if masked: */ if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) { - u64 misc_enable; + u64 misc_enable, disable; rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - if (misc_enable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) { - misc_enable &= ~MSR_IA32_MISC_ENABLE_LIMIT_CPUID; - wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable); - c->cpuid_level = cpuid_eax(0); - if (opt_cpu_info || c == &boot_cpu_data) - printk(KERN_INFO "revised cpuid level: %d\n", - c->cpuid_level); + disable = misc_enable & (MSR_IA32_MISC_ENABLE_LIMIT_CPUID | + MSR_IA32_MISC_ENABLE_XD_DISABLE); + if (disable) { + wrmsrl(MSR_IA32_MISC_ENABLE, misc_enable & ~disable); + bootsym(trampoline_misc_enable_off) |= disable; + } + + if (disable & MSR_IA32_MISC_ENABLE_LIMIT_CPUID) + printk(KERN_INFO "revised cpuid level: %d\n", + cpuid_eax(0)); + if (disable & MSR_IA32_MISC_ENABLE_XD_DISABLE) { + write_efer(read_efer() | EFER_NX); + printk(KERN_INFO + "re-enabled NX (Execute Disable) protection\n"); } } diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index b8ad93c..2b97861 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -322,6 +322,7 @@ #define MSR_IA32_MISC_ENABLE_MONITOR_ENABLE (1<<18) #define MSR_IA32_MISC_ENABLE_LIMIT_CPUID (1<<22) #define MSR_IA32_MISC_ENABLE_XTPR_DISABLE (1<<23) +#define MSR_IA32_MISC_ENABLE_XD_DISABLE (1ULL << 34) #define MSR_IA32_TSC_DEADLINE 0x000006E0 #define MSR_IA32_ENERGY_PERF_BIAS 0x000001b0 diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 3f8411f..26ba141 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -216,6 +216,7 @@ extern void set_cpuid_faulting(bool_t enable); extern u64 host_pat; extern bool_t opt_cpu_info; extern u32 cpuid_ext_features; +extern u64 trampoline_misc_enable_off; /* Maximum width of physical addresses supported by the hardware */ extern unsigned int paddr_bits; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46: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 1a93zA-0000Ui-Fa; Wed, 16 Dec 2015 04:46:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93z8-0000UR-Oz for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:42 +0000 Content-Length: 2580 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id B7/8B-31122-2BCE0765; Wed, 16 Dec 2015 04:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450241200!5567168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35766 invoked from network); 16 Dec 2015 04:46:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93z6-0005Va-MX for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93z6-0001me-JX for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:40 +0000 Date: Wed, 16 Dec 2015 04:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: make flush-all actually flush all X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6267164043363180842==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6267164043363180842== Content-Length: 2181 Content-Transfer-Encoding: quoted-printable commit fd3102e5d29cd07682e8c507134112225b63b189 Author: Jan Beulich AuthorDate: Thu Dec 10 13:17:49 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:17:49 2015 +0100 VT-d: make flush-all actually flush all Passing gfn=3D0 and page_count=3D0 actually avoids the iommu_flush_iotlb_dsi() and results in page-specific invalidation instead. Reported-by: "=E5=BC=A0=E6=99=BA" Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Feng Wu --- xen/drivers/passthrough/vtd/iommu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 1d17769..065f239 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -583,7 +583,7 @@ static void __intel_iommu_iotlb_flush(struct domain *d, unsigned long gfn, if ( iommu_domid =3D=3D -1 ) continue; - if ( page_count > 1 || gfn =3D=3D -1 ) + if ( page_count !=3D 1 || gfn =3D=3D INVALID_GFN ) { if ( iommu_flush_iotlb_dsi(iommu, iommu_domid, 0, flush_dev_iotlb) ) @@ -592,7 +592,7 @@ static void __intel_iommu_iotlb_flush(struct domain *d, unsigned long gfn, else { if ( iommu_flush_iotlb_psi(iommu, iommu_domid, - (paddr_t)gfn << PAGE_SHIFT_4K, 0, + (paddr_t)gfn << PAGE_SHIFT_4K, PAGE_ORDER_4K, !dma_old_pte_present, flush_dev_iotlb) ) iommu_flush_write_buffer(iommu); } @@ -606,7 +606,7 @@ static void intel_iommu_iotlb_flush(struct domain *d, unsigned long gfn, unsigne static void intel_iommu_iotlb_flush_all(struct domain *d) { - __intel_iommu_iotlb_flush(d, 0, 0, 0); + __intel_iommu_iotlb_flush(d, INVALID_GFN, 0, 0); } /* clear one page's page table */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6267164043363180842== 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 --===============6267164043363180842==-- From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:44 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46: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 1a93zA-0000Ui-Fa; Wed, 16 Dec 2015 04:46:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93z8-0000UR-Oz for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:42 +0000 Content-Length: 2580 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id B7/8B-31122-2BCE0765; Wed, 16 Dec 2015 04:46:42 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450241200!5567168!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35766 invoked from network); 16 Dec 2015 04:46:41 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:46:41 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93z6-0005Va-MX for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93z6-0001me-JX for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:40 +0000 Date: Wed, 16 Dec 2015 04:46:40 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: make flush-all actually flush all X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============6267164043363180842==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============6267164043363180842== Content-Length: 2181 Content-Transfer-Encoding: quoted-printable commit fd3102e5d29cd07682e8c507134112225b63b189 Author: Jan Beulich AuthorDate: Thu Dec 10 13:17:49 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 13:17:49 2015 +0100 VT-d: make flush-all actually flush all Passing gfn=3D0 and page_count=3D0 actually avoids the iommu_flush_iotlb_dsi() and results in page-specific invalidation instead. Reported-by: "=E5=BC=A0=E6=99=BA" Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Feng Wu --- xen/drivers/passthrough/vtd/iommu.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 1d17769..065f239 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -583,7 +583,7 @@ static void __intel_iommu_iotlb_flush(struct domain *d, unsigned long gfn, if ( iommu_domid =3D=3D -1 ) continue; - if ( page_count > 1 || gfn =3D=3D -1 ) + if ( page_count !=3D 1 || gfn =3D=3D INVALID_GFN ) { if ( iommu_flush_iotlb_dsi(iommu, iommu_domid, 0, flush_dev_iotlb) ) @@ -592,7 +592,7 @@ static void __intel_iommu_iotlb_flush(struct domain *d, unsigned long gfn, else { if ( iommu_flush_iotlb_psi(iommu, iommu_domid, - (paddr_t)gfn << PAGE_SHIFT_4K, 0, + (paddr_t)gfn << PAGE_SHIFT_4K, PAGE_ORDER_4K, !dma_old_pte_present, flush_dev_iotlb) ) iommu_flush_write_buffer(iommu); } @@ -606,7 +606,7 @@ static void intel_iommu_iotlb_flush(struct domain *d, unsigned long gfn, unsigne static void intel_iommu_iotlb_flush_all(struct domain *d) { - __intel_iommu_iotlb_flush(d, 0, 0, 0); + __intel_iommu_iotlb_flush(d, INVALID_GFN, 0, 0); } /* clear one page's page table */ -- generated by git-patchbot for /home/xen/git/xen.git#master --===============6267164043363180842== 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 --===============6267164043363180842==-- From xen-changelog-bounces@lists.xen.org Wed Dec 16 04:46:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zK-0000WM-KC; Wed, 16 Dec 2015 04:46:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zJ-0000W6-Ji for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:53 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 40/BE-18633-CBCE0765; Wed, 16 Dec 2015 04:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1450241211!10736247!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38389 invoked from network); 16 Dec 2015 04:46:51 -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; 16 Dec 2015 04:46:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zG-0005Vi-Un for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93zG-0001nA-TD for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:50 +0000 Date: Wed, 16 Dec 2015 04:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: update check-xl-disk-parse X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41b0aa569adb9dc9b759ccb424eb51484607da2d Author: Wei Liu AuthorDate: Wed Dec 9 10:43:36 2015 +0000 Commit: Ian Campbell CommitDate: Thu Dec 10 12:38:42 2015 +0000 libxl: update check-xl-disk-parse The block-attach command now returns 1 when fails. Update first test case to expect return value 1 instead of 255. The parser now doesn't generate output for default values. Remove them from expected output. According to 417e6b70 ("libxl: add option for discard support to xl disk configuration"), the "discard=" variant is never supported, delete two test cases with that variant. Reported-by: Jim Fehlig Signed-off-by: Wei Liu Tested-by: Jim Fehlig Acked-by: Ian Campbell --- tools/libxl/check-xl-disk-parse | 100 +++----------------------------------- 1 files changed, 8 insertions(+), 92 deletions(-) diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse index 1bec4ca..03572e4 100755 --- a/tools/libxl/check-xl-disk-parse +++ b/tools/libxl/check-xl-disk-parse @@ -40,7 +40,7 @@ complete () { fi } -e=255 +e=1 #---------- test data ---------- @@ -52,18 +52,10 @@ one $e foo expected < Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:46:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zK-0000WM-KC; Wed, 16 Dec 2015 04:46:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zJ-0000W6-Ji for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:53 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 40/BE-18633-CBCE0765; Wed, 16 Dec 2015 04:46:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1450241211!10736247!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38389 invoked from network); 16 Dec 2015 04:46:51 -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; 16 Dec 2015 04:46:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zG-0005Vi-Un for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93zG-0001nA-TD for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:46:50 +0000 Date: Wed, 16 Dec 2015 04:46:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: update check-xl-disk-parse X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 41b0aa569adb9dc9b759ccb424eb51484607da2d Author: Wei Liu AuthorDate: Wed Dec 9 10:43:36 2015 +0000 Commit: Ian Campbell CommitDate: Thu Dec 10 12:38:42 2015 +0000 libxl: update check-xl-disk-parse The block-attach command now returns 1 when fails. Update first test case to expect return value 1 instead of 255. The parser now doesn't generate output for default values. Remove them from expected output. According to 417e6b70 ("libxl: add option for discard support to xl disk configuration"), the "discard=" variant is never supported, delete two test cases with that variant. Reported-by: Jim Fehlig Signed-off-by: Wei Liu Tested-by: Jim Fehlig Acked-by: Ian Campbell --- tools/libxl/check-xl-disk-parse | 100 +++----------------------------------- 1 files changed, 8 insertions(+), 92 deletions(-) diff --git a/tools/libxl/check-xl-disk-parse b/tools/libxl/check-xl-disk-parse index 1bec4ca..03572e4 100755 --- a/tools/libxl/check-xl-disk-parse +++ b/tools/libxl/check-xl-disk-parse @@ -40,7 +40,7 @@ complete () { fi } -e=255 +e=1 #---------- test data ---------- @@ -52,18 +52,10 @@ one $e foo expected < Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:47:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zV-0000Yb-PJ; Wed, 16 Dec 2015 04:47:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zT-0000Xd-Sy for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:04 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 1B/6E-17090-7CCE0765; Wed, 16 Dec 2015 04:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1450241221!10683985!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29999 invoked from network); 16 Dec 2015 04:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:47:02 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zR-0005W6-7s for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93zR-0001o0-5B for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:01 +0000 Date: Wed, 16 Dec 2015 04:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: fix (ACPI S3) resume with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc018634b0814399880ccfe827711583d19108ca Author: Dario Faggioli AuthorDate: Thu Dec 10 17:24:51 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 17:24:51 2015 +0100 sched: fix (ACPI S3) resume with cpupools with different schedulers In fact, with 2 cpupools, one (the default) Credit and one Credit2 (with at least 1 pCPU in the latter), trying a (e.g., ACPI S3) suspend/resume crashes like this: (XEN) [ 150.587779] ----[ Xen-4.7-unstable x86_64 debug=y Not tainted ]---- (XEN) [ 150.587783] CPU: 6 (XEN) [ 150.587786] RIP: e008:[] sched_credit.c#csched_schedule+0xf2/0xc3d (XEN) [ 150.587796] RFLAGS: 0000000000010086 CONTEXT: hypervisor (XEN) [ 150.587801] rax: ffff83031fa3c020 rbx: ffff830322c1b4b0 rcx: 0000000000000000 (XEN) [ 150.587806] rdx: ffff83031fa78000 rsi: 000000000000000a rdi: ffff82d0802a9788 (XEN) [ 150.587811] rbp: ffff83031fa7fe20 rsp: ffff83031fa7fd30 r8: ffff83031fa80000 (XEN) [ 150.587815] r9: 0000000000000006 r10: 000000000008f7f2 r11: 0000000000000006 (XEN) [ 150.587819] r12: ffff8300dbdf3000 r13: ffff830322c1b4b0 r14: 0000000000000006 (XEN) [ 150.587823] r15: 0000000000000000 cr0: 000000008005003b cr4: 00000000000026e0 (XEN) [ 150.587827] cr3: 00000000dbaa8000 cr2: 0000000000000000 (XEN) [ 150.587830] ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) [ 150.587835] Xen stack trace from rsp=ffff83031fa7fd30: ... ... ... (XEN) [ 150.587962] Xen call trace: (XEN) [ 150.587966] [] sched_credit.c#csched_schedule+0xf2/0xc3d (XEN) [ 150.587974] [] schedule.c#schedule+0x128/0x635 (XEN) [ 150.587979] [] softirq.c#__do_softirq+0x82/0x8d (XEN) [ 150.587983] [] do_softirq+0x13/0x15 (XEN) [ 150.587988] [] domain.c#idle_loop+0x5b/0x6b (XEN) [ 151.272182] (XEN) [ 151.274174] **************************************** (XEN) [ 151.279624] Panic on CPU 6: (XEN) [ 151.282915] Xen BUG at sched_credit.c:655 (XEN) [ 151.287415] **************************************** During suspend, the pCPUs are not removed from their pools with the standard procedure (which would involve schedule_cpu_switch(). During resume, they: 1) are assigned to the default cpupool (CPU_UP_PREPARE phase); 2) are moved to the pool they were in before suspend, via schedule_cpu_switch() (CPU_ONLINE phase) During resume, scheduling (even if just the idle loop) can happen right after the CPU_STARTING phase(before CPU_ONLINE), i.e., before the pCPU is put back in its pool. In this case, it is the default pool'sscheduler that is invoked (Credit1, in the example above). But, during suspend, the Credit2 specific vCPU data is not being freed, and Credit1 specific vCPU data is not allocated, during resume. Therefore, Credit1 schedules on pCPUs whose idle vCPU's sched_priv points to Credit2 vCPU data, and we crash. Fix things by properly deallocating scheduler specific data of the pCPU's pool scheduler during pCPU teardown, and re-allocating them --always for &ops-- during pCPU bringup. This also fixes another (latent) bug. In fact, it avoids, still in schedule_cpu_switch(), that Credit1's free_vdata() is used to deallocate data allocated with Credit2's alloc_vdata(). This is not easy to trigger, but only because the other bug shown above manifests first and crashes the host. The downside of this patch, is that it adds one more allocation on the resume path, which is not ideal. Still, there is no better way of fixing the described bugs at the moment. Removing (all ideally) allocations happening during resume should continue being chased, in the long run. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Reviewed-by: George Dunlap --- xen/common/schedule.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index c195129..d121896 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1380,6 +1380,27 @@ static int cpu_schedule_up(unsigned int cpu) if ( idle_vcpu[cpu] == NULL ) alloc_vcpu(idle_vcpu[0]->domain, cpu, cpu); + else + { + struct vcpu *idle = idle_vcpu[cpu]; + + /* + * During (ACPI?) suspend the idle vCPU for this pCPU is not freed, + * while its scheduler specific data (what is pointed by sched_priv) + * is. Also, at this stage of the resume path, we attach the pCPU + * to the default scheduler, no matter in what cpupool it was before + * suspend. To avoid inconsistency, let's allocate default scheduler + * data for the idle vCPU here. If the pCPU was in a different pool + * with a different scheduler, it is schedule_cpu_switch(), invoked + * later, that will set things up as appropriate. + */ + ASSERT(idle->sched_priv == NULL); + + idle->sched_priv = SCHED_OP(&ops, alloc_vdata, idle, + idle->domain->sched_priv); + if ( idle->sched_priv == NULL ) + return -ENOMEM; + } if ( idle_vcpu[cpu] == NULL ) return -ENOMEM; @@ -1397,6 +1418,10 @@ static void cpu_schedule_down(unsigned int cpu) if ( sd->sched_priv != NULL ) SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_vdata, idle_vcpu[cpu]->sched_priv); + + idle_vcpu[cpu]->sched_priv = NULL; + sd->sched_priv = NULL; kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.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 16 04:47:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:47:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zV-0000Yb-PJ; Wed, 16 Dec 2015 04:47:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zT-0000Xd-Sy for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:04 +0000 Received: from [85.158.139.211] by server-10.bemta-5.messagelabs.com id 1B/6E-17090-7CCE0765; Wed, 16 Dec 2015 04:47:03 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1450241221!10683985!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29999 invoked from network); 16 Dec 2015 04:47:02 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 16 Dec 2015 04:47:02 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zR-0005W6-7s for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:01 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93zR-0001o0-5B for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:01 +0000 Date: Wed, 16 Dec 2015 04:47:01 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] sched: fix (ACPI S3) resume with cpupools with different schedulers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dc018634b0814399880ccfe827711583d19108ca Author: Dario Faggioli AuthorDate: Thu Dec 10 17:24:51 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 17:24:51 2015 +0100 sched: fix (ACPI S3) resume with cpupools with different schedulers In fact, with 2 cpupools, one (the default) Credit and one Credit2 (with at least 1 pCPU in the latter), trying a (e.g., ACPI S3) suspend/resume crashes like this: (XEN) [ 150.587779] ----[ Xen-4.7-unstable x86_64 debug=y Not tainted ]---- (XEN) [ 150.587783] CPU: 6 (XEN) [ 150.587786] RIP: e008:[] sched_credit.c#csched_schedule+0xf2/0xc3d (XEN) [ 150.587796] RFLAGS: 0000000000010086 CONTEXT: hypervisor (XEN) [ 150.587801] rax: ffff83031fa3c020 rbx: ffff830322c1b4b0 rcx: 0000000000000000 (XEN) [ 150.587806] rdx: ffff83031fa78000 rsi: 000000000000000a rdi: ffff82d0802a9788 (XEN) [ 150.587811] rbp: ffff83031fa7fe20 rsp: ffff83031fa7fd30 r8: ffff83031fa80000 (XEN) [ 150.587815] r9: 0000000000000006 r10: 000000000008f7f2 r11: 0000000000000006 (XEN) [ 150.587819] r12: ffff8300dbdf3000 r13: ffff830322c1b4b0 r14: 0000000000000006 (XEN) [ 150.587823] r15: 0000000000000000 cr0: 000000008005003b cr4: 00000000000026e0 (XEN) [ 150.587827] cr3: 00000000dbaa8000 cr2: 0000000000000000 (XEN) [ 150.587830] ds: 0000 es: 0000 fs: 0000 gs: 0000 ss: 0000 cs: e008 (XEN) [ 150.587835] Xen stack trace from rsp=ffff83031fa7fd30: ... ... ... (XEN) [ 150.587962] Xen call trace: (XEN) [ 150.587966] [] sched_credit.c#csched_schedule+0xf2/0xc3d (XEN) [ 150.587974] [] schedule.c#schedule+0x128/0x635 (XEN) [ 150.587979] [] softirq.c#__do_softirq+0x82/0x8d (XEN) [ 150.587983] [] do_softirq+0x13/0x15 (XEN) [ 150.587988] [] domain.c#idle_loop+0x5b/0x6b (XEN) [ 151.272182] (XEN) [ 151.274174] **************************************** (XEN) [ 151.279624] Panic on CPU 6: (XEN) [ 151.282915] Xen BUG at sched_credit.c:655 (XEN) [ 151.287415] **************************************** During suspend, the pCPUs are not removed from their pools with the standard procedure (which would involve schedule_cpu_switch(). During resume, they: 1) are assigned to the default cpupool (CPU_UP_PREPARE phase); 2) are moved to the pool they were in before suspend, via schedule_cpu_switch() (CPU_ONLINE phase) During resume, scheduling (even if just the idle loop) can happen right after the CPU_STARTING phase(before CPU_ONLINE), i.e., before the pCPU is put back in its pool. In this case, it is the default pool'sscheduler that is invoked (Credit1, in the example above). But, during suspend, the Credit2 specific vCPU data is not being freed, and Credit1 specific vCPU data is not allocated, during resume. Therefore, Credit1 schedules on pCPUs whose idle vCPU's sched_priv points to Credit2 vCPU data, and we crash. Fix things by properly deallocating scheduler specific data of the pCPU's pool scheduler during pCPU teardown, and re-allocating them --always for &ops-- during pCPU bringup. This also fixes another (latent) bug. In fact, it avoids, still in schedule_cpu_switch(), that Credit1's free_vdata() is used to deallocate data allocated with Credit2's alloc_vdata(). This is not easy to trigger, but only because the other bug shown above manifests first and crashes the host. The downside of this patch, is that it adds one more allocation on the resume path, which is not ideal. Still, there is no better way of fixing the described bugs at the moment. Removing (all ideally) allocations happening during resume should continue being chased, in the long run. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross Reviewed-by: George Dunlap --- xen/common/schedule.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/xen/common/schedule.c b/xen/common/schedule.c index c195129..d121896 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1380,6 +1380,27 @@ static int cpu_schedule_up(unsigned int cpu) if ( idle_vcpu[cpu] == NULL ) alloc_vcpu(idle_vcpu[0]->domain, cpu, cpu); + else + { + struct vcpu *idle = idle_vcpu[cpu]; + + /* + * During (ACPI?) suspend the idle vCPU for this pCPU is not freed, + * while its scheduler specific data (what is pointed by sched_priv) + * is. Also, at this stage of the resume path, we attach the pCPU + * to the default scheduler, no matter in what cpupool it was before + * suspend. To avoid inconsistency, let's allocate default scheduler + * data for the idle vCPU here. If the pCPU was in a different pool + * with a different scheduler, it is schedule_cpu_switch(), invoked + * later, that will set things up as appropriate. + */ + ASSERT(idle->sched_priv == NULL); + + idle->sched_priv = SCHED_OP(&ops, alloc_vdata, idle, + idle->domain->sched_priv); + if ( idle->sched_priv == NULL ) + return -ENOMEM; + } if ( idle_vcpu[cpu] == NULL ) return -ENOMEM; @@ -1397,6 +1418,10 @@ static void cpu_schedule_down(unsigned int cpu) if ( sd->sched_priv != NULL ) SCHED_OP(sched, free_pdata, sd->sched_priv, cpu); + SCHED_OP(sched, free_vdata, idle_vcpu[cpu]->sched_priv); + + idle_vcpu[cpu]->sched_priv = NULL; + sd->sched_priv = NULL; kill_timer(&sd->s_timer); } -- generated by git-patchbot for /home/xen/git/xen.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 16 04:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:47:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93ze-0000Zy-Te; Wed, 16 Dec 2015 04:47:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zd-0000Zf-GP for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:13 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id E8/2C-18316-0DCE0765; Wed, 16 Dec 2015 04:47:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450241231!5593343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19068 invoked from network); 16 Dec 2015 04:47:12 -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; 16 Dec 2015 04:47:12 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zb-0005WR-M6 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93zb-0001oq-En for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:11 +0000 Date: Wed, 16 Dec 2015 04:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: Correct order of parameters to memset() in setup_posted_irte() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6f0e099d2c17de47fd86e817b1998db903cab61 Author: Andrew Cooper AuthorDate: Thu Dec 10 17:25:18 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 17:25:18 2015 +0100 VT-d: Correct order of parameters to memset() in setup_posted_irte() Introduced in c/s 83ea9229 "vt-d: add API to update IRTE when VT-d PI is used". Spotted by Coverity. Signed-off-by: Andrew Cooper --- xen/drivers/passthrough/vtd/intremap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 0a48cd4..0ee3fb2 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -910,7 +910,7 @@ static void setup_posted_irte( struct iremap_entry *new_ire, const struct iremap_entry *old_ire, const struct pi_desc *pi_desc, const uint8_t gvec) { - memset(new_ire, sizeof(*new_ire), 0); + memset(new_ire, 0, sizeof(*new_ire)); /* * 'im' filed decides whether the irte is in posted format (with value 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 Wed Dec 16 04:47:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 16 Dec 2015 04:47:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93ze-0000Zy-Te; Wed, 16 Dec 2015 04:47:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zd-0000Zf-GP for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:13 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id E8/2C-18316-0DCE0765; Wed, 16 Dec 2015 04:47:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450241231!5593343!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19068 invoked from network); 16 Dec 2015 04:47:12 -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; 16 Dec 2015 04:47:12 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a93zb-0005WR-M6 for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a93zb-0001oq-En for xen-changelog@lists.xensource.com; Wed, 16 Dec 2015 04:47:11 +0000 Date: Wed, 16 Dec 2015 04:47:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VT-d: Correct order of parameters to memset() in setup_posted_irte() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e6f0e099d2c17de47fd86e817b1998db903cab61 Author: Andrew Cooper AuthorDate: Thu Dec 10 17:25:18 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 10 17:25:18 2015 +0100 VT-d: Correct order of parameters to memset() in setup_posted_irte() Introduced in c/s 83ea9229 "vt-d: add API to update IRTE when VT-d PI is used". Spotted by Coverity. Signed-off-by: Andrew Cooper --- xen/drivers/passthrough/vtd/intremap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c index 0a48cd4..0ee3fb2 100644 --- a/xen/drivers/passthrough/vtd/intremap.c +++ b/xen/drivers/passthrough/vtd/intremap.c @@ -910,7 +910,7 @@ static void setup_posted_irte( struct iremap_entry *new_ire, const struct iremap_entry *old_ire, const struct pi_desc *pi_desc, const uint8_t gvec) { - memset(new_ire, sizeof(*new_ire), 0); + memset(new_ire, 0, sizeof(*new_ire)); /* * 'im' filed decides whether the irte is in posted format (with value 1) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3m-0001W5-5Y; Thu, 17 Dec 2015 07:33:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3j-0001Vb-MS for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:07 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 05/85-31122-33562765; Thu, 17 Dec 2015 07:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1450337585!5929976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40047 invoked from network); 17 Dec 2015 07:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:33:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3h-0005jj-NP for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T3h-0007eO-8j for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:05 +0000 Date: Thu, 17 Dec 2015 07:33:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Flush for every exit paths in apply_p2m_changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ec2fa626f71152031b620bfe2d4941b9016a688 Author: Julien Grall AuthorDate: Tue Dec 1 17:52:09 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:58:54 2015 +0000 xen/arm: p2m: Flush for every exit paths in apply_p2m_changes Currently, the TLB is not flushed if an error occured while updating the stage-2 p2m. However, the TLB will contain stale mappings for any entry updated so far. To avoid a such situation, flush on every exit path when the variable "flush" is set. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index e396c40..f910cab 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1010,7 +1010,7 @@ static int apply_p2m_changes(struct domain *d, if ( (egfn - sgfn) > progress && !(progress & mask) ) { rc = progress; - goto tlbflush; + goto out; } break; } @@ -1096,15 +1096,13 @@ static int apply_p2m_changes(struct domain *d, rc = 0; -tlbflush: +out: if ( flush ) { flush_tlb_domain(d); iommu_iotlb_flush(d, sgfn, egfn - sgfn); } -out: - if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && addr != start_gpaddr ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3m-0001W5-5Y; Thu, 17 Dec 2015 07:33:10 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3j-0001Vb-MS for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:07 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 05/85-31122-33562765; Thu, 17 Dec 2015 07:33:07 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1450337585!5929976!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40047 invoked from network); 17 Dec 2015 07:33:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:33:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3h-0005jj-NP for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T3h-0007eO-8j for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:05 +0000 Date: Thu, 17 Dec 2015 07:33:05 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Flush for every exit paths in apply_p2m_changes X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1ec2fa626f71152031b620bfe2d4941b9016a688 Author: Julien Grall AuthorDate: Tue Dec 1 17:52:09 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:58:54 2015 +0000 xen/arm: p2m: Flush for every exit paths in apply_p2m_changes Currently, the TLB is not flushed if an error occured while updating the stage-2 p2m. However, the TLB will contain stale mappings for any entry updated so far. To avoid a such situation, flush on every exit path when the variable "flush" is set. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index e396c40..f910cab 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1010,7 +1010,7 @@ static int apply_p2m_changes(struct domain *d, if ( (egfn - sgfn) > progress && !(progress & mask) ) { rc = progress; - goto tlbflush; + goto out; } break; } @@ -1096,15 +1096,13 @@ static int apply_p2m_changes(struct domain *d, rc = 0; -tlbflush: +out: if ( flush ) { flush_tlb_domain(d); iommu_iotlb_flush(d, sgfn, egfn - sgfn); } -out: - if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && addr != start_gpaddr ) { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07: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 1a9T3v-0001X5-9i; Thu, 17 Dec 2015 07: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 1a9T3u-0001Wo-1T for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:18 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id F0/B5-31122-D3562765; Thu, 17 Dec 2015 07:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450337596!5935573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37517 invoked from network); 17 Dec 2015 07:33:17 -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; 17 Dec 2015 07:33:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3s-0005jr-38 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T3r-0007f0-VI for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:15 +0000 Date: Thu, 17 Dec 2015 07:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Store the page for each mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0cc05ca868036ea8751688b29d77f32ca0acb710 Author: Julien Grall AuthorDate: Tue Dec 1 17:52:10 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:58:54 2015 +0000 xen/arm: p2m: Store the page for each mapping The page will be use later for reference counting. So we need a quick access to the page associated to the mapping. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index f910cab..f28ae3f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -942,6 +942,7 @@ static int apply_p2m_changes(struct domain *d, int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; lpae_t *mappings[4] = { NULL, NULL, NULL, NULL }; + struct page_info *pages[4] = { NULL, NULL, NULL, NULL }; paddr_t addr, orig_maddr = maddr; unsigned int level = 0; unsigned int cur_root_table = ~0; @@ -964,7 +965,10 @@ static int apply_p2m_changes(struct domain *d, /* Static mapping. P2M_ROOT_PAGES > 1 are handled below */ if ( P2M_ROOT_PAGES == 1 ) + { mappings[P2M_ROOT_LEVEL] = __map_domain_page(p2m->root); + pages[P2M_ROOT_LEVEL] = p2m->root; + } addr = start_gpaddr; while ( addr < end_gpaddr ) @@ -1047,6 +1051,7 @@ static int apply_p2m_changes(struct domain *d, unmap_domain_page(mappings[P2M_ROOT_LEVEL]); mappings[P2M_ROOT_LEVEL] = __map_domain_page(p2m->root + root_table); + pages[P2M_ROOT_LEVEL] = p2m->root + root_table; cur_root_table = root_table; /* Any mapping further down is now invalid */ for ( i = P2M_ROOT_LEVEL; i < 4; i++ ) @@ -1079,6 +1084,7 @@ static int apply_p2m_changes(struct domain *d, if ( mappings[level+1] ) unmap_domain_page(mappings[level+1]); mappings[level+1] = map_domain_page(_mfn(entry->p2m.base)); + pages[level+1] = mfn_to_page(entry->p2m.base); cur_offset[level] = offset; /* Any mapping further down is now invalid */ for ( i = level+1; i < 4; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07: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 1a9T3v-0001X5-9i; Thu, 17 Dec 2015 07: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 1a9T3u-0001Wo-1T for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:18 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id F0/B5-31122-D3562765; Thu, 17 Dec 2015 07:33:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450337596!5935573!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37517 invoked from network); 17 Dec 2015 07:33:17 -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; 17 Dec 2015 07:33:17 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T3s-0005jr-38 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T3r-0007f0-VI for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:15 +0000 Date: Thu, 17 Dec 2015 07:33:15 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Store the page for each mapping X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 0cc05ca868036ea8751688b29d77f32ca0acb710 Author: Julien Grall AuthorDate: Tue Dec 1 17:52:10 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:58:54 2015 +0000 xen/arm: p2m: Store the page for each mapping The page will be use later for reference counting. So we need a quick access to the page associated to the mapping. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index f910cab..f28ae3f 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -942,6 +942,7 @@ static int apply_p2m_changes(struct domain *d, int rc, ret; struct p2m_domain *p2m = &d->arch.p2m; lpae_t *mappings[4] = { NULL, NULL, NULL, NULL }; + struct page_info *pages[4] = { NULL, NULL, NULL, NULL }; paddr_t addr, orig_maddr = maddr; unsigned int level = 0; unsigned int cur_root_table = ~0; @@ -964,7 +965,10 @@ static int apply_p2m_changes(struct domain *d, /* Static mapping. P2M_ROOT_PAGES > 1 are handled below */ if ( P2M_ROOT_PAGES == 1 ) + { mappings[P2M_ROOT_LEVEL] = __map_domain_page(p2m->root); + pages[P2M_ROOT_LEVEL] = p2m->root; + } addr = start_gpaddr; while ( addr < end_gpaddr ) @@ -1047,6 +1051,7 @@ static int apply_p2m_changes(struct domain *d, unmap_domain_page(mappings[P2M_ROOT_LEVEL]); mappings[P2M_ROOT_LEVEL] = __map_domain_page(p2m->root + root_table); + pages[P2M_ROOT_LEVEL] = p2m->root + root_table; cur_root_table = root_table; /* Any mapping further down is now invalid */ for ( i = P2M_ROOT_LEVEL; i < 4; i++ ) @@ -1079,6 +1084,7 @@ static int apply_p2m_changes(struct domain *d, if ( mappings[level+1] ) unmap_domain_page(mappings[level+1]); mappings[level+1] = map_domain_page(_mfn(entry->p2m.base)); + pages[level+1] = mfn_to_page(entry->p2m.base); cur_offset[level] = offset; /* Any mapping further down is now invalid */ for ( i = level+1; i < 4; i++ ) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07: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 1a9T46-0001Yr-F3; Thu, 17 Dec 2015 07: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 1a9T44-0001YN-TD for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:28 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id AD/63-13475-84562765; Thu, 17 Dec 2015 07:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1450337606!11566736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58798 invoked from network); 17 Dec 2015 07:33:27 -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; 17 Dec 2015 07:33:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T42-0005k3-HV for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T42-0007fR-E3 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:26 +0000 Date: Thu, 17 Dec 2015 07:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Introduce a helper to remove an entry in the page table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47f43d1645c8751240415de8609a4c4b07ea3591 Author: Julien Grall AuthorDate: Tue Dec 1 17:52:11 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:58:54 2015 +0000 xen/arm: p2m: Introduce a helper to remove an entry in the page table Factorize the code to remove an entry in p2m_remove_pte so we can re-use it later. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index f28ae3f..ae0acf0 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -367,6 +367,14 @@ static inline void p2m_write_pte(lpae_t *p, lpae_t pte, bool_t flush_cache) clean_dcache(*p); } +static inline void p2m_remove_pte(lpae_t *p, bool_t flush_cache) +{ + lpae_t pte; + + memset(&pte, 0x00, sizeof(pte)); + p2m_write_pte(p, pte, flush_cache); +} + /* * Allocate a new page table page and hook it in via the given entry. * apply_one_level relies on this returning 0 on success @@ -839,8 +847,7 @@ static int apply_one_level(struct domain *d, *flush = true; - memset(&pte, 0x00, sizeof(pte)); - p2m_write_pte(entry, pte, flush_cache); + p2m_remove_pte(entry, flush_cache); p2m_mem_access_radix_set(p2m, paddr_to_pfn(*addr), p2m_access_rwx); *addr += level_size; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07: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 1a9T46-0001Yr-F3; Thu, 17 Dec 2015 07: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 1a9T44-0001YN-TD for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:28 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id AD/63-13475-84562765; Thu, 17 Dec 2015 07:33:28 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1450337606!11566736!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58798 invoked from network); 17 Dec 2015 07:33:27 -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; 17 Dec 2015 07:33:27 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T42-0005k3-HV for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:26 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T42-0007fR-E3 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:26 +0000 Date: Thu, 17 Dec 2015 07:33:26 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Introduce a helper to remove an entry in the page table X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 47f43d1645c8751240415de8609a4c4b07ea3591 Author: Julien Grall AuthorDate: Tue Dec 1 17:52:11 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:58:54 2015 +0000 xen/arm: p2m: Introduce a helper to remove an entry in the page table Factorize the code to remove an entry in p2m_remove_pte so we can re-use it later. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- xen/arch/arm/p2m.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index f28ae3f..ae0acf0 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -367,6 +367,14 @@ static inline void p2m_write_pte(lpae_t *p, lpae_t pte, bool_t flush_cache) clean_dcache(*p); } +static inline void p2m_remove_pte(lpae_t *p, bool_t flush_cache) +{ + lpae_t pte; + + memset(&pte, 0x00, sizeof(pte)); + p2m_write_pte(p, pte, flush_cache); +} + /* * Allocate a new page table page and hook it in via the given entry. * apply_one_level relies on this returning 0 on success @@ -839,8 +847,7 @@ static int apply_one_level(struct domain *d, *flush = true; - memset(&pte, 0x00, sizeof(pte)); - p2m_write_pte(entry, pte, flush_cache); + p2m_remove_pte(entry, flush_cache); p2m_mem_access_radix_set(p2m, paddr_to_pfn(*addr), p2m_access_rwx); *addr += level_size; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:33:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4G-0001aW-KX; Thu, 17 Dec 2015 07:33:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4F-0001aH-Eq for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:39 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 6E/21-12831-25562765; Thu, 17 Dec 2015 07:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1450337617!11279822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61450 invoked from network); 17 Dec 2015 07:33:37 -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; 17 Dec 2015 07:33:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4C-0005kB-SI for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4C-0007g3-Nv for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:36 +0000 Date: Thu, 17 Dec 2015 07:33:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Remove translation table when it's empty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de5162b664ea3dea07a0b77b523413c2ce479f2a Author: Julien Grall AuthorDate: Tue Dec 1 17:52:12 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:59:04 2015 +0000 xen/arm: p2m: Remove translation table when it's empty Currently, the translation table is left in place even if no entries are in use. Because of how the p2m code has been implemented, replacing a translation table by a block (i.e superpage) is not supported. Therefore, any remapping of a superpage size will be split in smaller chunks making the translation less efficient. Replacing a table by a block when a new mapping is added would be too complicated because it requires us to check if all the upper levels are not in use and free them if necessary. Instead, we will remove the empty translation table when mappings are removed. To avoid going through all the table checking if no entry is in use, a counter representing the number of entry currently in use is kept per table translation and updated when an entry changes state (i.e valid <-> invalid). As Xen allocates a page for each translation table, it's possible to store the counter in the struct page_info. A new field p2m_refcount has been introduced in the in use union for this purpose. This is fine as the page is only used by the P2M code and nobody touches the other field of the union type_info. For the record, type_info has not been used because it would require more work to use it properly as Xen on ARM doesn't yet have the concept of type. Once Xen has finished removing a mapping and all the references to each translation table have been updated, then the higher levels will be processed and freed as needed. This will allow us to propagate the number of references and free multiple translation table at different level in one go. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- updated commit message as discussed ] --- xen/arch/arm/p2m.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/mm.h | 6 ++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ae0acf0..2190908 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -427,6 +427,8 @@ static int p2m_create_table(struct domain *d, lpae_t *entry, write_pte(&p[i], pte); } + + page->u.inuse.p2m_refcount = LPAE_ENTRIES; } else clear_page(p); @@ -936,6 +938,20 @@ static int apply_one_level(struct domain *d, BUG(); /* Should never get here */ } +/* + * The page is only used by the P2M code which is protected by the p2m->lock. + * So we can avoid to use atomic helpers. + */ +static void update_reference_mapping(struct page_info *page, + lpae_t old_entry, + lpae_t new_entry) +{ + if ( p2m_valid(old_entry) && !p2m_valid(new_entry) ) + page->u.inuse.p2m_refcount--; + else if ( !p2m_valid(old_entry) && p2m_valid(new_entry) ) + page->u.inuse.p2m_refcount++; +} + static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, @@ -961,6 +977,8 @@ static int apply_p2m_changes(struct domain *d, const bool_t preempt = !is_idle_vcpu(current); bool_t flush = false; bool_t flush_pt; + PAGE_LIST_HEAD(free_pages); + struct page_info *pg; /* Some IOMMU don't support coherent PT walk. When the p2m is * shared with the CPU, Xen has to make sure that the PT changes have @@ -1070,6 +1088,7 @@ static int apply_p2m_changes(struct domain *d, { unsigned offset = offsets[level]; lpae_t *entry = &mappings[level][offset]; + lpae_t old_entry = *entry; ret = apply_one_level(d, entry, level, flush_pt, op, @@ -1078,6 +1097,10 @@ static int apply_p2m_changes(struct domain *d, mattr, t, a); if ( ret < 0 ) { rc = ret ; goto out; } count += ret; + + if ( ret != P2M_ONE_PROGRESS_NOP ) + update_reference_mapping(pages[level], old_entry, *entry); + /* L3 had better have done something! We cannot descend any further */ BUG_ON(level == 3 && ret == P2M_ONE_DESCEND); if ( ret != P2M_ONE_DESCEND ) break; @@ -1099,6 +1122,45 @@ static int apply_p2m_changes(struct domain *d, } /* else: next level already valid */ } + + BUG_ON(level > 3); + + if ( op == REMOVE ) + { + for ( ; level > P2M_ROOT_LEVEL; level-- ) + { + lpae_t old_entry; + lpae_t *entry; + unsigned int offset; + + pg = pages[level]; + + /* + * No need to try the previous level if the current one + * still contains some mappings. + */ + if ( pg->u.inuse.p2m_refcount ) + break; + + offset = offsets[level - 1]; + entry = &mappings[level - 1][offset]; + old_entry = *entry; + + page_list_del(pg, &p2m->pages); + + p2m_remove_pte(entry, flush_pt); + + p2m->stats.mappings[level - 1]--; + update_reference_mapping(pages[level - 1], old_entry, *entry); + + /* + * We can't free the page now because it may be present + * in the guest TLB. Queue it and free it after the TLB + * has been flushed. + */ + page_list_add(pg, &free_pages); + } + } } if ( op == ALLOCATE || op == INSERT ) @@ -1116,6 +1178,9 @@ out: iommu_iotlb_flush(d, sgfn, egfn - sgfn); } + while ( (pg = page_list_remove_head(&free_pages)) ) + free_domheap_page(pg); + if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && addr != start_gpaddr ) { diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index a95082e..1427163 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -33,6 +33,12 @@ struct page_info struct { /* Type reference count and various PGT_xxx flags and fields. */ unsigned long type_info; + /* + * Reference count for page table used in the P2M code. + * The counter is protected by the p2m->lock of the + * associated domain. + */ + unsigned long p2m_refcount; } inuse; /* Page is on a free list: ((count_info & PGC_count_mask) == 0). */ struct { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:33:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4G-0001aW-KX; Thu, 17 Dec 2015 07:33:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4F-0001aH-Eq for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:39 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 6E/21-12831-25562765; Thu, 17 Dec 2015 07:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1450337617!11279822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61450 invoked from network); 17 Dec 2015 07:33:37 -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; 17 Dec 2015 07:33:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4C-0005kB-SI for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4C-0007g3-Nv for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:36 +0000 Date: Thu, 17 Dec 2015 07:33:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen/arm: p2m: Remove translation table when it's empty X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit de5162b664ea3dea07a0b77b523413c2ce479f2a Author: Julien Grall AuthorDate: Tue Dec 1 17:52:12 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 11:59:04 2015 +0000 xen/arm: p2m: Remove translation table when it's empty Currently, the translation table is left in place even if no entries are in use. Because of how the p2m code has been implemented, replacing a translation table by a block (i.e superpage) is not supported. Therefore, any remapping of a superpage size will be split in smaller chunks making the translation less efficient. Replacing a table by a block when a new mapping is added would be too complicated because it requires us to check if all the upper levels are not in use and free them if necessary. Instead, we will remove the empty translation table when mappings are removed. To avoid going through all the table checking if no entry is in use, a counter representing the number of entry currently in use is kept per table translation and updated when an entry changes state (i.e valid <-> invalid). As Xen allocates a page for each translation table, it's possible to store the counter in the struct page_info. A new field p2m_refcount has been introduced in the in use union for this purpose. This is fine as the page is only used by the P2M code and nobody touches the other field of the union type_info. For the record, type_info has not been used because it would require more work to use it properly as Xen on ARM doesn't yet have the concept of type. Once Xen has finished removing a mapping and all the references to each translation table have been updated, then the higher levels will be processed and freed as needed. This will allow us to propagate the number of references and free multiple translation table at different level in one go. Signed-off-by: Julien Grall Acked-by: Ian Campbell [ ijc -- updated commit message as discussed ] --- xen/arch/arm/p2m.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++ xen/include/asm-arm/mm.h | 6 ++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index ae0acf0..2190908 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -427,6 +427,8 @@ static int p2m_create_table(struct domain *d, lpae_t *entry, write_pte(&p[i], pte); } + + page->u.inuse.p2m_refcount = LPAE_ENTRIES; } else clear_page(p); @@ -936,6 +938,20 @@ static int apply_one_level(struct domain *d, BUG(); /* Should never get here */ } +/* + * The page is only used by the P2M code which is protected by the p2m->lock. + * So we can avoid to use atomic helpers. + */ +static void update_reference_mapping(struct page_info *page, + lpae_t old_entry, + lpae_t new_entry) +{ + if ( p2m_valid(old_entry) && !p2m_valid(new_entry) ) + page->u.inuse.p2m_refcount--; + else if ( !p2m_valid(old_entry) && p2m_valid(new_entry) ) + page->u.inuse.p2m_refcount++; +} + static int apply_p2m_changes(struct domain *d, enum p2m_operation op, paddr_t start_gpaddr, @@ -961,6 +977,8 @@ static int apply_p2m_changes(struct domain *d, const bool_t preempt = !is_idle_vcpu(current); bool_t flush = false; bool_t flush_pt; + PAGE_LIST_HEAD(free_pages); + struct page_info *pg; /* Some IOMMU don't support coherent PT walk. When the p2m is * shared with the CPU, Xen has to make sure that the PT changes have @@ -1070,6 +1088,7 @@ static int apply_p2m_changes(struct domain *d, { unsigned offset = offsets[level]; lpae_t *entry = &mappings[level][offset]; + lpae_t old_entry = *entry; ret = apply_one_level(d, entry, level, flush_pt, op, @@ -1078,6 +1097,10 @@ static int apply_p2m_changes(struct domain *d, mattr, t, a); if ( ret < 0 ) { rc = ret ; goto out; } count += ret; + + if ( ret != P2M_ONE_PROGRESS_NOP ) + update_reference_mapping(pages[level], old_entry, *entry); + /* L3 had better have done something! We cannot descend any further */ BUG_ON(level == 3 && ret == P2M_ONE_DESCEND); if ( ret != P2M_ONE_DESCEND ) break; @@ -1099,6 +1122,45 @@ static int apply_p2m_changes(struct domain *d, } /* else: next level already valid */ } + + BUG_ON(level > 3); + + if ( op == REMOVE ) + { + for ( ; level > P2M_ROOT_LEVEL; level-- ) + { + lpae_t old_entry; + lpae_t *entry; + unsigned int offset; + + pg = pages[level]; + + /* + * No need to try the previous level if the current one + * still contains some mappings. + */ + if ( pg->u.inuse.p2m_refcount ) + break; + + offset = offsets[level - 1]; + entry = &mappings[level - 1][offset]; + old_entry = *entry; + + page_list_del(pg, &p2m->pages); + + p2m_remove_pte(entry, flush_pt); + + p2m->stats.mappings[level - 1]--; + update_reference_mapping(pages[level - 1], old_entry, *entry); + + /* + * We can't free the page now because it may be present + * in the guest TLB. Queue it and free it after the TLB + * has been flushed. + */ + page_list_add(pg, &free_pages); + } + } } if ( op == ALLOCATE || op == INSERT ) @@ -1116,6 +1178,9 @@ out: iommu_iotlb_flush(d, sgfn, egfn - sgfn); } + while ( (pg = page_list_remove_head(&free_pages)) ) + free_domheap_page(pg); + if ( rc < 0 && ( op == INSERT || op == ALLOCATE ) && addr != start_gpaddr ) { diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index a95082e..1427163 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -33,6 +33,12 @@ struct page_info struct { /* Type reference count and various PGT_xxx flags and fields. */ unsigned long type_info; + /* + * Reference count for page table used in the P2M code. + * The counter is protected by the p2m->lock of the + * associated domain. + */ + unsigned long p2m_refcount; } inuse; /* Page is on a free list: ((count_info & PGC_count_mask) == 0). */ struct { -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:33:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4R-0001dS-QP; Thu, 17 Dec 2015 07:33:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4Q-0001cG-2u for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:50 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id F7/0C-31450-D5562765; Thu, 17 Dec 2015 07:33:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1450337627!10955415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44405 invoked from network); 17 Dec 2015 07:33:48 -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; 17 Dec 2015 07:33:48 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4N-0005kJ-A7 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4N-0007gU-5k for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:47 +0000 Date: Thu, 17 Dec 2015 07:33:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: re-name libxl__xs_write() to libxl__xs_printf()... X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5361ebc6da596ad61e94b3fed1960bd46fac14a Author: Paul Durrant AuthorDate: Tue Dec 1 13:55:24 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 12:03:08 2015 +0000 libxl: re-name libxl__xs_write() to libxl__xs_printf()... ...to denote what it actually does. The name libxl__xs_write() suggests something taking a buffer and length, akin to write(2), whereas the semantics of the function are actually more akin to printf(3). This patch is a textual substitution of libxl__xs_write with libxl__xs_printf with some associated formatting fixes. Signed-off-by: Paul Durrant Acked-by: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl.c | 47 ++++++++++++++++++++------------------- tools/libxl/libxl_bootloader.c | 4 +- tools/libxl/libxl_create.c | 4 +- tools/libxl/libxl_dm.c | 36 +++++++++++++++--------------- tools/libxl/libxl_dom.c | 23 ++++++++++--------- tools/libxl/libxl_exec.c | 2 +- tools/libxl/libxl_genid.c | 6 ++-- tools/libxl/libxl_internal.h | 4 +- tools/libxl/libxl_pci.c | 22 +++++++++--------- tools/libxl/libxl_qmp.c | 4 +- tools/libxl/libxl_xshelp.c | 4 +- 11 files changed, 79 insertions(+), 77 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bd3aac8..bd604ac 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1136,7 +1136,7 @@ int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, if (!shutdown_path) return ERROR_FAIL; - return libxl__xs_write(gc, t, shutdown_path, "%s", cmd); + return libxl__xs_printf(gc, t, shutdown_path, "%s", cmd); } static int libxl__domain_pvcontrol(libxl__gc *gc, uint32_t domid, @@ -1364,7 +1364,7 @@ static void disk_eject_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, if (!value || strcmp(value, "eject")) return; - if (libxl__xs_write(gc, XBT_NULL, wpath, "")) { + if (libxl__xs_printf(gc, XBT_NULL, wpath, "")) { LIBXL__EVENT_DISASTER(egc, "xs_write failed acknowledging eject", errno, LIBXL_EVENT_TYPE_DISK_EJECT); return; @@ -4696,13 +4696,13 @@ retry_transaction: goto out; if (target == NULL) { - libxl__xs_write(gc, t, target_path, "%"PRIu32, - (uint32_t) info.current_memkb); + libxl__xs_printf(gc, t, target_path, "%"PRIu32, + (uint32_t) info.current_memkb); *target_memkb = (uint32_t) info.current_memkb; } if (staticmax == NULL) { - libxl__xs_write(gc, t, max_path, "%"PRIu32, - (uint32_t) info.max_memkb); + libxl__xs_printf(gc, t, max_path, "%"PRIu32, + (uint32_t) info.max_memkb); *max_memkb = (uint32_t) info.max_memkb; } @@ -4839,8 +4839,8 @@ retry_transaction: goto out; } - libxl__xs_write(gc, t, GCSPRINTF("%s/memory/target", - dompath), "%"PRIu32, new_target_memkb); + libxl__xs_printf(gc, t, GCSPRINTF("%s/memory/target", dompath), + "%"PRIu32, new_target_memkb); rc = xc_domain_getinfolist(ctx->xch, domid, 1, &info); if (rc != 1 || info.domain != domid) { abort_transaction = 1; @@ -4850,8 +4850,8 @@ retry_transaction: libxl_dominfo_init(&ptr); xcinfo2xlinfo(ctx, &info, &ptr); uuid = libxl__uuid2string(gc, ptr.uuid); - libxl__xs_write(gc, t, GCSPRINTF("/vm/%s/memory", uuid), - "%"PRIu32, new_target_memkb / 1024); + libxl__xs_printf(gc, t, GCSPRINTF("/vm/%s/memory", uuid), + "%"PRIu32, new_target_memkb / 1024); libxl_dominfo_dispose(&ptr); out: @@ -5486,9 +5486,9 @@ static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, retry_transaction: t = xs_transaction_start(CTX->xsh); for (i = 0; i <= info->vcpu_max_id; i++) - libxl__xs_write(gc, t, - GCSPRINTF("%s/cpu/%u/availability", dompath, i), - "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); + libxl__xs_printf(gc, t, + GCSPRINTF("%s/cpu/%u/availability", dompath, i), + "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); if (!xs_transaction_end(CTX->xsh, t, 0)) { if (errno == EAGAIN) goto retry_transaction; @@ -5984,7 +5984,8 @@ int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq) GC_INIT(ctx); char *dompath = libxl__xs_get_dompath(gc, domid); - libxl__xs_write(gc, XBT_NULL, GCSPRINTF("%s/control/sysrq", dompath), "%c", sysrq); + libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/control/sysrq", dompath), + "%c", sysrq); GC_FREE; return 0; @@ -6262,12 +6263,12 @@ int libxl_cpupool_create(libxl_ctx *ctx, const char *name, t = xs_transaction_start(ctx->xsh); xs_mkdir(ctx->xsh, t, GCSPRINTF("/local/pool/%d", *poolid)); - libxl__xs_write(gc, t, - GCSPRINTF("/local/pool/%d/uuid", *poolid), - "%s", uuid_string); - libxl__xs_write(gc, t, - GCSPRINTF("/local/pool/%d/name", *poolid), - "%s", name); + libxl__xs_printf(gc, t, + GCSPRINTF("/local/pool/%d/uuid", *poolid), + "%s", uuid_string); + libxl__xs_printf(gc, t, + GCSPRINTF("/local/pool/%d/name", *poolid), + "%s", name); if (xs_transaction_end(ctx->xsh, t, 0) || (errno != EAGAIN)) { GC_FREE; @@ -6358,9 +6359,9 @@ int libxl_cpupool_rename(libxl_ctx *ctx, const char *name, uint32_t poolid) for (;;) { t = xs_transaction_start(ctx->xsh); - libxl__xs_write(gc, t, - GCSPRINTF("/local/pool/%d/name", poolid), - "%s", name); + libxl__xs_printf(gc, t, + GCSPRINTF("/local/pool/%d/name", poolid), + "%s", name); if (xs_transaction_end(ctx->xsh, t, 0)) break; diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 343fc30..0ae074a 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -485,8 +485,8 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) dom_console_xs_path = GCSPRINTF("%s/console/tty", dompath); - rc = libxl__xs_write(gc, XBT_NULL, dom_console_xs_path, "%s", - dom_console_slave_tty_path); + rc = libxl__xs_printf(gc, XBT_NULL, dom_console_xs_path, "%s", + dom_console_slave_tty_path); if (rc) { LOGE(ERROR,"xs write console path %s := %s failed", dom_console_xs_path, dom_console_slave_tty_path); diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 42aae0f..a9cf16a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -677,8 +677,8 @@ static int store_libxl_entry(libxl__gc *gc, uint32_t domid, path = libxl__xs_libxl_path(gc, domid); path = GCSPRINTF("%s/dm-version", path); - return libxl__xs_write(gc, XBT_NULL, path, "%s", - libxl_device_model_version_to_string(b_info->device_model_version)); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", + libxl_device_model_version_to_string(b_info->device_model_version)); } /*----- remus asynchronous checkpoint callback -----*/ diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index a4934df..2de0273 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1535,14 +1535,14 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) } libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/image/device-model-domid", - libxl__xs_get_dompath(gc, guest_domid)), - "%d", dm_domid); - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/target", - libxl__xs_get_dompath(gc, dm_domid)), - "%d", guest_domid); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/image/device-model-domid", + libxl__xs_get_dompath(gc, guest_domid)), + "%d", dm_domid); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/target", + libxl__xs_get_dompath(gc, dm_domid)), + "%d", guest_domid); ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { LOGE(ERROR, "setting target domain %d -> %d", dm_domid, guest_domid); @@ -1816,17 +1816,17 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { path = xs_get_domain_path(ctx->xsh, domid); - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/hvmloader/bios", path), - "%s", libxl_bios_type_to_string(b_info->u.hvm.bios)); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/hvmloader/bios", path), + "%s", libxl_bios_type_to_string(b_info->u.hvm.bios)); /* Disable relocating memory to make the MMIO hole larger * unless we're running qemu-traditional and vNUMA is not * configured. */ - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/hvmloader/allow-memory-relocate", path), - "%d", - b_info->device_model_version==LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - !libxl__vnuma_configured(b_info)); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/hvmloader/allow-memory-relocate", path), + "%d", + b_info->device_model_version==LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && + !libxl__vnuma_configured(b_info)); free(path); } @@ -1836,8 +1836,8 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) - libxl__xs_write(gc, XBT_NULL, GCSPRINTF("%s/disable_pf", path), - "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); + libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/disable_pf", path), + "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qemu-dm-%s", c_info->name)); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a1ebb49..e1f0c61 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -825,15 +825,15 @@ static int hvm_build_set_xs_values(libxl__gc *gc, if (dom->smbios_module.guest_addr_out) { path = GCSPRINTF("/local/domain/%d/"HVM_XS_SMBIOS_PT_ADDRESS, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%"PRIx64, - dom->smbios_module.guest_addr_out); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%"PRIx64, + dom->smbios_module.guest_addr_out); if (ret) goto err; path = GCSPRINTF("/local/domain/%d/"HVM_XS_SMBIOS_PT_LENGTH, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%x", - dom->smbios_module.length); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%x", + dom->smbios_module.length); if (ret) goto err; } @@ -841,15 +841,15 @@ static int hvm_build_set_xs_values(libxl__gc *gc, if (dom->acpi_module.guest_addr_out) { path = GCSPRINTF("/local/domain/%d/"HVM_XS_ACPI_PT_ADDRESS, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%"PRIx64, - dom->acpi_module.guest_addr_out); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%"PRIx64, + dom->acpi_module.guest_addr_out); if (ret) goto err; path = GCSPRINTF("/local/domain/%d/"HVM_XS_ACPI_PT_LENGTH, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%x", - dom->acpi_module.length); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%x", + dom->acpi_module.length); if (ret) goto err; } @@ -1074,7 +1074,7 @@ int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, char *path = NULL; uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); path = libxl__device_model_xs_path(gc, dm_domid, domid, "/command"); - return libxl__xs_write(gc, XBT_NULL, path, "%s", cmd); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", cmd); } /* @@ -1137,8 +1137,9 @@ int libxl__restore_emulator_xenstore_data(libxl__domain_create_state *dcs, goto out; } - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/%s", xs_root, key), "%s", val); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/%s", xs_root, key), + "%s", val); } rc = 0; diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index df4aead..02e6c91 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -144,7 +144,7 @@ int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, pid_t pid) rc = libxl__ev_child_xenstore_reopen(gc, spawn->what); if (rc) goto out; - r = libxl__xs_write(gc, XBT_NULL, spawn->pidpath, "%d", pid); + r = libxl__xs_printf(gc, XBT_NULL, spawn->pidpath, "%d", pid); if (r) { LOGE(ERROR, "write %s = %d: xenstore write failed", spawn->pidpath, pid); diff --git a/tools/libxl/libxl_genid.c b/tools/libxl/libxl_genid.c index 4e2f013..f1c4eb7 100644 --- a/tools/libxl/libxl_genid.c +++ b/tools/libxl/libxl_genid.c @@ -77,9 +77,9 @@ int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out; } - rc = libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/platform/generation-id", dom_path), - "%"PRIu64 ":%" PRIu64, genid[0], genid[1]); + rc = libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/platform/generation-id", dom_path), + "%"PRIu64 ":%" PRIu64, genid[0], genid[1]); if (rc < 0) goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d2bda0a..908a6fe 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -667,7 +667,7 @@ _hidden int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, _hidden int libxl__xs_writev_atonce(libxl__gc *gc, const char *dir, char **kvs); -_hidden int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, +_hidden int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); /* Each fn returns 0 on success. * On error: returns -1, sets errno (no logging) */ @@ -702,7 +702,7 @@ int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t, /* Does not include a trailing null. * May usefully be combined with GCSPRINTF if the format string - * behaviour of libxl__xs_write is desirable. */ + * behaviour of libxl__xs_printf is desirable. */ int libxl__xs_write_checked(libxl__gc *gc, xs_transaction_t t, const char *path, const char *string); diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 206b300..dc10cb7 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -254,7 +254,7 @@ retry_transaction2: xs_rm(ctx->xsh, t, GCSPRINTF("%s/vdev-%d", be_path, i)); xs_rm(ctx->xsh, t, GCSPRINTF("%s/opts-%d", be_path, i)); xs_rm(ctx->xsh, t, GCSPRINTF("%s/vdevfn-%d", be_path, i)); - libxl__xs_write(gc, t, num_devs_path, "%d", num - 1); + libxl__xs_printf(gc, t, num_devs_path, "%d", num - 1); for (j = i + 1; j < num; j++) { tmppath = GCSPRINTF("%s/state-%d", be_path, j); tmp = libxl__xs_read(gc, t, tmppath); @@ -733,7 +733,7 @@ static void pci_assignable_driver_path_write(libxl__gc *gc, pcidev->bus, pcidev->dev, pcidev->func); - if ( libxl__xs_write(gc, XBT_NULL, path, "%s", driver_path) < 0 ) { + if ( libxl__xs_printf(gc, XBT_NULL, path, "%s", driver_path) < 0 ) { LOGE(WARN, "Write of %s to node %s failed.", driver_path, path); } } @@ -971,14 +971,14 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, state = libxl__xs_read(gc, XBT_NULL, path); path = libxl__device_model_xs_path(gc, dm_domid, domid, "/parameter"); if (pcidev->vdevfn) { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, - pcidev->domain, pcidev->bus, pcidev->dev, - pcidev->func, pcidev->vdevfn, pcidev->msitranslate, - pcidev->power_mgmt); + libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func, pcidev->vdevfn, pcidev->msitranslate, + pcidev->power_mgmt); } else { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, - pcidev->domain, pcidev->bus, pcidev->dev, - pcidev->func, pcidev->msitranslate, pcidev->power_mgmt); + libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func, pcidev->msitranslate, pcidev->power_mgmt); } libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); @@ -1310,8 +1310,8 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, path = libxl__device_model_xs_path(gc, dm_domid, domid, "/state"); state = libxl__xs_read(gc, XBT_NULL, path); path = libxl__device_model_xs_path(gc, dm_domid, domid, "/parameter"); - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); + libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); /* Remove all functions at once atomically by only signalling * device-model for function 0 */ diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index f798de7..714038b 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -103,7 +103,7 @@ static int store_serial_port_info(libxl__qmp_handler *qmp, path = libxl__xs_get_dompath(gc, qmp->domid); path = GCSPRINTF("%s/serial/%d/tty", path, port); - ret = libxl__xs_write(gc, XBT_NULL, path, "%s", chardev + 4); + ret = libxl__xs_printf(gc, XBT_NULL, path, "%s", chardev + 4); GC_FREE; return ret; @@ -162,7 +162,7 @@ static int qmp_write_domain_console_item(libxl__gc *gc, int domid, path = libxl__xs_get_dompath(gc, domid); path = GCSPRINTF("%s/console/%s", path, item); - return libxl__xs_write(gc, XBT_NULL, path, "%s", value); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", value); } static int qmp_register_vnc_callback(libxl__qmp_handler *qmp, diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index 8554ee5..8798cba 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -96,8 +96,8 @@ out: } -int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, - const char *path, const char *fmt, ...) +int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, ...) { libxl_ctx *ctx = libxl__gc_owner(gc); char *s; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:33:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:33:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4R-0001dS-QP; Thu, 17 Dec 2015 07:33:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4Q-0001cG-2u for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:50 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id F7/0C-31450-D5562765; Thu, 17 Dec 2015 07:33:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1450337627!10955415!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44405 invoked from network); 17 Dec 2015 07:33:48 -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; 17 Dec 2015 07:33:48 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4N-0005kJ-A7 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:47 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4N-0007gU-5k for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:47 +0000 Date: Thu, 17 Dec 2015 07:33:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: re-name libxl__xs_write() to libxl__xs_printf()... X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a5361ebc6da596ad61e94b3fed1960bd46fac14a Author: Paul Durrant AuthorDate: Tue Dec 1 13:55:24 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 12:03:08 2015 +0000 libxl: re-name libxl__xs_write() to libxl__xs_printf()... ...to denote what it actually does. The name libxl__xs_write() suggests something taking a buffer and length, akin to write(2), whereas the semantics of the function are actually more akin to printf(3). This patch is a textual substitution of libxl__xs_write with libxl__xs_printf with some associated formatting fixes. Signed-off-by: Paul Durrant Acked-by: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl.c | 47 ++++++++++++++++++++------------------- tools/libxl/libxl_bootloader.c | 4 +- tools/libxl/libxl_create.c | 4 +- tools/libxl/libxl_dm.c | 36 +++++++++++++++--------------- tools/libxl/libxl_dom.c | 23 ++++++++++--------- tools/libxl/libxl_exec.c | 2 +- tools/libxl/libxl_genid.c | 6 ++-- tools/libxl/libxl_internal.h | 4 +- tools/libxl/libxl_pci.c | 22 +++++++++--------- tools/libxl/libxl_qmp.c | 4 +- tools/libxl/libxl_xshelp.c | 4 +- 11 files changed, 79 insertions(+), 77 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bd3aac8..bd604ac 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1136,7 +1136,7 @@ int libxl__domain_pvcontrol_write(libxl__gc *gc, xs_transaction_t t, if (!shutdown_path) return ERROR_FAIL; - return libxl__xs_write(gc, t, shutdown_path, "%s", cmd); + return libxl__xs_printf(gc, t, shutdown_path, "%s", cmd); } static int libxl__domain_pvcontrol(libxl__gc *gc, uint32_t domid, @@ -1364,7 +1364,7 @@ static void disk_eject_xswatch_callback(libxl__egc *egc, libxl__ev_xswatch *w, if (!value || strcmp(value, "eject")) return; - if (libxl__xs_write(gc, XBT_NULL, wpath, "")) { + if (libxl__xs_printf(gc, XBT_NULL, wpath, "")) { LIBXL__EVENT_DISASTER(egc, "xs_write failed acknowledging eject", errno, LIBXL_EVENT_TYPE_DISK_EJECT); return; @@ -4696,13 +4696,13 @@ retry_transaction: goto out; if (target == NULL) { - libxl__xs_write(gc, t, target_path, "%"PRIu32, - (uint32_t) info.current_memkb); + libxl__xs_printf(gc, t, target_path, "%"PRIu32, + (uint32_t) info.current_memkb); *target_memkb = (uint32_t) info.current_memkb; } if (staticmax == NULL) { - libxl__xs_write(gc, t, max_path, "%"PRIu32, - (uint32_t) info.max_memkb); + libxl__xs_printf(gc, t, max_path, "%"PRIu32, + (uint32_t) info.max_memkb); *max_memkb = (uint32_t) info.max_memkb; } @@ -4839,8 +4839,8 @@ retry_transaction: goto out; } - libxl__xs_write(gc, t, GCSPRINTF("%s/memory/target", - dompath), "%"PRIu32, new_target_memkb); + libxl__xs_printf(gc, t, GCSPRINTF("%s/memory/target", dompath), + "%"PRIu32, new_target_memkb); rc = xc_domain_getinfolist(ctx->xch, domid, 1, &info); if (rc != 1 || info.domain != domid) { abort_transaction = 1; @@ -4850,8 +4850,8 @@ retry_transaction: libxl_dominfo_init(&ptr); xcinfo2xlinfo(ctx, &info, &ptr); uuid = libxl__uuid2string(gc, ptr.uuid); - libxl__xs_write(gc, t, GCSPRINTF("/vm/%s/memory", uuid), - "%"PRIu32, new_target_memkb / 1024); + libxl__xs_printf(gc, t, GCSPRINTF("/vm/%s/memory", uuid), + "%"PRIu32, new_target_memkb / 1024); libxl_dominfo_dispose(&ptr); out: @@ -5486,9 +5486,9 @@ static int libxl__set_vcpuonline_xenstore(libxl__gc *gc, uint32_t domid, retry_transaction: t = xs_transaction_start(CTX->xsh); for (i = 0; i <= info->vcpu_max_id; i++) - libxl__xs_write(gc, t, - GCSPRINTF("%s/cpu/%u/availability", dompath, i), - "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); + libxl__xs_printf(gc, t, + GCSPRINTF("%s/cpu/%u/availability", dompath, i), + "%s", libxl_bitmap_test(cpumap, i) ? "online" : "offline"); if (!xs_transaction_end(CTX->xsh, t, 0)) { if (errno == EAGAIN) goto retry_transaction; @@ -5984,7 +5984,8 @@ int libxl_send_sysrq(libxl_ctx *ctx, uint32_t domid, char sysrq) GC_INIT(ctx); char *dompath = libxl__xs_get_dompath(gc, domid); - libxl__xs_write(gc, XBT_NULL, GCSPRINTF("%s/control/sysrq", dompath), "%c", sysrq); + libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/control/sysrq", dompath), + "%c", sysrq); GC_FREE; return 0; @@ -6262,12 +6263,12 @@ int libxl_cpupool_create(libxl_ctx *ctx, const char *name, t = xs_transaction_start(ctx->xsh); xs_mkdir(ctx->xsh, t, GCSPRINTF("/local/pool/%d", *poolid)); - libxl__xs_write(gc, t, - GCSPRINTF("/local/pool/%d/uuid", *poolid), - "%s", uuid_string); - libxl__xs_write(gc, t, - GCSPRINTF("/local/pool/%d/name", *poolid), - "%s", name); + libxl__xs_printf(gc, t, + GCSPRINTF("/local/pool/%d/uuid", *poolid), + "%s", uuid_string); + libxl__xs_printf(gc, t, + GCSPRINTF("/local/pool/%d/name", *poolid), + "%s", name); if (xs_transaction_end(ctx->xsh, t, 0) || (errno != EAGAIN)) { GC_FREE; @@ -6358,9 +6359,9 @@ int libxl_cpupool_rename(libxl_ctx *ctx, const char *name, uint32_t poolid) for (;;) { t = xs_transaction_start(ctx->xsh); - libxl__xs_write(gc, t, - GCSPRINTF("/local/pool/%d/name", poolid), - "%s", name); + libxl__xs_printf(gc, t, + GCSPRINTF("/local/pool/%d/name", poolid), + "%s", name); if (xs_transaction_end(ctx->xsh, t, 0)) break; diff --git a/tools/libxl/libxl_bootloader.c b/tools/libxl/libxl_bootloader.c index 343fc30..0ae074a 100644 --- a/tools/libxl/libxl_bootloader.c +++ b/tools/libxl/libxl_bootloader.c @@ -485,8 +485,8 @@ static void bootloader_gotptys(libxl__egc *egc, libxl__openpty_state *op) dom_console_xs_path = GCSPRINTF("%s/console/tty", dompath); - rc = libxl__xs_write(gc, XBT_NULL, dom_console_xs_path, "%s", - dom_console_slave_tty_path); + rc = libxl__xs_printf(gc, XBT_NULL, dom_console_xs_path, "%s", + dom_console_slave_tty_path); if (rc) { LOGE(ERROR,"xs write console path %s := %s failed", dom_console_xs_path, dom_console_slave_tty_path); diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 42aae0f..a9cf16a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -677,8 +677,8 @@ static int store_libxl_entry(libxl__gc *gc, uint32_t domid, path = libxl__xs_libxl_path(gc, domid); path = GCSPRINTF("%s/dm-version", path); - return libxl__xs_write(gc, XBT_NULL, path, "%s", - libxl_device_model_version_to_string(b_info->device_model_version)); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", + libxl_device_model_version_to_string(b_info->device_model_version)); } /*----- remus asynchronous checkpoint callback -----*/ diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index a4934df..2de0273 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1535,14 +1535,14 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) } libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/image/device-model-domid", - libxl__xs_get_dompath(gc, guest_domid)), - "%d", dm_domid); - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/target", - libxl__xs_get_dompath(gc, dm_domid)), - "%d", guest_domid); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/image/device-model-domid", + libxl__xs_get_dompath(gc, guest_domid)), + "%d", dm_domid); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/target", + libxl__xs_get_dompath(gc, dm_domid)), + "%d", guest_domid); ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { LOGE(ERROR, "setting target domain %d -> %d", dm_domid, guest_domid); @@ -1816,17 +1816,17 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) if (b_info->type == LIBXL_DOMAIN_TYPE_HVM) { path = xs_get_domain_path(ctx->xsh, domid); - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/hvmloader/bios", path), - "%s", libxl_bios_type_to_string(b_info->u.hvm.bios)); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/hvmloader/bios", path), + "%s", libxl_bios_type_to_string(b_info->u.hvm.bios)); /* Disable relocating memory to make the MMIO hole larger * unless we're running qemu-traditional and vNUMA is not * configured. */ - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/hvmloader/allow-memory-relocate", path), - "%d", - b_info->device_model_version==LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - !libxl__vnuma_configured(b_info)); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/hvmloader/allow-memory-relocate", path), + "%d", + b_info->device_model_version==LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && + !libxl__vnuma_configured(b_info)); free(path); } @@ -1836,8 +1836,8 @@ void libxl__spawn_local_dm(libxl__egc *egc, libxl__dm_spawn_state *dmss) if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) - libxl__xs_write(gc, XBT_NULL, GCSPRINTF("%s/disable_pf", path), - "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); + libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/disable_pf", path), + "%d", !libxl_defbool_val(b_info->u.hvm.xen_platform_pci)); logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qemu-dm-%s", c_info->name)); diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index a1ebb49..e1f0c61 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -825,15 +825,15 @@ static int hvm_build_set_xs_values(libxl__gc *gc, if (dom->smbios_module.guest_addr_out) { path = GCSPRINTF("/local/domain/%d/"HVM_XS_SMBIOS_PT_ADDRESS, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%"PRIx64, - dom->smbios_module.guest_addr_out); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%"PRIx64, + dom->smbios_module.guest_addr_out); if (ret) goto err; path = GCSPRINTF("/local/domain/%d/"HVM_XS_SMBIOS_PT_LENGTH, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%x", - dom->smbios_module.length); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%x", + dom->smbios_module.length); if (ret) goto err; } @@ -841,15 +841,15 @@ static int hvm_build_set_xs_values(libxl__gc *gc, if (dom->acpi_module.guest_addr_out) { path = GCSPRINTF("/local/domain/%d/"HVM_XS_ACPI_PT_ADDRESS, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%"PRIx64, - dom->acpi_module.guest_addr_out); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%"PRIx64, + dom->acpi_module.guest_addr_out); if (ret) goto err; path = GCSPRINTF("/local/domain/%d/"HVM_XS_ACPI_PT_LENGTH, domid); - ret = libxl__xs_write(gc, XBT_NULL, path, "0x%x", - dom->acpi_module.length); + ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%x", + dom->acpi_module.length); if (ret) goto err; } @@ -1074,7 +1074,7 @@ int libxl__qemu_traditional_cmd(libxl__gc *gc, uint32_t domid, char *path = NULL; uint32_t dm_domid = libxl_get_stubdom_id(CTX, domid); path = libxl__device_model_xs_path(gc, dm_domid, domid, "/command"); - return libxl__xs_write(gc, XBT_NULL, path, "%s", cmd); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", cmd); } /* @@ -1137,8 +1137,9 @@ int libxl__restore_emulator_xenstore_data(libxl__domain_create_state *dcs, goto out; } - libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/%s", xs_root, key), "%s", val); + libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/%s", xs_root, key), + "%s", val); } rc = 0; diff --git a/tools/libxl/libxl_exec.c b/tools/libxl/libxl_exec.c index df4aead..02e6c91 100644 --- a/tools/libxl/libxl_exec.c +++ b/tools/libxl/libxl_exec.c @@ -144,7 +144,7 @@ int libxl__spawn_record_pid(libxl__gc *gc, libxl__spawn_state *spawn, pid_t pid) rc = libxl__ev_child_xenstore_reopen(gc, spawn->what); if (rc) goto out; - r = libxl__xs_write(gc, XBT_NULL, spawn->pidpath, "%d", pid); + r = libxl__xs_printf(gc, XBT_NULL, spawn->pidpath, "%d", pid); if (r) { LOGE(ERROR, "write %s = %d: xenstore write failed", spawn->pidpath, pid); diff --git a/tools/libxl/libxl_genid.c b/tools/libxl/libxl_genid.c index 4e2f013..f1c4eb7 100644 --- a/tools/libxl/libxl_genid.c +++ b/tools/libxl/libxl_genid.c @@ -77,9 +77,9 @@ int libxl__ms_vm_genid_set(libxl__gc *gc, uint32_t domid, rc = ERROR_FAIL; goto out; } - rc = libxl__xs_write(gc, XBT_NULL, - GCSPRINTF("%s/platform/generation-id", dom_path), - "%"PRIu64 ":%" PRIu64, genid[0], genid[1]); + rc = libxl__xs_printf(gc, XBT_NULL, + GCSPRINTF("%s/platform/generation-id", dom_path), + "%"PRIu64 ":%" PRIu64, genid[0], genid[1]); if (rc < 0) goto out; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d2bda0a..908a6fe 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -667,7 +667,7 @@ _hidden int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, _hidden int libxl__xs_writev_atonce(libxl__gc *gc, const char *dir, char **kvs); -_hidden int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, +_hidden int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); /* Each fn returns 0 on success. * On error: returns -1, sets errno (no logging) */ @@ -702,7 +702,7 @@ int libxl__xs_read_checked(libxl__gc *gc, xs_transaction_t t, /* Does not include a trailing null. * May usefully be combined with GCSPRINTF if the format string - * behaviour of libxl__xs_write is desirable. */ + * behaviour of libxl__xs_printf is desirable. */ int libxl__xs_write_checked(libxl__gc *gc, xs_transaction_t t, const char *path, const char *string); diff --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 206b300..dc10cb7 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -254,7 +254,7 @@ retry_transaction2: xs_rm(ctx->xsh, t, GCSPRINTF("%s/vdev-%d", be_path, i)); xs_rm(ctx->xsh, t, GCSPRINTF("%s/opts-%d", be_path, i)); xs_rm(ctx->xsh, t, GCSPRINTF("%s/vdevfn-%d", be_path, i)); - libxl__xs_write(gc, t, num_devs_path, "%d", num - 1); + libxl__xs_printf(gc, t, num_devs_path, "%d", num - 1); for (j = i + 1; j < num; j++) { tmppath = GCSPRINTF("%s/state-%d", be_path, j); tmp = libxl__xs_read(gc, t, tmppath); @@ -733,7 +733,7 @@ static void pci_assignable_driver_path_write(libxl__gc *gc, pcidev->bus, pcidev->dev, pcidev->func); - if ( libxl__xs_write(gc, XBT_NULL, path, "%s", driver_path) < 0 ) { + if ( libxl__xs_printf(gc, XBT_NULL, path, "%s", driver_path) < 0 ) { LOGE(WARN, "Write of %s to node %s failed.", driver_path, path); } } @@ -971,14 +971,14 @@ static int qemu_pci_add_xenstore(libxl__gc *gc, uint32_t domid, state = libxl__xs_read(gc, XBT_NULL, path); path = libxl__device_model_xs_path(gc, dm_domid, domid, "/parameter"); if (pcidev->vdevfn) { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, - pcidev->domain, pcidev->bus, pcidev->dev, - pcidev->func, pcidev->vdevfn, pcidev->msitranslate, - pcidev->power_mgmt); + libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF_VDEVFN","PCI_OPTIONS, + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func, pcidev->vdevfn, pcidev->msitranslate, + pcidev->power_mgmt); } else { - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, - pcidev->domain, pcidev->bus, pcidev->dev, - pcidev->func, pcidev->msitranslate, pcidev->power_mgmt); + libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF","PCI_OPTIONS, + pcidev->domain, pcidev->bus, pcidev->dev, + pcidev->func, pcidev->msitranslate, pcidev->power_mgmt); } libxl__qemu_traditional_cmd(gc, domid, "pci-ins"); @@ -1310,8 +1310,8 @@ static int qemu_pci_remove_xenstore(libxl__gc *gc, uint32_t domid, path = libxl__device_model_xs_path(gc, dm_domid, domid, "/state"); state = libxl__xs_read(gc, XBT_NULL, path); path = libxl__device_model_xs_path(gc, dm_domid, domid, "/parameter"); - libxl__xs_write(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, - pcidev->bus, pcidev->dev, pcidev->func); + libxl__xs_printf(gc, XBT_NULL, path, PCI_BDF, pcidev->domain, + pcidev->bus, pcidev->dev, pcidev->func); /* Remove all functions at once atomically by only signalling * device-model for function 0 */ diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index f798de7..714038b 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -103,7 +103,7 @@ static int store_serial_port_info(libxl__qmp_handler *qmp, path = libxl__xs_get_dompath(gc, qmp->domid); path = GCSPRINTF("%s/serial/%d/tty", path, port); - ret = libxl__xs_write(gc, XBT_NULL, path, "%s", chardev + 4); + ret = libxl__xs_printf(gc, XBT_NULL, path, "%s", chardev + 4); GC_FREE; return ret; @@ -162,7 +162,7 @@ static int qmp_write_domain_console_item(libxl__gc *gc, int domid, path = libxl__xs_get_dompath(gc, domid); path = GCSPRINTF("%s/console/%s", path, item); - return libxl__xs_write(gc, XBT_NULL, path, "%s", value); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", value); } static int qmp_register_vnc_callback(libxl__qmp_handler *qmp, diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index 8554ee5..8798cba 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -96,8 +96,8 @@ out: } -int libxl__xs_write(libxl__gc *gc, xs_transaction_t t, - const char *path, const char *fmt, ...) +int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, ...) { libxl_ctx *ctx = libxl__gc_owner(gc); char *s; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4b-0001fl-3u; Thu, 17 Dec 2015 07:34:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4Z-0001fN-Vb for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:00 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 39/D1-12831-76562765; Thu, 17 Dec 2015 07:33:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450337637!11013594!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26529 invoked from network); 17 Dec 2015 07:33:58 -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; 17 Dec 2015 07:33:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4X-0005kR-MP for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4X-0007hX-Jy for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:57 +0000 Date: Thu, 17 Dec 2015 07:33:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: re-implement libxl__xs_printf() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2552ad1b6f0487d96623c85702373d8b410a5ac Author: Paul Durrant AuthorDate: Tue Dec 1 13:55:25 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 12:05:19 2015 +0000 libxl: re-implement libxl__xs_printf() This patch adds a new libxl__xs_vprintf() which actually checks the success of the underlying call to xs_write() (logging if it fails) and then re-implements libxl__xs_printf() using this (and replacing the call to vasprintf() with a call to libxl__vsprintf()). libxl__xs_vprintf() is added to the 'checked' section of libxl_internal.h and, since it now underpins libxl__xs_printf(), that declaration is moved into the same section. Looking at call sites of libxl__xs_printf() it seems as though several of them expected a failure if the underlying xs_write() failed, so this patch should actually fulfil the semantic that was intended all along. Signed-off-by: Paul Durrant Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 8 +++++--- tools/libxl/libxl_xshelp.c | 32 ++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 908a6fe..f116779 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -666,9 +666,6 @@ _hidden int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, /* _atonce creates a transaction and writes all keys at once */ _hidden int libxl__xs_writev_atonce(libxl__gc *gc, const char *dir, char **kvs); - -_hidden int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, - const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); /* Each fn returns 0 on success. * On error: returns -1, sets errno (no logging) */ @@ -688,6 +685,11 @@ _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); * fails it logs and returns ERROR_FAIL. */ +int libxl__xs_vprintf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, va_list ap); +int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); + /* On success, path will exist and will have an empty value */ int libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, const char *path, struct xs_permissions *perms, diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index 8798cba..e1412a6 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -96,23 +96,35 @@ out: } -int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, - const char *path, const char *fmt, ...) +int libxl__xs_vprintf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, va_list ap) { libxl_ctx *ctx = libxl__gc_owner(gc); char *s; + bool ok; + + s = libxl__vsprintf(gc, fmt, ap); + + ok = xs_write(ctx->xsh, t, path, s, strlen(s)); + if (!ok) { + LOGE(ERROR, "xenstore write failed: `%s' = `%s'", path, s); + return ERROR_FAIL; + } + + return 0; +} + +int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, ...) +{ va_list ap; - int ret; + int rc; + va_start(ap, fmt); - ret = vasprintf(&s, fmt, ap); + rc = libxl__xs_vprintf(gc, t, path, fmt, ap); va_end(ap); - if (ret == -1) { - return -1; - } - xs_write(ctx->xsh, t, path, s, ret); - free(s); - return 0; + return rc; } char * libxl__xs_read(libxl__gc *gc, xs_transaction_t t, const char *path) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4b-0001fl-3u; Thu, 17 Dec 2015 07:34:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4Z-0001fN-Vb for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:00 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 39/D1-12831-76562765; Thu, 17 Dec 2015 07:33:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450337637!11013594!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26529 invoked from network); 17 Dec 2015 07:33:58 -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; 17 Dec 2015 07:33:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4X-0005kR-MP for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4X-0007hX-Jy for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:33:57 +0000 Date: Thu, 17 Dec 2015 07:33:57 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: re-implement libxl__xs_printf() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2552ad1b6f0487d96623c85702373d8b410a5ac Author: Paul Durrant AuthorDate: Tue Dec 1 13:55:25 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 12:05:19 2015 +0000 libxl: re-implement libxl__xs_printf() This patch adds a new libxl__xs_vprintf() which actually checks the success of the underlying call to xs_write() (logging if it fails) and then re-implements libxl__xs_printf() using this (and replacing the call to vasprintf() with a call to libxl__vsprintf()). libxl__xs_vprintf() is added to the 'checked' section of libxl_internal.h and, since it now underpins libxl__xs_printf(), that declaration is moved into the same section. Looking at call sites of libxl__xs_printf() it seems as though several of them expected a failure if the underlying xs_write() failed, so this patch should actually fulfil the semantic that was intended all along. Signed-off-by: Paul Durrant Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_internal.h | 8 +++++--- tools/libxl/libxl_xshelp.c | 32 ++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 908a6fe..f116779 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -666,9 +666,6 @@ _hidden int libxl__xs_writev_perms(libxl__gc *gc, xs_transaction_t t, /* _atonce creates a transaction and writes all keys at once */ _hidden int libxl__xs_writev_atonce(libxl__gc *gc, const char *dir, char **kvs); - -_hidden int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, - const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); /* Each fn returns 0 on success. * On error: returns -1, sets errno (no logging) */ @@ -688,6 +685,11 @@ _hidden char *libxl__xs_libxl_path(libxl__gc *gc, uint32_t domid); * fails it logs and returns ERROR_FAIL. */ +int libxl__xs_vprintf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, va_list ap); +int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, ...) PRINTF_ATTRIBUTE(4, 5); + /* On success, path will exist and will have an empty value */ int libxl__xs_mknod(libxl__gc *gc, xs_transaction_t t, const char *path, struct xs_permissions *perms, diff --git a/tools/libxl/libxl_xshelp.c b/tools/libxl/libxl_xshelp.c index 8798cba..e1412a6 100644 --- a/tools/libxl/libxl_xshelp.c +++ b/tools/libxl/libxl_xshelp.c @@ -96,23 +96,35 @@ out: } -int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, - const char *path, const char *fmt, ...) +int libxl__xs_vprintf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, va_list ap) { libxl_ctx *ctx = libxl__gc_owner(gc); char *s; + bool ok; + + s = libxl__vsprintf(gc, fmt, ap); + + ok = xs_write(ctx->xsh, t, path, s, strlen(s)); + if (!ok) { + LOGE(ERROR, "xenstore write failed: `%s' = `%s'", path, s); + return ERROR_FAIL; + } + + return 0; +} + +int libxl__xs_printf(libxl__gc *gc, xs_transaction_t t, + const char *path, const char *fmt, ...) +{ va_list ap; - int ret; + int rc; + va_start(ap, fmt); - ret = vasprintf(&s, fmt, ap); + rc = libxl__xs_vprintf(gc, t, path, fmt, ap); va_end(ap); - if (ret == -1) { - return -1; - } - xs_write(ctx->xsh, t, path, s, ret); - free(s); - return 0; + return rc; } char * libxl__xs_read(libxl__gc *gc, xs_transaction_t t, const char *path) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34: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 1a9T4l-0001i9-7y; Thu, 17 Dec 2015 07:34:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4k-0001hs-84 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:10 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id EF/83-18633-17562765; Thu, 17 Dec 2015 07:34:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1450337648!11241823!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61491 invoked from network); 17 Dec 2015 07:34:09 -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; 17 Dec 2015 07:34:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4i-0005l2-37 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4h-0007iK-UH for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:08 +0000 Date: Thu, 17 Dec 2015 07:34:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Drop trailing ; from DEFINE_XEN_GUEST_HANDLE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6285ff920dfc42eb15890b8877da72aa9bae8592 Author: Ian Campbell AuthorDate: Mon Dec 14 16:21:31 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 12:06:53 2015 +0000 xen: arm: Drop trailing ; from DEFINE_XEN_GUEST_HANDLE This is always present at the point of use, which with -pedantic provokes: error: ISO C does not allow extra ';' outside of a function [-Werror=edantic] Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/include/public/arch-arm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 6322548..870bc3b 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -173,7 +173,7 @@ typedef union { type *p; unsigned long q; } \ __guest_handle_ ## name; \ typedef union { type *p; uint64_aligned_t q; } \ - __guest_handle_64_ ## name; + __guest_handle_64_ ## name /* * XEN_GUEST_HANDLE represents a guest pointer, when passed as a field -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34: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 1a9T4l-0001i9-7y; Thu, 17 Dec 2015 07:34:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4k-0001hs-84 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:10 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id EF/83-18633-17562765; Thu, 17 Dec 2015 07:34:09 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1450337648!11241823!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61491 invoked from network); 17 Dec 2015 07:34:09 -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; 17 Dec 2015 07:34:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4i-0005l2-37 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4h-0007iK-UH for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:08 +0000 Date: Thu, 17 Dec 2015 07:34:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: arm: Drop trailing ; from DEFINE_XEN_GUEST_HANDLE X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6285ff920dfc42eb15890b8877da72aa9bae8592 Author: Ian Campbell AuthorDate: Mon Dec 14 16:21:31 2015 +0000 Commit: Ian Campbell CommitDate: Tue Dec 15 12:06:53 2015 +0000 xen: arm: Drop trailing ; from DEFINE_XEN_GUEST_HANDLE This is always present at the point of use, which with -pedantic provokes: error: ISO C does not allow extra ';' outside of a function [-Werror=edantic] Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/include/public/arch-arm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index 6322548..870bc3b 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -173,7 +173,7 @@ typedef union { type *p; unsigned long q; } \ __guest_handle_ ## name; \ typedef union { type *p; uint64_aligned_t q; } \ - __guest_handle_64_ ## name; + __guest_handle_64_ ## name /* * XEN_GUEST_HANDLE represents a guest pointer, when passed as a field -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4w-0001kL-DY; Thu, 17 Dec 2015 07:34:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4v-0001k8-8U for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:21 +0000 Content-Length: 6750 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id ED/20-05979-C7562765; Thu, 17 Dec 2015 07:34:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1450337658!11185829!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9342 invoked from network); 17 Dec 2015 07:34:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:34:19 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4s-0005lA-GN for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4s-0007im-CP for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:18 +0000 Date: Thu, 17 Dec 2015 07:34:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: set the vPMU interface based on the presence of a lapic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8638976408196116725==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8638976408196116725== Content-Length: 6461 Content-Transfer-Encoding: quoted-printable commit fee4100a9ed9b801eddaccb96b4f63c8265af68a Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:11:11 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:11:11 2015 +0100 x86: set the vPMU interface based on the presence of a lapic Instead of choosing the interface to expose to guests based on the guest type, do it based on whether the guest has an emulated local apic or not. Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Boris Ostrovsky Acked-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/cpu/vpmu.c | 11 ++++++----- xen/arch/x86/cpu/vpmu_amd.c | 6 +++--- xen/arch/x86/cpu/vpmu_intel.c | 6 +++--- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index d870dcc..4856e98 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -94,7 +94,7 @@ void vpmu_lvtpc_update(uint32_t val) vpmu->hw_lapic_lvtpc =3D PMU_APIC_VECTOR | (val & APIC_LVT_MASKED); /* Postpone APIC updates for PV(H) guests if PMU interrupt is pending */ - if ( is_hvm_vcpu(curr) || !vpmu->xenpmu_data || + if ( has_vlapic(curr->domain) || !vpmu->xenpmu_data || !vpmu_is_set(vpmu, VPMU_CACHED) ) apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); } @@ -129,7 +129,7 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, * and since do_wr/rdmsr may load VPMU context we should save * (and unload) it again. */ - if ( !is_hvm_vcpu(curr) && vpmu->xenpmu_data && + if ( !has_vlapic(curr->domain) && vpmu->xenpmu_data && vpmu_is_set(vpmu, VPMU_CACHED) ) { vpmu_set(vpmu, VPMU_CONTEXT_SAVE); @@ -184,7 +184,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) return; /* PV(H) guest */ - if ( !is_hvm_vcpu(sampling) || (vpmu_mode & XENPMU_MODE_ALL) ) + if ( !has_vlapic(sampling->domain) || (vpmu_mode & XENPMU_MODE_ALL) ) { const struct cpu_user_regs *cur_regs; uint64_t *flags =3D &vpmu->xenpmu_data->pmu.pmu_flags; @@ -411,7 +411,8 @@ int vpmu_load(struct vcpu *v, bool_t from_guest) /* Only when PMU is counting, we load PMU context immediately. */ if ( !vpmu_is_set(vpmu, VPMU_RUNNING) || - (!is_hvm_vcpu(vpmu_vcpu(vpmu)) && vpmu_is_set(vpmu, VPMU_CACHED)) ) + (!has_vlapic(vpmu_vcpu(vpmu)->domain) && + vpmu_is_set(vpmu, VPMU_CACHED)) ) return 0; if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_load ) @@ -637,7 +638,7 @@ long do_xenpmu_op(unsigned int op, XEN_GUEST_HANDLE_PARAM(xen_pmu_params_t) arg) struct xen_pmu_data *xenpmu_data; struct vpmu_struct *vpmu; - if ( !opt_vpmu_enabled ) + if ( !opt_vpmu_enabled || has_vlapic(current->domain) ) return -EOPNOTSUPP; ret =3D xsm_pmu_op(XSM_OTHER, current->domain, op); diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 04da81a..990e6f3 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -238,7 +238,7 @@ static int amd_vpmu_load(struct vcpu *v, bool_t from_guest) bool_t is_running =3D 0; struct xen_pmu_amd_ctxt *guest_ctxt =3D &vpmu->xenpmu_data->pmu.c.amd; - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); ctxt =3D vpmu->context; ctrl_regs =3D vpmu_reg_pointer(ctxt, ctrls); @@ -314,7 +314,7 @@ static int amd_vpmu_save(struct vcpu *v, bool_t to_guest) { struct xen_pmu_amd_ctxt *guest_ctxt, *ctxt; - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); ctxt =3D vpmu->context; guest_ctxt =3D &vpmu->xenpmu_data->pmu.c.amd; memcpy(&guest_ctxt->regs[0], &ctxt->regs[0], regs_sz); @@ -525,7 +525,7 @@ int svm_vpmu_initialise(struct vcpu *v) vpmu->context =3D ctxt; vpmu->priv_context =3D NULL; - if ( !is_hvm_vcpu(v) ) + if ( !has_vlapic(v->domain) ) { /* Copy register offsets to shared area */ ASSERT(vpmu->xenpmu_data); diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index c27f095..4c16418 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -336,7 +336,7 @@ static int core2_vpmu_save(struct vcpu *v, bool_t to_guest) if ( to_guest ) { - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); memcpy((void *)(&vpmu->xenpmu_data->pmu.c.intel) + regs_off, vpmu->context + regs_off, regs_sz); } @@ -441,7 +441,7 @@ static int core2_vpmu_load(struct vcpu *v, bool_t from_guest) { int ret; - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); memcpy(vpmu->context + regs_off, (void *)&v->arch.vpmu.xenpmu_data->pmu.c.intel + regs_off, @@ -501,7 +501,7 @@ static int core2_vpmu_alloc_resource(struct vcpu *v) vpmu->context =3D core2_vpmu_cxt; vpmu->priv_context =3D p; - if ( !is_hvm_vcpu(v) ) + if ( !has_vlapic(v->domain) ) { /* Copy fixed/arch register offsets to shared area */ ASSERT(vpmu->xenpmu_data); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e1fadc3..0078100 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1190,7 +1190,7 @@ static int svm_vcpu_initialise(struct vcpu *v) } /* PVH's VPMU is initialized via hypercall */ - if ( is_hvm_vcpu(v) ) + if ( has_vlapic(v->domain) ) vpmu_initialise(v); svm_guest_osvw_init(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 47d5649..2922673 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -148,7 +148,7 @@ static int vmx_vcpu_initialise(struct vcpu *v) } /* PVH's VPMU is initialized via hypercall */ - if ( is_hvm_vcpu(v) ) + if ( has_vlapic(v->domain) ) vpmu_initialise(v); vmx_install_vlapic_mapping(v); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8638976408196116725== 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 --===============8638976408196116725==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:22 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4w-0001kL-DY; Thu, 17 Dec 2015 07:34:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4v-0001k8-8U for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:21 +0000 Content-Length: 6750 Received: from [85.158.137.68] by server-14.bemta-3.messagelabs.com id ED/20-05979-C7562765; Thu, 17 Dec 2015 07:34:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1450337658!11185829!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9342 invoked from network); 17 Dec 2015 07:34:19 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:34:19 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T4s-0005lA-GN for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T4s-0007im-CP for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:18 +0000 Date: Thu, 17 Dec 2015 07:34:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: set the vPMU interface based on the presence of a lapic X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============8638976408196116725==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============8638976408196116725== Content-Length: 6461 Content-Transfer-Encoding: quoted-printable commit fee4100a9ed9b801eddaccb96b4f63c8265af68a Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:11:11 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:11:11 2015 +0100 x86: set the vPMU interface based on the presence of a lapic Instead of choosing the interface to expose to guests based on the guest type, do it based on whether the guest has an emulated local apic or not. Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Boris Ostrovsky Acked-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/cpu/vpmu.c | 11 ++++++----- xen/arch/x86/cpu/vpmu_amd.c | 6 +++--- xen/arch/x86/cpu/vpmu_intel.c | 6 +++--- xen/arch/x86/hvm/svm/svm.c | 2 +- xen/arch/x86/hvm/vmx/vmx.c | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c index d870dcc..4856e98 100644 --- a/xen/arch/x86/cpu/vpmu.c +++ b/xen/arch/x86/cpu/vpmu.c @@ -94,7 +94,7 @@ void vpmu_lvtpc_update(uint32_t val) vpmu->hw_lapic_lvtpc =3D PMU_APIC_VECTOR | (val & APIC_LVT_MASKED); /* Postpone APIC updates for PV(H) guests if PMU interrupt is pending */ - if ( is_hvm_vcpu(curr) || !vpmu->xenpmu_data || + if ( has_vlapic(curr->domain) || !vpmu->xenpmu_data || !vpmu_is_set(vpmu, VPMU_CACHED) ) apic_write(APIC_LVTPC, vpmu->hw_lapic_lvtpc); } @@ -129,7 +129,7 @@ int vpmu_do_msr(unsigned int msr, uint64_t *msr_content, * and since do_wr/rdmsr may load VPMU context we should save * (and unload) it again. */ - if ( !is_hvm_vcpu(curr) && vpmu->xenpmu_data && + if ( !has_vlapic(curr->domain) && vpmu->xenpmu_data && vpmu_is_set(vpmu, VPMU_CACHED) ) { vpmu_set(vpmu, VPMU_CONTEXT_SAVE); @@ -184,7 +184,7 @@ void vpmu_do_interrupt(struct cpu_user_regs *regs) return; /* PV(H) guest */ - if ( !is_hvm_vcpu(sampling) || (vpmu_mode & XENPMU_MODE_ALL) ) + if ( !has_vlapic(sampling->domain) || (vpmu_mode & XENPMU_MODE_ALL) ) { const struct cpu_user_regs *cur_regs; uint64_t *flags =3D &vpmu->xenpmu_data->pmu.pmu_flags; @@ -411,7 +411,8 @@ int vpmu_load(struct vcpu *v, bool_t from_guest) /* Only when PMU is counting, we load PMU context immediately. */ if ( !vpmu_is_set(vpmu, VPMU_RUNNING) || - (!is_hvm_vcpu(vpmu_vcpu(vpmu)) && vpmu_is_set(vpmu, VPMU_CACHED)) ) + (!has_vlapic(vpmu_vcpu(vpmu)->domain) && + vpmu_is_set(vpmu, VPMU_CACHED)) ) return 0; if ( vpmu->arch_vpmu_ops && vpmu->arch_vpmu_ops->arch_vpmu_load ) @@ -637,7 +638,7 @@ long do_xenpmu_op(unsigned int op, XEN_GUEST_HANDLE_PARAM(xen_pmu_params_t) arg) struct xen_pmu_data *xenpmu_data; struct vpmu_struct *vpmu; - if ( !opt_vpmu_enabled ) + if ( !opt_vpmu_enabled || has_vlapic(current->domain) ) return -EOPNOTSUPP; ret =3D xsm_pmu_op(XSM_OTHER, current->domain, op); diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 04da81a..990e6f3 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -238,7 +238,7 @@ static int amd_vpmu_load(struct vcpu *v, bool_t from_guest) bool_t is_running =3D 0; struct xen_pmu_amd_ctxt *guest_ctxt =3D &vpmu->xenpmu_data->pmu.c.amd; - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); ctxt =3D vpmu->context; ctrl_regs =3D vpmu_reg_pointer(ctxt, ctrls); @@ -314,7 +314,7 @@ static int amd_vpmu_save(struct vcpu *v, bool_t to_guest) { struct xen_pmu_amd_ctxt *guest_ctxt, *ctxt; - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); ctxt =3D vpmu->context; guest_ctxt =3D &vpmu->xenpmu_data->pmu.c.amd; memcpy(&guest_ctxt->regs[0], &ctxt->regs[0], regs_sz); @@ -525,7 +525,7 @@ int svm_vpmu_initialise(struct vcpu *v) vpmu->context =3D ctxt; vpmu->priv_context =3D NULL; - if ( !is_hvm_vcpu(v) ) + if ( !has_vlapic(v->domain) ) { /* Copy register offsets to shared area */ ASSERT(vpmu->xenpmu_data); diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index c27f095..4c16418 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -336,7 +336,7 @@ static int core2_vpmu_save(struct vcpu *v, bool_t to_guest) if ( to_guest ) { - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); memcpy((void *)(&vpmu->xenpmu_data->pmu.c.intel) + regs_off, vpmu->context + regs_off, regs_sz); } @@ -441,7 +441,7 @@ static int core2_vpmu_load(struct vcpu *v, bool_t from_guest) { int ret; - ASSERT(!is_hvm_vcpu(v)); + ASSERT(!has_vlapic(v->domain)); memcpy(vpmu->context + regs_off, (void *)&v->arch.vpmu.xenpmu_data->pmu.c.intel + regs_off, @@ -501,7 +501,7 @@ static int core2_vpmu_alloc_resource(struct vcpu *v) vpmu->context =3D core2_vpmu_cxt; vpmu->priv_context =3D p; - if ( !is_hvm_vcpu(v) ) + if ( !has_vlapic(v->domain) ) { /* Copy fixed/arch register offsets to shared area */ ASSERT(vpmu->xenpmu_data); diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index e1fadc3..0078100 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1190,7 +1190,7 @@ static int svm_vcpu_initialise(struct vcpu *v) } /* PVH's VPMU is initialized via hypercall */ - if ( is_hvm_vcpu(v) ) + if ( has_vlapic(v->domain) ) vpmu_initialise(v); svm_guest_osvw_init(v); diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 47d5649..2922673 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -148,7 +148,7 @@ static int vmx_vcpu_initialise(struct vcpu *v) } /* PVH's VPMU is initialized via hypercall */ - if ( is_hvm_vcpu(v) ) + if ( has_vlapic(v->domain) ) vpmu_initialise(v); vmx_install_vlapic_mapping(v); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============8638976408196116725== 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 --===============8638976408196116725==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34: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 1a9T56-0001ls-IC; Thu, 17 Dec 2015 07:34:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T55-0001lf-Lg for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:31 +0000 Content-Length: 1960 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id F2/A6-31122-78562765; Thu, 17 Dec 2015 07:34:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1450337669!5803486!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22159 invoked from network); 17 Dec 2015 07:34:30 -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; 17 Dec 2015 07:34:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T53-0005lI-MR for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T53-0007js-Hd for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:29 +0000 Date: Thu, 17 Dec 2015 07:34:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow disabling all emulated devices inside of 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: multipart/mixed; boundary="===============5870508394378231876==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5870508394378231876== Content-Length: 1542 Content-Transfer-Encoding: quoted-printable commit 2fa6cfe3a2dc7dcaa1c6b2afadbe92f42dd62301 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:11:49 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:11:49 2015 +0100 x86: allow disabling all emulated devices inside of Xen Only allow enabling or disabling all the emulated devices inside of Xen, right now Xen doesn't support enabling specific emulated devices only. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2a8d5c1..df40dc6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -532,8 +532,8 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, d->domain_id, config->emulation_flags); return -EINVAL; } - if ( is_hvm_domain(d) =3F (config->emulation_flags !=3D XEN_X86_EMU_ALL) - : (config->emulation_flags !=3D 0) ) + if ( config->emulation_flags !=3D 0 && + (!is_hvm_domain(d) || config->emulation_flags !=3D XEN_X86_EMU_ALL) ) { printk(XENLOG_G_ERR "d%d: Xen does not allow %s domain creation " "with the current selection of emulators: %#x\n", -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5870508394378231876== 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 --===============5870508394378231876==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:32 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34: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 1a9T56-0001ls-IC; Thu, 17 Dec 2015 07:34:32 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T55-0001lf-Lg for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:31 +0000 Content-Length: 1960 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id F2/A6-31122-78562765; Thu, 17 Dec 2015 07:34:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1450337669!5803486!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22159 invoked from network); 17 Dec 2015 07:34:30 -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; 17 Dec 2015 07:34:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T53-0005lI-MR for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T53-0007js-Hd for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:29 +0000 Date: Thu, 17 Dec 2015 07:34:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow disabling all emulated devices inside of 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: multipart/mixed; boundary="===============5870508394378231876==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5870508394378231876== Content-Length: 1542 Content-Transfer-Encoding: quoted-printable commit 2fa6cfe3a2dc7dcaa1c6b2afadbe92f42dd62301 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:11:49 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:11:49 2015 +0100 x86: allow disabling all emulated devices inside of Xen Only allow enabling or disabling all the emulated devices inside of Xen, right now Xen doesn't support enabling specific emulated devices only. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2a8d5c1..df40dc6 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -532,8 +532,8 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, d->domain_id, config->emulation_flags); return -EINVAL; } - if ( is_hvm_domain(d) =3F (config->emulation_flags !=3D XEN_X86_EMU_ALL) - : (config->emulation_flags !=3D 0) ) + if ( config->emulation_flags !=3D 0 && + (!is_hvm_domain(d) || config->emulation_flags !=3D XEN_X86_EMU_ALL) ) { printk(XENLOG_G_ERR "d%d: Xen does not allow %s domain creation " "with the current selection of emulators: %#x\n", -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5870508394378231876== 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 --===============5870508394378231876==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34: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 1a9T5J-0001nU-NG; Thu, 17 Dec 2015 07:34:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5I-0001nM-9j for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:44 +0000 Content-Length: 8553 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 4B/99-21571-39562765; Thu, 17 Dec 2015 07:34:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1450337680!5805440!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37219 invoked from network); 17 Dec 2015 07:34:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:34:40 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5E-0005lQ-1d for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5D-0007kW-Ua for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:39 +0000 Date: Thu, 17 Dec 2015 07:34:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow creating domains without emulated devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2110089968796502758==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2110089968796502758== Content-Length: 8296 Content-Transfer-Encoding: quoted-printable commit d7f8218e3c89ab9fb08b6394202d51f399e918d5 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:12:18 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:12:18 2015 +0100 libxc: allow creating domains without emulated devices Introduce a new flag in xc_dom_image that turns on and off the emulated devices. This prevents creating the VGA hole, the hvm_info page and the ioreq server pages. libxl unconditionally sets it to true for all HVM domains at the moment. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/include/xc_dom.h | 4 ++ tools/libxc/xc_dom_x86.c | 73 +++++++++++++++++++++++------------------- tools/libxl/libxl_dom.c | 2 + tools/libxl/libxl_internal.h | 1 + 4 files changed, 47 insertions(+), 33 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 3c94b57..efa6c6e 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -200,6 +200,10 @@ struct xc_dom_image { xen_paddr_t mmio_size; xen_paddr_t lowmem_end; xen_paddr_t highmem_end; + xen_pfn_t vga_hole_size; + + /* If unset disables the setup of the IOREQ pages. */ + bool device_model; /* Extra ACPI tables passed to HVMLOADER */ struct xc_hvm_firmware_module acpi_module; diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 71b042e..1d4ad3e 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -50,8 +50,6 @@ #define X86_CR0_PE 0x01 #define X86_CR0_ET 0x10 -#define VGA_HOLE_SIZE (0x20) - #define SPECIALPAGE_PAGING 0 #define SPECIALPAGE_ACCESS 1 #define SPECIALPAGE_SHARING 2 @@ -595,12 +593,15 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) xen_pfn_t ioreq_server_array[NR_IOREQ_SERVER_PAGES]; xc_interface *xch =3D dom->xch; - if ( (hvm_info_page =3D xc_map_foreign_range( - xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, - HVM_INFO_PFN)) =3D=3D NULL ) - goto error_out; - build_hvm_info(hvm_info_page, dom); - munmap(hvm_info_page, PAGE_SIZE); + if ( dom->device_model ) + { + if ( (hvm_info_page =3D xc_map_foreign_range( + xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, + HVM_INFO_PFN)) =3D=3D NULL ) + goto error_out; + build_hvm_info(hvm_info_page, dom); + munmap(hvm_info_page, PAGE_SIZE); + } /* Allocate and clear special pages. */ for ( i =3D 0; i < NR_SPECIAL_PAGES; i++ ) @@ -632,30 +633,33 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) xc_hvm_param_set(xch, domid, HVM_PARAM_SHARING_RING_PFN, special_pfn(SPECIALPAGE_SHARING)); - /* - * Allocate and clear additional ioreq server pages. The default - * server will use the IOREQ and BUFIOREQ special pages above. - */ - for ( i =3D 0; i < NR_IOREQ_SERVER_PAGES; i++ ) - ioreq_server_array[i] =3D ioreq_server_pfn(i); - - rc =3D xc_domain_populate_physmap_exact(xch, domid, NR_IOREQ_SERVER_PAGES, 0, - 0, ioreq_server_array); - if ( rc !=3D 0 ) + if ( dom->device_model ) { - DOMPRINTF("Could not allocate ioreq server pages."); - goto error_out; - } + /* + * Allocate and clear additional ioreq server pages. The default + * server will use the IOREQ and BUFIOREQ special pages above. + */ + for ( i =3D 0; i < NR_IOREQ_SERVER_PAGES; i++ ) + ioreq_server_array[i] =3D ioreq_server_pfn(i); - if ( xc_clear_domain_pages(xch, domid, ioreq_server_pfn(0), - NR_IOREQ_SERVER_PAGES) ) + rc =3D xc_domain_populate_physmap_exact(xch, domid, NR_IOREQ_SERVER_PAGES, 0, + 0, ioreq_server_array); + if ( rc !=3D 0 ) + { + DOMPRINTF("Could not allocate ioreq server pages."); goto error_out; + } - /* Tell the domain where the pages are and how many there are */ - xc_hvm_param_set(xch, domid, HVM_PARAM_IOREQ_SERVER_PFN, - ioreq_server_pfn(0)); - xc_hvm_param_set(xch, domid, HVM_PARAM_NR_IOREQ_SERVER_PAGES, - NR_IOREQ_SERVER_PAGES); + if ( xc_clear_domain_pages(xch, domid, ioreq_server_pfn(0), + NR_IOREQ_SERVER_PAGES) ) + goto error_out; + + /* Tell the domain where the pages are and how many there are */ + xc_hvm_param_set(xch, domid, HVM_PARAM_IOREQ_SERVER_PFN, + ioreq_server_pfn(0)); + xc_hvm_param_set(xch, domid, HVM_PARAM_NR_IOREQ_SERVER_PAGES, + NR_IOREQ_SERVER_PAGES); + } /* * Identity-map page table is required for running with CR0.PG=3D0 when @@ -1393,7 +1397,8 @@ static int meminit_hvm(struct xc_dom_image *dom) * allocated is pointless. */ if ( claim_enabled ) { - rc =3D xc_domain_claim_pages(xch, domid, target_pages - VGA_HOLE_SIZE); + rc =3D xc_domain_claim_pages(xch, domid, + target_pages - dom->vga_hole_size); if ( rc !=3D 0 ) { DOMPRINTF("Could not allocate memory for HVM guest as we cannot claim memory!"); @@ -1409,7 +1414,8 @@ static int meminit_hvm(struct xc_dom_image *dom) * tot_pages will be target_pages - VGA_HOLE_SIZE after * this call. */ - rc =3D xc_domain_set_pod_target(xch, domid, target_pages - VGA_HOLE_SIZE, + rc =3D xc_domain_set_pod_target(xch, domid, + target_pages - dom->vga_hole_size, NULL, NULL, NULL); if ( rc !=3D 0 ) { @@ -1428,8 +1434,9 @@ static int meminit_hvm(struct xc_dom_image *dom) * Under 2MB mode, we allocate pages in batches of no more than 8MB to * ensure that we can be preempted and hence dom0 remains responsive. */ - rc =3D xc_domain_populate_physmap_exact( - xch, domid, 0xa0, 0, memflags, &dom->p2m_host[0x00]); + if ( dom->device_model ) + rc =3D xc_domain_populate_physmap_exact( + xch, domid, 0xa0, 0, memflags, &dom->p2m_host[0x00]); stat_normal_pages =3D 0; for ( vmemid =3D 0; vmemid < nr_vmemranges; vmemid++ ) @@ -1448,7 +1455,7 @@ static int meminit_hvm(struct xc_dom_image *dom) * 0xA0000-0xC0000. Note that 0x00000-0xA0000 is populated just * before this loop. */ - if ( vmemranges[vmemid].start =3D=3D 0 ) + if ( vmemranges[vmemid].start =3D=3D 0 && dom->device_model ) { cur_pages =3D 0xc0; stat_normal_pages +=3D 0xc0; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index e1f0c61..d17ea86 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -994,6 +994,8 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, dom->lowmem_end =3D lowmem_end; dom->highmem_end =3D highmem_end; dom->mmio_start =3D mmio_start; + dom->vga_hole_size =3D LIBXL_VGA_HOLE_SIZE; + dom->device_model =3D true; rc =3D libxl__domain_device_construct_rdm(gc, d_config, info->u.hvm.rdm_mem_boundary_memkb*1024, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f116779..96842d3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -102,6 +102,7 @@ #define LIBXL_HVM_EXTRA_MEMORY 2048 #define LIBXL_MIN_DOM0_MEM (128*1024) #define LIBXL_INVALID_GFN (~(uint64_t)0) +#define LIBXL_VGA_HOLE_SIZE 0x20 /* use 0 as the domid of the toolstack domain for now */ #define LIBXL_TOOLSTACK_DOMID 0 #define QEMU_SIGNATURE "DeviceModelRecord0002" -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2110089968796502758== 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 --===============2110089968796502758==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:46 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34: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 1a9T5J-0001nU-NG; Thu, 17 Dec 2015 07:34:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5I-0001nM-9j for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:44 +0000 Content-Length: 8553 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 4B/99-21571-39562765; Thu, 17 Dec 2015 07:34:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1450337680!5805440!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 37219 invoked from network); 17 Dec 2015 07:34:40 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:34:40 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5E-0005lQ-1d for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:40 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5D-0007kW-Ua for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:39 +0000 Date: Thu, 17 Dec 2015 07:34:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: allow creating domains without emulated devices X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============2110089968796502758==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2110089968796502758== Content-Length: 8296 Content-Transfer-Encoding: quoted-printable commit d7f8218e3c89ab9fb08b6394202d51f399e918d5 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:12:18 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:12:18 2015 +0100 libxc: allow creating domains without emulated devices Introduce a new flag in xc_dom_image that turns on and off the emulated devices. This prevents creating the VGA hole, the hvm_info page and the ioreq server pages. libxl unconditionally sets it to true for all HVM domains at the moment. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Wei Liu Reviewed-by: Andrew Cooper --- tools/libxc/include/xc_dom.h | 4 ++ tools/libxc/xc_dom_x86.c | 73 +++++++++++++++++++++++------------------- tools/libxl/libxl_dom.c | 2 + tools/libxl/libxl_internal.h | 1 + 4 files changed, 47 insertions(+), 33 deletions(-) diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index 3c94b57..efa6c6e 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -200,6 +200,10 @@ struct xc_dom_image { xen_paddr_t mmio_size; xen_paddr_t lowmem_end; xen_paddr_t highmem_end; + xen_pfn_t vga_hole_size; + + /* If unset disables the setup of the IOREQ pages. */ + bool device_model; /* Extra ACPI tables passed to HVMLOADER */ struct xc_hvm_firmware_module acpi_module; diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 71b042e..1d4ad3e 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -50,8 +50,6 @@ #define X86_CR0_PE 0x01 #define X86_CR0_ET 0x10 -#define VGA_HOLE_SIZE (0x20) - #define SPECIALPAGE_PAGING 0 #define SPECIALPAGE_ACCESS 1 #define SPECIALPAGE_SHARING 2 @@ -595,12 +593,15 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) xen_pfn_t ioreq_server_array[NR_IOREQ_SERVER_PAGES]; xc_interface *xch =3D dom->xch; - if ( (hvm_info_page =3D xc_map_foreign_range( - xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, - HVM_INFO_PFN)) =3D=3D NULL ) - goto error_out; - build_hvm_info(hvm_info_page, dom); - munmap(hvm_info_page, PAGE_SIZE); + if ( dom->device_model ) + { + if ( (hvm_info_page =3D xc_map_foreign_range( + xch, domid, PAGE_SIZE, PROT_READ | PROT_WRITE, + HVM_INFO_PFN)) =3D=3D NULL ) + goto error_out; + build_hvm_info(hvm_info_page, dom); + munmap(hvm_info_page, PAGE_SIZE); + } /* Allocate and clear special pages. */ for ( i =3D 0; i < NR_SPECIAL_PAGES; i++ ) @@ -632,30 +633,33 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) xc_hvm_param_set(xch, domid, HVM_PARAM_SHARING_RING_PFN, special_pfn(SPECIALPAGE_SHARING)); - /* - * Allocate and clear additional ioreq server pages. The default - * server will use the IOREQ and BUFIOREQ special pages above. - */ - for ( i =3D 0; i < NR_IOREQ_SERVER_PAGES; i++ ) - ioreq_server_array[i] =3D ioreq_server_pfn(i); - - rc =3D xc_domain_populate_physmap_exact(xch, domid, NR_IOREQ_SERVER_PAGES, 0, - 0, ioreq_server_array); - if ( rc !=3D 0 ) + if ( dom->device_model ) { - DOMPRINTF("Could not allocate ioreq server pages."); - goto error_out; - } + /* + * Allocate and clear additional ioreq server pages. The default + * server will use the IOREQ and BUFIOREQ special pages above. + */ + for ( i =3D 0; i < NR_IOREQ_SERVER_PAGES; i++ ) + ioreq_server_array[i] =3D ioreq_server_pfn(i); - if ( xc_clear_domain_pages(xch, domid, ioreq_server_pfn(0), - NR_IOREQ_SERVER_PAGES) ) + rc =3D xc_domain_populate_physmap_exact(xch, domid, NR_IOREQ_SERVER_PAGES, 0, + 0, ioreq_server_array); + if ( rc !=3D 0 ) + { + DOMPRINTF("Could not allocate ioreq server pages."); goto error_out; + } - /* Tell the domain where the pages are and how many there are */ - xc_hvm_param_set(xch, domid, HVM_PARAM_IOREQ_SERVER_PFN, - ioreq_server_pfn(0)); - xc_hvm_param_set(xch, domid, HVM_PARAM_NR_IOREQ_SERVER_PAGES, - NR_IOREQ_SERVER_PAGES); + if ( xc_clear_domain_pages(xch, domid, ioreq_server_pfn(0), + NR_IOREQ_SERVER_PAGES) ) + goto error_out; + + /* Tell the domain where the pages are and how many there are */ + xc_hvm_param_set(xch, domid, HVM_PARAM_IOREQ_SERVER_PFN, + ioreq_server_pfn(0)); + xc_hvm_param_set(xch, domid, HVM_PARAM_NR_IOREQ_SERVER_PAGES, + NR_IOREQ_SERVER_PAGES); + } /* * Identity-map page table is required for running with CR0.PG=3D0 when @@ -1393,7 +1397,8 @@ static int meminit_hvm(struct xc_dom_image *dom) * allocated is pointless. */ if ( claim_enabled ) { - rc =3D xc_domain_claim_pages(xch, domid, target_pages - VGA_HOLE_SIZE); + rc =3D xc_domain_claim_pages(xch, domid, + target_pages - dom->vga_hole_size); if ( rc !=3D 0 ) { DOMPRINTF("Could not allocate memory for HVM guest as we cannot claim memory!"); @@ -1409,7 +1414,8 @@ static int meminit_hvm(struct xc_dom_image *dom) * tot_pages will be target_pages - VGA_HOLE_SIZE after * this call. */ - rc =3D xc_domain_set_pod_target(xch, domid, target_pages - VGA_HOLE_SIZE, + rc =3D xc_domain_set_pod_target(xch, domid, + target_pages - dom->vga_hole_size, NULL, NULL, NULL); if ( rc !=3D 0 ) { @@ -1428,8 +1434,9 @@ static int meminit_hvm(struct xc_dom_image *dom) * Under 2MB mode, we allocate pages in batches of no more than 8MB to * ensure that we can be preempted and hence dom0 remains responsive. */ - rc =3D xc_domain_populate_physmap_exact( - xch, domid, 0xa0, 0, memflags, &dom->p2m_host[0x00]); + if ( dom->device_model ) + rc =3D xc_domain_populate_physmap_exact( + xch, domid, 0xa0, 0, memflags, &dom->p2m_host[0x00]); stat_normal_pages =3D 0; for ( vmemid =3D 0; vmemid < nr_vmemranges; vmemid++ ) @@ -1448,7 +1455,7 @@ static int meminit_hvm(struct xc_dom_image *dom) * 0xA0000-0xC0000. Note that 0x00000-0xA0000 is populated just * before this loop. */ - if ( vmemranges[vmemid].start =3D=3D 0 ) + if ( vmemranges[vmemid].start =3D=3D 0 && dom->device_model ) { cur_pages =3D 0xc0; stat_normal_pages +=3D 0xc0; diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index e1f0c61..d17ea86 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -994,6 +994,8 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, dom->lowmem_end =3D lowmem_end; dom->highmem_end =3D highmem_end; dom->mmio_start =3D mmio_start; + dom->vga_hole_size =3D LIBXL_VGA_HOLE_SIZE; + dom->device_model =3D true; rc =3D libxl__domain_device_construct_rdm(gc, d_config, info->u.hvm.rdm_mem_boundary_memkb*1024, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f116779..96842d3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -102,6 +102,7 @@ #define LIBXL_HVM_EXTRA_MEMORY 2048 #define LIBXL_MIN_DOM0_MEM (128*1024) #define LIBXL_INVALID_GFN (~(uint64_t)0) +#define LIBXL_VGA_HOLE_SIZE 0x20 /* use 0 as the domid of the toolstack domain for now */ #define LIBXL_TOOLSTACK_DOMID 0 #define QEMU_SIGNATURE "DeviceModelRecord0002" -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2110089968796502758== 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 --===============2110089968796502758==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5S-0001q7-Ua; Thu, 17 Dec 2015 07:34:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5R-0001pn-EN for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:53 +0000 Content-Length: 28841 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 88/08-16870-C9562765; Thu, 17 Dec 2015 07:34:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1450337690!10966167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18113 invoked from network); 17 Dec 2015 07:34:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:34:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5O-0005lV-E9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5O-0007l6-Ai for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:50 +0000 Date: Thu, 17 Dec 2015 07:34:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow HVM guests to use hypercalls to bring up vCPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5926567153380212660==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5926567153380212660== Content-Length: 29256 Content-Transfer-Encoding: quoted-printable commit 192df6f9122ddebc21d0a632c10da3453aeee1c2 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:12:32 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:13:21 2015 +0100 x86: allow HVM guests to use hypercalls to bring up vCPUs Allow the usage of the VCPUOP_initialise, VCPUOP_up, VCPUOP_down, VCPUOP_is_up, VCPUOP_get_physid and VCPUOP_send_nmi hypercalls from HVM guests. This patch introduces a new structure (vcpu_hvm_context) that should be used in conjuction with the VCPUOP_initialise hypercall in order to initialize vCPUs for HVM guests. Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 5 + xen/arch/x86/domain.c | 303 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 61 +------- xen/common/compat/domain.c | 50 +++++-- xen/common/domain.c | 41 +++-- xen/include/Makefile | 1 + xen/include/asm-x86/domain.h | 3 + xen/include/asm-x86/hvm/hvm.h | 5 + xen/include/public/hvm/hvm_vcpu.h | 144 ++++++++++++++++++ xen/include/public/vcpu.h | 6 +- xen/include/xen/domain.h | 3 + xen/include/xlat.lst | 3 + 12 files changed, 536 insertions(+), 89 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 860ac7d..3d274ae 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -756,6 +756,11 @@ int arch_set_info_guest( return 0; } +int arch_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + return default_initialise_vcpu(v, arg); +} + int arch_vcpu_reset(struct vcpu *v) { vcpu_end_shutdown_deferral(v); diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index df40dc6..2c3bb09 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -1188,6 +1189,308 @@ int arch_set_info_guest( #undef c } +static inline int check_segment(struct segment_register *reg, + enum x86_segment seg) +{ + + if ( reg->attr.fields.pad !=3D 0 ) + { + gprintk(XENLOG_ERR, "Segment attribute bits 12-15 are not zero\n"); + return -EINVAL; + } + + if ( reg->attr.bytes =3D=3D 0 ) + { + if ( seg !=3D x86_seg_ds && seg !=3D x86_seg_es ) + { + gprintk(XENLOG_ERR, "Null selector provided for CS, SS or TR\n"); + return -EINVAL; + } + return 0; + } + + if ( seg !=3D x86_seg_tr && !reg->attr.fields.s ) + { + gprintk(XENLOG_ERR, + "System segment provided for a code or data segment\n"); + return -EINVAL; + } + + if ( seg =3D=3D x86_seg_tr && reg->attr.fields.s ) + { + gprintk(XENLOG_ERR, "Code or data segment provided for TR\n"); + return -EINVAL; + } + + if ( !reg->attr.fields.p ) + { + gprintk(XENLOG_ERR, "Non-present segment provided\n"); + return -EINVAL; + } + + if ( seg =3D=3D x86_seg_cs && !(reg->attr.fields.type & 0x8) ) + { + gprintk(XENLOG_ERR, "Non-code segment provided for CS\n"); + return -EINVAL; + } + + if ( seg =3D=3D x86_seg_ss && + ((reg->attr.fields.type & 0x8) || !(reg->attr.fields.type & 0x2)) ) + { + gprintk(XENLOG_ERR, "Non-writeable segment provided for SS\n"); + return -EINVAL; + } + + if ( reg->attr.fields.s && seg !=3D x86_seg_ss && seg !=3D x86_seg_cs && + (reg->attr.fields.type & 0x8) && !(reg->attr.fields.type & 0x2) ) + { + gprintk(XENLOG_ERR, "Non-readable segment provided for DS or ES\n"); + return -EINVAL; + } + + return 0; +} + +/* Called by VCPUOP_initialise for HVM guests. */ +int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) +{ + struct cpu_user_regs *uregs =3D &v->arch.user_regs; + struct segment_register cs, ds, ss, es, tr; + const char *errstr; + int rc; + + if ( ctx->pad !=3D 0 ) + return -EINVAL; + + switch ( ctx->mode ) + { + default: + return -EINVAL; + + case VCPU_HVM_MODE_32B: + { + const struct vcpu_hvm_x86_32 *regs =3D &ctx->cpu_regs.x86_32; + uint32_t limit; + + if ( ctx->cpu_regs.x86_32.pad1 !=3D 0 || + ctx->cpu_regs.x86_32.pad2[0] !=3D 0 || + ctx->cpu_regs.x86_32.pad2[1] !=3D 0 || + ctx->cpu_regs.x86_32.pad2[2] !=3D 0 ) + return -EINVAL; + +#define SEG(s, r) ({ \ + s =3D (struct segment_register){ .base =3D (r)->s ## _base, \ + .limit =3D (r)->s ## _limit, \ + .attr.bytes =3D (r)->s ## _ar }; \ + check_segment(&s, x86_seg_ ## s); }) + + rc =3D SEG(cs, regs); + rc |=3D SEG(ds, regs); + rc |=3D SEG(ss, regs); + rc |=3D SEG(es, regs); + rc |=3D SEG(tr, regs); +#undef SEG + + if ( rc !=3D 0 ) + return rc; + + /* Basic sanity checks. */ + limit =3D cs.limit; + if ( cs.attr.fields.g ) + limit =3D (limit << 12) | 0xfff; + if ( regs->eip > limit ) + { + gprintk(XENLOG_ERR, "EIP (%#08x) outside CS limit (%#08x)\n", + regs->eip, limit); + return -EINVAL; + } + + if ( ss.attr.fields.dpl !=3D cs.attr.fields.dpl ) + { + gprintk(XENLOG_ERR, "SS.DPL (%u) is different than CS.DPL (%u)\n", + ss.attr.fields.dpl, cs.attr.fields.dpl); + return -EINVAL; + } + + if ( ds.attr.fields.p && ds.attr.fields.dpl > cs.attr.fields.dpl ) + { + gprintk(XENLOG_ERR, "DS.DPL (%u) is greater than CS.DPL (%u)\n", + ds.attr.fields.dpl, cs.attr.fields.dpl); + return -EINVAL; + } + + if ( es.attr.fields.p && es.attr.fields.dpl > cs.attr.fields.dpl ) + { + gprintk(XENLOG_ERR, "ES.DPL (%u) is greater than CS.DPL (%u)\n", + es.attr.fields.dpl, cs.attr.fields.dpl); + return -EINVAL; + } + + if ( (regs->efer & EFER_LMA) && !(regs->efer & EFER_LME) ) + { + gprintk(XENLOG_ERR, "EFER.LMA set without EFER.LME (%#016lx)\n", + regs->efer); + return -EINVAL; + } + + uregs->rax =3D regs->eax; + uregs->rcx =3D regs->ecx; + uregs->rdx =3D regs->edx; + uregs->rbx =3D regs->ebx; + uregs->rsp =3D regs->esp; + uregs->rbp =3D regs->ebp; + uregs->rsi =3D regs->esi; + uregs->rdi =3D regs->edi; + uregs->rip =3D regs->eip; + uregs->rflags =3D regs->eflags; + + v->arch.hvm_vcpu.guest_cr[0] =3D regs->cr0; + v->arch.hvm_vcpu.guest_cr[3] =3D regs->cr3; + v->arch.hvm_vcpu.guest_cr[4] =3D regs->cr4; + v->arch.hvm_vcpu.guest_efer =3D regs->efer; + } + break; + + case VCPU_HVM_MODE_64B: + { + const struct vcpu_hvm_x86_64 *regs =3D &ctx->cpu_regs.x86_64; + + /* Basic sanity checks. */ + if ( !is_canonical_address(regs->rip) ) + { + gprintk(XENLOG_ERR, "RIP contains a non-canonical address (%#lx)\n", + regs->rip); + return -EINVAL; + } + + if ( !(regs->cr0 & X86_CR0_PG) ) + { + gprintk(XENLOG_ERR, "CR0 doesn't have paging enabled (%#016lx)\n", + regs->cr0); + return -EINVAL; + } + + if ( !(regs->cr4 & X86_CR4_PAE) ) + { + gprintk(XENLOG_ERR, "CR4 doesn't have PAE enabled (%#016lx)\n", + regs->cr4); + return -EINVAL; + } + + if ( !(regs->efer & EFER_LME) ) + { + gprintk(XENLOG_ERR, "EFER doesn't have LME enabled (%#016lx)\n", + regs->efer); + return -EINVAL; + } + + uregs->rax =3D regs->rax; + uregs->rcx =3D regs->rcx; + uregs->rdx =3D regs->rdx; + uregs->rbx =3D regs->rbx; + uregs->rsp =3D regs->rsp; + uregs->rbp =3D regs->rbp; + uregs->rsi =3D regs->rsi; + uregs->rdi =3D regs->rdi; + uregs->rip =3D regs->rip; + uregs->rflags =3D regs->rflags; + + v->arch.hvm_vcpu.guest_cr[0] =3D regs->cr0; + v->arch.hvm_vcpu.guest_cr[3] =3D regs->cr3; + v->arch.hvm_vcpu.guest_cr[4] =3D regs->cr4; + v->arch.hvm_vcpu.guest_efer =3D regs->efer; + +#define SEG(l, a) (struct segment_register){ .limit =3D (l), .attr.bytes =3D (a) } + cs =3D SEG(~0u, 0xa9b); /* 64bit code segment. */ + ds =3D ss =3D es =3D SEG(~0u, 0xc93); + tr =3D SEG(0x67, 0x8b); /* 64bit TSS (busy). */ +#undef SEG + } + break; + + } + + if ( v->arch.hvm_vcpu.guest_efer & EFER_LME ) + v->arch.hvm_vcpu.guest_efer |=3D EFER_LMA; + + if ( v->arch.hvm_vcpu.guest_cr[4] & hvm_cr4_guest_reserved_bits(v, 0) ) + { + gprintk(XENLOG_ERR, "Bad CR4 value: %#016lx\n", + v->arch.hvm_vcpu.guest_cr[4]); + return -EINVAL; + } + + errstr =3D hvm_efer_valid(v, v->arch.hvm_vcpu.guest_efer, -1); + if ( errstr ) + { + gprintk(XENLOG_ERR, "Bad EFER value (%#016lx): %s\n", + v->arch.hvm_vcpu.guest_efer, errstr); + return -EINVAL; + } + + hvm_update_guest_cr(v, 0); + hvm_update_guest_cr(v, 3); + hvm_update_guest_cr(v, 4); + hvm_update_guest_efer(v); + + if ( hvm_paging_enabled(v) && !paging_mode_hap(v->domain) ) + { + /* Shadow-mode CR3 change. Check PDBR and update refcounts. */ + struct page_info *page =3D get_page_from_gfn(v->domain, + v->arch.hvm_vcpu.guest_cr[3] >> PAGE_SHIFT, + NULL, P2M_ALLOC); + if ( !page ) + { + gprintk(XENLOG_ERR, "Invalid CR3: %#lx\n", + v->arch.hvm_vcpu.guest_cr[3]); + return -EINVAL; + } + + v->arch.guest_table =3D pagetable_from_page(page); + } + + hvm_set_segment_register(v, x86_seg_cs, &cs); + hvm_set_segment_register(v, x86_seg_ds, &ds); + hvm_set_segment_register(v, x86_seg_ss, &ss); + hvm_set_segment_register(v, x86_seg_es, &es); + hvm_set_segment_register(v, x86_seg_tr, &tr); + + /* Sync AP's TSC with BSP's. */ + v->arch.hvm_vcpu.cache_tsc_offset =3D + v->domain->vcpu[0]->arch.hvm_vcpu.cache_tsc_offset; + hvm_funcs.set_tsc_offset(v, v->arch.hvm_vcpu.cache_tsc_offset, + v->domain->arch.hvm_domain.sync_tsc); + + paging_update_paging_modes(v); + + v->is_initialised =3D 1; + set_bit(_VPF_down, &v->pause_flags); + + return 0; +} + +int arch_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + int rc; + + if ( is_hvm_vcpu(v) ) + { + struct domain *d =3D v->domain; + struct vcpu_hvm_context ctxt; + + if ( copy_from_guest(&ctxt, arg, 1) ) + return -EFAULT; + + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_hvm_guest(v, &ctxt); + domain_unlock(d); + } + else + rc =3D default_initialise_vcpu(v, arg); + + return rc; +} + int arch_vcpu_reset(struct vcpu *v) { if ( is_pv_vcpu(v) ) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 92d57ff..08cef1f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1833,8 +1833,8 @@ static int hvm_save_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) } /* Return a string indicating the error, or NULL for valid. */ -static const char * hvm_efer_valid(const struct vcpu *v, uint64_t value, - signed int cr0_pg) +const char *hvm_efer_valid(const struct vcpu *v, uint64_t value, + signed int cr0_pg) { unsigned int ext1_ecx =3D 0, ext1_edx =3D 0; @@ -1902,8 +1902,7 @@ static const char * hvm_efer_valid(const struct vcpu *v, uint64_t value, X86_CR0_CD | X86_CR0_PG))) /* These bits in CR4 cannot be set by the guest. */ -static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, - bool_t restore) +unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v,bool_t restore) { unsigned int leaf1_ecx =3D 0, leaf1_edx =3D 0; unsigned int leaf7_0_ebx =3D 0, leaf7_0_ecx =3D 0; @@ -5108,31 +5107,6 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } } -static long hvm_vcpu_op( - int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) -{ - long rc; - - switch ( cmd ) - { - case VCPUOP_register_runstate_memory_area: - case VCPUOP_get_runstate_info: - case VCPUOP_set_periodic_timer: - case VCPUOP_stop_periodic_timer: - case VCPUOP_set_singleshot_timer: - case VCPUOP_stop_singleshot_timer: - case VCPUOP_register_vcpu_info: - case VCPUOP_register_vcpu_time_memory_area: - rc =3D do_vcpu_op(cmd, vcpuid, arg); - break; - default: - rc =3D -ENOSYS; - break; - } - - return rc; -} - typedef unsigned long hvm_hypercall_t( unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); @@ -5166,31 +5140,6 @@ static long hvm_memory_op_compat32(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return compat_memory_op(cmd, arg); } -static long hvm_vcpu_op_compat32( - int cmd, unsigned vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) -{ - long rc; - - switch ( cmd ) - { - case VCPUOP_register_runstate_memory_area: - case VCPUOP_get_runstate_info: - case VCPUOP_set_periodic_timer: - case VCPUOP_stop_periodic_timer: - case VCPUOP_set_singleshot_timer: - case VCPUOP_stop_singleshot_timer: - case VCPUOP_register_vcpu_info: - case VCPUOP_register_vcpu_time_memory_area: - rc =3D compat_vcpu_op(cmd, vcpuid, arg); - break; - default: - rc =3D -ENOSYS; - break; - } - - return rc; -} - static long hvm_physdev_op_compat32( int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { @@ -5212,7 +5161,7 @@ static long hvm_physdev_op_compat32( static hvm_hypercall_t *const hvm_hypercall64_table[NR_hypercalls] =3D { [ __HYPERVISOR_memory_op ] =3D (hvm_hypercall_t *)hvm_memory_op, [ __HYPERVISOR_grant_table_op ] =3D (hvm_hypercall_t *)hvm_grant_table_op, - [ __HYPERVISOR_vcpu_op ] =3D (hvm_hypercall_t *)hvm_vcpu_op, + HYPERCALL(vcpu_op), [ __HYPERVISOR_physdev_op ] =3D (hvm_hypercall_t *)hvm_physdev_op, HYPERCALL(xen_version), HYPERCALL(console_io), @@ -5233,7 +5182,7 @@ static hvm_hypercall_t *const hvm_hypercall64_table[NR_hypercalls] =3D { static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] =3D { [ __HYPERVISOR_memory_op ] =3D (hvm_hypercall_t *)hvm_memory_op_compat32, [ __HYPERVISOR_grant_table_op ] =3D (hvm_hypercall_t *)hvm_grant_table_op_compat32, - [ __HYPERVISOR_vcpu_op ] =3D (hvm_hypercall_t *)hvm_vcpu_op_compat32, + COMPAT_CALL(vcpu_op), [ __HYPERVISOR_physdev_op ] =3D (hvm_hypercall_t *)hvm_physdev_op_compat32, COMPAT_CALL(xen_version), HYPERCALL(console_io), diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c index c60d824..88bfdc8 100644 --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -11,6 +11,7 @@ asm(".file \"" __FILE__ "\""); #include #include #include +#include #define xen_vcpu_set_periodic_timer vcpu_set_periodic_timer CHECK_vcpu_set_periodic_timer; @@ -24,6 +25,14 @@ CHECK_SIZE_(struct, vcpu_info); CHECK_vcpu_register_vcpu_info; #undef xen_vcpu_register_vcpu_info +#define xen_vcpu_hvm_context vcpu_hvm_context +#define xen_vcpu_hvm_x86_32 vcpu_hvm_x86_32 +#define xen_vcpu_hvm_x86_64 vcpu_hvm_x86_64 +CHECK_vcpu_hvm_context; +#undef xen_vcpu_hvm_x86_64 +#undef xen_vcpu_hvm_x86_32 +#undef xen_vcpu_hvm_context + int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d =3D current->domain; @@ -37,33 +46,44 @@ int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) ar { case VCPUOP_initialise: { - struct compat_vcpu_guest_context *cmp_ctxt; - if ( v->vcpu_info =3D=3D &dummy_vcpu_info ) return -EINVAL; - if ( (cmp_ctxt =3D xmalloc(struct compat_vcpu_guest_context)) =3D=3D NULL ) + if ( is_hvm_vcpu(v) ) { - rc =3D -ENOMEM; - break; - } + struct vcpu_hvm_context ctxt; - if ( copy_from_guest(cmp_ctxt, arg, 1) ) - { - xfree(cmp_ctxt); - rc =3D -EFAULT; - break; + if ( copy_from_guest(&ctxt, arg, 1) ) + return -EFAULT; + + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_hvm_guest(v, &ctxt); + domain_unlock(d); } + else + { + struct compat_vcpu_guest_context *ctxt; + + if ( (ctxt =3D xmalloc(struct compat_vcpu_guest_context)) =3D=3D NULL ) + return -ENOMEM; + + if ( copy_from_guest(ctxt, arg, 1) ) + { + xfree(ctxt); + return -EFAULT; + } - domain_lock(d); - rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, cmp_ctxt); - domain_unlock(d); + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, ctxt); + domain_unlock(d); + + xfree(ctxt); + } if ( rc =3D=3D -ERESTART ) rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); - xfree(cmp_ctxt); break; } diff --git a/xen/common/domain.c b/xen/common/domain.c index f56b7ff..c4661d8 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1208,11 +1208,34 @@ void unmap_vcpu_info(struct vcpu *v) put_page_and_type(mfn_to_page(mfn)); } +int default_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + struct vcpu_guest_context *ctxt; + struct domain *d =3D v->domain; + int rc; + + if ( (ctxt =3D alloc_vcpu_guest_context()) =3D=3D NULL ) + return -ENOMEM; + + if ( copy_from_guest(ctxt, arg, 1) ) + { + free_vcpu_guest_context(ctxt); + return -EFAULT; + } + + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, ctxt); + domain_unlock(d); + + free_vcpu_guest_context(ctxt); + + return rc; +} + long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d =3D current->domain; struct vcpu *v; - struct vcpu_guest_context *ctxt; long rc =3D 0; if ( vcpuid >=3D d->max_vcpus || (v =3D d->vcpu[vcpuid]) =3D=3D NULL ) @@ -1224,21 +1247,7 @@ long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) if ( v->vcpu_info =3D=3D &dummy_vcpu_info ) return -EINVAL; - if ( (ctxt =3D alloc_vcpu_guest_context()) =3D=3D NULL ) - return -ENOMEM; - - if ( copy_from_guest(ctxt, arg, 1) ) - { - free_vcpu_guest_context(ctxt); - return -EFAULT; - } - - domain_lock(d); - rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, ctxt); - domain_unlock(d); - - free_vcpu_guest_context(ctxt); - + rc =3D arch_initialise_vcpu(v, arg); if ( rc =3D=3D -ERESTART ) rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); diff --git a/xen/include/Makefile b/xen/include/Makefile index c674f7f..94ba3d8 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -26,6 +26,7 @@ headers-$(CONFIG_X86) +=3D compat/arch-x86/pmu.h headers-$(CONFIG_X86) +=3D compat/arch-x86/xen-mca.h headers-$(CONFIG_X86) +=3D compat/arch-x86/xen.h headers-$(CONFIG_X86) +=3D compat/arch-x86/xen-$(compat-arch-y).h +headers-$(CONFIG_X86) +=3D compat/hvm/hvm_vcpu.h headers-y +=3D compat/arch-$(compat-arch-y).h compat/pmu.h compat/xlat.h headers-$(FLASK_ENABLE) +=3D compat/xsm/flask_op.h diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index c825975..e8f7037 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -600,6 +600,9 @@ static inline void free_vcpu_guest_context(struct vcpu_guest_context *vgc) vfree(vgc); } +struct vcpu_hvm_context; +int arch_set_info_hvm_guest(struct vcpu *v, const struct vcpu_hvm_context *ctx); + #endif /* __ASM_DOMAIN_H__ */ /* diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index f80e143..b9d893d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -560,6 +560,11 @@ void altp2m_vcpu_update_vmfunc_ve(struct vcpu *v); /* emulates #VE */ bool_t altp2m_vcpu_emulate_ve(struct vcpu *v); +/* Check CR4/EFER values */ +const char *hvm_efer_valid(const struct vcpu *v, uint64_t value, + signed int cr0_pg); +unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, bool_t restore); + #endif /* __ASM_X86_HVM_HVM_H__ */ /* diff --git a/xen/include/public/hvm/hvm_vcpu.h b/xen/include/public/hvm/hvm_vcpu.h new file mode 100644 index 0000000..d21abf1 --- /dev/null +++ b/xen/include/public/hvm/hvm_vcpu.h @@ -0,0 +1,144 @@ +/* + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2015, Roger Pau Monne + */ + +#ifndef __XEN_PUBLIC_HVM_HVM_VCPU_H__ +#define __XEN_PUBLIC_HVM_HVM_VCPU_H__ + +#include "../xen.h" + +struct vcpu_hvm_x86_32 { + uint32_t eax; + uint32_t ecx; + uint32_t edx; + uint32_t ebx; + uint32_t esp; + uint32_t ebp; + uint32_t esi; + uint32_t edi; + uint32_t eip; + uint32_t eflags; + + uint32_t cr0; + uint32_t cr3; + uint32_t cr4; + + uint32_t pad1; + + /* + * EFER should only be used to set the NXE bit (if required) + * when starting a vCPU in 32bit mode with paging enabled or + * to set the LME/LMA bits in order to start the vCPU in + * compatibility mode. + */ + uint64_t efer; + + uint32_t cs_base; + uint32_t ds_base; + uint32_t ss_base; + uint32_t es_base; + uint32_t tr_base; + uint32_t cs_limit; + uint32_t ds_limit; + uint32_t ss_limit; + uint32_t es_limit; + uint32_t tr_limit; + uint16_t cs_ar; + uint16_t ds_ar; + uint16_t ss_ar; + uint16_t es_ar; + uint16_t tr_ar; + + uint16_t pad2[3]; +}; + +/* + * The layout of the _ar fields of the segment registers is the + * following: + * + * Bits [0,3]: type (bits 40-43). + * Bit 4: s (descriptor type, bit 44). + * Bit [5,6]: dpl (descriptor privilege level, bits 45-46). + * Bit 7: p (segment-present, bit 47). + * Bit 8: avl (available for system software, bit 52). + * Bit 9: l (64-bit code segment, bit 53). + * Bit 10: db (meaning depends on the segment, bit 54). + * Bit 11: g (granularity, bit 55) + * Bits [12,15]: unused, must be blank. + * + * A more complete description of the meaning of this fields can be + * obtained from the Intel SDM, Volume 3, section 3.4.5. + */ + +struct vcpu_hvm_x86_64 { + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rbx; + uint64_t rsp; + uint64_t rbp; + uint64_t rsi; + uint64_t rdi; + uint64_t rip; + uint64_t rflags; + + uint64_t cr0; + uint64_t cr3; + uint64_t cr4; + uint64_t efer; + + /* + * Using VCPU_HVM_MODE_64B implies that the vCPU is launched + * directly in long mode, so the cached parts of the segment + * registers get set to match that environment. + * + * If the user wants to launch the vCPU in compatibility mode + * the 32-bit structure should be used instead. + */ +}; + +struct vcpu_hvm_context { +#define VCPU_HVM_MODE_32B 0 /* 32bit fields of the structure will be used. */ +#define VCPU_HVM_MODE_64B 1 /* 64bit fields of the structure will be used. */ + uint32_t mode; + + uint32_t pad; + + /* CPU registers. */ + union { + struct vcpu_hvm_x86_32 x86_32; + struct vcpu_hvm_x86_64 x86_64; + } cpu_regs; +}; +typedef struct vcpu_hvm_context vcpu_hvm_context_t; +DEFINE_XEN_GUEST_HANDLE(vcpu_hvm_context_t); + +#endif /* __XEN_PUBLIC_HVM_HVM_VCPU_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/vcpu.h b/xen/include/public/vcpu.h index 898b89f..692b87a 100644 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -41,8 +41,10 @@ * Initialise a VCPU. Each VCPU can be initialised only once. A * newly-initialised VCPU will not run until it is brought up by VCPUOP_up. * - * @extra_arg =3D=3D pointer to vcpu_guest_context structure containing initial - * state for the VCPU. + * @extra_arg =3D=3D For PV or ARM guests this is a pointer to a vcpu_guest_context + * structure containing the initial state for the VCPU. For x86 + * HVM based guests this is a pointer to a vcpu_hvm_context + * structure. */ #define VCPUOP_initialise 0 diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 3dca3f6..a1a6f25 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -64,6 +64,9 @@ int arch_domain_soft_reset(struct domain *d); int arch_set_info_guest(struct vcpu *, vcpu_guest_context_u); void arch_get_info_guest(struct vcpu *, vcpu_guest_context_u); +int arch_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg); +int default_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg); + int domain_relinquish_resources(struct domain *d); void dump_pageframe_info(struct domain *d); diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 3795059..fda1137 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -56,6 +56,9 @@ =3F grant_entry_header grant_table.h =3F grant_entry_v2 grant_table.h =3F gnttab_swap_grant_ref grant_table.h +=3F vcpu_hvm_context hvm/hvm_vcpu.h +=3F vcpu_hvm_x86_32 hvm/hvm_vcpu.h +=3F vcpu_hvm_x86_64 hvm/hvm_vcpu.h =3F kexec_exec kexec.h ! kexec_image kexec.h ! kexec_range kexec.h -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5926567153380212660== 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 --===============5926567153380212660==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:34:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:34:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5S-0001q7-Ua; Thu, 17 Dec 2015 07:34:54 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5R-0001pn-EN for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:53 +0000 Content-Length: 28841 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 88/08-16870-C9562765; Thu, 17 Dec 2015 07:34:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1450337690!10966167!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18113 invoked from network); 17 Dec 2015 07:34:51 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:34:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5O-0005lV-E9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5O-0007l6-Ai for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:34:50 +0000 Date: Thu, 17 Dec 2015 07:34:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: allow HVM guests to use hypercalls to bring up vCPUs X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============5926567153380212660==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============5926567153380212660== Content-Length: 29256 Content-Transfer-Encoding: quoted-printable commit 192df6f9122ddebc21d0a632c10da3453aeee1c2 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:12:32 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:13:21 2015 +0100 x86: allow HVM guests to use hypercalls to bring up vCPUs Allow the usage of the VCPUOP_initialise, VCPUOP_up, VCPUOP_down, VCPUOP_is_up, VCPUOP_get_physid and VCPUOP_send_nmi hypercalls from HVM guests. This patch introduces a new structure (vcpu_hvm_context) that should be used in conjuction with the VCPUOP_initialise hypercall in order to initialize vCPUs for HVM guests. Signed-off-by: Roger Pau Monn=C3=A9 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/domain.c | 5 + xen/arch/x86/domain.c | 303 +++++++++++++++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 61 +------- xen/common/compat/domain.c | 50 +++++-- xen/common/domain.c | 41 +++-- xen/include/Makefile | 1 + xen/include/asm-x86/domain.h | 3 + xen/include/asm-x86/hvm/hvm.h | 5 + xen/include/public/hvm/hvm_vcpu.h | 144 ++++++++++++++++++ xen/include/public/vcpu.h | 6 +- xen/include/xen/domain.h | 3 + xen/include/xlat.lst | 3 + 12 files changed, 536 insertions(+), 89 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 860ac7d..3d274ae 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -756,6 +756,11 @@ int arch_set_info_guest( return 0; } +int arch_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + return default_initialise_vcpu(v, arg); +} + int arch_vcpu_reset(struct vcpu *v) { vcpu_end_shutdown_deferral(v); diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index df40dc6..2c3bb09 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -1188,6 +1189,308 @@ int arch_set_info_guest( #undef c } +static inline int check_segment(struct segment_register *reg, + enum x86_segment seg) +{ + + if ( reg->attr.fields.pad !=3D 0 ) + { + gprintk(XENLOG_ERR, "Segment attribute bits 12-15 are not zero\n"); + return -EINVAL; + } + + if ( reg->attr.bytes =3D=3D 0 ) + { + if ( seg !=3D x86_seg_ds && seg !=3D x86_seg_es ) + { + gprintk(XENLOG_ERR, "Null selector provided for CS, SS or TR\n"); + return -EINVAL; + } + return 0; + } + + if ( seg !=3D x86_seg_tr && !reg->attr.fields.s ) + { + gprintk(XENLOG_ERR, + "System segment provided for a code or data segment\n"); + return -EINVAL; + } + + if ( seg =3D=3D x86_seg_tr && reg->attr.fields.s ) + { + gprintk(XENLOG_ERR, "Code or data segment provided for TR\n"); + return -EINVAL; + } + + if ( !reg->attr.fields.p ) + { + gprintk(XENLOG_ERR, "Non-present segment provided\n"); + return -EINVAL; + } + + if ( seg =3D=3D x86_seg_cs && !(reg->attr.fields.type & 0x8) ) + { + gprintk(XENLOG_ERR, "Non-code segment provided for CS\n"); + return -EINVAL; + } + + if ( seg =3D=3D x86_seg_ss && + ((reg->attr.fields.type & 0x8) || !(reg->attr.fields.type & 0x2)) ) + { + gprintk(XENLOG_ERR, "Non-writeable segment provided for SS\n"); + return -EINVAL; + } + + if ( reg->attr.fields.s && seg !=3D x86_seg_ss && seg !=3D x86_seg_cs && + (reg->attr.fields.type & 0x8) && !(reg->attr.fields.type & 0x2) ) + { + gprintk(XENLOG_ERR, "Non-readable segment provided for DS or ES\n"); + return -EINVAL; + } + + return 0; +} + +/* Called by VCPUOP_initialise for HVM guests. */ +int arch_set_info_hvm_guest(struct vcpu *v, const vcpu_hvm_context_t *ctx) +{ + struct cpu_user_regs *uregs =3D &v->arch.user_regs; + struct segment_register cs, ds, ss, es, tr; + const char *errstr; + int rc; + + if ( ctx->pad !=3D 0 ) + return -EINVAL; + + switch ( ctx->mode ) + { + default: + return -EINVAL; + + case VCPU_HVM_MODE_32B: + { + const struct vcpu_hvm_x86_32 *regs =3D &ctx->cpu_regs.x86_32; + uint32_t limit; + + if ( ctx->cpu_regs.x86_32.pad1 !=3D 0 || + ctx->cpu_regs.x86_32.pad2[0] !=3D 0 || + ctx->cpu_regs.x86_32.pad2[1] !=3D 0 || + ctx->cpu_regs.x86_32.pad2[2] !=3D 0 ) + return -EINVAL; + +#define SEG(s, r) ({ \ + s =3D (struct segment_register){ .base =3D (r)->s ## _base, \ + .limit =3D (r)->s ## _limit, \ + .attr.bytes =3D (r)->s ## _ar }; \ + check_segment(&s, x86_seg_ ## s); }) + + rc =3D SEG(cs, regs); + rc |=3D SEG(ds, regs); + rc |=3D SEG(ss, regs); + rc |=3D SEG(es, regs); + rc |=3D SEG(tr, regs); +#undef SEG + + if ( rc !=3D 0 ) + return rc; + + /* Basic sanity checks. */ + limit =3D cs.limit; + if ( cs.attr.fields.g ) + limit =3D (limit << 12) | 0xfff; + if ( regs->eip > limit ) + { + gprintk(XENLOG_ERR, "EIP (%#08x) outside CS limit (%#08x)\n", + regs->eip, limit); + return -EINVAL; + } + + if ( ss.attr.fields.dpl !=3D cs.attr.fields.dpl ) + { + gprintk(XENLOG_ERR, "SS.DPL (%u) is different than CS.DPL (%u)\n", + ss.attr.fields.dpl, cs.attr.fields.dpl); + return -EINVAL; + } + + if ( ds.attr.fields.p && ds.attr.fields.dpl > cs.attr.fields.dpl ) + { + gprintk(XENLOG_ERR, "DS.DPL (%u) is greater than CS.DPL (%u)\n", + ds.attr.fields.dpl, cs.attr.fields.dpl); + return -EINVAL; + } + + if ( es.attr.fields.p && es.attr.fields.dpl > cs.attr.fields.dpl ) + { + gprintk(XENLOG_ERR, "ES.DPL (%u) is greater than CS.DPL (%u)\n", + es.attr.fields.dpl, cs.attr.fields.dpl); + return -EINVAL; + } + + if ( (regs->efer & EFER_LMA) && !(regs->efer & EFER_LME) ) + { + gprintk(XENLOG_ERR, "EFER.LMA set without EFER.LME (%#016lx)\n", + regs->efer); + return -EINVAL; + } + + uregs->rax =3D regs->eax; + uregs->rcx =3D regs->ecx; + uregs->rdx =3D regs->edx; + uregs->rbx =3D regs->ebx; + uregs->rsp =3D regs->esp; + uregs->rbp =3D regs->ebp; + uregs->rsi =3D regs->esi; + uregs->rdi =3D regs->edi; + uregs->rip =3D regs->eip; + uregs->rflags =3D regs->eflags; + + v->arch.hvm_vcpu.guest_cr[0] =3D regs->cr0; + v->arch.hvm_vcpu.guest_cr[3] =3D regs->cr3; + v->arch.hvm_vcpu.guest_cr[4] =3D regs->cr4; + v->arch.hvm_vcpu.guest_efer =3D regs->efer; + } + break; + + case VCPU_HVM_MODE_64B: + { + const struct vcpu_hvm_x86_64 *regs =3D &ctx->cpu_regs.x86_64; + + /* Basic sanity checks. */ + if ( !is_canonical_address(regs->rip) ) + { + gprintk(XENLOG_ERR, "RIP contains a non-canonical address (%#lx)\n", + regs->rip); + return -EINVAL; + } + + if ( !(regs->cr0 & X86_CR0_PG) ) + { + gprintk(XENLOG_ERR, "CR0 doesn't have paging enabled (%#016lx)\n", + regs->cr0); + return -EINVAL; + } + + if ( !(regs->cr4 & X86_CR4_PAE) ) + { + gprintk(XENLOG_ERR, "CR4 doesn't have PAE enabled (%#016lx)\n", + regs->cr4); + return -EINVAL; + } + + if ( !(regs->efer & EFER_LME) ) + { + gprintk(XENLOG_ERR, "EFER doesn't have LME enabled (%#016lx)\n", + regs->efer); + return -EINVAL; + } + + uregs->rax =3D regs->rax; + uregs->rcx =3D regs->rcx; + uregs->rdx =3D regs->rdx; + uregs->rbx =3D regs->rbx; + uregs->rsp =3D regs->rsp; + uregs->rbp =3D regs->rbp; + uregs->rsi =3D regs->rsi; + uregs->rdi =3D regs->rdi; + uregs->rip =3D regs->rip; + uregs->rflags =3D regs->rflags; + + v->arch.hvm_vcpu.guest_cr[0] =3D regs->cr0; + v->arch.hvm_vcpu.guest_cr[3] =3D regs->cr3; + v->arch.hvm_vcpu.guest_cr[4] =3D regs->cr4; + v->arch.hvm_vcpu.guest_efer =3D regs->efer; + +#define SEG(l, a) (struct segment_register){ .limit =3D (l), .attr.bytes =3D (a) } + cs =3D SEG(~0u, 0xa9b); /* 64bit code segment. */ + ds =3D ss =3D es =3D SEG(~0u, 0xc93); + tr =3D SEG(0x67, 0x8b); /* 64bit TSS (busy). */ +#undef SEG + } + break; + + } + + if ( v->arch.hvm_vcpu.guest_efer & EFER_LME ) + v->arch.hvm_vcpu.guest_efer |=3D EFER_LMA; + + if ( v->arch.hvm_vcpu.guest_cr[4] & hvm_cr4_guest_reserved_bits(v, 0) ) + { + gprintk(XENLOG_ERR, "Bad CR4 value: %#016lx\n", + v->arch.hvm_vcpu.guest_cr[4]); + return -EINVAL; + } + + errstr =3D hvm_efer_valid(v, v->arch.hvm_vcpu.guest_efer, -1); + if ( errstr ) + { + gprintk(XENLOG_ERR, "Bad EFER value (%#016lx): %s\n", + v->arch.hvm_vcpu.guest_efer, errstr); + return -EINVAL; + } + + hvm_update_guest_cr(v, 0); + hvm_update_guest_cr(v, 3); + hvm_update_guest_cr(v, 4); + hvm_update_guest_efer(v); + + if ( hvm_paging_enabled(v) && !paging_mode_hap(v->domain) ) + { + /* Shadow-mode CR3 change. Check PDBR and update refcounts. */ + struct page_info *page =3D get_page_from_gfn(v->domain, + v->arch.hvm_vcpu.guest_cr[3] >> PAGE_SHIFT, + NULL, P2M_ALLOC); + if ( !page ) + { + gprintk(XENLOG_ERR, "Invalid CR3: %#lx\n", + v->arch.hvm_vcpu.guest_cr[3]); + return -EINVAL; + } + + v->arch.guest_table =3D pagetable_from_page(page); + } + + hvm_set_segment_register(v, x86_seg_cs, &cs); + hvm_set_segment_register(v, x86_seg_ds, &ds); + hvm_set_segment_register(v, x86_seg_ss, &ss); + hvm_set_segment_register(v, x86_seg_es, &es); + hvm_set_segment_register(v, x86_seg_tr, &tr); + + /* Sync AP's TSC with BSP's. */ + v->arch.hvm_vcpu.cache_tsc_offset =3D + v->domain->vcpu[0]->arch.hvm_vcpu.cache_tsc_offset; + hvm_funcs.set_tsc_offset(v, v->arch.hvm_vcpu.cache_tsc_offset, + v->domain->arch.hvm_domain.sync_tsc); + + paging_update_paging_modes(v); + + v->is_initialised =3D 1; + set_bit(_VPF_down, &v->pause_flags); + + return 0; +} + +int arch_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + int rc; + + if ( is_hvm_vcpu(v) ) + { + struct domain *d =3D v->domain; + struct vcpu_hvm_context ctxt; + + if ( copy_from_guest(&ctxt, arg, 1) ) + return -EFAULT; + + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_hvm_guest(v, &ctxt); + domain_unlock(d); + } + else + rc =3D default_initialise_vcpu(v, arg); + + return rc; +} + int arch_vcpu_reset(struct vcpu *v) { if ( is_pv_vcpu(v) ) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 92d57ff..08cef1f 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1833,8 +1833,8 @@ static int hvm_save_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) } /* Return a string indicating the error, or NULL for valid. */ -static const char * hvm_efer_valid(const struct vcpu *v, uint64_t value, - signed int cr0_pg) +const char *hvm_efer_valid(const struct vcpu *v, uint64_t value, + signed int cr0_pg) { unsigned int ext1_ecx =3D 0, ext1_edx =3D 0; @@ -1902,8 +1902,7 @@ static const char * hvm_efer_valid(const struct vcpu *v, uint64_t value, X86_CR0_CD | X86_CR0_PG))) /* These bits in CR4 cannot be set by the guest. */ -static unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, - bool_t restore) +unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v,bool_t restore) { unsigned int leaf1_ecx =3D 0, leaf1_edx =3D 0; unsigned int leaf7_0_ebx =3D 0, leaf7_0_ecx =3D 0; @@ -5108,31 +5107,6 @@ static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) } } -static long hvm_vcpu_op( - int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) -{ - long rc; - - switch ( cmd ) - { - case VCPUOP_register_runstate_memory_area: - case VCPUOP_get_runstate_info: - case VCPUOP_set_periodic_timer: - case VCPUOP_stop_periodic_timer: - case VCPUOP_set_singleshot_timer: - case VCPUOP_stop_singleshot_timer: - case VCPUOP_register_vcpu_info: - case VCPUOP_register_vcpu_time_memory_area: - rc =3D do_vcpu_op(cmd, vcpuid, arg); - break; - default: - rc =3D -ENOSYS; - break; - } - - return rc; -} - typedef unsigned long hvm_hypercall_t( unsigned long, unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); @@ -5166,31 +5140,6 @@ static long hvm_memory_op_compat32(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return compat_memory_op(cmd, arg); } -static long hvm_vcpu_op_compat32( - int cmd, unsigned vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) -{ - long rc; - - switch ( cmd ) - { - case VCPUOP_register_runstate_memory_area: - case VCPUOP_get_runstate_info: - case VCPUOP_set_periodic_timer: - case VCPUOP_stop_periodic_timer: - case VCPUOP_set_singleshot_timer: - case VCPUOP_stop_singleshot_timer: - case VCPUOP_register_vcpu_info: - case VCPUOP_register_vcpu_time_memory_area: - rc =3D compat_vcpu_op(cmd, vcpuid, arg); - break; - default: - rc =3D -ENOSYS; - break; - } - - return rc; -} - static long hvm_physdev_op_compat32( int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { @@ -5212,7 +5161,7 @@ static long hvm_physdev_op_compat32( static hvm_hypercall_t *const hvm_hypercall64_table[NR_hypercalls] =3D { [ __HYPERVISOR_memory_op ] =3D (hvm_hypercall_t *)hvm_memory_op, [ __HYPERVISOR_grant_table_op ] =3D (hvm_hypercall_t *)hvm_grant_table_op, - [ __HYPERVISOR_vcpu_op ] =3D (hvm_hypercall_t *)hvm_vcpu_op, + HYPERCALL(vcpu_op), [ __HYPERVISOR_physdev_op ] =3D (hvm_hypercall_t *)hvm_physdev_op, HYPERCALL(xen_version), HYPERCALL(console_io), @@ -5233,7 +5182,7 @@ static hvm_hypercall_t *const hvm_hypercall64_table[NR_hypercalls] =3D { static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] =3D { [ __HYPERVISOR_memory_op ] =3D (hvm_hypercall_t *)hvm_memory_op_compat32, [ __HYPERVISOR_grant_table_op ] =3D (hvm_hypercall_t *)hvm_grant_table_op_compat32, - [ __HYPERVISOR_vcpu_op ] =3D (hvm_hypercall_t *)hvm_vcpu_op_compat32, + COMPAT_CALL(vcpu_op), [ __HYPERVISOR_physdev_op ] =3D (hvm_hypercall_t *)hvm_physdev_op_compat32, COMPAT_CALL(xen_version), HYPERCALL(console_io), diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c index c60d824..88bfdc8 100644 --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -11,6 +11,7 @@ asm(".file \"" __FILE__ "\""); #include #include #include +#include #define xen_vcpu_set_periodic_timer vcpu_set_periodic_timer CHECK_vcpu_set_periodic_timer; @@ -24,6 +25,14 @@ CHECK_SIZE_(struct, vcpu_info); CHECK_vcpu_register_vcpu_info; #undef xen_vcpu_register_vcpu_info +#define xen_vcpu_hvm_context vcpu_hvm_context +#define xen_vcpu_hvm_x86_32 vcpu_hvm_x86_32 +#define xen_vcpu_hvm_x86_64 vcpu_hvm_x86_64 +CHECK_vcpu_hvm_context; +#undef xen_vcpu_hvm_x86_64 +#undef xen_vcpu_hvm_x86_32 +#undef xen_vcpu_hvm_context + int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d =3D current->domain; @@ -37,33 +46,44 @@ int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) ar { case VCPUOP_initialise: { - struct compat_vcpu_guest_context *cmp_ctxt; - if ( v->vcpu_info =3D=3D &dummy_vcpu_info ) return -EINVAL; - if ( (cmp_ctxt =3D xmalloc(struct compat_vcpu_guest_context)) =3D=3D NULL ) + if ( is_hvm_vcpu(v) ) { - rc =3D -ENOMEM; - break; - } + struct vcpu_hvm_context ctxt; - if ( copy_from_guest(cmp_ctxt, arg, 1) ) - { - xfree(cmp_ctxt); - rc =3D -EFAULT; - break; + if ( copy_from_guest(&ctxt, arg, 1) ) + return -EFAULT; + + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_hvm_guest(v, &ctxt); + domain_unlock(d); } + else + { + struct compat_vcpu_guest_context *ctxt; + + if ( (ctxt =3D xmalloc(struct compat_vcpu_guest_context)) =3D=3D NULL ) + return -ENOMEM; + + if ( copy_from_guest(ctxt, arg, 1) ) + { + xfree(ctxt); + return -EFAULT; + } - domain_lock(d); - rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, cmp_ctxt); - domain_unlock(d); + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, ctxt); + domain_unlock(d); + + xfree(ctxt); + } if ( rc =3D=3D -ERESTART ) rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); - xfree(cmp_ctxt); break; } diff --git a/xen/common/domain.c b/xen/common/domain.c index f56b7ff..c4661d8 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -1208,11 +1208,34 @@ void unmap_vcpu_info(struct vcpu *v) put_page_and_type(mfn_to_page(mfn)); } +int default_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg) +{ + struct vcpu_guest_context *ctxt; + struct domain *d =3D v->domain; + int rc; + + if ( (ctxt =3D alloc_vcpu_guest_context()) =3D=3D NULL ) + return -ENOMEM; + + if ( copy_from_guest(ctxt, arg, 1) ) + { + free_vcpu_guest_context(ctxt); + return -EFAULT; + } + + domain_lock(d); + rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, ctxt); + domain_unlock(d); + + free_vcpu_guest_context(ctxt); + + return rc; +} + long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d =3D current->domain; struct vcpu *v; - struct vcpu_guest_context *ctxt; long rc =3D 0; if ( vcpuid >=3D d->max_vcpus || (v =3D d->vcpu[vcpuid]) =3D=3D NULL ) @@ -1224,21 +1247,7 @@ long do_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) if ( v->vcpu_info =3D=3D &dummy_vcpu_info ) return -EINVAL; - if ( (ctxt =3D alloc_vcpu_guest_context()) =3D=3D NULL ) - return -ENOMEM; - - if ( copy_from_guest(ctxt, arg, 1) ) - { - free_vcpu_guest_context(ctxt); - return -EFAULT; - } - - domain_lock(d); - rc =3D v->is_initialised =3F -EEXIST : arch_set_info_guest(v, ctxt); - domain_unlock(d); - - free_vcpu_guest_context(ctxt); - + rc =3D arch_initialise_vcpu(v, arg); if ( rc =3D=3D -ERESTART ) rc =3D hypercall_create_continuation(__HYPERVISOR_vcpu_op, "iuh", cmd, vcpuid, arg); diff --git a/xen/include/Makefile b/xen/include/Makefile index c674f7f..94ba3d8 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -26,6 +26,7 @@ headers-$(CONFIG_X86) +=3D compat/arch-x86/pmu.h headers-$(CONFIG_X86) +=3D compat/arch-x86/xen-mca.h headers-$(CONFIG_X86) +=3D compat/arch-x86/xen.h headers-$(CONFIG_X86) +=3D compat/arch-x86/xen-$(compat-arch-y).h +headers-$(CONFIG_X86) +=3D compat/hvm/hvm_vcpu.h headers-y +=3D compat/arch-$(compat-arch-y).h compat/pmu.h compat/xlat.h headers-$(FLASK_ENABLE) +=3D compat/xsm/flask_op.h diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index c825975..e8f7037 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -600,6 +600,9 @@ static inline void free_vcpu_guest_context(struct vcpu_guest_context *vgc) vfree(vgc); } +struct vcpu_hvm_context; +int arch_set_info_hvm_guest(struct vcpu *v, const struct vcpu_hvm_context *ctx); + #endif /* __ASM_DOMAIN_H__ */ /* diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index f80e143..b9d893d 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -560,6 +560,11 @@ void altp2m_vcpu_update_vmfunc_ve(struct vcpu *v); /* emulates #VE */ bool_t altp2m_vcpu_emulate_ve(struct vcpu *v); +/* Check CR4/EFER values */ +const char *hvm_efer_valid(const struct vcpu *v, uint64_t value, + signed int cr0_pg); +unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v, bool_t restore); + #endif /* __ASM_X86_HVM_HVM_H__ */ /* diff --git a/xen/include/public/hvm/hvm_vcpu.h b/xen/include/public/hvm/hvm_vcpu.h new file mode 100644 index 0000000..d21abf1 --- /dev/null +++ b/xen/include/public/hvm/hvm_vcpu.h @@ -0,0 +1,144 @@ +/* + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Copyright (c) 2015, Roger Pau Monne + */ + +#ifndef __XEN_PUBLIC_HVM_HVM_VCPU_H__ +#define __XEN_PUBLIC_HVM_HVM_VCPU_H__ + +#include "../xen.h" + +struct vcpu_hvm_x86_32 { + uint32_t eax; + uint32_t ecx; + uint32_t edx; + uint32_t ebx; + uint32_t esp; + uint32_t ebp; + uint32_t esi; + uint32_t edi; + uint32_t eip; + uint32_t eflags; + + uint32_t cr0; + uint32_t cr3; + uint32_t cr4; + + uint32_t pad1; + + /* + * EFER should only be used to set the NXE bit (if required) + * when starting a vCPU in 32bit mode with paging enabled or + * to set the LME/LMA bits in order to start the vCPU in + * compatibility mode. + */ + uint64_t efer; + + uint32_t cs_base; + uint32_t ds_base; + uint32_t ss_base; + uint32_t es_base; + uint32_t tr_base; + uint32_t cs_limit; + uint32_t ds_limit; + uint32_t ss_limit; + uint32_t es_limit; + uint32_t tr_limit; + uint16_t cs_ar; + uint16_t ds_ar; + uint16_t ss_ar; + uint16_t es_ar; + uint16_t tr_ar; + + uint16_t pad2[3]; +}; + +/* + * The layout of the _ar fields of the segment registers is the + * following: + * + * Bits [0,3]: type (bits 40-43). + * Bit 4: s (descriptor type, bit 44). + * Bit [5,6]: dpl (descriptor privilege level, bits 45-46). + * Bit 7: p (segment-present, bit 47). + * Bit 8: avl (available for system software, bit 52). + * Bit 9: l (64-bit code segment, bit 53). + * Bit 10: db (meaning depends on the segment, bit 54). + * Bit 11: g (granularity, bit 55) + * Bits [12,15]: unused, must be blank. + * + * A more complete description of the meaning of this fields can be + * obtained from the Intel SDM, Volume 3, section 3.4.5. + */ + +struct vcpu_hvm_x86_64 { + uint64_t rax; + uint64_t rcx; + uint64_t rdx; + uint64_t rbx; + uint64_t rsp; + uint64_t rbp; + uint64_t rsi; + uint64_t rdi; + uint64_t rip; + uint64_t rflags; + + uint64_t cr0; + uint64_t cr3; + uint64_t cr4; + uint64_t efer; + + /* + * Using VCPU_HVM_MODE_64B implies that the vCPU is launched + * directly in long mode, so the cached parts of the segment + * registers get set to match that environment. + * + * If the user wants to launch the vCPU in compatibility mode + * the 32-bit structure should be used instead. + */ +}; + +struct vcpu_hvm_context { +#define VCPU_HVM_MODE_32B 0 /* 32bit fields of the structure will be used. */ +#define VCPU_HVM_MODE_64B 1 /* 64bit fields of the structure will be used. */ + uint32_t mode; + + uint32_t pad; + + /* CPU registers. */ + union { + struct vcpu_hvm_x86_32 x86_32; + struct vcpu_hvm_x86_64 x86_64; + } cpu_regs; +}; +typedef struct vcpu_hvm_context vcpu_hvm_context_t; +DEFINE_XEN_GUEST_HANDLE(vcpu_hvm_context_t); + +#endif /* __XEN_PUBLIC_HVM_HVM_VCPU_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/xen/include/public/vcpu.h b/xen/include/public/vcpu.h index 898b89f..692b87a 100644 --- a/xen/include/public/vcpu.h +++ b/xen/include/public/vcpu.h @@ -41,8 +41,10 @@ * Initialise a VCPU. Each VCPU can be initialised only once. A * newly-initialised VCPU will not run until it is brought up by VCPUOP_up. * - * @extra_arg =3D=3D pointer to vcpu_guest_context structure containing initial - * state for the VCPU. + * @extra_arg =3D=3D For PV or ARM guests this is a pointer to a vcpu_guest_context + * structure containing the initial state for the VCPU. For x86 + * HVM based guests this is a pointer to a vcpu_hvm_context + * structure. */ #define VCPUOP_initialise 0 diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 3dca3f6..a1a6f25 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -64,6 +64,9 @@ int arch_domain_soft_reset(struct domain *d); int arch_set_info_guest(struct vcpu *, vcpu_guest_context_u); void arch_get_info_guest(struct vcpu *, vcpu_guest_context_u); +int arch_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg); +int default_initialise_vcpu(struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg); + int domain_relinquish_resources(struct domain *d); void dump_pageframe_info(struct domain *d); diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 3795059..fda1137 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -56,6 +56,9 @@ =3F grant_entry_header grant_table.h =3F grant_entry_v2 grant_table.h =3F gnttab_swap_grant_ref grant_table.h +=3F vcpu_hvm_context hvm/hvm_vcpu.h +=3F vcpu_hvm_x86_32 hvm/hvm_vcpu.h +=3F vcpu_hvm_x86_64 hvm/hvm_vcpu.h =3F kexec_exec kexec.h ! kexec_image kexec.h ! kexec_range kexec.h -- generated by git-patchbot for /home/xen/git/xen.git#master --===============5926567153380212660== 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 --===============5926567153380212660==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5d-0001rx-4O; Thu, 17 Dec 2015 07:35:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5b-0001rc-BO for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:03 +0000 Content-Length: 6007 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id EC/01-28221-6A562765; Thu, 17 Dec 2015 07:35:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1450337700!11583042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51980 invoked from network); 17 Dec 2015 07:35:01 -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; 17 Dec 2015 07:35:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5Y-0005lg-QQ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5Y-0007mN-Ny for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:00 +0000 Date: Thu, 17 Dec 2015 07:35:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/xen: introduce a start info structure for HVMlite guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0394151163797728438==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0394151163797728438== Content-Length: 5698 Content-Transfer-Encoding: quoted-printable commit e703e60064ea55ac900d2e6d68eecd950b20af23 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:14:17 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:14:17 2015 +0100 libxc/xen: introduce a start info structure for HVMlite guests This structure contains the physical address of the command line, as well as the physical address of the list of loaded modules. The physical address of this structure is passed to the guest at boot time in the %ebx register. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Jan Beulich --- tools/libxc/xc_dom_x86.c | 68 +++++++++++++++++++++++++++++++++++++++++++++- xen/include/public/xen.h | 23 +++++++++++++++ 2 files changed, 90 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 1d4ad3e..d058949 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -633,7 +633,70 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) xc_hvm_param_set(xch, domid, HVM_PARAM_SHARING_RING_PFN, special_pfn(SPECIALPAGE_SHARING)); - if ( dom->device_model ) + if ( !dom->device_model ) + { + struct xc_dom_seg seg; + struct hvm_start_info *start_info; + char *cmdline; + struct hvm_modlist_entry *modlist; + void *start_page; + size_t cmdline_size =3D 0; + size_t start_info_size =3D sizeof(*start_info); + + if ( dom->cmdline ) + { + cmdline_size =3D ROUNDUP(strlen(dom->cmdline) + 1, 8); + start_info_size +=3D cmdline_size; + + } + if ( dom->ramdisk_blob ) + start_info_size +=3D sizeof(*modlist); /* Limited to one module. */ + + rc =3D xc_dom_alloc_segment(dom, &seg, "HVMlite start info", 0, + start_info_size); + if ( rc !=3D 0 ) + { + DOMPRINTF("Unable to reserve memory for the start info"); + goto out; + } + + start_page =3D xc_map_foreign_range(xch, domid, start_info_size, + PROT_READ | PROT_WRITE, + seg.pfn); + if ( start_page =3D=3D NULL ) + { + DOMPRINTF("Unable to map HVM start info page"); + goto error_out; + } + + start_info =3D start_page; + cmdline =3D start_page + sizeof(*start_info); + modlist =3D start_page + sizeof(*start_info) + cmdline_size; + + if ( dom->cmdline ) + { + strncpy(cmdline, dom->cmdline, MAX_GUEST_CMDLINE); + cmdline[MAX_GUEST_CMDLINE - 1] =3D '\0'; + start_info->cmdline_paddr =3D (seg.pfn << PAGE_SHIFT) + + ((uintptr_t)cmdline - (uintptr_t)start_info); + } + + if ( dom->ramdisk_blob ) + { + modlist[0].paddr =3D dom->ramdisk_seg.vstart - dom->parms.virt_base; + modlist[0].size =3D dom->ramdisk_seg.vend - dom->ramdisk_seg.vstart; + start_info->modlist_paddr =3D (seg.pfn << PAGE_SHIFT) + + ((uintptr_t)modlist - (uintptr_t)start_info); + start_info->nr_modules =3D 1; + } + + start_info->magic =3D HVM_START_MAGIC_VALUE; + + munmap(start_page, start_info_size); + + dom->start_info_pfn =3D seg.pfn; + } + else { /* * Allocate and clear additional ioreq server pages. The default @@ -1032,6 +1095,9 @@ static int vcpu_hvm(struct xc_dom_image *dom) /* Set the IP. */ bsp_ctx.cpu.rip =3D dom->parms.phys_entry; + if ( dom->start_info_pfn ) + bsp_ctx.cpu.rbx =3D dom->start_info_pfn << PAGE_SHIFT; + /* Set the end descriptor. */ bsp_ctx.end_d.typecode =3D HVM_SAVE_CODE(END); bsp_ctx.end_d.instance =3D 0; diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index ff5547e..7b629b1 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -784,6 +784,29 @@ struct start_info { }; typedef struct start_info start_info_t; +/* + * Start of day structure passed to PVH guests in %ebx. + * + * NOTE: nothing will be loaded at physical address 0, so + * a 0 value in any of the address fields should be treated + * as not present. + */ +struct hvm_start_info { +#define HVM_START_MAGIC_VALUE 0x336ec578 + uint32_t magic; /* Contains the magic value 0x336ec578 */ + /* ("xEn3" with the 0x80 bit of the "E" set).*/ + uint32_t flags; /* SIF_xxx flags. */ + uint32_t cmdline_paddr; /* Physical address of the command line. */ + uint32_t nr_modules; /* Number of modules passed to the kernel. */ + uint32_t modlist_paddr; /* Physical address of an array of */ + /* hvm_modlist_entry. */ +}; + +struct hvm_modlist_entry { + uint32_t paddr; /* Physical address of the module. */ + uint32_t size; /* Size of the module in bytes. */ +}; + /* New console union for dom0 introduced in 0x00030203. */ #if __XEN_INTERFACE_VERSION__ < 0x00030203 #define console_mfn console.domU.mfn -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0394151163797728438== 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 --===============0394151163797728438==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:05 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5d-0001rx-4O; Thu, 17 Dec 2015 07:35:05 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5b-0001rc-BO for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:03 +0000 Content-Length: 6007 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id EC/01-28221-6A562765; Thu, 17 Dec 2015 07:35:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1450337700!11583042!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51980 invoked from network); 17 Dec 2015 07:35:01 -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; 17 Dec 2015 07:35:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5Y-0005lg-QQ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5Y-0007mN-Ny for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:00 +0000 Date: Thu, 17 Dec 2015 07:35:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc/xen: introduce a start info structure for HVMlite guests X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0394151163797728438==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0394151163797728438== Content-Length: 5698 Content-Transfer-Encoding: quoted-printable commit e703e60064ea55ac900d2e6d68eecd950b20af23 Author: Roger Pau Monn=C3=A9 AuthorDate: Tue Dec 15 14:14:17 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:14:17 2015 +0100 libxc/xen: introduce a start info structure for HVMlite guests This structure contains the physical address of the command line, as well as the physical address of the list of loaded modules. The physical address of this structure is passed to the guest at boot time in the %ebx register. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Wei Liu Acked-by: Jan Beulich --- tools/libxc/xc_dom_x86.c | 68 +++++++++++++++++++++++++++++++++++++++++++++- xen/include/public/xen.h | 23 +++++++++++++++ 2 files changed, 90 insertions(+), 1 deletions(-) diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index 1d4ad3e..d058949 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -633,7 +633,70 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) xc_hvm_param_set(xch, domid, HVM_PARAM_SHARING_RING_PFN, special_pfn(SPECIALPAGE_SHARING)); - if ( dom->device_model ) + if ( !dom->device_model ) + { + struct xc_dom_seg seg; + struct hvm_start_info *start_info; + char *cmdline; + struct hvm_modlist_entry *modlist; + void *start_page; + size_t cmdline_size =3D 0; + size_t start_info_size =3D sizeof(*start_info); + + if ( dom->cmdline ) + { + cmdline_size =3D ROUNDUP(strlen(dom->cmdline) + 1, 8); + start_info_size +=3D cmdline_size; + + } + if ( dom->ramdisk_blob ) + start_info_size +=3D sizeof(*modlist); /* Limited to one module. */ + + rc =3D xc_dom_alloc_segment(dom, &seg, "HVMlite start info", 0, + start_info_size); + if ( rc !=3D 0 ) + { + DOMPRINTF("Unable to reserve memory for the start info"); + goto out; + } + + start_page =3D xc_map_foreign_range(xch, domid, start_info_size, + PROT_READ | PROT_WRITE, + seg.pfn); + if ( start_page =3D=3D NULL ) + { + DOMPRINTF("Unable to map HVM start info page"); + goto error_out; + } + + start_info =3D start_page; + cmdline =3D start_page + sizeof(*start_info); + modlist =3D start_page + sizeof(*start_info) + cmdline_size; + + if ( dom->cmdline ) + { + strncpy(cmdline, dom->cmdline, MAX_GUEST_CMDLINE); + cmdline[MAX_GUEST_CMDLINE - 1] =3D '\0'; + start_info->cmdline_paddr =3D (seg.pfn << PAGE_SHIFT) + + ((uintptr_t)cmdline - (uintptr_t)start_info); + } + + if ( dom->ramdisk_blob ) + { + modlist[0].paddr =3D dom->ramdisk_seg.vstart - dom->parms.virt_base; + modlist[0].size =3D dom->ramdisk_seg.vend - dom->ramdisk_seg.vstart; + start_info->modlist_paddr =3D (seg.pfn << PAGE_SHIFT) + + ((uintptr_t)modlist - (uintptr_t)start_info); + start_info->nr_modules =3D 1; + } + + start_info->magic =3D HVM_START_MAGIC_VALUE; + + munmap(start_page, start_info_size); + + dom->start_info_pfn =3D seg.pfn; + } + else { /* * Allocate and clear additional ioreq server pages. The default @@ -1032,6 +1095,9 @@ static int vcpu_hvm(struct xc_dom_image *dom) /* Set the IP. */ bsp_ctx.cpu.rip =3D dom->parms.phys_entry; + if ( dom->start_info_pfn ) + bsp_ctx.cpu.rbx =3D dom->start_info_pfn << PAGE_SHIFT; + /* Set the end descriptor. */ bsp_ctx.end_d.typecode =3D HVM_SAVE_CODE(END); bsp_ctx.end_d.instance =3D 0; diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index ff5547e..7b629b1 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -784,6 +784,29 @@ struct start_info { }; typedef struct start_info start_info_t; +/* + * Start of day structure passed to PVH guests in %ebx. + * + * NOTE: nothing will be loaded at physical address 0, so + * a 0 value in any of the address fields should be treated + * as not present. + */ +struct hvm_start_info { +#define HVM_START_MAGIC_VALUE 0x336ec578 + uint32_t magic; /* Contains the magic value 0x336ec578 */ + /* ("xEn3" with the 0x80 bit of the "E" set).*/ + uint32_t flags; /* SIF_xxx flags. */ + uint32_t cmdline_paddr; /* Physical address of the command line. */ + uint32_t nr_modules; /* Number of modules passed to the kernel. */ + uint32_t modlist_paddr; /* Physical address of an array of */ + /* hvm_modlist_entry. */ +}; + +struct hvm_modlist_entry { + uint32_t paddr; /* Physical address of the module. */ + uint32_t size; /* Size of the module in bytes. */ +}; + /* New console union for dom0 introduced in 0x00030203. */ #if __XEN_INTERFACE_VERSION__ < 0x00030203 #define console_mfn console.domU.mfn -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0394151163797728438== 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 --===============0394151163797728438==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35: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 1a9T5n-0001uM-Aj; Thu, 17 Dec 2015 07:35:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5l-0001u1-Hw for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:13 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 29/C1-01748-0B562765; Thu, 17 Dec 2015 07:35:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1450337711!11232275!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2864 invoked from network); 17 Dec 2015 07:35:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:12 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5j-0005mH-70 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5j-0007nG-3b for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:11 +0000 Date: Thu, 17 Dec 2015 07:35:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public/hvm: export the HVM_PARAM_CALLBACK_VIA ABI in the API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca5c54b6ff054512d9529af8db7b1d0bf89a5d20 Author: Andrew Cooper AuthorDate: Tue Dec 15 14:15:03 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:15:03 2015 +0100 public/hvm: export the HVM_PARAM_CALLBACK_VIA ABI in the API Signed-off-by: Andrew Cooper --- xen/include/public/hvm/params.h | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index b437444..81f9451 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -29,18 +29,31 @@ * Parameter space for HVMOP_{set,get}_param. */ +#define HVM_PARAM_CALLBACK_IRQ 0 /* * How should CPU0 event-channel notifications be delivered? - * val[63:56] == 0: val[55:0] is a delivery GSI (Global System Interrupt). - * val[63:56] == 1: val[55:0] is a delivery PCI INTx line, as follows: - * Domain = val[47:32], Bus = val[31:16], - * DevFn = val[15: 8], IntX = val[ 1: 0] - * val[63:56] == 2: val[7:0] is a vector number, check for - * XENFEAT_hvm_callback_vector to know if this delivery - * method is available. + * * If val == 0 then CPU0 event-channel notifications are not delivered. + * If val != 0, val[63:56] encodes the type, as follows: + */ + +#define HVM_PARAM_CALLBACK_TYPE_GSI 0 +/* + * val[55:0] is a delivery GSI. GSI 0 cannot be used, as it aliases val == 0, + * and disables all notifications. + */ + +#define HVM_PARAM_CALLBACK_TYPE_PCI_INTX 1 +/* + * val[55:0] is a delivery PCI INTx line: + * Domain = val[47:32], Bus = val[31:16] DevFn = val[15:8], IntX = val[1:0] + */ + +#define HVM_PARAM_CALLBACK_TYPE_VECTOR 2 +/* + * val[7:0] is a vector number. Check for XENFEAT_hvm_callback_vector to know + * if this delivery method is available. */ -#define HVM_PARAM_CALLBACK_IRQ 0 /* * These are not used by Xen. They are here for convenience of HVM-guest -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35: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 1a9T5n-0001uM-Aj; Thu, 17 Dec 2015 07:35:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5l-0001u1-Hw for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:13 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 29/C1-01748-0B562765; Thu, 17 Dec 2015 07:35:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1450337711!11232275!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 2864 invoked from network); 17 Dec 2015 07:35:12 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:12 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5j-0005mH-70 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5j-0007nG-3b for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:11 +0000 Date: Thu, 17 Dec 2015 07:35:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] public/hvm: export the HVM_PARAM_CALLBACK_VIA ABI in the API X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ca5c54b6ff054512d9529af8db7b1d0bf89a5d20 Author: Andrew Cooper AuthorDate: Tue Dec 15 14:15:03 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:15:03 2015 +0100 public/hvm: export the HVM_PARAM_CALLBACK_VIA ABI in the API Signed-off-by: Andrew Cooper --- xen/include/public/hvm/params.h | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/xen/include/public/hvm/params.h b/xen/include/public/hvm/params.h index b437444..81f9451 100644 --- a/xen/include/public/hvm/params.h +++ b/xen/include/public/hvm/params.h @@ -29,18 +29,31 @@ * Parameter space for HVMOP_{set,get}_param. */ +#define HVM_PARAM_CALLBACK_IRQ 0 /* * How should CPU0 event-channel notifications be delivered? - * val[63:56] == 0: val[55:0] is a delivery GSI (Global System Interrupt). - * val[63:56] == 1: val[55:0] is a delivery PCI INTx line, as follows: - * Domain = val[47:32], Bus = val[31:16], - * DevFn = val[15: 8], IntX = val[ 1: 0] - * val[63:56] == 2: val[7:0] is a vector number, check for - * XENFEAT_hvm_callback_vector to know if this delivery - * method is available. + * * If val == 0 then CPU0 event-channel notifications are not delivered. + * If val != 0, val[63:56] encodes the type, as follows: + */ + +#define HVM_PARAM_CALLBACK_TYPE_GSI 0 +/* + * val[55:0] is a delivery GSI. GSI 0 cannot be used, as it aliases val == 0, + * and disables all notifications. + */ + +#define HVM_PARAM_CALLBACK_TYPE_PCI_INTX 1 +/* + * val[55:0] is a delivery PCI INTx line: + * Domain = val[47:32], Bus = val[31:16] DevFn = val[15:8], IntX = val[1:0] + */ + +#define HVM_PARAM_CALLBACK_TYPE_VECTOR 2 +/* + * val[7:0] is a vector number. Check for XENFEAT_hvm_callback_vector to know + * if this delivery method is available. */ -#define HVM_PARAM_CALLBACK_IRQ 0 /* * These are not used by Xen. They are here for convenience of HVM-guest -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5y-0001wd-Fo; Thu, 17 Dec 2015 07:35:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5w-0001wH-90 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:24 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 06/01-09570-BB562765; Thu, 17 Dec 2015 07:35:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450337721!10716562!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56931 invoked from network); 17 Dec 2015 07:35:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:22 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5t-0005mP-Hu for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5t-0007np-DJ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:21 +0000 Date: Thu, 17 Dec 2015 07:35:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: generate labels at the beginning of unlikely sub-sections X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4ae1c999171bceb0649956047f814e1996391a4 Author: Jan Beulich AuthorDate: Tue Dec 15 14:15:43 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:15:43 2015 +0100 x86: generate labels at the beginning of unlikely sub-sections This is to limit symbol table growth, which would be quite a bit worse if we went with the "label every unlikely sub-section contribution" approach proposed previously. Older gas doesn't support quoted symbols, yet the result looks quite bit better that way. Hence two variants get introduced, one using proper path names (including slashes and dashes) and one using path names after converting them to valid symbol names (slashes and dashes replaced). As a secondary adjustment also change the section name used with Clang. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/Rules.mk | 4 ++++ xen/include/asm-x86/asm_defns.h | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 5b8eaed..637d252 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -20,6 +20,7 @@ xenoprof := y CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default +CFLAGS += '-D__OBJECT_LABEL__=$(subst /,$$,$(subst -,_,$(subst $(BASEDIR)/,,$(CURDIR))/$@))' # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float @@ -29,6 +30,9 @@ $(call cc-option-add,CFLAGS,CC,-Wnested-externs) $(call as-insn-check,CFLAGS,CC,"vmcall",-DHAVE_GAS_VMX) $(call as-insn-check,CFLAGS,CC,"invept (%rax)$$(comma)%rax",-DHAVE_GAS_EPT) $(call as-insn-check,CFLAGS,CC,"rdfsbase %rax",-DHAVE_GAS_FSGSBASE) +$(call as-insn-check,CFLAGS,CC,".equ \"x\"$$(comma)1", \ + -U__OBJECT_LABEL__ -DHAVE_GAS_QUOTED_SYM \ + '-D__OBJECT_LABEL__=$(subst $(BASEDIR)/,,$(CURDIR))/$$@') x86 := y x86_32 := n diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 95ea21d..7cf4408 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -93,10 +93,24 @@ void ret_from_intr(void); #ifdef __ASSEMBLY__ +#ifdef HAVE_GAS_QUOTED_SYM +#define SUBSECTION_LBL(tag) \ + .ifndef .L.tag; \ + .equ .L.tag, 1; \ + .equ __stringify(__OBJECT_LABEL__.tag), .; \ + .endif +#else +#define SUBSECTION_LBL(tag) \ + .ifndef __OBJECT_LABEL__.tag; \ + __OBJECT_LABEL__.tag:; \ + .endif +#endif + #define UNLIKELY_START(cond, tag) \ .Ldispatch.tag: \ j##cond .Lunlikely.tag; \ .subsection 1; \ + SUBSECTION_LBL(unlikely); \ .Lunlikely.tag: #define UNLIKELY_DISPATCH_LABEL(tag) \ @@ -141,9 +155,22 @@ void ret_from_intr(void); #else +#ifdef HAVE_GAS_QUOTED_SYM +#define SUBSECTION_LBL(tag) \ + ".ifndef .L." #tag "\n\t" \ + ".equ .L." #tag ", 1\n\t" \ + ".equ \"" __stringify(__OBJECT_LABEL__) "." #tag "\", .\n\t" \ + ".endif" +#else +#define SUBSECTION_LBL(tag) \ + ".ifndef " __stringify(__OBJECT_LABEL__) "." #tag "\n\t" \ + __stringify(__OBJECT_LABEL__) "." #tag ":\n\t" \ + ".endif" +#endif + #ifdef __clang__ /* clang's builtin assember can't do .subsection */ -#define UNLIKELY_START_SECTION ".pushsection .fixup,\"ax\"" +#define UNLIKELY_START_SECTION ".pushsection .text.unlikely,\"ax\"" #define UNLIKELY_END_SECTION ".popsection" #else @@ -155,7 +182,8 @@ void ret_from_intr(void); #define UNLIKELY_START(cond, tag) \ "j" #cond " .Lunlikely%=.tag;\n\t" \ - UNLIKELY_START_SECTION "\n" \ + UNLIKELY_START_SECTION "\n\t" \ + SUBSECTION_LBL(unlikely) "\n" \ ".Lunlikely%=.tag:" #define UNLIKELY_END(tag) \ -- generated by git-patchbot for /home/xen/git/xen.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 17 07:35:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5y-0001wd-Fo; Thu, 17 Dec 2015 07:35:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5w-0001wH-90 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:24 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 06/01-09570-BB562765; Thu, 17 Dec 2015 07:35:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450337721!10716562!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 56931 invoked from network); 17 Dec 2015 07:35:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:22 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T5t-0005mP-Hu for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T5t-0007np-DJ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:21 +0000 Date: Thu, 17 Dec 2015 07:35:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: generate labels at the beginning of unlikely sub-sections X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d4ae1c999171bceb0649956047f814e1996391a4 Author: Jan Beulich AuthorDate: Tue Dec 15 14:15:43 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:15:43 2015 +0100 x86: generate labels at the beginning of unlikely sub-sections This is to limit symbol table growth, which would be quite a bit worse if we went with the "label every unlikely sub-section contribution" approach proposed previously. Older gas doesn't support quoted symbols, yet the result looks quite bit better that way. Hence two variants get introduced, one using proper path names (including slashes and dashes) and one using path names after converting them to valid symbol names (slashes and dashes replaced). As a secondary adjustment also change the section name used with Clang. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/Rules.mk | 4 ++++ xen/include/asm-x86/asm_defns.h | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 5b8eaed..637d252 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -20,6 +20,7 @@ xenoprof := y CFLAGS += -I$(BASEDIR)/include CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default +CFLAGS += '-D__OBJECT_LABEL__=$(subst /,$$,$(subst -,_,$(subst $(BASEDIR)/,,$(CURDIR))/$@))' # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float @@ -29,6 +30,9 @@ $(call cc-option-add,CFLAGS,CC,-Wnested-externs) $(call as-insn-check,CFLAGS,CC,"vmcall",-DHAVE_GAS_VMX) $(call as-insn-check,CFLAGS,CC,"invept (%rax)$$(comma)%rax",-DHAVE_GAS_EPT) $(call as-insn-check,CFLAGS,CC,"rdfsbase %rax",-DHAVE_GAS_FSGSBASE) +$(call as-insn-check,CFLAGS,CC,".equ \"x\"$$(comma)1", \ + -U__OBJECT_LABEL__ -DHAVE_GAS_QUOTED_SYM \ + '-D__OBJECT_LABEL__=$(subst $(BASEDIR)/,,$(CURDIR))/$$@') x86 := y x86_32 := n diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 95ea21d..7cf4408 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -93,10 +93,24 @@ void ret_from_intr(void); #ifdef __ASSEMBLY__ +#ifdef HAVE_GAS_QUOTED_SYM +#define SUBSECTION_LBL(tag) \ + .ifndef .L.tag; \ + .equ .L.tag, 1; \ + .equ __stringify(__OBJECT_LABEL__.tag), .; \ + .endif +#else +#define SUBSECTION_LBL(tag) \ + .ifndef __OBJECT_LABEL__.tag; \ + __OBJECT_LABEL__.tag:; \ + .endif +#endif + #define UNLIKELY_START(cond, tag) \ .Ldispatch.tag: \ j##cond .Lunlikely.tag; \ .subsection 1; \ + SUBSECTION_LBL(unlikely); \ .Lunlikely.tag: #define UNLIKELY_DISPATCH_LABEL(tag) \ @@ -141,9 +155,22 @@ void ret_from_intr(void); #else +#ifdef HAVE_GAS_QUOTED_SYM +#define SUBSECTION_LBL(tag) \ + ".ifndef .L." #tag "\n\t" \ + ".equ .L." #tag ", 1\n\t" \ + ".equ \"" __stringify(__OBJECT_LABEL__) "." #tag "\", .\n\t" \ + ".endif" +#else +#define SUBSECTION_LBL(tag) \ + ".ifndef " __stringify(__OBJECT_LABEL__) "." #tag "\n\t" \ + __stringify(__OBJECT_LABEL__) "." #tag ":\n\t" \ + ".endif" +#endif + #ifdef __clang__ /* clang's builtin assember can't do .subsection */ -#define UNLIKELY_START_SECTION ".pushsection .fixup,\"ax\"" +#define UNLIKELY_START_SECTION ".pushsection .text.unlikely,\"ax\"" #define UNLIKELY_END_SECTION ".popsection" #else @@ -155,7 +182,8 @@ void ret_from_intr(void); #define UNLIKELY_START(cond, tag) \ "j" #cond " .Lunlikely%=.tag;\n\t" \ - UNLIKELY_START_SECTION "\n" \ + UNLIKELY_START_SECTION "\n\t" \ + SUBSECTION_LBL(unlikely) "\n" \ ".Lunlikely%=.tag:" #define UNLIKELY_END(tag) \ -- generated by git-patchbot for /home/xen/git/xen.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 17 07:35:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T66-0001yP-LT; Thu, 17 Dec 2015 07:35:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T66-0001yH-7C for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:34 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id BE/EE-23747-5C562765; Thu, 17 Dec 2015 07:35:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450337732!3765583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49511 invoked from network); 17 Dec 2015 07:35:32 -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; 17 Dec 2015 07:35:32 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T63-0005mX-Rf for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T63-0007oL-OR for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:31 +0000 Date: Thu, 17 Dec 2015 07:35:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: use tag in C UNLIKELY blocks, rather than a literal ".tag" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e904233f39534d6a20ad11bbcefda6fe3486fd23 Author: Andrew Cooper AuthorDate: Tue Dec 15 14:16:09 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:16:09 2015 +0100 x86: use tag in C UNLIKELY blocks, rather than a literal ".tag" Signed-off-by: Andrew Cooper --- xen/include/asm-x86/asm_defns.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 7cf4408..b5f79d8 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -180,16 +180,16 @@ void ret_from_intr(void); #endif -#define UNLIKELY_START(cond, tag) \ - "j" #cond " .Lunlikely%=.tag;\n\t" \ - UNLIKELY_START_SECTION "\n\t" \ - SUBSECTION_LBL(unlikely) "\n" \ - ".Lunlikely%=.tag:" +#define UNLIKELY_START(cond, tag) \ + "j" #cond " .Lunlikely." #tag ".%=;\n\t" \ + UNLIKELY_START_SECTION "\n\t" \ + SUBSECTION_LBL(unlikely) "\n" \ + ".Lunlikely." #tag ".%=:" #define UNLIKELY_END(tag) \ - "jmp .Llikely%=.tag;\n\t" \ + "jmp .Llikely." #tag ".%=;\n\t" \ UNLIKELY_END_SECTION "\n" \ - ".Llikely%=.tag:" + ".Llikely." #tag ".%=:" #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T66-0001yP-LT; Thu, 17 Dec 2015 07:35:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T66-0001yH-7C for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:34 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id BE/EE-23747-5C562765; Thu, 17 Dec 2015 07:35:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450337732!3765583!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49511 invoked from network); 17 Dec 2015 07:35:32 -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; 17 Dec 2015 07:35:32 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T63-0005mX-Rf for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T63-0007oL-OR for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:31 +0000 Date: Thu, 17 Dec 2015 07:35:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: use tag in C UNLIKELY blocks, rather than a literal ".tag" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e904233f39534d6a20ad11bbcefda6fe3486fd23 Author: Andrew Cooper AuthorDate: Tue Dec 15 14:16:09 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:16:09 2015 +0100 x86: use tag in C UNLIKELY blocks, rather than a literal ".tag" Signed-off-by: Andrew Cooper --- xen/include/asm-x86/asm_defns.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h index 7cf4408..b5f79d8 100644 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@ -180,16 +180,16 @@ void ret_from_intr(void); #endif -#define UNLIKELY_START(cond, tag) \ - "j" #cond " .Lunlikely%=.tag;\n\t" \ - UNLIKELY_START_SECTION "\n\t" \ - SUBSECTION_LBL(unlikely) "\n" \ - ".Lunlikely%=.tag:" +#define UNLIKELY_START(cond, tag) \ + "j" #cond " .Lunlikely." #tag ".%=;\n\t" \ + UNLIKELY_START_SECTION "\n\t" \ + SUBSECTION_LBL(unlikely) "\n" \ + ".Lunlikely." #tag ".%=:" #define UNLIKELY_END(tag) \ - "jmp .Llikely%=.tag;\n\t" \ + "jmp .Llikely." #tag ".%=;\n\t" \ UNLIKELY_END_SECTION "\n" \ - ".Llikely%=.tag:" + ".Llikely." #tag ".%=:" #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6G-00020A-QV; Thu, 17 Dec 2015 07:35:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6G-000201-7D for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:44 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id C6/7A-21571-FC562765; Thu, 17 Dec 2015 07:35:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450337742!5802501!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41769 invoked from network); 17 Dec 2015 07:35:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:43 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6E-0005mf-A7 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6E-0007on-6P for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:42 +0000 Date: Thu, 17 Dec 2015 07:35:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: load proper ACPI tables with OVMF X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99805554de5b18233522409e5575245ab21cd27a Author: Anthony PERARD AuthorDate: Tue Dec 15 14:16:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:16:29 2015 +0100 hvmloader: load proper ACPI tables with OVMF This patch loads the ACPI tables associated with QEMU instead of the one for qemu-traditional, since we only support OVMF with qemu-xen. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/ovmf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index bb3da93..db9fa7a 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -47,8 +47,8 @@ #define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 -extern unsigned char dsdt_anycpu[]; -extern int dsdt_anycpu_len; +extern unsigned char dsdt_anycpu_qemu_xen[]; +extern int dsdt_anycpu_qemu_xen_len; #define OVMF_INFO_MAX_TABLES 4 struct ovmf_info { @@ -119,8 +119,8 @@ static void ovmf_load(const struct bios_config *config) static void ovmf_acpi_build_tables(void) { struct acpi_config config = { - .dsdt_anycpu = dsdt_anycpu, - .dsdt_anycpu_len = dsdt_anycpu_len, + .dsdt_anycpu = dsdt_anycpu_qemu_xen, + .dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len, .dsdt_15cpu = NULL, .dsdt_15cpu_len = 0 }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6G-00020A-QV; Thu, 17 Dec 2015 07:35:44 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6G-000201-7D for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:44 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id C6/7A-21571-FC562765; Thu, 17 Dec 2015 07:35:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450337742!5802501!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41769 invoked from network); 17 Dec 2015 07:35:43 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:43 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6E-0005mf-A7 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6E-0007on-6P for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:42 +0000 Date: Thu, 17 Dec 2015 07:35:42 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] hvmloader: load proper ACPI tables with OVMF X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 99805554de5b18233522409e5575245ab21cd27a Author: Anthony PERARD AuthorDate: Tue Dec 15 14:16:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:16:29 2015 +0100 hvmloader: load proper ACPI tables with OVMF This patch loads the ACPI tables associated with QEMU instead of the one for qemu-traditional, since we only support OVMF with qemu-xen. Signed-off-by: Anthony PERARD Acked-by: Ian Campbell Reviewed-by: Andrew Cooper --- tools/firmware/hvmloader/ovmf.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index bb3da93..db9fa7a 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -47,8 +47,8 @@ #define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 -extern unsigned char dsdt_anycpu[]; -extern int dsdt_anycpu_len; +extern unsigned char dsdt_anycpu_qemu_xen[]; +extern int dsdt_anycpu_qemu_xen_len; #define OVMF_INFO_MAX_TABLES 4 struct ovmf_info { @@ -119,8 +119,8 @@ static void ovmf_load(const struct bios_config *config) static void ovmf_acpi_build_tables(void) { struct acpi_config config = { - .dsdt_anycpu = dsdt_anycpu, - .dsdt_anycpu_len = dsdt_anycpu_len, + .dsdt_anycpu = dsdt_anycpu_qemu_xen, + .dsdt_anycpu_len = dsdt_anycpu_qemu_xen_len, .dsdt_15cpu = NULL, .dsdt_15cpu_len = 0 }; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:35:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6R-00022q-Vi; Thu, 17 Dec 2015 07:35:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6Q-00022d-TM for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:55 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 05/47-02804-9D562765; Thu, 17 Dec 2015 07:35:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1450337752!10946782!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54832 invoked from network); 17 Dec 2015 07:35:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6O-0005mn-HJ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6O-0007pK-G2 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:52 +0000 Date: Thu, 17 Dec 2015 07:35:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] building with perfc=y was broken X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 391192bd9bf3de641fdfc99e272af8b7b67e53ac Author: Dario Faggioli AuthorDate: Tue Dec 15 14:16:45 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:16:45 2015 +0100 building with perfc=y was broken because of b38d426ad09 ("x86/viridian: flush remote tlbs by hypercall") which was defining mshv_call_flush, but using mshv_flush. Signed-off-by: Dario Faggioli Reviewed-by: Andrew Cooper Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index df6f26d..6bd844b 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -607,7 +607,7 @@ int viridian_hypercall(struct cpu_user_regs *regs) * See Microsoft Hypervisor Top Level Spec. sections 12.4.2 * and 12.4.3. */ - perfc_incr(mshv_flush); + perfc_incr(mshv_call_flush); /* These hypercalls should never use the fast-call convention. */ status = HV_STATUS_INVALID_PARAMETER; -- generated by git-patchbot for /home/xen/git/xen.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 17 07:35:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:35:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6R-00022q-Vi; Thu, 17 Dec 2015 07:35:55 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6Q-00022d-TM for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:55 +0000 Received: from [85.158.137.68] by server-10.bemta-3.messagelabs.com id 05/47-02804-9D562765; Thu, 17 Dec 2015 07:35:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1450337752!10946782!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54832 invoked from network); 17 Dec 2015 07:35:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:35:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6O-0005mn-HJ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6O-0007pK-G2 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:35:52 +0000 Date: Thu, 17 Dec 2015 07:35:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] building with perfc=y was broken X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 391192bd9bf3de641fdfc99e272af8b7b67e53ac Author: Dario Faggioli AuthorDate: Tue Dec 15 14:16:45 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 14:16:45 2015 +0100 building with perfc=y was broken because of b38d426ad09 ("x86/viridian: flush remote tlbs by hypercall") which was defining mshv_call_flush, but using mshv_flush. Signed-off-by: Dario Faggioli Reviewed-by: Andrew Cooper Reviewed-by: Paul Durrant --- xen/arch/x86/hvm/viridian.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index df6f26d..6bd844b 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -607,7 +607,7 @@ int viridian_hypercall(struct cpu_user_regs *regs) * See Microsoft Hypervisor Top Level Spec. sections 12.4.2 * and 12.4.3. */ - perfc_incr(mshv_flush); + perfc_incr(mshv_call_flush); /* These hypercalls should never use the fast-call convention. */ status = HV_STATUS_INVALID_PARAMETER; -- generated by git-patchbot for /home/xen/git/xen.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 17 07:36:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:36: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 1a9T6c-00024e-6D; Thu, 17 Dec 2015 07:36:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6b-00024N-9v for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:05 +0000 Content-Length: 1963 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 72/A6-14900-4E562765; Thu, 17 Dec 2015 07:36:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1450337763!11256529!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62181 invoked from network); 17 Dec 2015 07:36:03 -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; 17 Dec 2015 07:36:03 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6Z-0005nO-1X for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6Y-0007qW-QL for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:02 +0000 Date: Thu, 17 Dec 2015 07:36:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: switch xc_dom_elfloader to be used with HVMlite domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0864409994480007445==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0864409994480007445== Content-Length: 1550 Content-Transfer-Encoding: quoted-printable commit 904fc1d7c90d709ba9831fdf38a906c3ffff6922 Author: Roger Pau Monne AuthorDate: Mon Dec 7 17:48:35 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 15 13:25:44 2015 +0000 libxc: switch xc_dom_elfloader to be used with HVMlite domains Allow xc_dom_elfloader to report a guest type as hvm-3.0-x86_32 if it's running inside of a HVM container and has the PHYS32_ENTRY elfnote set. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/libxc/xc_dom_elfloader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c index 36a115e..2ae575e 100644 --- a/tools/libxc/xc_dom_elfloader.c +++ b/tools/libxc/xc_dom_elfloader.c @@ -56,6 +56,10 @@ static char *xc_dom_guest_type(struct xc_dom_image *dom, { uint64_t machine =3D elf_uval(elf, elf->ehdr, e_machine); + if ( dom->container_type =3D=3D XC_DOM_HVM_CONTAINER && + dom->parms.phys_entry !=3D UNSET_ADDR ) + return "hvm-3.0-x86_32"; + switch ( machine ) { case EM_386: -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0864409994480007445== 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 --===============0864409994480007445==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:36:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:36: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 1a9T6c-00024e-6D; Thu, 17 Dec 2015 07:36:06 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6b-00024N-9v for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:05 +0000 Content-Length: 1963 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 72/A6-14900-4E562765; Thu, 17 Dec 2015 07:36:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-31.messagelabs.com!1450337763!11256529!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62181 invoked from network); 17 Dec 2015 07:36:03 -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; 17 Dec 2015 07:36:03 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6Z-0005nO-1X for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6Y-0007qW-QL for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:02 +0000 Date: Thu, 17 Dec 2015 07:36:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxc: switch xc_dom_elfloader to be used with HVMlite domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.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="===============0864409994480007445==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============0864409994480007445== Content-Length: 1550 Content-Transfer-Encoding: quoted-printable commit 904fc1d7c90d709ba9831fdf38a906c3ffff6922 Author: Roger Pau Monne AuthorDate: Mon Dec 7 17:48:35 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 15 13:25:44 2015 +0000 libxc: switch xc_dom_elfloader to be used with HVMlite domains Allow xc_dom_elfloader to report a guest type as hvm-3.0-x86_32 if it's running inside of a HVM container and has the PHYS32_ENTRY elfnote set. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- tools/libxc/xc_dom_elfloader.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c index 36a115e..2ae575e 100644 --- a/tools/libxc/xc_dom_elfloader.c +++ b/tools/libxc/xc_dom_elfloader.c @@ -56,6 +56,10 @@ static char *xc_dom_guest_type(struct xc_dom_image *dom, { uint64_t machine =3D elf_uval(elf, elf->ehdr, e_machine); + if ( dom->container_type =3D=3D XC_DOM_HVM_CONTAINER && + dom->parms.phys_entry !=3D UNSET_ADDR ) + return "hvm-3.0-x86_32"; + switch ( machine ) { case EM_386: -- generated by git-patchbot for /home/xen/git/xen.git#master --===============0864409994480007445== 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 --===============0864409994480007445==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:36:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:36: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 1a9T6o-00026R-Cl; Thu, 17 Dec 2015 07:36:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6m-00026F-H9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:16 +0000 Content-Length: 22314 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id FA/4B-18316-FE562765; Thu, 17 Dec 2015 07:36:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450337774!5808068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36394 invoked from network); 17 Dec 2015 07:36:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:36:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6k-0005nb-1b for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6j-0007rC-CK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:13 +0000 Date: Thu, 17 Dec 2015 07:36:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: allow the creation of HVM domains without a device model. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1689703455307183244==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1689703455307183244== Content-Length: 22398 Content-Transfer-Encoding: quoted-printable commit 5ca88cb7582a19636646c1a39c739fdbcaf3362a Author: Roger Pau Monne AuthorDate: Mon Dec 7 17:48:36 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 15 13:25:44 2015 +0000 libxl: allow the creation of HVM domains without a device model. Replace the firmware loaded into HVM guests with an OS kernel. Since the HVM builder now uses the PV xc_dom_* set of functions this kernel will be parsed and loaded inside the guest like on PV, but the container is a pure HVM guest. Also, if device_model_version is set to none or a device model for the specified domain is not present unconditinally set the nic type to LIBXL_NIC_TYPE_VIF. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- docs/man/xl.cfg.pod.5 | 5 +++ tools/libxc/include/xc_dom.h | 2 + tools/libxc/xc_dom_x86.c | 15 ++++---- tools/libxl/libxl.c | 44 +++++++++++++++++------- tools/libxl/libxl.h | 8 ++++ tools/libxl/libxl_create.c | 16 ++++++++- tools/libxl/libxl_dm.c | 3 +- tools/libxl/libxl_dom.c | 74 +++++++++++++++++++++++++++++------------- tools/libxl/libxl_internal.h | 9 ++++- tools/libxl/libxl_types.idl | 1 + tools/libxl/libxl_x86.c | 15 ++++++-- tools/libxl/xl_cmdimpl.c | 2 + 12 files changed, 144 insertions(+), 50 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 3b695bd..8899f75 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1789,6 +1789,11 @@ This device-model is the default for Linux dom0. Use the device-model based upon the historical Xen fork of Qemu. This device-model is still the default for NetBSD dom0. +=3Ditem B + +Don't use any device model. This requires a kernel capable of booting +without emulated devices. + =3Dback It is recommended to accept the default value for new guests. If diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index efa6c6e..2460818 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -20,6 +20,8 @@ #include #define INVALID_PFN ((xen_pfn_t)-1) +#define X86_HVM_NR_SPECIAL_PAGES 8 +#define X86_HVM_END_SPECIAL_REGION 0xff000u /* --- typedefs and structs ---------------------------------------- */ diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index d058949..3960875 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -58,8 +58,8 @@ #define SPECIALPAGE_IOREQ 5 #define SPECIALPAGE_IDENT_PT 6 #define SPECIALPAGE_CONSOLE 7 -#define NR_SPECIAL_PAGES 8 -#define special_pfn(x) (0xff000u - NR_SPECIAL_PAGES + (x)) +#define special_pfn(x) \ + (X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES + (x)) #define NR_IOREQ_SERVER_PAGES 8 #define ioreq_server_pfn(x) (special_pfn(0) - NR_IOREQ_SERVER_PAGES + (x)) @@ -589,7 +589,7 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) void *hvm_info_page; uint32_t *ident_pt, domid =3D dom->guest_domid; int rc; - xen_pfn_t special_array[NR_SPECIAL_PAGES]; + xen_pfn_t special_array[X86_HVM_NR_SPECIAL_PAGES]; xen_pfn_t ioreq_server_array[NR_IOREQ_SERVER_PAGES]; xc_interface *xch =3D dom->xch; @@ -604,18 +604,19 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) } /* Allocate and clear special pages. */ - for ( i =3D 0; i < NR_SPECIAL_PAGES; i++ ) + for ( i =3D 0; i < X86_HVM_NR_SPECIAL_PAGES; i++ ) special_array[i] =3D special_pfn(i); - rc =3D xc_domain_populate_physmap_exact(xch, domid, NR_SPECIAL_PAGES, 0, 0, - special_array); + rc =3D xc_domain_populate_physmap_exact(xch, domid, X86_HVM_NR_SPECIAL_PAGES, + 0, 0, special_array); if ( rc !=3D 0 ) { DOMPRINTF("Could not allocate special pages."); goto error_out; } - if ( xc_clear_domain_pages(xch, domid, special_pfn(0), NR_SPECIAL_PAGES) ) + if ( xc_clear_domain_pages(xch, domid, special_pfn(0), + X86_HVM_NR_SPECIAL_PAGES) ) goto error_out; xc_hvm_param_set(xch, domid, HVM_PARAM_STORE_PFN, diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bd604ac..9207621 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1065,11 +1065,14 @@ int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) } if (type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { - rc =3D libxl__domain_resume_device_model(gc, domid); - if (rc < 0) { - LOG(ERROR, "failed to unpause device model for domain %u:%d", - domid, rc); - goto out; + if (libxl__device_model_version_running(gc, domid) !=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + rc =3D libxl__domain_resume_device_model(gc, domid); + if (rc < 0) { + LOG(ERROR, "failed to unpause device model for domain %u:%d", + domid, rc); + goto out; + } } } ret =3D xc_domain_unpause(ctx->xch, domid); @@ -1616,11 +1619,11 @@ void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: - if (!libxl_get_stubdom_id(CTX, domid)) - dm_present =3D 1; - else + if (libxl_get_stubdom_id(CTX, domid)) { dm_present =3D 0; - break; + break; + } + /* fall through */ case LIBXL_DOMAIN_TYPE_PV: pid =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("/local/domain/%d/image/device-model-pid", domid)); dm_present =3D (pid !=3D NULL); @@ -3240,7 +3243,7 @@ out: /******************************************************************************/ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, - uint32_t domid) + uint32_t domid, libxl_domain_build_info *info) { int rc; @@ -3277,8 +3280,23 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: - if (!nic->nictype) - nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU; + if (!nic->nictype) { + if (info !=3D NULL) { + /* Path taken at creation time. */ + if (info->device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) + nic->nictype =3D LIBXL_NIC_TYPE_VIF; + else + nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU; + } else { + /* Path taken when hot-adding a nic. */ + if (libxl__device_model_version_running(gc, domid) =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) + nic->nictype =3D LIBXL_NIC_TYPE_VIF; + else + nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU; + } + } break; case LIBXL_DOMAIN_TYPE_PV: if (nic->nictype =3D=3D LIBXL_NIC_TYPE_VIF_IOEMU) { @@ -3327,7 +3345,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl_device_nic_init(&nic_saved); libxl_device_nic_copy(CTX, &nic_saved, nic); - rc =3D libxl__device_nic_setdefault(gc, nic, domid); + rc =3D libxl__device_nic_setdefault(gc, nic, domid, NULL); if (rc) goto out; front =3D flexarray_make(gc, 16, 1); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 981cb84..05606a7 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -859,6 +859,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); */ #define LIBXL_HAVE_GFX_PASSTHRU_KIND +/* + * LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE + * + * In the case that LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE is set libxl + * allows the creation of HVM guests without a device model. + */ +#define LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE 1 + typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a9cf16a..261816a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -119,6 +119,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->u.hvm.bios =3D LIBXL_BIOS_TYPE_ROMBIOS; break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->u.hvm.bios =3D LIBXL_BIOS_TYPE_SEABIOS; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + break; default:return ERROR_INVAL; } @@ -132,6 +134,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->u.hvm.bios =3D=3D LIBXL_BIOS_TYPE_ROMBIOS) return ERROR_INVAL; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + break; default:abort(); } @@ -236,6 +240,9 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; } break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + b_info->video_memkb =3D 0; + break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: default: switch (b_info->u.hvm.vga.kind) { @@ -920,7 +927,8 @@ static void initiate_domain_create(libxl__egc *egc, * called libxl_device_nic_add when domcreate_launch_dm gets called, * but qemu needs the nic information to be complete. */ - ret =3D libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); + ret =3D libxl__device_nic_setdefault(gc, &d_config->nics[i], domid, + &d_config->b_info); if (ret) { LOG(ERROR, "Unable to set nic defaults for nic %d", i); goto error_out; @@ -1261,6 +1269,12 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, libxl__device_console_add(gc, domid, &console, state, &device); libxl__device_console_dispose(&console); + if (d_config->b_info.device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + domcreate_devmodel_started(egc, &dcs->dmss.dm, 0); + return; + } + libxl_device_vkb_init(&vkb); libxl__device_vkb_add(gc, domid, &vkb); libxl_device_vkb_dispose(&vkb); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 2de0273..0aaefd9 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1606,7 +1606,8 @@ static void spawn_stub_launch_dm(libxl__egc *egc, * called libxl_device_nic_add at this point, but qemu needs * the nic information to be complete. */ - ret =3D libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid); + ret =3D libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid, + &dm_config->b_info); if (ret) goto out; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index d17ea86..deb3ffa 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -787,21 +787,23 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, uint64_t str_mfn, cons_mfn; int i; - va_map =3D xc_map_foreign_range(handle, domid, - XC_PAGE_SIZE, PROT_READ | PROT_WRITE, - HVM_INFO_PFN); - if (va_map =3D=3D NULL) - return ERROR_FAIL; + if (info->device_model_version !=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + va_map =3D xc_map_foreign_range(handle, domid, + XC_PAGE_SIZE, PROT_READ | PROT_WRITE, + HVM_INFO_PFN); + if (va_map =3D=3D NULL) + return ERROR_FAIL; - va_hvm =3D (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); - va_hvm->apic_mode =3D libxl_defbool_val(info->u.hvm.apic); - va_hvm->nr_vcpus =3D info->max_vcpus; - memset(va_hvm->vcpu_online, 0, sizeof(va_hvm->vcpu_online)); - memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); - for (i =3D 0, sum =3D 0; i < va_hvm->length; i++) - sum +=3D ((uint8_t *) va_hvm)[i]; - va_hvm->checksum -=3D sum; - munmap(va_map, XC_PAGE_SIZE); + va_hvm =3D (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); + va_hvm->apic_mode =3D libxl_defbool_val(info->u.hvm.apic); + va_hvm->nr_vcpus =3D info->max_vcpus; + memset(va_hvm->vcpu_online, 0, sizeof(va_hvm->vcpu_online)); + memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); + for (i =3D 0, sum =3D 0; i < va_hvm->length; i++) + sum +=3D ((uint8_t *) va_hvm)[i]; + va_hvm->checksum -=3D sum; + munmap(va_map, XC_PAGE_SIZE); + } xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); @@ -867,7 +869,7 @@ static int libxl__domain_firmware(libxl__gc *gc, { libxl_ctx *ctx =3D libxl__gc_owner(gc); const char *firmware; - int e, rc =3D ERROR_FAIL; + int e, rc; int datalen =3D 0; void *data; @@ -882,18 +884,34 @@ static int libxl__domain_firmware(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: firmware =3D "hvmloader"; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + if (info->kernel =3D=3D NULL) { + LOG(ERROR, "no device model requested without a kernel"); + rc =3D ERROR_FAIL; + goto out; + } + break; default: LOG(ERROR, "invalid device model version %d", info->device_model_version); - return ERROR_FAIL; - break; + rc =3D ERROR_FAIL; + goto out; } } - rc =3D xc_dom_kernel_file(dom, libxl__abs_path(gc, firmware, + if (info->kernel !=3D NULL && + info->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + /* Try to load a kernel instead of the firmware. */ + rc =3D xc_dom_kernel_file(dom, info->kernel); + if (rc =3D=3D 0 && info->ramdisk !=3D NULL) + rc =3D xc_dom_ramdisk_file(dom, info->ramdisk); + } else { + rc =3D xc_dom_kernel_file(dom, libxl__abs_path(gc, firmware, libxl__xenfirmwaredir_path())); + } + if (rc !=3D 0) { - LOGE(ERROR, "xc_dom_kernel_file failed"); + LOGE(ERROR, "xc_dom_{kernel_file/ramdisk_file} failed"); goto out; } @@ -904,6 +922,7 @@ static int libxl__domain_firmware(libxl__gc *gc, if (e) { LOGEV(ERROR, e, "failed to read SMBIOS firmware file %s", info->u.hvm.smbios_firmware); + rc =3D ERROR_FAIL; goto out; } libxl__ptr_add(gc, data); @@ -921,6 +940,7 @@ static int libxl__domain_firmware(libxl__gc *gc, if (e) { LOGEV(ERROR, e, "failed to read ACPI firmware file %s", info->u.hvm.acpi_firmware); + rc =3D ERROR_FAIL; goto out; } libxl__ptr_add(gc, data); @@ -933,6 +953,7 @@ static int libxl__domain_firmware(libxl__gc *gc, return 0; out: + assert(rc !=3D 0); return rc; } @@ -945,10 +966,13 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, uint64_t mmio_start, lowmem_end, highmem_end, mem_size; libxl_domain_build_info *const info =3D &d_config->b_info; struct xc_dom_image *dom =3D NULL; + bool device_model =3D + info->device_model_version !=3D LIBXL_DEVICE_MODEL_VERSION_NONE =3F + true : false; xc_dom_loginit(ctx->xch); - dom =3D xc_dom_allocate(ctx->xch, NULL, NULL); + dom =3D xc_dom_allocate(ctx->xch, info->cmdline, NULL); if (!dom) { LOGE(ERROR, "xc_dom_allocate failed"); rc =3D ERROR_NOMEM; @@ -981,8 +1005,12 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (dom->target_pages =3D=3D 0) dom->target_pages =3D mem_size >> XC_PAGE_SHIFT; - if (dom->mmio_size =3D=3D 0) + if (dom->mmio_size =3D=3D 0 && device_model) dom->mmio_size =3D HVM_BELOW_4G_MMIO_LENGTH; + else if (dom->mmio_size =3D=3D 0 && !device_model) + dom->mmio_size =3D GB(4) - + ((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES) + << XC_PAGE_SHIFT); lowmem_end =3D mem_size; highmem_end =3D 0; mmio_start =3D (1ull << 32) - dom->mmio_size; @@ -994,8 +1022,8 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, dom->lowmem_end =3D lowmem_end; dom->highmem_end =3D highmem_end; dom->mmio_start =3D mmio_start; - dom->vga_hole_size =3D LIBXL_VGA_HOLE_SIZE; - dom->device_model =3D true; + dom->vga_hole_size =3D device_model =3F LIBXL_VGA_HOLE_SIZE : 0; + dom->device_model =3D device_model; rc =3D libxl__domain_device_construct_rdm(gc, d_config, info->u.hvm.rdm_mem_boundary_memkb*1024, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 96842d3..15731a8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -115,6 +115,12 @@ #define DOMID_XS_PATH "domid" #define INVALID_DOMID ~0 +/* Size macros. */ +#define __AC(X,Y) (X##Y) +#define _AC(X,Y) __AC(X,Y) +#define MB(_mb) (_AC(_mb, ULL) << 20) +#define GB(_gb) (_AC(_gb, ULL) << 30) + #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #define ROUNDUP(_val, _order) \ @@ -1190,7 +1196,8 @@ _hidden int libxl__domain_build_info_setdefault(libxl__gc *gc, _hidden int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk); _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, - uint32_t domid); + uint32_t domid, + libxl_domain_build_info *info); _hidden int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm); _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index cf3730f..9658356 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -98,6 +98,7 @@ libxl_device_model_version =3D Enumeration("device_model_version", [ (0, "UNKNOWN"), (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) (2, "QEMU_XEN"), # Upstream based qemu-xen device model + (3, "NONE"), # No device model ]) libxl_console_type =3D Enumeration("console_type", [ diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 183b6c2..46cfafb 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -7,10 +7,16 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, libxl_domain_config *d_config, xc_domain_configuration_t *xc_config) { - if (d_config->c_info.type =3D=3D LIBXL_DOMAIN_TYPE_HVM) + + if (d_config->c_info.type =3D=3D LIBXL_DOMAIN_TYPE_HVM && + d_config->b_info.device_model_version !=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + /* HVM domains with a device model. */ xc_config->emulation_flags =3D XEN_X86_EMU_ALL; - else + } else { + /* PV or HVM domains without a device model. */ xc_config->emulation_flags =3D 0; + } return 0; } @@ -485,6 +491,7 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc, struct e820entry *e820 =3D NULL; uint64_t highmem_size =3D dom->highmem_end =3F dom->highmem_end - (1ull << 32) : 0; + uint32_t lowmem_start =3D dom->device_model =3F GUEST_LOW_MEM_START_DEFAULT : 0; /* Add all rdm entries. */ for (i =3D 0; i < d_config->num_rdms; i++) @@ -505,8 +512,8 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc, e820 =3D libxl__malloc(gc, sizeof(struct e820entry) * e820_entries); /* Low memory */ - e820[nr].addr =3D GUEST_LOW_MEM_START_DEFAULT; - e820[nr].size =3D dom->lowmem_end - GUEST_LOW_MEM_START_DEFAULT; + e820[nr].addr =3D lowmem_start; + e820[nr].size =3D dom->lowmem_end - lowmem_start; e820[nr].type =3D E820_RAM; nr++; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2b6371d..f9933cb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2186,6 +2186,8 @@ skip_vfb: } else if (!strcmp(buf, "qemu-xen")) { b_info->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + } else if (!strcmp(buf, "none")) { + b_info->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_NONE; } else { fprintf(stderr, "Unknown device_model_version \"%s\" specified\n", buf); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1689703455307183244== 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 --===============1689703455307183244==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:36:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:36: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 1a9T6o-00026R-Cl; Thu, 17 Dec 2015 07:36:18 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6m-00026F-H9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:16 +0000 Content-Length: 22314 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id FA/4B-18316-FE562765; Thu, 17 Dec 2015 07:36:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450337774!5808068!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36394 invoked from network); 17 Dec 2015 07:36:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 07:36:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6k-0005nb-1b for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6j-0007rC-CK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:13 +0000 Date: Thu, 17 Dec 2015 07:36:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: allow the creation of HVM domains without a device model. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1689703455307183244==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============1689703455307183244== Content-Length: 22398 Content-Transfer-Encoding: quoted-printable commit 5ca88cb7582a19636646c1a39c739fdbcaf3362a Author: Roger Pau Monne AuthorDate: Mon Dec 7 17:48:36 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 15 13:25:44 2015 +0000 libxl: allow the creation of HVM domains without a device model. Replace the firmware loaded into HVM guests with an OS kernel. Since the HVM builder now uses the PV xc_dom_* set of functions this kernel will be parsed and loaded inside the guest like on PV, but the container is a pure HVM guest. Also, if device_model_version is set to none or a device model for the specified domain is not present unconditinally set the nic type to LIBXL_NIC_TYPE_VIF. Signed-off-by: Roger Pau Monn=C3=A9 Acked-by: Wei Liu Cc: Ian Jackson Cc: Stefano Stabellini Cc: Ian Campbell Cc: Wei Liu --- docs/man/xl.cfg.pod.5 | 5 +++ tools/libxc/include/xc_dom.h | 2 + tools/libxc/xc_dom_x86.c | 15 ++++---- tools/libxl/libxl.c | 44 +++++++++++++++++------- tools/libxl/libxl.h | 8 ++++ tools/libxl/libxl_create.c | 16 ++++++++- tools/libxl/libxl_dm.c | 3 +- tools/libxl/libxl_dom.c | 74 +++++++++++++++++++++++++++++------------- tools/libxl/libxl_internal.h | 9 ++++- tools/libxl/libxl_types.idl | 1 + tools/libxl/libxl_x86.c | 15 ++++++-- tools/libxl/xl_cmdimpl.c | 2 + 12 files changed, 144 insertions(+), 50 deletions(-) diff --git a/docs/man/xl.cfg.pod.5 b/docs/man/xl.cfg.pod.5 index 3b695bd..8899f75 100644 --- a/docs/man/xl.cfg.pod.5 +++ b/docs/man/xl.cfg.pod.5 @@ -1789,6 +1789,11 @@ This device-model is the default for Linux dom0. Use the device-model based upon the historical Xen fork of Qemu. This device-model is still the default for NetBSD dom0. +=3Ditem B + +Don't use any device model. This requires a kernel capable of booting +without emulated devices. + =3Dback It is recommended to accept the default value for new guests. If diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h index efa6c6e..2460818 100644 --- a/tools/libxc/include/xc_dom.h +++ b/tools/libxc/include/xc_dom.h @@ -20,6 +20,8 @@ #include #define INVALID_PFN ((xen_pfn_t)-1) +#define X86_HVM_NR_SPECIAL_PAGES 8 +#define X86_HVM_END_SPECIAL_REGION 0xff000u /* --- typedefs and structs ---------------------------------------- */ diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index d058949..3960875 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -58,8 +58,8 @@ #define SPECIALPAGE_IOREQ 5 #define SPECIALPAGE_IDENT_PT 6 #define SPECIALPAGE_CONSOLE 7 -#define NR_SPECIAL_PAGES 8 -#define special_pfn(x) (0xff000u - NR_SPECIAL_PAGES + (x)) +#define special_pfn(x) \ + (X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES + (x)) #define NR_IOREQ_SERVER_PAGES 8 #define ioreq_server_pfn(x) (special_pfn(0) - NR_IOREQ_SERVER_PAGES + (x)) @@ -589,7 +589,7 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) void *hvm_info_page; uint32_t *ident_pt, domid =3D dom->guest_domid; int rc; - xen_pfn_t special_array[NR_SPECIAL_PAGES]; + xen_pfn_t special_array[X86_HVM_NR_SPECIAL_PAGES]; xen_pfn_t ioreq_server_array[NR_IOREQ_SERVER_PAGES]; xc_interface *xch =3D dom->xch; @@ -604,18 +604,19 @@ static int alloc_magic_pages_hvm(struct xc_dom_image *dom) } /* Allocate and clear special pages. */ - for ( i =3D 0; i < NR_SPECIAL_PAGES; i++ ) + for ( i =3D 0; i < X86_HVM_NR_SPECIAL_PAGES; i++ ) special_array[i] =3D special_pfn(i); - rc =3D xc_domain_populate_physmap_exact(xch, domid, NR_SPECIAL_PAGES, 0, 0, - special_array); + rc =3D xc_domain_populate_physmap_exact(xch, domid, X86_HVM_NR_SPECIAL_PAGES, + 0, 0, special_array); if ( rc !=3D 0 ) { DOMPRINTF("Could not allocate special pages."); goto error_out; } - if ( xc_clear_domain_pages(xch, domid, special_pfn(0), NR_SPECIAL_PAGES) ) + if ( xc_clear_domain_pages(xch, domid, special_pfn(0), + X86_HVM_NR_SPECIAL_PAGES) ) goto error_out; xc_hvm_param_set(xch, domid, HVM_PARAM_STORE_PFN, diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index bd604ac..9207621 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -1065,11 +1065,14 @@ int libxl_domain_unpause(libxl_ctx *ctx, uint32_t domid) } if (type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { - rc =3D libxl__domain_resume_device_model(gc, domid); - if (rc < 0) { - LOG(ERROR, "failed to unpause device model for domain %u:%d", - domid, rc); - goto out; + if (libxl__device_model_version_running(gc, domid) !=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + rc =3D libxl__domain_resume_device_model(gc, domid); + if (rc < 0) { + LOG(ERROR, "failed to unpause device model for domain %u:%d", + domid, rc); + goto out; + } } } ret =3D xc_domain_unpause(ctx->xch, domid); @@ -1616,11 +1619,11 @@ void libxl__destroy_domid(libxl__egc *egc, libxl__destroy_domid_state *dis) switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: - if (!libxl_get_stubdom_id(CTX, domid)) - dm_present =3D 1; - else + if (libxl_get_stubdom_id(CTX, domid)) { dm_present =3D 0; - break; + break; + } + /* fall through */ case LIBXL_DOMAIN_TYPE_PV: pid =3D libxl__xs_read(gc, XBT_NULL, GCSPRINTF("/local/domain/%d/image/device-model-pid", domid)); dm_present =3D (pid !=3D NULL); @@ -3240,7 +3243,7 @@ out: /******************************************************************************/ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, - uint32_t domid) + uint32_t domid, libxl_domain_build_info *info) { int rc; @@ -3277,8 +3280,23 @@ int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: - if (!nic->nictype) - nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU; + if (!nic->nictype) { + if (info !=3D NULL) { + /* Path taken at creation time. */ + if (info->device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) + nic->nictype =3D LIBXL_NIC_TYPE_VIF; + else + nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU; + } else { + /* Path taken when hot-adding a nic. */ + if (libxl__device_model_version_running(gc, domid) =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) + nic->nictype =3D LIBXL_NIC_TYPE_VIF; + else + nic->nictype =3D LIBXL_NIC_TYPE_VIF_IOEMU; + } + } break; case LIBXL_DOMAIN_TYPE_PV: if (nic->nictype =3D=3D LIBXL_NIC_TYPE_VIF_IOEMU) { @@ -3327,7 +3345,7 @@ void libxl__device_nic_add(libxl__egc *egc, uint32_t domid, libxl_device_nic_init(&nic_saved); libxl_device_nic_copy(CTX, &nic_saved, nic); - rc =3D libxl__device_nic_setdefault(gc, nic, domid); + rc =3D libxl__device_nic_setdefault(gc, nic, domid, NULL); if (rc) goto out; front =3D flexarray_make(gc, 16, 1); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 981cb84..05606a7 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -859,6 +859,14 @@ void libxl_mac_copy(libxl_ctx *ctx, libxl_mac *dst, libxl_mac *src); */ #define LIBXL_HAVE_GFX_PASSTHRU_KIND +/* + * LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE + * + * In the case that LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE is set libxl + * allows the creation of HVM guests without a device model. + */ +#define LIBXL_HAVE_DEVICE_MODEL_VERSION_NONE 1 + typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index a9cf16a..261816a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -119,6 +119,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, b_info->u.hvm.bios =3D LIBXL_BIOS_TYPE_ROMBIOS; break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: b_info->u.hvm.bios =3D LIBXL_BIOS_TYPE_SEABIOS; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + break; default:return ERROR_INVAL; } @@ -132,6 +134,8 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->u.hvm.bios =3D=3D LIBXL_BIOS_TYPE_ROMBIOS) return ERROR_INVAL; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + break; default:abort(); } @@ -236,6 +240,9 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, break; } break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + b_info->video_memkb =3D 0; + break; case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: default: switch (b_info->u.hvm.vga.kind) { @@ -920,7 +927,8 @@ static void initiate_domain_create(libxl__egc *egc, * called libxl_device_nic_add when domcreate_launch_dm gets called, * but qemu needs the nic information to be complete. */ - ret =3D libxl__device_nic_setdefault(gc, &d_config->nics[i], domid); + ret =3D libxl__device_nic_setdefault(gc, &d_config->nics[i], domid, + &d_config->b_info); if (ret) { LOG(ERROR, "Unable to set nic defaults for nic %d", i); goto error_out; @@ -1261,6 +1269,12 @@ static void domcreate_launch_dm(libxl__egc *egc, libxl__multidev *multidev, libxl__device_console_add(gc, domid, &console, state, &device); libxl__device_console_dispose(&console); + if (d_config->b_info.device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + domcreate_devmodel_started(egc, &dcs->dmss.dm, 0); + return; + } + libxl_device_vkb_init(&vkb); libxl__device_vkb_add(gc, domid, &vkb); libxl_device_vkb_dispose(&vkb); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 2de0273..0aaefd9 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1606,7 +1606,8 @@ static void spawn_stub_launch_dm(libxl__egc *egc, * called libxl_device_nic_add at this point, but qemu needs * the nic information to be complete. */ - ret =3D libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid); + ret =3D libxl__device_nic_setdefault(gc, &dm_config->nics[i], dm_domid, + &dm_config->b_info); if (ret) goto out; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index d17ea86..deb3ffa 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -787,21 +787,23 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid, uint64_t str_mfn, cons_mfn; int i; - va_map =3D xc_map_foreign_range(handle, domid, - XC_PAGE_SIZE, PROT_READ | PROT_WRITE, - HVM_INFO_PFN); - if (va_map =3D=3D NULL) - return ERROR_FAIL; + if (info->device_model_version !=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + va_map =3D xc_map_foreign_range(handle, domid, + XC_PAGE_SIZE, PROT_READ | PROT_WRITE, + HVM_INFO_PFN); + if (va_map =3D=3D NULL) + return ERROR_FAIL; - va_hvm =3D (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); - va_hvm->apic_mode =3D libxl_defbool_val(info->u.hvm.apic); - va_hvm->nr_vcpus =3D info->max_vcpus; - memset(va_hvm->vcpu_online, 0, sizeof(va_hvm->vcpu_online)); - memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); - for (i =3D 0, sum =3D 0; i < va_hvm->length; i++) - sum +=3D ((uint8_t *) va_hvm)[i]; - va_hvm->checksum -=3D sum; - munmap(va_map, XC_PAGE_SIZE); + va_hvm =3D (struct hvm_info_table *)(va_map + HVM_INFO_OFFSET); + va_hvm->apic_mode =3D libxl_defbool_val(info->u.hvm.apic); + va_hvm->nr_vcpus =3D info->max_vcpus; + memset(va_hvm->vcpu_online, 0, sizeof(va_hvm->vcpu_online)); + memcpy(va_hvm->vcpu_online, info->avail_vcpus.map, info->avail_vcpus.size); + for (i =3D 0, sum =3D 0; i < va_hvm->length; i++) + sum +=3D ((uint8_t *) va_hvm)[i]; + va_hvm->checksum -=3D sum; + munmap(va_map, XC_PAGE_SIZE); + } xc_hvm_param_get(handle, domid, HVM_PARAM_STORE_PFN, &str_mfn); xc_hvm_param_get(handle, domid, HVM_PARAM_CONSOLE_PFN, &cons_mfn); @@ -867,7 +869,7 @@ static int libxl__domain_firmware(libxl__gc *gc, { libxl_ctx *ctx =3D libxl__gc_owner(gc); const char *firmware; - int e, rc =3D ERROR_FAIL; + int e, rc; int datalen =3D 0; void *data; @@ -882,18 +884,34 @@ static int libxl__domain_firmware(libxl__gc *gc, case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: firmware =3D "hvmloader"; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + if (info->kernel =3D=3D NULL) { + LOG(ERROR, "no device model requested without a kernel"); + rc =3D ERROR_FAIL; + goto out; + } + break; default: LOG(ERROR, "invalid device model version %d", info->device_model_version); - return ERROR_FAIL; - break; + rc =3D ERROR_FAIL; + goto out; } } - rc =3D xc_dom_kernel_file(dom, libxl__abs_path(gc, firmware, + if (info->kernel !=3D NULL && + info->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + /* Try to load a kernel instead of the firmware. */ + rc =3D xc_dom_kernel_file(dom, info->kernel); + if (rc =3D=3D 0 && info->ramdisk !=3D NULL) + rc =3D xc_dom_ramdisk_file(dom, info->ramdisk); + } else { + rc =3D xc_dom_kernel_file(dom, libxl__abs_path(gc, firmware, libxl__xenfirmwaredir_path())); + } + if (rc !=3D 0) { - LOGE(ERROR, "xc_dom_kernel_file failed"); + LOGE(ERROR, "xc_dom_{kernel_file/ramdisk_file} failed"); goto out; } @@ -904,6 +922,7 @@ static int libxl__domain_firmware(libxl__gc *gc, if (e) { LOGEV(ERROR, e, "failed to read SMBIOS firmware file %s", info->u.hvm.smbios_firmware); + rc =3D ERROR_FAIL; goto out; } libxl__ptr_add(gc, data); @@ -921,6 +940,7 @@ static int libxl__domain_firmware(libxl__gc *gc, if (e) { LOGEV(ERROR, e, "failed to read ACPI firmware file %s", info->u.hvm.acpi_firmware); + rc =3D ERROR_FAIL; goto out; } libxl__ptr_add(gc, data); @@ -933,6 +953,7 @@ static int libxl__domain_firmware(libxl__gc *gc, return 0; out: + assert(rc !=3D 0); return rc; } @@ -945,10 +966,13 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, uint64_t mmio_start, lowmem_end, highmem_end, mem_size; libxl_domain_build_info *const info =3D &d_config->b_info; struct xc_dom_image *dom =3D NULL; + bool device_model =3D + info->device_model_version !=3D LIBXL_DEVICE_MODEL_VERSION_NONE =3F + true : false; xc_dom_loginit(ctx->xch); - dom =3D xc_dom_allocate(ctx->xch, NULL, NULL); + dom =3D xc_dom_allocate(ctx->xch, info->cmdline, NULL); if (!dom) { LOGE(ERROR, "xc_dom_allocate failed"); rc =3D ERROR_NOMEM; @@ -981,8 +1005,12 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, if (dom->target_pages =3D=3D 0) dom->target_pages =3D mem_size >> XC_PAGE_SHIFT; - if (dom->mmio_size =3D=3D 0) + if (dom->mmio_size =3D=3D 0 && device_model) dom->mmio_size =3D HVM_BELOW_4G_MMIO_LENGTH; + else if (dom->mmio_size =3D=3D 0 && !device_model) + dom->mmio_size =3D GB(4) - + ((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES) + << XC_PAGE_SHIFT); lowmem_end =3D mem_size; highmem_end =3D 0; mmio_start =3D (1ull << 32) - dom->mmio_size; @@ -994,8 +1022,8 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid, dom->lowmem_end =3D lowmem_end; dom->highmem_end =3D highmem_end; dom->mmio_start =3D mmio_start; - dom->vga_hole_size =3D LIBXL_VGA_HOLE_SIZE; - dom->device_model =3D true; + dom->vga_hole_size =3D device_model =3F LIBXL_VGA_HOLE_SIZE : 0; + dom->device_model =3D device_model; rc =3D libxl__domain_device_construct_rdm(gc, d_config, info->u.hvm.rdm_mem_boundary_memkb*1024, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 96842d3..15731a8 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -115,6 +115,12 @@ #define DOMID_XS_PATH "domid" #define INVALID_DOMID ~0 +/* Size macros. */ +#define __AC(X,Y) (X##Y) +#define _AC(X,Y) __AC(X,Y) +#define MB(_mb) (_AC(_mb, ULL) << 20) +#define GB(_gb) (_AC(_gb, ULL) << 30) + #define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) #define ROUNDUP(_val, _order) \ @@ -1190,7 +1196,8 @@ _hidden int libxl__domain_build_info_setdefault(libxl__gc *gc, _hidden int libxl__device_disk_setdefault(libxl__gc *gc, libxl_device_disk *disk); _hidden int libxl__device_nic_setdefault(libxl__gc *gc, libxl_device_nic *nic, - uint32_t domid); + uint32_t domid, + libxl_domain_build_info *info); _hidden int libxl__device_vtpm_setdefault(libxl__gc *gc, libxl_device_vtpm *vtpm); _hidden int libxl__device_vfb_setdefault(libxl__gc *gc, libxl_device_vfb *vfb); _hidden int libxl__device_vkb_setdefault(libxl__gc *gc, libxl_device_vkb *vkb); diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index cf3730f..9658356 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -98,6 +98,7 @@ libxl_device_model_version =3D Enumeration("device_model_version", [ (0, "UNKNOWN"), (1, "QEMU_XEN_TRADITIONAL"), # Historical qemu-xen device model (qemu-dm) (2, "QEMU_XEN"), # Upstream based qemu-xen device model + (3, "NONE"), # No device model ]) libxl_console_type =3D Enumeration("console_type", [ diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index 183b6c2..46cfafb 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -7,10 +7,16 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc, libxl_domain_config *d_config, xc_domain_configuration_t *xc_config) { - if (d_config->c_info.type =3D=3D LIBXL_DOMAIN_TYPE_HVM) + + if (d_config->c_info.type =3D=3D LIBXL_DOMAIN_TYPE_HVM && + d_config->b_info.device_model_version !=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + /* HVM domains with a device model. */ xc_config->emulation_flags =3D XEN_X86_EMU_ALL; - else + } else { + /* PV or HVM domains without a device model. */ xc_config->emulation_flags =3D 0; + } return 0; } @@ -485,6 +491,7 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc, struct e820entry *e820 =3D NULL; uint64_t highmem_size =3D dom->highmem_end =3F dom->highmem_end - (1ull << 32) : 0; + uint32_t lowmem_start =3D dom->device_model =3F GUEST_LOW_MEM_START_DEFAULT : 0; /* Add all rdm entries. */ for (i =3D 0; i < d_config->num_rdms; i++) @@ -505,8 +512,8 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc, e820 =3D libxl__malloc(gc, sizeof(struct e820entry) * e820_entries); /* Low memory */ - e820[nr].addr =3D GUEST_LOW_MEM_START_DEFAULT; - e820[nr].size =3D dom->lowmem_end - GUEST_LOW_MEM_START_DEFAULT; + e820[nr].addr =3D lowmem_start; + e820[nr].size =3D dom->lowmem_end - lowmem_start; e820[nr].type =3D E820_RAM; nr++; diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index 2b6371d..f9933cb 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -2186,6 +2186,8 @@ skip_vfb: } else if (!strcmp(buf, "qemu-xen")) { b_info->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; + } else if (!strcmp(buf, "none")) { + b_info->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_NONE; } else { fprintf(stderr, "Unknown device_model_version \"%s\" specified\n", buf); -- generated by git-patchbot for /home/xen/git/xen.git#master --===============1689703455307183244== 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 --===============1689703455307183244==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:36:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:36: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 1a9T6y-00028B-MW; Thu, 17 Dec 2015 07:36:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6w-00027w-SR for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:27 +0000 Content-Length: 7071 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 3D/32-28221-AF562765; Thu, 17 Dec 2015 07:36:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450337784!11581668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35412 invoked from network); 17 Dec 2015 07:36:25 -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; 17 Dec 2015 07:36:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6u-0005nj-J8 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6u-0007rh-BK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:24 +0000 Date: Thu, 17 Dec 2015 07:36:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add support for migrating HVM guests without a device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2563946609520781786==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2563946609520781786== Content-Length: 6791 Content-Transfer-Encoding: quoted-printable commit 18fcef8d62b28766e7b373a71d54bcf7578cea23 Author: Roger Pau Monne AuthorDate: Mon Dec 7 17:48:37 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 15 13:25:44 2015 +0000 libxl: add support for migrating HVM guests without a device model Only some minor libxl changes are needed in order to be able to migrate HVM guests without a device model, no hypervisor changes are needed. This change prevents sending the emulator context if the device model version is set to none. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Wei Liu Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_dom_suspend.c | 2 ++ tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_stream_read.c | 16 ++++++++++++++++ tools/libxl/libxl_stream_write.c | 21 ++++++++++++++++++++- 5 files changed, 44 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index deb3ffa..47971a9 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1316,6 +1316,9 @@ void libxl__domain_suspend_common_switch_qemu_logdirty case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: domain_suspend_switch_qemu_xen_logdirty(domid, enable, shs); break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + libxl__xc_domain_saverestore_async_callback_done(egc, shs, 0); + break; default: LOG(ERROR,"logdirty switch failed" ", no valid device model version found, abandoning suspend"); diff --git a/tools/libxl/libxl_dom_suspend.c b/tools/libxl/libxl_dom_suspend.c index 4cc01ad..3313ad1 100644 --- a/tools/libxl/libxl_dom_suspend.c +++ b/tools/libxl/libxl_dom_suspend.c @@ -43,6 +43,8 @@ int libxl__domain_suspend_device_model(libxl__gc *gc, if (ret) unlink(filename); break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + break; default: return ERROR_INVAL; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 15731a8..a556a38 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3039,6 +3039,9 @@ struct libxl__stream_write_state { libxl__datacopier_state dc; sws_record_done_cb record_done_callback; + /* Cache device model version. */ + libxl_device_model_version device_model_version; + /* Only used when constructing EMULATOR records. */ libxl__datacopier_state emu_dc; libxl__carefd *emu_carefd; diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index 4ec29da..258dec4 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -539,6 +539,14 @@ static bool process_record(libxl__egc *egc, break; case REC_TYPE_EMULATOR_XENSTORE_DATA: + if (dcs->guest_config->b_info.device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + rc =3D ERROR_FAIL; + LOG(ERROR, + "Received a xenstore emulator record when none was expected"); + goto err; + } + if (rec->hdr.length < sizeof(libxl__sr_emulator_hdr)) { rc =3D ERROR_FAIL; LOG(ERROR, @@ -560,6 +568,14 @@ static bool process_record(libxl__egc *egc, break; case REC_TYPE_EMULATOR_CONTEXT: + if (dcs->guest_config->b_info.device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + rc =3D ERROR_FAIL; + LOG(ERROR, + "Received an emulator context record when none was expected"); + goto err; + } + write_emulator_blob(egc, stream, rec); break; diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 52a60d7..80d9208 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -167,6 +167,8 @@ static void setup_emulator_write(libxl__egc *egc, void *body, sws_record_done_cb cb) { + assert(stream->emu_sub_hdr.id !=3D EMULATOR_UNKNOWN); + assert(stream->device_model_version !=3D LIBXL_DEVICE_MODEL_VERSION_NONE); setup_generic_write(egc, stream, what, hdr, emu_hdr, body, cb); } @@ -207,6 +209,7 @@ void libxl__stream_write_init(libxl__stream_write_state *stream) FILLZERO(stream->emu_rec_hdr); FILLZERO(stream->emu_sub_hdr); stream->emu_body =3D NULL; + stream->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_UNKNOWN; } void libxl__stream_write_start(libxl__egc *egc, @@ -223,7 +226,9 @@ void libxl__stream_write_start(libxl__egc *egc, stream->running =3D true; if (dss->type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { - switch (libxl__device_model_version_running(gc, dss->domid)) { + stream->device_model_version =3D + libxl__device_model_version_running(gc, dss->domid); + switch (stream->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: stream->emu_sub_hdr.id =3D EMULATOR_QEMU_TRADITIONAL; break; @@ -232,6 +237,10 @@ void libxl__stream_write_start(libxl__egc *egc, stream->emu_sub_hdr.id =3D EMULATOR_QEMU_UPSTREAM; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + stream->emu_sub_hdr.id =3D EMULATOR_UNKNOWN; + break; + default: rc =3D ERROR_FAIL; LOG(ERROR, "Unknown emulator for HVM domain"); @@ -359,6 +368,11 @@ static void write_emulator_xenstore_record(libxl__egc *egc, char *buf =3D NULL; uint32_t len =3D 0; + if (stream->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + emulator_xenstore_record_done(egc, stream); + return; + } + rc =3D libxl__save_emulator_xenstore_data(dss, &buf, &len); if (rc) goto err; @@ -410,6 +424,11 @@ static void write_emulator_context_record(libxl__egc *egc, assert(dss->type =3D=3D LIBXL_DOMAIN_TYPE_HVM); + if (stream->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + emulator_context_record_done(egc, stream); + return; + } + /* Convenience aliases */ const char *const filename =3D dss->dm_savefile; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2563946609520781786== 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 --===============2563946609520781786==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 07:36:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 07:36: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 1a9T6y-00028B-MW; Thu, 17 Dec 2015 07:36:28 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6w-00027w-SR for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:27 +0000 Content-Length: 7071 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 3D/32-28221-AF562765; Thu, 17 Dec 2015 07:36:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450337784!11581668!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35412 invoked from network); 17 Dec 2015 07:36:25 -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; 17 Dec 2015 07:36:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9T6u-0005nj-J8 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9T6u-0007rh-BK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 07:36:24 +0000 Date: Thu, 17 Dec 2015 07:36:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libxl: add support for migrating HVM guests without a device model X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2563946609520781786==" Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org --===============2563946609520781786== Content-Length: 6791 Content-Transfer-Encoding: quoted-printable commit 18fcef8d62b28766e7b373a71d54bcf7578cea23 Author: Roger Pau Monne AuthorDate: Mon Dec 7 17:48:37 2015 +0100 Commit: Ian Campbell CommitDate: Tue Dec 15 13:25:44 2015 +0000 libxl: add support for migrating HVM guests without a device model Only some minor libxl changes are needed in order to be able to migrate HVM guests without a device model, no hypervisor changes are needed. This change prevents sending the emulator context if the device model version is set to none. Signed-off-by: Roger Pau Monn=C3=A9 Reviewed-by: Andrew Cooper Acked-by: Wei Liu Cc: Ian Jackson Cc: Ian Campbell Cc: Wei Liu --- tools/libxl/libxl_dom.c | 3 +++ tools/libxl/libxl_dom_suspend.c | 2 ++ tools/libxl/libxl_internal.h | 3 +++ tools/libxl/libxl_stream_read.c | 16 ++++++++++++++++ tools/libxl/libxl_stream_write.c | 21 ++++++++++++++++++++- 5 files changed, 44 insertions(+), 1 deletions(-) diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index deb3ffa..47971a9 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -1316,6 +1316,9 @@ void libxl__domain_suspend_common_switch_qemu_logdirty case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: domain_suspend_switch_qemu_xen_logdirty(domid, enable, shs); break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + libxl__xc_domain_saverestore_async_callback_done(egc, shs, 0); + break; default: LOG(ERROR,"logdirty switch failed" ", no valid device model version found, abandoning suspend"); diff --git a/tools/libxl/libxl_dom_suspend.c b/tools/libxl/libxl_dom_suspend.c index 4cc01ad..3313ad1 100644 --- a/tools/libxl/libxl_dom_suspend.c +++ b/tools/libxl/libxl_dom_suspend.c @@ -43,6 +43,8 @@ int libxl__domain_suspend_device_model(libxl__gc *gc, if (ret) unlink(filename); break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + break; default: return ERROR_INVAL; } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 15731a8..a556a38 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3039,6 +3039,9 @@ struct libxl__stream_write_state { libxl__datacopier_state dc; sws_record_done_cb record_done_callback; + /* Cache device model version. */ + libxl_device_model_version device_model_version; + /* Only used when constructing EMULATOR records. */ libxl__datacopier_state emu_dc; libxl__carefd *emu_carefd; diff --git a/tools/libxl/libxl_stream_read.c b/tools/libxl/libxl_stream_read.c index 4ec29da..258dec4 100644 --- a/tools/libxl/libxl_stream_read.c +++ b/tools/libxl/libxl_stream_read.c @@ -539,6 +539,14 @@ static bool process_record(libxl__egc *egc, break; case REC_TYPE_EMULATOR_XENSTORE_DATA: + if (dcs->guest_config->b_info.device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + rc =3D ERROR_FAIL; + LOG(ERROR, + "Received a xenstore emulator record when none was expected"); + goto err; + } + if (rec->hdr.length < sizeof(libxl__sr_emulator_hdr)) { rc =3D ERROR_FAIL; LOG(ERROR, @@ -560,6 +568,14 @@ static bool process_record(libxl__egc *egc, break; case REC_TYPE_EMULATOR_CONTEXT: + if (dcs->guest_config->b_info.device_model_version =3D=3D + LIBXL_DEVICE_MODEL_VERSION_NONE) { + rc =3D ERROR_FAIL; + LOG(ERROR, + "Received an emulator context record when none was expected"); + goto err; + } + write_emulator_blob(egc, stream, rec); break; diff --git a/tools/libxl/libxl_stream_write.c b/tools/libxl/libxl_stream_write.c index 52a60d7..80d9208 100644 --- a/tools/libxl/libxl_stream_write.c +++ b/tools/libxl/libxl_stream_write.c @@ -167,6 +167,8 @@ static void setup_emulator_write(libxl__egc *egc, void *body, sws_record_done_cb cb) { + assert(stream->emu_sub_hdr.id !=3D EMULATOR_UNKNOWN); + assert(stream->device_model_version !=3D LIBXL_DEVICE_MODEL_VERSION_NONE); setup_generic_write(egc, stream, what, hdr, emu_hdr, body, cb); } @@ -207,6 +209,7 @@ void libxl__stream_write_init(libxl__stream_write_state *stream) FILLZERO(stream->emu_rec_hdr); FILLZERO(stream->emu_sub_hdr); stream->emu_body =3D NULL; + stream->device_model_version =3D LIBXL_DEVICE_MODEL_VERSION_UNKNOWN; } void libxl__stream_write_start(libxl__egc *egc, @@ -223,7 +226,9 @@ void libxl__stream_write_start(libxl__egc *egc, stream->running =3D true; if (dss->type =3D=3D LIBXL_DOMAIN_TYPE_HVM) { - switch (libxl__device_model_version_running(gc, dss->domid)) { + stream->device_model_version =3D + libxl__device_model_version_running(gc, dss->domid); + switch (stream->device_model_version) { case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: stream->emu_sub_hdr.id =3D EMULATOR_QEMU_TRADITIONAL; break; @@ -232,6 +237,10 @@ void libxl__stream_write_start(libxl__egc *egc, stream->emu_sub_hdr.id =3D EMULATOR_QEMU_UPSTREAM; break; + case LIBXL_DEVICE_MODEL_VERSION_NONE: + stream->emu_sub_hdr.id =3D EMULATOR_UNKNOWN; + break; + default: rc =3D ERROR_FAIL; LOG(ERROR, "Unknown emulator for HVM domain"); @@ -359,6 +368,11 @@ static void write_emulator_xenstore_record(libxl__egc *egc, char *buf =3D NULL; uint32_t len =3D 0; + if (stream->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + emulator_xenstore_record_done(egc, stream); + return; + } + rc =3D libxl__save_emulator_xenstore_data(dss, &buf, &len); if (rc) goto err; @@ -410,6 +424,11 @@ static void write_emulator_context_record(libxl__egc *egc, assert(dss->type =3D=3D LIBXL_DOMAIN_TYPE_HVM); + if (stream->device_model_version =3D=3D LIBXL_DEVICE_MODEL_VERSION_NONE) { + emulator_context_record_done(egc, stream); + return; + } + /* Convenience aliases */ const char *const filename =3D dss->dm_savefile; -- generated by git-patchbot for /home/xen/git/xen.git#master --===============2563946609520781786== 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 --===============2563946609520781786==-- From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44: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 1a9Zmq-0003m3-GM; Thu, 17 Dec 2015 14:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmp-0003lM-O3 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:07 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 97/AF-24450-73AC2765; Thu, 17 Dec 2015 14:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1450363445!11644140!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29656 invoked from network); 17 Dec 2015 14:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmm-0002M3-NH for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmm-0003il-Hb for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:04 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363193 -3600 # Node ID 1459670cb028b07052fb89169217342bfc5d7e26 # Parent c3b5fe4e94c6f8623bc59f99cbab6f8467b2953b pciback: return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled The guest sequence of: a) XEN_PCI_OP_enable_msi b) XEN_PCI_OP_enable_msi c) XEN_PCI_OP_disable_msi results in hitting an BUG_ON condition in the msi.c code. The MSI code uses an dev->msi_list to which it adds MSI entries. Under the above conditions an BUG_ON() can be hit. The device passed in the guest MUST have MSI capability. The a) adds the entry to the dev->msi_list and sets msi_enabled. The b) adds a second entry but adding in to SysFS fails (duplicate entry) and deletes all of the entries from msi_list and returns (with msi_enabled is still set). c) pci_disable_msi passes the msi_enabled checks and hits: BUG_ON(list_empty(dev_to_msi_list(&dev->dev))); and blows up. The patch adds a simple check in the XEN_PCI_OP_enable_msi to guard against that. The check for msix_enabled is not stricly neccessary. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Reviewed-by: David Vrabel Committed-by: Jan Beulich --- diff -r c3b5fe4e94c6 -r 1459670cb028 drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:38:33 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:39:53 2015 +0100 @@ -11,7 +11,14 @@ int pciback_enable_msi(struct pciback_device *pdev, struct pci_dev *dev, struct xen_pci_op *op) { - int status = pci_enable_msi(dev); + int status; + + if (dev->msi_enabled) + status = -EALREADY; + else if (dev->msix_enabled) + status = -ENXIO; + else + status = pci_enable_msi(dev); if (status) { if (printk_ratelimit()) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44: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 1a9Zmq-0003m3-GM; Thu, 17 Dec 2015 14:44:08 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmp-0003lM-O3 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:07 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id 97/AF-24450-73AC2765; Thu, 17 Dec 2015 14:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-9.tower-27.messagelabs.com!1450363445!11644140!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29656 invoked from network); 17 Dec 2015 14:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmm-0002M3-NH for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmm-0003il-Hb for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:04 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363193 -3600 # Node ID 1459670cb028b07052fb89169217342bfc5d7e26 # Parent c3b5fe4e94c6f8623bc59f99cbab6f8467b2953b pciback: return error on XEN_PCI_OP_enable_msi when device has MSI or MSI-X enabled The guest sequence of: a) XEN_PCI_OP_enable_msi b) XEN_PCI_OP_enable_msi c) XEN_PCI_OP_disable_msi results in hitting an BUG_ON condition in the msi.c code. The MSI code uses an dev->msi_list to which it adds MSI entries. Under the above conditions an BUG_ON() can be hit. The device passed in the guest MUST have MSI capability. The a) adds the entry to the dev->msi_list and sets msi_enabled. The b) adds a second entry but adding in to SysFS fails (duplicate entry) and deletes all of the entries from msi_list and returns (with msi_enabled is still set). c) pci_disable_msi passes the msi_enabled checks and hits: BUG_ON(list_empty(dev_to_msi_list(&dev->dev))); and blows up. The patch adds a simple check in the XEN_PCI_OP_enable_msi to guard against that. The check for msix_enabled is not stricly neccessary. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Reviewed-by: David Vrabel Committed-by: Jan Beulich --- diff -r c3b5fe4e94c6 -r 1459670cb028 drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:38:33 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:39:53 2015 +0100 @@ -11,7 +11,14 @@ int pciback_enable_msi(struct pciback_device *pdev, struct pci_dev *dev, struct xen_pci_op *op) { - int status = pci_enable_msi(dev); + int status; + + if (dev->msi_enabled) + status = -EALREADY; + else if (dev->msix_enabled) + status = -ENXIO; + else + status = pci_enable_msi(dev); if (status) { if (printk_ratelimit()) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44: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 1a9Zmr-0003mY-KB; Thu, 17 Dec 2015 14:44:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmq-0003lU-Cs for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:08 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 85/EC-31122-73AC2765; Thu, 17 Dec 2015 14:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1450363445!5912973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58861 invoked from network); 17 Dec 2015 14:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmn-0002M4-44 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmm-0003j0-Va for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:04 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363235 -3600 # Node ID e364811cb319b2c69f8a70a5b19d0084e1e23a1e # Parent 1459670cb028b07052fb89169217342bfc5d7e26 pciback: return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled The guest sequence of: a) XEN_PCI_OP_enable_msix b) XEN_PCI_OP_enable_msix results in hitting an NULL pointer due to using freed pointers. The device passed in the guest MUST have MSI-X capability. The a) constructs and SysFS representation of MSI and MSI groups. The b) adds a second set of them but adding in to SysFS fails (duplicate entry). 'populate_msi_sysfs' frees the newly allocated msi_irq_groups (note that in a) pdev->msi_irq_groups is still set) and also free's ALL of the MSI-X entries of the device (the ones allocated in step a) and b)). The unwind code: 'free_msi_irqs' deletes all the entries and tries to delete the pdev->msi_irq_groups (which hasn't been set to NULL). However the pointers in the SysFS are already freed and we hit an NULL pointer further on when 'strlen' is attempted on a freed pointer. The patch adds a simple check in the XEN_PCI_OP_enable_msix to guard against that. The check for msi_enabled is not stricly neccessary. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Reviewed-by: David Vrabel Committed-by: Jan Beulich --- diff -r 1459670cb028 -r e364811cb319 drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:39:53 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:40:35 2015 +0100 @@ -50,6 +50,12 @@ int pciback_enable_msix(struct pciback_d if (op->value > SH_INFO_MAX_VEC) return -EINVAL; + if (dev->msix_enabled) + return -EALREADY; + + if (dev->msi_enabled) + return -ENXIO; + entries = kmalloc(op->value * sizeof(*entries), GFP_KERNEL); if (entries == NULL) return -ENOMEM; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44: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 1a9Zmr-0003mY-KB; Thu, 17 Dec 2015 14:44:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmq-0003lU-Cs for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:08 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 85/EC-31122-73AC2765; Thu, 17 Dec 2015 14:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-6.tower-21.messagelabs.com!1450363445!5912973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58861 invoked from network); 17 Dec 2015 14:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmn-0002M4-44 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmm-0003j0-Va for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:04 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:04 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363235 -3600 # Node ID e364811cb319b2c69f8a70a5b19d0084e1e23a1e # Parent 1459670cb028b07052fb89169217342bfc5d7e26 pciback: return error on XEN_PCI_OP_enable_msix when device has MSI or MSI-X enabled The guest sequence of: a) XEN_PCI_OP_enable_msix b) XEN_PCI_OP_enable_msix results in hitting an NULL pointer due to using freed pointers. The device passed in the guest MUST have MSI-X capability. The a) constructs and SysFS representation of MSI and MSI groups. The b) adds a second set of them but adding in to SysFS fails (duplicate entry). 'populate_msi_sysfs' frees the newly allocated msi_irq_groups (note that in a) pdev->msi_irq_groups is still set) and also free's ALL of the MSI-X entries of the device (the ones allocated in step a) and b)). The unwind code: 'free_msi_irqs' deletes all the entries and tries to delete the pdev->msi_irq_groups (which hasn't been set to NULL). However the pointers in the SysFS are already freed and we hit an NULL pointer further on when 'strlen' is attempted on a freed pointer. The patch adds a simple check in the XEN_PCI_OP_enable_msix to guard against that. The check for msi_enabled is not stricly neccessary. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Reviewed-by: David Vrabel Committed-by: Jan Beulich --- diff -r 1459670cb028 -r e364811cb319 drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:39:53 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:40:35 2015 +0100 @@ -50,6 +50,12 @@ int pciback_enable_msix(struct pciback_d if (op->value > SH_INFO_MAX_VEC) return -EINVAL; + if (dev->msix_enabled) + return -EALREADY; + + if (dev->msi_enabled) + return -ENXIO; + entries = kmalloc(op->value * sizeof(*entries), GFP_KERNEL); if (entries == NULL) return -ENOMEM; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44: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 1a9Zmr-0003ms-O5; Thu, 17 Dec 2015 14:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmq-0003lP-C9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:08 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id BD/D7-09570-73AC2765; Thu, 17 Dec 2015 14:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1450363446!11369218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40264 invoked from network); 17 Dec 2015 14:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmn-0002ML-Ul for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmn-0003jZ-TU for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:05 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363356 -3600 # Node ID a2856e4ff93b7a8e70c1b2334375ac76d29e01d8 # Parent ed2cdf550df2951119af3623cf67750cdeffad59 pciback: don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set commit f598282f51 ("PCI: Fix the NIU MSI-X problem in a better way") teaches us that dealing with MSI-X can be troublesome. Further checks in the MSI-X architecture shows that if the PCI_COMMAND_MEMORY bit is turned of in the PCI_COMMAND we may not be able to access the BAR (since they are memory regions). Since the MSI-X tables are located in there.. that can lead to us causing PCIe errors. Inhibit us performing any operation on the MSI-X unless the MEMORY bit is set. Note that Xen hypervisor with: "x86/MSI-X: access MSI-X table only after having enabled MSI-X" will return: xen_pciback: 0000:0a:00.1: error -6 enabling MSI-X for guest 3! When the generic MSI code tries to setup the PIRQ without MEMORY bit set. Which means with later versions of Xen (4.6) this patch is not neccessary. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Committed-by: Jan Beulich --- diff -r ed2cdf550df2 -r a2856e4ff93b drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:41:47 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:42:36 2015 +0100 @@ -47,6 +47,7 @@ int pciback_enable_msix(struct pciback_d { int i, result; struct msix_entry *entries; + u16 cmd; if (op->value > SH_INFO_MAX_VEC) return -EINVAL; @@ -54,7 +55,12 @@ int pciback_enable_msix(struct pciback_d if (dev->msix_enabled) return -EALREADY; - if (dev->msi_enabled) + /* + * PCI_COMMAND_MEMORY must be enabled, otherwise we may not be able + * to access the BARs where the MSI-X entries reside. + */ + pci_read_config_word(dev, PCI_COMMAND, &cmd); + if (dev->msi_enabled || !(cmd & PCI_COMMAND_MEMORY)) return -ENXIO; entries = kmalloc(op->value * sizeof(*entries), GFP_KERNEL); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44: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 1a9Zmr-0003ms-O5; Thu, 17 Dec 2015 14:44:09 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmq-0003lP-C9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:08 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id BD/D7-09570-73AC2765; Thu, 17 Dec 2015 14:44:07 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-2.tower-31.messagelabs.com!1450363446!11369218!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40264 invoked from network); 17 Dec 2015 14:44:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmn-0002ML-Ul for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmn-0003jZ-TU for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:05 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363356 -3600 # Node ID a2856e4ff93b7a8e70c1b2334375ac76d29e01d8 # Parent ed2cdf550df2951119af3623cf67750cdeffad59 pciback: don't allow MSI-X ops if PCI_COMMAND_MEMORY is not set commit f598282f51 ("PCI: Fix the NIU MSI-X problem in a better way") teaches us that dealing with MSI-X can be troublesome. Further checks in the MSI-X architecture shows that if the PCI_COMMAND_MEMORY bit is turned of in the PCI_COMMAND we may not be able to access the BAR (since they are memory regions). Since the MSI-X tables are located in there.. that can lead to us causing PCIe errors. Inhibit us performing any operation on the MSI-X unless the MEMORY bit is set. Note that Xen hypervisor with: "x86/MSI-X: access MSI-X table only after having enabled MSI-X" will return: xen_pciback: 0000:0a:00.1: error -6 enabling MSI-X for guest 3! When the generic MSI code tries to setup the PIRQ without MEMORY bit set. Which means with later versions of Xen (4.6) this patch is not neccessary. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: Jan Beulich Committed-by: Jan Beulich --- diff -r ed2cdf550df2 -r a2856e4ff93b drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:41:47 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:42:36 2015 +0100 @@ -47,6 +47,7 @@ int pciback_enable_msix(struct pciback_d { int i, result; struct msix_entry *entries; + u16 cmd; if (op->value > SH_INFO_MAX_VEC) return -EINVAL; @@ -54,7 +55,12 @@ int pciback_enable_msix(struct pciback_d if (dev->msix_enabled) return -EALREADY; - if (dev->msi_enabled) + /* + * PCI_COMMAND_MEMORY must be enabled, otherwise we may not be able + * to access the BARs where the MSI-X entries reside. + */ + pci_read_config_word(dev, PCI_COMMAND, &cmd); + if (dev->msi_enabled || !(cmd & PCI_COMMAND_MEMORY)) return -ENXIO; entries = kmalloc(op->value * sizeof(*entries), GFP_KERNEL); _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zms-0003nN-SU; Thu, 17 Dec 2015 14:44:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmr-0003mO-L0 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id E4/43-12831-83AC2765; Thu, 17 Dec 2015 14:44:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-206.messagelabs.com!1450363445!11122973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23738 invoked from network); 17 Dec 2015 14:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmm-0002M2-88 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmm-0003iW-46 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:04 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: don't use last request to determine minimum Tx credit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 David Vrabel # Date 1450363113 -3600 # Node ID c3b5fe4e94c6f8623bc59f99cbab6f8467b2953b # Parent 52a7179e39e70f9095cd93fee508116a342717c4 netback: don't use last request to determine minimum Tx credit The last from guest transmitted request gives no indication about the minimum amount of credit that the guest might need to send a packet since the last packet might have been a small one. Instead allow for the worst case 128 KiB packet. This is part of CVE-2015-8550 / XSA-155. Signed-off-by: David Vrabel Reviewed-by: Wei Liu Committed-by: Jan Beulich --- diff -r 52a7179e39e7 -r c3b5fe4e94c6 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Thu Dec 17 15:32:47 2015 +0100 +++ b/drivers/xen/netback/netback.c Thu Dec 17 15:38:33 2015 +0100 @@ -868,9 +868,7 @@ static void tx_add_credit(netif_t *netif * Allow a burst big enough to transmit a jumbo packet of up to 128kB. * Otherwise the interface can seize up due to insufficient credit. */ - max_burst = RING_GET_REQUEST(&netif->tx, netif->tx.req_cons)->size; - max_burst = min(max_burst, 131072UL); - max_burst = max(max_burst, netif->credit_bytes); + max_burst = max(131072UL, netif->credit_bytes); /* Take care that adding a new chunk of credit doesn't wrap to zero. */ max_credit = netif->remaining_credit + netif->credit_bytes; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:10 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zms-0003nN-SU; Thu, 17 Dec 2015 14:44:10 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmr-0003mO-L0 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:09 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id E4/43-12831-83AC2765; Thu, 17 Dec 2015 14:44:08 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-15.tower-206.messagelabs.com!1450363445!11122973!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23738 invoked from network); 17 Dec 2015 14:44:06 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 14:44:06 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmm-0002M2-88 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmm-0003iW-46 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:04 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] netback: don't use last request to determine minimum Tx credit X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 David Vrabel # Date 1450363113 -3600 # Node ID c3b5fe4e94c6f8623bc59f99cbab6f8467b2953b # Parent 52a7179e39e70f9095cd93fee508116a342717c4 netback: don't use last request to determine minimum Tx credit The last from guest transmitted request gives no indication about the minimum amount of credit that the guest might need to send a packet since the last packet might have been a small one. Instead allow for the worst case 128 KiB packet. This is part of CVE-2015-8550 / XSA-155. Signed-off-by: David Vrabel Reviewed-by: Wei Liu Committed-by: Jan Beulich --- diff -r 52a7179e39e7 -r c3b5fe4e94c6 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Thu Dec 17 15:32:47 2015 +0100 +++ b/drivers/xen/netback/netback.c Thu Dec 17 15:38:33 2015 +0100 @@ -868,9 +868,7 @@ static void tx_add_credit(netif_t *netif * Allow a burst big enough to transmit a jumbo packet of up to 128kB. * Otherwise the interface can seize up due to insufficient credit. */ - max_burst = RING_GET_REQUEST(&netif->tx, netif->tx.req_cons)->size; - max_burst = min(max_burst, 131072UL); - max_burst = max(max_burst, netif->credit_bytes); + max_burst = max(131072UL, netif->credit_bytes); /* Take care that adding a new chunk of credit doesn't wrap to zero. */ max_credit = netif->remaining_credit + netif->credit_bytes; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmv-0003ob-0t; Thu, 17 Dec 2015 14:44:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zms-0003nL-S6 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:11 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id DE/D5-21571-A3AC2765; Thu, 17 Dec 2015 14:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1450363445!5902096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46856 invoked from network); 17 Dec 2015 14:44:07 -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; 17 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zml-0002M1-OT for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zml-0003iE-I9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:03 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] backends: guarantee one time reads of shared ring contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1450362767 -3600 # Node ID 52a7179e39e70f9095cd93fee508116a342717c4 # Parent a0a79976ffebcfa5ff55feb09f833fc1adbeb2e8 backends: guarantee one time reads of shared ring contents Address double fetch vulnerabilities, occurring when a variable is fetched twice from shared memory but a security check is only performed on the first fetched value. This is part of CVE-2015-8550 / XSA-155. Signed-off-by: Jan Beulich --- diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/blkback/blkback.c --- a/drivers/xen/blkback/blkback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/blkback/blkback.c Thu Dec 17 15:32:47 2015 +0100 @@ -363,6 +363,9 @@ static int _do_block_io_op(blkif_t *blki ++rc; + /* Apply all sanity checks to /private copy/ of request. */ + barrier(); + switch (req.operation) { case BLKIF_OP_READ: case BLKIF_OP_WRITE: @@ -375,10 +378,6 @@ static int _do_block_io_op(blkif_t *blki /* before make_response() */ blk_rings->common.req_cons = rc; - - /* Apply all sanity checks to /private copy/ of request. */ - barrier(); - dispatch_rw_block_io(blkif, &req, pending_req); break; default: @@ -386,7 +385,6 @@ static int _do_block_io_op(blkif_t *blki * avoid excessive CPU consumption by a bad guest. */ msleep(1); blk_rings->common.req_cons = rc; - barrier(); DPRINTK("error: unknown block io operation [%d]\n", req.operation); make_response(blkif, req.id, req.operation, diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/netback/netback.c Thu Dec 17 15:32:47 2015 +0100 @@ -1057,6 +1057,7 @@ static int netbk_count_requests(netif_t memcpy(txp, RING_GET_REQUEST(&netif->tx, cons + frags), sizeof(*txp)); + barrier(); /* * If the guest submitted a frame >= 64 KiB then first->size @@ -1237,6 +1238,7 @@ int netbk_get_extras(netif_t *netif, str memcpy(&extra, RING_GET_REQUEST(&netif->tx, cons), sizeof(extra)); + barrier(); if (unlikely(!extra.type || extra.type >= XEN_NETIF_EXTRA_TYPE_MAX)) { netif->tx.req_cons = ++cons; @@ -1335,6 +1337,7 @@ static void net_tx_action(unsigned long i = netif->tx.req_cons; rmb(); /* Ensure that we see the request before we copy it. */ memcpy(&txreq, RING_GET_REQUEST(&netif->tx, i), sizeof(txreq)); + barrier(); /* Credit-based scheduling. */ if (txreq.size > netif->remaining_credit) { diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/pciback/pciback.h --- a/drivers/xen/pciback/pciback.h Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/pciback/pciback.h Thu Dec 17 15:32:47 2015 +0100 @@ -42,6 +42,7 @@ struct pciback_device { unsigned long flags; struct work_struct op_work; + struct xen_pci_op op; }; struct pciback_dev_data { diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/pciback/pciback_ops.c --- a/drivers/xen/pciback/pciback_ops.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/pciback/pciback_ops.c Thu Dec 17 15:32:47 2015 +0100 @@ -79,8 +79,10 @@ void pciback_do_op(void *data) { struct pciback_device *pdev = data; struct pci_dev *dev; - struct xen_pci_op *op = &pdev->sh_info->op; + struct xen_pci_op *op = &pdev->op; + *op = pdev->sh_info->op; + barrier(); dev = pciback_get_pci_dev(pdev, op->domain, op->bus, op->devfn); if (dev == NULL) @@ -116,6 +118,17 @@ void pciback_do_op(void *data) break; } } + pdev->sh_info->op.err = op->err; + pdev->sh_info->op.value = op->value; +#ifdef CONFIG_PCI_MSI + if (op->cmd == XEN_PCI_OP_enable_msix && op->err == 0) { + unsigned int i; + + for (i = 0; i < op->value; i++) + pdev->sh_info->op.msix_entries[i].vector = + op->msix_entries[i].vector; + } +#endif /* Tell the driver domain that we're done. */ wmb(); clear_bit(_XEN_PCIF_active, (unsigned long *)&pdev->sh_info->flags); diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/scsiback/scsiback.c --- a/drivers/xen/scsiback/scsiback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/scsiback/scsiback.c Thu Dec 17 15:32:47 2015 +0100 @@ -515,11 +515,13 @@ static int prepare_pending_reqs(struct v pending_req->info = info; - pending_req->v_chn = vir.chn = ring_req->channel; - pending_req->v_tgt = vir.tgt = ring_req->id; + vir.chn = ring_req->channel; + vir.tgt = ring_req->id; vir.lun = ring_req->lun; + rmb(); + pending_req->v_chn = vir.chn; + pending_req->v_tgt = vir.tgt; - rmb(); sdev = scsiback_do_translation(info, &vir); if (!sdev) { pending_req->sdev = NULL; diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/tpmback/tpmback.c --- a/drivers/xen/tpmback/tpmback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/tpmback/tpmback.c Thu Dec 17 15:32:47 2015 +0100 @@ -245,17 +245,16 @@ int _packet_write(struct packet *pak, unsigned int tocopy; struct gnttab_map_grant_ref map_op; struct gnttab_unmap_grant_ref unmap_op; - tpmif_tx_request_t *tx; + tpmif_tx_request_t tx = tpmif->tx->ring[i].req; - tx = &tpmif->tx->ring[i].req; - - if (0 == tx->addr) { + rmb(); + if (0 == tx.addr) { DPRINTK("ERROR: Buffer for outgoing packet NULL?! i=%d\n", i); return 0; } gnttab_set_map_op(&map_op, idx_to_kaddr(tpmif, i), - GNTMAP_host_map, tx->ref, tpmif->domid); + GNTMAP_host_map, tx.ref, tpmif->domid); gnttab_check_GNTST_eagain_do_while(GNTTABOP_map_grant_ref, &map_op); @@ -269,12 +268,12 @@ int _packet_write(struct packet *pak, tocopy = min_t(size_t, size - offset, PAGE_SIZE); if (copy_from_buffer((void *)(idx_to_kaddr(tpmif, i) | - (tx->addr & ~PAGE_MASK)), + (tx.addr & ~PAGE_MASK)), &data[offset], tocopy, isuserbuffer)) { tpmif_put(tpmif); return -EFAULT; } - tx->size = tocopy; + tpmif->tx->ring[i].req.size = tocopy; gnttab_set_unmap_op(&unmap_op, idx_to_kaddr(tpmif, i), GNTMAP_host_map, handle); @@ -373,9 +372,6 @@ static int packet_read_shmem(struct pack u32 to_copy; grant_handle_t handle; - tpmif_tx_request_t *tx; - - tx = &tpmif->tx->ring[0].req; /* * Start copying data at the page with index 'index' * and within that page at offset 'offset'. @@ -386,11 +382,11 @@ static int packet_read_shmem(struct pack void *src; struct gnttab_map_grant_ref map_op; struct gnttab_unmap_grant_ref unmap_op; + tpmif_tx_request_t tx = tpmif->tx->ring[i].req; - tx = &tpmif->tx->ring[i].req; - + rmb(); gnttab_set_map_op(&map_op, idx_to_kaddr(tpmif, i), - GNTMAP_host_map, tx->ref, tpmif->domid); + GNTMAP_host_map, tx.ref, tpmif->domid); gnttab_check_GNTST_eagain_do_while(GNTTABOP_map_grant_ref, &map_op); @@ -401,19 +397,19 @@ static int packet_read_shmem(struct pack handle = map_op.handle; - if (to_copy > tx->size) { + if (to_copy > tx.size) { /* * User requests more than what's available */ - to_copy = min_t(u32, tx->size, to_copy); + to_copy = min_t(u32, tx.size, to_copy); } DPRINTK("Copying from mapped memory at %08lx\n", (unsigned long)(idx_to_kaddr(tpmif, i) | - (tx->addr & ~PAGE_MASK))); + (tx.addr & ~PAGE_MASK))); src = (void *)(idx_to_kaddr(tpmif, i) | - ((tx->addr & ~PAGE_MASK) + pg_offset)); + ((tx.addr & ~PAGE_MASK) + pg_offset)); if (copy_to_buffer(&buffer[offset], src, to_copy, isuserbuffer)) { return -EFAULT; @@ -874,21 +870,23 @@ static void tpm_tx_action(unsigned long { struct list_head *ent; tpmif_t *tpmif; - tpmif_tx_request_t *tx; DPRINTK("%s: Getting data from front-end(s)!\n", __FUNCTION__); while (!list_empty(&tpm_schedule_list)) { + tpmif_tx_request_t tx; + /* Get a tpmif from the list with work to do. */ ent = tpm_schedule_list.next; tpmif = list_entry(ent, tpmif_t, list); tpmif_get(tpmif); remove_from_tpm_schedule_list(tpmif); - tx = &tpmif->tx->ring[0].req; + tx = tpmif->tx->ring[0].req; + rmb(); /* pass it up */ - vtpm_receive(tpmif, tx->size); + vtpm_receive(tpmif, tx.size); tpmif_put(tpmif); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmv-0003ob-0t; Thu, 17 Dec 2015 14:44:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zms-0003nL-S6 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:11 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id DE/D5-21571-A3AC2765; Thu, 17 Dec 2015 14:44:10 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1450363445!5902096!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46856 invoked from network); 17 Dec 2015 14:44:07 -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; 17 Dec 2015 14:44:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zml-0002M1-OT for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zml-0003iE-I9 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:03 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:03 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] backends: guarantee one time reads of shared ring contents X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: 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 1450362767 -3600 # Node ID 52a7179e39e70f9095cd93fee508116a342717c4 # Parent a0a79976ffebcfa5ff55feb09f833fc1adbeb2e8 backends: guarantee one time reads of shared ring contents Address double fetch vulnerabilities, occurring when a variable is fetched twice from shared memory but a security check is only performed on the first fetched value. This is part of CVE-2015-8550 / XSA-155. Signed-off-by: Jan Beulich --- diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/blkback/blkback.c --- a/drivers/xen/blkback/blkback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/blkback/blkback.c Thu Dec 17 15:32:47 2015 +0100 @@ -363,6 +363,9 @@ static int _do_block_io_op(blkif_t *blki ++rc; + /* Apply all sanity checks to /private copy/ of request. */ + barrier(); + switch (req.operation) { case BLKIF_OP_READ: case BLKIF_OP_WRITE: @@ -375,10 +378,6 @@ static int _do_block_io_op(blkif_t *blki /* before make_response() */ blk_rings->common.req_cons = rc; - - /* Apply all sanity checks to /private copy/ of request. */ - barrier(); - dispatch_rw_block_io(blkif, &req, pending_req); break; default: @@ -386,7 +385,6 @@ static int _do_block_io_op(blkif_t *blki * avoid excessive CPU consumption by a bad guest. */ msleep(1); blk_rings->common.req_cons = rc; - barrier(); DPRINTK("error: unknown block io operation [%d]\n", req.operation); make_response(blkif, req.id, req.operation, diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/netback/netback.c --- a/drivers/xen/netback/netback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/netback/netback.c Thu Dec 17 15:32:47 2015 +0100 @@ -1057,6 +1057,7 @@ static int netbk_count_requests(netif_t memcpy(txp, RING_GET_REQUEST(&netif->tx, cons + frags), sizeof(*txp)); + barrier(); /* * If the guest submitted a frame >= 64 KiB then first->size @@ -1237,6 +1238,7 @@ int netbk_get_extras(netif_t *netif, str memcpy(&extra, RING_GET_REQUEST(&netif->tx, cons), sizeof(extra)); + barrier(); if (unlikely(!extra.type || extra.type >= XEN_NETIF_EXTRA_TYPE_MAX)) { netif->tx.req_cons = ++cons; @@ -1335,6 +1337,7 @@ static void net_tx_action(unsigned long i = netif->tx.req_cons; rmb(); /* Ensure that we see the request before we copy it. */ memcpy(&txreq, RING_GET_REQUEST(&netif->tx, i), sizeof(txreq)); + barrier(); /* Credit-based scheduling. */ if (txreq.size > netif->remaining_credit) { diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/pciback/pciback.h --- a/drivers/xen/pciback/pciback.h Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/pciback/pciback.h Thu Dec 17 15:32:47 2015 +0100 @@ -42,6 +42,7 @@ struct pciback_device { unsigned long flags; struct work_struct op_work; + struct xen_pci_op op; }; struct pciback_dev_data { diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/pciback/pciback_ops.c --- a/drivers/xen/pciback/pciback_ops.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/pciback/pciback_ops.c Thu Dec 17 15:32:47 2015 +0100 @@ -79,8 +79,10 @@ void pciback_do_op(void *data) { struct pciback_device *pdev = data; struct pci_dev *dev; - struct xen_pci_op *op = &pdev->sh_info->op; + struct xen_pci_op *op = &pdev->op; + *op = pdev->sh_info->op; + barrier(); dev = pciback_get_pci_dev(pdev, op->domain, op->bus, op->devfn); if (dev == NULL) @@ -116,6 +118,17 @@ void pciback_do_op(void *data) break; } } + pdev->sh_info->op.err = op->err; + pdev->sh_info->op.value = op->value; +#ifdef CONFIG_PCI_MSI + if (op->cmd == XEN_PCI_OP_enable_msix && op->err == 0) { + unsigned int i; + + for (i = 0; i < op->value; i++) + pdev->sh_info->op.msix_entries[i].vector = + op->msix_entries[i].vector; + } +#endif /* Tell the driver domain that we're done. */ wmb(); clear_bit(_XEN_PCIF_active, (unsigned long *)&pdev->sh_info->flags); diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/scsiback/scsiback.c --- a/drivers/xen/scsiback/scsiback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/scsiback/scsiback.c Thu Dec 17 15:32:47 2015 +0100 @@ -515,11 +515,13 @@ static int prepare_pending_reqs(struct v pending_req->info = info; - pending_req->v_chn = vir.chn = ring_req->channel; - pending_req->v_tgt = vir.tgt = ring_req->id; + vir.chn = ring_req->channel; + vir.tgt = ring_req->id; vir.lun = ring_req->lun; + rmb(); + pending_req->v_chn = vir.chn; + pending_req->v_tgt = vir.tgt; - rmb(); sdev = scsiback_do_translation(info, &vir); if (!sdev) { pending_req->sdev = NULL; diff -r a0a79976ffeb -r 52a7179e39e7 drivers/xen/tpmback/tpmback.c --- a/drivers/xen/tpmback/tpmback.c Mon Nov 16 13:40:35 2015 +0100 +++ b/drivers/xen/tpmback/tpmback.c Thu Dec 17 15:32:47 2015 +0100 @@ -245,17 +245,16 @@ int _packet_write(struct packet *pak, unsigned int tocopy; struct gnttab_map_grant_ref map_op; struct gnttab_unmap_grant_ref unmap_op; - tpmif_tx_request_t *tx; + tpmif_tx_request_t tx = tpmif->tx->ring[i].req; - tx = &tpmif->tx->ring[i].req; - - if (0 == tx->addr) { + rmb(); + if (0 == tx.addr) { DPRINTK("ERROR: Buffer for outgoing packet NULL?! i=%d\n", i); return 0; } gnttab_set_map_op(&map_op, idx_to_kaddr(tpmif, i), - GNTMAP_host_map, tx->ref, tpmif->domid); + GNTMAP_host_map, tx.ref, tpmif->domid); gnttab_check_GNTST_eagain_do_while(GNTTABOP_map_grant_ref, &map_op); @@ -269,12 +268,12 @@ int _packet_write(struct packet *pak, tocopy = min_t(size_t, size - offset, PAGE_SIZE); if (copy_from_buffer((void *)(idx_to_kaddr(tpmif, i) | - (tx->addr & ~PAGE_MASK)), + (tx.addr & ~PAGE_MASK)), &data[offset], tocopy, isuserbuffer)) { tpmif_put(tpmif); return -EFAULT; } - tx->size = tocopy; + tpmif->tx->ring[i].req.size = tocopy; gnttab_set_unmap_op(&unmap_op, idx_to_kaddr(tpmif, i), GNTMAP_host_map, handle); @@ -373,9 +372,6 @@ static int packet_read_shmem(struct pack u32 to_copy; grant_handle_t handle; - tpmif_tx_request_t *tx; - - tx = &tpmif->tx->ring[0].req; /* * Start copying data at the page with index 'index' * and within that page at offset 'offset'. @@ -386,11 +382,11 @@ static int packet_read_shmem(struct pack void *src; struct gnttab_map_grant_ref map_op; struct gnttab_unmap_grant_ref unmap_op; + tpmif_tx_request_t tx = tpmif->tx->ring[i].req; - tx = &tpmif->tx->ring[i].req; - + rmb(); gnttab_set_map_op(&map_op, idx_to_kaddr(tpmif, i), - GNTMAP_host_map, tx->ref, tpmif->domid); + GNTMAP_host_map, tx.ref, tpmif->domid); gnttab_check_GNTST_eagain_do_while(GNTTABOP_map_grant_ref, &map_op); @@ -401,19 +397,19 @@ static int packet_read_shmem(struct pack handle = map_op.handle; - if (to_copy > tx->size) { + if (to_copy > tx.size) { /* * User requests more than what's available */ - to_copy = min_t(u32, tx->size, to_copy); + to_copy = min_t(u32, tx.size, to_copy); } DPRINTK("Copying from mapped memory at %08lx\n", (unsigned long)(idx_to_kaddr(tpmif, i) | - (tx->addr & ~PAGE_MASK))); + (tx.addr & ~PAGE_MASK))); src = (void *)(idx_to_kaddr(tpmif, i) | - ((tx->addr & ~PAGE_MASK) + pg_offset)); + ((tx.addr & ~PAGE_MASK) + pg_offset)); if (copy_to_buffer(&buffer[offset], src, to_copy, isuserbuffer)) { return -EFAULT; @@ -874,21 +870,23 @@ static void tpm_tx_action(unsigned long { struct list_head *ent; tpmif_t *tpmif; - tpmif_tx_request_t *tx; DPRINTK("%s: Getting data from front-end(s)!\n", __FUNCTION__); while (!list_empty(&tpm_schedule_list)) { + tpmif_tx_request_t tx; + /* Get a tpmif from the list with work to do. */ ent = tpm_schedule_list.next; tpmif = list_entry(ent, tpmif_t, list); tpmif_get(tpmif); remove_from_tpm_schedule_list(tpmif); - tx = &tpmif->tx->ring[0].req; + tx = tpmif->tx->ring[0].req; + rmb(); /* pass it up */ - vtpm_receive(tpmif, tx->size); + vtpm_receive(tpmif, tx.size); tpmif_put(tpmif); } _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmv-0003or-5H; Thu, 17 Dec 2015 14:44:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmt-0003o4-Kh for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:11 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id B2/DD-18316-B3AC2765; Thu, 17 Dec 2015 14:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1450363445!6038282!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 636 invoked from network); 17 Dec 2015 14:44:08 -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; 17 Dec 2015 14:44:08 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmn-0002MH-JL for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmn-0003jK-BZ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:05 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: for XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363307 -3600 # Node ID ed2cdf550df2951119af3623cf67750cdeffad59 # Parent e364811cb319b2c69f8a70a5b19d0084e1e23a1e pciback: for XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled Otherwise just continue on, returning the same values as previously (return of 0, and op->result has the PIRQ value). This does not change the behavior of XEN_PCI_OP_disable_msi[|x]. The pci_disable_msi or pci_disable_msix have the checks for msi_enabled or msix_enabled so they will error out immediately. However the guest can still call these operations and cause us to disable the 'ack_intr'. That means the backend IRQ handler for the legacy interrupt will not respond to interrupts anymore. This will lead to (if the device is causing an interrupt storm) for the Linux generic code to disable the interrupt line. Naturally this will only happen if the device in question is plugged in on the motherboard on shared level interrupt GSI. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: David Vrabel Committed-by: Jan Beulich --- diff -r e364811cb319 -r ed2cdf550df2 drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:40:35 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:41:47 2015 +0100 @@ -35,7 +35,8 @@ int pciback_enable_msi(struct pciback_de int pciback_disable_msi(struct pciback_device *pdev, struct pci_dev *dev, struct xen_pci_op *op) { - pci_disable_msi(dev); + if (dev->msi_enabled) + pci_disable_msi(dev); op->value = dev->irq; return 0; @@ -82,8 +83,8 @@ int pciback_enable_msix(struct pciback_d int pciback_disable_msix(struct pciback_device *pdev, struct pci_dev *dev, struct xen_pci_op *op) { - - pci_disable_msix(dev); + if (dev->msix_enabled) + pci_disable_msix(dev); op->value = dev->irq; return 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 14:44:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 14:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmv-0003or-5H; Thu, 17 Dec 2015 14:44:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmt-0003o4-Kh for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:11 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id B2/DD-18316-B3AC2765; Thu, 17 Dec 2015 14:44:11 +0000 X-Env-Sender: xen@xenbits.xen.org X-Msg-Ref: server-7.tower-21.messagelabs.com!1450363445!6038282!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 636 invoked from network); 17 Dec 2015 14:44:08 -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; 17 Dec 2015 14:44:08 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9Zmn-0002MH-JL for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9Zmn-0003jK-BZ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 14:44:05 +0000 Message-Id: Date: Thu, 17 Dec 2015 14:44:05 +0000 From: Xen patchbot-linux-2.6.18-xen To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [linux-2.6.18-xen] pciback: for XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org # HG changeset patch # User Konrad Rzeszutek Wilk # Date 1450363307 -3600 # Node ID ed2cdf550df2951119af3623cf67750cdeffad59 # Parent e364811cb319b2c69f8a70a5b19d0084e1e23a1e pciback: for XEN_PCI_OP_disable_msi[|x] only disable if device has MSI(X) enabled Otherwise just continue on, returning the same values as previously (return of 0, and op->result has the PIRQ value). This does not change the behavior of XEN_PCI_OP_disable_msi[|x]. The pci_disable_msi or pci_disable_msix have the checks for msi_enabled or msix_enabled so they will error out immediately. However the guest can still call these operations and cause us to disable the 'ack_intr'. That means the backend IRQ handler for the legacy interrupt will not respond to interrupts anymore. This will lead to (if the device is causing an interrupt storm) for the Linux generic code to disable the interrupt line. Naturally this will only happen if the device in question is plugged in on the motherboard on shared level interrupt GSI. This is part of CVE-2015-8551 + CVE-2015-8552 / XSA-157. Signed-off-by: Konrad Rzeszutek Wilk Reviewed-by: David Vrabel Committed-by: Jan Beulich --- diff -r e364811cb319 -r ed2cdf550df2 drivers/xen/pciback/conf_space_capability_msi.c --- a/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:40:35 2015 +0100 +++ b/drivers/xen/pciback/conf_space_capability_msi.c Thu Dec 17 15:41:47 2015 +0100 @@ -35,7 +35,8 @@ int pciback_enable_msi(struct pciback_de int pciback_disable_msi(struct pciback_device *pdev, struct pci_dev *dev, struct xen_pci_op *op) { - pci_disable_msi(dev); + if (dev->msi_enabled) + pci_disable_msi(dev); op->value = dev->irq; return 0; @@ -82,8 +83,8 @@ int pciback_enable_msix(struct pciback_d int pciback_disable_msix(struct pciback_device *pdev, struct pci_dev *dev, struct xen_pci_op *op) { - - pci_disable_msix(dev); + if (dev->msix_enabled) + pci_disable_msix(dev); op->value = dev->irq; return 0; _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dX6-0007Aj-2q; Thu, 17 Dec 2015 18:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dX4-0007Ad-Pf for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:06 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7D/64-18633-67203765; Thu, 17 Dec 2015 18:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1450377844!11442869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47641 invoked from network); 17 Dec 2015 18:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 18:44:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dX2-0005RD-Ji for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dX2-0002GB-GT for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:04 +0000 Date: Thu, 17 Dec 2015 18:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/PoD: Make p2m_pod_empty_cache() restartable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92bea0a4d1a2517142c2ccc0482fc16f4c0dc6d1 Author: Andrew Cooper AuthorDate: Tue Dec 15 15:33:17 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:33:17 2015 +0100 x86/PoD: Make p2m_pod_empty_cache() restartable This avoids a long running operation when destroying a domain with a large PoD cache. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap master commit: 59a5061723ba47c0028cf48487e5de551c42a378 master date: 2015-11-02 15:33:38 +0100 --- xen/arch/x86/mm/p2m-pod.c | 16 +++++++++++----- xen/arch/x86/mm/paging.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index b880e12..1282f6b 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -376,11 +376,11 @@ out: return ret; } -void -p2m_pod_empty_cache(struct domain *d) +int p2m_pod_empty_cache(struct domain *d) { struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page; + unsigned int i; /* After this barrier no new PoD activities can happen. */ BUG_ON(!d->is_dying); @@ -390,8 +390,6 @@ p2m_pod_empty_cache(struct domain *d) while ( (page = page_list_remove_head(&p2m->pod.super)) ) { - int i; - for ( i = 0 ; i < SUPERPAGE_PAGES ; i++ ) { BUG_ON(page_get_owner(page + i) != d); @@ -399,19 +397,27 @@ p2m_pod_empty_cache(struct domain *d) } p2m->pod.count -= SUPERPAGE_PAGES; + + if ( hypercall_preempt_check() ) + goto out; } - while ( (page = page_list_remove_head(&p2m->pod.single)) ) + for ( i = 0; (page = page_list_remove_head(&p2m->pod.single)); ++i ) { BUG_ON(page_get_owner(page) != d); page_list_add_tail(page, &d->page_list); p2m->pod.count -= 1; + + if ( i && !(i & 511) && hypercall_preempt_check() ) + goto out; } BUG_ON(p2m->pod.count != 0); + out: unlock_page_alloc(p2m); + return p2m->pod.count ? -ERESTART : 0; } int diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 3b502e8..37e2a12 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -795,7 +795,7 @@ int paging_teardown(struct domain *d) return rc; /* Move populate-on-demand cache back to domain_list for destruction */ - p2m_pod_empty_cache(d); + rc = p2m_pod_empty_cache(d); return rc; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index de0136f..3626a1d 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -532,7 +532,7 @@ void p2m_pod_dump_data(struct domain *d); /* Move all pages from the populate-on-demand cache to the domain page_list * (usually in preparation for domain destruction) */ -void p2m_pod_empty_cache(struct domain *d); +int p2m_pod_empty_cache(struct domain *d); /* Set populate-on-demand cache size so that the total memory allocated to a * domain matches target */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dX6-0007Aj-2q; Thu, 17 Dec 2015 18:44:08 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dX4-0007Ad-Pf for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:06 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 7D/64-18633-67203765; Thu, 17 Dec 2015 18:44:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1450377844!11442869!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47641 invoked from network); 17 Dec 2015 18:44:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 18:44:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dX2-0005RD-Ji for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dX2-0002GB-GT for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:04 +0000 Date: Thu, 17 Dec 2015 18:44:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/PoD: Make p2m_pod_empty_cache() restartable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 92bea0a4d1a2517142c2ccc0482fc16f4c0dc6d1 Author: Andrew Cooper AuthorDate: Tue Dec 15 15:33:17 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:33:17 2015 +0100 x86/PoD: Make p2m_pod_empty_cache() restartable This avoids a long running operation when destroying a domain with a large PoD cache. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap master commit: 59a5061723ba47c0028cf48487e5de551c42a378 master date: 2015-11-02 15:33:38 +0100 --- xen/arch/x86/mm/p2m-pod.c | 16 +++++++++++----- xen/arch/x86/mm/paging.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index b880e12..1282f6b 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -376,11 +376,11 @@ out: return ret; } -void -p2m_pod_empty_cache(struct domain *d) +int p2m_pod_empty_cache(struct domain *d) { struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page; + unsigned int i; /* After this barrier no new PoD activities can happen. */ BUG_ON(!d->is_dying); @@ -390,8 +390,6 @@ p2m_pod_empty_cache(struct domain *d) while ( (page = page_list_remove_head(&p2m->pod.super)) ) { - int i; - for ( i = 0 ; i < SUPERPAGE_PAGES ; i++ ) { BUG_ON(page_get_owner(page + i) != d); @@ -399,19 +397,27 @@ p2m_pod_empty_cache(struct domain *d) } p2m->pod.count -= SUPERPAGE_PAGES; + + if ( hypercall_preempt_check() ) + goto out; } - while ( (page = page_list_remove_head(&p2m->pod.single)) ) + for ( i = 0; (page = page_list_remove_head(&p2m->pod.single)); ++i ) { BUG_ON(page_get_owner(page) != d); page_list_add_tail(page, &d->page_list); p2m->pod.count -= 1; + + if ( i && !(i & 511) && hypercall_preempt_check() ) + goto out; } BUG_ON(p2m->pod.count != 0); + out: unlock_page_alloc(p2m); + return p2m->pod.count ? -ERESTART : 0; } int diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 3b502e8..37e2a12 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -795,7 +795,7 @@ int paging_teardown(struct domain *d) return rc; /* Move populate-on-demand cache back to domain_list for destruction */ - p2m_pod_empty_cache(d); + rc = p2m_pod_empty_cache(d); return rc; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index de0136f..3626a1d 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -532,7 +532,7 @@ void p2m_pod_dump_data(struct domain *d); /* Move all pages from the populate-on-demand cache to the domain page_list * (usually in preparation for domain destruction) */ -void p2m_pod_empty_cache(struct domain *d); +int p2m_pod_empty_cache(struct domain *d); /* Set populate-on-demand cache size so that the total memory allocated to a * domain matches target */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXG-0007BZ-8K; Thu, 17 Dec 2015 18:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXF-0007BR-DB for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 87/99-09570-08203765; Thu, 17 Dec 2015 18:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1450377855!1847601!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3737 invoked from network); 17 Dec 2015 18:44:16 -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; 17 Dec 2015 18:44:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXD-0005RL-3U for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXC-0002Ge-SF for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:14 +0000 Date: Thu, 17 Dec 2015 18:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/vmx: improvements to vmentry failure handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96aaf7e6f24631df3f9ed3dda7a53ebed1fbee85 Author: Andrew Cooper AuthorDate: Tue Dec 15 15:34:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:34:29 2015 +0100 x86/vmx: improvements to vmentry failure handling Combine the almost identical vm_launch_fail() and vm_resume_fail() into a single vmx_vmentry_failure(). Re-save all GPRs so that domain_crash() prints the real register values, rather than the stack frame of the vmx_vmentry_failure() call. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian master commit: bbcf0b218f64b1e3e2b66b0fbb623f51d9014e81 master date: 2015-11-03 18:14:02 +0100 --- xen/arch/x86/hvm/vmx/entry.S | 9 +++++---- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 664ed83..3c8c749 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -102,14 +102,15 @@ UNLIKELY_END(realmode) /*.Lvmx_resume:*/ VMRESUME - sti - call vm_resume_fail - ud2 + jmp .Lvmx_vmentry_fail .Lvmx_launch: VMLAUNCH + +.Lvmx_vmentry_fail: sti - call vm_launch_fail + SAVE_ALL + call vmx_vmentry_failure ud2 ENTRY(vmx_asm_do_vmentry) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 39b9479..b689e91 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1316,21 +1316,14 @@ void vmx_destroy_vmcs(struct vcpu *v) free_xenheap_page(v->arch.hvm_vmx.msr_bitmap); } -void vm_launch_fail(void) -{ - unsigned long error; - - __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); - domain_crash_synchronous(); -} - -void vm_resume_fail(void) +void vmx_vmentry_failure(void) { + struct vcpu *curr = current; unsigned long error; __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); + printk(XENLOG_G_ERR "%pv: VM%s error: %#lx\n", + curr, curr->arch.hvm_vmx.launched ? "RESUME" : "LAUNCH", error); domain_crash_synchronous(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXG-0007BZ-8K; Thu, 17 Dec 2015 18:44:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXF-0007BR-DB for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:17 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 87/99-09570-08203765; Thu, 17 Dec 2015 18:44:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1450377855!1847601!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3737 invoked from network); 17 Dec 2015 18:44:16 -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; 17 Dec 2015 18:44:16 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXD-0005RL-3U for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:15 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXC-0002Ge-SF for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:14 +0000 Date: Thu, 17 Dec 2015 18:44:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/vmx: improvements to vmentry failure handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 96aaf7e6f24631df3f9ed3dda7a53ebed1fbee85 Author: Andrew Cooper AuthorDate: Tue Dec 15 15:34:29 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:34:29 2015 +0100 x86/vmx: improvements to vmentry failure handling Combine the almost identical vm_launch_fail() and vm_resume_fail() into a single vmx_vmentry_failure(). Re-save all GPRs so that domain_crash() prints the real register values, rather than the stack frame of the vmx_vmentry_failure() call. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian master commit: bbcf0b218f64b1e3e2b66b0fbb623f51d9014e81 master date: 2015-11-03 18:14:02 +0100 --- xen/arch/x86/hvm/vmx/entry.S | 9 +++++---- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 664ed83..3c8c749 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -102,14 +102,15 @@ UNLIKELY_END(realmode) /*.Lvmx_resume:*/ VMRESUME - sti - call vm_resume_fail - ud2 + jmp .Lvmx_vmentry_fail .Lvmx_launch: VMLAUNCH + +.Lvmx_vmentry_fail: sti - call vm_launch_fail + SAVE_ALL + call vmx_vmentry_failure ud2 ENTRY(vmx_asm_do_vmentry) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 39b9479..b689e91 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1316,21 +1316,14 @@ void vmx_destroy_vmcs(struct vcpu *v) free_xenheap_page(v->arch.hvm_vmx.msr_bitmap); } -void vm_launch_fail(void) -{ - unsigned long error; - - __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); - domain_crash_synchronous(); -} - -void vm_resume_fail(void) +void vmx_vmentry_failure(void) { + struct vcpu *curr = current; unsigned long error; __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); + printk(XENLOG_G_ERR "%pv: VM%s error: %#lx\n", + curr, curr->arch.hvm_vmx.launched ? "RESUME" : "LAUNCH", error); domain_crash_synchronous(); } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXR-0007Cw-Da; Thu, 17 Dec 2015 18:44:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXP-0007Cr-UK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:28 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 76/6F-12831-B8203765; Thu, 17 Dec 2015 18:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1450377865!11462261!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36313 invoked from network); 17 Dec 2015 18:44:26 -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; 17 Dec 2015 18:44:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXN-0005RT-Op for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXN-0002HB-CJ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:25 +0000 Date: Thu, 17 Dec 2015 18:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/HVM: don't inject #DB with error code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f44b5428a4394c3191c25940f779cd13e27a2501 Author: Jan Beulich AuthorDate: Tue Dec 15 15:35:28 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:35:28 2015 +0100 x86/HVM: don't inject #DB with error code Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 057e0e72d2a5d598087c5f167ec6a13203a3cf65 master date: 2015-11-12 16:59:18 +0100 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7d53c6c..dc904f64 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3843,7 +3843,7 @@ void hvm_task_switch( goto out; if ( (tss.trace & 1) && !exn_raised ) - hvm_inject_hw_exception(TRAP_debug, tss_sel & 0xfff8); + hvm_inject_hw_exception(TRAP_debug, HVM_DELIVER_NO_ERROR_CODE); tr.attr.fields.type = 0xb; /* busy 32-bit tss */ hvm_set_segment_register(v, x86_seg_tr, &tr); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXR-0007Cw-Da; Thu, 17 Dec 2015 18:44:29 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXP-0007Cr-UK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:28 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 76/6F-12831-B8203765; Thu, 17 Dec 2015 18:44:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1450377865!11462261!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36313 invoked from network); 17 Dec 2015 18:44:26 -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; 17 Dec 2015 18:44:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXN-0005RT-Op for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXN-0002HB-CJ for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:25 +0000 Date: Thu, 17 Dec 2015 18:44:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/HVM: don't inject #DB with error code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f44b5428a4394c3191c25940f779cd13e27a2501 Author: Jan Beulich AuthorDate: Tue Dec 15 15:35:28 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:35:28 2015 +0100 x86/HVM: don't inject #DB with error code Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 057e0e72d2a5d598087c5f167ec6a13203a3cf65 master date: 2015-11-12 16:59:18 +0100 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 7d53c6c..dc904f64 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3843,7 +3843,7 @@ void hvm_task_switch( goto out; if ( (tss.trace & 1) && !exn_raised ) - hvm_inject_hw_exception(TRAP_debug, tss_sel & 0xfff8); + hvm_inject_hw_exception(TRAP_debug, HVM_DELIVER_NO_ERROR_CODE); tr.attr.fields.type = 0xb; /* busy 32-bit tss */ hvm_set_segment_register(v, x86_seg_tr, &tr); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXb-0007Fi-HT; Thu, 17 Dec 2015 18:44:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXa-0007FU-JA for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:38 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 5C/3A-13905-59203765; Thu, 17 Dec 2015 18:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1450377876!11455931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9317 invoked from network); 17 Dec 2015 18:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 18:44:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXY-0005Rb-7H for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXX-0002IM-VI for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:36 +0000 Date: Thu, 17 Dec 2015 18:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VMX: fix/adjust trap injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec70614e30f5b38cc958fcf2c034a7d58dcc5190 Author: Jan Beulich AuthorDate: Tue Dec 15 15:36:01 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:36:01 2015 +0100 VMX: fix/adjust trap injection In the course of investigating the 4.1.6 backport issue of the XSA-156 patch I realized that #DB injection has always been broken, but with it now getting always intercepted the problem has got worse: Documentation clearly states that neither DR7.GD nor DebugCtl.LBR get cleared before the intercept, so this is something we need to do before reflecting the intercepted exception. While adjusting this (and also with 4.1.6's strange use of X86_EVENTTYPE_SW_EXCEPTION for #DB in mind) I further realized that the special casing of individual vectors shouldn't be done for software interrupts (resulting from INT $nn). And then some code movement: Setting of CR2 for #PF can be done in the same switch() statement (no need for a separate if()), and reading of intr_info is better done close the the consumption of the variable (allowing the compiler to generate better code / use fewer registers for variables). Signed-off-by: Jan Beulich Acked-by: Kevin Tian master commit: 81a28f14009f4d8577a81b28dd06f6828112054b master date: 2015-11-24 12:30:31 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 4540cdc..bfc6465 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1463,16 +1463,7 @@ static void vmx_inject_trap(struct hvm_trap *trap) struct vcpu *curr = current; struct hvm_trap _trap = *trap; - if ( (_trap.vector == TRAP_page_fault) && - (_trap.type == X86_EVENTTYPE_HW_EXCEPTION) ) - current->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; - - if ( nestedhvm_vcpu_in_guestmode(curr) ) - intr_info = vcpu_2_nvmx(curr).intr.intr_info; - else - __vmread(VM_ENTRY_INTR_INFO, &intr_info); - - switch ( _trap.vector ) + switch ( _trap.vector | -(_trap.type == X86_EVENTTYPE_SW_INTERRUPT) ) { case TRAP_debug: if ( guest_cpu_user_regs()->eflags & X86_EFLAGS_TF ) @@ -1480,6 +1471,16 @@ static void vmx_inject_trap(struct hvm_trap *trap) __restore_debug_registers(curr); write_debugreg(6, read_debugreg(6) | 0x4000); } + if ( !nestedhvm_vcpu_in_guestmode(curr) || + !nvmx_intercepts_exception(curr, TRAP_debug, _trap.error_code) ) + { + unsigned long val; + + __vmread(GUEST_DR7, &val); + __vmwrite(GUEST_DR7, val & ~DR_GENERAL_DETECT); + __vmread(GUEST_IA32_DEBUGCTL, &val); + __vmwrite(GUEST_IA32_DEBUGCTL, val & ~IA32_DEBUGCTLMSR_LBR); + } if ( cpu_has_monitor_trap_flag ) break; /* fall through */ @@ -1490,8 +1491,19 @@ static void vmx_inject_trap(struct hvm_trap *trap) domain_pause_for_debugger(); return; } + break; + + case TRAP_page_fault: + ASSERT(_trap.type == X86_EVENTTYPE_HW_EXCEPTION); + curr->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; + break; } + if ( nestedhvm_vcpu_in_guestmode(curr) ) + intr_info = vcpu_2_nvmx(curr).intr.intr_info; + else + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( unlikely(intr_info & INTR_INFO_VALID_MASK) && (((intr_info >> 8) & 7) == X86_EVENTTYPE_HW_EXCEPTION) ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:39 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXb-0007Fi-HT; Thu, 17 Dec 2015 18:44:39 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXa-0007FU-JA for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:38 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 5C/3A-13905-59203765; Thu, 17 Dec 2015 18:44:37 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1450377876!11455931!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9317 invoked from network); 17 Dec 2015 18:44:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 18:44:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXY-0005Rb-7H for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXX-0002IM-VI for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:36 +0000 Date: Thu, 17 Dec 2015 18:44:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VMX: fix/adjust trap injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ec70614e30f5b38cc958fcf2c034a7d58dcc5190 Author: Jan Beulich AuthorDate: Tue Dec 15 15:36:01 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:36:01 2015 +0100 VMX: fix/adjust trap injection In the course of investigating the 4.1.6 backport issue of the XSA-156 patch I realized that #DB injection has always been broken, but with it now getting always intercepted the problem has got worse: Documentation clearly states that neither DR7.GD nor DebugCtl.LBR get cleared before the intercept, so this is something we need to do before reflecting the intercepted exception. While adjusting this (and also with 4.1.6's strange use of X86_EVENTTYPE_SW_EXCEPTION for #DB in mind) I further realized that the special casing of individual vectors shouldn't be done for software interrupts (resulting from INT $nn). And then some code movement: Setting of CR2 for #PF can be done in the same switch() statement (no need for a separate if()), and reading of intr_info is better done close the the consumption of the variable (allowing the compiler to generate better code / use fewer registers for variables). Signed-off-by: Jan Beulich Acked-by: Kevin Tian master commit: 81a28f14009f4d8577a81b28dd06f6828112054b master date: 2015-11-24 12:30:31 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 4540cdc..bfc6465 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1463,16 +1463,7 @@ static void vmx_inject_trap(struct hvm_trap *trap) struct vcpu *curr = current; struct hvm_trap _trap = *trap; - if ( (_trap.vector == TRAP_page_fault) && - (_trap.type == X86_EVENTTYPE_HW_EXCEPTION) ) - current->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; - - if ( nestedhvm_vcpu_in_guestmode(curr) ) - intr_info = vcpu_2_nvmx(curr).intr.intr_info; - else - __vmread(VM_ENTRY_INTR_INFO, &intr_info); - - switch ( _trap.vector ) + switch ( _trap.vector | -(_trap.type == X86_EVENTTYPE_SW_INTERRUPT) ) { case TRAP_debug: if ( guest_cpu_user_regs()->eflags & X86_EFLAGS_TF ) @@ -1480,6 +1471,16 @@ static void vmx_inject_trap(struct hvm_trap *trap) __restore_debug_registers(curr); write_debugreg(6, read_debugreg(6) | 0x4000); } + if ( !nestedhvm_vcpu_in_guestmode(curr) || + !nvmx_intercepts_exception(curr, TRAP_debug, _trap.error_code) ) + { + unsigned long val; + + __vmread(GUEST_DR7, &val); + __vmwrite(GUEST_DR7, val & ~DR_GENERAL_DETECT); + __vmread(GUEST_IA32_DEBUGCTL, &val); + __vmwrite(GUEST_IA32_DEBUGCTL, val & ~IA32_DEBUGCTLMSR_LBR); + } if ( cpu_has_monitor_trap_flag ) break; /* fall through */ @@ -1490,8 +1491,19 @@ static void vmx_inject_trap(struct hvm_trap *trap) domain_pause_for_debugger(); return; } + break; + + case TRAP_page_fault: + ASSERT(_trap.type == X86_EVENTTYPE_HW_EXCEPTION); + curr->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; + break; } + if ( nestedhvm_vcpu_in_guestmode(curr) ) + intr_info = vcpu_2_nvmx(curr).intr.intr_info; + else + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( unlikely(intr_info & INTR_INFO_VALID_MASK) && (((intr_info >> 8) & 7) == X86_EVENTTYPE_HW_EXCEPTION) ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXl-0007JO-Lw; Thu, 17 Dec 2015 18:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXk-0007Ij-Ro for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:48 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 8D/B1-21571-0A203765; Thu, 17 Dec 2015 18:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450377886!5953689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13462 invoked from network); 17 Dec 2015 18:44:47 -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; 17 Dec 2015 18:44:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXi-0005Rj-Nm for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXi-0002Iv-GY for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:46 +0000 Date: Thu, 17 Dec 2015 18:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] sched: fix locking for insert_vcpu() in credit1 and RTDS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 413d59f3e1873fcbc3e67aca8c3a815b0f49cf08 Author: Dario Faggioli AuthorDate: Tue Dec 15 15:36:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:36:26 2015 +0100 sched: fix locking for insert_vcpu() in credit1 and RTDS The insert_vcpu() hook is handled with inconsistent locking. In fact, schedule_cpu_switch() calls the hook with runqueue lock held, while sched_move_domain() relies on the hook implementations to take the lock themselves (and, since that is not done in Credit1 and RTDS, such operation is not safe in those cases). This is fixed as follows: - take the lock in the hook implementations, in specific schedulers' code; - avoid calling insert_vcpu(), for the idle vCPU, in schedule_cpu_switch(). In fact, idle vCPUs are set to run immediately, and the various schedulers won't insert them in their runqueues anyway, even when explicitly asked to. While there, still in schedule_cpu_switch(), locking with _irq() is enough (there's no need to do *_irqsave()). Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap master commit: ae2f41e3d7e7798537b7ea6dbb9a0c6aeb1179e3 master date: 2015-11-24 14:48:34 +0100 --- xen/common/sched_credit.c | 6 ++++++ xen/common/sched_rt.c | 3 +++ xen/common/schedule.c | 6 ++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7af910d..2a3a67d 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -889,9 +889,15 @@ static void csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu *svc = vc->sched_priv; + spinlock_t *lock; + unsigned long flags; + + lock = vcpu_schedule_lock_irqsave(vc, &flags); if ( !__vcpu_on_runq(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(vc->processor, svc); + + vcpu_schedule_unlock_irqrestore(lock, flags, vc); } static void diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index e70d6c7..0621780 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -548,16 +548,19 @@ rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct rt_vcpu *svc = rt_vcpu(vc); s_time_t now = NOW(); + spinlock_t *lock; /* not addlocate idle vcpu to dom vcpu list */ if ( is_idle_vcpu(vc) ) return; + lock = vcpu_schedule_lock_irq(vc); if ( now >= svc->cur_deadline ) rt_update_deadline(now, svc); if ( !__vcpu_on_q(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(ops, svc); + vcpu_schedule_unlock_irq(lock, vc); /* add rt_vcpu svc to scheduler-specific vcpu list of the dom */ list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu); diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 86dc73b..64a619f 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1435,7 +1435,6 @@ void __init scheduler_init(void) int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { - unsigned long flags; struct vcpu *idle; spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; @@ -1456,7 +1455,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - lock = pcpu_schedule_lock_irqsave(cpu, &flags); + lock = pcpu_schedule_lock_irq(cpu); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1465,9 +1464,8 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) ppriv_old = per_cpu(schedule_data, cpu).sched_priv; per_cpu(schedule_data, cpu).sched_priv = ppriv; SCHED_OP(new_ops, tick_resume, cpu); - SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(lock, flags, cpu); + pcpu_schedule_unlock_irq(lock, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:44:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:44:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXl-0007JO-Lw; Thu, 17 Dec 2015 18:44:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXk-0007Ij-Ro for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:48 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 8D/B1-21571-0A203765; Thu, 17 Dec 2015 18:44:48 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450377886!5953689!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13462 invoked from network); 17 Dec 2015 18:44:47 -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; 17 Dec 2015 18:44:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXi-0005Rj-Nm for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXi-0002Iv-GY for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:46 +0000 Date: Thu, 17 Dec 2015 18:44:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] sched: fix locking for insert_vcpu() in credit1 and RTDS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 413d59f3e1873fcbc3e67aca8c3a815b0f49cf08 Author: Dario Faggioli AuthorDate: Tue Dec 15 15:36:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:36:26 2015 +0100 sched: fix locking for insert_vcpu() in credit1 and RTDS The insert_vcpu() hook is handled with inconsistent locking. In fact, schedule_cpu_switch() calls the hook with runqueue lock held, while sched_move_domain() relies on the hook implementations to take the lock themselves (and, since that is not done in Credit1 and RTDS, such operation is not safe in those cases). This is fixed as follows: - take the lock in the hook implementations, in specific schedulers' code; - avoid calling insert_vcpu(), for the idle vCPU, in schedule_cpu_switch(). In fact, idle vCPUs are set to run immediately, and the various schedulers won't insert them in their runqueues anyway, even when explicitly asked to. While there, still in schedule_cpu_switch(), locking with _irq() is enough (there's no need to do *_irqsave()). Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap master commit: ae2f41e3d7e7798537b7ea6dbb9a0c6aeb1179e3 master date: 2015-11-24 14:48:34 +0100 --- xen/common/sched_credit.c | 6 ++++++ xen/common/sched_rt.c | 3 +++ xen/common/schedule.c | 6 ++---- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 7af910d..2a3a67d 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -889,9 +889,15 @@ static void csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu *svc = vc->sched_priv; + spinlock_t *lock; + unsigned long flags; + + lock = vcpu_schedule_lock_irqsave(vc, &flags); if ( !__vcpu_on_runq(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(vc->processor, svc); + + vcpu_schedule_unlock_irqrestore(lock, flags, vc); } static void diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index e70d6c7..0621780 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -548,16 +548,19 @@ rt_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct rt_vcpu *svc = rt_vcpu(vc); s_time_t now = NOW(); + spinlock_t *lock; /* not addlocate idle vcpu to dom vcpu list */ if ( is_idle_vcpu(vc) ) return; + lock = vcpu_schedule_lock_irq(vc); if ( now >= svc->cur_deadline ) rt_update_deadline(now, svc); if ( !__vcpu_on_q(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(ops, svc); + vcpu_schedule_unlock_irq(lock, vc); /* add rt_vcpu svc to scheduler-specific vcpu list of the dom */ list_add_tail(&svc->sdom_elem, &svc->sdom->vcpu); diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 86dc73b..64a619f 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1435,7 +1435,6 @@ void __init scheduler_init(void) int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { - unsigned long flags; struct vcpu *idle; spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; @@ -1456,7 +1455,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - lock = pcpu_schedule_lock_irqsave(cpu, &flags); + lock = pcpu_schedule_lock_irq(cpu); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1465,9 +1464,8 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) ppriv_old = per_cpu(schedule_data, cpu).sched_priv; per_cpu(schedule_data, cpu).sched_priv = ppriv; SCHED_OP(new_ops, tick_resume, cpu); - SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(lock, flags, cpu); + pcpu_schedule_unlock_irq(lock, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXw-0007Kz-Qm; Thu, 17 Dec 2015 18:45:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXv-0007Kj-8Q for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:59 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 67/88-21901-AA203765; Thu, 17 Dec 2015 18:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450377897!11195365!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36386 invoked from network); 17 Dec 2015 18:44:58 -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; 17 Dec 2015 18:44:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXt-0005Rr-2w for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXs-0002JQ-Va for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:56 +0000 Date: Thu, 17 Dec 2015 18:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/vPMU: document as unsupported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fea50c0f1d792603d576cd1270d18ad48718ee81 Author: Jan Beulich AuthorDate: Tue Dec 15 15:37:24 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:37:24 2015 +0100 x86/vPMU: document as unsupported This is XSA-163. Signed-off-by: Jan Beulich master commit: c03480cf5c4e96fb4afb2237ad0a3cac7162564a master date: 2015-11-24 18:32:20 +0100 --- docs/misc/xen-command-line.markdown | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 84bca2a..b634361 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1370,8 +1370,8 @@ feature is switched on on Intel processors supporting this feature. Note that if **watchdog** option is also specified vpmu will be turned off. *Warning:* -As the BTS virtualisation is not 100% safe and because of the nehalem quirk -don't use the vpmu flag on production systems with Intel cpus! +As the virtualisation is not 100% safe, don't use the vpmu flag on +production systems (see http://xenbits.xen.org/xsa/advisory-163.html)! ### watchdog > `= force | ` -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXw-0007Kz-Qm; Thu, 17 Dec 2015 18:45:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXv-0007Kj-8Q for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:59 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 67/88-21901-AA203765; Thu, 17 Dec 2015 18:44:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450377897!11195365!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36386 invoked from network); 17 Dec 2015 18:44:58 -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; 17 Dec 2015 18:44:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dXt-0005Rr-2w for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dXs-0002JQ-Va for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:44:56 +0000 Date: Thu, 17 Dec 2015 18:44:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/vPMU: document as unsupported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit fea50c0f1d792603d576cd1270d18ad48718ee81 Author: Jan Beulich AuthorDate: Tue Dec 15 15:37:24 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:37:24 2015 +0100 x86/vPMU: document as unsupported This is XSA-163. Signed-off-by: Jan Beulich master commit: c03480cf5c4e96fb4afb2237ad0a3cac7162564a master date: 2015-11-24 18:32:20 +0100 --- docs/misc/xen-command-line.markdown | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 84bca2a..b634361 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1370,8 +1370,8 @@ feature is switched on on Intel processors supporting this feature. Note that if **watchdog** option is also specified vpmu will be turned off. *Warning:* -As the BTS virtualisation is not 100% safe and because of the nehalem quirk -don't use the vpmu flag on production systems with Intel cpus! +As the virtualisation is not 100% safe, don't use the vpmu flag on +production systems (see http://xenbits.xen.org/xsa/advisory-163.html)! ### watchdog > `= force | ` -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dY7-0007RM-VE; Thu, 17 Dec 2015 18:45:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dY6-0007Qz-OW for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:10 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id B8/15-31122-6B203765; Thu, 17 Dec 2015 18:45:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1450377908!5950511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26207 invoked from network); 17 Dec 2015 18:45:09 -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; 17 Dec 2015 18:45:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dY3-0005Sw-Hw for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dY3-0002KA-AG for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:07 +0000 Date: Thu, 17 Dec 2015 18:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/boot: check for not allowed sections before linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c56b094d4c320b0b0afb41236c162d1f02b8995 Author: Daniel Kiper AuthorDate: Tue Dec 15 15:37:55 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:37:55 2015 +0100 x86/boot: check for not allowed sections before linking Currently check for not allowed sections is performed just after compilation. However, if compilation succeeds and check fails then second build will create xen.gz/xen.efi without any visible error. This happens because %.o: %.c recipe created object file during first run and make do not execute this recipe during second run. So, look for not allowed sections before linking. This way check will be executed every time. Signed-off-by: Daniel Kiper Reviewed-by: Jan Beulich master commit: d380b3559734739ae009cd3c0e9aabb5602863e2 master date: 2015-11-25 17:24:36 +0100 --- xen/arch/x86/boot/build32.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index c208249..4a1421f 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -16,11 +16,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) $(OBJCOPY) -O binary $< $@ %.lnk: %.o - $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< - -%.o: %.c - $(CC) $(CFLAGS) -c -fpic $< -o $@ - $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ + $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ while read idx name sz rest; do \ case "$$name" in \ .data|.data.*|.rodata|.rodata.*|.bss|.bss.*) \ @@ -29,6 +25,10 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) exit $$(expr $$idx + 1);; \ esac; \ done + $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< + +%.o: %.c + $(CC) $(CFLAGS) -c -fpic $< -o $@ reloc.o: reloc.c $(RELOC_DEPS) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dY7-0007RM-VE; Thu, 17 Dec 2015 18:45:11 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dY6-0007Qz-OW for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:10 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id B8/15-31122-6B203765; Thu, 17 Dec 2015 18:45:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1450377908!5950511!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26207 invoked from network); 17 Dec 2015 18:45:09 -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; 17 Dec 2015 18:45:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dY3-0005Sw-Hw for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dY3-0002KA-AG for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:07 +0000 Date: Thu, 17 Dec 2015 18:45:07 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/boot: check for not allowed sections before linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7c56b094d4c320b0b0afb41236c162d1f02b8995 Author: Daniel Kiper AuthorDate: Tue Dec 15 15:37:55 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:37:55 2015 +0100 x86/boot: check for not allowed sections before linking Currently check for not allowed sections is performed just after compilation. However, if compilation succeeds and check fails then second build will create xen.gz/xen.efi without any visible error. This happens because %.o: %.c recipe created object file during first run and make do not execute this recipe during second run. So, look for not allowed sections before linking. This way check will be executed every time. Signed-off-by: Daniel Kiper Reviewed-by: Jan Beulich master commit: d380b3559734739ae009cd3c0e9aabb5602863e2 master date: 2015-11-25 17:24:36 +0100 --- xen/arch/x86/boot/build32.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index c208249..4a1421f 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -16,11 +16,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) $(OBJCOPY) -O binary $< $@ %.lnk: %.o - $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< - -%.o: %.c - $(CC) $(CFLAGS) -c -fpic $< -o $@ - $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ + $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ while read idx name sz rest; do \ case "$$name" in \ .data|.data.*|.rodata|.rodata.*|.bss|.bss.*) \ @@ -29,6 +25,10 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) exit $$(expr $$idx + 1);; \ esac; \ done + $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< + +%.o: %.c + $(CC) $(CFLAGS) -c -fpic $< -o $@ reloc.o: reloc.c $(RELOC_DEPS) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYL-0007Y5-7I; Thu, 17 Dec 2015 18:45:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYJ-0007Vw-E4 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:23 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id DE/E0-16870-2C203765; Thu, 17 Dec 2015 18:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450377919!11195416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38387 invoked from network); 17 Dec 2015 18:45:19 -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; 17 Dec 2015 18:45:19 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYE-0005T4-Tu for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYE-0002Ki-NK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:18 +0000 Date: Thu, 17 Dec 2015 18:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/ept: remove unnecessary sync after resolving misconfigured entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c8859ec553bde224ac9841880caf40fb7c7e80e Author: David Vrabel AuthorDate: Tue Dec 15 15:38:38 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:38:38 2015 +0100 x86/ept: remove unnecessary sync after resolving misconfigured entries When using EPT, type changes are done with the following steps: 1. Set entry as invalid (misconfigured) by settings a reserved memory type. 2. Flush all EPT and combined translations (ept_sync_domain()). 3. Fixup misconfigured entries as required (on EPT_MISCONFIG vmexits or when explicitly setting an entry. Since resolve_misconfig() only updates entries that were misconfigured, there is no need to invalidate any translations since the hardware does not cache misconfigured translations (vol 3, section 28.3.2). Remove the unnecessary (and very expensive) ept_sync_domain() calls). Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: cea357ba4b3335ca5279ee9c00838f85575d5842 master date: 2015-12-02 15:19:53 +0100 --- xen/arch/x86/mm/p2m-ept.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 5e6ab3f..3f5138d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -594,7 +594,6 @@ bool_t ept_handle_misconfig(uint64_t gpa) spurious = curr->arch.hvm_vmx.ept_spurious_misconfig; rc = resolve_misconfig(p2m, PFN_DOWN(gpa)); curr->arch.hvm_vmx.ept_spurious_misconfig = 0; - ept_sync_domain(p2m); p2m_unlock(p2m); @@ -620,7 +619,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, int need_modify_vtd_table = 1; int vtd_pte_present = 0; unsigned int iommu_flags = p2m_get_iommu_flags(p2mt); - enum { sync_off, sync_on, sync_check } needs_sync = sync_check; + bool_t needs_sync = 1; ept_entry_t old_entry = { .epte = 0 }; ept_entry_t new_entry = { .epte = 0 }; struct ept_data *ept = &p2m->ept; @@ -641,12 +640,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* Carry out any eventually pending earlier changes first. */ ret = resolve_misconfig(p2m, gfn); if ( ret < 0 ) - { - ept_sync_domain(p2m); return ret; - } - if ( ret > 0 ) - needs_sync = sync_on; ASSERT((target == 2 && hvm_hap_has_1gb()) || (target == 1 && hvm_hap_has_2mb()) || @@ -689,8 +683,8 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* We reached the target level. */ /* No need to flush if the old entry wasn't valid */ - if ( needs_sync == sync_check && !is_epte_present(ept_entry) ) - needs_sync = sync_off; + if ( !is_epte_present(ept_entry) ) + needs_sync = 0; /* If we're replacing a non-leaf entry with a leaf entry (1GiB or 2MiB), * the intermediate tables will be freed below after the ept flush @@ -766,7 +760,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, p2m->max_mapped_pfn = gfn + (1UL << order) - 1; out: - if ( needs_sync != sync_off ) + if ( needs_sync ) ept_sync_domain(p2m); /* For non-nested p2m, may need to change VT-d page table.*/ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYL-0007Y5-7I; Thu, 17 Dec 2015 18:45:25 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYJ-0007Vw-E4 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:23 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id DE/E0-16870-2C203765; Thu, 17 Dec 2015 18:45:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450377919!11195416!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38387 invoked from network); 17 Dec 2015 18:45:19 -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; 17 Dec 2015 18:45:19 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYE-0005T4-Tu for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:18 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYE-0002Ki-NK for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:18 +0000 Date: Thu, 17 Dec 2015 18:45:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/ept: remove unnecessary sync after resolving misconfigured entries X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c8859ec553bde224ac9841880caf40fb7c7e80e Author: David Vrabel AuthorDate: Tue Dec 15 15:38:38 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:38:38 2015 +0100 x86/ept: remove unnecessary sync after resolving misconfigured entries When using EPT, type changes are done with the following steps: 1. Set entry as invalid (misconfigured) by settings a reserved memory type. 2. Flush all EPT and combined translations (ept_sync_domain()). 3. Fixup misconfigured entries as required (on EPT_MISCONFIG vmexits or when explicitly setting an entry. Since resolve_misconfig() only updates entries that were misconfigured, there is no need to invalidate any translations since the hardware does not cache misconfigured translations (vol 3, section 28.3.2). Remove the unnecessary (and very expensive) ept_sync_domain() calls). Signed-off-by: David Vrabel Reviewed-by: Andrew Cooper Acked-by: Kevin Tian master commit: cea357ba4b3335ca5279ee9c00838f85575d5842 master date: 2015-12-02 15:19:53 +0100 --- xen/arch/x86/mm/p2m-ept.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index 5e6ab3f..3f5138d 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -594,7 +594,6 @@ bool_t ept_handle_misconfig(uint64_t gpa) spurious = curr->arch.hvm_vmx.ept_spurious_misconfig; rc = resolve_misconfig(p2m, PFN_DOWN(gpa)); curr->arch.hvm_vmx.ept_spurious_misconfig = 0; - ept_sync_domain(p2m); p2m_unlock(p2m); @@ -620,7 +619,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, int need_modify_vtd_table = 1; int vtd_pte_present = 0; unsigned int iommu_flags = p2m_get_iommu_flags(p2mt); - enum { sync_off, sync_on, sync_check } needs_sync = sync_check; + bool_t needs_sync = 1; ept_entry_t old_entry = { .epte = 0 }; ept_entry_t new_entry = { .epte = 0 }; struct ept_data *ept = &p2m->ept; @@ -641,12 +640,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* Carry out any eventually pending earlier changes first. */ ret = resolve_misconfig(p2m, gfn); if ( ret < 0 ) - { - ept_sync_domain(p2m); return ret; - } - if ( ret > 0 ) - needs_sync = sync_on; ASSERT((target == 2 && hvm_hap_has_1gb()) || (target == 1 && hvm_hap_has_2mb()) || @@ -689,8 +683,8 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, /* We reached the target level. */ /* No need to flush if the old entry wasn't valid */ - if ( needs_sync == sync_check && !is_epte_present(ept_entry) ) - needs_sync = sync_off; + if ( !is_epte_present(ept_entry) ) + needs_sync = 0; /* If we're replacing a non-leaf entry with a leaf entry (1GiB or 2MiB), * the intermediate tables will be freed below after the ept flush @@ -766,7 +760,7 @@ ept_set_entry(struct p2m_domain *p2m, unsigned long gfn, mfn_t mfn, p2m->max_mapped_pfn = gfn + (1UL << order) - 1; out: - if ( needs_sync != sync_off ) + if ( needs_sync ) ept_sync_domain(p2m); /* For non-nested p2m, may need to change VT-d page table.*/ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYT-0007Zn-BO; Thu, 17 Dec 2015 18:45:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYR-0007ZX-Qn for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:32 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id E5/87-31443-BC203765; Thu, 17 Dec 2015 18:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1450377929!11444470!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18376 invoked from network); 17 Dec 2015 18:45:30 -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; 17 Dec 2015 18:45:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYP-0005TG-9D for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYP-0002LG-5q for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:29 +0000 Date: Thu, 17 Dec 2015 18:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] evtchn: don't reuse ports that are still "busy" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74b7f4631e72a6381d39021a8d9d60f40e29ef9d Author: David Vrabel AuthorDate: Tue Dec 15 15:39:20 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:39:20 2015 +0100 evtchn: don't reuse ports that are still "busy" When using the FIFO ABI a guest may close an event channel that is still LINKED. If this port is reused, subsequent events may be lost because they may become pending on the wrong queue. This could be fixed by requiring guests to only close event channels that are not linked. This is difficult since: a) irq cleanup in the guest may be done in a context that cannot wait for the event to be unlinked; b) the guest may attempt to rebind a PIRQ whose previous close is still pending; and c) existing guests already have the problematic behaviour. Instead, simply check a port is not "busy" (i.e., it's not linked) before reusing it. Guests should still drain any queues for VCPUs that are being offlined, or the port will become unusable until the VCPU is onlined and starts processing events again. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich master commit: 78e24c269b0a4a8b864ece725e6d4209ed95dfa7 master date: 2015-12-02 15:21:46 +0100 --- xen/common/event_channel.c | 3 ++- xen/common/event_fifo.c | 12 ++++++++++++ xen/include/xen/event.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index eece46b..7956ef1 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -171,7 +171,8 @@ static int get_free_port(struct domain *d) { if ( port > d->max_evtchn_port ) return -ENOSPC; - if ( evtchn_from_port(d, port)->state == ECS_FREE ) + if ( evtchn_from_port(d, port)->state == ECS_FREE + && !evtchn_port_is_busy(d, port) ) return port; } diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index b81fae4..5a28968 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -312,6 +312,17 @@ static bool_t evtchn_fifo_is_masked(struct domain *d, return test_bit(EVTCHN_FIFO_MASKED, word); } +static bool_t evtchn_fifo_is_busy(struct domain *d, evtchn_port_t port) +{ + event_word_t *word; + + word = evtchn_fifo_word_from_port(d, port); + if ( unlikely(!word) ) + return 0; + + return test_bit(EVTCHN_FIFO_LINKED, word); +} + static int evtchn_fifo_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) { @@ -351,6 +362,7 @@ static const struct evtchn_port_ops evtchn_port_ops_fifo = .unmask = evtchn_fifo_unmask, .is_pending = evtchn_fifo_is_pending, .is_masked = evtchn_fifo_is_masked, + .is_busy = evtchn_fifo_is_busy, .set_priority = evtchn_fifo_set_priority, .print_state = evtchn_fifo_print_state, }; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 88526f8..19e1e3a 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -141,6 +141,11 @@ struct evtchn_port_ops { void (*unmask)(struct domain *d, struct evtchn *evtchn); bool_t (*is_pending)(struct domain *d, const struct evtchn *evtchn); bool_t (*is_masked)(struct domain *d, const struct evtchn *evtchn); + /* + * Is the port unavailable because it's still being cleaned up + * after being closed? + */ + bool_t (*is_busy)(struct domain *d, evtchn_port_t port); int (*set_priority)(struct domain *d, struct evtchn *evtchn, unsigned int priority); void (*print_state)(struct domain *d, const struct evtchn *evtchn); @@ -182,6 +187,13 @@ static inline bool_t evtchn_port_is_masked(struct domain *d, return d->evtchn_port_ops->is_masked(d, evtchn); } +static inline bool_t evtchn_port_is_busy(struct domain *d, evtchn_port_t port) +{ + if ( d->evtchn_port_ops->is_busy ) + return d->evtchn_port_ops->is_busy(d, port); + return 0; +} + static inline int evtchn_port_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYT-0007Zn-BO; Thu, 17 Dec 2015 18:45:33 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYR-0007ZX-Qn for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:32 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id E5/87-31443-BC203765; Thu, 17 Dec 2015 18:45:31 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1450377929!11444470!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18376 invoked from network); 17 Dec 2015 18:45:30 -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; 17 Dec 2015 18:45:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYP-0005TG-9D for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYP-0002LG-5q for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:29 +0000 Date: Thu, 17 Dec 2015 18:45:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] evtchn: don't reuse ports that are still "busy" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 74b7f4631e72a6381d39021a8d9d60f40e29ef9d Author: David Vrabel AuthorDate: Tue Dec 15 15:39:20 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:39:20 2015 +0100 evtchn: don't reuse ports that are still "busy" When using the FIFO ABI a guest may close an event channel that is still LINKED. If this port is reused, subsequent events may be lost because they may become pending on the wrong queue. This could be fixed by requiring guests to only close event channels that are not linked. This is difficult since: a) irq cleanup in the guest may be done in a context that cannot wait for the event to be unlinked; b) the guest may attempt to rebind a PIRQ whose previous close is still pending; and c) existing guests already have the problematic behaviour. Instead, simply check a port is not "busy" (i.e., it's not linked) before reusing it. Guests should still drain any queues for VCPUs that are being offlined, or the port will become unusable until the VCPU is onlined and starts processing events again. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich master commit: 78e24c269b0a4a8b864ece725e6d4209ed95dfa7 master date: 2015-12-02 15:21:46 +0100 --- xen/common/event_channel.c | 3 ++- xen/common/event_fifo.c | 12 ++++++++++++ xen/include/xen/event.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index eece46b..7956ef1 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -171,7 +171,8 @@ static int get_free_port(struct domain *d) { if ( port > d->max_evtchn_port ) return -ENOSPC; - if ( evtchn_from_port(d, port)->state == ECS_FREE ) + if ( evtchn_from_port(d, port)->state == ECS_FREE + && !evtchn_port_is_busy(d, port) ) return port; } diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index b81fae4..5a28968 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -312,6 +312,17 @@ static bool_t evtchn_fifo_is_masked(struct domain *d, return test_bit(EVTCHN_FIFO_MASKED, word); } +static bool_t evtchn_fifo_is_busy(struct domain *d, evtchn_port_t port) +{ + event_word_t *word; + + word = evtchn_fifo_word_from_port(d, port); + if ( unlikely(!word) ) + return 0; + + return test_bit(EVTCHN_FIFO_LINKED, word); +} + static int evtchn_fifo_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) { @@ -351,6 +362,7 @@ static const struct evtchn_port_ops evtchn_port_ops_fifo = .unmask = evtchn_fifo_unmask, .is_pending = evtchn_fifo_is_pending, .is_masked = evtchn_fifo_is_masked, + .is_busy = evtchn_fifo_is_busy, .set_priority = evtchn_fifo_set_priority, .print_state = evtchn_fifo_print_state, }; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 88526f8..19e1e3a 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -141,6 +141,11 @@ struct evtchn_port_ops { void (*unmask)(struct domain *d, struct evtchn *evtchn); bool_t (*is_pending)(struct domain *d, const struct evtchn *evtchn); bool_t (*is_masked)(struct domain *d, const struct evtchn *evtchn); + /* + * Is the port unavailable because it's still being cleaned up + * after being closed? + */ + bool_t (*is_busy)(struct domain *d, evtchn_port_t port); int (*set_priority)(struct domain *d, struct evtchn *evtchn, unsigned int priority); void (*print_state)(struct domain *d, const struct evtchn *evtchn); @@ -182,6 +187,13 @@ static inline bool_t evtchn_port_is_masked(struct domain *d, return d->evtchn_port_ops->is_masked(d, evtchn); } +static inline bool_t evtchn_port_is_busy(struct domain *d, evtchn_port_t port) +{ + if ( d->evtchn_port_ops->is_busy ) + return d->evtchn_port_ops->is_busy(d, port); + return 0; +} + static inline int evtchn_port_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45: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 1a9dYd-0007cA-FX; Thu, 17 Dec 2015 18:45:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYb-0007ar-KO for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:41 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id C5/88-18316-5D203765; Thu, 17 Dec 2015 18:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450377939!6081740!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19702 invoked from network); 17 Dec 2015 18:45:40 -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; 17 Dec 2015 18:45:40 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYZ-0005TO-Jj for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYZ-0002MH-GB for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:39 +0000 Date: Thu, 17 Dec 2015 18:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: drop unneeded Ivybridge quirk workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d11d0df41f9b2614689a39b360916338497f225b Author: Jan Beulich AuthorDate: Tue Dec 15 15:39:52 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:39:52 2015 +0100 VT-d: drop unneeded Ivybridge quirk workaround We've been told by Intel that server chipsets don't need the workaround anymore starting with Ivybridge (Xeon E5/E7 v2); the second half of the workaround was missing anyway. Signed-off-by: Jan Beulich Acked-by: Kevin Tian master commit: a10307b3912e65bbdd9184ba5fe849d252b75f92 master date: 2015-12-03 15:33:10 +0100 --- xen/drivers/passthrough/vtd/quirks.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 69d29ab..87b4d97 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -430,7 +430,6 @@ void pci_vtd_quirk(const struct pci_dev *pdev) * - This can cause system failure upon non-fatal VT-d faults. * - Potential security issue if malicious guest trigger VT-d faults. */ - case 0x0e28: /* Xeon-E5v2 (IvyBridge) */ case 0x342e: /* Tylersburg chipset (Nehalem / Westmere systems) */ case 0x3728: /* Xeon C5500/C3500 (JasperForest) */ case 0x3c28: /* Sandybridge */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45: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 1a9dYd-0007cA-FX; Thu, 17 Dec 2015 18:45:43 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYb-0007ar-KO for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:41 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id C5/88-18316-5D203765; Thu, 17 Dec 2015 18:45:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450377939!6081740!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19702 invoked from network); 17 Dec 2015 18:45:40 -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; 17 Dec 2015 18:45:40 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYZ-0005TO-Jj for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYZ-0002MH-GB for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:39 +0000 Date: Thu, 17 Dec 2015 18:45:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] VT-d: drop unneeded Ivybridge quirk workaround X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d11d0df41f9b2614689a39b360916338497f225b Author: Jan Beulich AuthorDate: Tue Dec 15 15:39:52 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:39:52 2015 +0100 VT-d: drop unneeded Ivybridge quirk workaround We've been told by Intel that server chipsets don't need the workaround anymore starting with Ivybridge (Xeon E5/E7 v2); the second half of the workaround was missing anyway. Signed-off-by: Jan Beulich Acked-by: Kevin Tian master commit: a10307b3912e65bbdd9184ba5fe849d252b75f92 master date: 2015-12-03 15:33:10 +0100 --- xen/drivers/passthrough/vtd/quirks.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/xen/drivers/passthrough/vtd/quirks.c b/xen/drivers/passthrough/vtd/quirks.c index 69d29ab..87b4d97 100644 --- a/xen/drivers/passthrough/vtd/quirks.c +++ b/xen/drivers/passthrough/vtd/quirks.c @@ -430,7 +430,6 @@ void pci_vtd_quirk(const struct pci_dev *pdev) * - This can cause system failure upon non-fatal VT-d faults. * - Potential security issue if malicious guest trigger VT-d faults. */ - case 0x0e28: /* Xeon-E5v2 (IvyBridge) */ case 0x342e: /* Tylersburg chipset (Nehalem / Westmere systems) */ case 0x3728: /* Xeon C5500/C3500 (JasperForest) */ case 0x3c28: /* Sandybridge */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45: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 1a9dYn-0007hl-Jb; Thu, 17 Dec 2015 18:45:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYm-0007hW-B1 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:52 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 28/48-00475-FD203765; Thu, 17 Dec 2015 18:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1450377950!11704943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28525 invoked from network); 17 Dec 2015 18:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 18:45:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYj-0005TU-TO for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYj-0002Mr-QM for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:49 +0000 Date: Thu, 17 Dec 2015 18:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/time: fix domain type check in tsc_set_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c11414775a28ccd29a33c62cd89e202feb631d7 Author: Haozhong Zhang AuthorDate: Tue Dec 15 15:40:18 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:40:18 2015 +0100 x86/time: fix domain type check in tsc_set_info() Replace is_hvm_domain() in tsc_set_info() by has_hvm_container_domain() to keep consistent with other domain type checks in tsc_set_info(). Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky master commit: 3c80d6f3c61eb0f8072f70b0a9a8c8c7adf17572 master date: 2015-12-08 09:46:30 +0100 --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 74c01e3..f31110b 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1966,7 +1966,7 @@ void tsc_set_info(struct domain *d, break; } d->arch.incarnation = incarnation + 1; - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { hvm_set_rdtsc_exiting(d, d->arch.vtsc); if ( d->vcpu && d->vcpu[0] && incarnation == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Thu Dec 17 18:45:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 17 Dec 2015 18:45: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 1a9dYn-0007hl-Jb; Thu, 17 Dec 2015 18:45:53 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYm-0007hW-B1 for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:52 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 28/48-00475-FD203765; Thu, 17 Dec 2015 18:45:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1450377950!11704943!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28525 invoked from network); 17 Dec 2015 18:45:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 17 Dec 2015 18:45:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9dYj-0005TU-TO for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9dYj-0002Mr-QM for xen-changelog@lists.xensource.com; Thu, 17 Dec 2015 18:45:49 +0000 Date: Thu, 17 Dec 2015 18:45:49 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.5] x86/time: fix domain type check in tsc_set_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4c11414775a28ccd29a33c62cd89e202feb631d7 Author: Haozhong Zhang AuthorDate: Tue Dec 15 15:40:18 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:40:18 2015 +0100 x86/time: fix domain type check in tsc_set_info() Replace is_hvm_domain() in tsc_set_info() by has_hvm_container_domain() to keep consistent with other domain type checks in tsc_set_info(). Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky master commit: 3c80d6f3c61eb0f8072f70b0a9a8c8c7adf17572 master date: 2015-12-08 09:46:30 +0100 --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index 74c01e3..f31110b 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1966,7 +1966,7 @@ void tsc_set_info(struct domain *d, break; } d->arch.incarnation = incarnation + 1; - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) { hvm_set_rdtsc_exiting(d, d->arch.vtsc); if ( d->vcpu && d->vcpu[0] && incarnation == 0 ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 10:33:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10: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 1a9sLV-0004F8-48; Fri, 18 Dec 2015 10:33:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLS-0004Eb-Uj for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:07 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 23/11-09834-2E0E3765; Fri, 18 Dec 2015 10:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450434784!11907722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48868 invoked from network); 18 Dec 2015 10:33: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; 18 Dec 2015 10:33:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLQ-0006Qm-Fb for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLQ-000156-BF for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:04 +0000 Date: Fri, 18 Dec 2015 10:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: don't suppress invalidation address write when it is zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1db34a40ea860d11f5dec030851f3808cfd6d7ea Author: Jan Beulich AuthorDate: Tue Dec 15 15:47:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:47:26 2015 +0100 VT-d: don't suppress invalidation address write when it is zero GFN zero is a valid address, and hence may need invalidation done for it just like for any other GFN. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: 710942e57fb42ff8f344ca82f6b678f67e38ae63 master date: 2015-10-12 15:58:35 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 18324ac..2036d56 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -415,7 +415,7 @@ static int flush_iotlb_reg(void *_iommu, u16 did, { struct iommu *iommu = (struct iommu *) _iommu; int tlb_offset = ecap_iotlb_offset(iommu->ecap); - u64 val = 0, val_iva = 0; + u64 val = 0; unsigned long flags; /* @@ -436,7 +436,6 @@ static int flush_iotlb_reg(void *_iommu, u16 did, switch ( type ) { case DMA_TLB_GLOBAL_FLUSH: - /* global flush doesn't need set IVA_REG */ val = DMA_TLB_GLOBAL_FLUSH|DMA_TLB_IVT; break; case DMA_TLB_DSI_FLUSH: @@ -444,8 +443,6 @@ static int flush_iotlb_reg(void *_iommu, u16 did, break; case DMA_TLB_PSI_FLUSH: val = DMA_TLB_PSI_FLUSH|DMA_TLB_IVT|DMA_TLB_DID(did); - /* Note: always flush non-leaf currently */ - val_iva = size_order | addr; break; default: BUG(); @@ -458,8 +455,11 @@ static int flush_iotlb_reg(void *_iommu, u16 did, spin_lock_irqsave(&iommu->register_lock, flags); /* Note: Only uses first TLB reg currently */ - if ( val_iva ) - dmar_writeq(iommu->reg, tlb_offset, val_iva); + if ( type == DMA_TLB_PSI_FLUSH ) + { + /* Note: always flush non-leaf currently. */ + dmar_writeq(iommu->reg, tlb_offset, size_order | addr); + } dmar_writeq(iommu->reg, tlb_offset + 8, val); /* Make sure hardware complete it */ -- 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 18 10:33:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10: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 1a9sLV-0004F8-48; Fri, 18 Dec 2015 10:33:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLS-0004Eb-Uj for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:07 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 23/11-09834-2E0E3765; Fri, 18 Dec 2015 10:33:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450434784!11907722!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48868 invoked from network); 18 Dec 2015 10:33: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; 18 Dec 2015 10:33:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLQ-0006Qm-Fb for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLQ-000156-BF for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:04 +0000 Date: Fri, 18 Dec 2015 10:33:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VT-d: don't suppress invalidation address write when it is zero X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1db34a40ea860d11f5dec030851f3808cfd6d7ea Author: Jan Beulich AuthorDate: Tue Dec 15 15:47:26 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:47:26 2015 +0100 VT-d: don't suppress invalidation address write when it is zero GFN zero is a valid address, and hence may need invalidation done for it just like for any other GFN. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Yang Zhang master commit: 710942e57fb42ff8f344ca82f6b678f67e38ae63 master date: 2015-10-12 15:58:35 +0200 --- xen/drivers/passthrough/vtd/iommu.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 18324ac..2036d56 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -415,7 +415,7 @@ static int flush_iotlb_reg(void *_iommu, u16 did, { struct iommu *iommu = (struct iommu *) _iommu; int tlb_offset = ecap_iotlb_offset(iommu->ecap); - u64 val = 0, val_iva = 0; + u64 val = 0; unsigned long flags; /* @@ -436,7 +436,6 @@ static int flush_iotlb_reg(void *_iommu, u16 did, switch ( type ) { case DMA_TLB_GLOBAL_FLUSH: - /* global flush doesn't need set IVA_REG */ val = DMA_TLB_GLOBAL_FLUSH|DMA_TLB_IVT; break; case DMA_TLB_DSI_FLUSH: @@ -444,8 +443,6 @@ static int flush_iotlb_reg(void *_iommu, u16 did, break; case DMA_TLB_PSI_FLUSH: val = DMA_TLB_PSI_FLUSH|DMA_TLB_IVT|DMA_TLB_DID(did); - /* Note: always flush non-leaf currently */ - val_iva = size_order | addr; break; default: BUG(); @@ -458,8 +455,11 @@ static int flush_iotlb_reg(void *_iommu, u16 did, spin_lock_irqsave(&iommu->register_lock, flags); /* Note: Only uses first TLB reg currently */ - if ( val_iva ) - dmar_writeq(iommu->reg, tlb_offset, val_iva); + if ( type == DMA_TLB_PSI_FLUSH ) + { + /* Note: always flush non-leaf currently. */ + dmar_writeq(iommu->reg, tlb_offset, size_order | addr); + } dmar_writeq(iommu->reg, tlb_offset + 8, val); /* Make sure hardware complete it */ -- 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 18 10:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10: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 1a9sLq-0004Jy-A2; Fri, 18 Dec 2015 10: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 1a9sLo-0004It-55 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:28 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id AB/FA-03066-7F0E3765; Fri, 18 Dec 2015 10:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450434805!11017119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49197 invoked from network); 18 Dec 2015 10:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:33:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLl-0006R4-DL for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLl-00015u-6N for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:25 +0000 Date: Fri, 18 Dec 2015 10:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/NUMA: fix SRAT table processor entry parsing and consumption X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff1010b09627784c959a5ae97e10472dbe7d097 Author: Jan Beulich AuthorDate: Tue Dec 15 15:48:44 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:48:44 2015 +0100 x86/NUMA: fix SRAT table processor entry parsing and consumption - don't overrun apicid_to_node[] (possible in the x2APIC case) - don't limit number of processor related SRAT entries we can consume - make acpi_numa_{processor,x2apic}_affinity_init() as similar to one another as possible - print APIC IDs in hex (to ease matching with other log messages), at once making legacy and x2APIC ones distinguishable (by width) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 83281fc9b31396e94c0bfb6550b75c165037a0ad master date: 2015-10-14 12:46:27 +0200 --- xen/arch/x86/numa.c | 3 ++- xen/arch/x86/setup.c | 2 +- xen/arch/x86/smpboot.c | 3 ++- xen/arch/x86/srat.c | 18 +++++++++++------- xen/drivers/acpi/numa.c | 4 ++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index b141877..a0a4796 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -331,7 +331,8 @@ void __init init_cpu_to_node(void) u32 apicid = x86_cpu_to_apicid[i]; if (apicid == BAD_APICID) continue; - node = apicid_to_node[apicid]; + node = apicid < MAX_LOCAL_APIC ? apicid_to_node[apicid] + : NUMA_NO_NODE; if ( node == NUMA_NO_NODE || !node_online(node) ) node = 0; numa_set_node(i, node); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 4f75af2..3727a8a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -193,7 +193,7 @@ void __devinit srat_detect_node(int cpu) unsigned node; u32 apicid = x86_cpu_to_apicid[cpu]; - node = apicid_to_node[apicid]; + node = apicid < MAX_LOCAL_APIC ? apicid_to_node[apicid] : NUMA_NO_NODE; if ( node == NUMA_NO_NODE ) node = 0; diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 7a1eac6..772f1aa 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -903,7 +903,8 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) cpu = node; goto out; } - apicid_to_node[apic_id] = node; + if ( apic_id < MAX_LOCAL_APIC ) + apicid_to_node[apic_id] = node; } /* Physically added CPUs do not have synchronised TSC. */ diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index d4e479c..b101135 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -170,7 +170,6 @@ void __init acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) { int pxm, node; - int apic_id; if (srat_disabled()) return; @@ -178,8 +177,13 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) bad_srat(); return; } - if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0) + if (!(pa->flags & ACPI_SRAT_CPU_ENABLED)) + return; + if (pa->apic_id >= MAX_LOCAL_APIC) { + printk(KERN_INFO "SRAT: APIC %08x ignored\n", pa->apic_id); return; + } + pxm = pa->proximity_domain; node = setup_node(pxm); if (node < 0) { @@ -187,11 +191,11 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) return; } - apic_id = pa->apic_id; - apicid_to_node[apic_id] = node; + apicid_to_node[pa->apic_id] = node; + node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", - pxm, apic_id, node); + printk(KERN_INFO "SRAT: PXM %u -> APIC %08x -> Node %u\n", + pxm, pa->apic_id, node); } /* Callback for Proximity Domain -> LAPIC mapping */ @@ -221,7 +225,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) apicid_to_node[pa->apic_id] = node; node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", + printk(KERN_INFO "SRAT: PXM %u -> APIC %02x -> Node %u\n", pxm, pa->apic_id, node); } diff --git a/xen/drivers/acpi/numa.c b/xen/drivers/acpi/numa.c index 775537b..9b4543a 100644 --- a/xen/drivers/acpi/numa.c +++ b/xen/drivers/acpi/numa.c @@ -199,9 +199,9 @@ int __init acpi_numa_init(void) /* SRAT: Static Resource Affinity Table */ if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) { acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY, - acpi_parse_x2apic_affinity, NR_CPUS); + acpi_parse_x2apic_affinity, 0); acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, - acpi_parse_processor_affinity, NR_CPUS); + acpi_parse_processor_affinity, 0); acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS); -- 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 18 10:33:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10: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 1a9sLq-0004Jy-A2; Fri, 18 Dec 2015 10: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 1a9sLo-0004It-55 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:28 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id AB/FA-03066-7F0E3765; Fri, 18 Dec 2015 10:33:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450434805!11017119!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49197 invoked from network); 18 Dec 2015 10:33:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:33:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLl-0006R4-DL for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLl-00015u-6N for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:25 +0000 Date: Fri, 18 Dec 2015 10:33:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/NUMA: fix SRAT table processor entry parsing and consumption X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit dff1010b09627784c959a5ae97e10472dbe7d097 Author: Jan Beulich AuthorDate: Tue Dec 15 15:48:44 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:48:44 2015 +0100 x86/NUMA: fix SRAT table processor entry parsing and consumption - don't overrun apicid_to_node[] (possible in the x2APIC case) - don't limit number of processor related SRAT entries we can consume - make acpi_numa_{processor,x2apic}_affinity_init() as similar to one another as possible - print APIC IDs in hex (to ease matching with other log messages), at once making legacy and x2APIC ones distinguishable (by width) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 83281fc9b31396e94c0bfb6550b75c165037a0ad master date: 2015-10-14 12:46:27 +0200 --- xen/arch/x86/numa.c | 3 ++- xen/arch/x86/setup.c | 2 +- xen/arch/x86/smpboot.c | 3 ++- xen/arch/x86/srat.c | 18 +++++++++++------- xen/drivers/acpi/numa.c | 4 ++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index b141877..a0a4796 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -331,7 +331,8 @@ void __init init_cpu_to_node(void) u32 apicid = x86_cpu_to_apicid[i]; if (apicid == BAD_APICID) continue; - node = apicid_to_node[apicid]; + node = apicid < MAX_LOCAL_APIC ? apicid_to_node[apicid] + : NUMA_NO_NODE; if ( node == NUMA_NO_NODE || !node_online(node) ) node = 0; numa_set_node(i, node); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 4f75af2..3727a8a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -193,7 +193,7 @@ void __devinit srat_detect_node(int cpu) unsigned node; u32 apicid = x86_cpu_to_apicid[cpu]; - node = apicid_to_node[apicid]; + node = apicid < MAX_LOCAL_APIC ? apicid_to_node[apicid] : NUMA_NO_NODE; if ( node == NUMA_NO_NODE ) node = 0; diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 7a1eac6..772f1aa 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -903,7 +903,8 @@ int cpu_add(uint32_t apic_id, uint32_t acpi_id, uint32_t pxm) cpu = node; goto out; } - apicid_to_node[apic_id] = node; + if ( apic_id < MAX_LOCAL_APIC ) + apicid_to_node[apic_id] = node; } /* Physically added CPUs do not have synchronised TSC. */ diff --git a/xen/arch/x86/srat.c b/xen/arch/x86/srat.c index d4e479c..b101135 100644 --- a/xen/arch/x86/srat.c +++ b/xen/arch/x86/srat.c @@ -170,7 +170,6 @@ void __init acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) { int pxm, node; - int apic_id; if (srat_disabled()) return; @@ -178,8 +177,13 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) bad_srat(); return; } - if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0) + if (!(pa->flags & ACPI_SRAT_CPU_ENABLED)) + return; + if (pa->apic_id >= MAX_LOCAL_APIC) { + printk(KERN_INFO "SRAT: APIC %08x ignored\n", pa->apic_id); return; + } + pxm = pa->proximity_domain; node = setup_node(pxm); if (node < 0) { @@ -187,11 +191,11 @@ acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) return; } - apic_id = pa->apic_id; - apicid_to_node[apic_id] = node; + apicid_to_node[pa->apic_id] = node; + node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", - pxm, apic_id, node); + printk(KERN_INFO "SRAT: PXM %u -> APIC %08x -> Node %u\n", + pxm, pa->apic_id, node); } /* Callback for Proximity Domain -> LAPIC mapping */ @@ -221,7 +225,7 @@ acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa) apicid_to_node[pa->apic_id] = node; node_set(node, processor_nodes_parsed); acpi_numa = 1; - printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n", + printk(KERN_INFO "SRAT: PXM %u -> APIC %02x -> Node %u\n", pxm, pa->apic_id, node); } diff --git a/xen/drivers/acpi/numa.c b/xen/drivers/acpi/numa.c index 775537b..9b4543a 100644 --- a/xen/drivers/acpi/numa.c +++ b/xen/drivers/acpi/numa.c @@ -199,9 +199,9 @@ int __init acpi_numa_init(void) /* SRAT: Static Resource Affinity Table */ if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) { acpi_table_parse_srat(ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY, - acpi_parse_x2apic_affinity, NR_CPUS); + acpi_parse_x2apic_affinity, 0); acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY, - acpi_parse_processor_affinity, NR_CPUS); + acpi_parse_processor_affinity, 0); acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY, acpi_parse_memory_affinity, NR_NODE_MEMBLKS); -- 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 18 10:33:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:33:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLr-0004LK-Hv; Fri, 18 Dec 2015 10:33:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLq-0004Ja-5C for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:30 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id B9/B2-18316-9F0E3765; Fri, 18 Dec 2015 10:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1450434798!5628827!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21386 invoked from network); 18 Dec 2015 10:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:33:29 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLa-0006Qr-VH for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLa-00015V-SB for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:14 +0000 Date: Fri, 18 Dec 2015 10:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: hide MWAITX from PV domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc285166ed4f8ed4caee53a98cba9fa1c5536af2 Author: Jan Beulich AuthorDate: Tue Dec 15 15:47:59 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:47:59 2015 +0100 x86: hide MWAITX from PV domains Since MWAIT is hidden too. (Linux starting with 4.3 is making use of that feature, and is checking for it without looking at the MWAIT one.) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 941cd44324db7eddc46cba4596fa13d505066ccf master date: 2015-10-13 17:17:52 +0200 --- xen/arch/x86/traps.c | 1 + xen/include/asm-x86/cpufeature.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e44cd2d..318153a 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -873,6 +873,7 @@ void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_LWP % 32, &c); __clear_bit(X86_FEATURE_NODEID_MSR % 32, &c); __clear_bit(X86_FEATURE_TOPOEXT % 32, &c); + __clear_bit(X86_FEATURE_MWAITX % 32, &c); break; case 0x00000005: /* MONITOR/MWAIT */ diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 526821f..d36bbca 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -137,6 +137,7 @@ #define X86_FEATURE_NODEID_MSR (6*32+19) /* NodeId MSR */ #define X86_FEATURE_TBM (6*32+21) /* trailing bit manipulations */ #define X86_FEATURE_TOPOEXT (6*32+22) /* topology extensions CPUID leafs */ +#define X86_FEATURE_MWAITX (6*32+29) /* MWAIT extension (MONITORX/MWAITX) */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 7 */ #define X86_FEATURE_FSGSBASE (7*32+ 0) /* {RD,WR}{FS,GS}BASE instructions */ -- 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 18 10:33:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:33:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLr-0004LK-Hv; Fri, 18 Dec 2015 10:33:31 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLq-0004Ja-5C for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:30 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id B9/B2-18316-9F0E3765; Fri, 18 Dec 2015 10:33:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1450434798!5628827!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21386 invoked from network); 18 Dec 2015 10:33:29 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:33:29 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLa-0006Qr-VH for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLa-00015V-SB for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:14 +0000 Date: Fri, 18 Dec 2015 10:33:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86: hide MWAITX from PV domains X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit cc285166ed4f8ed4caee53a98cba9fa1c5536af2 Author: Jan Beulich AuthorDate: Tue Dec 15 15:47:59 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:47:59 2015 +0100 x86: hide MWAITX from PV domains Since MWAIT is hidden too. (Linux starting with 4.3 is making use of that feature, and is checking for it without looking at the MWAIT one.) Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 941cd44324db7eddc46cba4596fa13d505066ccf master date: 2015-10-13 17:17:52 +0200 --- xen/arch/x86/traps.c | 1 + xen/include/asm-x86/cpufeature.h | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e44cd2d..318153a 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -873,6 +873,7 @@ void pv_cpuid(struct cpu_user_regs *regs) __clear_bit(X86_FEATURE_LWP % 32, &c); __clear_bit(X86_FEATURE_NODEID_MSR % 32, &c); __clear_bit(X86_FEATURE_TOPOEXT % 32, &c); + __clear_bit(X86_FEATURE_MWAITX % 32, &c); break; case 0x00000005: /* MONITOR/MWAIT */ diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 526821f..d36bbca 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -137,6 +137,7 @@ #define X86_FEATURE_NODEID_MSR (6*32+19) /* NodeId MSR */ #define X86_FEATURE_TBM (6*32+21) /* trailing bit manipulations */ #define X86_FEATURE_TOPOEXT (6*32+22) /* topology extensions CPUID leafs */ +#define X86_FEATURE_MWAITX (6*32+29) /* MWAIT extension (MONITORX/MWAITX) */ /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 7 */ #define X86_FEATURE_FSGSBASE (7*32+ 0) /* {RD,WR}{FS,GS}BASE instructions */ -- 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 18 10:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:33:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLz-0004Nt-MO; Fri, 18 Dec 2015 10: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 1a9sLy-0004NF-QS for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:38 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id BD/E2-18316-201E3765; Fri, 18 Dec 2015 10:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450434816!1675282!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1111 invoked from network); 18 Dec 2015 10:33:37 -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; 18 Dec 2015 10:33:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLv-0006RC-QO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLv-00016N-Mt for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:35 +0000 Date: Fri, 18 Dec 2015 10:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/PoD: Make p2m_pod_empty_cache() restartable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee4d57324786bbda7f7622c9bded9925ef150d6a Author: Andrew Cooper AuthorDate: Tue Dec 15 15:50:21 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:50:21 2015 +0100 x86/PoD: Make p2m_pod_empty_cache() restartable This avoids a long running operation when destroying a domain with a large PoD cache. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap master commit: 59a5061723ba47c0028cf48487e5de551c42a378 master date: 2015-11-02 15:33:38 +0100 --- xen/arch/x86/mm/p2m-pod.c | 16 +++++++++++----- xen/arch/x86/mm/paging.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index d97b4a3..d5e566e 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -376,11 +376,11 @@ out: return ret; } -void -p2m_pod_empty_cache(struct domain *d) +int p2m_pod_empty_cache(struct domain *d) { struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page; + unsigned int i; /* After this barrier no new PoD activities can happen. */ BUG_ON(!d->is_dying); @@ -390,8 +390,6 @@ p2m_pod_empty_cache(struct domain *d) while ( (page = page_list_remove_head(&p2m->pod.super)) ) { - int i; - for ( i = 0 ; i < SUPERPAGE_PAGES ; i++ ) { BUG_ON(page_get_owner(page + i) != d); @@ -399,19 +397,27 @@ p2m_pod_empty_cache(struct domain *d) } p2m->pod.count -= SUPERPAGE_PAGES; + + if ( hypercall_preempt_check() ) + goto out; } - while ( (page = page_list_remove_head(&p2m->pod.single)) ) + for ( i = 0; (page = page_list_remove_head(&p2m->pod.single)); ++i ) { BUG_ON(page_get_owner(page) != d); page_list_add_tail(page, &d->page_list); p2m->pod.count -= 1; + + if ( i && !(i & 511) && hypercall_preempt_check() ) + goto out; } BUG_ON(p2m->pod.count != 0); + out: unlock_page_alloc(p2m); + return p2m->pod.count ? -ERESTART : 0; } int diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 72555b3..fd30008 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -793,7 +793,7 @@ int paging_teardown(struct domain *d) return rc; /* Move populate-on-demand cache back to domain_list for destruction */ - p2m_pod_empty_cache(d); + rc = p2m_pod_empty_cache(d); return rc; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 9d70d6c..ef49ac3 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -530,7 +530,7 @@ void p2m_pod_dump_data(struct domain *d); /* Move all pages from the populate-on-demand cache to the domain page_list * (usually in preparation for domain destruction) */ -void p2m_pod_empty_cache(struct domain *d); +int p2m_pod_empty_cache(struct domain *d); /* Set populate-on-demand cache size so that the total memory allocated to a * domain matches target */ -- 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 18 10:33:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:33:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLz-0004Nt-MO; Fri, 18 Dec 2015 10: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 1a9sLy-0004NF-QS for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:38 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id BD/E2-18316-201E3765; Fri, 18 Dec 2015 10:33:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450434816!1675282!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1111 invoked from network); 18 Dec 2015 10:33:37 -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; 18 Dec 2015 10:33:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sLv-0006RC-QO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:35 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sLv-00016N-Mt for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:35 +0000 Date: Fri, 18 Dec 2015 10:33:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/PoD: Make p2m_pod_empty_cache() restartable X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee4d57324786bbda7f7622c9bded9925ef150d6a Author: Andrew Cooper AuthorDate: Tue Dec 15 15:50:21 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:50:21 2015 +0100 x86/PoD: Make p2m_pod_empty_cache() restartable This avoids a long running operation when destroying a domain with a large PoD cache. Signed-off-by: Andrew Cooper Reviewed-by: George Dunlap master commit: 59a5061723ba47c0028cf48487e5de551c42a378 master date: 2015-11-02 15:33:38 +0100 --- xen/arch/x86/mm/p2m-pod.c | 16 +++++++++++----- xen/arch/x86/mm/paging.c | 2 +- xen/include/asm-x86/p2m.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/mm/p2m-pod.c b/xen/arch/x86/mm/p2m-pod.c index d97b4a3..d5e566e 100644 --- a/xen/arch/x86/mm/p2m-pod.c +++ b/xen/arch/x86/mm/p2m-pod.c @@ -376,11 +376,11 @@ out: return ret; } -void -p2m_pod_empty_cache(struct domain *d) +int p2m_pod_empty_cache(struct domain *d) { struct p2m_domain *p2m = p2m_get_hostp2m(d); struct page_info *page; + unsigned int i; /* After this barrier no new PoD activities can happen. */ BUG_ON(!d->is_dying); @@ -390,8 +390,6 @@ p2m_pod_empty_cache(struct domain *d) while ( (page = page_list_remove_head(&p2m->pod.super)) ) { - int i; - for ( i = 0 ; i < SUPERPAGE_PAGES ; i++ ) { BUG_ON(page_get_owner(page + i) != d); @@ -399,19 +397,27 @@ p2m_pod_empty_cache(struct domain *d) } p2m->pod.count -= SUPERPAGE_PAGES; + + if ( hypercall_preempt_check() ) + goto out; } - while ( (page = page_list_remove_head(&p2m->pod.single)) ) + for ( i = 0; (page = page_list_remove_head(&p2m->pod.single)); ++i ) { BUG_ON(page_get_owner(page) != d); page_list_add_tail(page, &d->page_list); p2m->pod.count -= 1; + + if ( i && !(i & 511) && hypercall_preempt_check() ) + goto out; } BUG_ON(p2m->pod.count != 0); + out: unlock_page_alloc(p2m); + return p2m->pod.count ? -ERESTART : 0; } int diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 72555b3..fd30008 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -793,7 +793,7 @@ int paging_teardown(struct domain *d) return rc; /* Move populate-on-demand cache back to domain_list for destruction */ - p2m_pod_empty_cache(d); + rc = p2m_pod_empty_cache(d); return rc; } diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index 9d70d6c..ef49ac3 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -530,7 +530,7 @@ void p2m_pod_dump_data(struct domain *d); /* Move all pages from the populate-on-demand cache to the domain page_list * (usually in preparation for domain destruction) */ -void p2m_pod_empty_cache(struct domain *d); +int p2m_pod_empty_cache(struct domain *d); /* Set populate-on-demand cache size so that the total memory allocated to a * domain matches target */ -- 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 18 10:33:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:33:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMB-0004RL-Qa; Fri, 18 Dec 2015 10:33:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMA-0004Qs-Ph for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:50 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 43/4F-21571-E01E3765; Fri, 18 Dec 2015 10:33:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450434826!6056065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47160 invoked from network); 18 Dec 2015 10:33:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:33:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sM6-0006RR-81 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sM6-00016n-4o for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:46 +0000 Date: Fri, 18 Dec 2015 10:33:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/vmx: improvements to vmentry failure handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1b6738ad7832f8dbf44a76039c9fc8c44384bbbd Author: Andrew Cooper AuthorDate: Tue Dec 15 15:50:47 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:50:47 2015 +0100 x86/vmx: improvements to vmentry failure handling Combine the almost identical vm_launch_fail() and vm_resume_fail() into a single vmx_vmentry_failure(). Re-save all GPRs so that domain_crash() prints the real register values, rather than the stack frame of the vmx_vmentry_failure() call. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian master commit: bbcf0b218f64b1e3e2b66b0fbb623f51d9014e81 master date: 2015-11-03 18:14:02 +0100 --- xen/arch/x86/hvm/vmx/entry.S | 9 +++++---- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 664ed83..3c8c749 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -102,14 +102,15 @@ UNLIKELY_END(realmode) /*.Lvmx_resume:*/ VMRESUME - sti - call vm_resume_fail - ud2 + jmp .Lvmx_vmentry_fail .Lvmx_launch: VMLAUNCH + +.Lvmx_vmentry_fail: sti - call vm_launch_fail + SAVE_ALL + call vmx_vmentry_failure ud2 ENTRY(vmx_asm_do_vmentry) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4a97563..89a5722 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1292,21 +1292,14 @@ void vmx_destroy_vmcs(struct vcpu *v) free_xenheap_page(v->arch.hvm_vmx.msr_bitmap); } -void vm_launch_fail(void) -{ - unsigned long error; - - __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); - domain_crash_synchronous(); -} - -void vm_resume_fail(void) +void vmx_vmentry_failure(void) { + struct vcpu *curr = current; unsigned long error; __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); + printk(XENLOG_G_ERR "%pv: VM%s error: %#lx\n", + curr, curr->arch.hvm_vmx.launched ? "RESUME" : "LAUNCH", error); domain_crash_synchronous(); } -- 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 18 10:33:51 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:33:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMB-0004RL-Qa; Fri, 18 Dec 2015 10:33:51 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMA-0004Qs-Ph for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:50 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 43/4F-21571-E01E3765; Fri, 18 Dec 2015 10:33:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450434826!6056065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47160 invoked from network); 18 Dec 2015 10:33:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:33:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sM6-0006RR-81 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sM6-00016n-4o for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:46 +0000 Date: Fri, 18 Dec 2015 10:33:46 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/vmx: improvements to vmentry failure handling X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1b6738ad7832f8dbf44a76039c9fc8c44384bbbd Author: Andrew Cooper AuthorDate: Tue Dec 15 15:50:47 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:50:47 2015 +0100 x86/vmx: improvements to vmentry failure handling Combine the almost identical vm_launch_fail() and vm_resume_fail() into a single vmx_vmentry_failure(). Re-save all GPRs so that domain_crash() prints the real register values, rather than the stack frame of the vmx_vmentry_failure() call. Signed-off-by: Andrew Cooper Acked-by: Kevin Tian master commit: bbcf0b218f64b1e3e2b66b0fbb623f51d9014e81 master date: 2015-11-03 18:14:02 +0100 --- xen/arch/x86/hvm/vmx/entry.S | 9 +++++---- xen/arch/x86/hvm/vmx/vmcs.c | 15 ++++----------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S index 664ed83..3c8c749 100644 --- a/xen/arch/x86/hvm/vmx/entry.S +++ b/xen/arch/x86/hvm/vmx/entry.S @@ -102,14 +102,15 @@ UNLIKELY_END(realmode) /*.Lvmx_resume:*/ VMRESUME - sti - call vm_resume_fail - ud2 + jmp .Lvmx_vmentry_fail .Lvmx_launch: VMLAUNCH + +.Lvmx_vmentry_fail: sti - call vm_launch_fail + SAVE_ALL + call vmx_vmentry_failure ud2 ENTRY(vmx_asm_do_vmentry) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4a97563..89a5722 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1292,21 +1292,14 @@ void vmx_destroy_vmcs(struct vcpu *v) free_xenheap_page(v->arch.hvm_vmx.msr_bitmap); } -void vm_launch_fail(void) -{ - unsigned long error; - - __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); - domain_crash_synchronous(); -} - -void vm_resume_fail(void) +void vmx_vmentry_failure(void) { + struct vcpu *curr = current; unsigned long error; __vmread(VM_INSTRUCTION_ERROR, &error); - printk(" error code %lx\n", error); + printk(XENLOG_G_ERR "%pv: VM%s error: %#lx\n", + curr, curr->arch.hvm_vmx.launched ? "RESUME" : "LAUNCH", error); domain_crash_synchronous(); } -- 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 18 10:34:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMR-0004VO-Vr; Fri, 18 Dec 2015 10:34:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMQ-0004Us-Ah for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:06 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id A8/AF-21571-D11E3765; Fri, 18 Dec 2015 10:34:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450434839!6056100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48520 invoked from network); 18 Dec 2015 10:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMG-0006Rc-HL for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMG-00017q-Dg for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:56 +0000 Date: Fri, 18 Dec 2015 10:33:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: don't inject #DB with error code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e2cca296faf56dd76cd1fbac045dfcbe9d2e808 Author: Jan Beulich AuthorDate: Tue Dec 15 15:51:44 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:51:44 2015 +0100 x86/HVM: don't inject #DB with error code Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 057e0e72d2a5d598087c5f167ec6a13203a3cf65 master date: 2015-11-12 16:59:18 +0100 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 86ae18a..321f8bf 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2519,7 +2519,7 @@ void hvm_task_switch( goto out; if ( (tss.trace & 1) && !exn_raised ) - hvm_inject_hw_exception(TRAP_debug, tss_sel & 0xfff8); + hvm_inject_hw_exception(TRAP_debug, HVM_DELIVER_NO_ERROR_CODE); tr.attr.fields.type = 0xb; /* busy 32-bit tss */ hvm_set_segment_register(v, x86_seg_tr, &tr); -- 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 18 10:34:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMR-0004VO-Vr; Fri, 18 Dec 2015 10:34:07 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMQ-0004Us-Ah for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:06 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id A8/AF-21571-D11E3765; Fri, 18 Dec 2015 10:34:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450434839!6056100!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 48520 invoked from network); 18 Dec 2015 10:34:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMG-0006Rc-HL for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMG-00017q-Dg for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:33:56 +0000 Date: Fri, 18 Dec 2015 10:33:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/HVM: don't inject #DB with error code X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6e2cca296faf56dd76cd1fbac045dfcbe9d2e808 Author: Jan Beulich AuthorDate: Tue Dec 15 15:51:44 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:51:44 2015 +0100 x86/HVM: don't inject #DB with error code Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 057e0e72d2a5d598087c5f167ec6a13203a3cf65 master date: 2015-11-12 16:59:18 +0100 --- xen/arch/x86/hvm/hvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 86ae18a..321f8bf 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2519,7 +2519,7 @@ void hvm_task_switch( goto out; if ( (tss.trace & 1) && !exn_raised ) - hvm_inject_hw_exception(TRAP_debug, tss_sel & 0xfff8); + hvm_inject_hw_exception(TRAP_debug, HVM_DELIVER_NO_ERROR_CODE); tr.attr.fields.type = 0xb; /* busy 32-bit tss */ hvm_set_segment_register(v, x86_seg_tr, &tr); -- 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 18 10:34:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMX-0004X4-3B; Fri, 18 Dec 2015 10:34:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMV-0004WQ-Cj for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:12 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 34/A9-16870-221E3765; Fri, 18 Dec 2015 10:34:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1450434847!11289320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41937 invoked from network); 18 Dec 2015 10:34:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMQ-0006SD-T9 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMQ-00018P-PX for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:06 +0000 Date: Fri, 18 Dec 2015 10:34:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] sched: fix locking for insert_vcpu() in credit1 and RTDS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52f7217a10ffb692ae0e320830c17dcfeb7f6810 Author: Dario Faggioli AuthorDate: Tue Dec 15 15:52:51 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:52:51 2015 +0100 sched: fix locking for insert_vcpu() in credit1 and RTDS The insert_vcpu() hook is handled with inconsistent locking. In fact, schedule_cpu_switch() calls the hook with runqueue lock held, while sched_move_domain() relies on the hook implementations to take the lock themselves (and, since that is not done in Credit1 and RTDS, such operation is not safe in those cases). This is fixed as follows: - take the lock in the hook implementations, in specific schedulers' code; - avoid calling insert_vcpu(), for the idle vCPU, in schedule_cpu_switch(). In fact, idle vCPUs are set to run immediately, and the various schedulers won't insert them in their runqueues anyway, even when explicitly asked to. While there, still in schedule_cpu_switch(), locking with _irq() is enough (there's no need to do *_irqsave()). Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap master commit: ae2f41e3d7e7798537b7ea6dbb9a0c6aeb1179e3 master date: 2015-11-24 14:48:34 +0100 --- xen/common/sched_credit.c | 6 ++++++ xen/common/schedule.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 81f3510..f08075d 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -910,9 +910,15 @@ static void csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu *svc = vc->sched_priv; + spinlock_t *lock; + unsigned long flags; + + lock = vcpu_schedule_lock_irqsave(vc, &flags); if ( !__vcpu_on_runq(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(vc->processor, svc); + + vcpu_schedule_unlock_irqrestore(lock, flags, vc); } static void diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 79768c5..f2a7427 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1418,7 +1418,6 @@ void __init scheduler_init(void) int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { - unsigned long flags; struct vcpu *idle; spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; @@ -1439,7 +1438,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - lock = pcpu_schedule_lock_irqsave(cpu, &flags); + lock = pcpu_schedule_lock_irq(cpu); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1448,9 +1447,8 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) ppriv_old = per_cpu(schedule_data, cpu).sched_priv; per_cpu(schedule_data, cpu).sched_priv = ppriv; SCHED_OP(new_ops, tick_resume, cpu); - SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(lock, flags, cpu); + pcpu_schedule_unlock_irq(lock, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); -- 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 18 10:34:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMX-0004X4-3B; Fri, 18 Dec 2015 10:34:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMV-0004WQ-Cj for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:12 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 34/A9-16870-221E3765; Fri, 18 Dec 2015 10:34:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-206.messagelabs.com!1450434847!11289320!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41937 invoked from network); 18 Dec 2015 10:34:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMQ-0006SD-T9 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMQ-00018P-PX for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:06 +0000 Date: Fri, 18 Dec 2015 10:34:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] sched: fix locking for insert_vcpu() in credit1 and RTDS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 52f7217a10ffb692ae0e320830c17dcfeb7f6810 Author: Dario Faggioli AuthorDate: Tue Dec 15 15:52:51 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:52:51 2015 +0100 sched: fix locking for insert_vcpu() in credit1 and RTDS The insert_vcpu() hook is handled with inconsistent locking. In fact, schedule_cpu_switch() calls the hook with runqueue lock held, while sched_move_domain() relies on the hook implementations to take the lock themselves (and, since that is not done in Credit1 and RTDS, such operation is not safe in those cases). This is fixed as follows: - take the lock in the hook implementations, in specific schedulers' code; - avoid calling insert_vcpu(), for the idle vCPU, in schedule_cpu_switch(). In fact, idle vCPUs are set to run immediately, and the various schedulers won't insert them in their runqueues anyway, even when explicitly asked to. While there, still in schedule_cpu_switch(), locking with _irq() is enough (there's no need to do *_irqsave()). Signed-off-by: Dario Faggioli Reviewed-by: Meng Xu Reviewed-by: George Dunlap master commit: ae2f41e3d7e7798537b7ea6dbb9a0c6aeb1179e3 master date: 2015-11-24 14:48:34 +0100 --- xen/common/sched_credit.c | 6 ++++++ xen/common/schedule.c | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c index 81f3510..f08075d 100644 --- a/xen/common/sched_credit.c +++ b/xen/common/sched_credit.c @@ -910,9 +910,15 @@ static void csched_vcpu_insert(const struct scheduler *ops, struct vcpu *vc) { struct csched_vcpu *svc = vc->sched_priv; + spinlock_t *lock; + unsigned long flags; + + lock = vcpu_schedule_lock_irqsave(vc, &flags); if ( !__vcpu_on_runq(svc) && vcpu_runnable(vc) && !vc->is_running ) __runq_insert(vc->processor, svc); + + vcpu_schedule_unlock_irqrestore(lock, flags, vc); } static void diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 79768c5..f2a7427 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -1418,7 +1418,6 @@ void __init scheduler_init(void) int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) { - unsigned long flags; struct vcpu *idle; spinlock_t *lock; void *ppriv, *ppriv_old, *vpriv, *vpriv_old; @@ -1439,7 +1438,7 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) return -ENOMEM; } - lock = pcpu_schedule_lock_irqsave(cpu, &flags); + lock = pcpu_schedule_lock_irq(cpu); SCHED_OP(old_ops, tick_suspend, cpu); vpriv_old = idle->sched_priv; @@ -1448,9 +1447,8 @@ int schedule_cpu_switch(unsigned int cpu, struct cpupool *c) ppriv_old = per_cpu(schedule_data, cpu).sched_priv; per_cpu(schedule_data, cpu).sched_priv = ppriv; SCHED_OP(new_ops, tick_resume, cpu); - SCHED_OP(new_ops, insert_vcpu, idle); - pcpu_schedule_unlock_irqrestore(lock, flags, cpu); + pcpu_schedule_unlock_irq(lock, cpu); SCHED_OP(old_ops, free_vdata, vpriv_old); SCHED_OP(old_ops, free_pdata, ppriv_old, cpu); -- 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 18 10:34:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMf-0004Yz-86; Fri, 18 Dec 2015 10:34:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMd-0004YX-LR for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:19 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 3C/73-13487-A21E3765; Fri, 18 Dec 2015 10:34:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1450434857!11572043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61489 invoked from network); 18 Dec 2015 10:34:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMb-0006SL-CS for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMb-00018r-67 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:17 +0000 Date: Fri, 18 Dec 2015 10:34:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VMX: fix/adjust trap injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f70eaf9f0784297831bea168d416b9c834d667db Author: Jan Beulich AuthorDate: Tue Dec 15 15:53:12 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:53:12 2015 +0100 VMX: fix/adjust trap injection In the course of investigating the 4.1.6 backport issue of the XSA-156 patch I realized that #DB injection has always been broken, but with it now getting always intercepted the problem has got worse: Documentation clearly states that neither DR7.GD nor DebugCtl.LBR get cleared before the intercept, so this is something we need to do before reflecting the intercepted exception. While adjusting this (and also with 4.1.6's strange use of X86_EVENTTYPE_SW_EXCEPTION for #DB in mind) I further realized that the special casing of individual vectors shouldn't be done for software interrupts (resulting from INT $nn). And then some code movement: Setting of CR2 for #PF can be done in the same switch() statement (no need for a separate if()), and reading of intr_info is better done close the the consumption of the variable (allowing the compiler to generate better code / use fewer registers for variables). Signed-off-by: Jan Beulich Acked-by: Kevin Tian master commit: 81a28f14009f4d8577a81b28dd06f6828112054b master date: 2015-11-24 12:30:31 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index ced3092..a8a9d58 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1409,16 +1409,7 @@ static void vmx_inject_trap(struct hvm_trap *trap) struct vcpu *curr = current; struct hvm_trap _trap = *trap; - if ( (_trap.vector == TRAP_page_fault) && - (_trap.type == X86_EVENTTYPE_HW_EXCEPTION) ) - current->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; - - if ( nestedhvm_vcpu_in_guestmode(curr) ) - intr_info = vcpu_2_nvmx(curr).intr.intr_info; - else - __vmread(VM_ENTRY_INTR_INFO, &intr_info); - - switch ( _trap.vector ) + switch ( _trap.vector | -(_trap.type == X86_EVENTTYPE_SW_INTERRUPT) ) { case TRAP_debug: if ( guest_cpu_user_regs()->eflags & X86_EFLAGS_TF ) @@ -1426,6 +1417,16 @@ static void vmx_inject_trap(struct hvm_trap *trap) __restore_debug_registers(curr); write_debugreg(6, read_debugreg(6) | 0x4000); } + if ( !nestedhvm_vcpu_in_guestmode(curr) || + !nvmx_intercepts_exception(curr, TRAP_debug, _trap.error_code) ) + { + unsigned long val; + + __vmread(GUEST_DR7, &val); + __vmwrite(GUEST_DR7, val & ~DR_GENERAL_DETECT); + __vmread(GUEST_IA32_DEBUGCTL, &val); + __vmwrite(GUEST_IA32_DEBUGCTL, val & ~IA32_DEBUGCTLMSR_LBR); + } if ( cpu_has_monitor_trap_flag ) break; /* fall through */ @@ -1436,8 +1437,19 @@ static void vmx_inject_trap(struct hvm_trap *trap) domain_pause_for_debugger(); return; } + break; + + case TRAP_page_fault: + ASSERT(_trap.type == X86_EVENTTYPE_HW_EXCEPTION); + curr->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; + break; } + if ( nestedhvm_vcpu_in_guestmode(curr) ) + intr_info = vcpu_2_nvmx(curr).intr.intr_info; + else + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( unlikely(intr_info & INTR_INFO_VALID_MASK) && (((intr_info >> 8) & 7) == X86_EVENTTYPE_HW_EXCEPTION) ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 10:34:21 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMf-0004Yz-86; Fri, 18 Dec 2015 10:34:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMd-0004YX-LR for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:19 +0000 Received: from [85.158.139.211] by server-3.bemta-5.messagelabs.com id 3C/73-13487-A21E3765; Fri, 18 Dec 2015 10:34:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1450434857!11572043!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61489 invoked from network); 18 Dec 2015 10:34:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMb-0006SL-CS for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMb-00018r-67 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:17 +0000 Date: Fri, 18 Dec 2015 10:34:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] VMX: fix/adjust trap injection X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f70eaf9f0784297831bea168d416b9c834d667db Author: Jan Beulich AuthorDate: Tue Dec 15 15:53:12 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:53:12 2015 +0100 VMX: fix/adjust trap injection In the course of investigating the 4.1.6 backport issue of the XSA-156 patch I realized that #DB injection has always been broken, but with it now getting always intercepted the problem has got worse: Documentation clearly states that neither DR7.GD nor DebugCtl.LBR get cleared before the intercept, so this is something we need to do before reflecting the intercepted exception. While adjusting this (and also with 4.1.6's strange use of X86_EVENTTYPE_SW_EXCEPTION for #DB in mind) I further realized that the special casing of individual vectors shouldn't be done for software interrupts (resulting from INT $nn). And then some code movement: Setting of CR2 for #PF can be done in the same switch() statement (no need for a separate if()), and reading of intr_info is better done close the the consumption of the variable (allowing the compiler to generate better code / use fewer registers for variables). Signed-off-by: Jan Beulich Acked-by: Kevin Tian master commit: 81a28f14009f4d8577a81b28dd06f6828112054b master date: 2015-11-24 12:30:31 +0100 --- xen/arch/x86/hvm/vmx/vmx.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index ced3092..a8a9d58 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -1409,16 +1409,7 @@ static void vmx_inject_trap(struct hvm_trap *trap) struct vcpu *curr = current; struct hvm_trap _trap = *trap; - if ( (_trap.vector == TRAP_page_fault) && - (_trap.type == X86_EVENTTYPE_HW_EXCEPTION) ) - current->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; - - if ( nestedhvm_vcpu_in_guestmode(curr) ) - intr_info = vcpu_2_nvmx(curr).intr.intr_info; - else - __vmread(VM_ENTRY_INTR_INFO, &intr_info); - - switch ( _trap.vector ) + switch ( _trap.vector | -(_trap.type == X86_EVENTTYPE_SW_INTERRUPT) ) { case TRAP_debug: if ( guest_cpu_user_regs()->eflags & X86_EFLAGS_TF ) @@ -1426,6 +1417,16 @@ static void vmx_inject_trap(struct hvm_trap *trap) __restore_debug_registers(curr); write_debugreg(6, read_debugreg(6) | 0x4000); } + if ( !nestedhvm_vcpu_in_guestmode(curr) || + !nvmx_intercepts_exception(curr, TRAP_debug, _trap.error_code) ) + { + unsigned long val; + + __vmread(GUEST_DR7, &val); + __vmwrite(GUEST_DR7, val & ~DR_GENERAL_DETECT); + __vmread(GUEST_IA32_DEBUGCTL, &val); + __vmwrite(GUEST_IA32_DEBUGCTL, val & ~IA32_DEBUGCTLMSR_LBR); + } if ( cpu_has_monitor_trap_flag ) break; /* fall through */ @@ -1436,8 +1437,19 @@ static void vmx_inject_trap(struct hvm_trap *trap) domain_pause_for_debugger(); return; } + break; + + case TRAP_page_fault: + ASSERT(_trap.type == X86_EVENTTYPE_HW_EXCEPTION); + curr->arch.hvm_vcpu.guest_cr[2] = _trap.cr2; + break; } + if ( nestedhvm_vcpu_in_guestmode(curr) ) + intr_info = vcpu_2_nvmx(curr).intr.intr_info; + else + __vmread(VM_ENTRY_INTR_INFO, &intr_info); + if ( unlikely(intr_info & INTR_INFO_VALID_MASK) && (((intr_info >> 8) & 7) == X86_EVENTTYPE_HW_EXCEPTION) ) { -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.4 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 10:34:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMp-0004c8-Be; Fri, 18 Dec 2015 10:34:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMo-0004b8-7n for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:30 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 6A/ED-03066-531E3765; Fri, 18 Dec 2015 10:34:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1450434868!11247822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3758 invoked from network); 18 Dec 2015 10:34:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMl-0006Sa-O6 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMl-00019J-Lw for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:27 +0000 Date: Fri, 18 Dec 2015 10:34:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/vPMU: document as unsupported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f089991f9f1f580493d1bb72fb46a3b31a97d5f4 Author: Jan Beulich AuthorDate: Tue Dec 15 15:53:49 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:53:49 2015 +0100 x86/vPMU: document as unsupported This is XSA-163. Signed-off-by: Jan Beulich master commit: c03480cf5c4e96fb4afb2237ad0a3cac7162564a master date: 2015-11-24 18:32:20 +0100 --- docs/misc/xen-command-line.markdown | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 3d2ebc7..74999e3 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1041,8 +1041,9 @@ feature is switched on on Intel processors supporting this feature. Note that if **watchdog** option is also specified vpmu will be turned off. *Warning:* -As the BTS virtualisation is not 100% safe and because of the nehalem quirk -don't use the vpmu flag on production systems with Intel cpus! +As the virtualisation is not 100% safe, don't use the vpmu flag on +production systems (see Xen Security Advisory 163, +http://xenbits.xen.org/xsa/advisory-163.html)! ### watchdog > `= force | ` -- 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 18 10:34:31 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sMp-0004c8-Be; Fri, 18 Dec 2015 10:34:31 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMo-0004b8-7n for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:30 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id 6A/ED-03066-531E3765; Fri, 18 Dec 2015 10:34:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1450434868!11247822!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3758 invoked from network); 18 Dec 2015 10:34:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMl-0006Sa-O6 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMl-00019J-Lw for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:27 +0000 Date: Fri, 18 Dec 2015 10:34:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/vPMU: document as unsupported X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f089991f9f1f580493d1bb72fb46a3b31a97d5f4 Author: Jan Beulich AuthorDate: Tue Dec 15 15:53:49 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:53:49 2015 +0100 x86/vPMU: document as unsupported This is XSA-163. Signed-off-by: Jan Beulich master commit: c03480cf5c4e96fb4afb2237ad0a3cac7162564a master date: 2015-11-24 18:32:20 +0100 --- docs/misc/xen-command-line.markdown | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 3d2ebc7..74999e3 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1041,8 +1041,9 @@ feature is switched on on Intel processors supporting this feature. Note that if **watchdog** option is also specified vpmu will be turned off. *Warning:* -As the BTS virtualisation is not 100% safe and because of the nehalem quirk -don't use the vpmu flag on production systems with Intel cpus! +As the virtualisation is not 100% safe, don't use the vpmu flag on +production systems (see Xen Security Advisory 163, +http://xenbits.xen.org/xsa/advisory-163.html)! ### watchdog > `= force | ` -- 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 18 10:34:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMz-0004f7-KI; Fri, 18 Dec 2015 10:34:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMy-0004ej-Gk for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:40 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 73/04-13475-F31E3765; Fri, 18 Dec 2015 10:34:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450434878!8122154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18753 invoked from network); 18 Dec 2015 10:34:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMw-0006Si-0j for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMv-00019u-Vn for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:37 +0000 Date: Fri, 18 Dec 2015 10:34:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/boot: check for not allowed sections before linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f287a78df9192a4194b8146ed0e4661fdb92092 Author: Daniel Kiper AuthorDate: Tue Dec 15 15:55:00 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:55:00 2015 +0100 x86/boot: check for not allowed sections before linking Currently check for not allowed sections is performed just after compilation. However, if compilation succeeds and check fails then second build will create xen.gz/xen.efi without any visible error. This happens because %.o: %.c recipe created object file during first run and make do not execute this recipe during second run. So, look for not allowed sections before linking. This way check will be executed every time. Signed-off-by: Daniel Kiper Reviewed-by: Jan Beulich master commit: d380b3559734739ae009cd3c0e9aabb5602863e2 master date: 2015-11-25 17:24:36 +0100 --- xen/arch/x86/boot/build32.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index a2d4b34..8ca1de8 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -16,11 +16,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) $(OBJCOPY) -O binary $< $@ %.lnk: %.o - $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< - -%.o: %.c - $(CC) $(CFLAGS) -c -fpic $< -o $@ - $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p}' |\ + $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ while read idx name sz rest; do \ case "$$name" in \ .data|.data.*|.rodata|.rodata.*|.bss|.bss.*) \ @@ -29,6 +25,10 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) exit $$(expr $$idx + 1);; \ esac; \ done + $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< + +%.o: %.c + $(CC) $(CFLAGS) -c -fpic $< -o $@ reloc.o: $(BASEDIR)/include/asm-x86/config.h .PRECIOUS: %.bin %.lnk -- 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 18 10:34:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMz-0004f7-KI; Fri, 18 Dec 2015 10:34:41 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMy-0004ej-Gk for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:40 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 73/04-13475-F31E3765; Fri, 18 Dec 2015 10:34:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450434878!8122154!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18753 invoked from network); 18 Dec 2015 10:34:39 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:39 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sMw-0006Si-0j for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:38 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sMv-00019u-Vn for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:37 +0000 Date: Fri, 18 Dec 2015 10:34:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/boot: check for not allowed sections before linking X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2f287a78df9192a4194b8146ed0e4661fdb92092 Author: Daniel Kiper AuthorDate: Tue Dec 15 15:55:00 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:55:00 2015 +0100 x86/boot: check for not allowed sections before linking Currently check for not allowed sections is performed just after compilation. However, if compilation succeeds and check fails then second build will create xen.gz/xen.efi without any visible error. This happens because %.o: %.c recipe created object file during first run and make do not execute this recipe during second run. So, look for not allowed sections before linking. This way check will be executed every time. Signed-off-by: Daniel Kiper Reviewed-by: Jan Beulich master commit: d380b3559734739ae009cd3c0e9aabb5602863e2 master date: 2015-11-25 17:24:36 +0100 --- xen/arch/x86/boot/build32.mk | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index a2d4b34..8ca1de8 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -16,11 +16,7 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) $(OBJCOPY) -O binary $< $@ %.lnk: %.o - $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< - -%.o: %.c - $(CC) $(CFLAGS) -c -fpic $< -o $@ - $(OBJDUMP) -h $@ | sed -n '/[0-9]/{s,00*,0,g;p}' |\ + $(OBJDUMP) -h $< | sed -n '/[0-9]/{s,00*,0,g;p;}' |\ while read idx name sz rest; do \ case "$$name" in \ .data|.data.*|.rodata|.rodata.*|.bss|.bss.*) \ @@ -29,6 +25,10 @@ CFLAGS := $(filter-out -flto,$(CFLAGS)) exit $$(expr $$idx + 1);; \ esac; \ done + $(LD) $(LDFLAGS_DIRECT) -N -Ttext 0 -o $@ $< + +%.o: %.c + $(CC) $(CFLAGS) -c -fpic $< -o $@ reloc.o: $(BASEDIR)/include/asm-x86/config.h .PRECIOUS: %.bin %.lnk -- 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 18 10:34:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sNC-0004iQ-P6; Fri, 18 Dec 2015 10:34:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sNB-0004i4-1L for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:53 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id F1/67-08347-C41E3765; Fri, 18 Dec 2015 10:34:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1450434888!11909194!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46410 invoked from network); 18 Dec 2015 10:34:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sN6-0006St-BO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sN6-0001AS-7z for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:48 +0000 Date: Fri, 18 Dec 2015 10:34:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] evtchn: don't reuse ports that are still "busy" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3049fad2b01e85e944d928763f2b012eebf080e Author: David Vrabel AuthorDate: Tue Dec 15 15:55:23 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:55:23 2015 +0100 evtchn: don't reuse ports that are still "busy" When using the FIFO ABI a guest may close an event channel that is still LINKED. If this port is reused, subsequent events may be lost because they may become pending on the wrong queue. This could be fixed by requiring guests to only close event channels that are not linked. This is difficult since: a) irq cleanup in the guest may be done in a context that cannot wait for the event to be unlinked; b) the guest may attempt to rebind a PIRQ whose previous close is still pending; and c) existing guests already have the problematic behaviour. Instead, simply check a port is not "busy" (i.e., it's not linked) before reusing it. Guests should still drain any queues for VCPUs that are being offlined, or the port will become unusable until the VCPU is onlined and starts processing events again. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich master commit: 78e24c269b0a4a8b864ece725e6d4209ed95dfa7 master date: 2015-12-02 15:21:46 +0100 --- xen/common/event_channel.c | 3 ++- xen/common/event_fifo.c | 12 ++++++++++++ xen/include/xen/event.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 2774cbb..0e4c195 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -171,7 +171,8 @@ static int get_free_port(struct domain *d) { if ( port > d->max_evtchn_port ) return -ENOSPC; - if ( evtchn_from_port(d, port)->state == ECS_FREE ) + if ( evtchn_from_port(d, port)->state == ECS_FREE + && !evtchn_port_is_busy(d, port) ) return port; } diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index e9c1fbe..a443c98 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -313,6 +313,17 @@ static bool_t evtchn_fifo_is_masked(struct domain *d, return test_bit(EVTCHN_FIFO_MASKED, word); } +static bool_t evtchn_fifo_is_busy(struct domain *d, evtchn_port_t port) +{ + event_word_t *word; + + word = evtchn_fifo_word_from_port(d, port); + if ( unlikely(!word) ) + return 0; + + return test_bit(EVTCHN_FIFO_LINKED, word); +} + static int evtchn_fifo_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) { @@ -352,6 +363,7 @@ static const struct evtchn_port_ops evtchn_port_ops_fifo = .unmask = evtchn_fifo_unmask, .is_pending = evtchn_fifo_is_pending, .is_masked = evtchn_fifo_is_masked, + .is_busy = evtchn_fifo_is_busy, .set_priority = evtchn_fifo_set_priority, .print_state = evtchn_fifo_print_state, }; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 06c0654..075f4da 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -138,6 +138,11 @@ struct evtchn_port_ops { void (*unmask)(struct domain *d, struct evtchn *evtchn); bool_t (*is_pending)(struct domain *d, const struct evtchn *evtchn); bool_t (*is_masked)(struct domain *d, const struct evtchn *evtchn); + /* + * Is the port unavailable because it's still being cleaned up + * after being closed? + */ + bool_t (*is_busy)(struct domain *d, evtchn_port_t port); int (*set_priority)(struct domain *d, struct evtchn *evtchn, unsigned int priority); void (*print_state)(struct domain *d, const struct evtchn *evtchn); @@ -179,6 +184,13 @@ static inline bool_t evtchn_port_is_masked(struct domain *d, return d->evtchn_port_ops->is_masked(d, evtchn); } +static inline bool_t evtchn_port_is_busy(struct domain *d, evtchn_port_t port) +{ + if ( d->evtchn_port_ops->is_busy ) + return d->evtchn_port_ops->is_busy(d, port); + return 0; +} + static inline int evtchn_port_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) -- 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 18 10:34:54 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:34: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 1a9sNC-0004iQ-P6; Fri, 18 Dec 2015 10:34:54 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sNB-0004i4-1L for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:53 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id F1/67-08347-C41E3765; Fri, 18 Dec 2015 10:34:52 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1450434888!11909194!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46410 invoked from network); 18 Dec 2015 10:34:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:34:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sN6-0006St-BO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sN6-0001AS-7z for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:48 +0000 Date: Fri, 18 Dec 2015 10:34:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] evtchn: don't reuse ports that are still "busy" X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c3049fad2b01e85e944d928763f2b012eebf080e Author: David Vrabel AuthorDate: Tue Dec 15 15:55:23 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:55:23 2015 +0100 evtchn: don't reuse ports that are still "busy" When using the FIFO ABI a guest may close an event channel that is still LINKED. If this port is reused, subsequent events may be lost because they may become pending on the wrong queue. This could be fixed by requiring guests to only close event channels that are not linked. This is difficult since: a) irq cleanup in the guest may be done in a context that cannot wait for the event to be unlinked; b) the guest may attempt to rebind a PIRQ whose previous close is still pending; and c) existing guests already have the problematic behaviour. Instead, simply check a port is not "busy" (i.e., it's not linked) before reusing it. Guests should still drain any queues for VCPUs that are being offlined, or the port will become unusable until the VCPU is onlined and starts processing events again. Signed-off-by: David Vrabel Reviewed-by: Jan Beulich master commit: 78e24c269b0a4a8b864ece725e6d4209ed95dfa7 master date: 2015-12-02 15:21:46 +0100 --- xen/common/event_channel.c | 3 ++- xen/common/event_fifo.c | 12 ++++++++++++ xen/include/xen/event.h | 12 ++++++++++++ 3 files changed, 26 insertions(+), 1 deletions(-) diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c index 2774cbb..0e4c195 100644 --- a/xen/common/event_channel.c +++ b/xen/common/event_channel.c @@ -171,7 +171,8 @@ static int get_free_port(struct domain *d) { if ( port > d->max_evtchn_port ) return -ENOSPC; - if ( evtchn_from_port(d, port)->state == ECS_FREE ) + if ( evtchn_from_port(d, port)->state == ECS_FREE + && !evtchn_port_is_busy(d, port) ) return port; } diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c index e9c1fbe..a443c98 100644 --- a/xen/common/event_fifo.c +++ b/xen/common/event_fifo.c @@ -313,6 +313,17 @@ static bool_t evtchn_fifo_is_masked(struct domain *d, return test_bit(EVTCHN_FIFO_MASKED, word); } +static bool_t evtchn_fifo_is_busy(struct domain *d, evtchn_port_t port) +{ + event_word_t *word; + + word = evtchn_fifo_word_from_port(d, port); + if ( unlikely(!word) ) + return 0; + + return test_bit(EVTCHN_FIFO_LINKED, word); +} + static int evtchn_fifo_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) { @@ -352,6 +363,7 @@ static const struct evtchn_port_ops evtchn_port_ops_fifo = .unmask = evtchn_fifo_unmask, .is_pending = evtchn_fifo_is_pending, .is_masked = evtchn_fifo_is_masked, + .is_busy = evtchn_fifo_is_busy, .set_priority = evtchn_fifo_set_priority, .print_state = evtchn_fifo_print_state, }; diff --git a/xen/include/xen/event.h b/xen/include/xen/event.h index 06c0654..075f4da 100644 --- a/xen/include/xen/event.h +++ b/xen/include/xen/event.h @@ -138,6 +138,11 @@ struct evtchn_port_ops { void (*unmask)(struct domain *d, struct evtchn *evtchn); bool_t (*is_pending)(struct domain *d, const struct evtchn *evtchn); bool_t (*is_masked)(struct domain *d, const struct evtchn *evtchn); + /* + * Is the port unavailable because it's still being cleaned up + * after being closed? + */ + bool_t (*is_busy)(struct domain *d, evtchn_port_t port); int (*set_priority)(struct domain *d, struct evtchn *evtchn, unsigned int priority); void (*print_state)(struct domain *d, const struct evtchn *evtchn); @@ -179,6 +184,13 @@ static inline bool_t evtchn_port_is_masked(struct domain *d, return d->evtchn_port_ops->is_masked(d, evtchn); } +static inline bool_t evtchn_port_is_busy(struct domain *d, evtchn_port_t port) +{ + if ( d->evtchn_port_ops->is_busy ) + return d->evtchn_port_ops->is_busy(d, port); + return 0; +} + static inline int evtchn_port_set_priority(struct domain *d, struct evtchn *evtchn, unsigned int priority) -- 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 18 10:35:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:35: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 1a9sNQ-0004l8-T4; Fri, 18 Dec 2015 10:35:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sNP-0004kr-6p for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:35:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id CD/05-18316-A51E3765; Fri, 18 Dec 2015 10:35:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1450434899!6057326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51616 invoked from network); 18 Dec 2015 10:35:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:35:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sNG-0006T6-KO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sNG-0001Bk-Iy for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:58 +0000 Date: Fri, 18 Dec 2015 10:34:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/time: fix domain type check in tsc_set_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b73c9bf21f9199401a36eeda7ba0a4412aad6d Author: Haozhong Zhang AuthorDate: Tue Dec 15 15:56:02 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:56:02 2015 +0100 x86/time: fix domain type check in tsc_set_info() Replace is_hvm_domain() in tsc_set_info() by has_hvm_container_domain() to keep consistent with other domain type checks in tsc_set_info(). Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky master commit: 3c80d6f3c61eb0f8072f70b0a9a8c8c7adf17572 master date: 2015-12-08 09:46:30 +0100 --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index f80d661..fbbd095 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1918,7 +1918,7 @@ void tsc_set_info(struct domain *d, break; } d->arch.incarnation = incarnation + 1; - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_set_rdtsc_exiting(d, d->arch.vtsc); } -- 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 18 10:35:08 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 10:35: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 1a9sNQ-0004l8-T4; Fri, 18 Dec 2015 10:35:08 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sNP-0004kr-6p for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:35:07 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id CD/05-18316-A51E3765; Fri, 18 Dec 2015 10:35:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1450434899!6057326!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51616 invoked from network); 18 Dec 2015 10:35:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-9.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 10:35:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9sNG-0006T6-KO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9sNG-0001Bk-Iy for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 10:34:58 +0000 Date: Fri, 18 Dec 2015 10:34:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen stable-4.4] x86/time: fix domain type check in tsc_set_info() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d0b73c9bf21f9199401a36eeda7ba0a4412aad6d Author: Haozhong Zhang AuthorDate: Tue Dec 15 15:56:02 2015 +0100 Commit: Jan Beulich CommitDate: Tue Dec 15 15:56:02 2015 +0100 x86/time: fix domain type check in tsc_set_info() Replace is_hvm_domain() in tsc_set_info() by has_hvm_container_domain() to keep consistent with other domain type checks in tsc_set_info(). Signed-off-by: Haozhong Zhang Reviewed-by: Boris Ostrovsky master commit: 3c80d6f3c61eb0f8072f70b0a9a8c8c7adf17572 master date: 2015-12-08 09:46:30 +0100 --- xen/arch/x86/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c index f80d661..fbbd095 100644 --- a/xen/arch/x86/time.c +++ b/xen/arch/x86/time.c @@ -1918,7 +1918,7 @@ void tsc_set_info(struct domain *d, break; } d->arch.incarnation = incarnation + 1; - if ( is_hvm_domain(d) ) + if ( has_hvm_container_domain(d) ) hvm_set_rdtsc_exiting(d, d->arch.vtsc); } -- 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 18 15:00:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00: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 1a9wVq-0003uH-Mk; Fri, 18 Dec 2015 15:00:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wVq-0003u9-0T for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:06 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 86/40-18316-57F14765; Fri, 18 Dec 2015 15:00:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1450450803!6245604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51121 invoked from network); 18 Dec 2015 15:00:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wVn-0000z2-N9 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wVn-00016H-FY for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:03 +0000 Date: Fri, 18 Dec 2015 15:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b8bcb5e754881c4e6bee871a789c178fb5b00fcb Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:55:13 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#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 18 15:00:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00: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 1a9wVq-0003uH-Mk; Fri, 18 Dec 2015 15:00:06 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wVq-0003u9-0T for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:06 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 86/40-18316-57F14765; Fri, 18 Dec 2015 15:00:05 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1450450803!6245604!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51121 invoked from network); 18 Dec 2015 15:00:04 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wVn-0000z2-N9 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wVn-00016H-FY for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:03 +0000 Date: Fri, 18 Dec 2015 15:00:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b8bcb5e754881c4e6bee871a789c178fb5b00fcb Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:55:13 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#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 18 15:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00: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 1a9wW2-0003wR-Qo; Fri, 18 Dec 2015 15:00:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wW2-0003wH-2y for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:18 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id A4/3A-03763-18F14765; Fri, 18 Dec 2015 15:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1450450814!11320323!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8983 invoked from network); 18 Dec 2015 15:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wVx-0000zA-Uv for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wVx-00017G-SX for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:13 +0000 Date: Fri, 18 Dec 2015 15:00:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a82794b1d5a6da06062a333b1db404e2448345dd Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:55:17 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#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 18 15:00:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00: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 1a9wW2-0003wR-Qo; Fri, 18 Dec 2015 15:00:18 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wW2-0003wH-2y for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:18 +0000 Received: from [85.158.137.68] by server-16.bemta-3.messagelabs.com id A4/3A-03763-18F14765; Fri, 18 Dec 2015 15:00:17 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-31.messagelabs.com!1450450814!11320323!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8983 invoked from network); 18 Dec 2015 15:00:15 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wVx-0000zA-Uv for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wVx-00017G-SX for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:13 +0000 Date: Fri, 18 Dec 2015 15:00:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional master] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a82794b1d5a6da06062a333b1db404e2448345dd Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:55:17 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#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 18 15:00:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00: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 1a9wWD-0003y3-Uh; Fri, 18 Dec 2015 15:00:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWC-0003xp-83 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:28 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 44/FF-28221-B8F14765; Fri, 18 Dec 2015 15:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450450825!11983097!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6188 invoked from network); 18 Dec 2015 15:00:26 -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; 18 Dec 2015 15:00:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wW9-0000zN-Of for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wW9-00018F-LZ for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:25 +0000 Date: Fri, 18 Dec 2015 15:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.6] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86f5058086f7a5250b3e46fbe586d4f5beddeb63 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:56:43 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:00:29 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00: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 1a9wWD-0003y3-Uh; Fri, 18 Dec 2015 15:00:29 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWC-0003xp-83 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:28 +0000 Received: from [193.109.254.147] by server-7.bemta-14.messagelabs.com id 44/FF-28221-B8F14765; Fri, 18 Dec 2015 15:00:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1450450825!11983097!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6188 invoked from network); 18 Dec 2015 15:00:26 -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; 18 Dec 2015 15:00:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wW9-0000zN-Of for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wW9-00018F-LZ for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:25 +0000 Date: Fri, 18 Dec 2015 15:00:25 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.6] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 86f5058086f7a5250b3e46fbe586d4f5beddeb63 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:56:43 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:00:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWO-000407-2Y; Fri, 18 Dec 2015 15:00:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWM-0003zr-Pm for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:38 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id A1/C0-21571-69F14765; Fri, 18 Dec 2015 15:00:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1450450836!6118539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9033 invoked from network); 18 Dec 2015 15:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWK-0000zV-7F for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWJ-00019J-Vn for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:36 +0000 Date: Fri, 18 Dec 2015 15:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.6] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ff95ee25149052f6eccfd5d3b3ec814f4f8a6d7 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:56:43 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:00:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWO-000407-2Y; Fri, 18 Dec 2015 15:00:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWM-0003zr-Pm for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:38 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id A1/C0-21571-69F14765; Fri, 18 Dec 2015 15:00:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-21.messagelabs.com!1450450836!6118539!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9033 invoked from network); 18 Dec 2015 15:00:37 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:37 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWK-0000zV-7F for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:36 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWJ-00019J-Vn for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:36 +0000 Date: Fri, 18 Dec 2015 15:00:35 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.6] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6ff95ee25149052f6eccfd5d3b3ec814f4f8a6d7 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:56:43 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.6 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:00:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWa-00043M-6j; Fri, 18 Dec 2015 15:00:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWY-000431-SW for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:50 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 32/01-21571-2AF14765; Fri, 18 Dec 2015 15:00:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450450848!6139651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43251 invoked from network); 18 Dec 2015 15:00:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWW-0000zj-7s for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWV-0001Ag-SI for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:48 +0000 Date: Fri, 18 Dec 2015 15:00:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.5] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12cbf578452e0ad1200b5e110a0455b91d5e7189 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:57:57 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:00:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:00:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWa-00043M-6j; Fri, 18 Dec 2015 15:00:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWY-000431-SW for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:50 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 32/01-21571-2AF14765; Fri, 18 Dec 2015 15:00:50 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450450848!6139651!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43251 invoked from network); 18 Dec 2015 15:00:49 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWW-0000zj-7s for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWV-0001Ag-SI for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:48 +0000 Date: Fri, 18 Dec 2015 15:00:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.5] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 12cbf578452e0ad1200b5e110a0455b91d5e7189 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:57:57 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:01:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 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 1a9wWm-000467-AT; Fri, 18 Dec 2015 15:01:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWl-00045m-78 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:03 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 8C/93-13475-EAF14765; Fri, 18 Dec 2015 15:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1450450858!11939137!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54019 invoked from network); 18 Dec 2015 15:00:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWg-0000zr-ML for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWg-0001BG-F5 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:58 +0000 Date: Fri, 18 Dec 2015 15:00:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.5] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9eb9952892716caae2f0960acc1f06132625426 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:57:57 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:01:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 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 1a9wWm-000467-AT; Fri, 18 Dec 2015 15:01:04 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWl-00045m-78 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:03 +0000 Received: from [193.109.254.147] by server-9.bemta-14.messagelabs.com id 8C/93-13475-EAF14765; Fri, 18 Dec 2015 15:01:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1450450858!11939137!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54019 invoked from network); 18 Dec 2015 15:00:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:00:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWg-0000zr-ML for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWg-0001BG-F5 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:00:58 +0000 Date: Fri, 18 Dec 2015 15:00:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.5] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f9eb9952892716caae2f0960acc1f06132625426 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:57:57 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.git#stable-4.5 _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Fri Dec 18 15:01:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:01: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 1a9wWw-00048F-ID; Fri, 18 Dec 2015 15:01:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWv-00047u-Bx for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:13 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 1E/97-09834-8BF14765; Fri, 18 Dec 2015 15:01:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1450450870!11909803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35587 invoked from network); 18 Dec 2015 15:01:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:01:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWs-00010V-LN for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWs-0001CF-BS for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:10 +0000 Date: Fri, 18 Dec 2015 15:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.4] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc468fe34e146026854242676635d9435dab5c0d Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:30 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 18 15:01:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:01: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 1a9wWw-00048F-ID; Fri, 18 Dec 2015 15:01:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWv-00047u-Bx for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:13 +0000 Received: from [193.109.254.147] by server-12.bemta-14.messagelabs.com id 1E/97-09834-8BF14765; Fri, 18 Dec 2015 15:01:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1450450870!11909803!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35587 invoked from network); 18 Dec 2015 15:01:11 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:01:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wWs-00010V-LN for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wWs-0001CF-BS for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:10 +0000 Date: Fri, 18 Dec 2015 15:01:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.4] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bc468fe34e146026854242676635d9435dab5c0d Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:30 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 18 15:01:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:01: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 1a9wX6-0004B6-LS; Fri, 18 Dec 2015 15:01:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wX5-0004Aq-Fo for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:23 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 57/B2-08347-2CF14765; Fri, 18 Dec 2015 15:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1450450881!12001674!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5093 invoked from network); 18 Dec 2015 15:01:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:01:22 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wX2-00010g-W0 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wX2-0001Ce-Tf for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:20 +0000 Date: Fri, 18 Dec 2015 15:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.4] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c51f20baba0bc01e7e3a3a16e72be9a0ed6cb734 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:30 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 18 15:01:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:01: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 1a9wX6-0004B6-LS; Fri, 18 Dec 2015 15:01:24 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wX5-0004Aq-Fo for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:23 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 57/B2-08347-2CF14765; Fri, 18 Dec 2015 15:01:22 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1450450881!12001674!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5093 invoked from network); 18 Dec 2015 15:01:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-6.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:01:22 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wX2-00010g-W0 for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wX2-0001Ce-Tf for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:20 +0000 Date: Fri, 18 Dec 2015 15:01:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.4] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c51f20baba0bc01e7e3a3a16e72be9a0ed6cb734 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:30 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 18 15:01:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:01:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXI-0004Dd-TX; Fri, 18 Dec 2015 15:01:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXH-0004DE-Im for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:35 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id A0/65-03066-ECF14765; Fri, 18 Dec 2015 15:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450450893!11090600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7750 invoked from network); 18 Dec 2015 15:01:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:01:33 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXE-00010o-RI for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wXE-0001DY-JO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:32 +0000 Date: Fri, 18 Dec 2015 15:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.3] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 806a941fb5c68f0b25f209b92553acb298d30c04 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:56 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 18 15:01:36 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 15:01:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXI-0004Dd-TX; Fri, 18 Dec 2015 15:01:36 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXH-0004DE-Im for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:35 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id A0/65-03066-ECF14765; Fri, 18 Dec 2015 15:01:34 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450450893!11090600!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7750 invoked from network); 18 Dec 2015 15:01:33 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 18 Dec 2015 15:01:33 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXE-00010o-RI for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:32 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wXE-0001DY-JO for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:32 +0000 Date: Fri, 18 Dec 2015 15:01:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.3] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 806a941fb5c68f0b25f209b92553acb298d30c04 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:37:08 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:56 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/xenfb.c b/hw/xenfb.c index 75b2bc2..369d45d 100644 --- a/hw/xenfb.c +++ b/hw/xenfb.c @@ -827,18 +827,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 18 15:01:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 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 1a9wXT-0004Fu-1V; Fri, 18 Dec 2015 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 1a9wXR-0004Fb-Li for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:45 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 03/8D-14715-8DF14765; Fri, 18 Dec 2015 15:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450450903!4138932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4467 invoked from network); 18 Dec 2015 15:01:44 -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; 18 Dec 2015 15:01:44 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXP-00010w-6F for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wXP-0001Er-3E for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:43 +0000 Date: Fri, 18 Dec 2015 15:01:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.3] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95872ff9713292f1c859c093feae0a2eaff8f810 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:56 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 18 15:01:47 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 18 Dec 2015 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 1a9wXT-0004Fu-1V; Fri, 18 Dec 2015 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 1a9wXR-0004Fb-Li for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:45 +0000 Received: from [85.158.137.68] by server-1.bemta-3.messagelabs.com id 03/8D-14715-8DF14765; Fri, 18 Dec 2015 15:01:44 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450450903!4138932!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4467 invoked from network); 18 Dec 2015 15:01:44 -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; 18 Dec 2015 15:01:44 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1a9wXP-00010w-6F for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:43 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1a9wXP-0001Er-3E for xen-changelog@lists.xensource.com; Fri, 18 Dec 2015 15:01:43 +0000 Date: Fri, 18 Dec 2015 15:01:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen-traditional stable-4.3] blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 95872ff9713292f1c859c093feae0a2eaff8f810 Author: Stefano Stabellini AuthorDate: Fri Nov 20 10:56:00 2015 -0500 Commit: Ian Jackson CommitDate: Fri Dec 18 14:58:56 2015 +0000 blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk --- hw/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/xen_blkif.h b/hw/xen_blkif.h index ca3a65b..eb29cb1 100644 --- a/hw/xen_blkif.h +++ b/hw/xen_blkif.h @@ -79,8 +79,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -94,8 +96,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque dst->handle = src->handle; dst->id = src->id; dst->sector_number = src->sector_number; - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + xen_mb(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen-traditional.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 19 14:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Dec 2015 14:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOf-000428-2U; Sat, 19 Dec 2015 14:22:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOc-000420-St for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:06 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 79/D2-22089-E0865765; Sat, 19 Dec 2015 14:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1450534924!11754149!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11251 invoked from network); 19 Dec 2015 14:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Dec 2015 14:22:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOa-0006nl-Ca for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aAIOa-00006Z-7Y for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:04 +0000 Date: Sat, 19 Dec 2015 14:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 367132cb26369af0821c7f7aa3a2f6ec0047a41c Author: Stefano Stabellini AuthorDate: Fri Dec 18 15:09:58 2015 +0000 Commit: Stefano Stabellini CommitDate: Fri Dec 18 15:20:38 2015 +0000 xen/blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/block/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/block/xen_blkif.h b/hw/block/xen_blkif.h index 711b692..c68487cb 100644 --- a/hw/block/xen_blkif.h +++ b/hw/block/xen_blkif.h @@ -85,8 +85,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque d->nr_sectors = s->nr_sectors; return; } - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + barrier(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -106,8 +108,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque d->nr_sectors = s->nr_sectors; return; } - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + barrier(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 19 14:22:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Dec 2015 14:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOf-000428-2U; Sat, 19 Dec 2015 14:22:09 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOc-000420-St for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:06 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 79/D2-22089-E0865765; Sat, 19 Dec 2015 14:22:06 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1450534924!11754149!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11251 invoked from network); 19 Dec 2015 14:22:05 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 19 Dec 2015 14:22:05 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOa-0006nl-Ca for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:04 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aAIOa-00006Z-7Y for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:04 +0000 Date: Sat, 19 Dec 2015 14:22:04 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xen/blkif: Avoid double access to src->nr_segments X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 367132cb26369af0821c7f7aa3a2f6ec0047a41c Author: Stefano Stabellini AuthorDate: Fri Dec 18 15:09:58 2015 +0000 Commit: Stefano Stabellini CommitDate: Fri Dec 18 15:20:38 2015 +0000 xen/blkif: Avoid double access to src->nr_segments src is stored in shared memory and src->nr_segments is dereferenced twice at the end of the function. If a compiler decides to compile this into two separate memory accesses then the size limitation could be bypassed. Fix it by removing the double access to src->nr_segments. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/block/xen_blkif.h | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/block/xen_blkif.h b/hw/block/xen_blkif.h index 711b692..c68487cb 100644 --- a/hw/block/xen_blkif.h +++ b/hw/block/xen_blkif.h @@ -85,8 +85,10 @@ static inline void blkif_get_x86_32_req(blkif_request_t *dst, blkif_x86_32_reque d->nr_sectors = s->nr_sectors; return; } - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + barrier(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } @@ -106,8 +108,10 @@ static inline void blkif_get_x86_64_req(blkif_request_t *dst, blkif_x86_64_reque d->nr_sectors = s->nr_sectors; return; } - if (n > src->nr_segments) - n = src->nr_segments; + /* prevent the compiler from optimizing the code and using src->nr_segments instead */ + barrier(); + if (n > dst->nr_segments) + n = dst->nr_segments; for (i = 0; i < n; i++) dst->seg[i] = src->seg[i]; } -- generated by git-patchbot for /home/xen/git/qemu-xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 19 14:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Dec 2015 14: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 1aAIOo-00043I-83; Sat, 19 Dec 2015 14:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOm-000439-RU for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:16 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id D6/20-24494-81865765; Sat, 19 Dec 2015 14:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1450534934!11769396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5332 invoked from network); 19 Dec 2015 14:22: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; 19 Dec 2015 14:22:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOk-0006np-Kh for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aAIOk-00006v-JH for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:14 +0000 Date: Sat, 19 Dec 2015 14:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f165e581d9a6f7cf81aa7496d3eee1e31212c8ad Author: Stefano Stabellini AuthorDate: Fri Dec 18 15:10:09 2015 +0000 Commit: Stefano Stabellini CommitDate: Fri Dec 18 15:20:45 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/display/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 5e324ef..4e2a27a 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -784,18 +784,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Sat Dec 19 14:22:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 19 Dec 2015 14: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 1aAIOo-00043I-83; Sat, 19 Dec 2015 14:22:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOm-000439-RU for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:16 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id D6/20-24494-81865765; Sat, 19 Dec 2015 14:22:16 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1450534934!11769396!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5332 invoked from network); 19 Dec 2015 14:22: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; 19 Dec 2015 14:22:15 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aAIOk-0006np-Kh for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:14 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aAIOk-00006v-JH for xen-changelog@lists.xensource.com; Sat, 19 Dec 2015 14:22:14 +0000 Date: Sat, 19 Dec 2015 14:22:14 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [qemu-xen master] xenfb: avoid reading twice the same fields from the shared page X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f165e581d9a6f7cf81aa7496d3eee1e31212c8ad Author: Stefano Stabellini AuthorDate: Fri Dec 18 15:10:09 2015 +0000 Commit: Stefano Stabellini CommitDate: Fri Dec 18 15:20:45 2015 +0000 xenfb: avoid reading twice the same fields from the shared page Reading twice the same field could give the guest an attack of opportunity. In the case of event->type, gcc could compile the switch statement into a jump table, effectively ending up reading the type field multiple times. This is part of XSA-155. Signed-off-by: Stefano Stabellini --- hw/display/xenfb.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 5e324ef..4e2a27a 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -784,18 +784,20 @@ static void xenfb_invalidate(void *opaque) static void xenfb_handle_events(struct XenFB *xenfb) { - uint32_t prod, cons; + uint32_t prod, cons, out_cons; struct xenfb_page *page = xenfb->c.page; prod = page->out_prod; - if (prod == page->out_cons) + out_cons = page->out_cons; + if (prod == out_cons) return; xen_rmb(); /* ensure we see ring contents up to prod */ - for (cons = page->out_cons; cons != prod; cons++) { + for (cons = out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); + uint8_t type = event->type; int x, y, w, h; - switch (event->type) { + switch (type) { case XENFB_TYPE_UPDATE: if (xenfb->up_count == UP_QUEUE) xenfb->up_fullscreen = 1; -- generated by git-patchbot for /home/xen/git/qemu-xen.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 23 06:22:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcoa-0005lO-2Y; Wed, 23 Dec 2015 06:22:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcoY-0005lE-3m for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:22:22 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id D2/3A-32615-D9D3A765; Wed, 23 Dec 2015 06:22:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1450851739!12372224!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49922 invoked from network); 23 Dec 2015 06:22:20 -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; 23 Dec 2015 06:22:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcoV-0000m0-Oy for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:22:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcoU-000719-5O for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:22:19 +0000 Date: Wed, 23 Dec 2015 06:22:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: Allow device model to raise PCI interrupts (pcilevel capability) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3619c989c641c545a597326e71fac93e8e2610c Author: Ian Campbell AuthorDate: Mon Dec 14 11:55:45 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 16 09:44:45 2015 +0000 flask: Allow device model to raise PCI interrupts (pcilevel capability) Allows: (XEN) avc: denied { pcilevel } for domid=2 target=1 scontext=system_u:system_r:dm_dom_t tcontext=system_u:system_r:domU_t_target tclass=hvm Which otherwise leads to the following on resume after migrate (comparing non-XSM to XSM): ata2.00: configured for MWDMA2 usb 1-2: reset full-speed USB device number 2 using uhci_hcd +PM: restore of devices complete after 3779.268 msecs usb 1-2: USB disconnect, device number 2 -PM: restore of devices complete after 2342.528 msecs usb 1-2: new full-speed USB device number 3 using uhci_hcd usb 1-2: New USB device found, idVendor=0627, idProduct=0001 usb 1-2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 usb 1-2: Product: QEMU USB Tablet usb 1-2: Manufacturer: QEMU 0.10.2 usb 1-2: SerialNumber: 1 input: QEMU 0.10.2 QEMU USB Tablet as /devices/pci0000:00/0000:00:01.2/usb1/1-2/1-2:1.0/input/input8 generic-usb 0003:0627:0001.0002: input,hidraw0: USB HID v0.01 Pointer [QEMU 0.10.2 QEMU USB Tablet] on usb-0000:00:01.2-2/input0 Restarting tasks ... done. Setting capacity to 20480000 Setting capacity to 20480000 +uhci_hcd 0000:00:01.2: Unlink after no-IRQ? Controller is probably using the wrong IRQ. And a glitch in the domU which is sufficient to disrupt the post migration checks done by osstest. This has been through a test run on merlot1 and resolved the migration issues with the test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm osstest test case. Signed-off-by: Ian Campbell Cc: Daniel De Graaf Acked-by: Ian Jackson Acked-by: Daniel De Graaf --- tools/flask/policy/policy/modules/xen/xen.if | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index 32dd7b3..00d1bbb 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -150,7 +150,7 @@ define(`device_model', ` allow $1 $2_target:domain shutdown; allow $1 $2_target:mmu { map_read map_write adjust physmap target_hack }; - allow $1 $2_target:hvm { getparam setparam trackdirtyvram hvmctl irqlevel pciroute cacheattr send_irq }; + allow $1 $2_target:hvm { getparam setparam trackdirtyvram hvmctl irqlevel pciroute pcilevel cacheattr send_irq }; ') # make_device_model(priv, dm_dom, hvm_dom) -- generated by git-patchbot for /home/xen/git/xen.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 23 06:22:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcoa-0005lO-2Y; Wed, 23 Dec 2015 06:22:24 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcoY-0005lE-3m for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:22:22 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id D2/3A-32615-D9D3A765; Wed, 23 Dec 2015 06:22:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1450851739!12372224!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49922 invoked from network); 23 Dec 2015 06:22:20 -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; 23 Dec 2015 06:22:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcoV-0000m0-Oy for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:22:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcoU-000719-5O for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:22:19 +0000 Date: Wed, 23 Dec 2015 06:22:18 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] flask: Allow device model to raise PCI interrupts (pcilevel capability) X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d3619c989c641c545a597326e71fac93e8e2610c Author: Ian Campbell AuthorDate: Mon Dec 14 11:55:45 2015 +0000 Commit: Ian Campbell CommitDate: Wed Dec 16 09:44:45 2015 +0000 flask: Allow device model to raise PCI interrupts (pcilevel capability) Allows: (XEN) avc: denied { pcilevel } for domid=2 target=1 scontext=system_u:system_r:dm_dom_t tcontext=system_u:system_r:domU_t_target tclass=hvm Which otherwise leads to the following on resume after migrate (comparing non-XSM to XSM): ata2.00: configured for MWDMA2 usb 1-2: reset full-speed USB device number 2 using uhci_hcd +PM: restore of devices complete after 3779.268 msecs usb 1-2: USB disconnect, device number 2 -PM: restore of devices complete after 2342.528 msecs usb 1-2: new full-speed USB device number 3 using uhci_hcd usb 1-2: New USB device found, idVendor=0627, idProduct=0001 usb 1-2: New USB device strings: Mfr=3, Product=2, SerialNumber=1 usb 1-2: Product: QEMU USB Tablet usb 1-2: Manufacturer: QEMU 0.10.2 usb 1-2: SerialNumber: 1 input: QEMU 0.10.2 QEMU USB Tablet as /devices/pci0000:00/0000:00:01.2/usb1/1-2/1-2:1.0/input/input8 generic-usb 0003:0627:0001.0002: input,hidraw0: USB HID v0.01 Pointer [QEMU 0.10.2 QEMU USB Tablet] on usb-0000:00:01.2-2/input0 Restarting tasks ... done. Setting capacity to 20480000 Setting capacity to 20480000 +uhci_hcd 0000:00:01.2: Unlink after no-IRQ? Controller is probably using the wrong IRQ. And a glitch in the domU which is sufficient to disrupt the post migration checks done by osstest. This has been through a test run on merlot1 and resolved the migration issues with the test-amd64-amd64-xl-qemut-stubdom-debianhvm-amd64-xsm osstest test case. Signed-off-by: Ian Campbell Cc: Daniel De Graaf Acked-by: Ian Jackson Acked-by: Daniel De Graaf --- tools/flask/policy/policy/modules/xen/xen.if | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/flask/policy/policy/modules/xen/xen.if b/tools/flask/policy/policy/modules/xen/xen.if index 32dd7b3..00d1bbb 100644 --- a/tools/flask/policy/policy/modules/xen/xen.if +++ b/tools/flask/policy/policy/modules/xen/xen.if @@ -150,7 +150,7 @@ define(`device_model', ` allow $1 $2_target:domain shutdown; allow $1 $2_target:mmu { map_read map_write adjust physmap target_hack }; - allow $1 $2_target:hvm { getparam setparam trackdirtyvram hvmctl irqlevel pciroute cacheattr send_irq }; + allow $1 $2_target:hvm { getparam setparam trackdirtyvram hvmctl irqlevel pciroute pcilevel cacheattr send_irq }; ') # make_device_model(priv, dm_dom, hvm_dom) -- generated by git-patchbot for /home/xen/git/xen.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 23 06:23:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23: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 1aBcpN-0005p7-8Y; Wed, 23 Dec 2015 06:23:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpL-0005ow-7a for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:11 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 98/C8-18316-ECD3A765; Wed, 23 Dec 2015 06:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450851786!6800430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28780 invoked from network); 23 Dec 2015 06:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:23:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpG-0000me-0t for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcoi-00071h-89 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:03 +0000 Date: Wed, 23 Dec 2015 06:22:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __cpuinit annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df7a56905eb218c82ed8d12947dbfc83e3c3c014 Author: Andrew Cooper AuthorDate: Wed Dec 16 11:57:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 11:57:02 2015 +0100 drop empty __cpuinit annotation Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/cpu.c | 2 +- xen/arch/arm/gic-hip04.c | 6 +++--- xen/arch/arm/gic-v2.c | 6 +++--- xen/arch/arm/gic-v3.c | 6 +++--- xen/arch/arm/gic.c | 4 ++-- xen/arch/arm/irq.c | 4 ++-- xen/arch/arm/mm.c | 2 +- xen/arch/arm/smpboot.c | 6 +++--- xen/arch/arm/time.c | 2 +- xen/arch/arm/traps.c | 2 +- xen/arch/x86/cpu/common.c | 18 +++++++++--------- xen/arch/x86/cpu/intel_cacheinfo.c | 4 ++-- xen/arch/x86/numa.c | 4 ++-- xen/arch/x86/x86_64/mmconf-fam10h.c | 2 +- xen/include/asm-arm/gic.h | 2 +- xen/include/asm-arm/mm.h | 4 ++-- xen/include/asm-arm/p2m.h | 2 +- xen/include/asm-arm/time.h | 2 +- xen/include/xen/config.h | 2 -- 19 files changed, 39 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/cpu.c b/xen/arch/arm/cpu.c index afc564f..d21651c 100644 --- a/xen/arch/arm/cpu.c +++ b/xen/arch/arm/cpu.c @@ -17,7 +17,7 @@ #include -void __cpuinit identify_cpu(struct cpuinfo_arm *c) +void identify_cpu(struct cpuinfo_arm *c) { c->midr.bits = READ_SYSREG32(MIDR_EL1); c->mpidr.bits = READ_SYSREG(MPIDR_EL1); diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 310f35a..a42cf24 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -306,7 +306,7 @@ static void __init hip04gic_dist_init(void) writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } -static void __cpuinit hip04gic_cpu_init(void) +static void hip04gic_cpu_init(void) { int i; @@ -344,7 +344,7 @@ static void hip04gic_cpu_disable(void) writel_gicc(0x0, GICC_CTLR); } -static void __cpuinit hip04gic_hyp_init(void) +static void hip04gic_hyp_init(void) { uint32_t vtr; uint8_t nr_lrs; @@ -354,7 +354,7 @@ static void __cpuinit hip04gic_hyp_init(void) gicv2_info.nr_lrs = nr_lrs; } -static void __cpuinit hip04gic_hyp_disable(void) +static void hip04gic_hyp_disable(void) { writel_gich(0, GICH_HCR); } diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 01e36b5..793dca7 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -292,7 +292,7 @@ static void __init gicv2_dist_init(void) writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } -static void __cpuinit gicv2_cpu_init(void) +static void gicv2_cpu_init(void) { int i; @@ -330,7 +330,7 @@ static void gicv2_cpu_disable(void) writel_gicc(0x0, GICC_CTLR); } -static void __cpuinit gicv2_hyp_init(void) +static void gicv2_hyp_init(void) { uint32_t vtr; uint8_t nr_lrs; @@ -340,7 +340,7 @@ static void __cpuinit gicv2_hyp_init(void) gicv2_info.nr_lrs = nr_lrs; } -static void __cpuinit gicv2_hyp_disable(void) +static void gicv2_hyp_disable(void) { writel_gich(0, GICH_HCR); } diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 4fe0c37..a245b56 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -676,7 +676,7 @@ static int __init gicv3_populate_rdist(void) return -ENODEV; } -static int __cpuinit gicv3_cpu_init(void) +static int gicv3_cpu_init(void) { int i; uint32_t priority; @@ -737,7 +737,7 @@ static void gicv3_cpu_disable(void) isb(); } -static void __cpuinit gicv3_hyp_init(void) +static void gicv3_hyp_init(void) { uint32_t vtr; @@ -768,7 +768,7 @@ static int gicv3_secondary_cpu_init(void) return res; } -static void __cpuinit gicv3_hyp_disable(void) +static void gicv3_hyp_disable(void) { uint32_t hcr; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 1e1e5ba..0b3f634 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -305,7 +305,7 @@ void smp_send_state_dump(unsigned int cpu) } /* Set up the per-CPU parts of the GIC for a secondary CPU */ -void __cpuinit gic_init_secondary_cpu(void) +void gic_init_secondary_cpu(void) { gic_hw_ops->secondary_init(); /* Clear LR mask for secondary cpus */ @@ -695,7 +695,7 @@ void gic_dump_info(struct vcpu *v) } } -void __cpuinit init_maintenance_interrupt(void) +void init_maintenance_interrupt(void) { request_irq(gic_hw_ops->info->maintenance_irq, 0, maintenance_interrupt, "irq-maintenance", NULL); diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 1f38605..d409abb 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -85,7 +85,7 @@ static int __init init_irq_data(void) return 0; } -static int __cpuinit init_local_irq_data(void) +static int init_local_irq_data(void) { int irq; @@ -124,7 +124,7 @@ void __init init_IRQ(void) BUG_ON(init_irq_data() < 0); } -void __cpuinit init_secondary_IRQ(void) +void init_secondary_IRQ(void) { BUG_ON(init_local_irq_data() < 0); } diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 8b6d915..47bfb27 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -620,7 +620,7 @@ int init_secondary_pagetables(int cpu) #endif /* MMU setup for secondary CPUS (which already have paging enabled) */ -void __cpuinit mmu_init_secondary_cpu(void) +void mmu_init_secondary_cpu(void) { /* From now on, no mapping may be both writable and executable. */ WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index a96cda2..00b2b2a 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -264,9 +264,9 @@ smp_prepare_cpus (unsigned int max_cpus) } /* Boot the current CPU */ -void __cpuinit start_secondary(unsigned long boot_phys_offset, - unsigned long fdt_paddr, - unsigned long hwid) +void start_secondary(unsigned long boot_phys_offset, + unsigned long fdt_paddr, + unsigned long hwid) { unsigned int cpuid = init_data.cpuid; diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 6207615..40f4758 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -230,7 +230,7 @@ static void check_timer_irq_cfg(unsigned int irq, const char *which) } /* Set up the timer interrupt on this CPU */ -void __cpuinit init_timer_interrupt(void) +void init_timer_interrupt(void) { /* Sensible defaults */ WRITE_SYSREG64(0, CNTVOFF_EL2); /* No VM-specific offset */ diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index c49bd3f..83744e8 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -99,7 +99,7 @@ static int debug_stack_lines = 40; integer_param("debug_stack_lines", debug_stack_lines); -void __cpuinit init_traps(void) +void init_traps(void) { /* Setup Hyp vector base */ WRITE_SYSREG((vaddr_t)hyp_traps_vector, VBAR_EL2); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 07566d9..536a691 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -70,7 +70,7 @@ static const struct cpu_dev *this_cpu = &default_cpu; bool_t opt_cpu_info; boolean_param("cpuinfo", opt_cpu_info); -int __cpuinit get_model_name(struct cpuinfo_x86 *c) +int get_model_name(struct cpuinfo_x86 *c) { unsigned int *v; char *p, *q; @@ -100,7 +100,7 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c) } -void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) +void display_cacheinfo(struct cpuinfo_x86 *c) { unsigned int dummy, ecx, edx, l2size; @@ -212,7 +212,7 @@ static void __init early_cpu_detect(void) paddr_bits = cpuid_eax(0x80000008) & 0xff; } -static void __cpuinit generic_identify(struct cpuinfo_x86 *c) +static void generic_identify(struct cpuinfo_x86 *c) { u32 eax, ebx, ecx, edx, tmp; @@ -276,7 +276,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) /* * This does the hard work of actually picking apart the CPU stuff... */ -void __cpuinit identify_cpu(struct cpuinfo_x86 *c) +void identify_cpu(struct cpuinfo_x86 *c) { int i; @@ -382,7 +382,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) * Check for extended topology enumeration cpuid leaf 0xb and if it * exists, use it for cpu topology detection. */ -void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) +void detect_extended_topology(struct cpuinfo_x86 *c) { unsigned int eax, ebx, ecx, edx, sub_index; unsigned int ht_mask_width, core_plus_mask_width; @@ -439,7 +439,7 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) } } -void __cpuinit detect_ht(struct cpuinfo_x86 *c) +void detect_ht(struct cpuinfo_x86 *c) { u32 eax, ebx, ecx, edx; int index_msb, core_bits; @@ -514,7 +514,7 @@ unsigned int __init apicid_to_socket(unsigned int apicid) return apicid; } -void __cpuinit print_cpu_info(unsigned int cpu) +void print_cpu_info(unsigned int cpu) { const struct cpuinfo_x86 *c = cpu_data + cpu; const char *vendor = NULL; @@ -565,7 +565,7 @@ void __init early_cpu_init(void) * - Inserts TSS selector into regular and compat GDTs * - Loads GDT, IDT, TR then null LDT */ -void __cpuinit load_system_tables(void) +void load_system_tables(void) { unsigned int cpu = smp_processor_id(); unsigned long stack_bottom = get_stack_bottom(), @@ -618,7 +618,7 @@ void __cpuinit load_system_tables(void) * and IDT. We reload them nevertheless, this function acts as a * 'CPU state barrier', nothing should get across. */ -void __cpuinit cpu_init(void) +void cpu_init(void) { int cpu = smp_processor_id(); diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c index bb02fe7..b3b0c18 100644 --- a/xen/arch/x86/cpu/intel_cacheinfo.c +++ b/xen/arch/x86/cpu/intel_cacheinfo.c @@ -104,7 +104,7 @@ int cpuid4_cache_lookup(int index, struct cpuid4_info *this_leaf) return 0; } -static int __cpuinit find_num_cache_leaves(void) +static int find_num_cache_leaves(void) { unsigned int eax, ebx, ecx, edx; union _cpuid4_leaf_eax cache_eax; @@ -119,7 +119,7 @@ static int __cpuinit find_num_cache_leaves(void) return i; } -unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c) +unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c) { unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */ unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index b7abc02..e243e06 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -289,12 +289,12 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) (u64)end_pfn << PAGE_SHIFT); } -__cpuinit void numa_add_cpu(int cpu) +void numa_add_cpu(int cpu) { cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); } -void __cpuinit numa_set_node(int cpu, nodeid_t node) +void numa_set_node(int cpu, nodeid_t node) { cpu_to_node[cpu] = node; } diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index 8bdd39e..ed0acb9 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -137,7 +137,7 @@ out: fam10h_pci_mmconf_base = start; } -void __cpuinit fam10h_check_enable_mmcfg(void) +void fam10h_check_enable_mmcfg(void) { u64 val; bool_t print = opt_cpu_info; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 42a2eec..630bb33 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -237,7 +237,7 @@ extern void gic_inject(void); extern void gic_clear_pending_irqs(struct vcpu *v); extern int gic_events_need_delivery(void); -extern void __cpuinit init_maintenance_interrupt(void); +extern void init_maintenance_interrupt(void); extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, unsigned int priority); extern void gic_raise_inflight_irq(struct vcpu *v, unsigned int virtual_irq); diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 1427163..2e9d0b2 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -163,9 +163,9 @@ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); extern void remove_early_mappings(void); /* Allocate and initialise pagetables for a secondary CPU. Sets init_ttbr to the * new page table */ -extern int __cpuinit init_secondary_pagetables(int cpu); +extern int init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ -extern void __cpuinit mmu_init_secondary_cpu(void); +extern void mmu_init_secondary_cpu(void); /* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. * Base must be 32MB aligned and size a multiple of 32MB. */ extern void setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 08bdce3..4c62725 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -122,7 +122,7 @@ void p2m_altp2m_check(struct vcpu *v, uint16_t idx) void p2m_vmid_allocator_init(void); /* Second stage paging setup, to be called on all CPUs */ -void __cpuinit setup_virt_paging(void); +void setup_virt_paging(void); /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index f99d6e8..5b9a31d 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -32,7 +32,7 @@ extern uint32_t timer_dt_clock_frequency; unsigned int timer_get_irq(enum timer_ppi ppi); /* Set up the timer interrupt on this CPU */ -extern void __cpuinit init_timer_interrupt(void); +extern void init_timer_interrupt(void); /* Counter value at boot time */ extern uint64_t boot_count; diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 89a590e..9b4b6ef 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -84,8 +84,6 @@ #define mk_unsigned_long(x) x #endif /* !__ASSEMBLY__ */ -#define __cpuinit - #ifdef FLASK_ENABLE #define XSM_MAGIC 0xf97cff8c /* Maintain statistics on the access vector cache */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:23:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23: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 1aBcpN-0005p7-8Y; Wed, 23 Dec 2015 06:23:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpL-0005ow-7a for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:11 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 98/C8-18316-ECD3A765; Wed, 23 Dec 2015 06:23:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450851786!6800430!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28780 invoked from network); 23 Dec 2015 06:23:07 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:23:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpG-0000me-0t for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcoi-00071h-89 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:03 +0000 Date: Wed, 23 Dec 2015 06:22:32 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] drop empty __cpuinit annotation X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df7a56905eb218c82ed8d12947dbfc83e3c3c014 Author: Andrew Cooper AuthorDate: Wed Dec 16 11:57:02 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 11:57:02 2015 +0100 drop empty __cpuinit annotation Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/cpu.c | 2 +- xen/arch/arm/gic-hip04.c | 6 +++--- xen/arch/arm/gic-v2.c | 6 +++--- xen/arch/arm/gic-v3.c | 6 +++--- xen/arch/arm/gic.c | 4 ++-- xen/arch/arm/irq.c | 4 ++-- xen/arch/arm/mm.c | 2 +- xen/arch/arm/smpboot.c | 6 +++--- xen/arch/arm/time.c | 2 +- xen/arch/arm/traps.c | 2 +- xen/arch/x86/cpu/common.c | 18 +++++++++--------- xen/arch/x86/cpu/intel_cacheinfo.c | 4 ++-- xen/arch/x86/numa.c | 4 ++-- xen/arch/x86/x86_64/mmconf-fam10h.c | 2 +- xen/include/asm-arm/gic.h | 2 +- xen/include/asm-arm/mm.h | 4 ++-- xen/include/asm-arm/p2m.h | 2 +- xen/include/asm-arm/time.h | 2 +- xen/include/xen/config.h | 2 -- 19 files changed, 39 insertions(+), 41 deletions(-) diff --git a/xen/arch/arm/cpu.c b/xen/arch/arm/cpu.c index afc564f..d21651c 100644 --- a/xen/arch/arm/cpu.c +++ b/xen/arch/arm/cpu.c @@ -17,7 +17,7 @@ #include -void __cpuinit identify_cpu(struct cpuinfo_arm *c) +void identify_cpu(struct cpuinfo_arm *c) { c->midr.bits = READ_SYSREG32(MIDR_EL1); c->mpidr.bits = READ_SYSREG(MPIDR_EL1); diff --git a/xen/arch/arm/gic-hip04.c b/xen/arch/arm/gic-hip04.c index 310f35a..a42cf24 100644 --- a/xen/arch/arm/gic-hip04.c +++ b/xen/arch/arm/gic-hip04.c @@ -306,7 +306,7 @@ static void __init hip04gic_dist_init(void) writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } -static void __cpuinit hip04gic_cpu_init(void) +static void hip04gic_cpu_init(void) { int i; @@ -344,7 +344,7 @@ static void hip04gic_cpu_disable(void) writel_gicc(0x0, GICC_CTLR); } -static void __cpuinit hip04gic_hyp_init(void) +static void hip04gic_hyp_init(void) { uint32_t vtr; uint8_t nr_lrs; @@ -354,7 +354,7 @@ static void __cpuinit hip04gic_hyp_init(void) gicv2_info.nr_lrs = nr_lrs; } -static void __cpuinit hip04gic_hyp_disable(void) +static void hip04gic_hyp_disable(void) { writel_gich(0, GICH_HCR); } diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 01e36b5..793dca7 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -292,7 +292,7 @@ static void __init gicv2_dist_init(void) writel_gicd(GICD_CTL_ENABLE, GICD_CTLR); } -static void __cpuinit gicv2_cpu_init(void) +static void gicv2_cpu_init(void) { int i; @@ -330,7 +330,7 @@ static void gicv2_cpu_disable(void) writel_gicc(0x0, GICC_CTLR); } -static void __cpuinit gicv2_hyp_init(void) +static void gicv2_hyp_init(void) { uint32_t vtr; uint8_t nr_lrs; @@ -340,7 +340,7 @@ static void __cpuinit gicv2_hyp_init(void) gicv2_info.nr_lrs = nr_lrs; } -static void __cpuinit gicv2_hyp_disable(void) +static void gicv2_hyp_disable(void) { writel_gich(0, GICH_HCR); } diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index 4fe0c37..a245b56 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -676,7 +676,7 @@ static int __init gicv3_populate_rdist(void) return -ENODEV; } -static int __cpuinit gicv3_cpu_init(void) +static int gicv3_cpu_init(void) { int i; uint32_t priority; @@ -737,7 +737,7 @@ static void gicv3_cpu_disable(void) isb(); } -static void __cpuinit gicv3_hyp_init(void) +static void gicv3_hyp_init(void) { uint32_t vtr; @@ -768,7 +768,7 @@ static int gicv3_secondary_cpu_init(void) return res; } -static void __cpuinit gicv3_hyp_disable(void) +static void gicv3_hyp_disable(void) { uint32_t hcr; diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 1e1e5ba..0b3f634 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -305,7 +305,7 @@ void smp_send_state_dump(unsigned int cpu) } /* Set up the per-CPU parts of the GIC for a secondary CPU */ -void __cpuinit gic_init_secondary_cpu(void) +void gic_init_secondary_cpu(void) { gic_hw_ops->secondary_init(); /* Clear LR mask for secondary cpus */ @@ -695,7 +695,7 @@ void gic_dump_info(struct vcpu *v) } } -void __cpuinit init_maintenance_interrupt(void) +void init_maintenance_interrupt(void) { request_irq(gic_hw_ops->info->maintenance_irq, 0, maintenance_interrupt, "irq-maintenance", NULL); diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 1f38605..d409abb 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -85,7 +85,7 @@ static int __init init_irq_data(void) return 0; } -static int __cpuinit init_local_irq_data(void) +static int init_local_irq_data(void) { int irq; @@ -124,7 +124,7 @@ void __init init_IRQ(void) BUG_ON(init_irq_data() < 0); } -void __cpuinit init_secondary_IRQ(void) +void init_secondary_IRQ(void) { BUG_ON(init_local_irq_data() < 0); } diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 8b6d915..47bfb27 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -620,7 +620,7 @@ int init_secondary_pagetables(int cpu) #endif /* MMU setup for secondary CPUS (which already have paging enabled) */ -void __cpuinit mmu_init_secondary_cpu(void) +void mmu_init_secondary_cpu(void) { /* From now on, no mapping may be both writable and executable. */ WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2); diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c index a96cda2..00b2b2a 100644 --- a/xen/arch/arm/smpboot.c +++ b/xen/arch/arm/smpboot.c @@ -264,9 +264,9 @@ smp_prepare_cpus (unsigned int max_cpus) } /* Boot the current CPU */ -void __cpuinit start_secondary(unsigned long boot_phys_offset, - unsigned long fdt_paddr, - unsigned long hwid) +void start_secondary(unsigned long boot_phys_offset, + unsigned long fdt_paddr, + unsigned long hwid) { unsigned int cpuid = init_data.cpuid; diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c index 6207615..40f4758 100644 --- a/xen/arch/arm/time.c +++ b/xen/arch/arm/time.c @@ -230,7 +230,7 @@ static void check_timer_irq_cfg(unsigned int irq, const char *which) } /* Set up the timer interrupt on this CPU */ -void __cpuinit init_timer_interrupt(void) +void init_timer_interrupt(void) { /* Sensible defaults */ WRITE_SYSREG64(0, CNTVOFF_EL2); /* No VM-specific offset */ diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index c49bd3f..83744e8 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -99,7 +99,7 @@ static int debug_stack_lines = 40; integer_param("debug_stack_lines", debug_stack_lines); -void __cpuinit init_traps(void) +void init_traps(void) { /* Setup Hyp vector base */ WRITE_SYSREG((vaddr_t)hyp_traps_vector, VBAR_EL2); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 07566d9..536a691 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -70,7 +70,7 @@ static const struct cpu_dev *this_cpu = &default_cpu; bool_t opt_cpu_info; boolean_param("cpuinfo", opt_cpu_info); -int __cpuinit get_model_name(struct cpuinfo_x86 *c) +int get_model_name(struct cpuinfo_x86 *c) { unsigned int *v; char *p, *q; @@ -100,7 +100,7 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c) } -void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) +void display_cacheinfo(struct cpuinfo_x86 *c) { unsigned int dummy, ecx, edx, l2size; @@ -212,7 +212,7 @@ static void __init early_cpu_detect(void) paddr_bits = cpuid_eax(0x80000008) & 0xff; } -static void __cpuinit generic_identify(struct cpuinfo_x86 *c) +static void generic_identify(struct cpuinfo_x86 *c) { u32 eax, ebx, ecx, edx, tmp; @@ -276,7 +276,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) /* * This does the hard work of actually picking apart the CPU stuff... */ -void __cpuinit identify_cpu(struct cpuinfo_x86 *c) +void identify_cpu(struct cpuinfo_x86 *c) { int i; @@ -382,7 +382,7 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c) * Check for extended topology enumeration cpuid leaf 0xb and if it * exists, use it for cpu topology detection. */ -void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) +void detect_extended_topology(struct cpuinfo_x86 *c) { unsigned int eax, ebx, ecx, edx, sub_index; unsigned int ht_mask_width, core_plus_mask_width; @@ -439,7 +439,7 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) } } -void __cpuinit detect_ht(struct cpuinfo_x86 *c) +void detect_ht(struct cpuinfo_x86 *c) { u32 eax, ebx, ecx, edx; int index_msb, core_bits; @@ -514,7 +514,7 @@ unsigned int __init apicid_to_socket(unsigned int apicid) return apicid; } -void __cpuinit print_cpu_info(unsigned int cpu) +void print_cpu_info(unsigned int cpu) { const struct cpuinfo_x86 *c = cpu_data + cpu; const char *vendor = NULL; @@ -565,7 +565,7 @@ void __init early_cpu_init(void) * - Inserts TSS selector into regular and compat GDTs * - Loads GDT, IDT, TR then null LDT */ -void __cpuinit load_system_tables(void) +void load_system_tables(void) { unsigned int cpu = smp_processor_id(); unsigned long stack_bottom = get_stack_bottom(), @@ -618,7 +618,7 @@ void __cpuinit load_system_tables(void) * and IDT. We reload them nevertheless, this function acts as a * 'CPU state barrier', nothing should get across. */ -void __cpuinit cpu_init(void) +void cpu_init(void) { int cpu = smp_processor_id(); diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c b/xen/arch/x86/cpu/intel_cacheinfo.c index bb02fe7..b3b0c18 100644 --- a/xen/arch/x86/cpu/intel_cacheinfo.c +++ b/xen/arch/x86/cpu/intel_cacheinfo.c @@ -104,7 +104,7 @@ int cpuid4_cache_lookup(int index, struct cpuid4_info *this_leaf) return 0; } -static int __cpuinit find_num_cache_leaves(void) +static int find_num_cache_leaves(void) { unsigned int eax, ebx, ecx, edx; union _cpuid4_leaf_eax cache_eax; @@ -119,7 +119,7 @@ static int __cpuinit find_num_cache_leaves(void) return i; } -unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c) +unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c) { unsigned int trace = 0, l1i = 0, l1d = 0, l2 = 0, l3 = 0; /* Cache sizes */ unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */ diff --git a/xen/arch/x86/numa.c b/xen/arch/x86/numa.c index b7abc02..e243e06 100644 --- a/xen/arch/x86/numa.c +++ b/xen/arch/x86/numa.c @@ -289,12 +289,12 @@ void __init numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn) (u64)end_pfn << PAGE_SHIFT); } -__cpuinit void numa_add_cpu(int cpu) +void numa_add_cpu(int cpu) { cpumask_set_cpu(cpu, &node_to_cpumask[cpu_to_node(cpu)]); } -void __cpuinit numa_set_node(int cpu, nodeid_t node) +void numa_set_node(int cpu, nodeid_t node) { cpu_to_node[cpu] = node; } diff --git a/xen/arch/x86/x86_64/mmconf-fam10h.c b/xen/arch/x86/x86_64/mmconf-fam10h.c index 8bdd39e..ed0acb9 100644 --- a/xen/arch/x86/x86_64/mmconf-fam10h.c +++ b/xen/arch/x86/x86_64/mmconf-fam10h.c @@ -137,7 +137,7 @@ out: fam10h_pci_mmconf_base = start; } -void __cpuinit fam10h_check_enable_mmcfg(void) +void fam10h_check_enable_mmcfg(void) { u64 val; bool_t print = opt_cpu_info; diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 42a2eec..630bb33 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -237,7 +237,7 @@ extern void gic_inject(void); extern void gic_clear_pending_irqs(struct vcpu *v); extern int gic_events_need_delivery(void); -extern void __cpuinit init_maintenance_interrupt(void); +extern void init_maintenance_interrupt(void); extern void gic_raise_guest_irq(struct vcpu *v, unsigned int irq, unsigned int priority); extern void gic_raise_inflight_irq(struct vcpu *v, unsigned int virtual_irq); diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 1427163..2e9d0b2 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -163,9 +163,9 @@ extern void setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr); extern void remove_early_mappings(void); /* Allocate and initialise pagetables for a secondary CPU. Sets init_ttbr to the * new page table */ -extern int __cpuinit init_secondary_pagetables(int cpu); +extern int init_secondary_pagetables(int cpu); /* Switch secondary CPUS to its own pagetables and finalise MMU setup */ -extern void __cpuinit mmu_init_secondary_cpu(void); +extern void mmu_init_secondary_cpu(void); /* Set up the xenheap: up to 1GB of contiguous, always-mapped memory. * Base must be 32MB aligned and size a multiple of 32MB. */ extern void setup_xenheap_mappings(unsigned long base_mfn, unsigned long nr_mfns); diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 08bdce3..4c62725 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -122,7 +122,7 @@ void p2m_altp2m_check(struct vcpu *v, uint16_t idx) void p2m_vmid_allocator_init(void); /* Second stage paging setup, to be called on all CPUs */ -void __cpuinit setup_virt_paging(void); +void setup_virt_paging(void); /* Init the datastructures for later use by the p2m code */ int p2m_init(struct domain *d); diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h index f99d6e8..5b9a31d 100644 --- a/xen/include/asm-arm/time.h +++ b/xen/include/asm-arm/time.h @@ -32,7 +32,7 @@ extern uint32_t timer_dt_clock_frequency; unsigned int timer_get_irq(enum timer_ppi ppi); /* Set up the timer interrupt on this CPU */ -extern void __cpuinit init_timer_interrupt(void); +extern void init_timer_interrupt(void); /* Counter value at boot time */ extern uint64_t boot_count; diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 89a590e..9b4b6ef 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -84,8 +84,6 @@ #define mk_unsigned_long(x) x #endif /* !__ASSEMBLY__ */ -#define __cpuinit - #ifdef FLASK_ENABLE #define XSM_MAGIC 0xf97cff8c /* Maintain statistics on the access vector cache */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23: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 1aBcpU-0005q8-EP; Wed, 23 Dec 2015 06:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpT-0005ps-FB for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:19 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 23/E1-12889-6DD3A765; Wed, 23 Dec 2015 06:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450851797!9039305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24241 invoked from network); 23 Dec 2015 06:23:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:23:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpQ-0000mm-Ub for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcpQ-00073f-Dk for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:16 +0000 Date: Wed, 23 Dec 2015 06:23:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: sort and update tree info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d7db1e00c8c235d6a279860c77d2f2ecec64882 Author: Jan Beulich AuthorDate: Wed Dec 16 11:59:17 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 11:59:17 2015 +0100 MAINTAINERS: sort and update tree info Move a few misplaced entries into their intended (alphabetical) slots. Update qemu and mini-os tree info. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- MAINTAINERS | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 01f575c..09fe823 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -139,11 +139,6 @@ F: xen/drivers/char/omap-uart.c F: xen/drivers/char/pl011.c F: xen/drivers/passthrough/arm/ -HISILICON HIP04 SUPPORT -M: Zoltan Kiss -S: Supported -F: xen/arch/arm/gic-hip04.c - CPU POOLS M: Juergen Gross M: Dario Faggioli @@ -181,10 +176,10 @@ S: Supported F: xen/arch/x86/debug.c F: tools/debugger/gdbsx/ -KDD DEBUGGER -M: Tim Deegan -S: Odd Fixes -F: tools/debugger/kdd/ +HISILICON HIP04 SUPPORT +M: Zoltan Kiss +S: Supported +F: xen/arch/arm/gic-hip04.c INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) M: Gang Wei @@ -218,6 +213,11 @@ X: xen/drivers/passthrough/vtd/ X: xen/drivers/passthrough/device_tree.c F: xen/include/xen/iommu.h +KDD DEBUGGER +M: Tim Deegan +S: Odd Fixes +F: tools/debugger/kdd/ + KEXEC M: David Vrabel S: Supported @@ -237,8 +237,8 @@ M: Stefano Stabellini M: Samuel Thibault S: Supported L: minios-devel@lists.xenproject.org +T: git git://xenbits.xen.org/mini-os.git F: config/MiniOS.mk -F: extras/mini-os/ OCAML TOOLS M: David Scott @@ -264,12 +264,12 @@ F: xen/include/acpi/cpufreq/ QEMU-DM M: Ian Jackson S: Supported -T: git git://xenbits.xen.org/qemu-xen-*.git +T: git git://xenbits.xen.org/qemu-xen-traditional.git QEMU UPSTREAM M: Stefano Stabellini S: Supported -T: git git://xenbits.xen.org/qemu-upstream-*.git +T: git git://xenbits.xen.org/qemu-xen.git REMUS M: Shriram Rajagopalan @@ -347,6 +347,17 @@ S: Supported T: hg http://xenbits.xen.org/linux-2.6.18-xen.hg F: drivers/xen/usb*/ +VM EVENT AND MEM ACCESS +M: Razvan Cojocaru +M: Tamas K Lengyel +S: Supported +F: xen/common/vm_event.c +F: xen/common/mem_access.c +F: xen/arch/x86/hvm/event.c +F: xen/arch/x86/monitor.c +F: xen/arch/x86/vm_event.c +F: tools/tests/xen-access + VTPM M: Daniel De Graaf M: Quan Xu @@ -388,17 +399,6 @@ M: Tim Deegan S: Maintained F: xen/arch/x86/mm/shadow/ -VM EVENT AND MEM ACCESS -M: Razvan Cojocaru -M: Tamas K Lengyel -S: Supported -F: xen/common/vm_event.c -F: xen/common/mem_access.c -F: xen/arch/x86/hvm/event.c -F: xen/arch/x86/monitor.c -F: xen/arch/x86/vm_event.c -F: tools/tests/xen-access - XENTRACE M: George Dunlap S: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:23:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23: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 1aBcpU-0005q8-EP; Wed, 23 Dec 2015 06:23:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpT-0005ps-FB for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:19 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id 23/E1-12889-6DD3A765; Wed, 23 Dec 2015 06:23:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450851797!9039305!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24241 invoked from network); 23 Dec 2015 06:23:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:23:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpQ-0000mm-Ub for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:16 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcpQ-00073f-Dk for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:16 +0000 Date: Wed, 23 Dec 2015 06:23:16 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] MAINTAINERS: sort and update tree info X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1d7db1e00c8c235d6a279860c77d2f2ecec64882 Author: Jan Beulich AuthorDate: Wed Dec 16 11:59:17 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 11:59:17 2015 +0100 MAINTAINERS: sort and update tree info Move a few misplaced entries into their intended (alphabetical) slots. Update qemu and mini-os tree info. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- MAINTAINERS | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 01f575c..09fe823 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -139,11 +139,6 @@ F: xen/drivers/char/omap-uart.c F: xen/drivers/char/pl011.c F: xen/drivers/passthrough/arm/ -HISILICON HIP04 SUPPORT -M: Zoltan Kiss -S: Supported -F: xen/arch/arm/gic-hip04.c - CPU POOLS M: Juergen Gross M: Dario Faggioli @@ -181,10 +176,10 @@ S: Supported F: xen/arch/x86/debug.c F: tools/debugger/gdbsx/ -KDD DEBUGGER -M: Tim Deegan -S: Odd Fixes -F: tools/debugger/kdd/ +HISILICON HIP04 SUPPORT +M: Zoltan Kiss +S: Supported +F: xen/arch/arm/gic-hip04.c INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) M: Gang Wei @@ -218,6 +213,11 @@ X: xen/drivers/passthrough/vtd/ X: xen/drivers/passthrough/device_tree.c F: xen/include/xen/iommu.h +KDD DEBUGGER +M: Tim Deegan +S: Odd Fixes +F: tools/debugger/kdd/ + KEXEC M: David Vrabel S: Supported @@ -237,8 +237,8 @@ M: Stefano Stabellini M: Samuel Thibault S: Supported L: minios-devel@lists.xenproject.org +T: git git://xenbits.xen.org/mini-os.git F: config/MiniOS.mk -F: extras/mini-os/ OCAML TOOLS M: David Scott @@ -264,12 +264,12 @@ F: xen/include/acpi/cpufreq/ QEMU-DM M: Ian Jackson S: Supported -T: git git://xenbits.xen.org/qemu-xen-*.git +T: git git://xenbits.xen.org/qemu-xen-traditional.git QEMU UPSTREAM M: Stefano Stabellini S: Supported -T: git git://xenbits.xen.org/qemu-upstream-*.git +T: git git://xenbits.xen.org/qemu-xen.git REMUS M: Shriram Rajagopalan @@ -347,6 +347,17 @@ S: Supported T: hg http://xenbits.xen.org/linux-2.6.18-xen.hg F: drivers/xen/usb*/ +VM EVENT AND MEM ACCESS +M: Razvan Cojocaru +M: Tamas K Lengyel +S: Supported +F: xen/common/vm_event.c +F: xen/common/mem_access.c +F: xen/arch/x86/hvm/event.c +F: xen/arch/x86/monitor.c +F: xen/arch/x86/vm_event.c +F: tools/tests/xen-access + VTPM M: Daniel De Graaf M: Quan Xu @@ -388,17 +399,6 @@ M: Tim Deegan S: Maintained F: xen/arch/x86/mm/shadow/ -VM EVENT AND MEM ACCESS -M: Razvan Cojocaru -M: Tamas K Lengyel -S: Supported -F: xen/common/vm_event.c -F: xen/common/mem_access.c -F: xen/arch/x86/hvm/event.c -F: xen/arch/x86/monitor.c -F: xen/arch/x86/vm_event.c -F: tools/tests/xen-access - XENTRACE M: George Dunlap S: Supported -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:23:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpo-0005sF-LA; Wed, 23 Dec 2015 06:23:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpn-0005s1-R3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:39 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id D5/34-28228-BED3A765; Wed, 23 Dec 2015 06:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1450851817!12819991!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43457 invoked from network); 23 Dec 2015 06:23:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:23:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpl-0000n0-G0 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcpb-00074A-UK for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:36 +0000 Date: Wed, 23 Dec 2015 06:23:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/symbols: document binutils commits for issues needing workarounds so far X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d87b78cfe65a1eecfe75dc86037f19b2cd7b1f6a Author: Jan Beulich AuthorDate: Wed Dec 16 12:00:25 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 12:00:25 2015 +0100 tools/symbols: document binutils commits for issues needing workarounds so far Also the issue 3rd issue mentioned in commit d37d63d4b5 ("symbols: prefix static symbols with their source file names") has been fixed by binutils commit 270f824531 (also expected to appear in 2.27). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/tools/symbols.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/xen/tools/symbols.c b/xen/tools/symbols.c index 1abdf08..196db74 100644 --- a/xen/tools/symbols.c +++ b/xen/tools/symbols.c @@ -105,15 +105,18 @@ static int read_symbol(FILE *in, struct sym_entry *s) sym = strrchr(str, '.'); if (strcasecmp(type, "FILE") == 0 || - (/* GNU nm prior to XXX doesn't produce a type for EFI binaries. */ + (/* + * GNU nm prior to binutils commit 552e55ed06 (expected to + * appear in 2.27) doesn't produce a type for EFI binaries. + */ input_format == fmt_sysv && !*type && stype == '?' && sym && sym[1] && strchr("cSsoh", sym[1]) && !sym[2])) { /* - * gas prior to XXX outputs symbol table entries resulting - * from .file in reverse order. If we get two consecutive file - * symbols, prefer the first one if that names an object file - * or has a directory component (to cover multiply compiled - * files). + * gas prior to binutils commit fbdf9406b0 (expected to appear + * in 2.27) outputs symbol table entries resulting from .file + * in reverse order. If we get two consecutive file symbols, + * prefer the first one if that names an object file or has a + * directory component (to cover multiply compiled files). */ bool multi = strchr(str, '/') || (sym && sym[1] == 'o'); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:23:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpo-0005sF-LA; Wed, 23 Dec 2015 06:23:40 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpn-0005s1-R3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:39 +0000 Received: from [193.109.254.147] by server-11.bemta-14.messagelabs.com id D5/34-28228-BED3A765; Wed, 23 Dec 2015 06:23:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-27.messagelabs.com!1450851817!12819991!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 43457 invoked from network); 23 Dec 2015 06:23:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:23:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpl-0000n0-G0 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcpb-00074A-UK for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:36 +0000 Date: Wed, 23 Dec 2015 06:23:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools/symbols: document binutils commits for issues needing workarounds so far X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d87b78cfe65a1eecfe75dc86037f19b2cd7b1f6a Author: Jan Beulich AuthorDate: Wed Dec 16 12:00:25 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 12:00:25 2015 +0100 tools/symbols: document binutils commits for issues needing workarounds so far Also the issue 3rd issue mentioned in commit d37d63d4b5 ("symbols: prefix static symbols with their source file names") has been fixed by binutils commit 270f824531 (also expected to appear in 2.27). Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/tools/symbols.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/xen/tools/symbols.c b/xen/tools/symbols.c index 1abdf08..196db74 100644 --- a/xen/tools/symbols.c +++ b/xen/tools/symbols.c @@ -105,15 +105,18 @@ static int read_symbol(FILE *in, struct sym_entry *s) sym = strrchr(str, '.'); if (strcasecmp(type, "FILE") == 0 || - (/* GNU nm prior to XXX doesn't produce a type for EFI binaries. */ + (/* + * GNU nm prior to binutils commit 552e55ed06 (expected to + * appear in 2.27) doesn't produce a type for EFI binaries. + */ input_format == fmt_sysv && !*type && stype == '?' && sym && sym[1] && strchr("cSsoh", sym[1]) && !sym[2])) { /* - * gas prior to XXX outputs symbol table entries resulting - * from .file in reverse order. If we get two consecutive file - * symbols, prefer the first one if that names an object file - * or has a directory component (to cover multiply compiled - * files). + * gas prior to binutils commit fbdf9406b0 (expected to appear + * in 2.27) outputs symbol table entries resulting from .file + * in reverse order. If we get two consecutive file symbols, + * prefer the first one if that names an object file or has a + * directory component (to cover multiply compiled files). */ bool multi = strchr(str, '/') || (sym && sym[1] == 'o'); -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:23:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcq3-0005vC-UU; Wed, 23 Dec 2015 06:23:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcq2-0005uv-NG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:54 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 28/4D-25438-AFD3A765; Wed, 23 Dec 2015 06:23:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1450851830!10820567!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21700 invoked from network); 23 Dec 2015 06:23:51 -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; 23 Dec 2015 06:23:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpy-0000nD-BM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcpw-00074r-9B for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:49 +0000 Date: Wed, 23 Dec 2015 06:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: always enable HAS_MEM_ACCESS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7df31694deac6611aa1bc47ff1936ea4d9898dbf Author: Doug Goldstein AuthorDate: Fri Dec 11 10:00:11 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 16 11:57:46 2015 +0000 tools: always enable HAS_MEM_ACCESS For all supported targets HAS_MEM_ACCESS is enabled so this drops the conditional and always makes it enabled. The goal here is to remove the setting in the top level config directory when kconfig changes land. Suggested-by: Jan Beulich Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Ian Campbell --- tools/tests/xen-access/Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile index f810543..dd70f9f 100644 --- a/tools/tests/xen-access/Makefile +++ b/tools/tests/xen-access/Makefile @@ -7,8 +7,7 @@ CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenguest) CFLAGS += $(CFLAGS_xeninclude) -TARGETS-y := -TARGETS-$(HAS_MEM_ACCESS) := xen-access +TARGETS-y := xen-access TARGETS := $(TARGETS-y) .PHONY: all -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:23:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:23:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcq3-0005vC-UU; Wed, 23 Dec 2015 06:23:55 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcq2-0005uv-NG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:54 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id 28/4D-25438-AFD3A765; Wed, 23 Dec 2015 06:23:54 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1450851830!10820567!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 21700 invoked from network); 23 Dec 2015 06:23:51 -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; 23 Dec 2015 06:23:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcpy-0000nD-BM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcpw-00074r-9B for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:23:49 +0000 Date: Wed, 23 Dec 2015 06:23:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] tools: always enable HAS_MEM_ACCESS X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7df31694deac6611aa1bc47ff1936ea4d9898dbf Author: Doug Goldstein AuthorDate: Fri Dec 11 10:00:11 2015 -0600 Commit: Ian Campbell CommitDate: Wed Dec 16 11:57:46 2015 +0000 tools: always enable HAS_MEM_ACCESS For all supported targets HAS_MEM_ACCESS is enabled so this drops the conditional and always makes it enabled. The goal here is to remove the setting in the top level config directory when kconfig changes land. Suggested-by: Jan Beulich Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Ian Campbell --- tools/tests/xen-access/Makefile | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/tests/xen-access/Makefile b/tools/tests/xen-access/Makefile index f810543..dd70f9f 100644 --- a/tools/tests/xen-access/Makefile +++ b/tools/tests/xen-access/Makefile @@ -7,8 +7,7 @@ CFLAGS += $(CFLAGS_libxenctrl) CFLAGS += $(CFLAGS_libxenguest) CFLAGS += $(CFLAGS_xeninclude) -TARGETS-y := -TARGETS-$(HAS_MEM_ACCESS) := xen-access +TARGETS-y := xen-access TARGETS := $(TARGETS-y) .PHONY: all -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:24:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqJ-0005wv-3y; Wed, 23 Dec 2015 06:24:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqH-0005wm-CM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:09 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 6A/52-30270-80E3A765; Wed, 23 Dec 2015 06:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1450851843!12379269!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36560 invoked from network); 23 Dec 2015 06:24: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; 23 Dec 2015 06:24:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqB-0000nn-6u for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqA-00076B-QQ for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:03 +0000 Date: Wed, 23 Dec 2015 06:24:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: import Kbuild/Kconfig from Linux 4.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c271b7584ed7feff57e5b3ffd01746e7b03c8ae Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:25:15 2015 +0100 build: import Kbuild/Kconfig from Linux 4.3 Import the following files and directories from the Linux v4.3 tag / commit id 6a13feb9c82803e2b815eca72fa7a9f5561d7861. - scripts/kconfig -> xen/tools/kconfig - Documentation/kbuild/kconfig{,-language}.txt -> docs/misc/kconfig{-language}.txt - scripts/Makefile.host -> xen/tools/kconfig/Makefile.host These files are currently unused but will be used shortly. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- docs/misc/kconfig-language.txt | 395 ++++ docs/misc/kconfig.txt | 237 +++ xen/tools/kconfig/.gitignore | 22 + xen/tools/kconfig/Makefile | 317 ++++ xen/tools/kconfig/Makefile.host | 128 ++ xen/tools/kconfig/POTFILES.in | 12 + xen/tools/kconfig/check.sh | 13 + xen/tools/kconfig/conf.c | 722 +++++++ xen/tools/kconfig/confdata.c | 1245 +++++++++++++ xen/tools/kconfig/expr.c | 1206 ++++++++++++ xen/tools/kconfig/expr.h | 238 +++ xen/tools/kconfig/gconf.c | 1521 +++++++++++++++ xen/tools/kconfig/gconf.glade | 661 +++++++ xen/tools/kconfig/images.c | 326 ++++ xen/tools/kconfig/kxgettext.c | 235 +++ xen/tools/kconfig/list.h | 131 ++ xen/tools/kconfig/lkc.h | 186 ++ xen/tools/kconfig/lkc_proto.h | 52 + xen/tools/kconfig/lxdialog/.gitignore | 4 + xen/tools/kconfig/lxdialog/BIG.FAT.WARNING | 4 + xen/tools/kconfig/lxdialog/check-lxdialog.sh | 91 + xen/tools/kconfig/lxdialog/checklist.c | 332 ++++ xen/tools/kconfig/lxdialog/dialog.h | 257 +++ xen/tools/kconfig/lxdialog/inputbox.c | 301 +++ xen/tools/kconfig/lxdialog/menubox.c | 437 +++++ xen/tools/kconfig/lxdialog/textbox.c | 408 ++++ xen/tools/kconfig/lxdialog/util.c | 713 +++++++ xen/tools/kconfig/lxdialog/yesno.c | 114 ++ xen/tools/kconfig/mconf.c | 1047 +++++++++++ xen/tools/kconfig/menu.c | 697 +++++++ xen/tools/kconfig/merge_config.sh | 162 ++ xen/tools/kconfig/nconf.c | 1561 ++++++++++++++++ xen/tools/kconfig/nconf.gui.c | 656 +++++++ xen/tools/kconfig/nconf.h | 96 + xen/tools/kconfig/qconf.cc | 1798 ++++++++++++++++++ xen/tools/kconfig/qconf.h | 338 ++++ xen/tools/kconfig/streamline_config.pl | 647 +++++++ xen/tools/kconfig/symbol.c | 1376 ++++++++++++++ xen/tools/kconfig/util.c | 147 ++ xen/tools/kconfig/zconf.gperf | 49 + xen/tools/kconfig/zconf.hash.c_shipped | 293 +++ xen/tools/kconfig/zconf.l | 374 ++++ xen/tools/kconfig/zconf.lex.c_shipped | 2473 ++++++++++++++++++++++++ xen/tools/kconfig/zconf.tab.c_shipped | 2580 ++++++++++++++++++++++++++ xen/tools/kconfig/zconf.y | 742 ++++++++ 45 files changed, 25344 insertions(+), 0 deletions(-) diff --git a/docs/misc/kconfig-language.txt b/docs/misc/kconfig-language.txt new file mode 100644 index 0000000..350f733 --- /dev/null +++ b/docs/misc/kconfig-language.txt @@ -0,0 +1,395 @@ +Introduction +------------ + +The configuration database is a collection of configuration options +organized in a tree structure: + + +- Code maturity level options + | +- Prompt for development and/or incomplete code/drivers + +- General setup + | +- Networking support + | +- System V IPC + | +- BSD Process Accounting + | +- Sysctl support + +- Loadable module support + | +- Enable loadable module support + | +- Set version information on all module symbols + | +- Kernel module loader + +- ... + +Every entry has its own dependencies. These dependencies are used +to determine the visibility of an entry. Any child entry is only +visible if its parent entry is also visible. + +Menu entries +------------ + +Most entries define a config option; all other entries help to organize +them. A single configuration option is defined like this: + +config MODVERSIONS + bool "Set version information on all module symbols" + depends on MODULES + help + Usually, modules have to be recompiled whenever you switch to a new + kernel. ... + +Every line starts with a key word and can be followed by multiple +arguments. "config" starts a new config entry. The following lines +define attributes for this config option. Attributes can be the type of +the config option, input prompt, dependencies, help text and default +values. A config option can be defined multiple times with the same +name, but every definition can have only a single input prompt and the +type must not conflict. + +Menu attributes +--------------- + +A menu entry can have a number of attributes. Not all of them are +applicable everywhere (see syntax). + +- type definition: "bool"/"tristate"/"string"/"hex"/"int" + Every config option must have a type. There are only two basic types: + tristate and string; the other types are based on these two. The type + definition optionally accepts an input prompt, so these two examples + are equivalent: + + bool "Networking support" + and + bool + prompt "Networking support" + +- input prompt: "prompt" ["if" ] + Every menu entry can have at most one prompt, which is used to display + to the user. Optionally dependencies only for this prompt can be added + with "if". + +- default value: "default" ["if" ] + A config option can have any number of default values. If multiple + default values are visible, only the first defined one is active. + Default values are not limited to the menu entry where they are + defined. This means the default can be defined somewhere else or be + overridden by an earlier definition. + The default value is only assigned to the config symbol if no other + value was set by the user (via the input prompt above). If an input + prompt is visible the default value is presented to the user and can + be overridden by him. + Optionally, dependencies only for this default value can be added with + "if". + +- type definition + default value: + "def_bool"/"def_tristate" ["if" ] + This is a shorthand notation for a type definition plus a value. + Optionally dependencies for this default value can be added with "if". + +- dependencies: "depends on" + This defines a dependency for this menu entry. If multiple + dependencies are defined, they are connected with '&&'. Dependencies + are applied to all other options within this menu entry (which also + accept an "if" expression), so these two examples are equivalent: + + bool "foo" if BAR + default y if BAR + and + depends on BAR + bool "foo" + default y + +- reverse dependencies: "select" ["if" ] + While normal dependencies reduce the upper limit of a symbol (see + below), reverse dependencies can be used to force a lower limit of + another symbol. The value of the current menu symbol is used as the + minimal value can be set to. If is selected multiple + times, the limit is set to the largest selection. + Reverse dependencies can only be used with boolean or tristate + symbols. + Note: + select should be used with care. select will force + a symbol to a value without visiting the dependencies. + By abusing select you are able to select a symbol FOO even + if FOO depends on BAR that is not set. + In general use select only for non-visible symbols + (no prompts anywhere) and for symbols with no dependencies. + That will limit the usefulness but on the other hand avoid + the illegal configurations all over. + +- limiting menu display: "visible if" + This attribute is only applicable to menu blocks, if the condition is + false, the menu block is not displayed to the user (the symbols + contained there can still be selected by other symbols, though). It is + similar to a conditional "prompt" attribute for individual menu + entries. Default value of "visible" is true. + +- numerical ranges: "range" ["if" ] + This allows to limit the range of possible input values for int + and hex symbols. The user can only input a value which is larger than + or equal to the first symbol and smaller than or equal to the second + symbol. + +- help text: "help" or "---help---" + This defines a help text. The end of the help text is determined by + the indentation level, this means it ends at the first line which has + a smaller indentation than the first line of the help text. + "---help---" and "help" do not differ in behaviour, "---help---" is + used to help visually separate configuration logic from help within + the file as an aid to developers. + +- misc options: "option" [=] + Various less common options can be defined via this option syntax, + which can modify the behaviour of the menu entry and its config + symbol. These options are currently possible: + + - "defconfig_list" + This declares a list of default entries which can be used when + looking for the default configuration (which is used when the main + .config doesn't exists yet.) + + - "modules" + This declares the symbol to be used as the MODULES symbol, which + enables the third modular state for all config symbols. + At most one symbol may have the "modules" option set. + + - "env"= + This imports the environment variable into Kconfig. It behaves like + a default, except that the value comes from the environment, this + also means that the behaviour when mixing it with normal defaults is + undefined at this point. The symbol is currently not exported back + to the build environment (if this is desired, it can be done via + another symbol). + + - "allnoconfig_y" + This declares the symbol as one that should have the value y when + using "allnoconfig". Used for symbols that hide other symbols. + +Menu dependencies +----------------- + +Dependencies define the visibility of a menu entry and can also reduce +the input range of tristate symbols. The tristate logic used in the +expressions uses one more state than normal boolean logic to express the +module state. Dependency expressions have the following syntax: + + ::= (1) + '=' (2) + '!=' (3) + '(' ')' (4) + '!' (5) + '&&' (6) + '||' (7) + +Expressions are listed in decreasing order of precedence. + +(1) Convert the symbol into an expression. Boolean and tristate symbols + are simply converted into the respective expression values. All + other symbol types result in 'n'. +(2) If the values of both symbols are equal, it returns 'y', + otherwise 'n'. +(3) If the values of both symbols are equal, it returns 'n', + otherwise 'y'. +(4) Returns the value of the expression. Used to override precedence. +(5) Returns the result of (2-/expr/). +(6) Returns the result of min(/expr/, /expr/). +(7) Returns the result of max(/expr/, /expr/). + +An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2 +respectively for calculations). A menu entry becomes visible when its +expression evaluates to 'm' or 'y'. + +There are two types of symbols: constant and non-constant symbols. +Non-constant symbols are the most common ones and are defined with the +'config' statement. Non-constant symbols consist entirely of alphanumeric +characters or underscores. +Constant symbols are only part of expressions. Constant symbols are +always surrounded by single or double quotes. Within the quote, any +other character is allowed and the quotes can be escaped using '\'. + +Menu structure +-------------- + +The position of a menu entry in the tree is determined in two ways. First +it can be specified explicitly: + +menu "Network device support" + depends on NET + +config NETDEVICES + ... + +endmenu + +All entries within the "menu" ... "endmenu" block become a submenu of +"Network device support". All subentries inherit the dependencies from +the menu entry, e.g. this means the dependency "NET" is added to the +dependency list of the config option NETDEVICES. + +The other way to generate the menu structure is done by analyzing the +dependencies. If a menu entry somehow depends on the previous entry, it +can be made a submenu of it. First, the previous (parent) symbol must +be part of the dependency list and then one of these two conditions +must be true: +- the child entry must become invisible, if the parent is set to 'n' +- the child entry must only be visible, if the parent is visible + +config MODULES + bool "Enable loadable module support" + +config MODVERSIONS + bool "Set version information on all module symbols" + depends on MODULES + +comment "module support disabled" + depends on !MODULES + +MODVERSIONS directly depends on MODULES, this means it's only visible if +MODULES is different from 'n'. The comment on the other hand is always +visible when MODULES is visible (the (empty) dependency of MODULES is +also part of the comment dependencies). + + +Kconfig syntax +-------------- + +The configuration file describes a series of menu entries, where every +line starts with a keyword (except help texts). The following keywords +end a menu entry: +- config +- menuconfig +- choice/endchoice +- comment +- menu/endmenu +- if/endif +- source +The first five also start the definition of a menu entry. + +config: + + "config" + + +This defines a config symbol and accepts any of above +attributes as options. + +menuconfig: + "menuconfig" + + +This is similar to the simple config entry above, but it also gives a +hint to front ends, that all suboptions should be displayed as a +separate list of options. + +choices: + + "choice" [symbol] + + + "endchoice" + +This defines a choice group and accepts any of the above attributes as +options. A choice can only be of type bool or tristate, while a boolean +choice only allows a single config entry to be selected, a tristate +choice also allows any number of config entries to be set to 'm'. This +can be used if multiple drivers for a single hardware exists and only a +single driver can be compiled/loaded into the kernel, but all drivers +can be compiled as modules. +A choice accepts another option "optional", which allows to set the +choice to 'n' and no entry needs to be selected. +If no [symbol] is associated with a choice, then you can not have multiple +definitions of that choice. If a [symbol] is associated to the choice, +then you may define the same choice (ie. with the same entries) in another +place. + +comment: + + "comment" + + +This defines a comment which is displayed to the user during the +configuration process and is also echoed to the output files. The only +possible options are dependencies. + +menu: + + "menu" + + + "endmenu" + +This defines a menu block, see "Menu structure" above for more +information. The only possible options are dependencies and "visible" +attributes. + +if: + + "if" + + "endif" + +This defines an if block. The dependency expression is appended +to all enclosed menu entries. + +source: + + "source" + +This reads the specified configuration file. This file is always parsed. + +mainmenu: + + "mainmenu" + +This sets the config program's title bar if the config program chooses +to use it. It should be placed at the top of the configuration, before any +other statement. + + +Kconfig hints +------------- +This is a collection of Kconfig tips, most of which aren't obvious at +first glance and most of which have become idioms in several Kconfig +files. + +Adding common features and make the usage configurable +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +It is a common idiom to implement a feature/functionality that are +relevant for some architectures but not all. +The recommended way to do so is to use a config variable named HAVE_* +that is defined in a common Kconfig file and selected by the relevant +architectures. +An example is the generic IOMAP functionality. + +We would in lib/Kconfig see: + +# Generic IOMAP is used to ... +config HAVE_GENERIC_IOMAP + +config GENERIC_IOMAP + depends on HAVE_GENERIC_IOMAP && FOO + +And in lib/Makefile we would see: +obj-$(CONFIG_GENERIC_IOMAP) += iomap.o + +For each architecture using the generic IOMAP functionality we would see: + +config X86 + select ... + select HAVE_GENERIC_IOMAP + select ... + +Note: we use the existing config option and avoid creating a new +config variable to select HAVE_GENERIC_IOMAP. + +Note: the use of the internal config variable HAVE_GENERIC_IOMAP, it is +introduced to overcome the limitation of select which will force a +config option to 'y' no matter the dependencies. +The dependencies are moved to the symbol GENERIC_IOMAP and we avoid the +situation where select forces a symbol equals to 'y'. + +Build as module only +~~~~~~~~~~~~~~~~~~~~ +To restrict a component build to module-only, qualify its config symbol +with "depends on m". E.g.: + +config FOO + depends on BAR && m + +limits FOO to module (=m) or disabled (=n). diff --git a/docs/misc/kconfig.txt b/docs/misc/kconfig.txt new file mode 100644 index 0000000..bbc99c0 --- /dev/null +++ b/docs/misc/kconfig.txt @@ -0,0 +1,237 @@ +This file contains some assistance for using "make *config". + +Use "make help" to list all of the possible configuration targets. + +The xconfig ('qconf') and menuconfig ('mconf') programs also +have embedded help text. Be sure to check it for navigation, +search, and other general help text. + +====================================================================== +General +-------------------------------------------------- + +New kernel releases often introduce new config symbols. Often more +important, new kernel releases may rename config symbols. When +this happens, using a previously working .config file and running +"make oldconfig" won't necessarily produce a working new kernel +for you, so you may find that you need to see what NEW kernel +symbols have been introduced. + +To see a list of new config symbols when using "make oldconfig", use + + cp user/some/old.config .config + make listnewconfig + +and the config program will list any new symbols, one per line. + + scripts/diffconfig .config.old .config | less + +______________________________________________________________________ +Environment variables for '*config' + +KCONFIG_CONFIG +-------------------------------------------------- +This environment variable can be used to specify a default kernel config +file name to override the default name of ".config". + +KCONFIG_OVERWRITECONFIG +-------------------------------------------------- +If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not +break symlinks when .config is a symlink to somewhere else. + +CONFIG_ +-------------------------------------------------- +If you set CONFIG_ in the environment, Kconfig will prefix all symbols +with its value when saving the configuration, instead of using the default, +"CONFIG_". + +______________________________________________________________________ +Environment variables for '{allyes/allmod/allno/rand}config' + +KCONFIG_ALLCONFIG +-------------------------------------------------- +(partially based on lkml email from/by Rob Landley, re: miniconfig) +-------------------------------------------------- +The allyesconfig/allmodconfig/allnoconfig/randconfig variants can also +use the environment variable KCONFIG_ALLCONFIG as a flag or a filename +that contains config symbols that the user requires to be set to a +specific value. If KCONFIG_ALLCONFIG is used without a filename where +KCONFIG_ALLCONFIG == "" or KCONFIG_ALLCONFIG == "1", "make *config" +checks for a file named "all{yes/mod/no/def/random}.config" +(corresponding to the *config command that was used) for symbol values +that are to be forced. If this file is not found, it checks for a +file named "all.config" to contain forced values. + +This enables you to create "miniature" config (miniconfig) or custom +config files containing just the config symbols that you are interested +in. Then the kernel config system generates the full .config file, +including symbols of your miniconfig file. + +This 'KCONFIG_ALLCONFIG' file is a config file which contains +(usually a subset of all) preset config symbols. These variable +settings are still subject to normal dependency checks. + +Examples: + KCONFIG_ALLCONFIG=custom-notebook.config make allnoconfig +or + KCONFIG_ALLCONFIG=mini.config make allnoconfig +or + make KCONFIG_ALLCONFIG=mini.config allnoconfig + +These examples will disable most options (allnoconfig) but enable or +disable the options that are explicitly listed in the specified +mini-config files. + +______________________________________________________________________ +Environment variables for 'randconfig' + +KCONFIG_SEED +-------------------------------------------------- +You can set this to the integer value used to seed the RNG, if you want +to somehow debug the behaviour of the kconfig parser/frontends. +If not set, the current time will be used. + +KCONFIG_PROBABILITY +-------------------------------------------------- +This variable can be used to skew the probabilities. This variable can +be unset or empty, or set to three different formats: + KCONFIG_PROBABILITY y:n split y:m:n split + ----------------------------------------------------------------- + unset or empty 50 : 50 33 : 33 : 34 + N N : 100-N N/2 : N/2 : 100-N + [1] N:M N+M : 100-(N+M) N : M : 100-(N+M) + [2] N:M:L N : 100-N M : L : 100-(M+L) + +where N, M and L are integers (in base 10) in the range [0,100], and so +that: + [1] N+M is in the range [0,100] + [2] M+L is in the range [0,100] + +Examples: + KCONFIG_PROBABILITY=10 + 10% of booleans will be set to 'y', 90% to 'n' + 5% of tristates will be set to 'y', 5% to 'm', 90% to 'n' + KCONFIG_PROBABILITY=15:25 + 40% of booleans will be set to 'y', 60% to 'n' + 15% of tristates will be set to 'y', 25% to 'm', 60% to 'n' + KCONFIG_PROBABILITY=10:15:15 + 10% of booleans will be set to 'y', 90% to 'n' + 15% of tristates will be set to 'y', 15% to 'm', 70% to 'n' + +______________________________________________________________________ +Environment variables for 'silentoldconfig' + +KCONFIG_NOSILENTUPDATE +-------------------------------------------------- +If this variable has a non-blank value, it prevents silent kernel +config updates (requires explicit updates). + +KCONFIG_AUTOCONFIG +-------------------------------------------------- +This environment variable can be set to specify the path & name of the +"auto.conf" file. Its default value is "include/config/auto.conf". + +KCONFIG_TRISTATE +-------------------------------------------------- +This environment variable can be set to specify the path & name of the +"tristate.conf" file. Its default value is "include/config/tristate.conf". + +KCONFIG_AUTOHEADER +-------------------------------------------------- +This environment variable can be set to specify the path & name of the +"autoconf.h" (header) file. +Its default value is "include/generated/autoconf.h". + + +====================================================================== +menuconfig +-------------------------------------------------- + +SEARCHING for CONFIG symbols + +Searching in menuconfig: + + The Search function searches for kernel configuration symbol + names, so you have to know something close to what you are + looking for. + + Example: + /hotplug + This lists all config symbols that contain "hotplug", + e.g., HOTPLUG_CPU, MEMORY_HOTPLUG. + + For search help, enter / followed TAB-TAB-TAB (to highlight + ) and Enter. This will tell you that you can also use + regular expressions (regexes) in the search string, so if you + are not interested in MEMORY_HOTPLUG, you could try + + /^hotplug + + When searching, symbols are sorted thus: + - first, exact matches, sorted alphabetically (an exact match + is when the search matches the complete symbol name); + - then, other matches, sorted alphabetically. + For example: ^ATH.K matches: + ATH5K ATH9K ATH5K_AHB ATH5K_DEBUG [...] ATH6KL ATH6KL_DEBUG + [...] ATH9K_AHB ATH9K_BTCOEX_SUPPORT ATH9K_COMMON [...] + of which only ATH5K and ATH9K match exactly and so are sorted + first (and in alphabetical order), then come all other symbols, + sorted in alphabetical order. + +______________________________________________________________________ +User interface options for 'menuconfig' + +MENUCONFIG_COLOR +-------------------------------------------------- +It is possible to select different color themes using the variable +MENUCONFIG_COLOR. To select a theme use: + + make MENUCONFIG_COLOR= menuconfig + +Available themes are: + mono => selects colors suitable for monochrome displays + blackbg => selects a color scheme with black background + classic => theme with blue background. The classic look + bluetitle => a LCD friendly version of classic. (default) + +MENUCONFIG_MODE +-------------------------------------------------- +This mode shows all sub-menus in one large tree. + +Example: + make MENUCONFIG_MODE=single_menu menuconfig + + +====================================================================== +xconfig +-------------------------------------------------- + +Searching in xconfig: + + The Search function searches for kernel configuration symbol + names, so you have to know something close to what you are + looking for. + + Example: + Ctrl-F hotplug + or + Menu: File, Search, hotplug + + lists all config symbol entries that contain "hotplug" in + the symbol name. In this Search dialog, you may change the + config setting for any of the entries that are not grayed out. + You can also enter a different search string without having + to return to the main menu. + + +====================================================================== +gconfig +-------------------------------------------------- + +Searching in gconfig: + + None (gconfig isn't maintained as well as xconfig or menuconfig); + however, gconfig does have a few more viewing choices than + xconfig does. + +### diff --git a/xen/tools/kconfig/.gitignore b/xen/tools/kconfig/.gitignore new file mode 100644 index 0000000..be603c4 --- /dev/null +++ b/xen/tools/kconfig/.gitignore @@ -0,0 +1,22 @@ +# +# Generated files +# +config* +*.lex.c +*.tab.c +*.tab.h +zconf.hash.c +*.moc +gconf.glade.h +*.pot +*.mo + +# +# configuration programs +# +conf +mconf +nconf +qconf +gconf +kxgettext diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile new file mode 100644 index 0000000..aceaaed --- /dev/null +++ b/xen/tools/kconfig/Makefile @@ -0,0 +1,317 @@ +# =========================================================================== +# Kernel configuration targets +# These targets are used from top-level makefile + +PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \ + localmodconfig localyesconfig + +ifdef KBUILD_KCONFIG +Kconfig := $(KBUILD_KCONFIG) +else +Kconfig := Kconfig +endif + +ifeq ($(quiet),silent_) +silent := -s +endif + +# We need this, in case the user has it in its environment +unexport CONFIG_ + +xconfig: $(obj)/qconf + $< $(silent) $(Kconfig) + +gconfig: $(obj)/gconf + $< $(silent) $(Kconfig) + +menuconfig: $(obj)/mconf + $< $(silent) $(Kconfig) + +config: $(obj)/conf + $< $(silent) --oldaskconfig $(Kconfig) + +nconfig: $(obj)/nconf + $< $(silent) $(Kconfig) + +silentoldconfig: $(obj)/conf + $(Q)mkdir -p include/config include/generated + $< $(silent) --$@ $(Kconfig) + +localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf + $(Q)mkdir -p include/config include/generated + $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config + $(Q)if [ -f .config ]; then \ + cmp -s .tmp.config .config || \ + (mv -f .config .config.old.1; \ + mv -f .tmp.config .config; \ + $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \ + mv -f .config.old.1 .config.old) \ + else \ + mv -f .tmp.config .config; \ + $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \ + fi + $(Q)rm -f .tmp.config + +# Create new linux.pot file +# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files +update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h + $(Q)$(kecho) " GEN config.pot" + $(Q)xgettext --default-domain=linux \ + --add-comments --keyword=_ --keyword=N_ \ + --from-code=UTF-8 \ + --files-from=$(srctree)/scripts/kconfig/POTFILES.in \ + --directory=$(srctree) --directory=$(objtree) \ + --output $(obj)/config.pot + $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot + $(Q)(for i in `ls $(srctree)/arch/*/Kconfig \ + $(srctree)/arch/*/um/Kconfig`; \ + do \ + $(kecho) " GEN $$i"; \ + $(obj)/kxgettext $$i \ + >> $(obj)/config.pot; \ + done ) + $(Q)$(kecho) " GEN linux.pot" + $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ + --output $(obj)/linux.pot + $(Q)rm -f $(obj)/config.pot + +# These targets map 1:1 to the commandline options of 'conf' +simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ + alldefconfig randconfig listnewconfig olddefconfig +PHONY += $(simple-targets) + +$(simple-targets): $(obj)/conf + $< $(silent) --$@ $(Kconfig) + +PHONY += oldnoconfig savedefconfig defconfig + +# oldnoconfig is an alias of olddefconfig, because people already are dependent +# on its behavior (sets new symbols to their default value but not 'n') with the +# counter-intuitive name. +oldnoconfig: olddefconfig + +savedefconfig: $(obj)/conf + $< $(silent) --$@=defconfig $(Kconfig) + +defconfig: $(obj)/conf +ifeq ($(KBUILD_DEFCONFIG),) + $< $(silent) --defconfig $(Kconfig) +else + @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" + $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) +endif + +%_defconfig: $(obj)/conf + $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) + +configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@) + +%.config: $(obj)/conf + $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles) + +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig + +PHONY += kvmconfig +kvmconfig: kvm_guest.config + @: + +PHONY += xenconfig +xenconfig: xen.config + @: + +PHONY += tinyconfig +tinyconfig: + $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config + +# Help text used by make help +help: + @echo ' config - Update current config utilising a line-oriented program' + @echo ' nconfig - Update current config utilising a ncurses menu based' + @echo ' program' + @echo ' menuconfig - Update current config utilising a menu based program' + @echo ' xconfig - Update current config utilising a Qt based front-end' + @echo ' gconfig - Update current config utilising a GTK+ based front-end' + @echo ' oldconfig - Update current config utilising a provided .config as base' + @echo ' localmodconfig - Update current config disabling modules not loaded' + @echo ' localyesconfig - Update current config converting local mods to core' + @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps' + @echo ' defconfig - New config with default from ARCH supplied defconfig' + @echo ' savedefconfig - Save current config as ./defconfig (minimal config)' + @echo ' allnoconfig - New config where all options are answered with no' + @echo ' allyesconfig - New config where all options are accepted with yes' + @echo ' allmodconfig - New config selecting modules when possible' + @echo ' alldefconfig - New config with all symbols set to default' + @echo ' randconfig - New config with random answer to all options' + @echo ' listnewconfig - List new options' + @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their' + @echo ' default value' + @echo ' kvmconfig - Enable additional options for kvm guest kernel support' + @echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' + @echo ' tinyconfig - Configure the tiniest possible kernel' + +# lxdialog stuff +check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh + +# Use recursively expanded variables so we do not call gcc unless +# we really need to do so. (Do not call gcc as part of make mrproper) +HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ + -DLOCALE + +# =========================================================================== +# Shared Makefile for the various kconfig executables: +# conf: Used for defconfig, oldconfig and related targets +# nconf: Used for the nconfig target. +# Utilizes ncurses +# mconf: Used for the menuconfig target +# Utilizes the lxdialog package +# qconf: Used for the xconfig target +# Based on Qt which needs to be installed to compile it +# gconf: Used for the gconfig target +# Based on GTK+ which needs to be installed to compile it +# object files used by all kconfig flavours + +lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o +lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o + +conf-objs := conf.o zconf.tab.o +mconf-objs := mconf.o zconf.tab.o $(lxdialog) +nconf-objs := nconf.o zconf.tab.o nconf.gui.o +kxgettext-objs := kxgettext.o zconf.tab.o +qconf-cxxobjs := qconf.o +qconf-objs := zconf.tab.o +gconf-objs := gconf.o zconf.tab.o + +hostprogs-y := conf nconf mconf kxgettext qconf gconf + +clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck +clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h +clean-files += config.pot linux.pot + +# Check that we have the required ncurses stuff installed for lxdialog (menuconfig) +PHONY += $(obj)/dochecklxdialog +$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog +$(obj)/dochecklxdialog: + $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf) + +always := dochecklxdialog + +# Add environment specific flags +HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS)) + +# generated files seem to need this to find local include files +HOSTCFLAGS_zconf.lex.o := -I$(src) +HOSTCFLAGS_zconf.tab.o := -I$(src) + +LEX_PREFIX_zconf := zconf +YACC_PREFIX_zconf := zconf + +HOSTLOADLIBES_qconf = $(KC_QT_LIBS) +HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) + +HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` +HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ + -Wno-missing-prototypes + +HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) + +HOSTLOADLIBES_nconf = $(shell \ + pkg-config --libs menuw panelw ncursesw 2>/dev/null \ + || pkg-config --libs menu panel ncurses 2>/dev/null \ + || echo "-lmenu -lpanel -lncurses" ) +$(obj)/qconf.o: $(obj)/.tmp_qtcheck + +ifeq ($(MAKECMDGOALS),xconfig) +$(obj)/.tmp_qtcheck: $(src)/Makefile +-include $(obj)/.tmp_qtcheck + +# Qt needs some extra effort... +$(obj)/.tmp_qtcheck: + @set -e; $(kecho) " CHECK qt"; dir=""; pkg=""; \ + if ! pkg-config --exists QtCore 2> /dev/null; then \ + echo "* Unable to find the Qt4 tool qmake. Trying to use Qt3"; \ + pkg-config --exists qt 2> /dev/null && pkg=qt; \ + pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \ + if [ -n "$$pkg" ]; then \ + cflags="\$$(shell pkg-config $$pkg --cflags)"; \ + libs="\$$(shell pkg-config $$pkg --libs)"; \ + moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \ + dir="$$(pkg-config $$pkg --variable=prefix)"; \ + else \ + for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \ + if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \ + done; \ + if [ -z "$$dir" ]; then \ + echo >&2 "*"; \ + echo >&2 "* Unable to find any Qt installation. Please make sure that"; \ + echo >&2 "* the Qt4 or Qt3 development package is correctly installed and"; \ + echo >&2 "* either qmake can be found or install pkg-config or set"; \ + echo >&2 "* the QTDIR environment variable to the correct location."; \ + echo >&2 "*"; \ + false; \ + fi; \ + libpath=$$dir/lib; lib=qt; osdir=""; \ + $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \ + osdir=x$$($(HOSTCXX) -print-multi-os-directory); \ + test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \ + test -f $$libpath/libqt-mt.so && lib=qt-mt; \ + cflags="-I$$dir/include"; \ + libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \ + moc="$$dir/bin/moc"; \ + fi; \ + if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \ + echo "*"; \ + echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \ + echo "*"; \ + moc="/usr/bin/moc"; \ + fi; \ + else \ + cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ + libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ + moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \ + [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \ + fi; \ + echo "KC_QT_CFLAGS=$$cflags" > $@; \ + echo "KC_QT_LIBS=$$libs" >> $@; \ + echo "KC_QT_MOC=$$moc" >> $@ +endif + +$(obj)/gconf.o: $(obj)/.tmp_gtkcheck + +ifeq ($(MAKECMDGOALS),gconfig) +-include $(obj)/.tmp_gtkcheck + +# GTK+ needs some extra effort, too... +$(obj)/.tmp_gtkcheck: + @if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then \ + if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \ + touch $@; \ + else \ + echo >&2 "*"; \ + echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \ + echo >&2 "*"; \ + false; \ + fi \ + else \ + echo >&2 "*"; \ + echo >&2 "* Unable to find the GTK+ installation. Please make sure that"; \ + echo >&2 "* the GTK+ 2.0 development package is correctly installed..."; \ + echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \ + echo >&2 "*"; \ + false; \ + fi +endif + +$(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c + +$(obj)/qconf.o: $(obj)/qconf.moc + +quiet_cmd_moc = MOC $@ + cmd_moc = $(KC_QT_MOC) -i $< -o $@ + +$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck + $(call cmd,moc) + +# Extract gconf menu items for i18n support +$(obj)/gconf.glade.h: $(obj)/gconf.glade + $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \ + $(obj)/gconf.glade diff --git a/xen/tools/kconfig/Makefile.host b/xen/tools/kconfig/Makefile.host new file mode 100644 index 0000000..133edfa --- /dev/null +++ b/xen/tools/kconfig/Makefile.host @@ -0,0 +1,128 @@ +# ========================================================================== +# Building binaries on the host system +# Binaries are used during the compilation of the kernel, for example +# to preprocess a data file. +# +# Both C and C++ are supported, but preferred language is C for such utilities. +# +# Sample syntax (see Documentation/kbuild/makefiles.txt for reference) +# hostprogs-y := bin2hex +# Will compile bin2hex.c and create an executable named bin2hex +# +# hostprogs-y := lxdialog +# lxdialog-objs := checklist.o lxdialog.o +# Will compile lxdialog.c and checklist.c, and then link the executable +# lxdialog, based on checklist.o and lxdialog.o +# +# hostprogs-y := qconf +# qconf-cxxobjs := qconf.o +# qconf-objs := menu.o +# Will compile qconf as a C++ program, and menu as a C program. +# They are linked as C++ code to the executable qconf + +__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m)) + +# C code +# Executables compiled from a single .c file +host-csingle := $(foreach m,$(__hostprogs), \ + $(if $($(m)-objs)$($(m)-cxxobjs),,$(m))) + +# C executables linked based on several .o files +host-cmulti := $(foreach m,$(__hostprogs),\ + $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m)))) + +# Object (.o) files compiled from .c files +host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs))) + +# C++ code +# C++ executables compiled from at least one .cc file +# and zero or more .c files +host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m))) + +# C++ Object (.o) files compiled from .cc files +host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs))) + +# output directory for programs/.o files +# hostprogs-y := tools/build may have been specified. +# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation +host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs)) + +host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs)))) + + +__hostprogs := $(addprefix $(obj)/,$(__hostprogs)) +host-csingle := $(addprefix $(obj)/,$(host-csingle)) +host-cmulti := $(addprefix $(obj)/,$(host-cmulti)) +host-cobjs := $(addprefix $(obj)/,$(host-cobjs)) +host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti)) +host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs)) +host-objdirs := $(addprefix $(obj)/,$(host-objdirs)) + +obj-dirs += $(host-objdirs) + +##### +# Handle options to gcc. Support building with separate output directory + +_hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ + $(HOSTCFLAGS_$(basetarget).o) +_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ + $(HOSTCXXFLAGS_$(basetarget).o) + +ifeq ($(KBUILD_SRC),) +__hostc_flags = $(_hostc_flags) +__hostcxx_flags = $(_hostcxx_flags) +else +__hostc_flags = -I$(obj) $(call flags,_hostc_flags) +__hostcxx_flags = -I$(obj) $(call flags,_hostcxx_flags) +endif + +hostc_flags = -Wp,-MD,$(depfile) $(__hostc_flags) +hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) + +##### +# Compile programs on the host + +# Create executable from a single .c file +# host-csingle -> Executable +quiet_cmd_host-csingle = HOSTCC $@ + cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \ + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) +$(host-csingle): $(obj)/%: $(src)/%.c FORCE + $(call if_changed_dep,host-csingle) + +# Link an executable based on list of .o files, all plain c +# host-cmulti -> executable +quiet_cmd_host-cmulti = HOSTLD $@ + cmd_host-cmulti = $(HOSTCC) $(HOSTLDFLAGS) -o $@ \ + $(addprefix $(obj)/,$($(@F)-objs)) \ + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) +$(host-cmulti): FORCE + $(call if_changed,host-cmulti) +$(call multi_depend, $(host-cmulti), , -objs) + +# Create .o file from a single .c file +# host-cobjs -> .o +quiet_cmd_host-cobjs = HOSTCC $@ + cmd_host-cobjs = $(HOSTCC) $(hostc_flags) -c -o $@ $< +$(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE + $(call if_changed_dep,host-cobjs) + +# Link an executable based on list of .o files, a mixture of .c and .cc +# host-cxxmulti -> executable +quiet_cmd_host-cxxmulti = HOSTLD $@ + cmd_host-cxxmulti = $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \ + $(foreach o,objs cxxobjs,\ + $(addprefix $(obj)/,$($(@F)-$(o)))) \ + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) +$(host-cxxmulti): FORCE + $(call if_changed,host-cxxmulti) +$(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) + +# Create .o file from a single .cc (C++) file +quiet_cmd_host-cxxobjs = HOSTCXX $@ + cmd_host-cxxobjs = $(HOSTCXX) $(hostcxx_flags) -c -o $@ $< +$(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE + $(call if_changed_dep,host-cxxobjs) + +targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ + $(host-cxxmulti) $(host-cxxobjs) diff --git a/xen/tools/kconfig/POTFILES.in b/xen/tools/kconfig/POTFILES.in new file mode 100644 index 0000000..9674573 --- /dev/null +++ b/xen/tools/kconfig/POTFILES.in @@ -0,0 +1,12 @@ +scripts/kconfig/lxdialog/checklist.c +scripts/kconfig/lxdialog/inputbox.c +scripts/kconfig/lxdialog/menubox.c +scripts/kconfig/lxdialog/textbox.c +scripts/kconfig/lxdialog/util.c +scripts/kconfig/lxdialog/yesno.c +scripts/kconfig/mconf.c +scripts/kconfig/conf.c +scripts/kconfig/confdata.c +scripts/kconfig/gconf.c +scripts/kconfig/gconf.glade.h +scripts/kconfig/qconf.cc diff --git a/xen/tools/kconfig/check.sh b/xen/tools/kconfig/check.sh new file mode 100755 index 0000000..55b79ba --- /dev/null +++ b/xen/tools/kconfig/check.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Needed for systems without gettext +$* -x c -o /dev/null - > /dev/null 2>&1 << EOF +#include +int main() +{ + gettext(""); + return 0; +} +EOF +if [ ! "$?" -eq "0" ]; then + echo -DKBUILD_NO_NLS; +fi diff --git a/xen/tools/kconfig/conf.c b/xen/tools/kconfig/conf.c new file mode 100644 index 0000000..6c20431 --- /dev/null +++ b/xen/tools/kconfig/conf.c @@ -0,0 +1,722 @@ +/* + * Copyright (C) 2002 Roman Zippel + * Released under the terms of the GNU GPL v2.0. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lkc.h" + +static void conf(struct menu *menu); +static void check_conf(struct menu *menu); +static void xfgets(char *str, int size, FILE *in); + +enum input_mode { + oldaskconfig, + silentoldconfig, + oldconfig, + allnoconfig, + allyesconfig, + allmodconfig, + alldefconfig, + randconfig, + defconfig, + savedefconfig, + listnewconfig, + olddefconfig, +} input_mode = oldaskconfig; + +static int indent = 1; +static int tty_stdio; +static int valid_stdin = 1; +static int sync_kconfig; +static int conf_cnt; +static char line[128]; +static struct menu *rootEntry; + +static void print_help(struct menu *menu) +{ + struct gstr help = str_new(); + + menu_get_ext_help(menu, &help); + + printf("\n%s\n", str_get(&help)); + str_free(&help); +} + +static void strip(char *str) +{ + char *p = str; + int l; + + while ((isspace(*p))) + p++; + l = strlen(p); + if (p != str) + memmove(str, p, l + 1); + if (!l) + return; + p = str + l - 1; + while ((isspace(*p))) + *p-- = 0; +} + +static void check_stdin(void) +{ + if (!valid_stdin) { + printf(_("aborted!\n\n")); + printf(_("Console input/output is redirected. ")); + printf(_("Run 'make oldconfig' to update configuration.\n\n")); + exit(1); + } +} + +static int conf_askvalue(struct symbol *sym, const char *def) +{ + enum symbol_type type = sym_get_type(sym); + + if (!sym_has_value(sym)) + printf(_("(NEW) ")); + + line[0] = '\n'; + line[1] = 0; + + if (!sym_is_changable(sym)) { + printf("%s\n", def); + line[0] = '\n'; + line[1] = 0; + return 0; + } + + switch (input_mode) { + case oldconfig: + case silentoldconfig: + if (sym_has_value(sym)) { + printf("%s\n", def); + return 0; + } + check_stdin(); + /* fall through */ + case oldaskconfig: + fflush(stdout); + xfgets(line, 128, stdin); + if (!tty_stdio) + printf("\n"); + return 1; + default: + break; + } + + switch (type) { + case S_INT: + case S_HEX: + case S_STRING: + printf("%s\n", def); + return 1; + default: + ; + } + printf("%s", line); + return 1; +} + +static int conf_string(struct menu *menu) +{ + struct symbol *sym = menu->sym; + const char *def; + + while (1) { + printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); + printf("(%s) ", sym->name); + def = sym_get_string_value(sym); + if (sym_get_string_value(sym)) + printf("[%s] ", def); + if (!conf_askvalue(sym, def)) + return 0; + switch (line[0]) { + case '\n': + break; + case '?': + /* print help */ + if (line[1] == '\n') { + print_help(menu); + def = NULL; + break; + } + /* fall through */ + default: + line[strlen(line)-1] = 0; + def = line; + } + if (def && sym_set_string_value(sym, def)) + return 0; + } +} + +static int conf_sym(struct menu *menu) +{ + struct symbol *sym = menu->sym; + tristate oldval, newval; + + while (1) { + printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); + if (sym->name) + printf("(%s) ", sym->name); + putchar('['); + oldval = sym_get_tristate_value(sym); + switch (oldval) { + case no: + putchar('N'); + break; + case mod: + putchar('M'); + break; + case yes: + putchar('Y'); + break; + } + if (oldval != no && sym_tristate_within_range(sym, no)) + printf("/n"); + if (oldval != mod && sym_tristate_within_range(sym, mod)) + printf("/m"); + if (oldval != yes && sym_tristate_within_range(sym, yes)) + printf("/y"); + if (menu_has_help(menu)) + printf("/?"); + printf("] "); + if (!conf_askvalue(sym, sym_get_string_value(sym))) + return 0; + strip(line); + + switch (line[0]) { + case 'n': + case 'N': + newval = no; + if (!line[1] || !strcmp(&line[1], "o")) + break; + continue; + case 'm': + case 'M': + newval = mod; + if (!line[1]) + break; + continue; + case 'y': + case 'Y': + newval = yes; + if (!line[1] || !strcmp(&line[1], "es")) + break; + continue; + case 0: + newval = oldval; + break; + case '?': + goto help; + default: + continue; + } + if (sym_set_tristate_value(sym, newval)) + return 0; +help: + print_help(menu); + } +} + +static int conf_choice(struct menu *menu) +{ + struct symbol *sym, *def_sym; + struct menu *child; + bool is_new; + + sym = menu->sym; + is_new = !sym_has_value(sym); + if (sym_is_changable(sym)) { + conf_sym(menu); + sym_calc_value(sym); + switch (sym_get_tristate_value(sym)) { + case no: + return 1; + case mod: + return 0; + case yes: + break; + } + } else { + switch (sym_get_tristate_value(sym)) { + case no: + return 1; + case mod: + printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu))); + return 0; + case yes: + break; + } + } + + while (1) { + int cnt, def; + + printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu))); + def_sym = sym_get_choice_value(sym); + cnt = def = 0; + line[0] = 0; + for (child = menu->list; child; child = child->next) { + if (!menu_is_visible(child)) + continue; + if (!child->sym) { + printf("%*c %s\n", indent, '*', _(menu_get_prompt(child))); + continue; + } + cnt++; + if (child->sym == def_sym) { + def = cnt; + printf("%*c", indent, '>'); + } else + printf("%*c", indent, ' '); + printf(" %d. %s", cnt, _(menu_get_prompt(child))); + if (child->sym->name) + printf(" (%s)", child->sym->name); + if (!sym_has_value(child->sym)) + printf(_(" (NEW)")); + printf("\n"); + } + printf(_("%*schoice"), indent - 1, ""); + if (cnt == 1) { + printf("[1]: 1\n"); + goto conf_childs; + } + printf("[1-%d", cnt); + if (menu_has_help(menu)) + printf("?"); + printf("]: "); + switch (input_mode) { + case oldconfig: + case silentoldconfig: + if (!is_new) { + cnt = def; + printf("%d\n", cnt); + break; + } + check_stdin(); + /* fall through */ + case oldaskconfig: + fflush(stdout); + xfgets(line, 128, stdin); + strip(line); + if (line[0] == '?') { + print_help(menu); + continue; + } + if (!line[0]) + cnt = def; + else if (isdigit(line[0])) + cnt = atoi(line); + else + continue; + break; + default: + break; + } + + conf_childs: + for (child = menu->list; child; child = child->next) { + if (!child->sym || !menu_is_visible(child)) + continue; + if (!--cnt) + break; + } + if (!child) + continue; + if (line[0] && line[strlen(line) - 1] == '?') { + print_help(child); + continue; + } + sym_set_choice_value(sym, child->sym); + for (child = child->list; child; child = child->next) { + indent += 2; + conf(child); + indent -= 2; + } + return 1; + } +} + +static void conf(struct menu *menu) +{ + struct symbol *sym; + struct property *prop; + struct menu *child; + + if (!menu_is_visible(menu)) + return; + + sym = menu->sym; + prop = menu->prompt; + if (prop) { + const char *prompt; + + switch (prop->type) { + case P_MENU: + if ((input_mode == silentoldconfig || + input_mode == listnewconfig || + input_mode == olddefconfig) && + rootEntry != menu) { + check_conf(menu); + return; + } + /* fall through */ + case P_COMMENT: + prompt = menu_get_prompt(menu); + if (prompt) + printf("%*c\n%*c %s\n%*c\n", + indent, '*', + indent, '*', _(prompt), + indent, '*'); + default: + ; + } + } + + if (!sym) + goto conf_childs; + + if (sym_is_choice(sym)) { + conf_choice(menu); + if (sym->curr.tri != mod) + return; + goto conf_childs; + } + + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + conf_string(menu); + break; + default: + conf_sym(menu); + break; + } + +conf_childs: + if (sym) + indent += 2; + for (child = menu->list; child; child = child->next) + conf(child); + if (sym) + indent -= 2; +} + +static void check_conf(struct menu *menu) +{ + struct symbol *sym; + struct menu *child; + + if (!menu_is_visible(menu)) + return; + + sym = menu->sym; + if (sym && !sym_has_value(sym)) { + if (sym_is_changable(sym) || + (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { + if (input_mode == listnewconfig) { + if (sym->name && !sym_is_choice_value(sym)) { + printf("%s%s\n", CONFIG_, sym->name); + } + } else if (input_mode != olddefconfig) { + if (!conf_cnt++) + printf(_("*\n* Restart config...\n*\n")); + rootEntry = menu_get_parent_menu(menu); + conf(rootEntry); + } + } + } + + for (child = menu->list; child; child = child->next) + check_conf(child); +} + +static struct option long_opts[] = { + {"oldaskconfig", no_argument, NULL, oldaskconfig}, + {"oldconfig", no_argument, NULL, oldconfig}, + {"silentoldconfig", no_argument, NULL, silentoldconfig}, + {"defconfig", optional_argument, NULL, defconfig}, + {"savedefconfig", required_argument, NULL, savedefconfig}, + {"allnoconfig", no_argument, NULL, allnoconfig}, + {"allyesconfig", no_argument, NULL, allyesconfig}, + {"allmodconfig", no_argument, NULL, allmodconfig}, + {"alldefconfig", no_argument, NULL, alldefconfig}, + {"randconfig", no_argument, NULL, randconfig}, + {"listnewconfig", no_argument, NULL, listnewconfig}, + {"olddefconfig", no_argument, NULL, olddefconfig}, + /* + * oldnoconfig is an alias of olddefconfig, because people already + * are dependent on its behavior(sets new symbols to their default + * value but not 'n') with the counter-intuitive name. + */ + {"oldnoconfig", no_argument, NULL, olddefconfig}, + {NULL, 0, NULL, 0} +}; + +static void conf_usage(const char *progname) +{ + + printf("Usage: %s [-s] [option] \n", progname); + printf("[option] is _one_ of the following:\n"); + printf(" --listnewconfig List new options\n"); + printf(" --oldaskconfig Start a new configuration using a line-oriented program\n"); + printf(" --oldconfig Update a configuration using a provided .config as base\n"); + printf(" --silentoldconfig Same as oldconfig, but quietly, additionally update deps\n"); + printf(" --olddefconfig Same as silentoldconfig but sets new symbols to their default value\n"); + printf(" --oldnoconfig An alias of olddefconfig\n"); + printf(" --defconfig New config with default defined in \n"); + printf(" --savedefconfig Save the minimal current configuration to \n"); + printf(" --allnoconfig New config where all options are answered with no\n"); + printf(" --allyesconfig New config where all options are answered with yes\n"); + printf(" --allmodconfig New config where all options are answered with mod\n"); + printf(" --alldefconfig New config with all symbols set to default\n"); + printf(" --randconfig New config with random answer to all options\n"); +} + +int main(int ac, char **av) +{ + const char *progname = av[0]; + int opt; + const char *name, *defconfig_file = NULL /* gcc uninit */; + struct stat tmpstat; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + tty_stdio = isatty(0) && isatty(1) && isatty(2); + + while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) { + if (opt == 's') { + conf_set_message_callback(NULL); + continue; + } + input_mode = (enum input_mode)opt; + switch (opt) { + case silentoldconfig: + sync_kconfig = 1; + break; + case defconfig: + case savedefconfig: + defconfig_file = optarg; + break; + case randconfig: + { + struct timeval now; + unsigned int seed; + char *seed_env; + + /* + * Use microseconds derived seed, + * compensate for systems where it may be zero + */ + gettimeofday(&now, NULL); + seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1)); + + seed_env = getenv("KCONFIG_SEED"); + if( seed_env && *seed_env ) { + char *endp; + int tmp = (int)strtol(seed_env, &endp, 0); + if (*endp == '\0') { + seed = tmp; + } + } + fprintf( stderr, "KCONFIG_SEED=0x%X\n", seed ); + srand(seed); + break; + } + case oldaskconfig: + case oldconfig: + case allnoconfig: + case allyesconfig: + case allmodconfig: + case alldefconfig: + case listnewconfig: + case olddefconfig: + break; + case '?': + conf_usage(progname); + exit(1); + break; + } + } + if (ac == optind) { + printf(_("%s: Kconfig file missing\n"), av[0]); + conf_usage(progname); + exit(1); + } + name = av[optind]; + conf_parse(name); + //zconfdump(stdout); + if (sync_kconfig) { + name = conf_get_configname(); + if (stat(name, &tmpstat)) { + fprintf(stderr, _("***\n" + "*** Configuration file \"%s\" not found!\n" + "***\n" + "*** Please run some configurator (e.g. \"make oldconfig\" or\n" + "*** \"make menuconfig\" or \"make xconfig\").\n" + "***\n"), name); + exit(1); + } + } + + switch (input_mode) { + case defconfig: + if (!defconfig_file) + defconfig_file = conf_get_default_confname(); + if (conf_read(defconfig_file)) { + printf(_("***\n" + "*** Can't find default configuration \"%s\"!\n" + "***\n"), defconfig_file); + exit(1); + } + break; + case savedefconfig: + case silentoldconfig: + case oldaskconfig: + case oldconfig: + case listnewconfig: + case olddefconfig: + conf_read(NULL); + break; + case allnoconfig: + case allyesconfig: + case allmodconfig: + case alldefconfig: + case randconfig: + name = getenv("KCONFIG_ALLCONFIG"); + if (!name) + break; + if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) { + if (conf_read_simple(name, S_DEF_USER)) { + fprintf(stderr, + _("*** Can't read seed configuration \"%s\"!\n"), + name); + exit(1); + } + break; + } + switch (input_mode) { + case allnoconfig: name = "allno.config"; break; + case allyesconfig: name = "allyes.config"; break; + case allmodconfig: name = "allmod.config"; break; + case alldefconfig: name = "alldef.config"; break; + case randconfig: name = "allrandom.config"; break; + default: break; + } + if (conf_read_simple(name, S_DEF_USER) && + conf_read_simple("all.config", S_DEF_USER)) { + fprintf(stderr, + _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"), + name); + exit(1); + } + break; + default: + break; + } + + if (sync_kconfig) { + if (conf_get_changed()) { + name = getenv("KCONFIG_NOSILENTUPDATE"); + if (name && *name) { + fprintf(stderr, + _("\n*** The configuration requires explicit update.\n\n")); + return 1; + } + } + valid_stdin = tty_stdio; + } + + switch (input_mode) { + case allnoconfig: + conf_set_all_new_symbols(def_no); + break; + case allyesconfig: + conf_set_all_new_symbols(def_yes); + break; + case allmodconfig: + conf_set_all_new_symbols(def_mod); + break; + case alldefconfig: + conf_set_all_new_symbols(def_default); + break; + case randconfig: + /* Really nothing to do in this loop */ + while (conf_set_all_new_symbols(def_random)) ; + break; + case defconfig: + conf_set_all_new_symbols(def_default); + break; + case savedefconfig: + break; + case oldaskconfig: + rootEntry = &rootmenu; + conf(&rootmenu); + input_mode = silentoldconfig; + /* fall through */ + case oldconfig: + case listnewconfig: + case olddefconfig: + case silentoldconfig: + /* Update until a loop caused no more changes */ + do { + conf_cnt = 0; + check_conf(&rootmenu); + } while (conf_cnt && + (input_mode != listnewconfig && + input_mode != olddefconfig)); + break; + } + + if (sync_kconfig) { + /* silentoldconfig is used during the build so we shall update autoconf. + * All other commands are only used to generate a config. + */ + if (conf_get_changed() && conf_write(NULL)) { + fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); + exit(1); + } + if (conf_write_autoconf()) { + fprintf(stderr, _("\n*** Error during update of the configuration.\n\n")); + return 1; + } + } else if (input_mode == savedefconfig) { + if (conf_write_defconfig(defconfig_file)) { + fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), + defconfig_file); + return 1; + } + } else if (input_mode != listnewconfig) { + if (conf_write(NULL)) { + fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); + exit(1); + } + } + return 0; +} + +/* + * Helper function to facilitate fgets() by Jean Sacren. + */ +void xfgets(char *str, int size, FILE *in) +{ + if (fgets(str, size, in) == NULL) + fprintf(stderr, "\nError in reading or end of file.\n"); +} diff --git a/xen/tools/kconfig/confdata.c b/xen/tools/kconfig/confdata.c new file mode 100644 index 0000000..0b7dc2f --- /dev/null +++ b/xen/tools/kconfig/confdata.c @@ -0,0 +1,1245 @@ +/* + * Copyright (C) 2002 Roman Zippel + * Released under the terms of the GNU GPL v2.0. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lkc.h" + +struct conf_printer { + void (*print_symbol)(FILE *, struct symbol *, const char *, void *); + void (*print_comment)(FILE *, const char *, void *); +}; + +static void conf_warning(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); + +static void conf_message(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); + +static const char *conf_filename; +static int conf_lineno, conf_warnings, conf_unsaved; + +const char conf_defname[] = "arch/$ARCH/defconfig"; + +static void conf_warning(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "%s:%d:warning: ", conf_filename, conf_lineno); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + conf_warnings++; +} + +static void conf_default_message_callback(const char *fmt, va_list ap) +{ + printf("#\n# "); + vprintf(fmt, ap); + printf("\n#\n"); +} + +static void (*conf_message_callback) (const char *fmt, va_list ap) = + conf_default_message_callback; +void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap)) +{ + conf_message_callback = fn; +} + +static void conf_message(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (conf_message_callback) + conf_message_callback(fmt, ap); + va_end(ap); +} + +const char *conf_get_configname(void) +{ + char *name = getenv("KCONFIG_CONFIG"); + + return name ? name : ".config"; +} + +const char *conf_get_autoconfig_name(void) +{ + char *name = getenv("KCONFIG_AUTOCONFIG"); + + return name ? name : "include/config/auto.conf"; +} + +static char *conf_expand_value(const char *in) +{ + struct symbol *sym; + const char *src; + static char res_value[SYMBOL_MAXLENGTH]; + char *dst, name[SYMBOL_MAXLENGTH]; + + res_value[0] = 0; + dst = name; + while ((src = strchr(in, '$'))) { + strncat(res_value, in, src - in); + src++; + dst = name; + while (isalnum(*src) || *src == '_') + *dst++ = *src++; + *dst = 0; + sym = sym_lookup(name, 0); + sym_calc_value(sym); + strcat(res_value, sym_get_string_value(sym)); + in = src; + } + strcat(res_value, in); + + return res_value; +} + +char *conf_get_default_confname(void) +{ + struct stat buf; + static char fullname[PATH_MAX+1]; + char *env, *name; + + name = conf_expand_value(conf_defname); + env = getenv(SRCTREE); + if (env) { + sprintf(fullname, "%s/%s", env, name); + if (!stat(fullname, &buf)) + return fullname; + } + return name; +} + +static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) +{ + char *p2; + + switch (sym->type) { + case S_TRISTATE: + if (p[0] == 'm') { + sym->def[def].tri = mod; + sym->flags |= def_flags; + break; + } + /* fall through */ + case S_BOOLEAN: + if (p[0] == 'y') { + sym->def[def].tri = yes; + sym->flags |= def_flags; + break; + } + if (p[0] == 'n') { + sym->def[def].tri = no; + sym->flags |= def_flags; + break; + } + if (def != S_DEF_AUTO) + conf_warning("symbol value '%s' invalid for %s", + p, sym->name); + return 1; + case S_OTHER: + if (*p != '"') { + for (p2 = p; *p2 && !isspace(*p2); p2++) + ; + sym->type = S_STRING; + goto done; + } + /* fall through */ + case S_STRING: + if (*p++ != '"') + break; + for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) { + if (*p2 == '"') { + *p2 = 0; + break; + } + memmove(p2, p2 + 1, strlen(p2)); + } + if (!p2) { + if (def != S_DEF_AUTO) + conf_warning("invalid string found"); + return 1; + } + /* fall through */ + case S_INT: + case S_HEX: + done: + if (sym_string_valid(sym, p)) { + sym->def[def].val = strdup(p); + sym->flags |= def_flags; + } else { + if (def != S_DEF_AUTO) + conf_warning("symbol value '%s' invalid for %s", + p, sym->name); + return 1; + } + break; + default: + ; + } + return 0; +} + +#define LINE_GROWTH 16 +static int add_byte(int c, char **lineptr, size_t slen, size_t *n) +{ + char *nline; + size_t new_size = slen + 1; + if (new_size > *n) { + new_size += LINE_GROWTH - 1; + new_size *= 2; + nline = realloc(*lineptr, new_size); + if (!nline) + return -1; + + *lineptr = nline; + *n = new_size; + } + + (*lineptr)[slen] = c; + + return 0; +} + +static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream) +{ + char *line = *lineptr; + size_t slen = 0; + + for (;;) { + int c = getc(stream); + + switch (c) { + case '\n': + if (add_byte(c, &line, slen, n) < 0) + goto e_out; + slen++; + /* fall through */ + case EOF: + if (add_byte('\0', &line, slen, n) < 0) + goto e_out; + *lineptr = line; + if (slen == 0) + return -1; + return slen; + default: + if (add_byte(c, &line, slen, n) < 0) + goto e_out; + slen++; + } + } + +e_out: + line[slen-1] = '\0'; + *lineptr = line; + return -1; +} + +int conf_read_simple(const char *name, int def) +{ + FILE *in = NULL; + char *line = NULL; + size_t line_asize = 0; + char *p, *p2; + struct symbol *sym; + int i, def_flags; + + if (name) { + in = zconf_fopen(name); + } else { + struct property *prop; + + name = conf_get_configname(); + in = zconf_fopen(name); + if (in) + goto load; + sym_add_change_count(1); + if (!sym_defconfig_list) { + sym_calc_value(modules_sym); + return 1; + } + + for_all_defaults(sym_defconfig_list, prop) { + if (expr_calc_value(prop->visible.expr) == no || + prop->expr->type != E_SYMBOL) + continue; + name = conf_expand_value(prop->expr->left.sym->name); + in = zconf_fopen(name); + if (in) { + conf_message(_("using defaults found in %s"), + name); + goto load; + } + } + } + if (!in) + return 1; + +load: + conf_filename = name; + conf_lineno = 0; + conf_warnings = 0; + conf_unsaved = 0; + + def_flags = SYMBOL_DEF << def; + for_all_symbols(i, sym) { + sym->flags |= SYMBOL_CHANGED; + sym->flags &= ~(def_flags|SYMBOL_VALID); + if (sym_is_choice(sym)) + sym->flags |= def_flags; + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + if (sym->def[def].val) + free(sym->def[def].val); + /* fall through */ + default: + sym->def[def].val = NULL; + sym->def[def].tri = no; + } + } + + while (compat_getline(&line, &line_asize, in) != -1) { + conf_lineno++; + sym = NULL; + if (line[0] == '#') { + if (memcmp(line + 2, CONFIG_, strlen(CONFIG_))) + continue; + p = strchr(line + 2 + strlen(CONFIG_), ' '); + if (!p) + continue; + *p++ = 0; + if (strncmp(p, "is not set", 10)) + continue; + if (def == S_DEF_USER) { + sym = sym_find(line + 2 + strlen(CONFIG_)); + if (!sym) { + sym_add_change_count(1); + goto setsym; + } + } else { + sym = sym_lookup(line + 2 + strlen(CONFIG_), 0); + if (sym->type == S_UNKNOWN) + sym->type = S_BOOLEAN; + } + if (sym->flags & def_flags) { + conf_warning("override: reassigning to symbol %s", sym->name); + } + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + sym->def[def].tri = no; + sym->flags |= def_flags; + break; + default: + ; + } + } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) { + p = strchr(line + strlen(CONFIG_), '='); + if (!p) + continue; + *p++ = 0; + p2 = strchr(p, '\n'); + if (p2) { + *p2-- = 0; + if (*p2 == '\r') + *p2 = 0; + } + if (def == S_DEF_USER) { + sym = sym_find(line + strlen(CONFIG_)); + if (!sym) { + sym_add_change_count(1); + goto setsym; + } + } else { + sym = sym_lookup(line + strlen(CONFIG_), 0); + if (sym->type == S_UNKNOWN) + sym->type = S_OTHER; + } + if (sym->flags & def_flags) { + conf_warning("override: reassigning to symbol %s", sym->name); + } + if (conf_set_sym_val(sym, def, def_flags, p)) + continue; + } else { + if (line[0] != '\r' && line[0] != '\n') + conf_warning("unexpected data"); + continue; + } +setsym: + if (sym && sym_is_choice_value(sym)) { + struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); + switch (sym->def[def].tri) { + case no: + break; + case mod: + if (cs->def[def].tri == yes) { + conf_warning("%s creates inconsistent choice state", sym->name); + cs->flags &= ~def_flags; + } + break; + case yes: + if (cs->def[def].tri != no) + conf_warning("override: %s changes choice state", sym->name); + cs->def[def].val = sym; + break; + } + cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri); + } + } + free(line); + fclose(in); + sym_calc_value(modules_sym); + return 0; +} + +int conf_read(const char *name) +{ + struct symbol *sym; + int i; + + sym_set_change_count(0); + + if (conf_read_simple(name, S_DEF_USER)) + return 1; + + for_all_symbols(i, sym) { + sym_calc_value(sym); + if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO)) + continue; + if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) { + /* check that calculated value agrees with saved value */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym)) + break; + if (!sym_is_choice(sym)) + continue; + /* fall through */ + default: + if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val)) + continue; + break; + } + } else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE)) + /* no previous value and not saved */ + continue; + conf_unsaved++; + /* maybe print value in verbose mode... */ + } + + for_all_symbols(i, sym) { + if (sym_has_value(sym) && !sym_is_choice_value(sym)) { + /* Reset values of generates values, so they'll appear + * as new, if they should become visible, but that + * doesn't quite work if the Kconfig and the saved + * configuration disagree. + */ + if (sym->visible == no && !conf_unsaved) + sym->flags &= ~SYMBOL_DEF_USER; + switch (sym->type) { + case S_STRING: + case S_INT: + case S_HEX: + /* Reset a string value if it's out of range */ + if (sym_string_within_range(sym, sym->def[S_DEF_USER].val)) + break; + sym->flags &= ~(SYMBOL_VALID|SYMBOL_DEF_USER); + conf_unsaved++; + break; + default: + break; + } + } + } + + sym_add_change_count(conf_warnings || conf_unsaved); + + return 0; +} + +/* + * Kconfig configuration printer + * + * This printer is used when generating the resulting configuration after + * kconfig invocation and `defconfig' files. Unset symbol might be omitted by + * passing a non-NULL argument to the printer. + * + */ +static void +kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (*value == 'n') { + bool skip_unset = (arg != NULL); + + if (!skip_unset) + fprintf(fp, "# %s%s is not set\n", + CONFIG_, sym->name); + return; + } + break; + default: + break; + } + + fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value); +} + +static void +kconfig_print_comment(FILE *fp, const char *value, void *arg) +{ + const char *p = value; + size_t l; + + for (;;) { + l = strcspn(p, "\n"); + fprintf(fp, "#"); + if (l) { + fprintf(fp, " "); + xfwrite(p, l, 1, fp); + p += l; + } + fprintf(fp, "\n"); + if (*p++ == '\0') + break; + } +} + +static struct conf_printer kconfig_printer_cb = +{ + .print_symbol = kconfig_print_symbol, + .print_comment = kconfig_print_comment, +}; + +/* + * Header printer + * + * This printer is used when generating the `include/generated/autoconf.h' file. + */ +static void +header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: { + const char *suffix = ""; + + switch (*value) { + case 'n': + break; + case 'm': + suffix = "_MODULE"; + /* fall through */ + default: + fprintf(fp, "#define %s%s%s 1\n", + CONFIG_, sym->name, suffix); + } + break; + } + case S_HEX: { + const char *prefix = ""; + + if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X')) + prefix = "0x"; + fprintf(fp, "#define %s%s %s%s\n", + CONFIG_, sym->name, prefix, value); + break; + } + case S_STRING: + case S_INT: + fprintf(fp, "#define %s%s %s\n", + CONFIG_, sym->name, value); + break; + default: + break; + } + +} + +static void +header_print_comment(FILE *fp, const char *value, void *arg) +{ + const char *p = value; + size_t l; + + fprintf(fp, "/*\n"); + for (;;) { + l = strcspn(p, "\n"); + fprintf(fp, " *"); + if (l) { + fprintf(fp, " "); + xfwrite(p, l, 1, fp); + p += l; + } + fprintf(fp, "\n"); + if (*p++ == '\0') + break; + } + fprintf(fp, " */\n"); +} + +static struct conf_printer header_printer_cb = +{ + .print_symbol = header_print_symbol, + .print_comment = header_print_comment, +}; + +/* + * Tristate printer + * + * This printer is used when generating the `include/config/tristate.conf' file. + */ +static void +tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + if (sym->type == S_TRISTATE && *value != 'n') + fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value)); +} + +static struct conf_printer tristate_printer_cb = +{ + .print_symbol = tristate_print_symbol, + .print_comment = kconfig_print_comment, +}; + +static void conf_write_symbol(FILE *fp, struct symbol *sym, + struct conf_printer *printer, void *printer_arg) +{ + const char *str; + + switch (sym->type) { + case S_OTHER: + case S_UNKNOWN: + break; + case S_STRING: + str = sym_get_string_value(sym); + str = sym_escape_string_value(str); + printer->print_symbol(fp, sym, str, printer_arg); + free((void *)str); + break; + default: + str = sym_get_string_value(sym); + printer->print_symbol(fp, sym, str, printer_arg); + } +} + +static void +conf_write_heading(FILE *fp, struct conf_printer *printer, void *printer_arg) +{ + char buf[256]; + + snprintf(buf, sizeof(buf), + "\n" + "Automatically generated file; DO NOT EDIT.\n" + "%s\n", + rootmenu.prompt->text); + + printer->print_comment(fp, buf, printer_arg); +} + +/* + * Write out a minimal config. + * All values that has default values are skipped as this is redundant. + */ +int conf_write_defconfig(const char *filename) +{ + struct symbol *sym; + struct menu *menu; + FILE *out; + + out = fopen(filename, "w"); + if (!out) + return 1; + + sym_clear_all_valid(); + + /* Traverse all menus to find all relevant symbols */ + menu = rootmenu.list; + + while (menu != NULL) + { + sym = menu->sym; + if (sym == NULL) { + if (!menu_is_visible(menu)) + goto next_menu; + } else if (!sym_is_choice(sym)) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE)) + goto next_menu; + sym->flags &= ~SYMBOL_WRITE; + /* If we cannot change the symbol - skip */ + if (!sym_is_changable(sym)) + goto next_menu; + /* If symbol equals to default value - skip */ + if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0) + goto next_menu; + + /* + * If symbol is a choice value and equals to the + * default for a choice - skip. + * But only if value is bool and equal to "y" and + * choice is not "optional". + * (If choice is "optional" then all values can be "n") + */ + if (sym_is_choice_value(sym)) { + struct symbol *cs; + struct symbol *ds; + + cs = prop_get_symbol(sym_get_choice_prop(sym)); + ds = sym_choice_default(cs); + if (!sym_is_optional(cs) && sym == ds) { + if ((sym->type == S_BOOLEAN) && + sym_get_tristate_value(sym) == yes) + goto next_menu; + } + } + conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); + } +next_menu: + if (menu->list != NULL) { + menu = menu->list; + } + else if (menu->next != NULL) { + menu = menu->next; + } else { + while ((menu = menu->parent)) { + if (menu->next != NULL) { + menu = menu->next; + break; + } + } + } + } + fclose(out); + return 0; +} + +int conf_write(const char *name) +{ + FILE *out; + struct symbol *sym; + struct menu *menu; + const char *basename; + const char *str; + char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; + char *env; + + dirname[0] = 0; + if (name && name[0]) { + struct stat st; + char *slash; + + if (!stat(name, &st) && S_ISDIR(st.st_mode)) { + strcpy(dirname, name); + strcat(dirname, "/"); + basename = conf_get_configname(); + } else if ((slash = strrchr(name, '/'))) { + int size = slash - name + 1; + memcpy(dirname, name, size); + dirname[size] = 0; + if (slash[1]) + basename = slash + 1; + else + basename = conf_get_configname(); + } else + basename = name; + } else + basename = conf_get_configname(); + + sprintf(newname, "%s%s", dirname, basename); + env = getenv("KCONFIG_OVERWRITECONFIG"); + if (!env || !*env) { + sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid()); + out = fopen(tmpname, "w"); + } else { + *tmpname = 0; + out = fopen(newname, "w"); + } + if (!out) + return 1; + + conf_write_heading(out, &kconfig_printer_cb, NULL); + + if (!conf_get_changed()) + sym_clear_all_valid(); + + menu = rootmenu.list; + while (menu) { + sym = menu->sym; + if (!sym) { + if (!menu_is_visible(menu)) + goto next; + str = menu_get_prompt(menu); + fprintf(out, "\n" + "#\n" + "# %s\n" + "#\n", str); + } else if (!(sym->flags & SYMBOL_CHOICE)) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE)) + goto next; + sym->flags &= ~SYMBOL_WRITE; + + conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); + } + +next: + if (menu->list) { + menu = menu->list; + continue; + } + if (menu->next) + menu = menu->next; + else while ((menu = menu->parent)) { + if (menu->next) { + menu = menu->next; + break; + } + } + } + fclose(out); + + if (*tmpname) { + strcat(dirname, basename); + strcat(dirname, ".old"); + rename(newname, dirname); + if (rename(tmpname, newname)) + return 1; + } + + conf_message(_("configuration written to %s"), newname); + + sym_set_change_count(0); + + return 0; +} + +static int conf_split_config(void) +{ + const char *name; + char path[PATH_MAX+1]; + char *s, *d, c; + struct symbol *sym; + struct stat sb; + int res, i, fd; + + name = conf_get_autoconfig_name(); + conf_read_simple(name, S_DEF_AUTO); + + if (chdir("include/config")) + return 1; + + res = 0; + for_all_symbols(i, sym) { + sym_calc_value(sym); + if ((sym->flags & SYMBOL_AUTO) || !sym->name) + continue; + if (sym->flags & SYMBOL_WRITE) { + if (sym->flags & SYMBOL_DEF_AUTO) { + /* + * symbol has old and new value, + * so compare them... + */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym_get_tristate_value(sym) == + sym->def[S_DEF_AUTO].tri) + continue; + break; + case S_STRING: + case S_HEX: + case S_INT: + if (!strcmp(sym_get_string_value(sym), + sym->def[S_DEF_AUTO].val)) + continue; + break; + default: + break; + } + } else { + /* + * If there is no old value, only 'no' (unset) + * is allowed as new value. + */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym_get_tristate_value(sym) == no) + continue; + break; + default: + break; + } + } + } else if (!(sym->flags & SYMBOL_DEF_AUTO)) + /* There is neither an old nor a new value. */ + continue; + /* else + * There is an old value, but no new value ('no' (unset) + * isn't saved in auto.conf, so the old value is always + * different from 'no'). + */ + + /* Replace all '_' and append ".h" */ + s = sym->name; + d = path; + while ((c = *s++)) { + c = tolower(c); + *d++ = (c == '_') ? '/' : c; + } + strcpy(d, ".h"); + + /* Assume directory path already exists. */ + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (fd == -1) { + if (errno != ENOENT) { + res = 1; + break; + } + /* + * Create directory components, + * unless they exist already. + */ + d = path; + while ((d = strchr(d, '/'))) { + *d = 0; + if (stat(path, &sb) && mkdir(path, 0755)) { + res = 1; + goto out; + } + *d++ = '/'; + } + /* Try it again. */ + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (fd == -1) { + res = 1; + break; + } + } + close(fd); + } +out: + if (chdir("../..")) + return 1; + + return res; +} + +int conf_write_autoconf(void) +{ + struct symbol *sym; + const char *name; + FILE *out, *tristate, *out_h; + int i; + + sym_clear_all_valid(); + + file_write_dep("include/config/auto.conf.cmd"); + + if (conf_split_config()) + return 1; + + out = fopen(".tmpconfig", "w"); + if (!out) + return 1; + + tristate = fopen(".tmpconfig_tristate", "w"); + if (!tristate) { + fclose(out); + return 1; + } + + out_h = fopen(".tmpconfig.h", "w"); + if (!out_h) { + fclose(out); + fclose(tristate); + return 1; + } + + conf_write_heading(out, &kconfig_printer_cb, NULL); + + conf_write_heading(tristate, &tristate_printer_cb, NULL); + + conf_write_heading(out_h, &header_printer_cb, NULL); + + for_all_symbols(i, sym) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE) || !sym->name) + continue; + + /* write symbol to auto.conf, tristate and header files */ + conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1); + + conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1); + + conf_write_symbol(out_h, sym, &header_printer_cb, NULL); + } + fclose(out); + fclose(tristate); + fclose(out_h); + + name = getenv("KCONFIG_AUTOHEADER"); + if (!name) + name = "include/generated/autoconf.h"; + if (rename(".tmpconfig.h", name)) + return 1; + name = getenv("KCONFIG_TRISTATE"); + if (!name) + name = "include/config/tristate.conf"; + if (rename(".tmpconfig_tristate", name)) + return 1; + name = conf_get_autoconfig_name(); + /* + * This must be the last step, kbuild has a dependency on auto.conf + * and this marks the successful completion of the previous steps. + */ + if (rename(".tmpconfig", name)) + return 1; + + return 0; +} + +static int sym_change_count; +static void (*conf_changed_callback)(void); + +void sym_set_change_count(int count) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:24:11 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqJ-0005wv-3y; Wed, 23 Dec 2015 06:24:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqH-0005wm-CM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:09 +0000 Received: from [85.158.139.211] by server-9.bemta-5.messagelabs.com id 6A/52-30270-80E3A765; Wed, 23 Dec 2015 06:24:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1450851843!12379269!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36560 invoked from network); 23 Dec 2015 06:24: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; 23 Dec 2015 06:24:04 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqB-0000nn-6u for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:03 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqA-00076B-QQ for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:03 +0000 Date: Wed, 23 Dec 2015 06:24:02 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: import Kbuild/Kconfig from Linux 4.3 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8c271b7584ed7feff57e5b3ffd01746e7b03c8ae Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:25:15 2015 +0100 build: import Kbuild/Kconfig from Linux 4.3 Import the following files and directories from the Linux v4.3 tag / commit id 6a13feb9c82803e2b815eca72fa7a9f5561d7861. - scripts/kconfig -> xen/tools/kconfig - Documentation/kbuild/kconfig{,-language}.txt -> docs/misc/kconfig{-language}.txt - scripts/Makefile.host -> xen/tools/kconfig/Makefile.host These files are currently unused but will be used shortly. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- docs/misc/kconfig-language.txt | 395 ++++ docs/misc/kconfig.txt | 237 +++ xen/tools/kconfig/.gitignore | 22 + xen/tools/kconfig/Makefile | 317 ++++ xen/tools/kconfig/Makefile.host | 128 ++ xen/tools/kconfig/POTFILES.in | 12 + xen/tools/kconfig/check.sh | 13 + xen/tools/kconfig/conf.c | 722 +++++++ xen/tools/kconfig/confdata.c | 1245 +++++++++++++ xen/tools/kconfig/expr.c | 1206 ++++++++++++ xen/tools/kconfig/expr.h | 238 +++ xen/tools/kconfig/gconf.c | 1521 +++++++++++++++ xen/tools/kconfig/gconf.glade | 661 +++++++ xen/tools/kconfig/images.c | 326 ++++ xen/tools/kconfig/kxgettext.c | 235 +++ xen/tools/kconfig/list.h | 131 ++ xen/tools/kconfig/lkc.h | 186 ++ xen/tools/kconfig/lkc_proto.h | 52 + xen/tools/kconfig/lxdialog/.gitignore | 4 + xen/tools/kconfig/lxdialog/BIG.FAT.WARNING | 4 + xen/tools/kconfig/lxdialog/check-lxdialog.sh | 91 + xen/tools/kconfig/lxdialog/checklist.c | 332 ++++ xen/tools/kconfig/lxdialog/dialog.h | 257 +++ xen/tools/kconfig/lxdialog/inputbox.c | 301 +++ xen/tools/kconfig/lxdialog/menubox.c | 437 +++++ xen/tools/kconfig/lxdialog/textbox.c | 408 ++++ xen/tools/kconfig/lxdialog/util.c | 713 +++++++ xen/tools/kconfig/lxdialog/yesno.c | 114 ++ xen/tools/kconfig/mconf.c | 1047 +++++++++++ xen/tools/kconfig/menu.c | 697 +++++++ xen/tools/kconfig/merge_config.sh | 162 ++ xen/tools/kconfig/nconf.c | 1561 ++++++++++++++++ xen/tools/kconfig/nconf.gui.c | 656 +++++++ xen/tools/kconfig/nconf.h | 96 + xen/tools/kconfig/qconf.cc | 1798 ++++++++++++++++++ xen/tools/kconfig/qconf.h | 338 ++++ xen/tools/kconfig/streamline_config.pl | 647 +++++++ xen/tools/kconfig/symbol.c | 1376 ++++++++++++++ xen/tools/kconfig/util.c | 147 ++ xen/tools/kconfig/zconf.gperf | 49 + xen/tools/kconfig/zconf.hash.c_shipped | 293 +++ xen/tools/kconfig/zconf.l | 374 ++++ xen/tools/kconfig/zconf.lex.c_shipped | 2473 ++++++++++++++++++++++++ xen/tools/kconfig/zconf.tab.c_shipped | 2580 ++++++++++++++++++++++++++ xen/tools/kconfig/zconf.y | 742 ++++++++ 45 files changed, 25344 insertions(+), 0 deletions(-) diff --git a/docs/misc/kconfig-language.txt b/docs/misc/kconfig-language.txt new file mode 100644 index 0000000..350f733 --- /dev/null +++ b/docs/misc/kconfig-language.txt @@ -0,0 +1,395 @@ +Introduction +------------ + +The configuration database is a collection of configuration options +organized in a tree structure: + + +- Code maturity level options + | +- Prompt for development and/or incomplete code/drivers + +- General setup + | +- Networking support + | +- System V IPC + | +- BSD Process Accounting + | +- Sysctl support + +- Loadable module support + | +- Enable loadable module support + | +- Set version information on all module symbols + | +- Kernel module loader + +- ... + +Every entry has its own dependencies. These dependencies are used +to determine the visibility of an entry. Any child entry is only +visible if its parent entry is also visible. + +Menu entries +------------ + +Most entries define a config option; all other entries help to organize +them. A single configuration option is defined like this: + +config MODVERSIONS + bool "Set version information on all module symbols" + depends on MODULES + help + Usually, modules have to be recompiled whenever you switch to a new + kernel. ... + +Every line starts with a key word and can be followed by multiple +arguments. "config" starts a new config entry. The following lines +define attributes for this config option. Attributes can be the type of +the config option, input prompt, dependencies, help text and default +values. A config option can be defined multiple times with the same +name, but every definition can have only a single input prompt and the +type must not conflict. + +Menu attributes +--------------- + +A menu entry can have a number of attributes. Not all of them are +applicable everywhere (see syntax). + +- type definition: "bool"/"tristate"/"string"/"hex"/"int" + Every config option must have a type. There are only two basic types: + tristate and string; the other types are based on these two. The type + definition optionally accepts an input prompt, so these two examples + are equivalent: + + bool "Networking support" + and + bool + prompt "Networking support" + +- input prompt: "prompt" ["if" ] + Every menu entry can have at most one prompt, which is used to display + to the user. Optionally dependencies only for this prompt can be added + with "if". + +- default value: "default" ["if" ] + A config option can have any number of default values. If multiple + default values are visible, only the first defined one is active. + Default values are not limited to the menu entry where they are + defined. This means the default can be defined somewhere else or be + overridden by an earlier definition. + The default value is only assigned to the config symbol if no other + value was set by the user (via the input prompt above). If an input + prompt is visible the default value is presented to the user and can + be overridden by him. + Optionally, dependencies only for this default value can be added with + "if". + +- type definition + default value: + "def_bool"/"def_tristate" ["if" ] + This is a shorthand notation for a type definition plus a value. + Optionally dependencies for this default value can be added with "if". + +- dependencies: "depends on" + This defines a dependency for this menu entry. If multiple + dependencies are defined, they are connected with '&&'. Dependencies + are applied to all other options within this menu entry (which also + accept an "if" expression), so these two examples are equivalent: + + bool "foo" if BAR + default y if BAR + and + depends on BAR + bool "foo" + default y + +- reverse dependencies: "select" ["if" ] + While normal dependencies reduce the upper limit of a symbol (see + below), reverse dependencies can be used to force a lower limit of + another symbol. The value of the current menu symbol is used as the + minimal value can be set to. If is selected multiple + times, the limit is set to the largest selection. + Reverse dependencies can only be used with boolean or tristate + symbols. + Note: + select should be used with care. select will force + a symbol to a value without visiting the dependencies. + By abusing select you are able to select a symbol FOO even + if FOO depends on BAR that is not set. + In general use select only for non-visible symbols + (no prompts anywhere) and for symbols with no dependencies. + That will limit the usefulness but on the other hand avoid + the illegal configurations all over. + +- limiting menu display: "visible if" + This attribute is only applicable to menu blocks, if the condition is + false, the menu block is not displayed to the user (the symbols + contained there can still be selected by other symbols, though). It is + similar to a conditional "prompt" attribute for individual menu + entries. Default value of "visible" is true. + +- numerical ranges: "range" ["if" ] + This allows to limit the range of possible input values for int + and hex symbols. The user can only input a value which is larger than + or equal to the first symbol and smaller than or equal to the second + symbol. + +- help text: "help" or "---help---" + This defines a help text. The end of the help text is determined by + the indentation level, this means it ends at the first line which has + a smaller indentation than the first line of the help text. + "---help---" and "help" do not differ in behaviour, "---help---" is + used to help visually separate configuration logic from help within + the file as an aid to developers. + +- misc options: "option" [=] + Various less common options can be defined via this option syntax, + which can modify the behaviour of the menu entry and its config + symbol. These options are currently possible: + + - "defconfig_list" + This declares a list of default entries which can be used when + looking for the default configuration (which is used when the main + .config doesn't exists yet.) + + - "modules" + This declares the symbol to be used as the MODULES symbol, which + enables the third modular state for all config symbols. + At most one symbol may have the "modules" option set. + + - "env"= + This imports the environment variable into Kconfig. It behaves like + a default, except that the value comes from the environment, this + also means that the behaviour when mixing it with normal defaults is + undefined at this point. The symbol is currently not exported back + to the build environment (if this is desired, it can be done via + another symbol). + + - "allnoconfig_y" + This declares the symbol as one that should have the value y when + using "allnoconfig". Used for symbols that hide other symbols. + +Menu dependencies +----------------- + +Dependencies define the visibility of a menu entry and can also reduce +the input range of tristate symbols. The tristate logic used in the +expressions uses one more state than normal boolean logic to express the +module state. Dependency expressions have the following syntax: + + ::= (1) + '=' (2) + '!=' (3) + '(' ')' (4) + '!' (5) + '&&' (6) + '||' (7) + +Expressions are listed in decreasing order of precedence. + +(1) Convert the symbol into an expression. Boolean and tristate symbols + are simply converted into the respective expression values. All + other symbol types result in 'n'. +(2) If the values of both symbols are equal, it returns 'y', + otherwise 'n'. +(3) If the values of both symbols are equal, it returns 'n', + otherwise 'y'. +(4) Returns the value of the expression. Used to override precedence. +(5) Returns the result of (2-/expr/). +(6) Returns the result of min(/expr/, /expr/). +(7) Returns the result of max(/expr/, /expr/). + +An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2 +respectively for calculations). A menu entry becomes visible when its +expression evaluates to 'm' or 'y'. + +There are two types of symbols: constant and non-constant symbols. +Non-constant symbols are the most common ones and are defined with the +'config' statement. Non-constant symbols consist entirely of alphanumeric +characters or underscores. +Constant symbols are only part of expressions. Constant symbols are +always surrounded by single or double quotes. Within the quote, any +other character is allowed and the quotes can be escaped using '\'. + +Menu structure +-------------- + +The position of a menu entry in the tree is determined in two ways. First +it can be specified explicitly: + +menu "Network device support" + depends on NET + +config NETDEVICES + ... + +endmenu + +All entries within the "menu" ... "endmenu" block become a submenu of +"Network device support". All subentries inherit the dependencies from +the menu entry, e.g. this means the dependency "NET" is added to the +dependency list of the config option NETDEVICES. + +The other way to generate the menu structure is done by analyzing the +dependencies. If a menu entry somehow depends on the previous entry, it +can be made a submenu of it. First, the previous (parent) symbol must +be part of the dependency list and then one of these two conditions +must be true: +- the child entry must become invisible, if the parent is set to 'n' +- the child entry must only be visible, if the parent is visible + +config MODULES + bool "Enable loadable module support" + +config MODVERSIONS + bool "Set version information on all module symbols" + depends on MODULES + +comment "module support disabled" + depends on !MODULES + +MODVERSIONS directly depends on MODULES, this means it's only visible if +MODULES is different from 'n'. The comment on the other hand is always +visible when MODULES is visible (the (empty) dependency of MODULES is +also part of the comment dependencies). + + +Kconfig syntax +-------------- + +The configuration file describes a series of menu entries, where every +line starts with a keyword (except help texts). The following keywords +end a menu entry: +- config +- menuconfig +- choice/endchoice +- comment +- menu/endmenu +- if/endif +- source +The first five also start the definition of a menu entry. + +config: + + "config" + + +This defines a config symbol and accepts any of above +attributes as options. + +menuconfig: + "menuconfig" + + +This is similar to the simple config entry above, but it also gives a +hint to front ends, that all suboptions should be displayed as a +separate list of options. + +choices: + + "choice" [symbol] + + + "endchoice" + +This defines a choice group and accepts any of the above attributes as +options. A choice can only be of type bool or tristate, while a boolean +choice only allows a single config entry to be selected, a tristate +choice also allows any number of config entries to be set to 'm'. This +can be used if multiple drivers for a single hardware exists and only a +single driver can be compiled/loaded into the kernel, but all drivers +can be compiled as modules. +A choice accepts another option "optional", which allows to set the +choice to 'n' and no entry needs to be selected. +If no [symbol] is associated with a choice, then you can not have multiple +definitions of that choice. If a [symbol] is associated to the choice, +then you may define the same choice (ie. with the same entries) in another +place. + +comment: + + "comment" + + +This defines a comment which is displayed to the user during the +configuration process and is also echoed to the output files. The only +possible options are dependencies. + +menu: + + "menu" + + + "endmenu" + +This defines a menu block, see "Menu structure" above for more +information. The only possible options are dependencies and "visible" +attributes. + +if: + + "if" + + "endif" + +This defines an if block. The dependency expression is appended +to all enclosed menu entries. + +source: + + "source" + +This reads the specified configuration file. This file is always parsed. + +mainmenu: + + "mainmenu" + +This sets the config program's title bar if the config program chooses +to use it. It should be placed at the top of the configuration, before any +other statement. + + +Kconfig hints +------------- +This is a collection of Kconfig tips, most of which aren't obvious at +first glance and most of which have become idioms in several Kconfig +files. + +Adding common features and make the usage configurable +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +It is a common idiom to implement a feature/functionality that are +relevant for some architectures but not all. +The recommended way to do so is to use a config variable named HAVE_* +that is defined in a common Kconfig file and selected by the relevant +architectures. +An example is the generic IOMAP functionality. + +We would in lib/Kconfig see: + +# Generic IOMAP is used to ... +config HAVE_GENERIC_IOMAP + +config GENERIC_IOMAP + depends on HAVE_GENERIC_IOMAP && FOO + +And in lib/Makefile we would see: +obj-$(CONFIG_GENERIC_IOMAP) += iomap.o + +For each architecture using the generic IOMAP functionality we would see: + +config X86 + select ... + select HAVE_GENERIC_IOMAP + select ... + +Note: we use the existing config option and avoid creating a new +config variable to select HAVE_GENERIC_IOMAP. + +Note: the use of the internal config variable HAVE_GENERIC_IOMAP, it is +introduced to overcome the limitation of select which will force a +config option to 'y' no matter the dependencies. +The dependencies are moved to the symbol GENERIC_IOMAP and we avoid the +situation where select forces a symbol equals to 'y'. + +Build as module only +~~~~~~~~~~~~~~~~~~~~ +To restrict a component build to module-only, qualify its config symbol +with "depends on m". E.g.: + +config FOO + depends on BAR && m + +limits FOO to module (=m) or disabled (=n). diff --git a/docs/misc/kconfig.txt b/docs/misc/kconfig.txt new file mode 100644 index 0000000..bbc99c0 --- /dev/null +++ b/docs/misc/kconfig.txt @@ -0,0 +1,237 @@ +This file contains some assistance for using "make *config". + +Use "make help" to list all of the possible configuration targets. + +The xconfig ('qconf') and menuconfig ('mconf') programs also +have embedded help text. Be sure to check it for navigation, +search, and other general help text. + +====================================================================== +General +-------------------------------------------------- + +New kernel releases often introduce new config symbols. Often more +important, new kernel releases may rename config symbols. When +this happens, using a previously working .config file and running +"make oldconfig" won't necessarily produce a working new kernel +for you, so you may find that you need to see what NEW kernel +symbols have been introduced. + +To see a list of new config symbols when using "make oldconfig", use + + cp user/some/old.config .config + make listnewconfig + +and the config program will list any new symbols, one per line. + + scripts/diffconfig .config.old .config | less + +______________________________________________________________________ +Environment variables for '*config' + +KCONFIG_CONFIG +-------------------------------------------------- +This environment variable can be used to specify a default kernel config +file name to override the default name of ".config". + +KCONFIG_OVERWRITECONFIG +-------------------------------------------------- +If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not +break symlinks when .config is a symlink to somewhere else. + +CONFIG_ +-------------------------------------------------- +If you set CONFIG_ in the environment, Kconfig will prefix all symbols +with its value when saving the configuration, instead of using the default, +"CONFIG_". + +______________________________________________________________________ +Environment variables for '{allyes/allmod/allno/rand}config' + +KCONFIG_ALLCONFIG +-------------------------------------------------- +(partially based on lkml email from/by Rob Landley, re: miniconfig) +-------------------------------------------------- +The allyesconfig/allmodconfig/allnoconfig/randconfig variants can also +use the environment variable KCONFIG_ALLCONFIG as a flag or a filename +that contains config symbols that the user requires to be set to a +specific value. If KCONFIG_ALLCONFIG is used without a filename where +KCONFIG_ALLCONFIG == "" or KCONFIG_ALLCONFIG == "1", "make *config" +checks for a file named "all{yes/mod/no/def/random}.config" +(corresponding to the *config command that was used) for symbol values +that are to be forced. If this file is not found, it checks for a +file named "all.config" to contain forced values. + +This enables you to create "miniature" config (miniconfig) or custom +config files containing just the config symbols that you are interested +in. Then the kernel config system generates the full .config file, +including symbols of your miniconfig file. + +This 'KCONFIG_ALLCONFIG' file is a config file which contains +(usually a subset of all) preset config symbols. These variable +settings are still subject to normal dependency checks. + +Examples: + KCONFIG_ALLCONFIG=custom-notebook.config make allnoconfig +or + KCONFIG_ALLCONFIG=mini.config make allnoconfig +or + make KCONFIG_ALLCONFIG=mini.config allnoconfig + +These examples will disable most options (allnoconfig) but enable or +disable the options that are explicitly listed in the specified +mini-config files. + +______________________________________________________________________ +Environment variables for 'randconfig' + +KCONFIG_SEED +-------------------------------------------------- +You can set this to the integer value used to seed the RNG, if you want +to somehow debug the behaviour of the kconfig parser/frontends. +If not set, the current time will be used. + +KCONFIG_PROBABILITY +-------------------------------------------------- +This variable can be used to skew the probabilities. This variable can +be unset or empty, or set to three different formats: + KCONFIG_PROBABILITY y:n split y:m:n split + ----------------------------------------------------------------- + unset or empty 50 : 50 33 : 33 : 34 + N N : 100-N N/2 : N/2 : 100-N + [1] N:M N+M : 100-(N+M) N : M : 100-(N+M) + [2] N:M:L N : 100-N M : L : 100-(M+L) + +where N, M and L are integers (in base 10) in the range [0,100], and so +that: + [1] N+M is in the range [0,100] + [2] M+L is in the range [0,100] + +Examples: + KCONFIG_PROBABILITY=10 + 10% of booleans will be set to 'y', 90% to 'n' + 5% of tristates will be set to 'y', 5% to 'm', 90% to 'n' + KCONFIG_PROBABILITY=15:25 + 40% of booleans will be set to 'y', 60% to 'n' + 15% of tristates will be set to 'y', 25% to 'm', 60% to 'n' + KCONFIG_PROBABILITY=10:15:15 + 10% of booleans will be set to 'y', 90% to 'n' + 15% of tristates will be set to 'y', 15% to 'm', 70% to 'n' + +______________________________________________________________________ +Environment variables for 'silentoldconfig' + +KCONFIG_NOSILENTUPDATE +-------------------------------------------------- +If this variable has a non-blank value, it prevents silent kernel +config updates (requires explicit updates). + +KCONFIG_AUTOCONFIG +-------------------------------------------------- +This environment variable can be set to specify the path & name of the +"auto.conf" file. Its default value is "include/config/auto.conf". + +KCONFIG_TRISTATE +-------------------------------------------------- +This environment variable can be set to specify the path & name of the +"tristate.conf" file. Its default value is "include/config/tristate.conf". + +KCONFIG_AUTOHEADER +-------------------------------------------------- +This environment variable can be set to specify the path & name of the +"autoconf.h" (header) file. +Its default value is "include/generated/autoconf.h". + + +====================================================================== +menuconfig +-------------------------------------------------- + +SEARCHING for CONFIG symbols + +Searching in menuconfig: + + The Search function searches for kernel configuration symbol + names, so you have to know something close to what you are + looking for. + + Example: + /hotplug + This lists all config symbols that contain "hotplug", + e.g., HOTPLUG_CPU, MEMORY_HOTPLUG. + + For search help, enter / followed TAB-TAB-TAB (to highlight + ) and Enter. This will tell you that you can also use + regular expressions (regexes) in the search string, so if you + are not interested in MEMORY_HOTPLUG, you could try + + /^hotplug + + When searching, symbols are sorted thus: + - first, exact matches, sorted alphabetically (an exact match + is when the search matches the complete symbol name); + - then, other matches, sorted alphabetically. + For example: ^ATH.K matches: + ATH5K ATH9K ATH5K_AHB ATH5K_DEBUG [...] ATH6KL ATH6KL_DEBUG + [...] ATH9K_AHB ATH9K_BTCOEX_SUPPORT ATH9K_COMMON [...] + of which only ATH5K and ATH9K match exactly and so are sorted + first (and in alphabetical order), then come all other symbols, + sorted in alphabetical order. + +______________________________________________________________________ +User interface options for 'menuconfig' + +MENUCONFIG_COLOR +-------------------------------------------------- +It is possible to select different color themes using the variable +MENUCONFIG_COLOR. To select a theme use: + + make MENUCONFIG_COLOR= menuconfig + +Available themes are: + mono => selects colors suitable for monochrome displays + blackbg => selects a color scheme with black background + classic => theme with blue background. The classic look + bluetitle => a LCD friendly version of classic. (default) + +MENUCONFIG_MODE +-------------------------------------------------- +This mode shows all sub-menus in one large tree. + +Example: + make MENUCONFIG_MODE=single_menu menuconfig + + +====================================================================== +xconfig +-------------------------------------------------- + +Searching in xconfig: + + The Search function searches for kernel configuration symbol + names, so you have to know something close to what you are + looking for. + + Example: + Ctrl-F hotplug + or + Menu: File, Search, hotplug + + lists all config symbol entries that contain "hotplug" in + the symbol name. In this Search dialog, you may change the + config setting for any of the entries that are not grayed out. + You can also enter a different search string without having + to return to the main menu. + + +====================================================================== +gconfig +-------------------------------------------------- + +Searching in gconfig: + + None (gconfig isn't maintained as well as xconfig or menuconfig); + however, gconfig does have a few more viewing choices than + xconfig does. + +### diff --git a/xen/tools/kconfig/.gitignore b/xen/tools/kconfig/.gitignore new file mode 100644 index 0000000..be603c4 --- /dev/null +++ b/xen/tools/kconfig/.gitignore @@ -0,0 +1,22 @@ +# +# Generated files +# +config* +*.lex.c +*.tab.c +*.tab.h +zconf.hash.c +*.moc +gconf.glade.h +*.pot +*.mo + +# +# configuration programs +# +conf +mconf +nconf +qconf +gconf +kxgettext diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile new file mode 100644 index 0000000..aceaaed --- /dev/null +++ b/xen/tools/kconfig/Makefile @@ -0,0 +1,317 @@ +# =========================================================================== +# Kernel configuration targets +# These targets are used from top-level makefile + +PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \ + localmodconfig localyesconfig + +ifdef KBUILD_KCONFIG +Kconfig := $(KBUILD_KCONFIG) +else +Kconfig := Kconfig +endif + +ifeq ($(quiet),silent_) +silent := -s +endif + +# We need this, in case the user has it in its environment +unexport CONFIG_ + +xconfig: $(obj)/qconf + $< $(silent) $(Kconfig) + +gconfig: $(obj)/gconf + $< $(silent) $(Kconfig) + +menuconfig: $(obj)/mconf + $< $(silent) $(Kconfig) + +config: $(obj)/conf + $< $(silent) --oldaskconfig $(Kconfig) + +nconfig: $(obj)/nconf + $< $(silent) $(Kconfig) + +silentoldconfig: $(obj)/conf + $(Q)mkdir -p include/config include/generated + $< $(silent) --$@ $(Kconfig) + +localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf + $(Q)mkdir -p include/config include/generated + $(Q)perl $< --$@ $(srctree) $(Kconfig) > .tmp.config + $(Q)if [ -f .config ]; then \ + cmp -s .tmp.config .config || \ + (mv -f .config .config.old.1; \ + mv -f .tmp.config .config; \ + $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \ + mv -f .config.old.1 .config.old) \ + else \ + mv -f .tmp.config .config; \ + $(obj)/conf $(silent) --silentoldconfig $(Kconfig); \ + fi + $(Q)rm -f .tmp.config + +# Create new linux.pot file +# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files +update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h + $(Q)$(kecho) " GEN config.pot" + $(Q)xgettext --default-domain=linux \ + --add-comments --keyword=_ --keyword=N_ \ + --from-code=UTF-8 \ + --files-from=$(srctree)/scripts/kconfig/POTFILES.in \ + --directory=$(srctree) --directory=$(objtree) \ + --output $(obj)/config.pot + $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot + $(Q)(for i in `ls $(srctree)/arch/*/Kconfig \ + $(srctree)/arch/*/um/Kconfig`; \ + do \ + $(kecho) " GEN $$i"; \ + $(obj)/kxgettext $$i \ + >> $(obj)/config.pot; \ + done ) + $(Q)$(kecho) " GEN linux.pot" + $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ + --output $(obj)/linux.pot + $(Q)rm -f $(obj)/config.pot + +# These targets map 1:1 to the commandline options of 'conf' +simple-targets := oldconfig allnoconfig allyesconfig allmodconfig \ + alldefconfig randconfig listnewconfig olddefconfig +PHONY += $(simple-targets) + +$(simple-targets): $(obj)/conf + $< $(silent) --$@ $(Kconfig) + +PHONY += oldnoconfig savedefconfig defconfig + +# oldnoconfig is an alias of olddefconfig, because people already are dependent +# on its behavior (sets new symbols to their default value but not 'n') with the +# counter-intuitive name. +oldnoconfig: olddefconfig + +savedefconfig: $(obj)/conf + $< $(silent) --$@=defconfig $(Kconfig) + +defconfig: $(obj)/conf +ifeq ($(KBUILD_DEFCONFIG),) + $< $(silent) --defconfig $(Kconfig) +else + @$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" + $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig) +endif + +%_defconfig: $(obj)/conf + $(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig) + +configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/configs/$@) + +%.config: $(obj)/conf + $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles) + +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig + +PHONY += kvmconfig +kvmconfig: kvm_guest.config + @: + +PHONY += xenconfig +xenconfig: xen.config + @: + +PHONY += tinyconfig +tinyconfig: + $(Q)$(MAKE) -f $(srctree)/Makefile allnoconfig tiny.config + +# Help text used by make help +help: + @echo ' config - Update current config utilising a line-oriented program' + @echo ' nconfig - Update current config utilising a ncurses menu based' + @echo ' program' + @echo ' menuconfig - Update current config utilising a menu based program' + @echo ' xconfig - Update current config utilising a Qt based front-end' + @echo ' gconfig - Update current config utilising a GTK+ based front-end' + @echo ' oldconfig - Update current config utilising a provided .config as base' + @echo ' localmodconfig - Update current config disabling modules not loaded' + @echo ' localyesconfig - Update current config converting local mods to core' + @echo ' silentoldconfig - Same as oldconfig, but quietly, additionally update deps' + @echo ' defconfig - New config with default from ARCH supplied defconfig' + @echo ' savedefconfig - Save current config as ./defconfig (minimal config)' + @echo ' allnoconfig - New config where all options are answered with no' + @echo ' allyesconfig - New config where all options are accepted with yes' + @echo ' allmodconfig - New config selecting modules when possible' + @echo ' alldefconfig - New config with all symbols set to default' + @echo ' randconfig - New config with random answer to all options' + @echo ' listnewconfig - List new options' + @echo ' olddefconfig - Same as silentoldconfig but sets new symbols to their' + @echo ' default value' + @echo ' kvmconfig - Enable additional options for kvm guest kernel support' + @echo ' xenconfig - Enable additional options for xen dom0 and guest kernel support' + @echo ' tinyconfig - Configure the tiniest possible kernel' + +# lxdialog stuff +check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh + +# Use recursively expanded variables so we do not call gcc unless +# we really need to do so. (Do not call gcc as part of make mrproper) +HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ + -DLOCALE + +# =========================================================================== +# Shared Makefile for the various kconfig executables: +# conf: Used for defconfig, oldconfig and related targets +# nconf: Used for the nconfig target. +# Utilizes ncurses +# mconf: Used for the menuconfig target +# Utilizes the lxdialog package +# qconf: Used for the xconfig target +# Based on Qt which needs to be installed to compile it +# gconf: Used for the gconfig target +# Based on GTK+ which needs to be installed to compile it +# object files used by all kconfig flavours + +lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o +lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o + +conf-objs := conf.o zconf.tab.o +mconf-objs := mconf.o zconf.tab.o $(lxdialog) +nconf-objs := nconf.o zconf.tab.o nconf.gui.o +kxgettext-objs := kxgettext.o zconf.tab.o +qconf-cxxobjs := qconf.o +qconf-objs := zconf.tab.o +gconf-objs := gconf.o zconf.tab.o + +hostprogs-y := conf nconf mconf kxgettext qconf gconf + +clean-files := qconf.moc .tmp_qtcheck .tmp_gtkcheck +clean-files += zconf.tab.c zconf.lex.c zconf.hash.c gconf.glade.h +clean-files += config.pot linux.pot + +# Check that we have the required ncurses stuff installed for lxdialog (menuconfig) +PHONY += $(obj)/dochecklxdialog +$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog +$(obj)/dochecklxdialog: + $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf) + +always := dochecklxdialog + +# Add environment specific flags +HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS)) + +# generated files seem to need this to find local include files +HOSTCFLAGS_zconf.lex.o := -I$(src) +HOSTCFLAGS_zconf.tab.o := -I$(src) + +LEX_PREFIX_zconf := zconf +YACC_PREFIX_zconf := zconf + +HOSTLOADLIBES_qconf = $(KC_QT_LIBS) +HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) + +HOSTLOADLIBES_gconf = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` +HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \ + -Wno-missing-prototypes + +HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC)) + +HOSTLOADLIBES_nconf = $(shell \ + pkg-config --libs menuw panelw ncursesw 2>/dev/null \ + || pkg-config --libs menu panel ncurses 2>/dev/null \ + || echo "-lmenu -lpanel -lncurses" ) +$(obj)/qconf.o: $(obj)/.tmp_qtcheck + +ifeq ($(MAKECMDGOALS),xconfig) +$(obj)/.tmp_qtcheck: $(src)/Makefile +-include $(obj)/.tmp_qtcheck + +# Qt needs some extra effort... +$(obj)/.tmp_qtcheck: + @set -e; $(kecho) " CHECK qt"; dir=""; pkg=""; \ + if ! pkg-config --exists QtCore 2> /dev/null; then \ + echo "* Unable to find the Qt4 tool qmake. Trying to use Qt3"; \ + pkg-config --exists qt 2> /dev/null && pkg=qt; \ + pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \ + if [ -n "$$pkg" ]; then \ + cflags="\$$(shell pkg-config $$pkg --cflags)"; \ + libs="\$$(shell pkg-config $$pkg --libs)"; \ + moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \ + dir="$$(pkg-config $$pkg --variable=prefix)"; \ + else \ + for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \ + if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \ + done; \ + if [ -z "$$dir" ]; then \ + echo >&2 "*"; \ + echo >&2 "* Unable to find any Qt installation. Please make sure that"; \ + echo >&2 "* the Qt4 or Qt3 development package is correctly installed and"; \ + echo >&2 "* either qmake can be found or install pkg-config or set"; \ + echo >&2 "* the QTDIR environment variable to the correct location."; \ + echo >&2 "*"; \ + false; \ + fi; \ + libpath=$$dir/lib; lib=qt; osdir=""; \ + $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \ + osdir=x$$($(HOSTCXX) -print-multi-os-directory); \ + test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \ + test -f $$libpath/libqt-mt.so && lib=qt-mt; \ + cflags="-I$$dir/include"; \ + libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \ + moc="$$dir/bin/moc"; \ + fi; \ + if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \ + echo "*"; \ + echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \ + echo "*"; \ + moc="/usr/bin/moc"; \ + fi; \ + else \ + cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \ + libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \ + moc="\$$(shell pkg-config QtCore --variable=moc_location)"; \ + [ -n "$$moc" ] || moc="\$$(shell pkg-config QtCore --variable=prefix)/bin/moc"; \ + fi; \ + echo "KC_QT_CFLAGS=$$cflags" > $@; \ + echo "KC_QT_LIBS=$$libs" >> $@; \ + echo "KC_QT_MOC=$$moc" >> $@ +endif + +$(obj)/gconf.o: $(obj)/.tmp_gtkcheck + +ifeq ($(MAKECMDGOALS),gconfig) +-include $(obj)/.tmp_gtkcheck + +# GTK+ needs some extra effort, too... +$(obj)/.tmp_gtkcheck: + @if `pkg-config --exists gtk+-2.0 gmodule-2.0 libglade-2.0`; then \ + if `pkg-config --atleast-version=2.0.0 gtk+-2.0`; then \ + touch $@; \ + else \ + echo >&2 "*"; \ + echo >&2 "* GTK+ is present but version >= 2.0.0 is required."; \ + echo >&2 "*"; \ + false; \ + fi \ + else \ + echo >&2 "*"; \ + echo >&2 "* Unable to find the GTK+ installation. Please make sure that"; \ + echo >&2 "* the GTK+ 2.0 development package is correctly installed..."; \ + echo >&2 "* You need gtk+-2.0, glib-2.0 and libglade-2.0."; \ + echo >&2 "*"; \ + false; \ + fi +endif + +$(obj)/zconf.tab.o: $(obj)/zconf.lex.c $(obj)/zconf.hash.c + +$(obj)/qconf.o: $(obj)/qconf.moc + +quiet_cmd_moc = MOC $@ + cmd_moc = $(KC_QT_MOC) -i $< -o $@ + +$(obj)/%.moc: $(src)/%.h $(obj)/.tmp_qtcheck + $(call cmd,moc) + +# Extract gconf menu items for i18n support +$(obj)/gconf.glade.h: $(obj)/gconf.glade + $(Q)intltool-extract --type=gettext/glade --srcdir=$(srctree) \ + $(obj)/gconf.glade diff --git a/xen/tools/kconfig/Makefile.host b/xen/tools/kconfig/Makefile.host new file mode 100644 index 0000000..133edfa --- /dev/null +++ b/xen/tools/kconfig/Makefile.host @@ -0,0 +1,128 @@ +# ========================================================================== +# Building binaries on the host system +# Binaries are used during the compilation of the kernel, for example +# to preprocess a data file. +# +# Both C and C++ are supported, but preferred language is C for such utilities. +# +# Sample syntax (see Documentation/kbuild/makefiles.txt for reference) +# hostprogs-y := bin2hex +# Will compile bin2hex.c and create an executable named bin2hex +# +# hostprogs-y := lxdialog +# lxdialog-objs := checklist.o lxdialog.o +# Will compile lxdialog.c and checklist.c, and then link the executable +# lxdialog, based on checklist.o and lxdialog.o +# +# hostprogs-y := qconf +# qconf-cxxobjs := qconf.o +# qconf-objs := menu.o +# Will compile qconf as a C++ program, and menu as a C program. +# They are linked as C++ code to the executable qconf + +__hostprogs := $(sort $(hostprogs-y) $(hostprogs-m)) + +# C code +# Executables compiled from a single .c file +host-csingle := $(foreach m,$(__hostprogs), \ + $(if $($(m)-objs)$($(m)-cxxobjs),,$(m))) + +# C executables linked based on several .o files +host-cmulti := $(foreach m,$(__hostprogs),\ + $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m)))) + +# Object (.o) files compiled from .c files +host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs))) + +# C++ code +# C++ executables compiled from at least one .cc file +# and zero or more .c files +host-cxxmulti := $(foreach m,$(__hostprogs),$(if $($(m)-cxxobjs),$(m))) + +# C++ Object (.o) files compiled from .cc files +host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs))) + +# output directory for programs/.o files +# hostprogs-y := tools/build may have been specified. +# Retrieve also directory of .o files from prog-objs or prog-cxxobjs notation +host-objdirs := $(dir $(__hostprogs) $(host-cobjs) $(host-cxxobjs)) + +host-objdirs := $(strip $(sort $(filter-out ./,$(host-objdirs)))) + + +__hostprogs := $(addprefix $(obj)/,$(__hostprogs)) +host-csingle := $(addprefix $(obj)/,$(host-csingle)) +host-cmulti := $(addprefix $(obj)/,$(host-cmulti)) +host-cobjs := $(addprefix $(obj)/,$(host-cobjs)) +host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti)) +host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs)) +host-objdirs := $(addprefix $(obj)/,$(host-objdirs)) + +obj-dirs += $(host-objdirs) + +##### +# Handle options to gcc. Support building with separate output directory + +_hostc_flags = $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) \ + $(HOSTCFLAGS_$(basetarget).o) +_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \ + $(HOSTCXXFLAGS_$(basetarget).o) + +ifeq ($(KBUILD_SRC),) +__hostc_flags = $(_hostc_flags) +__hostcxx_flags = $(_hostcxx_flags) +else +__hostc_flags = -I$(obj) $(call flags,_hostc_flags) +__hostcxx_flags = -I$(obj) $(call flags,_hostcxx_flags) +endif + +hostc_flags = -Wp,-MD,$(depfile) $(__hostc_flags) +hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) + +##### +# Compile programs on the host + +# Create executable from a single .c file +# host-csingle -> Executable +quiet_cmd_host-csingle = HOSTCC $@ + cmd_host-csingle = $(HOSTCC) $(hostc_flags) -o $@ $< \ + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) +$(host-csingle): $(obj)/%: $(src)/%.c FORCE + $(call if_changed_dep,host-csingle) + +# Link an executable based on list of .o files, all plain c +# host-cmulti -> executable +quiet_cmd_host-cmulti = HOSTLD $@ + cmd_host-cmulti = $(HOSTCC) $(HOSTLDFLAGS) -o $@ \ + $(addprefix $(obj)/,$($(@F)-objs)) \ + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) +$(host-cmulti): FORCE + $(call if_changed,host-cmulti) +$(call multi_depend, $(host-cmulti), , -objs) + +# Create .o file from a single .c file +# host-cobjs -> .o +quiet_cmd_host-cobjs = HOSTCC $@ + cmd_host-cobjs = $(HOSTCC) $(hostc_flags) -c -o $@ $< +$(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE + $(call if_changed_dep,host-cobjs) + +# Link an executable based on list of .o files, a mixture of .c and .cc +# host-cxxmulti -> executable +quiet_cmd_host-cxxmulti = HOSTLD $@ + cmd_host-cxxmulti = $(HOSTCXX) $(HOSTLDFLAGS) -o $@ \ + $(foreach o,objs cxxobjs,\ + $(addprefix $(obj)/,$($(@F)-$(o)))) \ + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F)) +$(host-cxxmulti): FORCE + $(call if_changed,host-cxxmulti) +$(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) + +# Create .o file from a single .cc (C++) file +quiet_cmd_host-cxxobjs = HOSTCXX $@ + cmd_host-cxxobjs = $(HOSTCXX) $(hostcxx_flags) -c -o $@ $< +$(host-cxxobjs): $(obj)/%.o: $(src)/%.cc FORCE + $(call if_changed_dep,host-cxxobjs) + +targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\ + $(host-cxxmulti) $(host-cxxobjs) diff --git a/xen/tools/kconfig/POTFILES.in b/xen/tools/kconfig/POTFILES.in new file mode 100644 index 0000000..9674573 --- /dev/null +++ b/xen/tools/kconfig/POTFILES.in @@ -0,0 +1,12 @@ +scripts/kconfig/lxdialog/checklist.c +scripts/kconfig/lxdialog/inputbox.c +scripts/kconfig/lxdialog/menubox.c +scripts/kconfig/lxdialog/textbox.c +scripts/kconfig/lxdialog/util.c +scripts/kconfig/lxdialog/yesno.c +scripts/kconfig/mconf.c +scripts/kconfig/conf.c +scripts/kconfig/confdata.c +scripts/kconfig/gconf.c +scripts/kconfig/gconf.glade.h +scripts/kconfig/qconf.cc diff --git a/xen/tools/kconfig/check.sh b/xen/tools/kconfig/check.sh new file mode 100755 index 0000000..55b79ba --- /dev/null +++ b/xen/tools/kconfig/check.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Needed for systems without gettext +$* -x c -o /dev/null - > /dev/null 2>&1 << EOF +#include +int main() +{ + gettext(""); + return 0; +} +EOF +if [ ! "$?" -eq "0" ]; then + echo -DKBUILD_NO_NLS; +fi diff --git a/xen/tools/kconfig/conf.c b/xen/tools/kconfig/conf.c new file mode 100644 index 0000000..6c20431 --- /dev/null +++ b/xen/tools/kconfig/conf.c @@ -0,0 +1,722 @@ +/* + * Copyright (C) 2002 Roman Zippel + * Released under the terms of the GNU GPL v2.0. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lkc.h" + +static void conf(struct menu *menu); +static void check_conf(struct menu *menu); +static void xfgets(char *str, int size, FILE *in); + +enum input_mode { + oldaskconfig, + silentoldconfig, + oldconfig, + allnoconfig, + allyesconfig, + allmodconfig, + alldefconfig, + randconfig, + defconfig, + savedefconfig, + listnewconfig, + olddefconfig, +} input_mode = oldaskconfig; + +static int indent = 1; +static int tty_stdio; +static int valid_stdin = 1; +static int sync_kconfig; +static int conf_cnt; +static char line[128]; +static struct menu *rootEntry; + +static void print_help(struct menu *menu) +{ + struct gstr help = str_new(); + + menu_get_ext_help(menu, &help); + + printf("\n%s\n", str_get(&help)); + str_free(&help); +} + +static void strip(char *str) +{ + char *p = str; + int l; + + while ((isspace(*p))) + p++; + l = strlen(p); + if (p != str) + memmove(str, p, l + 1); + if (!l) + return; + p = str + l - 1; + while ((isspace(*p))) + *p-- = 0; +} + +static void check_stdin(void) +{ + if (!valid_stdin) { + printf(_("aborted!\n\n")); + printf(_("Console input/output is redirected. ")); + printf(_("Run 'make oldconfig' to update configuration.\n\n")); + exit(1); + } +} + +static int conf_askvalue(struct symbol *sym, const char *def) +{ + enum symbol_type type = sym_get_type(sym); + + if (!sym_has_value(sym)) + printf(_("(NEW) ")); + + line[0] = '\n'; + line[1] = 0; + + if (!sym_is_changable(sym)) { + printf("%s\n", def); + line[0] = '\n'; + line[1] = 0; + return 0; + } + + switch (input_mode) { + case oldconfig: + case silentoldconfig: + if (sym_has_value(sym)) { + printf("%s\n", def); + return 0; + } + check_stdin(); + /* fall through */ + case oldaskconfig: + fflush(stdout); + xfgets(line, 128, stdin); + if (!tty_stdio) + printf("\n"); + return 1; + default: + break; + } + + switch (type) { + case S_INT: + case S_HEX: + case S_STRING: + printf("%s\n", def); + return 1; + default: + ; + } + printf("%s", line); + return 1; +} + +static int conf_string(struct menu *menu) +{ + struct symbol *sym = menu->sym; + const char *def; + + while (1) { + printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); + printf("(%s) ", sym->name); + def = sym_get_string_value(sym); + if (sym_get_string_value(sym)) + printf("[%s] ", def); + if (!conf_askvalue(sym, def)) + return 0; + switch (line[0]) { + case '\n': + break; + case '?': + /* print help */ + if (line[1] == '\n') { + print_help(menu); + def = NULL; + break; + } + /* fall through */ + default: + line[strlen(line)-1] = 0; + def = line; + } + if (def && sym_set_string_value(sym, def)) + return 0; + } +} + +static int conf_sym(struct menu *menu) +{ + struct symbol *sym = menu->sym; + tristate oldval, newval; + + while (1) { + printf("%*s%s ", indent - 1, "", _(menu->prompt->text)); + if (sym->name) + printf("(%s) ", sym->name); + putchar('['); + oldval = sym_get_tristate_value(sym); + switch (oldval) { + case no: + putchar('N'); + break; + case mod: + putchar('M'); + break; + case yes: + putchar('Y'); + break; + } + if (oldval != no && sym_tristate_within_range(sym, no)) + printf("/n"); + if (oldval != mod && sym_tristate_within_range(sym, mod)) + printf("/m"); + if (oldval != yes && sym_tristate_within_range(sym, yes)) + printf("/y"); + if (menu_has_help(menu)) + printf("/?"); + printf("] "); + if (!conf_askvalue(sym, sym_get_string_value(sym))) + return 0; + strip(line); + + switch (line[0]) { + case 'n': + case 'N': + newval = no; + if (!line[1] || !strcmp(&line[1], "o")) + break; + continue; + case 'm': + case 'M': + newval = mod; + if (!line[1]) + break; + continue; + case 'y': + case 'Y': + newval = yes; + if (!line[1] || !strcmp(&line[1], "es")) + break; + continue; + case 0: + newval = oldval; + break; + case '?': + goto help; + default: + continue; + } + if (sym_set_tristate_value(sym, newval)) + return 0; +help: + print_help(menu); + } +} + +static int conf_choice(struct menu *menu) +{ + struct symbol *sym, *def_sym; + struct menu *child; + bool is_new; + + sym = menu->sym; + is_new = !sym_has_value(sym); + if (sym_is_changable(sym)) { + conf_sym(menu); + sym_calc_value(sym); + switch (sym_get_tristate_value(sym)) { + case no: + return 1; + case mod: + return 0; + case yes: + break; + } + } else { + switch (sym_get_tristate_value(sym)) { + case no: + return 1; + case mod: + printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu))); + return 0; + case yes: + break; + } + } + + while (1) { + int cnt, def; + + printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu))); + def_sym = sym_get_choice_value(sym); + cnt = def = 0; + line[0] = 0; + for (child = menu->list; child; child = child->next) { + if (!menu_is_visible(child)) + continue; + if (!child->sym) { + printf("%*c %s\n", indent, '*', _(menu_get_prompt(child))); + continue; + } + cnt++; + if (child->sym == def_sym) { + def = cnt; + printf("%*c", indent, '>'); + } else + printf("%*c", indent, ' '); + printf(" %d. %s", cnt, _(menu_get_prompt(child))); + if (child->sym->name) + printf(" (%s)", child->sym->name); + if (!sym_has_value(child->sym)) + printf(_(" (NEW)")); + printf("\n"); + } + printf(_("%*schoice"), indent - 1, ""); + if (cnt == 1) { + printf("[1]: 1\n"); + goto conf_childs; + } + printf("[1-%d", cnt); + if (menu_has_help(menu)) + printf("?"); + printf("]: "); + switch (input_mode) { + case oldconfig: + case silentoldconfig: + if (!is_new) { + cnt = def; + printf("%d\n", cnt); + break; + } + check_stdin(); + /* fall through */ + case oldaskconfig: + fflush(stdout); + xfgets(line, 128, stdin); + strip(line); + if (line[0] == '?') { + print_help(menu); + continue; + } + if (!line[0]) + cnt = def; + else if (isdigit(line[0])) + cnt = atoi(line); + else + continue; + break; + default: + break; + } + + conf_childs: + for (child = menu->list; child; child = child->next) { + if (!child->sym || !menu_is_visible(child)) + continue; + if (!--cnt) + break; + } + if (!child) + continue; + if (line[0] && line[strlen(line) - 1] == '?') { + print_help(child); + continue; + } + sym_set_choice_value(sym, child->sym); + for (child = child->list; child; child = child->next) { + indent += 2; + conf(child); + indent -= 2; + } + return 1; + } +} + +static void conf(struct menu *menu) +{ + struct symbol *sym; + struct property *prop; + struct menu *child; + + if (!menu_is_visible(menu)) + return; + + sym = menu->sym; + prop = menu->prompt; + if (prop) { + const char *prompt; + + switch (prop->type) { + case P_MENU: + if ((input_mode == silentoldconfig || + input_mode == listnewconfig || + input_mode == olddefconfig) && + rootEntry != menu) { + check_conf(menu); + return; + } + /* fall through */ + case P_COMMENT: + prompt = menu_get_prompt(menu); + if (prompt) + printf("%*c\n%*c %s\n%*c\n", + indent, '*', + indent, '*', _(prompt), + indent, '*'); + default: + ; + } + } + + if (!sym) + goto conf_childs; + + if (sym_is_choice(sym)) { + conf_choice(menu); + if (sym->curr.tri != mod) + return; + goto conf_childs; + } + + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + conf_string(menu); + break; + default: + conf_sym(menu); + break; + } + +conf_childs: + if (sym) + indent += 2; + for (child = menu->list; child; child = child->next) + conf(child); + if (sym) + indent -= 2; +} + +static void check_conf(struct menu *menu) +{ + struct symbol *sym; + struct menu *child; + + if (!menu_is_visible(menu)) + return; + + sym = menu->sym; + if (sym && !sym_has_value(sym)) { + if (sym_is_changable(sym) || + (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) { + if (input_mode == listnewconfig) { + if (sym->name && !sym_is_choice_value(sym)) { + printf("%s%s\n", CONFIG_, sym->name); + } + } else if (input_mode != olddefconfig) { + if (!conf_cnt++) + printf(_("*\n* Restart config...\n*\n")); + rootEntry = menu_get_parent_menu(menu); + conf(rootEntry); + } + } + } + + for (child = menu->list; child; child = child->next) + check_conf(child); +} + +static struct option long_opts[] = { + {"oldaskconfig", no_argument, NULL, oldaskconfig}, + {"oldconfig", no_argument, NULL, oldconfig}, + {"silentoldconfig", no_argument, NULL, silentoldconfig}, + {"defconfig", optional_argument, NULL, defconfig}, + {"savedefconfig", required_argument, NULL, savedefconfig}, + {"allnoconfig", no_argument, NULL, allnoconfig}, + {"allyesconfig", no_argument, NULL, allyesconfig}, + {"allmodconfig", no_argument, NULL, allmodconfig}, + {"alldefconfig", no_argument, NULL, alldefconfig}, + {"randconfig", no_argument, NULL, randconfig}, + {"listnewconfig", no_argument, NULL, listnewconfig}, + {"olddefconfig", no_argument, NULL, olddefconfig}, + /* + * oldnoconfig is an alias of olddefconfig, because people already + * are dependent on its behavior(sets new symbols to their default + * value but not 'n') with the counter-intuitive name. + */ + {"oldnoconfig", no_argument, NULL, olddefconfig}, + {NULL, 0, NULL, 0} +}; + +static void conf_usage(const char *progname) +{ + + printf("Usage: %s [-s] [option] \n", progname); + printf("[option] is _one_ of the following:\n"); + printf(" --listnewconfig List new options\n"); + printf(" --oldaskconfig Start a new configuration using a line-oriented program\n"); + printf(" --oldconfig Update a configuration using a provided .config as base\n"); + printf(" --silentoldconfig Same as oldconfig, but quietly, additionally update deps\n"); + printf(" --olddefconfig Same as silentoldconfig but sets new symbols to their default value\n"); + printf(" --oldnoconfig An alias of olddefconfig\n"); + printf(" --defconfig New config with default defined in \n"); + printf(" --savedefconfig Save the minimal current configuration to \n"); + printf(" --allnoconfig New config where all options are answered with no\n"); + printf(" --allyesconfig New config where all options are answered with yes\n"); + printf(" --allmodconfig New config where all options are answered with mod\n"); + printf(" --alldefconfig New config with all symbols set to default\n"); + printf(" --randconfig New config with random answer to all options\n"); +} + +int main(int ac, char **av) +{ + const char *progname = av[0]; + int opt; + const char *name, *defconfig_file = NULL /* gcc uninit */; + struct stat tmpstat; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + tty_stdio = isatty(0) && isatty(1) && isatty(2); + + while ((opt = getopt_long(ac, av, "s", long_opts, NULL)) != -1) { + if (opt == 's') { + conf_set_message_callback(NULL); + continue; + } + input_mode = (enum input_mode)opt; + switch (opt) { + case silentoldconfig: + sync_kconfig = 1; + break; + case defconfig: + case savedefconfig: + defconfig_file = optarg; + break; + case randconfig: + { + struct timeval now; + unsigned int seed; + char *seed_env; + + /* + * Use microseconds derived seed, + * compensate for systems where it may be zero + */ + gettimeofday(&now, NULL); + seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1)); + + seed_env = getenv("KCONFIG_SEED"); + if( seed_env && *seed_env ) { + char *endp; + int tmp = (int)strtol(seed_env, &endp, 0); + if (*endp == '\0') { + seed = tmp; + } + } + fprintf( stderr, "KCONFIG_SEED=0x%X\n", seed ); + srand(seed); + break; + } + case oldaskconfig: + case oldconfig: + case allnoconfig: + case allyesconfig: + case allmodconfig: + case alldefconfig: + case listnewconfig: + case olddefconfig: + break; + case '?': + conf_usage(progname); + exit(1); + break; + } + } + if (ac == optind) { + printf(_("%s: Kconfig file missing\n"), av[0]); + conf_usage(progname); + exit(1); + } + name = av[optind]; + conf_parse(name); + //zconfdump(stdout); + if (sync_kconfig) { + name = conf_get_configname(); + if (stat(name, &tmpstat)) { + fprintf(stderr, _("***\n" + "*** Configuration file \"%s\" not found!\n" + "***\n" + "*** Please run some configurator (e.g. \"make oldconfig\" or\n" + "*** \"make menuconfig\" or \"make xconfig\").\n" + "***\n"), name); + exit(1); + } + } + + switch (input_mode) { + case defconfig: + if (!defconfig_file) + defconfig_file = conf_get_default_confname(); + if (conf_read(defconfig_file)) { + printf(_("***\n" + "*** Can't find default configuration \"%s\"!\n" + "***\n"), defconfig_file); + exit(1); + } + break; + case savedefconfig: + case silentoldconfig: + case oldaskconfig: + case oldconfig: + case listnewconfig: + case olddefconfig: + conf_read(NULL); + break; + case allnoconfig: + case allyesconfig: + case allmodconfig: + case alldefconfig: + case randconfig: + name = getenv("KCONFIG_ALLCONFIG"); + if (!name) + break; + if ((strcmp(name, "") != 0) && (strcmp(name, "1") != 0)) { + if (conf_read_simple(name, S_DEF_USER)) { + fprintf(stderr, + _("*** Can't read seed configuration \"%s\"!\n"), + name); + exit(1); + } + break; + } + switch (input_mode) { + case allnoconfig: name = "allno.config"; break; + case allyesconfig: name = "allyes.config"; break; + case allmodconfig: name = "allmod.config"; break; + case alldefconfig: name = "alldef.config"; break; + case randconfig: name = "allrandom.config"; break; + default: break; + } + if (conf_read_simple(name, S_DEF_USER) && + conf_read_simple("all.config", S_DEF_USER)) { + fprintf(stderr, + _("*** KCONFIG_ALLCONFIG set, but no \"%s\" or \"all.config\" file found\n"), + name); + exit(1); + } + break; + default: + break; + } + + if (sync_kconfig) { + if (conf_get_changed()) { + name = getenv("KCONFIG_NOSILENTUPDATE"); + if (name && *name) { + fprintf(stderr, + _("\n*** The configuration requires explicit update.\n\n")); + return 1; + } + } + valid_stdin = tty_stdio; + } + + switch (input_mode) { + case allnoconfig: + conf_set_all_new_symbols(def_no); + break; + case allyesconfig: + conf_set_all_new_symbols(def_yes); + break; + case allmodconfig: + conf_set_all_new_symbols(def_mod); + break; + case alldefconfig: + conf_set_all_new_symbols(def_default); + break; + case randconfig: + /* Really nothing to do in this loop */ + while (conf_set_all_new_symbols(def_random)) ; + break; + case defconfig: + conf_set_all_new_symbols(def_default); + break; + case savedefconfig: + break; + case oldaskconfig: + rootEntry = &rootmenu; + conf(&rootmenu); + input_mode = silentoldconfig; + /* fall through */ + case oldconfig: + case listnewconfig: + case olddefconfig: + case silentoldconfig: + /* Update until a loop caused no more changes */ + do { + conf_cnt = 0; + check_conf(&rootmenu); + } while (conf_cnt && + (input_mode != listnewconfig && + input_mode != olddefconfig)); + break; + } + + if (sync_kconfig) { + /* silentoldconfig is used during the build so we shall update autoconf. + * All other commands are only used to generate a config. + */ + if (conf_get_changed() && conf_write(NULL)) { + fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); + exit(1); + } + if (conf_write_autoconf()) { + fprintf(stderr, _("\n*** Error during update of the configuration.\n\n")); + return 1; + } + } else if (input_mode == savedefconfig) { + if (conf_write_defconfig(defconfig_file)) { + fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"), + defconfig_file); + return 1; + } + } else if (input_mode != listnewconfig) { + if (conf_write(NULL)) { + fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n")); + exit(1); + } + } + return 0; +} + +/* + * Helper function to facilitate fgets() by Jean Sacren. + */ +void xfgets(char *str, int size, FILE *in) +{ + if (fgets(str, size, in) == NULL) + fprintf(stderr, "\nError in reading or end of file.\n"); +} diff --git a/xen/tools/kconfig/confdata.c b/xen/tools/kconfig/confdata.c new file mode 100644 index 0000000..0b7dc2f --- /dev/null +++ b/xen/tools/kconfig/confdata.c @@ -0,0 +1,1245 @@ +/* + * Copyright (C) 2002 Roman Zippel + * Released under the terms of the GNU GPL v2.0. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "lkc.h" + +struct conf_printer { + void (*print_symbol)(FILE *, struct symbol *, const char *, void *); + void (*print_comment)(FILE *, const char *, void *); +}; + +static void conf_warning(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); + +static void conf_message(const char *fmt, ...) + __attribute__ ((format (printf, 1, 2))); + +static const char *conf_filename; +static int conf_lineno, conf_warnings, conf_unsaved; + +const char conf_defname[] = "arch/$ARCH/defconfig"; + +static void conf_warning(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + fprintf(stderr, "%s:%d:warning: ", conf_filename, conf_lineno); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + va_end(ap); + conf_warnings++; +} + +static void conf_default_message_callback(const char *fmt, va_list ap) +{ + printf("#\n# "); + vprintf(fmt, ap); + printf("\n#\n"); +} + +static void (*conf_message_callback) (const char *fmt, va_list ap) = + conf_default_message_callback; +void conf_set_message_callback(void (*fn) (const char *fmt, va_list ap)) +{ + conf_message_callback = fn; +} + +static void conf_message(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + if (conf_message_callback) + conf_message_callback(fmt, ap); + va_end(ap); +} + +const char *conf_get_configname(void) +{ + char *name = getenv("KCONFIG_CONFIG"); + + return name ? name : ".config"; +} + +const char *conf_get_autoconfig_name(void) +{ + char *name = getenv("KCONFIG_AUTOCONFIG"); + + return name ? name : "include/config/auto.conf"; +} + +static char *conf_expand_value(const char *in) +{ + struct symbol *sym; + const char *src; + static char res_value[SYMBOL_MAXLENGTH]; + char *dst, name[SYMBOL_MAXLENGTH]; + + res_value[0] = 0; + dst = name; + while ((src = strchr(in, '$'))) { + strncat(res_value, in, src - in); + src++; + dst = name; + while (isalnum(*src) || *src == '_') + *dst++ = *src++; + *dst = 0; + sym = sym_lookup(name, 0); + sym_calc_value(sym); + strcat(res_value, sym_get_string_value(sym)); + in = src; + } + strcat(res_value, in); + + return res_value; +} + +char *conf_get_default_confname(void) +{ + struct stat buf; + static char fullname[PATH_MAX+1]; + char *env, *name; + + name = conf_expand_value(conf_defname); + env = getenv(SRCTREE); + if (env) { + sprintf(fullname, "%s/%s", env, name); + if (!stat(fullname, &buf)) + return fullname; + } + return name; +} + +static int conf_set_sym_val(struct symbol *sym, int def, int def_flags, char *p) +{ + char *p2; + + switch (sym->type) { + case S_TRISTATE: + if (p[0] == 'm') { + sym->def[def].tri = mod; + sym->flags |= def_flags; + break; + } + /* fall through */ + case S_BOOLEAN: + if (p[0] == 'y') { + sym->def[def].tri = yes; + sym->flags |= def_flags; + break; + } + if (p[0] == 'n') { + sym->def[def].tri = no; + sym->flags |= def_flags; + break; + } + if (def != S_DEF_AUTO) + conf_warning("symbol value '%s' invalid for %s", + p, sym->name); + return 1; + case S_OTHER: + if (*p != '"') { + for (p2 = p; *p2 && !isspace(*p2); p2++) + ; + sym->type = S_STRING; + goto done; + } + /* fall through */ + case S_STRING: + if (*p++ != '"') + break; + for (p2 = p; (p2 = strpbrk(p2, "\"\\")); p2++) { + if (*p2 == '"') { + *p2 = 0; + break; + } + memmove(p2, p2 + 1, strlen(p2)); + } + if (!p2) { + if (def != S_DEF_AUTO) + conf_warning("invalid string found"); + return 1; + } + /* fall through */ + case S_INT: + case S_HEX: + done: + if (sym_string_valid(sym, p)) { + sym->def[def].val = strdup(p); + sym->flags |= def_flags; + } else { + if (def != S_DEF_AUTO) + conf_warning("symbol value '%s' invalid for %s", + p, sym->name); + return 1; + } + break; + default: + ; + } + return 0; +} + +#define LINE_GROWTH 16 +static int add_byte(int c, char **lineptr, size_t slen, size_t *n) +{ + char *nline; + size_t new_size = slen + 1; + if (new_size > *n) { + new_size += LINE_GROWTH - 1; + new_size *= 2; + nline = realloc(*lineptr, new_size); + if (!nline) + return -1; + + *lineptr = nline; + *n = new_size; + } + + (*lineptr)[slen] = c; + + return 0; +} + +static ssize_t compat_getline(char **lineptr, size_t *n, FILE *stream) +{ + char *line = *lineptr; + size_t slen = 0; + + for (;;) { + int c = getc(stream); + + switch (c) { + case '\n': + if (add_byte(c, &line, slen, n) < 0) + goto e_out; + slen++; + /* fall through */ + case EOF: + if (add_byte('\0', &line, slen, n) < 0) + goto e_out; + *lineptr = line; + if (slen == 0) + return -1; + return slen; + default: + if (add_byte(c, &line, slen, n) < 0) + goto e_out; + slen++; + } + } + +e_out: + line[slen-1] = '\0'; + *lineptr = line; + return -1; +} + +int conf_read_simple(const char *name, int def) +{ + FILE *in = NULL; + char *line = NULL; + size_t line_asize = 0; + char *p, *p2; + struct symbol *sym; + int i, def_flags; + + if (name) { + in = zconf_fopen(name); + } else { + struct property *prop; + + name = conf_get_configname(); + in = zconf_fopen(name); + if (in) + goto load; + sym_add_change_count(1); + if (!sym_defconfig_list) { + sym_calc_value(modules_sym); + return 1; + } + + for_all_defaults(sym_defconfig_list, prop) { + if (expr_calc_value(prop->visible.expr) == no || + prop->expr->type != E_SYMBOL) + continue; + name = conf_expand_value(prop->expr->left.sym->name); + in = zconf_fopen(name); + if (in) { + conf_message(_("using defaults found in %s"), + name); + goto load; + } + } + } + if (!in) + return 1; + +load: + conf_filename = name; + conf_lineno = 0; + conf_warnings = 0; + conf_unsaved = 0; + + def_flags = SYMBOL_DEF << def; + for_all_symbols(i, sym) { + sym->flags |= SYMBOL_CHANGED; + sym->flags &= ~(def_flags|SYMBOL_VALID); + if (sym_is_choice(sym)) + sym->flags |= def_flags; + switch (sym->type) { + case S_INT: + case S_HEX: + case S_STRING: + if (sym->def[def].val) + free(sym->def[def].val); + /* fall through */ + default: + sym->def[def].val = NULL; + sym->def[def].tri = no; + } + } + + while (compat_getline(&line, &line_asize, in) != -1) { + conf_lineno++; + sym = NULL; + if (line[0] == '#') { + if (memcmp(line + 2, CONFIG_, strlen(CONFIG_))) + continue; + p = strchr(line + 2 + strlen(CONFIG_), ' '); + if (!p) + continue; + *p++ = 0; + if (strncmp(p, "is not set", 10)) + continue; + if (def == S_DEF_USER) { + sym = sym_find(line + 2 + strlen(CONFIG_)); + if (!sym) { + sym_add_change_count(1); + goto setsym; + } + } else { + sym = sym_lookup(line + 2 + strlen(CONFIG_), 0); + if (sym->type == S_UNKNOWN) + sym->type = S_BOOLEAN; + } + if (sym->flags & def_flags) { + conf_warning("override: reassigning to symbol %s", sym->name); + } + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + sym->def[def].tri = no; + sym->flags |= def_flags; + break; + default: + ; + } + } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) { + p = strchr(line + strlen(CONFIG_), '='); + if (!p) + continue; + *p++ = 0; + p2 = strchr(p, '\n'); + if (p2) { + *p2-- = 0; + if (*p2 == '\r') + *p2 = 0; + } + if (def == S_DEF_USER) { + sym = sym_find(line + strlen(CONFIG_)); + if (!sym) { + sym_add_change_count(1); + goto setsym; + } + } else { + sym = sym_lookup(line + strlen(CONFIG_), 0); + if (sym->type == S_UNKNOWN) + sym->type = S_OTHER; + } + if (sym->flags & def_flags) { + conf_warning("override: reassigning to symbol %s", sym->name); + } + if (conf_set_sym_val(sym, def, def_flags, p)) + continue; + } else { + if (line[0] != '\r' && line[0] != '\n') + conf_warning("unexpected data"); + continue; + } +setsym: + if (sym && sym_is_choice_value(sym)) { + struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym)); + switch (sym->def[def].tri) { + case no: + break; + case mod: + if (cs->def[def].tri == yes) { + conf_warning("%s creates inconsistent choice state", sym->name); + cs->flags &= ~def_flags; + } + break; + case yes: + if (cs->def[def].tri != no) + conf_warning("override: %s changes choice state", sym->name); + cs->def[def].val = sym; + break; + } + cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri); + } + } + free(line); + fclose(in); + sym_calc_value(modules_sym); + return 0; +} + +int conf_read(const char *name) +{ + struct symbol *sym; + int i; + + sym_set_change_count(0); + + if (conf_read_simple(name, S_DEF_USER)) + return 1; + + for_all_symbols(i, sym) { + sym_calc_value(sym); + if (sym_is_choice(sym) || (sym->flags & SYMBOL_AUTO)) + continue; + if (sym_has_value(sym) && (sym->flags & SYMBOL_WRITE)) { + /* check that calculated value agrees with saved value */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym->def[S_DEF_USER].tri != sym_get_tristate_value(sym)) + break; + if (!sym_is_choice(sym)) + continue; + /* fall through */ + default: + if (!strcmp(sym->curr.val, sym->def[S_DEF_USER].val)) + continue; + break; + } + } else if (!sym_has_value(sym) && !(sym->flags & SYMBOL_WRITE)) + /* no previous value and not saved */ + continue; + conf_unsaved++; + /* maybe print value in verbose mode... */ + } + + for_all_symbols(i, sym) { + if (sym_has_value(sym) && !sym_is_choice_value(sym)) { + /* Reset values of generates values, so they'll appear + * as new, if they should become visible, but that + * doesn't quite work if the Kconfig and the saved + * configuration disagree. + */ + if (sym->visible == no && !conf_unsaved) + sym->flags &= ~SYMBOL_DEF_USER; + switch (sym->type) { + case S_STRING: + case S_INT: + case S_HEX: + /* Reset a string value if it's out of range */ + if (sym_string_within_range(sym, sym->def[S_DEF_USER].val)) + break; + sym->flags &= ~(SYMBOL_VALID|SYMBOL_DEF_USER); + conf_unsaved++; + break; + default: + break; + } + } + } + + sym_add_change_count(conf_warnings || conf_unsaved); + + return 0; +} + +/* + * Kconfig configuration printer + * + * This printer is used when generating the resulting configuration after + * kconfig invocation and `defconfig' files. Unset symbol might be omitted by + * passing a non-NULL argument to the printer. + * + */ +static void +kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (*value == 'n') { + bool skip_unset = (arg != NULL); + + if (!skip_unset) + fprintf(fp, "# %s%s is not set\n", + CONFIG_, sym->name); + return; + } + break; + default: + break; + } + + fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value); +} + +static void +kconfig_print_comment(FILE *fp, const char *value, void *arg) +{ + const char *p = value; + size_t l; + + for (;;) { + l = strcspn(p, "\n"); + fprintf(fp, "#"); + if (l) { + fprintf(fp, " "); + xfwrite(p, l, 1, fp); + p += l; + } + fprintf(fp, "\n"); + if (*p++ == '\0') + break; + } +} + +static struct conf_printer kconfig_printer_cb = +{ + .print_symbol = kconfig_print_symbol, + .print_comment = kconfig_print_comment, +}; + +/* + * Header printer + * + * This printer is used when generating the `include/generated/autoconf.h' file. + */ +static void +header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: { + const char *suffix = ""; + + switch (*value) { + case 'n': + break; + case 'm': + suffix = "_MODULE"; + /* fall through */ + default: + fprintf(fp, "#define %s%s%s 1\n", + CONFIG_, sym->name, suffix); + } + break; + } + case S_HEX: { + const char *prefix = ""; + + if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X')) + prefix = "0x"; + fprintf(fp, "#define %s%s %s%s\n", + CONFIG_, sym->name, prefix, value); + break; + } + case S_STRING: + case S_INT: + fprintf(fp, "#define %s%s %s\n", + CONFIG_, sym->name, value); + break; + default: + break; + } + +} + +static void +header_print_comment(FILE *fp, const char *value, void *arg) +{ + const char *p = value; + size_t l; + + fprintf(fp, "/*\n"); + for (;;) { + l = strcspn(p, "\n"); + fprintf(fp, " *"); + if (l) { + fprintf(fp, " "); + xfwrite(p, l, 1, fp); + p += l; + } + fprintf(fp, "\n"); + if (*p++ == '\0') + break; + } + fprintf(fp, " */\n"); +} + +static struct conf_printer header_printer_cb = +{ + .print_symbol = header_print_symbol, + .print_comment = header_print_comment, +}; + +/* + * Tristate printer + * + * This printer is used when generating the `include/config/tristate.conf' file. + */ +static void +tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) +{ + + if (sym->type == S_TRISTATE && *value != 'n') + fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value)); +} + +static struct conf_printer tristate_printer_cb = +{ + .print_symbol = tristate_print_symbol, + .print_comment = kconfig_print_comment, +}; + +static void conf_write_symbol(FILE *fp, struct symbol *sym, + struct conf_printer *printer, void *printer_arg) +{ + const char *str; + + switch (sym->type) { + case S_OTHER: + case S_UNKNOWN: + break; + case S_STRING: + str = sym_get_string_value(sym); + str = sym_escape_string_value(str); + printer->print_symbol(fp, sym, str, printer_arg); + free((void *)str); + break; + default: + str = sym_get_string_value(sym); + printer->print_symbol(fp, sym, str, printer_arg); + } +} + +static void +conf_write_heading(FILE *fp, struct conf_printer *printer, void *printer_arg) +{ + char buf[256]; + + snprintf(buf, sizeof(buf), + "\n" + "Automatically generated file; DO NOT EDIT.\n" + "%s\n", + rootmenu.prompt->text); + + printer->print_comment(fp, buf, printer_arg); +} + +/* + * Write out a minimal config. + * All values that has default values are skipped as this is redundant. + */ +int conf_write_defconfig(const char *filename) +{ + struct symbol *sym; + struct menu *menu; + FILE *out; + + out = fopen(filename, "w"); + if (!out) + return 1; + + sym_clear_all_valid(); + + /* Traverse all menus to find all relevant symbols */ + menu = rootmenu.list; + + while (menu != NULL) + { + sym = menu->sym; + if (sym == NULL) { + if (!menu_is_visible(menu)) + goto next_menu; + } else if (!sym_is_choice(sym)) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE)) + goto next_menu; + sym->flags &= ~SYMBOL_WRITE; + /* If we cannot change the symbol - skip */ + if (!sym_is_changable(sym)) + goto next_menu; + /* If symbol equals to default value - skip */ + if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0) + goto next_menu; + + /* + * If symbol is a choice value and equals to the + * default for a choice - skip. + * But only if value is bool and equal to "y" and + * choice is not "optional". + * (If choice is "optional" then all values can be "n") + */ + if (sym_is_choice_value(sym)) { + struct symbol *cs; + struct symbol *ds; + + cs = prop_get_symbol(sym_get_choice_prop(sym)); + ds = sym_choice_default(cs); + if (!sym_is_optional(cs) && sym == ds) { + if ((sym->type == S_BOOLEAN) && + sym_get_tristate_value(sym) == yes) + goto next_menu; + } + } + conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); + } +next_menu: + if (menu->list != NULL) { + menu = menu->list; + } + else if (menu->next != NULL) { + menu = menu->next; + } else { + while ((menu = menu->parent)) { + if (menu->next != NULL) { + menu = menu->next; + break; + } + } + } + } + fclose(out); + return 0; +} + +int conf_write(const char *name) +{ + FILE *out; + struct symbol *sym; + struct menu *menu; + const char *basename; + const char *str; + char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; + char *env; + + dirname[0] = 0; + if (name && name[0]) { + struct stat st; + char *slash; + + if (!stat(name, &st) && S_ISDIR(st.st_mode)) { + strcpy(dirname, name); + strcat(dirname, "/"); + basename = conf_get_configname(); + } else if ((slash = strrchr(name, '/'))) { + int size = slash - name + 1; + memcpy(dirname, name, size); + dirname[size] = 0; + if (slash[1]) + basename = slash + 1; + else + basename = conf_get_configname(); + } else + basename = name; + } else + basename = conf_get_configname(); + + sprintf(newname, "%s%s", dirname, basename); + env = getenv("KCONFIG_OVERWRITECONFIG"); + if (!env || !*env) { + sprintf(tmpname, "%s.tmpconfig.%d", dirname, (int)getpid()); + out = fopen(tmpname, "w"); + } else { + *tmpname = 0; + out = fopen(newname, "w"); + } + if (!out) + return 1; + + conf_write_heading(out, &kconfig_printer_cb, NULL); + + if (!conf_get_changed()) + sym_clear_all_valid(); + + menu = rootmenu.list; + while (menu) { + sym = menu->sym; + if (!sym) { + if (!menu_is_visible(menu)) + goto next; + str = menu_get_prompt(menu); + fprintf(out, "\n" + "#\n" + "# %s\n" + "#\n", str); + } else if (!(sym->flags & SYMBOL_CHOICE)) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE)) + goto next; + sym->flags &= ~SYMBOL_WRITE; + + conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); + } + +next: + if (menu->list) { + menu = menu->list; + continue; + } + if (menu->next) + menu = menu->next; + else while ((menu = menu->parent)) { + if (menu->next) { + menu = menu->next; + break; + } + } + } + fclose(out); + + if (*tmpname) { + strcat(dirname, basename); + strcat(dirname, ".old"); + rename(newname, dirname); + if (rename(tmpname, newname)) + return 1; + } + + conf_message(_("configuration written to %s"), newname); + + sym_set_change_count(0); + + return 0; +} + +static int conf_split_config(void) +{ + const char *name; + char path[PATH_MAX+1]; + char *s, *d, c; + struct symbol *sym; + struct stat sb; + int res, i, fd; + + name = conf_get_autoconfig_name(); + conf_read_simple(name, S_DEF_AUTO); + + if (chdir("include/config")) + return 1; + + res = 0; + for_all_symbols(i, sym) { + sym_calc_value(sym); + if ((sym->flags & SYMBOL_AUTO) || !sym->name) + continue; + if (sym->flags & SYMBOL_WRITE) { + if (sym->flags & SYMBOL_DEF_AUTO) { + /* + * symbol has old and new value, + * so compare them... + */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym_get_tristate_value(sym) == + sym->def[S_DEF_AUTO].tri) + continue; + break; + case S_STRING: + case S_HEX: + case S_INT: + if (!strcmp(sym_get_string_value(sym), + sym->def[S_DEF_AUTO].val)) + continue; + break; + default: + break; + } + } else { + /* + * If there is no old value, only 'no' (unset) + * is allowed as new value. + */ + switch (sym->type) { + case S_BOOLEAN: + case S_TRISTATE: + if (sym_get_tristate_value(sym) == no) + continue; + break; + default: + break; + } + } + } else if (!(sym->flags & SYMBOL_DEF_AUTO)) + /* There is neither an old nor a new value. */ + continue; + /* else + * There is an old value, but no new value ('no' (unset) + * isn't saved in auto.conf, so the old value is always + * different from 'no'). + */ + + /* Replace all '_' and append ".h" */ + s = sym->name; + d = path; + while ((c = *s++)) { + c = tolower(c); + *d++ = (c == '_') ? '/' : c; + } + strcpy(d, ".h"); + + /* Assume directory path already exists. */ + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (fd == -1) { + if (errno != ENOENT) { + res = 1; + break; + } + /* + * Create directory components, + * unless they exist already. + */ + d = path; + while ((d = strchr(d, '/'))) { + *d = 0; + if (stat(path, &sb) && mkdir(path, 0755)) { + res = 1; + goto out; + } + *d++ = '/'; + } + /* Try it again. */ + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0644); + if (fd == -1) { + res = 1; + break; + } + } + close(fd); + } +out: + if (chdir("../..")) + return 1; + + return res; +} + +int conf_write_autoconf(void) +{ + struct symbol *sym; + const char *name; + FILE *out, *tristate, *out_h; + int i; + + sym_clear_all_valid(); + + file_write_dep("include/config/auto.conf.cmd"); + + if (conf_split_config()) + return 1; + + out = fopen(".tmpconfig", "w"); + if (!out) + return 1; + + tristate = fopen(".tmpconfig_tristate", "w"); + if (!tristate) { + fclose(out); + return 1; + } + + out_h = fopen(".tmpconfig.h", "w"); + if (!out_h) { + fclose(out); + fclose(tristate); + return 1; + } + + conf_write_heading(out, &kconfig_printer_cb, NULL); + + conf_write_heading(tristate, &tristate_printer_cb, NULL); + + conf_write_heading(out_h, &header_printer_cb, NULL); + + for_all_symbols(i, sym) { + sym_calc_value(sym); + if (!(sym->flags & SYMBOL_WRITE) || !sym->name) + continue; + + /* write symbol to auto.conf, tristate and header files */ + conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1); + + conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1); + + conf_write_symbol(out_h, sym, &header_printer_cb, NULL); + } + fclose(out); + fclose(tristate); + fclose(out_h); + + name = getenv("KCONFIG_AUTOHEADER"); + if (!name) + name = "include/generated/autoconf.h"; + if (rename(".tmpconfig.h", name)) + return 1; + name = getenv("KCONFIG_TRISTATE"); + if (!name) + name = "include/config/tristate.conf"; + if (rename(".tmpconfig_tristate", name)) + return 1; + name = conf_get_autoconfig_name(); + /* + * This must be the last step, kbuild has a dependency on auto.conf + * and this marks the successful completion of the previous steps. + */ + if (rename(".tmpconfig", name)) + return 1; + + return 0; +} + +static int sym_change_count; +static void (*conf_changed_callback)(void); + +void sym_set_change_count(int count) _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:24:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24: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 1aBcqQ-0005yD-Da; Wed, 23 Dec 2015 06:24:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqO-0005y1-Al for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:16 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 44/50-13905-F0E3A765; Wed, 23 Dec 2015 06:24:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1450851853!12104012!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8436 invoked from network); 23 Dec 2015 06:24:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:24:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqL-0000nr-ND for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqL-00076q-Er for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:13 +0000 Date: Wed, 23 Dec 2015 06:24:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: build Kconfig and config rules X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9ea93d0abf7954f9129f8e24d5db2d919185c8c Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:27:06 2015 +0100 build: build Kconfig and config rules Wire in the Kconfig build and makefile rules to be able to generate valid configuration files to be used by the build process but don't actually use the output for affecting the Xen build. To avoid dragging in most of Kbuild from the Linux kernel this adds Makefile.kconfig which is our real entry point into building kconfig. This attempts to reuse as much of the Xen build bits as possible and wire them to the bits that kconfig expects to be provided by Kbuild. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- .gitignore | 6 +++ xen/Kconfig | 24 ++++++++++++ xen/Makefile | 21 ++++++++++ xen/arch/arm/Kconfig | 31 +++++++++++++++ xen/arch/x86/Kconfig | 17 ++++++++ xen/common/Kconfig | 4 ++ xen/drivers/Kconfig | 3 + xen/tools/kconfig/Makefile.kconfig | 66 +++++++++++++++++++++++++++++++++ 8 files changed, 172 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 91e1430..0a0f3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -217,6 +217,8 @@ tools/xentrace/tbctl tools/xentrace/xenctx tools/xentrace/xentrace xen/.banner +xen/.config +xen/.config.old xen/System.map xen/arch/arm/asm-offsets.s xen/arch/arm/xen.lds @@ -239,10 +241,14 @@ xen/include/headers++.chk xen/include/asm xen/include/asm-*/asm-offsets.h xen/include/compat/* +xen/include/config/ +xen/include/generated/ xen/include/public/public xen/include/xen/*.new xen/include/xen/acm_policy.h xen/include/xen/compile.h +xen/tools/kconfig/.tmp_gtkcheck +xen/tools/kconfig/.tmp_qtcheck xen/tools/symbols xen/xsm/flask/include/av_perm_to_string.h xen/xsm/flask/include/av_permissions.h diff --git a/xen/Kconfig b/xen/Kconfig new file mode 100644 index 0000000..ffe3f45 --- /dev/null +++ b/xen/Kconfig @@ -0,0 +1,24 @@ +# +# For a description of the syntax of this configuration file, +# see docs/misc/kconfig-language.txt +# +mainmenu "Xen/$SRCARCH $XEN_FULLVERSION Configuration" + +config SRCARCH + string + option env="SRCARCH" + +config ARCH + string + option env="ARCH" + +source "arch/$SRCARCH/Kconfig" + +config XEN_FULLVERSION + string + option env="XEN_FULLVERSION" + +config DEFCONFIG_LIST + string + option defconfig_list + default "$ARCH_DEFCONFIG" diff --git a/xen/Makefile b/xen/Makefile index 62c3a6e..fd16650 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -20,6 +20,13 @@ MAKEFLAGS += -rR EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi +# Don't break if the build process wasn't called from the top level +# we need XEN_TARGET_ARCH to generate the proper config +include $(XEN_ROOT)/Config.mk + +# Allow someone to change their config file +export KCONFIG_CONFIG ?= .config + .PHONY: default default: build @@ -91,6 +98,7 @@ _clean: delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean $(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig clean find . \( -name "*.o" -o -name ".*.d" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET)-syms *~ core rm -f include/asm-*/asm-offsets.h @@ -220,3 +228,16 @@ FORCE: %/: FORCE $(MAKE) -f $(BASEDIR)/Rules.mk -C $* built_in.o built_in_bin.o + +kconfig := silentoldconfig oldconfig config menuconfig defconfig \ + nconfig xconfig gconfig savedefconfig listnewconfig olddefconfig +.PHONY: $(kconfig) +$(kconfig): + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) $@ + +include/config/%.conf: include/config/auto.conf.cmd + $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) silentoldconfig + +# Allow people to just run `make` as before and not force them to configure +$(KCONFIG_CONFIG): + $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) defconfig diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig new file mode 100644 index 0000000..91b96bc --- /dev/null +++ b/xen/arch/arm/Kconfig @@ -0,0 +1,31 @@ +# Select 32 or 64 bit +config 64BIT + bool + default ARCH != "arm32" + help + Say yes to build a 64-bit Xen + Say no to build a 32-bit Xen + +config ARM_32 + def_bool y + depends on !64BIT + +config ARM_64 + def_bool y + depends on 64BIT + +config ARM + def_bool y + +config ARCH_DEFCONFIG + string + default "arch/arm/configs/arm32_defconfig" if ARM_32 + default "arch/arm/configs/arm64_defconfig" if ARM_64 + +menu "Architecture Features" + +endmenu + +source "common/Kconfig" + +source "drivers/Kconfig" diff --git a/xen/arch/arm/configs/arm32_defconfig b/xen/arch/arm/configs/arm32_defconfig new file mode 100644 index 0000000..e69de29 diff --git a/xen/arch/arm/configs/arm64_defconfig b/xen/arch/arm/configs/arm64_defconfig new file mode 100644 index 0000000..e69de29 diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig new file mode 100644 index 0000000..9df34a4 --- /dev/null +++ b/xen/arch/x86/Kconfig @@ -0,0 +1,17 @@ +config X86_64 + def_bool y + +config X86 + def_bool y + +config ARCH_DEFCONFIG + string + default "arch/x86/configs/x86_64_defconfig" + +menu "Architecture Features" + +endmenu + +source "common/Kconfig" + +source "drivers/Kconfig" diff --git a/xen/arch/x86/configs/x86_64_defconfig b/xen/arch/x86/configs/x86_64_defconfig new file mode 100644 index 0000000..e69de29 diff --git a/xen/common/Kconfig b/xen/common/Kconfig new file mode 100644 index 0000000..0251856 --- /dev/null +++ b/xen/common/Kconfig @@ -0,0 +1,4 @@ + +menu "Common Features" + +endmenu diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig new file mode 100644 index 0000000..7bc7b6e --- /dev/null +++ b/xen/drivers/Kconfig @@ -0,0 +1,3 @@ +menu "Device Drivers" + +endmenu diff --git a/xen/tools/kconfig/Makefile.kconfig b/xen/tools/kconfig/Makefile.kconfig new file mode 100644 index 0000000..574ce1d --- /dev/null +++ b/xen/tools/kconfig/Makefile.kconfig @@ -0,0 +1,66 @@ +# xen/tools/kconfig + +# default rule to do nothing +all: + +# Xen doesn't have a silent build flag +quiet := silent_ +Q := @ +kecho := : + +# eventually you'll want to do out of tree builds +srctree := $(XEN_ROOT)/xen +objtree := $(srctree) +src := tools/kconfig +obj := $(src) +KBUILD_SRC := + +# handle functions (most of these lifted from different Linux makefiles +dot-target = $(dir $@).$(notdir $@) +depfile = $(subst $(comma),,$(dot-target).d) +basetarget = $(basename $(notdir $@)) +cmd = $(cmd_$(1)) +if_changed = $(cmd_$(1)) +if_changed_dep = $(cmd_$(1)) + +define multi_depend +$(foreach m, $(notdir $1), \ + $(eval $(obj)/$m: \ + $(addprefix $(obj)/, $(foreach s, $3, $($(m:%$(strip $2)=%$(s))))))) +endef + +# Set our default defconfig file +KBUILD_DEFCONFIG := $(ARCH)_defconfig + +# provide our shell +CONFIG_SHELL := $(SHELL) + +# provide the host compiler +HOSTCC := gcc +HOSTCXX := g++ + +# force target +PHONY += FORCE + +FORCE: + +SRCARCH = $(shell echo $(ARCH) | \ + sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g') +export SRCARCH + +# include the original Makefile and Makefile.host from Linux +include $(src)/Makefile +include $(src)/Makefile.host + +# clean up rule +clean-deps = $(foreach f,$(host-cobjs) $(host-cxxobjs),$(dir $f).$(notdir $f).d) +clean-shipped = $(patsubst %_shipped,%,$(wildcard $(obj)/*_shipped)) + +clean: + rm -rf $(clean-files) + rm -rf $(clean-deps) + rm -rf $(host-csingle) $(host-cmulti) $(host-cxxmulti) $(host-cobjs) $(host-cxxobjs) + rm -rf $(clean-shipped) + +$(obj)/zconf%: $(src)/zconf%_shipped + @cp -f $< $@ -- generated by git-patchbot for /home/xen/git/xen.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 23 06:24:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24: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 1aBcqQ-0005yD-Da; Wed, 23 Dec 2015 06:24:18 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqO-0005y1-Al for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:16 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id 44/50-13905-F0E3A765; Wed, 23 Dec 2015 06:24:15 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1450851853!12104012!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8436 invoked from network); 23 Dec 2015 06:24:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:24:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqL-0000nr-ND for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqL-00076q-Er for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:13 +0000 Date: Wed, 23 Dec 2015 06:24:13 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: build Kconfig and config rules X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e9ea93d0abf7954f9129f8e24d5db2d919185c8c Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:27:06 2015 +0100 build: build Kconfig and config rules Wire in the Kconfig build and makefile rules to be able to generate valid configuration files to be used by the build process but don't actually use the output for affecting the Xen build. To avoid dragging in most of Kbuild from the Linux kernel this adds Makefile.kconfig which is our real entry point into building kconfig. This attempts to reuse as much of the Xen build bits as possible and wire them to the bits that kconfig expects to be provided by Kbuild. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- .gitignore | 6 +++ xen/Kconfig | 24 ++++++++++++ xen/Makefile | 21 ++++++++++ xen/arch/arm/Kconfig | 31 +++++++++++++++ xen/arch/x86/Kconfig | 17 ++++++++ xen/common/Kconfig | 4 ++ xen/drivers/Kconfig | 3 + xen/tools/kconfig/Makefile.kconfig | 66 +++++++++++++++++++++++++++++++++ 8 files changed, 172 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 91e1430..0a0f3ad 100644 --- a/.gitignore +++ b/.gitignore @@ -217,6 +217,8 @@ tools/xentrace/tbctl tools/xentrace/xenctx tools/xentrace/xentrace xen/.banner +xen/.config +xen/.config.old xen/System.map xen/arch/arm/asm-offsets.s xen/arch/arm/xen.lds @@ -239,10 +241,14 @@ xen/include/headers++.chk xen/include/asm xen/include/asm-*/asm-offsets.h xen/include/compat/* +xen/include/config/ +xen/include/generated/ xen/include/public/public xen/include/xen/*.new xen/include/xen/acm_policy.h xen/include/xen/compile.h +xen/tools/kconfig/.tmp_gtkcheck +xen/tools/kconfig/.tmp_qtcheck xen/tools/symbols xen/xsm/flask/include/av_perm_to_string.h xen/xsm/flask/include/av_permissions.h diff --git a/xen/Kconfig b/xen/Kconfig new file mode 100644 index 0000000..ffe3f45 --- /dev/null +++ b/xen/Kconfig @@ -0,0 +1,24 @@ +# +# For a description of the syntax of this configuration file, +# see docs/misc/kconfig-language.txt +# +mainmenu "Xen/$SRCARCH $XEN_FULLVERSION Configuration" + +config SRCARCH + string + option env="SRCARCH" + +config ARCH + string + option env="ARCH" + +source "arch/$SRCARCH/Kconfig" + +config XEN_FULLVERSION + string + option env="XEN_FULLVERSION" + +config DEFCONFIG_LIST + string + option defconfig_list + default "$ARCH_DEFCONFIG" diff --git a/xen/Makefile b/xen/Makefile index 62c3a6e..fd16650 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -20,6 +20,13 @@ MAKEFLAGS += -rR EFI_MOUNTPOINT ?= $(BOOT_DIR)/efi +# Don't break if the build process wasn't called from the top level +# we need XEN_TARGET_ARCH to generate the proper config +include $(XEN_ROOT)/Config.mk + +# Allow someone to change their config file +export KCONFIG_CONFIG ?= .config + .PHONY: default default: build @@ -91,6 +98,7 @@ _clean: delete-unfresh-files $(MAKE) -f $(BASEDIR)/Rules.mk -C xsm clean $(MAKE) -f $(BASEDIR)/Rules.mk -C crypto clean $(MAKE) -f $(BASEDIR)/Rules.mk -C arch/$(TARGET_ARCH) clean + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig clean find . \( -name "*.o" -o -name ".*.d" \) -exec rm -f {} \; rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi $(TARGET)-syms *~ core rm -f include/asm-*/asm-offsets.h @@ -220,3 +228,16 @@ FORCE: %/: FORCE $(MAKE) -f $(BASEDIR)/Rules.mk -C $* built_in.o built_in_bin.o + +kconfig := silentoldconfig oldconfig config menuconfig defconfig \ + nconfig xconfig gconfig savedefconfig listnewconfig olddefconfig +.PHONY: $(kconfig) +$(kconfig): + $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) $@ + +include/config/%.conf: include/config/auto.conf.cmd + $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) silentoldconfig + +# Allow people to just run `make` as before and not force them to configure +$(KCONFIG_CONFIG): + $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) defconfig diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig new file mode 100644 index 0000000..91b96bc --- /dev/null +++ b/xen/arch/arm/Kconfig @@ -0,0 +1,31 @@ +# Select 32 or 64 bit +config 64BIT + bool + default ARCH != "arm32" + help + Say yes to build a 64-bit Xen + Say no to build a 32-bit Xen + +config ARM_32 + def_bool y + depends on !64BIT + +config ARM_64 + def_bool y + depends on 64BIT + +config ARM + def_bool y + +config ARCH_DEFCONFIG + string + default "arch/arm/configs/arm32_defconfig" if ARM_32 + default "arch/arm/configs/arm64_defconfig" if ARM_64 + +menu "Architecture Features" + +endmenu + +source "common/Kconfig" + +source "drivers/Kconfig" diff --git a/xen/arch/arm/configs/arm32_defconfig b/xen/arch/arm/configs/arm32_defconfig new file mode 100644 index 0000000..e69de29 diff --git a/xen/arch/arm/configs/arm64_defconfig b/xen/arch/arm/configs/arm64_defconfig new file mode 100644 index 0000000..e69de29 diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig new file mode 100644 index 0000000..9df34a4 --- /dev/null +++ b/xen/arch/x86/Kconfig @@ -0,0 +1,17 @@ +config X86_64 + def_bool y + +config X86 + def_bool y + +config ARCH_DEFCONFIG + string + default "arch/x86/configs/x86_64_defconfig" + +menu "Architecture Features" + +endmenu + +source "common/Kconfig" + +source "drivers/Kconfig" diff --git a/xen/arch/x86/configs/x86_64_defconfig b/xen/arch/x86/configs/x86_64_defconfig new file mode 100644 index 0000000..e69de29 diff --git a/xen/common/Kconfig b/xen/common/Kconfig new file mode 100644 index 0000000..0251856 --- /dev/null +++ b/xen/common/Kconfig @@ -0,0 +1,4 @@ + +menu "Common Features" + +endmenu diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig new file mode 100644 index 0000000..7bc7b6e --- /dev/null +++ b/xen/drivers/Kconfig @@ -0,0 +1,3 @@ +menu "Device Drivers" + +endmenu diff --git a/xen/tools/kconfig/Makefile.kconfig b/xen/tools/kconfig/Makefile.kconfig new file mode 100644 index 0000000..574ce1d --- /dev/null +++ b/xen/tools/kconfig/Makefile.kconfig @@ -0,0 +1,66 @@ +# xen/tools/kconfig + +# default rule to do nothing +all: + +# Xen doesn't have a silent build flag +quiet := silent_ +Q := @ +kecho := : + +# eventually you'll want to do out of tree builds +srctree := $(XEN_ROOT)/xen +objtree := $(srctree) +src := tools/kconfig +obj := $(src) +KBUILD_SRC := + +# handle functions (most of these lifted from different Linux makefiles +dot-target = $(dir $@).$(notdir $@) +depfile = $(subst $(comma),,$(dot-target).d) +basetarget = $(basename $(notdir $@)) +cmd = $(cmd_$(1)) +if_changed = $(cmd_$(1)) +if_changed_dep = $(cmd_$(1)) + +define multi_depend +$(foreach m, $(notdir $1), \ + $(eval $(obj)/$m: \ + $(addprefix $(obj)/, $(foreach s, $3, $($(m:%$(strip $2)=%$(s))))))) +endef + +# Set our default defconfig file +KBUILD_DEFCONFIG := $(ARCH)_defconfig + +# provide our shell +CONFIG_SHELL := $(SHELL) + +# provide the host compiler +HOSTCC := gcc +HOSTCXX := g++ + +# force target +PHONY += FORCE + +FORCE: + +SRCARCH = $(shell echo $(ARCH) | \ + sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g') +export SRCARCH + +# include the original Makefile and Makefile.host from Linux +include $(src)/Makefile +include $(src)/Makefile.host + +# clean up rule +clean-deps = $(foreach f,$(host-cobjs) $(host-cxxobjs),$(dir $f).$(notdir $f).d) +clean-shipped = $(patsubst %_shipped,%,$(wildcard $(obj)/*_shipped)) + +clean: + rm -rf $(clean-files) + rm -rf $(clean-deps) + rm -rf $(host-csingle) $(host-cmulti) $(host-cxxmulti) $(host-cobjs) $(host-cxxobjs) + rm -rf $(clean-shipped) + +$(obj)/zconf%: $(src)/zconf%_shipped + @cp -f $< $@ -- generated by git-patchbot for /home/xen/git/xen.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 23 06:24:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24: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 1aBcqa-0005zg-HY; Wed, 23 Dec 2015 06:24:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqZ-0005zT-1W for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:27 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id E0/D3-07651-A1E3A765; Wed, 23 Dec 2015 06:24:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1450851864!4852188!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11576 invoked from network); 23 Dec 2015 06:24:25 -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; 23 Dec 2015 06:24:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqW-0000o3-C4 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqW-00077Q-0u for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:24 +0000 Date: Wed, 23 Dec 2015 06:24:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: use generated Kconfig options for 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 a75bdd57ca746682ad4dca87d79963a7243cc008 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:40:05 2015 +0100 build: use generated Kconfig options for Xen Switches the build system to rely on the options and flags generated by Kconfig to control what gets built and how. Follow on patches will convert items to be prefixed with CONFIG_. Additionally remove a #define that resulted in a redefined variable when building for arm. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/Makefile | 9 ++++++++- xen/Rules.mk | 2 ++ xen/drivers/passthrough/arm/smmu.c | 4 ---- xen/include/xen/config.h | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index fd16650..9023863 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -33,6 +33,8 @@ default: build .PHONY: dist dist: install +build install:: include/config/auto.conf + .PHONY: build install uninstall clean distclean cscope TAGS tags MAP gtags build install uninstall debug clean distclean cscope TAGS tags MAP gtags:: ifneq ($(XEN_TARGET_ARCH),x86_32) @@ -235,9 +237,14 @@ kconfig := silentoldconfig oldconfig config menuconfig defconfig \ $(kconfig): $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) $@ -include/config/%.conf: include/config/auto.conf.cmd +include/config/%.conf: include/config/auto.conf.cmd $(KCONFIG_CONFIG) $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) silentoldconfig # Allow people to just run `make` as before and not force them to configure $(KCONFIG_CONFIG): $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) defconfig + +# Break the dependency chain for the first run +include/config/auto.conf.cmd: ; + +-include $(BASEDIR)/include/config/auto.conf.cmd diff --git a/xen/Rules.mk b/xen/Rules.mk index 02db110..d696206 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -12,6 +12,8 @@ frame_pointer ?= n lto ?= n kexec ?= y +-include $(BASEDIR)/include/config/auto.conf + include $(XEN_ROOT)/Config.mk # Hardcoded configuration implications and dependencies. diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index bb08827..62da087 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -196,10 +196,6 @@ static inline int pci_for_each_dma_alias(struct pci_dev *pdev, #define PHYS_MASK_SHIFT PADDR_BITS typedef paddr_t phys_addr_t; -#ifdef CONFIG_ARM_64 -# define CONFIG_64BIT -#endif - #define VA_BITS 0 /* Only used for configuring stage-1 input size */ /* The macro ACCESS_ONCE start to be replaced in Linux in favor of diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 9b4b6ef..7595599 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -7,6 +7,8 @@ #ifndef __XEN_CONFIG_H__ #define __XEN_CONFIG_H__ +#include + #ifndef __ASSEMBLY__ #include #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:24:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24: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 1aBcqa-0005zg-HY; Wed, 23 Dec 2015 06:24:28 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqZ-0005zT-1W for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:27 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id E0/D3-07651-A1E3A765; Wed, 23 Dec 2015 06:24:26 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1450851864!4852188!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11576 invoked from network); 23 Dec 2015 06:24:25 -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; 23 Dec 2015 06:24:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqW-0000o3-C4 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqW-00077Q-0u for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:24 +0000 Date: Wed, 23 Dec 2015 06:24:24 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: use generated Kconfig options for 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 a75bdd57ca746682ad4dca87d79963a7243cc008 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:40:05 2015 +0100 build: use generated Kconfig options for Xen Switches the build system to rely on the options and flags generated by Kconfig to control what gets built and how. Follow on patches will convert items to be prefixed with CONFIG_. Additionally remove a #define that resulted in a redefined variable when building for arm. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/Makefile | 9 ++++++++- xen/Rules.mk | 2 ++ xen/drivers/passthrough/arm/smmu.c | 4 ---- xen/include/xen/config.h | 2 ++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index fd16650..9023863 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -33,6 +33,8 @@ default: build .PHONY: dist dist: install +build install:: include/config/auto.conf + .PHONY: build install uninstall clean distclean cscope TAGS tags MAP gtags build install uninstall debug clean distclean cscope TAGS tags MAP gtags:: ifneq ($(XEN_TARGET_ARCH),x86_32) @@ -235,9 +237,14 @@ kconfig := silentoldconfig oldconfig config menuconfig defconfig \ $(kconfig): $(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) $@ -include/config/%.conf: include/config/auto.conf.cmd +include/config/%.conf: include/config/auto.conf.cmd $(KCONFIG_CONFIG) $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) silentoldconfig # Allow people to just run `make` as before and not force them to configure $(KCONFIG_CONFIG): $(Q)$(MAKE) -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(XEN_TARGET_ARCH) defconfig + +# Break the dependency chain for the first run +include/config/auto.conf.cmd: ; + +-include $(BASEDIR)/include/config/auto.conf.cmd diff --git a/xen/Rules.mk b/xen/Rules.mk index 02db110..d696206 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -12,6 +12,8 @@ frame_pointer ?= n lto ?= n kexec ?= y +-include $(BASEDIR)/include/config/auto.conf + include $(XEN_ROOT)/Config.mk # Hardcoded configuration implications and dependencies. diff --git a/xen/drivers/passthrough/arm/smmu.c b/xen/drivers/passthrough/arm/smmu.c index bb08827..62da087 100644 --- a/xen/drivers/passthrough/arm/smmu.c +++ b/xen/drivers/passthrough/arm/smmu.c @@ -196,10 +196,6 @@ static inline int pci_for_each_dma_alias(struct pci_dev *pdev, #define PHYS_MASK_SHIFT PADDR_BITS typedef paddr_t phys_addr_t; -#ifdef CONFIG_ARM_64 -# define CONFIG_64BIT -#endif - #define VA_BITS 0 /* Only used for configuring stage-1 input size */ /* The macro ACCESS_ONCE start to be replaced in Linux in favor of diff --git a/xen/include/xen/config.h b/xen/include/xen/config.h index 9b4b6ef..7595599 100644 --- a/xen/include/xen/config.h +++ b/xen/include/xen/config.h @@ -7,6 +7,8 @@ #ifndef __XEN_CONFIG_H__ #define __XEN_CONFIG_H__ +#include + #ifndef __ASSEMBLY__ #include #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:24:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqv-00061y-MW; Wed, 23 Dec 2015 06:24:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqt-00061l-HS for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:47 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E3/1B-22089-E2E3A765; Wed, 23 Dec 2015 06:24:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1450851885!12371049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64529 invoked from network); 23 Dec 2015 06:24:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:24:45 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqq-0000oG-Rr for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqp-000789-6B for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:44 +0000 Date: Wed, 23 Dec 2015 06:24:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PASSTHROUGH use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0d44c1f9461b830fde3675bf6dfcebafa41cb97 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:42:03 2015 +0100 build: convert HAS_PASSTHROUGH use to Kconfig Use the Kconfig generated HAS_PASSTHROUGH defines for the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/compat/memory.c | 4 ++-- xen/common/memory.c | 8 ++++---- xen/drivers/Kconfig | 1 + xen/drivers/Makefile | 2 +- xen/drivers/passthrough/Kconfig | 4 ++++ xen/include/xen/sched.h | 4 ++-- xen/include/xsm/dummy.h | 4 ++-- xen/include/xsm/xsm.h | 8 ++++---- xen/xsm/dummy.c | 4 ++-- xen/xsm/flask/hooks.c | 10 +++++----- 15 files changed, 29 insertions(+), 25 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index d696206..a822147 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -58,7 +58,6 @@ CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX -CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 91b96bc..0fd69a7 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -16,6 +16,7 @@ config ARM_64 config ARM def_bool y + select HAS_PASSTHROUGH config ARCH_DEFCONFIG string diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index b31770c..86d7b81 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -9,7 +9,6 @@ HAS_DEVICE_TREE := y HAS_VIDEO := y HAS_ARM_HDLCD := y -HAS_PASSTHROUGH := y HAS_PDX := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 9df34a4..3771256 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_PASSTHROUGH config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 637d252..07f0baa 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -8,7 +8,6 @@ HAS_VGA := y HAS_VIDEO := y HAS_CPUFREQ := y HAS_PCI := y -HAS_PASSTHROUGH := y HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index bb10993..19a914d 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -18,7 +18,7 @@ CHECK_TYPE(domid); CHECK_mem_access_op; CHECK_vmemrange; -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH struct get_reserved_device_memory { struct compat_reserved_device_memory_map map; unsigned int used_entries; @@ -340,7 +340,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH case XENMEM_reserved_device_memory_map: { struct get_reserved_device_memory grdm; diff --git a/xen/common/memory.c b/xen/common/memory.c index efb6e1a..6b3a755 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -651,7 +651,7 @@ static int xenmem_add_to_physmap(struct domain *d, xatp->gpfn += start; xatp->size -= start; -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH if ( need_iommu(d) ) this_cpu(iommu_dont_flush_iotlb) = 1; #endif @@ -674,7 +674,7 @@ static int xenmem_add_to_physmap(struct domain *d, } } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH if ( need_iommu(d) ) { this_cpu(iommu_dont_flush_iotlb) = 0; @@ -801,7 +801,7 @@ static int construct_memop_from_reservation( return 0; } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH struct get_reserved_device_memory { struct xen_reserved_device_memory_map map; unsigned int used_entries; @@ -1245,7 +1245,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH case XENMEM_reserved_device_memory_map: { struct get_reserved_device_memory grdm; diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index 7bc7b6e..57311cc 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,3 +1,4 @@ menu "Device Drivers" +source "drivers/passthrough/Kconfig" endmenu diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index 9c70f20..e283870 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -1,6 +1,6 @@ subdir-y += char subdir-$(HAS_CPUFREQ) += cpufreq subdir-$(HAS_PCI) += pci -subdir-$(HAS_PASSTHROUGH) += passthrough +subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(HAS_ACPI) += acpi subdir-$(HAS_VIDEO) += video diff --git a/xen/drivers/passthrough/Kconfig b/xen/drivers/passthrough/Kconfig new file mode 100644 index 0000000..05a8daf --- /dev/null +++ b/xen/drivers/passthrough/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_PASSTHROUGH if device pass through is supported +config HAS_PASSTHROUGH + bool diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 3729b0f..fc61fc3 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -366,7 +366,7 @@ struct domain int64_t time_offset_seconds; -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH /* Does this guest need iommu mappings (-1 meaning "being set up")? */ s8 need_iommu; #endif @@ -839,7 +839,7 @@ void watchdog_domain_destroy(struct domain *d); #define has_hvm_container_vcpu(v) (has_hvm_container_domain((v)->domain)) #define is_pinned_vcpu(v) ((v)->domain->is_pinned || \ cpumask_weight((v)->cpu_hard_affinity) == 1) -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH #define need_iommu(d) ((d)->need_iommu) #else #define need_iommu(d) (0) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index e43f2a1..50b94a1 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -323,7 +323,7 @@ static XSM_INLINE int xsm_get_vnumainfo(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); @@ -350,7 +350,7 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) static XSM_INLINE int xsm_test_assign_dtdevice(XSM_DEFAULT_ARG const char *dtpath) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index f48cf60..e5cb088 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -114,14 +114,14 @@ struct xsm_operations { int (*iomem_mapping) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); int (*pci_config_permission) (struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access); -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) int (*get_device_group) (uint32_t machine_bdf); int (*test_assign_device) (uint32_t machine_bdf); int (*assign_device) (struct domain *d, uint32_t machine_bdf); int (*deassign_device) (struct domain *d, uint32_t machine_bdf); #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) int (*test_assign_dtdevice) (const char *dtpath); int (*assign_dtdevice) (struct domain *d, const char *dtpath); int (*deassign_dtdevice) (struct domain *d, const char *dtpath); @@ -469,7 +469,7 @@ static inline int xsm_pci_config_permission (xsm_default_t def, struct domain *d return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); } -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->get_device_group(machine_bdf); @@ -491,7 +491,7 @@ static inline int xsm_deassign_device(xsm_default_t def, struct domain *d, uint3 } #endif /* HAS_PASSTHROUGH && HAS_PCI) */ -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) static inline int xsm_assign_dtdevice(xsm_default_t def, struct domain *d, const char *dtpath) { diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 618a96e..036db4b 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -89,14 +89,14 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, pci_config_permission); set_to_dummy_if_null(ops, get_vnumainfo); -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) set_to_dummy_if_null(ops, get_device_group); set_to_dummy_if_null(ops, test_assign_device); set_to_dummy_if_null(ops, assign_device); set_to_dummy_if_null(ops, deassign_device); #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) set_to_dummy_if_null(ops, test_assign_dtdevice); set_to_dummy_if_null(ops, assign_dtdevice); set_to_dummy_if_null(ops, deassign_dtdevice); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index da8d287..3f4ceea 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -588,7 +588,7 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_ioport_permission: case XEN_DOMCTL_ioport_mapping: #endif -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH /* * These have individual XSM hooks * (drivers/passthrough/{pci,device_tree.c) @@ -1213,7 +1213,7 @@ static int flask_mem_sharing(struct domain *d) } #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) static int flask_get_device_group(uint32_t machine_bdf) { u32 rsid; @@ -1279,7 +1279,7 @@ static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) } #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) static int flask_test_assign_dtdevice(const char *dtpath) { u32 rsid; @@ -1725,14 +1725,14 @@ static struct xsm_operations flask_ops = { .remove_from_physmap = flask_remove_from_physmap, .map_gmfn_foreign = flask_map_gmfn_foreign, -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) .get_device_group = flask_get_device_group, .test_assign_device = flask_test_assign_device, .assign_device = flask_assign_device, .deassign_device = flask_deassign_device, #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) .test_assign_dtdevice = flask_test_assign_dtdevice, .assign_dtdevice = flask_assign_dtdevice, .deassign_dtdevice = flask_deassign_dtdevice, -- generated by git-patchbot for /home/xen/git/xen.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 23 06:24:50 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:24:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqv-00061y-MW; Wed, 23 Dec 2015 06:24:49 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqt-00061l-HS for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:47 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id E3/1B-22089-E2E3A765; Wed, 23 Dec 2015 06:24:46 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1450851885!12371049!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64529 invoked from network); 23 Dec 2015 06:24:45 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-12.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:24:45 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcqq-0000oG-Rr for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:44 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcqp-000789-6B for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:44 +0000 Date: Wed, 23 Dec 2015 06:24:43 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PASSTHROUGH use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e0d44c1f9461b830fde3675bf6dfcebafa41cb97 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:42:03 2015 +0100 build: convert HAS_PASSTHROUGH use to Kconfig Use the Kconfig generated HAS_PASSTHROUGH defines for the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/compat/memory.c | 4 ++-- xen/common/memory.c | 8 ++++---- xen/drivers/Kconfig | 1 + xen/drivers/Makefile | 2 +- xen/drivers/passthrough/Kconfig | 4 ++++ xen/include/xen/sched.h | 4 ++-- xen/include/xsm/dummy.h | 4 ++-- xen/include/xsm/xsm.h | 8 ++++---- xen/xsm/dummy.c | 4 ++-- xen/xsm/flask/hooks.c | 10 +++++----- 15 files changed, 29 insertions(+), 25 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index d696206..a822147 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -58,7 +58,6 @@ CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX -CFLAGS-$(HAS_PASSTHROUGH) += -DHAS_PASSTHROUGH CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 91b96bc..0fd69a7 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -16,6 +16,7 @@ config ARM_64 config ARM def_bool y + select HAS_PASSTHROUGH config ARCH_DEFCONFIG string diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index b31770c..86d7b81 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -9,7 +9,6 @@ HAS_DEVICE_TREE := y HAS_VIDEO := y HAS_ARM_HDLCD := y -HAS_PASSTHROUGH := y HAS_PDX := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 9df34a4..3771256 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_PASSTHROUGH config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 637d252..07f0baa 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -8,7 +8,6 @@ HAS_VGA := y HAS_VIDEO := y HAS_CPUFREQ := y HAS_PCI := y -HAS_PASSTHROUGH := y HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index bb10993..19a914d 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -18,7 +18,7 @@ CHECK_TYPE(domid); CHECK_mem_access_op; CHECK_vmemrange; -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH struct get_reserved_device_memory { struct compat_reserved_device_memory_map map; unsigned int used_entries; @@ -340,7 +340,7 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) break; } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH case XENMEM_reserved_device_memory_map: { struct get_reserved_device_memory grdm; diff --git a/xen/common/memory.c b/xen/common/memory.c index efb6e1a..6b3a755 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -651,7 +651,7 @@ static int xenmem_add_to_physmap(struct domain *d, xatp->gpfn += start; xatp->size -= start; -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH if ( need_iommu(d) ) this_cpu(iommu_dont_flush_iotlb) = 1; #endif @@ -674,7 +674,7 @@ static int xenmem_add_to_physmap(struct domain *d, } } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH if ( need_iommu(d) ) { this_cpu(iommu_dont_flush_iotlb) = 0; @@ -801,7 +801,7 @@ static int construct_memop_from_reservation( return 0; } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH struct get_reserved_device_memory { struct xen_reserved_device_memory_map map; unsigned int used_entries; @@ -1245,7 +1245,7 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) break; } -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH case XENMEM_reserved_device_memory_map: { struct get_reserved_device_memory grdm; diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index 7bc7b6e..57311cc 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,3 +1,4 @@ menu "Device Drivers" +source "drivers/passthrough/Kconfig" endmenu diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index 9c70f20..e283870 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -1,6 +1,6 @@ subdir-y += char subdir-$(HAS_CPUFREQ) += cpufreq subdir-$(HAS_PCI) += pci -subdir-$(HAS_PASSTHROUGH) += passthrough +subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(HAS_ACPI) += acpi subdir-$(HAS_VIDEO) += video diff --git a/xen/drivers/passthrough/Kconfig b/xen/drivers/passthrough/Kconfig new file mode 100644 index 0000000..05a8daf --- /dev/null +++ b/xen/drivers/passthrough/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_PASSTHROUGH if device pass through is supported +config HAS_PASSTHROUGH + bool diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 3729b0f..fc61fc3 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -366,7 +366,7 @@ struct domain int64_t time_offset_seconds; -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH /* Does this guest need iommu mappings (-1 meaning "being set up")? */ s8 need_iommu; #endif @@ -839,7 +839,7 @@ void watchdog_domain_destroy(struct domain *d); #define has_hvm_container_vcpu(v) (has_hvm_container_domain((v)->domain)) #define is_pinned_vcpu(v) ((v)->domain->is_pinned || \ cpumask_weight((v)->cpu_hard_affinity) == 1) -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH #define need_iommu(d) ((d)->need_iommu) #else #define need_iommu(d) (0) diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index e43f2a1..50b94a1 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -323,7 +323,7 @@ static XSM_INLINE int xsm_get_vnumainfo(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); @@ -350,7 +350,7 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) static XSM_INLINE int xsm_test_assign_dtdevice(XSM_DEFAULT_ARG const char *dtpath) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index f48cf60..e5cb088 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -114,14 +114,14 @@ struct xsm_operations { int (*iomem_mapping) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); int (*pci_config_permission) (struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access); -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) int (*get_device_group) (uint32_t machine_bdf); int (*test_assign_device) (uint32_t machine_bdf); int (*assign_device) (struct domain *d, uint32_t machine_bdf); int (*deassign_device) (struct domain *d, uint32_t machine_bdf); #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) int (*test_assign_dtdevice) (const char *dtpath); int (*assign_dtdevice) (struct domain *d, const char *dtpath); int (*deassign_dtdevice) (struct domain *d, const char *dtpath); @@ -469,7 +469,7 @@ static inline int xsm_pci_config_permission (xsm_default_t def, struct domain *d return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); } -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->get_device_group(machine_bdf); @@ -491,7 +491,7 @@ static inline int xsm_deassign_device(xsm_default_t def, struct domain *d, uint3 } #endif /* HAS_PASSTHROUGH && HAS_PCI) */ -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) static inline int xsm_assign_dtdevice(xsm_default_t def, struct domain *d, const char *dtpath) { diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 618a96e..036db4b 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -89,14 +89,14 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, pci_config_permission); set_to_dummy_if_null(ops, get_vnumainfo); -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) set_to_dummy_if_null(ops, get_device_group); set_to_dummy_if_null(ops, test_assign_device); set_to_dummy_if_null(ops, assign_device); set_to_dummy_if_null(ops, deassign_device); #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) set_to_dummy_if_null(ops, test_assign_dtdevice); set_to_dummy_if_null(ops, assign_dtdevice); set_to_dummy_if_null(ops, deassign_dtdevice); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index da8d287..3f4ceea 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -588,7 +588,7 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_ioport_permission: case XEN_DOMCTL_ioport_mapping: #endif -#ifdef HAS_PASSTHROUGH +#ifdef CONFIG_HAS_PASSTHROUGH /* * These have individual XSM hooks * (drivers/passthrough/{pci,device_tree.c) @@ -1213,7 +1213,7 @@ static int flask_mem_sharing(struct domain *d) } #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) static int flask_get_device_group(uint32_t machine_bdf) { u32 rsid; @@ -1279,7 +1279,7 @@ static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) } #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) static int flask_test_assign_dtdevice(const char *dtpath) { u32 rsid; @@ -1725,14 +1725,14 @@ static struct xsm_operations flask_ops = { .remove_from_physmap = flask_remove_from_physmap, .map_gmfn_foreign = flask_map_gmfn_foreign, -#if defined(HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) .get_device_group = flask_get_device_group, .test_assign_device = flask_test_assign_device, .assign_device = flask_assign_device, .deassign_device = flask_deassign_device, #endif -#if defined(HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) .test_assign_dtdevice = flask_test_assign_dtdevice, .assign_dtdevice = flask_assign_dtdevice, .deassign_dtdevice = flask_deassign_dtdevice, -- generated by git-patchbot for /home/xen/git/xen.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 23 06:25:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcr8-000648-Rk; Wed, 23 Dec 2015 06:25:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcr7-00063q-2Q for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:01 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 2A/E8-24856-C3E3A765; Wed, 23 Dec 2015 06:25:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1450851898!12086656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24827 invoked from network); 23 Dec 2015 06:24:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:24:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcr4-0000oP-Fn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcr1-00078p-OB for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:57 +0000 Date: Wed, 23 Dec 2015 06:24:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_DEVICE_TREE use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7bb2a30a3e86b24883df9d606fbd57b9875fda3 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:43:24 2015 +0100 build: convert HAS_DEVICE_TREE use to Kconfig Use the Kconfig generated CONFIG_HAS_DEVICE_TREE defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/common/Kconfig | 4 ++++ xen/common/Makefile | 4 ++-- xen/drivers/char/ns16550.c | 4 ++-- xen/drivers/passthrough/Makefile | 2 +- xen/drivers/passthrough/iommu.c | 2 +- xen/include/asm-arm/device.h | 2 +- xen/include/xen/hvm/iommu.h | 2 +- xen/include/xen/iommu.h | 2 +- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 8 ++++---- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- xen/xsm/xsm_core.c | 2 +- xen/xsm/xsm_policy.c | 4 ++-- 17 files changed, 25 insertions(+), 22 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index a822147..10e0b9d 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -58,7 +58,6 @@ CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX -CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 0fd69a7..93e64f6 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -16,6 +16,7 @@ config ARM_64 config ARM def_bool y + select HAS_DEVICE_TREE select HAS_PASSTHROUGH config ARCH_DEFCONFIG diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 86d7b81..4725374 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -6,7 +6,6 @@ # 'make clean' before rebuilding. # -HAS_DEVICE_TREE := y HAS_VIDEO := y HAS_ARM_HDLCD := y HAS_PDX := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0251856..53ca33f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -1,4 +1,8 @@ menu "Common Features" +# Select HAS_DEVICE_TREE if device tree is supported +config HAS_DEVICE_TREE + bool + endmenu diff --git a/xen/common/Makefile b/xen/common/Makefile index 3547c8e..5dc2bb2 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -2,7 +2,7 @@ obj-y += bitmap.o obj-$(HAS_CORE_PARKING) += core_parking.o obj-y += cpu.o obj-y += cpupool.o -obj-$(HAS_DEVICE_TREE) += device_tree.o +obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o obj-y += domctl.o obj-y += domain.o obj-y += event_2l.o @@ -70,4 +70,4 @@ subdir-$(x86_64) += hvm subdir-$(coverage) += gcov subdir-y += libelf -subdir-$(HAS_DEVICE_TREE) += libfdt +subdir-$(CONFIG_HAS_DEVICE_TREE) += libfdt diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 09abca8..e96e072 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -24,7 +24,7 @@ #include #include #include -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE #include #endif #ifdef CONFIG_X86 @@ -1131,7 +1131,7 @@ void __init ns16550_init(int index, struct ns16550_defaults *defaults) ns16550_parse_port_config(uart, (index == 0) ? opt_com1 : opt_com2); } -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE static int __init ns16550_uart_dt_init(struct dt_device_node *dev, const void *data) { diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index 16e9027..2bb5afb 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -6,4 +6,4 @@ subdir-$(arm) += arm obj-y += iommu.o obj-$(x86) += io.o obj-$(HAS_PCI) += pci.o -obj-$(HAS_DEVICE_TREE) += device_tree.o +obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 3d02550..8bb7df0 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -357,7 +357,7 @@ int iommu_do_domctl( ret = iommu_do_pci_domctl(domctl, d, u_domctl); #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE if ( ret == -ENODEV ) ret = iommu_do_dt_domctl(domctl, d, u_domctl); #endif diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 5d0a4cd..b455bdf 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -16,7 +16,7 @@ struct dev_archdata { struct device { enum device_type type; -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE struct dt_device_node *of_node; /* Used by drivers imported from Linux */ #endif struct dev_archdata archdata; diff --git a/xen/include/xen/hvm/iommu.h b/xen/include/xen/hvm/iommu.h index 106e08f..c817eec 100644 --- a/xen/include/xen/hvm/iommu.h +++ b/xen/include/xen/hvm/iommu.h @@ -29,7 +29,7 @@ struct hvm_iommu { /* iommu_ops */ const struct iommu_ops *platform_ops; -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE /* List of DT devices assigned to this domain */ struct list_head dt_devices; #endif diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 1f5d04a..ac9b7f8 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -109,7 +109,7 @@ void iommu_read_msi_from_ire(struct msi_desc *msi_desc, struct msi_msg *msg); #define PT_IRQ_TIME_OUT MILLISECS(8) #endif /* HAS_PCI */ -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE #include int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 50b94a1..c7de165 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -350,7 +350,7 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) static XSM_INLINE int xsm_test_assign_dtdevice(XSM_DEFAULT_ARG const char *dtpath) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index e5cb088..6ebb0e0 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -121,7 +121,7 @@ struct xsm_operations { int (*deassign_device) (struct domain *d, uint32_t machine_bdf); #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) int (*test_assign_dtdevice) (const char *dtpath); int (*assign_dtdevice) (struct domain *d, const char *dtpath); int (*deassign_dtdevice) (struct domain *d, const char *dtpath); @@ -491,7 +491,7 @@ static inline int xsm_deassign_device(xsm_default_t def, struct domain *d, uint3 } #endif /* HAS_PASSTHROUGH && HAS_PCI) */ -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) static inline int xsm_assign_dtdevice(xsm_default_t def, struct domain *d, const char *dtpath) { @@ -741,7 +741,7 @@ extern int xsm_multiboot_policy_init(unsigned long *module_map, void *(*bootstrap_map)(const module_t *)); #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE extern int xsm_dt_init(void); extern int xsm_dt_policy_init(void); #endif @@ -765,7 +765,7 @@ static inline int xsm_multiboot_init (unsigned long *module_map, } #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE static inline int xsm_dt_init(void) { return 0; diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 036db4b..a380da3 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -96,7 +96,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, deassign_device); #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) set_to_dummy_if_null(ops, test_assign_dtdevice); set_to_dummy_if_null(ops, assign_dtdevice); set_to_dummy_if_null(ops, deassign_dtdevice); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 3f4ceea..2650cc8 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1279,7 +1279,7 @@ static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) } #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) static int flask_test_assign_dtdevice(const char *dtpath) { u32 rsid; @@ -1732,7 +1732,7 @@ static struct xsm_operations flask_ops = { .deassign_device = flask_deassign_device, #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) .test_assign_dtdevice = flask_test_assign_dtdevice, .assign_dtdevice = flask_assign_dtdevice, .deassign_dtdevice = flask_deassign_dtdevice, diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 0ac6d03..2a74496 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -85,7 +85,7 @@ int __init xsm_multiboot_init(unsigned long *module_map, } #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE int __init xsm_dt_init(void) { int ret = 0; diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 6e0bb78..b60d822 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -23,7 +23,7 @@ #include #endif #include -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE # include # include #endif @@ -74,7 +74,7 @@ int __init xsm_multiboot_policy_init(unsigned long *module_map, } #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE int __init xsm_dt_policy_init(void) { struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_XSM); -- generated by git-patchbot for /home/xen/git/xen.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 23 06:25:02 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcr8-000648-Rk; Wed, 23 Dec 2015 06:25:02 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcr7-00063q-2Q for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:01 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 2A/E8-24856-C3E3A765; Wed, 23 Dec 2015 06:25:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1450851898!12086656!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24827 invoked from network); 23 Dec 2015 06:24:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-16.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:24:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcr4-0000oP-Fn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcr1-00078p-OB for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:24:57 +0000 Date: Wed, 23 Dec 2015 06:24:55 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_DEVICE_TREE use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e7bb2a30a3e86b24883df9d606fbd57b9875fda3 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:43:24 2015 +0100 build: convert HAS_DEVICE_TREE use to Kconfig Use the Kconfig generated CONFIG_HAS_DEVICE_TREE defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/common/Kconfig | 4 ++++ xen/common/Makefile | 4 ++-- xen/drivers/char/ns16550.c | 4 ++-- xen/drivers/passthrough/Makefile | 2 +- xen/drivers/passthrough/iommu.c | 2 +- xen/include/asm-arm/device.h | 2 +- xen/include/xen/hvm/iommu.h | 2 +- xen/include/xen/iommu.h | 2 +- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 8 ++++---- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- xen/xsm/xsm_core.c | 2 +- xen/xsm/xsm_policy.c | 4 ++-- 17 files changed, 25 insertions(+), 22 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index a822147..10e0b9d 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -58,7 +58,6 @@ CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX -CFLAGS-$(HAS_DEVICE_TREE) += -DHAS_DEVICE_TREE CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 0fd69a7..93e64f6 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -16,6 +16,7 @@ config ARM_64 config ARM def_bool y + select HAS_DEVICE_TREE select HAS_PASSTHROUGH config ARCH_DEFCONFIG diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 86d7b81..4725374 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -6,7 +6,6 @@ # 'make clean' before rebuilding. # -HAS_DEVICE_TREE := y HAS_VIDEO := y HAS_ARM_HDLCD := y HAS_PDX := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 0251856..53ca33f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -1,4 +1,8 @@ menu "Common Features" +# Select HAS_DEVICE_TREE if device tree is supported +config HAS_DEVICE_TREE + bool + endmenu diff --git a/xen/common/Makefile b/xen/common/Makefile index 3547c8e..5dc2bb2 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -2,7 +2,7 @@ obj-y += bitmap.o obj-$(HAS_CORE_PARKING) += core_parking.o obj-y += cpu.o obj-y += cpupool.o -obj-$(HAS_DEVICE_TREE) += device_tree.o +obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o obj-y += domctl.o obj-y += domain.o obj-y += event_2l.o @@ -70,4 +70,4 @@ subdir-$(x86_64) += hvm subdir-$(coverage) += gcov subdir-y += libelf -subdir-$(HAS_DEVICE_TREE) += libfdt +subdir-$(CONFIG_HAS_DEVICE_TREE) += libfdt diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 09abca8..e96e072 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -24,7 +24,7 @@ #include #include #include -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE #include #endif #ifdef CONFIG_X86 @@ -1131,7 +1131,7 @@ void __init ns16550_init(int index, struct ns16550_defaults *defaults) ns16550_parse_port_config(uart, (index == 0) ? opt_com1 : opt_com2); } -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE static int __init ns16550_uart_dt_init(struct dt_device_node *dev, const void *data) { diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index 16e9027..2bb5afb 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -6,4 +6,4 @@ subdir-$(arm) += arm obj-y += iommu.o obj-$(x86) += io.o obj-$(HAS_PCI) += pci.o -obj-$(HAS_DEVICE_TREE) += device_tree.o +obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 3d02550..8bb7df0 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -357,7 +357,7 @@ int iommu_do_domctl( ret = iommu_do_pci_domctl(domctl, d, u_domctl); #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE if ( ret == -ENODEV ) ret = iommu_do_dt_domctl(domctl, d, u_domctl); #endif diff --git a/xen/include/asm-arm/device.h b/xen/include/asm-arm/device.h index 5d0a4cd..b455bdf 100644 --- a/xen/include/asm-arm/device.h +++ b/xen/include/asm-arm/device.h @@ -16,7 +16,7 @@ struct dev_archdata { struct device { enum device_type type; -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE struct dt_device_node *of_node; /* Used by drivers imported from Linux */ #endif struct dev_archdata archdata; diff --git a/xen/include/xen/hvm/iommu.h b/xen/include/xen/hvm/iommu.h index 106e08f..c817eec 100644 --- a/xen/include/xen/hvm/iommu.h +++ b/xen/include/xen/hvm/iommu.h @@ -29,7 +29,7 @@ struct hvm_iommu { /* iommu_ops */ const struct iommu_ops *platform_ops; -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE /* List of DT devices assigned to this domain */ struct list_head dt_devices; #endif diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 1f5d04a..ac9b7f8 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -109,7 +109,7 @@ void iommu_read_msi_from_ire(struct msi_desc *msi_desc, struct msi_msg *msg); #define PT_IRQ_TIME_OUT MILLISECS(8) #endif /* HAS_PCI */ -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE #include int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 50b94a1..c7de165 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -350,7 +350,7 @@ static XSM_INLINE int xsm_deassign_device(XSM_DEFAULT_ARG struct domain *d, uint #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) static XSM_INLINE int xsm_test_assign_dtdevice(XSM_DEFAULT_ARG const char *dtpath) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index e5cb088..6ebb0e0 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -121,7 +121,7 @@ struct xsm_operations { int (*deassign_device) (struct domain *d, uint32_t machine_bdf); #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) int (*test_assign_dtdevice) (const char *dtpath); int (*assign_dtdevice) (struct domain *d, const char *dtpath); int (*deassign_dtdevice) (struct domain *d, const char *dtpath); @@ -491,7 +491,7 @@ static inline int xsm_deassign_device(xsm_default_t def, struct domain *d, uint3 } #endif /* HAS_PASSTHROUGH && HAS_PCI) */ -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) static inline int xsm_assign_dtdevice(xsm_default_t def, struct domain *d, const char *dtpath) { @@ -741,7 +741,7 @@ extern int xsm_multiboot_policy_init(unsigned long *module_map, void *(*bootstrap_map)(const module_t *)); #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE extern int xsm_dt_init(void); extern int xsm_dt_policy_init(void); #endif @@ -765,7 +765,7 @@ static inline int xsm_multiboot_init (unsigned long *module_map, } #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE static inline int xsm_dt_init(void) { return 0; diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 036db4b..a380da3 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -96,7 +96,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, deassign_device); #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) set_to_dummy_if_null(ops, test_assign_dtdevice); set_to_dummy_if_null(ops, assign_dtdevice); set_to_dummy_if_null(ops, deassign_dtdevice); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 3f4ceea..2650cc8 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1279,7 +1279,7 @@ static int flask_deassign_device(struct domain *d, uint32_t machine_bdf) } #endif /* HAS_PASSTHROUGH && HAS_PCI */ -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) static int flask_test_assign_dtdevice(const char *dtpath) { u32 rsid; @@ -1732,7 +1732,7 @@ static struct xsm_operations flask_ops = { .deassign_device = flask_deassign_device, #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_DEVICE_TREE) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_DEVICE_TREE) .test_assign_dtdevice = flask_test_assign_dtdevice, .assign_dtdevice = flask_assign_dtdevice, .deassign_dtdevice = flask_deassign_dtdevice, diff --git a/xen/xsm/xsm_core.c b/xen/xsm/xsm_core.c index 0ac6d03..2a74496 100644 --- a/xen/xsm/xsm_core.c +++ b/xen/xsm/xsm_core.c @@ -85,7 +85,7 @@ int __init xsm_multiboot_init(unsigned long *module_map, } #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE int __init xsm_dt_init(void) { int ret = 0; diff --git a/xen/xsm/xsm_policy.c b/xen/xsm/xsm_policy.c index 6e0bb78..b60d822 100644 --- a/xen/xsm/xsm_policy.c +++ b/xen/xsm/xsm_policy.c @@ -23,7 +23,7 @@ #include #endif #include -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE # include # include #endif @@ -74,7 +74,7 @@ int __init xsm_multiboot_policy_init(unsigned long *module_map, } #endif -#ifdef HAS_DEVICE_TREE +#ifdef CONFIG_HAS_DEVICE_TREE int __init xsm_dt_policy_init(void) { struct bootmodule *mod = boot_module_find_by_kind(BOOTMOD_XSM); -- generated by git-patchbot for /home/xen/git/xen.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 23 06:25:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrL-00066O-2r; Wed, 23 Dec 2015 06:25:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrK-00066D-Bi for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:14 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CF/36-31069-94E3A765; Wed, 23 Dec 2015 06:25:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1450851911!4852270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14134 invoked from network); 23 Dec 2015 06:25:12 -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; 23 Dec 2015 06:25:12 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrH-0000p2-HU for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcrF-0007BG-OY for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:10 +0000 Date: Wed, 23 Dec 2015 06:25:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PCI use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1809d50035963b26ea6e1dcccbe5e6b5ad47580b Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:44:22 2015 +0100 build: convert HAS_PCI use to Kconfig Use the Kconfig generated CONFIG_HAS_PCI defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/sysctl.c | 2 +- xen/drivers/Kconfig | 3 +++ xen/drivers/Makefile | 2 +- xen/drivers/char/ns16550.c | 24 ++++++++++++------------ xen/drivers/passthrough/Makefile | 2 +- xen/drivers/passthrough/iommu.c | 2 +- xen/drivers/pci/Kconfig | 4 ++++ xen/include/xen/iommu.h | 6 +++--- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 12 ++++++------ 15 files changed, 37 insertions(+), 31 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 10e0b9d..678b1f3 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -61,7 +61,6 @@ CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING -CFLAGS-$(HAS_PCI) += -DHAS_PCI CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 3771256..63f2b21 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -4,6 +4,7 @@ config X86_64 config X86 def_bool y select HAS_PASSTHROUGH + select HAS_PCI config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 07f0baa..6e55d80 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -7,7 +7,6 @@ HAS_NUMA := y HAS_VGA := y HAS_VIDEO := y HAS_CPUFREQ := y -HAS_PCI := y HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 85e853f..47d115e 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -401,7 +401,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) break; #endif -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI case XEN_SYSCTL_pcitopoinfo: { xen_sysctl_pcitopoinfo_t *ti = &op->u.pcitopoinfo; diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index 57311cc..5362e41 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,4 +1,7 @@ menu "Device Drivers" source "drivers/passthrough/Kconfig" + +source "drivers/pci/Kconfig" + endmenu diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index e283870..eb32d69 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -1,6 +1,6 @@ subdir-y += char subdir-$(HAS_CPUFREQ) += cpufreq -subdir-$(HAS_PCI) += pci +subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(HAS_ACPI) += acpi subdir-$(HAS_VIDEO) += video diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e96e072..885839c 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -16,7 +16,7 @@ #include #include #include -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI #include #include #include @@ -64,7 +64,7 @@ static struct ns16550 { unsigned int timeout_ms; bool_t intr_works; bool_t dw_usr_bsy; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI /* PCI card parameters. */ bool_t pb_bdf_enable; /* if =1, pb-bdf effective, port behind bridge */ bool_t ps_bdf_enable; /* if =1, ps_bdf effective, port on pci card */ @@ -97,7 +97,7 @@ struct ns16550_config_param { }; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI enum { param_default = 0, param_trumanage, @@ -475,7 +475,7 @@ static int ns16550_getc(struct serial_port *port, char *pc) static void pci_serial_early_init(struct ns16550 *uart) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( !uart->ps_bdf_enable || uart->io_base >= 0x10000 ) return; @@ -621,7 +621,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) ns16550_setup_postirq(uart); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( uart->bar || uart->ps_bdf_enable ) { if ( !uart->enable_ro ) @@ -650,7 +650,7 @@ static void ns16550_suspend(struct serial_port *port) stop_timer(&uart->timer); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( uart->bar ) uart->cr = pci_conf_read16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND); @@ -659,7 +659,7 @@ static void ns16550_suspend(struct serial_port *port) static void _ns16550_resume(struct serial_port *port) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI struct ns16550 *uart = port->uart; if ( uart->bar ) @@ -797,7 +797,7 @@ static int __init check_existence(struct ns16550 *uart) return 1; /* Everything is MMIO */ #endif -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI pci_serial_early_init(uart); #endif @@ -828,7 +828,7 @@ static int __init check_existence(struct ns16550 *uart) return (status == 0x90); } -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI static int __init pci_uart_config(struct ns16550 *uart, bool_t skip_amt, unsigned int bar_idx) { @@ -1030,7 +1030,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( strncmp(conf, "pci", 3) == 0 ) { if ( pci_uart_config(uart, 1/* skip AMT */, uart - ns16550_com) ) @@ -1053,7 +1053,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) uart->irq = simple_strtol(conf, &conf, 10); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( *conf == ',' && *++conf != ',' ) { conf = parse_pci(conf, NULL, &uart->ps_bdf[0], @@ -1094,7 +1094,7 @@ static void ns16550_init_common(struct ns16550 *uart) { uart->clock_hz = UART_CLOCK_HZ; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI uart->enable_ro = 0; #endif diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index 2bb5afb..a6657c5 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -5,5 +5,5 @@ subdir-$(arm) += arm obj-y += iommu.o obj-$(x86) += io.o -obj-$(HAS_PCI) += pci.o +obj-$(CONFIG_HAS_PCI) += pci.o obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 8bb7df0..0b2abf4 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -353,7 +353,7 @@ int iommu_do_domctl( if ( !iommu_enabled ) return -ENOSYS; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI ret = iommu_do_pci_domctl(domctl, d, u_domctl); #endif diff --git a/xen/drivers/pci/Kconfig b/xen/drivers/pci/Kconfig new file mode 100644 index 0000000..68b9953 --- /dev/null +++ b/xen/drivers/pci/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_PCI if PCI is supported +config HAS_PCI + bool diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index ac9b7f8..8217cb7 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -87,7 +87,7 @@ enum iommu_feature bool_t iommu_has_feature(struct domain *d, enum iommu_feature feature); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI void pt_pci_init(void); struct pirq; @@ -141,7 +141,7 @@ struct iommu_ops { int (*assign_device)(struct domain *, u8 devfn, device_t *dev, u32 flag); int (*reassign_device)(struct domain *s, struct domain *t, u8 devfn, device_t *dev); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI int (*get_device_group_id)(u16 seg, u8 bus, u8 devfn); int (*update_ire_from_msi)(struct msi_desc *msi_desc, struct msi_msg *msg); void (*read_msi_from_ire)(struct msi_desc *msi_desc, struct msi_msg *msg); @@ -174,7 +174,7 @@ int iommu_get_reserved_device_memory(iommu_grdm_t *, void *); void iommu_share_p2m_table(struct domain *d); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI int iommu_do_pci_domctl(struct xen_domctl *, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t)); #endif diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index c7de165..5e6ee71 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -323,7 +323,7 @@ static XSM_INLINE int xsm_get_vnumainfo(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 6ebb0e0..1dac834 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -114,7 +114,7 @@ struct xsm_operations { int (*iomem_mapping) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); int (*pci_config_permission) (struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access); -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) int (*get_device_group) (uint32_t machine_bdf); int (*test_assign_device) (uint32_t machine_bdf); int (*assign_device) (struct domain *d, uint32_t machine_bdf); @@ -469,7 +469,7 @@ static inline int xsm_pci_config_permission (xsm_default_t def, struct domain *d return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); } -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->get_device_group(machine_bdf); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index a380da3..6f4101c 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -89,7 +89,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, pci_config_permission); set_to_dummy_if_null(ops, get_vnumainfo); -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) set_to_dummy_if_null(ops, get_device_group); set_to_dummy_if_null(ops, test_assign_device); set_to_dummy_if_null(ops, assign_device); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 2650cc8..454b0ce 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI #include #endif #include @@ -111,7 +111,7 @@ static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) } return security_irq_sid(irq, sid); } -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI { struct irq_desc *desc = irq_to_desc(irq); if ( desc->msi_desc && desc->msi_desc->dev ) { @@ -853,7 +853,7 @@ static int flask_map_domain_pirq (struct domain *d) static int flask_map_domain_msi (struct domain *d, int irq, void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI struct msi_info *msi = data; u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; @@ -899,7 +899,7 @@ static int flask_unmap_domain_pirq (struct domain *d) static int flask_unmap_domain_msi (struct domain *d, int irq, void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI struct msi_info *msi = data; u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; @@ -1213,7 +1213,7 @@ static int flask_mem_sharing(struct domain *d) } #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static int flask_get_device_group(uint32_t machine_bdf) { u32 rsid; @@ -1725,7 +1725,7 @@ static struct xsm_operations flask_ops = { .remove_from_physmap = flask_remove_from_physmap, .map_gmfn_foreign = flask_map_gmfn_foreign, -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) .get_device_group = flask_get_device_group, .test_assign_device = flask_test_assign_device, .assign_device = flask_assign_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 Wed Dec 23 06:25:15 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrL-00066O-2r; Wed, 23 Dec 2015 06:25:15 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrK-00066D-Bi for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:14 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id CF/36-31069-94E3A765; Wed, 23 Dec 2015 06:25:13 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-31.messagelabs.com!1450851911!4852270!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14134 invoked from network); 23 Dec 2015 06:25:12 -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; 23 Dec 2015 06:25:12 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrH-0000p2-HU for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcrF-0007BG-OY for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:10 +0000 Date: Wed, 23 Dec 2015 06:25:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PCI use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1809d50035963b26ea6e1dcccbe5e6b5ad47580b Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:44:22 2015 +0100 build: convert HAS_PCI use to Kconfig Use the Kconfig generated CONFIG_HAS_PCI defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Daniel De Graaf --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/sysctl.c | 2 +- xen/drivers/Kconfig | 3 +++ xen/drivers/Makefile | 2 +- xen/drivers/char/ns16550.c | 24 ++++++++++++------------ xen/drivers/passthrough/Makefile | 2 +- xen/drivers/passthrough/iommu.c | 2 +- xen/drivers/pci/Kconfig | 4 ++++ xen/include/xen/iommu.h | 6 +++--- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 12 ++++++------ 15 files changed, 37 insertions(+), 31 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 10e0b9d..678b1f3 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -61,7 +61,6 @@ CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING -CFLAGS-$(HAS_PCI) += -DHAS_PCI CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 3771256..63f2b21 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -4,6 +4,7 @@ config X86_64 config X86 def_bool y select HAS_PASSTHROUGH + select HAS_PCI config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 07f0baa..6e55d80 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -7,7 +7,6 @@ HAS_NUMA := y HAS_VGA := y HAS_VIDEO := y HAS_CPUFREQ := y -HAS_PCI := y HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 85e853f..47d115e 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -401,7 +401,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) break; #endif -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI case XEN_SYSCTL_pcitopoinfo: { xen_sysctl_pcitopoinfo_t *ti = &op->u.pcitopoinfo; diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index 57311cc..5362e41 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,4 +1,7 @@ menu "Device Drivers" source "drivers/passthrough/Kconfig" + +source "drivers/pci/Kconfig" + endmenu diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index e283870..eb32d69 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -1,6 +1,6 @@ subdir-y += char subdir-$(HAS_CPUFREQ) += cpufreq -subdir-$(HAS_PCI) += pci +subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(HAS_ACPI) += acpi subdir-$(HAS_VIDEO) += video diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index e96e072..885839c 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -16,7 +16,7 @@ #include #include #include -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI #include #include #include @@ -64,7 +64,7 @@ static struct ns16550 { unsigned int timeout_ms; bool_t intr_works; bool_t dw_usr_bsy; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI /* PCI card parameters. */ bool_t pb_bdf_enable; /* if =1, pb-bdf effective, port behind bridge */ bool_t ps_bdf_enable; /* if =1, ps_bdf effective, port on pci card */ @@ -97,7 +97,7 @@ struct ns16550_config_param { }; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI enum { param_default = 0, param_trumanage, @@ -475,7 +475,7 @@ static int ns16550_getc(struct serial_port *port, char *pc) static void pci_serial_early_init(struct ns16550 *uart) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( !uart->ps_bdf_enable || uart->io_base >= 0x10000 ) return; @@ -621,7 +621,7 @@ static void __init ns16550_init_postirq(struct serial_port *port) ns16550_setup_postirq(uart); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( uart->bar || uart->ps_bdf_enable ) { if ( !uart->enable_ro ) @@ -650,7 +650,7 @@ static void ns16550_suspend(struct serial_port *port) stop_timer(&uart->timer); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( uart->bar ) uart->cr = pci_conf_read16(0, uart->ps_bdf[0], uart->ps_bdf[1], uart->ps_bdf[2], PCI_COMMAND); @@ -659,7 +659,7 @@ static void ns16550_suspend(struct serial_port *port) static void _ns16550_resume(struct serial_port *port) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI struct ns16550 *uart = port->uart; if ( uart->bar ) @@ -797,7 +797,7 @@ static int __init check_existence(struct ns16550 *uart) return 1; /* Everything is MMIO */ #endif -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI pci_serial_early_init(uart); #endif @@ -828,7 +828,7 @@ static int __init check_existence(struct ns16550 *uart) return (status == 0x90); } -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI static int __init pci_uart_config(struct ns16550 *uart, bool_t skip_amt, unsigned int bar_idx) { @@ -1030,7 +1030,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( strncmp(conf, "pci", 3) == 0 ) { if ( pci_uart_config(uart, 1/* skip AMT */, uart - ns16550_com) ) @@ -1053,7 +1053,7 @@ static void __init ns16550_parse_port_config( if ( *conf == ',' && *++conf != ',' ) uart->irq = simple_strtol(conf, &conf, 10); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI if ( *conf == ',' && *++conf != ',' ) { conf = parse_pci(conf, NULL, &uart->ps_bdf[0], @@ -1094,7 +1094,7 @@ static void ns16550_init_common(struct ns16550 *uart) { uart->clock_hz = UART_CLOCK_HZ; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI uart->enable_ro = 0; #endif diff --git a/xen/drivers/passthrough/Makefile b/xen/drivers/passthrough/Makefile index 2bb5afb..a6657c5 100644 --- a/xen/drivers/passthrough/Makefile +++ b/xen/drivers/passthrough/Makefile @@ -5,5 +5,5 @@ subdir-$(arm) += arm obj-y += iommu.o obj-$(x86) += io.o -obj-$(HAS_PCI) += pci.o +obj-$(CONFIG_HAS_PCI) += pci.o obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o diff --git a/xen/drivers/passthrough/iommu.c b/xen/drivers/passthrough/iommu.c index 8bb7df0..0b2abf4 100644 --- a/xen/drivers/passthrough/iommu.c +++ b/xen/drivers/passthrough/iommu.c @@ -353,7 +353,7 @@ int iommu_do_domctl( if ( !iommu_enabled ) return -ENOSYS; -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI ret = iommu_do_pci_domctl(domctl, d, u_domctl); #endif diff --git a/xen/drivers/pci/Kconfig b/xen/drivers/pci/Kconfig new file mode 100644 index 0000000..68b9953 --- /dev/null +++ b/xen/drivers/pci/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_PCI if PCI is supported +config HAS_PCI + bool diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index ac9b7f8..8217cb7 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -87,7 +87,7 @@ enum iommu_feature bool_t iommu_has_feature(struct domain *d, enum iommu_feature feature); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI void pt_pci_init(void); struct pirq; @@ -141,7 +141,7 @@ struct iommu_ops { int (*assign_device)(struct domain *, u8 devfn, device_t *dev, u32 flag); int (*reassign_device)(struct domain *s, struct domain *t, u8 devfn, device_t *dev); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI int (*get_device_group_id)(u16 seg, u8 bus, u8 devfn); int (*update_ire_from_msi)(struct msi_desc *msi_desc, struct msi_msg *msg); void (*read_msi_from_ire)(struct msi_desc *msi_desc, struct msi_msg *msg); @@ -174,7 +174,7 @@ int iommu_get_reserved_device_memory(iommu_grdm_t *, void *); void iommu_share_p2m_table(struct domain *d); -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI int iommu_do_pci_domctl(struct xen_domctl *, struct domain *d, XEN_GUEST_HANDLE_PARAM(xen_domctl_t)); #endif diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index c7de165..5e6ee71 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -323,7 +323,7 @@ static XSM_INLINE int xsm_get_vnumainfo(XSM_DEFAULT_ARG struct domain *d) return xsm_default_action(action, current->domain, d); } -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static XSM_INLINE int xsm_get_device_group(XSM_DEFAULT_ARG uint32_t machine_bdf) { XSM_ASSERT_ACTION(XSM_HOOK); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 6ebb0e0..1dac834 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -114,7 +114,7 @@ struct xsm_operations { int (*iomem_mapping) (struct domain *d, uint64_t s, uint64_t e, uint8_t allow); int (*pci_config_permission) (struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end, uint8_t access); -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) int (*get_device_group) (uint32_t machine_bdf); int (*test_assign_device) (uint32_t machine_bdf); int (*assign_device) (struct domain *d, uint32_t machine_bdf); @@ -469,7 +469,7 @@ static inline int xsm_pci_config_permission (xsm_default_t def, struct domain *d return xsm_ops->pci_config_permission(d, machine_bdf, start, end, access); } -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static inline int xsm_get_device_group(xsm_default_t def, uint32_t machine_bdf) { return xsm_ops->get_device_group(machine_bdf); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index a380da3..6f4101c 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -89,7 +89,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, pci_config_permission); set_to_dummy_if_null(ops, get_vnumainfo); -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) set_to_dummy_if_null(ops, get_device_group); set_to_dummy_if_null(ops, test_assign_device); set_to_dummy_if_null(ops, assign_device); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 2650cc8..454b0ce 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -20,7 +20,7 @@ #include #include #include -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI #include #endif #include @@ -111,7 +111,7 @@ static int get_irq_sid(int irq, u32 *sid, struct avc_audit_data *ad) } return security_irq_sid(irq, sid); } -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI { struct irq_desc *desc = irq_to_desc(irq); if ( desc->msi_desc && desc->msi_desc->dev ) { @@ -853,7 +853,7 @@ static int flask_map_domain_pirq (struct domain *d) static int flask_map_domain_msi (struct domain *d, int irq, void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI struct msi_info *msi = data; u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; @@ -899,7 +899,7 @@ static int flask_unmap_domain_pirq (struct domain *d) static int flask_unmap_domain_msi (struct domain *d, int irq, void *data, u32 *sid, struct avc_audit_data *ad) { -#ifdef HAS_PCI +#ifdef CONFIG_HAS_PCI struct msi_info *msi = data; u32 machine_bdf = (msi->seg << 16) | (msi->bus << 8) | msi->devfn; @@ -1213,7 +1213,7 @@ static int flask_mem_sharing(struct domain *d) } #endif -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) static int flask_get_device_group(uint32_t machine_bdf) { u32 rsid; @@ -1725,7 +1725,7 @@ static struct xsm_operations flask_ops = { .remove_from_physmap = flask_remove_from_physmap, .map_gmfn_foreign = flask_map_gmfn_foreign, -#if defined(CONFIG_HAS_PASSTHROUGH) && defined(HAS_PCI) +#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI) .get_device_group = flask_get_device_group, .test_assign_device = flask_test_assign_device, .assign_device = flask_assign_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 Wed Dec 23 06:25:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25: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 1aBcrY-00068C-7Q; Wed, 23 Dec 2015 06:25:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrX-000686-JV for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:27 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 3E/89-18316-75E3A765; Wed, 23 Dec 2015 06:25:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450851925!6800661!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49942 invoked from network); 23 Dec 2015 06:25:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:25:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrV-0000pJ-Cq for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcrT-0007Bp-6F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:24 +0000 Date: Wed, 23 Dec 2015 06:25:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_NS16550 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f02ad357247901ad83e3910f3dadd70e231f3f3d Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:45:07 2015 +0100 build: convert HAS_NS16550 use to Kconfig Use the Kconfig generated CONFIG_HAS_NS16550 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - config/arm64.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/Kconfig | 2 ++ xen/drivers/char/Kconfig | 6 ++++++ xen/drivers/char/Makefile | 2 +- 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index cd97e42..f963338 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -13,7 +13,6 @@ HAS_PL011 := y HAS_EXYNOS4210 := y HAS_OMAP := y HAS_SCIF := y -HAS_NS16550 := y HAS_MEM_ACCESS := y # Use only if calling $(LD) directly. diff --git a/config/arm64.mk b/config/arm64.mk index c5deb4e..f35f6bf 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -8,7 +8,6 @@ CFLAGS += #-marm -march= -mcpu= etc HAS_PL011 := y HAS_CADENCE_UART := y -HAS_NS16550 := y HAS_MEM_ACCESS := y HAS_GICV3 := y diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 63f2b21..e68e35b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 6e55d80..c924aa2 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -7,7 +7,6 @@ HAS_NUMA := y HAS_VGA := y HAS_VIDEO := y HAS_CPUFREQ := y -HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y HAS_GDBSX := y diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index 5362e41..fe6fcca 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,5 +1,7 @@ menu "Device Drivers" +source "drivers/char/Kconfig" + source "drivers/passthrough/Kconfig" source "drivers/pci/Kconfig" diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig new file mode 100644 index 0000000..eb8c3b5 --- /dev/null +++ b/xen/drivers/char/Kconfig @@ -0,0 +1,6 @@ +# 16550-series UART support +config HAS_NS16550 + bool + default y + help + This selects the 16550-series UART support. For most systems, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 47fc3f9..5e9d271 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,5 +1,5 @@ obj-y += console.o -obj-$(HAS_NS16550) += ns16550.o +obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(HAS_CADENCE_UART) += cadence-uart.o obj-$(HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:25:28 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25: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 1aBcrY-00068C-7Q; Wed, 23 Dec 2015 06:25:28 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrX-000686-JV for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:27 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 3E/89-18316-75E3A765; Wed, 23 Dec 2015 06:25:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450851925!6800661!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49942 invoked from network); 23 Dec 2015 06:25:26 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:25:26 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrV-0000pJ-Cq for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:25 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcrT-0007Bp-6F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:24 +0000 Date: Wed, 23 Dec 2015 06:25:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_NS16550 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit f02ad357247901ad83e3910f3dadd70e231f3f3d Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:45:07 2015 +0100 build: convert HAS_NS16550 use to Kconfig Use the Kconfig generated CONFIG_HAS_NS16550 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - config/arm64.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/Kconfig | 2 ++ xen/drivers/char/Kconfig | 6 ++++++ xen/drivers/char/Makefile | 2 +- 7 files changed, 10 insertions(+), 4 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index cd97e42..f963338 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -13,7 +13,6 @@ HAS_PL011 := y HAS_EXYNOS4210 := y HAS_OMAP := y HAS_SCIF := y -HAS_NS16550 := y HAS_MEM_ACCESS := y # Use only if calling $(LD) directly. diff --git a/config/arm64.mk b/config/arm64.mk index c5deb4e..f35f6bf 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -8,7 +8,6 @@ CFLAGS += #-marm -march= -mcpu= etc HAS_PL011 := y HAS_CADENCE_UART := y -HAS_NS16550 := y HAS_MEM_ACCESS := y HAS_GICV3 := y diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 63f2b21..e68e35b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 6e55d80..c924aa2 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -7,7 +7,6 @@ HAS_NUMA := y HAS_VGA := y HAS_VIDEO := y HAS_CPUFREQ := y -HAS_NS16550 := y HAS_EHCI := y HAS_KEXEC := y HAS_GDBSX := y diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index 5362e41..fe6fcca 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,5 +1,7 @@ menu "Device Drivers" +source "drivers/char/Kconfig" + source "drivers/passthrough/Kconfig" source "drivers/pci/Kconfig" diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig new file mode 100644 index 0000000..eb8c3b5 --- /dev/null +++ b/xen/drivers/char/Kconfig @@ -0,0 +1,6 @@ +# 16550-series UART support +config HAS_NS16550 + bool + default y + help + This selects the 16550-series UART support. For most systems, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 47fc3f9..5e9d271 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,5 +1,5 @@ obj-y += console.o -obj-$(HAS_NS16550) += ns16550.o +obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(HAS_CADENCE_UART) += cadence-uart.o obj-$(HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:25:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25: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 1aBcrt-00069q-CN; Wed, 23 Dec 2015 06:25:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrs-00069j-G0 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:48 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C7/A6-31069-B6E3A765; Wed, 23 Dec 2015 06:25:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450851946!4851656!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17254 invoked from network); 23 Dec 2015 06:25:47 -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; 23 Dec 2015 06:25:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrq-0000q4-4q for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcrg-0007CX-4v for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:45 +0000 Date: Wed, 23 Dec 2015 06:25:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_IOPORTS use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 642efcc68330c938b1d3e46cfb9503695977e62e Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:45:45 2015 +0100 build: convert HAS_IOPORTS use to Kconfig Use the Kconfig generated CONFIG_HAS_IOPORTS defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 3 +++ xen/drivers/char/ns16550.c | 10 +++++----- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 678b1f3..b12ad73 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -61,7 +61,6 @@ CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING -CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index e68e35b..c13ef29 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index c924aa2..0597387 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -1,7 +1,6 @@ ######################################## # x86-specific definitions -HAS_IOPORTS := y HAS_ACPI := y HAS_NUMA := y HAS_VGA := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 53ca33f..ea04d11 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,4 +5,7 @@ menu "Common Features" config HAS_DEVICE_TREE bool +config HAS_IOPORTS + bool + endmenu diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 885839c..bc24015 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -348,7 +348,7 @@ static void ns16550_delayed_resume(void *data); static u8 ns_read_reg(struct ns16550 *uart, unsigned int reg) { void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return inb(uart->io_base + reg); #endif @@ -366,7 +366,7 @@ static u8 ns_read_reg(struct ns16550 *uart, unsigned int reg) static void ns_write_reg(struct ns16550 *uart, unsigned int reg, u8 c) { void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return outb(c, uart->io_base + reg); #endif @@ -552,7 +552,7 @@ static void __init ns16550_init_preirq(struct serial_port *port) { struct ns16550 *uart = port->uart; -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS /* I/O ports are distinguished by their size (16 bits). */ if ( uart->io_base >= 0x10000 ) #endif @@ -722,7 +722,7 @@ static void ns16550_resume(struct serial_port *port) static void __init ns16550_endboot(struct serial_port *port) { -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS struct ns16550 *uart = port->uart; int rv; @@ -786,7 +786,7 @@ static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS /* * We can't poke MMIO UARTs until they get I/O remapped later. Assume that * if we're getting MMIO UARTs, the arch code knows what it's doing. -- generated by git-patchbot for /home/xen/git/xen.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 23 06:25:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:25: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 1aBcrt-00069q-CN; Wed, 23 Dec 2015 06:25:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrs-00069j-G0 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:48 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id C7/A6-31069-B6E3A765; Wed, 23 Dec 2015 06:25:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450851946!4851656!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17254 invoked from network); 23 Dec 2015 06:25:47 -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; 23 Dec 2015 06:25:47 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcrq-0000q4-4q for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:46 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcrg-0007CX-4v for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:45 +0000 Date: Wed, 23 Dec 2015 06:25:36 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_IOPORTS use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 642efcc68330c938b1d3e46cfb9503695977e62e Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:45:45 2015 +0100 build: convert HAS_IOPORTS use to Kconfig Use the Kconfig generated CONFIG_HAS_IOPORTS defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 3 +++ xen/drivers/char/ns16550.c | 10 +++++----- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 678b1f3..b12ad73 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -61,7 +61,6 @@ CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING -CFLAGS-$(HAS_IOPORTS) += -DHAS_IOPORTS CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index e68e35b..c13ef29 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index c924aa2..0597387 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -1,7 +1,6 @@ ######################################## # x86-specific definitions -HAS_IOPORTS := y HAS_ACPI := y HAS_NUMA := y HAS_VGA := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 53ca33f..ea04d11 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,4 +5,7 @@ menu "Common Features" config HAS_DEVICE_TREE bool +config HAS_IOPORTS + bool + endmenu diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 885839c..bc24015 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -348,7 +348,7 @@ static void ns16550_delayed_resume(void *data); static u8 ns_read_reg(struct ns16550 *uart, unsigned int reg) { void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return inb(uart->io_base + reg); #endif @@ -366,7 +366,7 @@ static u8 ns_read_reg(struct ns16550 *uart, unsigned int reg) static void ns_write_reg(struct ns16550 *uart, unsigned int reg, u8 c) { void __iomem *addr = uart->remapped_io_base + (reg << uart->reg_shift); -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS if ( uart->remapped_io_base == NULL ) return outb(c, uart->io_base + reg); #endif @@ -552,7 +552,7 @@ static void __init ns16550_init_preirq(struct serial_port *port) { struct ns16550 *uart = port->uart; -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS /* I/O ports are distinguished by their size (16 bits). */ if ( uart->io_base >= 0x10000 ) #endif @@ -722,7 +722,7 @@ static void ns16550_resume(struct serial_port *port) static void __init ns16550_endboot(struct serial_port *port) { -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS struct ns16550 *uart = port->uart; int rv; @@ -786,7 +786,7 @@ static int __init check_existence(struct ns16550 *uart) { unsigned char status, scratch, scratch2, scratch3; -#ifdef HAS_IOPORTS +#ifdef CONFIG_HAS_IOPORTS /* * We can't poke MMIO UARTs until they get I/O remapped later. Assume that * if we're getting MMIO UARTs, the arch code knows what it's doing. -- generated by git-patchbot for /home/xen/git/xen.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 23 06:26:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:26:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcs5-0006Bt-HT; Wed, 23 Dec 2015 06:26:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcs4-0006Bm-MO for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:00 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id E2/9E-03066-77E3A765; Wed, 23 Dec 2015 06:25:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450851958!4851674!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17774 invoked from network); 23 Dec 2015 06:25:59 -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; 23 Dec 2015 06:25:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcs2-0000qC-B1 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcs0-0007DY-TM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:57 +0000 Date: Wed, 23 Dec 2015 06:25:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_ACPI use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 933daac823a7c83c132df1f6e22ab831c6d3c3bd Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:46:15 2015 +0100 build: convert HAS_ACPI use to Kconfig Use the Kconfig generated CONFIG_HAS_ACPI defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/sysctl.c | 2 +- xen/drivers/Kconfig | 2 ++ xen/drivers/Makefile | 2 +- xen/drivers/acpi/Kconfig | 4 ++++ 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b12ad73..09783e7 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -56,7 +56,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index c13ef29..5e6c6c9 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_ACPI select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 0597387..66d50f4 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -1,7 +1,6 @@ ######################################## # x86-specific definitions -HAS_ACPI := y HAS_NUMA := y HAS_VGA := y HAS_VIDEO := y diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 47d115e..a3007b8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -171,7 +171,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) op->u.availheap.avail_bytes <<= PAGE_SHIFT; break; -#ifdef HAS_ACPI +#ifdef CONFIG_HAS_ACPI case XEN_SYSCTL_get_pmstat: ret = do_get_pm_info(&op->u.get_pmstat); break; diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index fe6fcca..eb01d47 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,5 +1,7 @@ menu "Device Drivers" +source "drivers/acpi/Kconfig" + source "drivers/char/Kconfig" source "drivers/passthrough/Kconfig" diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index eb32d69..9f6c18b 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -2,5 +2,5 @@ subdir-y += char subdir-$(HAS_CPUFREQ) += cpufreq subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough -subdir-$(HAS_ACPI) += acpi +subdir-$(CONFIG_HAS_ACPI) += acpi subdir-$(HAS_VIDEO) += video diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig new file mode 100644 index 0000000..11ab5e4 --- /dev/null +++ b/xen/drivers/acpi/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_ACPI if ACPI is supported +config HAS_ACPI + bool -- generated by git-patchbot for /home/xen/git/xen.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 23 06:26:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:26:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcs5-0006Bt-HT; Wed, 23 Dec 2015 06:26:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcs4-0006Bm-MO for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:00 +0000 Received: from [85.158.137.68] by server-9.bemta-3.messagelabs.com id E2/9E-03066-77E3A765; Wed, 23 Dec 2015 06:25:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-31.messagelabs.com!1450851958!4851674!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17774 invoked from network); 23 Dec 2015 06:25:59 -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; 23 Dec 2015 06:25:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcs2-0000qC-B1 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcs0-0007DY-TM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:25:57 +0000 Date: Wed, 23 Dec 2015 06:25:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_ACPI use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 933daac823a7c83c132df1f6e22ab831c6d3c3bd Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:46:15 2015 +0100 build: convert HAS_ACPI use to Kconfig Use the Kconfig generated CONFIG_HAS_ACPI defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/sysctl.c | 2 +- xen/drivers/Kconfig | 2 ++ xen/drivers/Makefile | 2 +- xen/drivers/acpi/Kconfig | 4 ++++ 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index b12ad73..09783e7 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -56,7 +56,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_ACPI) += -DHAS_ACPI CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index c13ef29..5e6c6c9 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select HAS_ACPI select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 0597387..66d50f4 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -1,7 +1,6 @@ ######################################## # x86-specific definitions -HAS_ACPI := y HAS_NUMA := y HAS_VGA := y HAS_VIDEO := y diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 47d115e..a3007b8 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -171,7 +171,7 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) op->u.availheap.avail_bytes <<= PAGE_SHIFT; break; -#ifdef HAS_ACPI +#ifdef CONFIG_HAS_ACPI case XEN_SYSCTL_get_pmstat: ret = do_get_pm_info(&op->u.get_pmstat); break; diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index fe6fcca..eb01d47 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -1,5 +1,7 @@ menu "Device Drivers" +source "drivers/acpi/Kconfig" + source "drivers/char/Kconfig" source "drivers/passthrough/Kconfig" diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index eb32d69..9f6c18b 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -2,5 +2,5 @@ subdir-y += char subdir-$(HAS_CPUFREQ) += cpufreq subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough -subdir-$(HAS_ACPI) += acpi +subdir-$(CONFIG_HAS_ACPI) += acpi subdir-$(HAS_VIDEO) += video diff --git a/xen/drivers/acpi/Kconfig b/xen/drivers/acpi/Kconfig new file mode 100644 index 0000000..11ab5e4 --- /dev/null +++ b/xen/drivers/acpi/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_ACPI if ACPI is supported +config HAS_ACPI + bool -- generated by git-patchbot for /home/xen/git/xen.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 23 06:26:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:26: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 1aBcsH-0006Dt-Px; Wed, 23 Dec 2015 06:26:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsG-0006Di-1p for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:12 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 19/E9-21571-38E3A765; Wed, 23 Dec 2015 06:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450851970!6800724!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61775 invoked from network); 23 Dec 2015 06:26:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:26:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsE-0000qm-0P for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcsD-0007Eq-IK for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:09 +0000 Date: Wed, 23 Dec 2015 06:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_VIDEO use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 415a5b95880236b12b0888703c99a09bb8530e01 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:46:55 2015 +0100 build: convert HAS_VIDEO use to Kconfig Use the Kconfig generated CONFIG_HAS_VIDEO defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/Kconfig | 2 ++ xen/drivers/Makefile | 2 +- xen/drivers/video/Kconfig | 4 ++++ xen/drivers/video/Makefile | 8 ++++---- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 93e64f6..c88a5d8 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM def_bool y select HAS_DEVICE_TREE select HAS_PASSTHROUGH + select HAS_VIDEO config ARCH_DEFCONFIG string diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 4725374..90b1f24 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -6,7 +6,6 @@ # 'make clean' before rebuilding. # -HAS_VIDEO := y HAS_ARM_HDLCD := y HAS_PDX := y diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 5e6c6c9..ee8df87 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -8,6 +8,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI + select HAS_VIDEO config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 66d50f4..2ba10ce 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -3,7 +3,6 @@ HAS_NUMA := y HAS_VGA := y -HAS_VIDEO := y HAS_CPUFREQ := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index eb01d47..f0ad01e 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -8,4 +8,6 @@ source "drivers/passthrough/Kconfig" source "drivers/pci/Kconfig" +source "drivers/video/Kconfig" + endmenu diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index 9f6c18b..01d6b8d 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -3,4 +3,4 @@ subdir-$(HAS_CPUFREQ) += cpufreq subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(CONFIG_HAS_ACPI) += acpi -subdir-$(HAS_VIDEO) += video +subdir-$(CONFIG_HAS_VIDEO) += video diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig new file mode 100644 index 0000000..7fc7aea --- /dev/null +++ b/xen/drivers/video/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_VIDEO if video is supported +config HAS_VIDEO + bool diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index a756292..914b6cf 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -1,7 +1,7 @@ obj-$(HAS_VGA) := vga.o -obj-$(HAS_VIDEO) += font_8x14.o -obj-$(HAS_VIDEO) += font_8x16.o -obj-$(HAS_VIDEO) += font_8x8.o -obj-$(HAS_VIDEO) += lfb.o +obj-$(CONFIG_HAS_VIDEO) += font_8x14.o +obj-$(CONFIG_HAS_VIDEO) += font_8x16.o +obj-$(CONFIG_HAS_VIDEO) += font_8x8.o +obj-$(CONFIG_HAS_VIDEO) += lfb.o obj-$(HAS_VGA) += vesa.o obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:26:13 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:26: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 1aBcsH-0006Dt-Px; Wed, 23 Dec 2015 06:26:13 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsG-0006Di-1p for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:12 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 19/E9-21571-38E3A765; Wed, 23 Dec 2015 06:26:11 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450851970!6800724!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61775 invoked from network); 23 Dec 2015 06:26:10 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:26:10 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsE-0000qm-0P for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:10 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcsD-0007Eq-IK for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:09 +0000 Date: Wed, 23 Dec 2015 06:26:09 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_VIDEO use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 415a5b95880236b12b0888703c99a09bb8530e01 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:46:55 2015 +0100 build: convert HAS_VIDEO use to Kconfig Use the Kconfig generated CONFIG_HAS_VIDEO defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/Kconfig | 2 ++ xen/drivers/Makefile | 2 +- xen/drivers/video/Kconfig | 4 ++++ xen/drivers/video/Makefile | 8 ++++---- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 93e64f6..c88a5d8 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM def_bool y select HAS_DEVICE_TREE select HAS_PASSTHROUGH + select HAS_VIDEO config ARCH_DEFCONFIG string diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 4725374..90b1f24 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -6,7 +6,6 @@ # 'make clean' before rebuilding. # -HAS_VIDEO := y HAS_ARM_HDLCD := y HAS_PDX := y diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 5e6c6c9..ee8df87 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -8,6 +8,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI + select HAS_VIDEO config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 66d50f4..2ba10ce 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -3,7 +3,6 @@ HAS_NUMA := y HAS_VGA := y -HAS_VIDEO := y HAS_CPUFREQ := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index eb01d47..f0ad01e 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -8,4 +8,6 @@ source "drivers/passthrough/Kconfig" source "drivers/pci/Kconfig" +source "drivers/video/Kconfig" + endmenu diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index 9f6c18b..01d6b8d 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -3,4 +3,4 @@ subdir-$(HAS_CPUFREQ) += cpufreq subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(CONFIG_HAS_ACPI) += acpi -subdir-$(HAS_VIDEO) += video +subdir-$(CONFIG_HAS_VIDEO) += video diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig new file mode 100644 index 0000000..7fc7aea --- /dev/null +++ b/xen/drivers/video/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_VIDEO if video is supported +config HAS_VIDEO + bool diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index a756292..914b6cf 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -1,7 +1,7 @@ obj-$(HAS_VGA) := vga.o -obj-$(HAS_VIDEO) += font_8x14.o -obj-$(HAS_VIDEO) += font_8x16.o -obj-$(HAS_VIDEO) += font_8x8.o -obj-$(HAS_VIDEO) += lfb.o +obj-$(CONFIG_HAS_VIDEO) += font_8x14.o +obj-$(CONFIG_HAS_VIDEO) += font_8x16.o +obj-$(CONFIG_HAS_VIDEO) += font_8x8.o +obj-$(CONFIG_HAS_VIDEO) += lfb.o obj-$(HAS_VGA) += vesa.o obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:26:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:26:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsU-0006FU-W4; Wed, 23 Dec 2015 06:26:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsT-0006FM-Bv for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:25 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 1E/13-01753-09E3A765; Wed, 23 Dec 2015 06:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1450851983!12321970!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5030 invoked from network); 23 Dec 2015 06:26:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:26:23 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsQ-0000qu-Sw for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcsO-0007FZ-MG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:22 +0000 Date: Wed, 23 Dec 2015 06:26:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_VGA use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56f7d5db127824d6846d0ae89f869f5c59bc7893 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:47:48 2015 +0100 build: convert HAS_VGA use to Kconfig Use the Kconfig generated CONFIG_HAS_VGA defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 2 +- xen/arch/x86/Rules.mk | 1 - xen/drivers/video/Kconfig | 5 +++++ xen/drivers/video/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index ee8df87..a42c149 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -8,7 +8,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI - select HAS_VIDEO + select HAS_VGA config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 2ba10ce..592d1f2 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_VGA := y HAS_CPUFREQ := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 7fc7aea..2b553d9 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -2,3 +2,8 @@ # Select HAS_VIDEO if video is supported config HAS_VIDEO bool + +# Select HAS_VGA if VGA is supported +config HAS_VGA + bool + select HAS_VIDEO diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index 914b6cf..0143c4a 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -1,7 +1,7 @@ -obj-$(HAS_VGA) := vga.o +obj-$(CONFIG_HAS_VGA) := vga.o obj-$(CONFIG_HAS_VIDEO) += font_8x14.o obj-$(CONFIG_HAS_VIDEO) += font_8x16.o obj-$(CONFIG_HAS_VIDEO) += font_8x8.o obj-$(CONFIG_HAS_VIDEO) += lfb.o -obj-$(HAS_VGA) += vesa.o +obj-$(CONFIG_HAS_VGA) += vesa.o obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:26:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:26:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsU-0006FU-W4; Wed, 23 Dec 2015 06:26:26 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsT-0006FM-Bv for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:25 +0000 Received: from [85.158.137.68] by server-3.bemta-3.messagelabs.com id 1E/13-01753-09E3A765; Wed, 23 Dec 2015 06:26:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1450851983!12321970!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5030 invoked from network); 23 Dec 2015 06:26:23 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:26:23 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsQ-0000qu-Sw for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:22 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcsO-0007FZ-MG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:22 +0000 Date: Wed, 23 Dec 2015 06:26:20 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_VGA use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 56f7d5db127824d6846d0ae89f869f5c59bc7893 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:47:48 2015 +0100 build: convert HAS_VGA use to Kconfig Use the Kconfig generated CONFIG_HAS_VGA defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 2 +- xen/arch/x86/Rules.mk | 1 - xen/drivers/video/Kconfig | 5 +++++ xen/drivers/video/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index ee8df87..a42c149 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -8,7 +8,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI - select HAS_VIDEO + select HAS_VGA config ARCH_DEFCONFIG string diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 2ba10ce..592d1f2 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_VGA := y HAS_CPUFREQ := y HAS_EHCI := y HAS_KEXEC := y diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 7fc7aea..2b553d9 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -2,3 +2,8 @@ # Select HAS_VIDEO if video is supported config HAS_VIDEO bool + +# Select HAS_VGA if VGA is supported +config HAS_VGA + bool + select HAS_VIDEO diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index 914b6cf..0143c4a 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -1,7 +1,7 @@ -obj-$(HAS_VGA) := vga.o +obj-$(CONFIG_HAS_VGA) := vga.o obj-$(CONFIG_HAS_VIDEO) += font_8x14.o obj-$(CONFIG_HAS_VIDEO) += font_8x16.o obj-$(CONFIG_HAS_VIDEO) += font_8x8.o obj-$(CONFIG_HAS_VIDEO) += lfb.o -obj-$(HAS_VGA) += vesa.o +obj-$(CONFIG_HAS_VGA) += vesa.o obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:27:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBct2-0006I0-4q; Wed, 23 Dec 2015 06:27:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBct0-0006Hv-9Y for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:58 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 3F/2E-31450-1BE3A765; Wed, 23 Dec 2015 06:26:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1450852016!12358605!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17801 invoked from network); 23 Dec 2015 06:26:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:26:56 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsx-0000r2-QF for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcsb-0007Gy-DM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:53 +0000 Date: Wed, 23 Dec 2015 06:26:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_CPUFREQ use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 994ce40a9151f18df45ba7a2352a4eda2f3c5eaa Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:48:14 2015 +0100 build: convert HAS_CPUFREQ use to Kconfig Use the Kconfig generated CONFIG_HAS_CPUFREQ defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/Kconfig | 2 ++ xen/drivers/Makefile | 2 +- xen/drivers/cpufreq/Kconfig | 4 ++++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index a42c149..d04ab05 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -4,6 +4,7 @@ config X86_64 config X86 def_bool y select HAS_ACPI + select HAS_CPUFREQ select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 592d1f2..c09757a 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_CPUFREQ := y HAS_EHCI := y HAS_KEXEC := y HAS_GDBSX := y diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index f0ad01e..bc3a54f 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -4,6 +4,8 @@ source "drivers/acpi/Kconfig" source "drivers/char/Kconfig" +source "drivers/cpufreq/Kconfig" + source "drivers/passthrough/Kconfig" source "drivers/pci/Kconfig" diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index 01d6b8d..7bbb654 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -1,5 +1,5 @@ subdir-y += char -subdir-$(HAS_CPUFREQ) += cpufreq +subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(CONFIG_HAS_ACPI) += acpi diff --git a/xen/drivers/cpufreq/Kconfig b/xen/drivers/cpufreq/Kconfig new file mode 100644 index 0000000..00be480 --- /dev/null +++ b/xen/drivers/cpufreq/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_CPUFREQ if CPU frequency scaling is supported +config HAS_CPUFREQ + bool -- generated by git-patchbot for /home/xen/git/xen.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 23 06:27:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBct2-0006I0-4q; Wed, 23 Dec 2015 06:27:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBct0-0006Hv-9Y for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:58 +0000 Received: from [85.158.139.211] by server-2.bemta-5.messagelabs.com id 3F/2E-31450-1BE3A765; Wed, 23 Dec 2015 06:26:57 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1450852016!12358605!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17801 invoked from network); 23 Dec 2015 06:26:56 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:26:56 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcsx-0000r2-QF for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:55 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcsb-0007Gy-DM for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:26:53 +0000 Date: Wed, 23 Dec 2015 06:26:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_CPUFREQ use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 994ce40a9151f18df45ba7a2352a4eda2f3c5eaa Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:48:14 2015 +0100 build: convert HAS_CPUFREQ use to Kconfig Use the Kconfig generated CONFIG_HAS_CPUFREQ defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/Kconfig | 2 ++ xen/drivers/Makefile | 2 +- xen/drivers/cpufreq/Kconfig | 4 ++++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index a42c149..d04ab05 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -4,6 +4,7 @@ config X86_64 config X86 def_bool y select HAS_ACPI + select HAS_CPUFREQ select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 592d1f2..c09757a 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_CPUFREQ := y HAS_EHCI := y HAS_KEXEC := y HAS_GDBSX := y diff --git a/xen/drivers/Kconfig b/xen/drivers/Kconfig index f0ad01e..bc3a54f 100644 --- a/xen/drivers/Kconfig +++ b/xen/drivers/Kconfig @@ -4,6 +4,8 @@ source "drivers/acpi/Kconfig" source "drivers/char/Kconfig" +source "drivers/cpufreq/Kconfig" + source "drivers/passthrough/Kconfig" source "drivers/pci/Kconfig" diff --git a/xen/drivers/Makefile b/xen/drivers/Makefile index 01d6b8d..7bbb654 100644 --- a/xen/drivers/Makefile +++ b/xen/drivers/Makefile @@ -1,5 +1,5 @@ subdir-y += char -subdir-$(HAS_CPUFREQ) += cpufreq +subdir-$(CONFIG_HAS_CPUFREQ) += cpufreq subdir-$(CONFIG_HAS_PCI) += pci subdir-$(CONFIG_HAS_PASSTHROUGH) += passthrough subdir-$(CONFIG_HAS_ACPI) += acpi diff --git a/xen/drivers/cpufreq/Kconfig b/xen/drivers/cpufreq/Kconfig new file mode 100644 index 0000000..00be480 --- /dev/null +++ b/xen/drivers/cpufreq/Kconfig @@ -0,0 +1,4 @@ + +# Select HAS_CPUFREQ if CPU frequency scaling is supported +config HAS_CPUFREQ + bool -- generated by git-patchbot for /home/xen/git/xen.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 23 06:27:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27: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 1aBctJ-0006JM-BY; Wed, 23 Dec 2015 06:27:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctH-0006J7-A6 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:15 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 6D/5E-00475-2CE3A765; Wed, 23 Dec 2015 06:27:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1450852033!12761513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54679 invoked from network); 23 Dec 2015 06:27:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:27:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctF-0000rc-0W for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBctA-0007Jb-30 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:11 +0000 Date: Wed, 23 Dec 2015 06:27:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_GDBSX use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ad19015ceace2e01607a4660627a58d1e9ed937 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:48:51 2015 +0100 build: convert HAS_GDBSX use to Kconfig Use the Kconfig generated CONFIG_HAS_GDBSX defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 4 ++++ xen/common/domain.c | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 09783e7..f572c0d 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -56,7 +56,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index d04ab05..12780f9 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -5,6 +5,7 @@ config X86 def_bool y select HAS_ACPI select HAS_CPUFREQ + select HAS_GDBSX select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index c09757a..88c47ab 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -4,7 +4,6 @@ HAS_NUMA := y HAS_EHCI := y HAS_KEXEC := y -HAS_GDBSX := y HAS_PDX := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index ea04d11..75edd45 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,6 +5,10 @@ menu "Common Features" config HAS_DEVICE_TREE bool +# Select HAS_GDBSX if GDBSX is supported +config HAS_GDBSX + bool + config HAS_IOPORTS bool diff --git a/xen/common/domain.c b/xen/common/domain.c index c4661d8..1017efb 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -772,7 +772,7 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) vcpu_check_shutdown(v); } -#ifdef HAS_GDBSX +#ifdef CONFIG_HAS_GDBSX void domain_pause_for_debugger(void) { struct vcpu *curr = current; -- generated by git-patchbot for /home/xen/git/xen.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 23 06:27:18 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27: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 1aBctJ-0006JM-BY; Wed, 23 Dec 2015 06:27:17 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctH-0006J7-A6 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:15 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 6D/5E-00475-2CE3A765; Wed, 23 Dec 2015 06:27:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1450852033!12761513!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG, UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 54679 invoked from network); 23 Dec 2015 06:27:14 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:27:14 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctF-0000rc-0W for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:13 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBctA-0007Jb-30 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:11 +0000 Date: Wed, 23 Dec 2015 06:27:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_GDBSX use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 9ad19015ceace2e01607a4660627a58d1e9ed937 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:48:51 2015 +0100 build: convert HAS_GDBSX use to Kconfig Use the Kconfig generated CONFIG_HAS_GDBSX defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 4 ++++ xen/common/domain.c | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index 09783e7..f572c0d 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -56,7 +56,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_GDBSX) += -DHAS_GDBSX CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index d04ab05..12780f9 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -5,6 +5,7 @@ config X86 def_bool y select HAS_ACPI select HAS_CPUFREQ + select HAS_GDBSX select HAS_IOPORTS select HAS_NS16550 select HAS_PASSTHROUGH diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index c09757a..88c47ab 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -4,7 +4,6 @@ HAS_NUMA := y HAS_EHCI := y HAS_KEXEC := y -HAS_GDBSX := y HAS_PDX := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index ea04d11..75edd45 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,6 +5,10 @@ menu "Common Features" config HAS_DEVICE_TREE bool +# Select HAS_GDBSX if GDBSX is supported +config HAS_GDBSX + bool + config HAS_IOPORTS bool diff --git a/xen/common/domain.c b/xen/common/domain.c index c4661d8..1017efb 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -772,7 +772,7 @@ void vcpu_end_shutdown_deferral(struct vcpu *v) vcpu_check_shutdown(v); } -#ifdef HAS_GDBSX +#ifdef CONFIG_HAS_GDBSX void domain_pause_for_debugger(void) { struct vcpu *curr = current; -- generated by git-patchbot for /home/xen/git/xen.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 23 06:27:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27: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 1aBctW-0006Kh-FQ; Wed, 23 Dec 2015 06:27:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctU-0006KY-Aw for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:28 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 01/12-31122-FCE3A765; Wed, 23 Dec 2015 06:27:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450852044!2419461!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63700 invoked from network); 23 Dec 2015 06:27:25 -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; 23 Dec 2015 06:27:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctQ-0000rk-6C for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBctP-0007KP-VO for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:24 +0000 Date: Wed, 23 Dec 2015 06:27:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PDX use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04075af1371990449da2cdc0519fd123c2cb7bfc Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:49:16 2015 +0100 build: convert HAS_PDX use to Kconfig Use the Kconfig generated CONFIG_HAS_PDX defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 4 ++++ xen/common/Makefile | 2 +- xen/include/xen/pdx.h | 2 +- 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index f572c0d..d55c58c 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING -CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index c88a5d8..1ac2233 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM def_bool y select HAS_DEVICE_TREE select HAS_PASSTHROUGH + select HAS_PDX select HAS_VIDEO config ARCH_DEFCONFIG diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 90b1f24..52b1ad4 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -7,7 +7,6 @@ # HAS_ARM_HDLCD := y -HAS_PDX := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 12780f9..d472234 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -10,6 +10,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI + select HAS_PDX select HAS_VGA config ARCH_DEFCONFIG diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 88c47ab..568fa97 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -4,7 +4,6 @@ HAS_NUMA := y HAS_EHCI := y HAS_KEXEC := y -HAS_PDX := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 75edd45..4905574 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,6 +5,10 @@ menu "Common Features" config HAS_DEVICE_TREE bool +# Select HAS_PDX if PDX is supported +config HAS_PDX + bool + # Select HAS_GDBSX if GDBSX is supported config HAS_GDBSX bool diff --git a/xen/common/Makefile b/xen/common/Makefile index 5dc2bb2..0acd2b0 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -23,7 +23,7 @@ obj-y += memory.o obj-y += multicall.o obj-y += notifier.o obj-y += page_alloc.o -obj-$(HAS_PDX) += pdx.o +obj-$(CONFIG_HAS_PDX) += pdx.o obj-y += preempt.o obj-y += random.o obj-y += rangeset.o diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 18fe8e5..c7c837e 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -1,7 +1,7 @@ #ifndef __XEN_PDX_H__ #define __XEN_PDX_H__ -#ifdef HAS_PDX +#ifdef CONFIG_HAS_PDX extern unsigned long max_pdx; extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:27:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27: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 1aBctW-0006Kh-FQ; Wed, 23 Dec 2015 06:27:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctU-0006KY-Aw for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:28 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 01/12-31122-FCE3A765; Wed, 23 Dec 2015 06:27:27 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450852044!2419461!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63700 invoked from network); 23 Dec 2015 06:27:25 -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; 23 Dec 2015 06:27:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctQ-0000rk-6C for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBctP-0007KP-VO for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:24 +0000 Date: Wed, 23 Dec 2015 06:27:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PDX use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 04075af1371990449da2cdc0519fd123c2cb7bfc Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:49:16 2015 +0100 build: convert HAS_PDX use to Kconfig Use the Kconfig generated CONFIG_HAS_PDX defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 4 ++++ xen/common/Makefile | 2 +- xen/include/xen/pdx.h | 2 +- 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index f572c0d..d55c58c 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(lock_profile) += -DLOCK_PROFILE CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING -CFLAGS-$(HAS_PDX) += -DHAS_PDX CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index c88a5d8..1ac2233 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM def_bool y select HAS_DEVICE_TREE select HAS_PASSTHROUGH + select HAS_PDX select HAS_VIDEO config ARCH_DEFCONFIG diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 90b1f24..52b1ad4 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -7,7 +7,6 @@ # HAS_ARM_HDLCD := y -HAS_PDX := y CFLAGS += -I$(BASEDIR)/include diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 12780f9..d472234 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -10,6 +10,7 @@ config X86 select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI + select HAS_PDX select HAS_VGA config ARCH_DEFCONFIG diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 88c47ab..568fa97 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -4,7 +4,6 @@ HAS_NUMA := y HAS_EHCI := y HAS_KEXEC := y -HAS_PDX := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 75edd45..4905574 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,6 +5,10 @@ menu "Common Features" config HAS_DEVICE_TREE bool +# Select HAS_PDX if PDX is supported +config HAS_PDX + bool + # Select HAS_GDBSX if GDBSX is supported config HAS_GDBSX bool diff --git a/xen/common/Makefile b/xen/common/Makefile index 5dc2bb2..0acd2b0 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -23,7 +23,7 @@ obj-y += memory.o obj-y += multicall.o obj-y += notifier.o obj-y += page_alloc.o -obj-$(HAS_PDX) += pdx.o +obj-$(CONFIG_HAS_PDX) += pdx.o obj-y += preempt.o obj-y += random.o obj-y += rangeset.o diff --git a/xen/include/xen/pdx.h b/xen/include/xen/pdx.h index 18fe8e5..c7c837e 100644 --- a/xen/include/xen/pdx.h +++ b/xen/include/xen/pdx.h @@ -1,7 +1,7 @@ #ifndef __XEN_PDX_H__ #define __XEN_PDX_H__ -#ifdef HAS_PDX +#ifdef CONFIG_HAS_PDX extern unsigned long max_pdx; extern unsigned long pfn_pdx_bottom_mask, ma_va_bottom_mask; -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:27:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctg-0006Ly-LH; Wed, 23 Dec 2015 06:27:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctf-0006Lo-Bu for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:39 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id E3/6A-21571-ADE3A765; Wed, 23 Dec 2015 06:27:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1450852057!6802764!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27081 invoked from network); 23 Dec 2015 06:27:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:27:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctd-0000rs-Af for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcta-0007Kz-Eo for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:36 +0000 Date: Wed, 23 Dec 2015 06:27:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_KEXEC / KEXEC use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 684b4130640218b1d47454fac35279db5add9ee5 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:49:40 2015 +0100 build: convert HAS_KEXEC / KEXEC use to Kconfig Use the Kconfig generated CONFIG_HAS_KEXEC defines in the build system and replace kexec :=y in Rules.mk with a kconfig option called CONFIG_KEXEC. Purposefully did not merge the two variables together in this patch to keep this as mechanical as possible. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 10 ++++------ xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index d55c58c..4ed0d11 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -10,7 +10,6 @@ lock_profile ?= n crash_debug ?= n frame_pointer ?= n lto ?= n -kexec ?= y -include $(BASEDIR)/include/config/auto.conf @@ -28,6 +27,10 @@ ifeq ($(perfc_arrays),y) perfc := y endif +ifneq ($(origin kexec),undefined) +$(error "You must use 'make menuconfig' to enable/disable kexec now.") +endif + # Set ARCH/SUBARCH appropriately. override TARGET_SUBARCH := $(XEN_TARGET_ARCH) override TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \ @@ -68,11 +71,6 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif -CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec) -CONFIG_KEXEC := $(CONFIG_KEXEC-y) - -CFLAGS-$(CONFIG_KEXEC) += -DCONFIG_KEXEC - AFLAGS-y += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h # Clang's built-in assembler can't handle .code16/.code32/.code64 yet diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index d472234..88955e7 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -7,6 +7,7 @@ config X86 select HAS_CPUFREQ select HAS_GDBSX select HAS_IOPORTS + select HAS_KEXEC select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 568fa97..c27e0d6 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -3,7 +3,6 @@ HAS_NUMA := y HAS_EHCI := y -HAS_KEXEC := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 4905574..8d2ab4f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -9,6 +9,10 @@ config HAS_DEVICE_TREE config HAS_PDX bool +# Select HAS_KEXEC if kexec is supported +config HAS_KEXEC + bool + # Select HAS_GDBSX if GDBSX is supported config HAS_GDBSX bool @@ -16,4 +20,16 @@ config HAS_GDBSX config HAS_IOPORTS bool +# Enable/Disable kexec support +config KEXEC + bool "kexec support" + default y + depends on HAS_KEXEC + ---help--- + Allows a running Xen hypervisor to be replaced with another OS + without rebooting. This is primarily used to execute a crash + environment to collect information on a Xen hypervisor or dom0 crash. + + If unsure, say Y. + endmenu -- generated by git-patchbot for /home/xen/git/xen.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 23 06:27:40 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctg-0006Ly-LH; Wed, 23 Dec 2015 06:27:40 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctf-0006Lo-Bu for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:39 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id E3/6A-21571-ADE3A765; Wed, 23 Dec 2015 06:27:38 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1450852057!6802764!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27081 invoked from network); 23 Dec 2015 06:27:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-4.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:27:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctd-0000rs-Af for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcta-0007Kz-Eo for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:36 +0000 Date: Wed, 23 Dec 2015 06:27:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_KEXEC / KEXEC use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 684b4130640218b1d47454fac35279db5add9ee5 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:49:40 2015 +0100 build: convert HAS_KEXEC / KEXEC use to Kconfig Use the Kconfig generated CONFIG_HAS_KEXEC defines in the build system and replace kexec :=y in Rules.mk with a kconfig option called CONFIG_KEXEC. Purposefully did not merge the two variables together in this patch to keep this as mechanical as possible. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/Rules.mk | 10 ++++------ xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/common/Kconfig | 16 ++++++++++++++++ 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/xen/Rules.mk b/xen/Rules.mk index d55c58c..4ed0d11 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -10,7 +10,6 @@ lock_profile ?= n crash_debug ?= n frame_pointer ?= n lto ?= n -kexec ?= y -include $(BASEDIR)/include/config/auto.conf @@ -28,6 +27,10 @@ ifeq ($(perfc_arrays),y) perfc := y endif +ifneq ($(origin kexec),undefined) +$(error "You must use 'make menuconfig' to enable/disable kexec now.") +endif + # Set ARCH/SUBARCH appropriately. override TARGET_SUBARCH := $(XEN_TARGET_ARCH) override TARGET_ARCH := $(shell echo $(XEN_TARGET_ARCH) | \ @@ -68,11 +71,6 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif -CONFIG_KEXEC-$(HAS_KEXEC) := $(kexec) -CONFIG_KEXEC := $(CONFIG_KEXEC-y) - -CFLAGS-$(CONFIG_KEXEC) += -DCONFIG_KEXEC - AFLAGS-y += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h # Clang's built-in assembler can't handle .code16/.code32/.code64 yet diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index d472234..88955e7 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -7,6 +7,7 @@ config X86 select HAS_CPUFREQ select HAS_GDBSX select HAS_IOPORTS + select HAS_KEXEC select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index 568fa97..c27e0d6 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -3,7 +3,6 @@ HAS_NUMA := y HAS_EHCI := y -HAS_KEXEC := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 4905574..8d2ab4f 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -9,6 +9,10 @@ config HAS_DEVICE_TREE config HAS_PDX bool +# Select HAS_KEXEC if kexec is supported +config HAS_KEXEC + bool + # Select HAS_GDBSX if GDBSX is supported config HAS_GDBSX bool @@ -16,4 +20,16 @@ config HAS_GDBSX config HAS_IOPORTS bool +# Enable/Disable kexec support +config KEXEC + bool "kexec support" + default y + depends on HAS_KEXEC + ---help--- + Allows a running Xen hypervisor to be replaced with another OS + without rebooting. This is primarily used to execute a crash + environment to collect information on a Xen hypervisor or dom0 crash. + + If unsure, say Y. + endmenu -- generated by git-patchbot for /home/xen/git/xen.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 23 06:27:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcts-0006Na-P7; Wed, 23 Dec 2015 06:27:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctr-0006NO-LH for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:51 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id F5/7A-21571-7EE3A765; Wed, 23 Dec 2015 06:27:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450852069!6827645!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35620 invoked from network); 23 Dec 2015 06:27:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:27:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctp-0000s0-LC for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBctn-0007LT-QG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:48 +0000 Date: Wed, 23 Dec 2015 06:27:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_ARM_HDLCD use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6eb48cbfdf29f7b054f68acd1a7a9c6c7a0f6eb7 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:23:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:50:44 2015 +0100 build: convert HAS_ARM_HDLCD use to Kconfig Use the Kconfig generated CONFIG_HAS_ARM_HDLCD defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 2 -- xen/drivers/video/Kconfig | 4 ++++ xen/drivers/video/Makefile | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 1ac2233..ec2406c 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -16,6 +16,7 @@ config ARM_64 config ARM def_bool y + select HAS_ARM_HDLCD select HAS_DEVICE_TREE select HAS_PASSTHROUGH select HAS_PDX diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 52b1ad4..2158bd8 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -6,8 +6,6 @@ # 'make clean' before rebuilding. # -HAS_ARM_HDLCD := y - CFLAGS += -I$(BASEDIR)/include $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 2b553d9..8b25694 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -7,3 +7,7 @@ config HAS_VIDEO config HAS_VGA bool select HAS_VIDEO + +# Select HAS_ARM_HDLCD if ARM HDLCD is supported +config HAS_ARM_HDLCD + bool diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index 0143c4a..b9b5e23 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -4,4 +4,4 @@ obj-$(CONFIG_HAS_VIDEO) += font_8x16.o obj-$(CONFIG_HAS_VIDEO) += font_8x8.o obj-$(CONFIG_HAS_VIDEO) += lfb.o obj-$(CONFIG_HAS_VGA) += vesa.o -obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o +obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:27:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:27:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcts-0006Na-P7; Wed, 23 Dec 2015 06:27:52 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctr-0006NO-LH for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:51 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id F5/7A-21571-7EE3A765; Wed, 23 Dec 2015 06:27:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450852069!6827645!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35620 invoked from network); 23 Dec 2015 06:27:50 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:27:50 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBctp-0000s0-LC for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:49 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBctn-0007LT-QG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:27:48 +0000 Date: Wed, 23 Dec 2015 06:27:47 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_ARM_HDLCD use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 6eb48cbfdf29f7b054f68acd1a7a9c6c7a0f6eb7 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:23:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:50:44 2015 +0100 build: convert HAS_ARM_HDLCD use to Kconfig Use the Kconfig generated CONFIG_HAS_ARM_HDLCD defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/arm/Kconfig | 1 + xen/arch/arm/Rules.mk | 2 -- xen/drivers/video/Kconfig | 4 ++++ xen/drivers/video/Makefile | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 1ac2233..ec2406c 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -16,6 +16,7 @@ config ARM_64 config ARM def_bool y + select HAS_ARM_HDLCD select HAS_DEVICE_TREE select HAS_PASSTHROUGH select HAS_PDX diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 52b1ad4..2158bd8 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -6,8 +6,6 @@ # 'make clean' before rebuilding. # -HAS_ARM_HDLCD := y - CFLAGS += -I$(BASEDIR)/include $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) diff --git a/xen/drivers/video/Kconfig b/xen/drivers/video/Kconfig index 2b553d9..8b25694 100644 --- a/xen/drivers/video/Kconfig +++ b/xen/drivers/video/Kconfig @@ -7,3 +7,7 @@ config HAS_VIDEO config HAS_VGA bool select HAS_VIDEO + +# Select HAS_ARM_HDLCD if ARM HDLCD is supported +config HAS_ARM_HDLCD + bool diff --git a/xen/drivers/video/Makefile b/xen/drivers/video/Makefile index 0143c4a..b9b5e23 100644 --- a/xen/drivers/video/Makefile +++ b/xen/drivers/video/Makefile @@ -4,4 +4,4 @@ obj-$(CONFIG_HAS_VIDEO) += font_8x16.o obj-$(CONFIG_HAS_VIDEO) += font_8x8.o obj-$(CONFIG_HAS_VIDEO) += lfb.o obj-$(CONFIG_HAS_VGA) += vesa.o -obj-$(HAS_ARM_HDLCD) += arm_hdlcd.o +obj-$(CONFIG_HAS_ARM_HDLCD) += arm_hdlcd.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28: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 1aBcu6-0006QN-1s; Wed, 23 Dec 2015 06:28:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcu5-0006QD-5r for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:05 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id CB/92-12831-4FE3A765; Wed, 23 Dec 2015 06:28:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1450852081!12376214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41306 invoked from network); 23 Dec 2015 06:28:01 -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; 23 Dec 2015 06:28:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcu0-0000s8-Rs for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcu0-0007MP-C5 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:00 +0000 Date: Wed, 23 Dec 2015 06:28:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_CADENCE_UART use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d21e3663af228252036d72ba31cc8b9a856ccdfa Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:51:27 2015 +0100 build: convert HAS_CADENCE_UART use to Kconfig Use the Kconfig generated CONFIG_HAS_CADENCE_UART defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm64.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm64.mk b/config/arm64.mk index f35f6bf..2d119a6 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -7,7 +7,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc HAS_PL011 := y -HAS_CADENCE_UART := y HAS_MEM_ACCESS := y HAS_GICV3 := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index eb8c3b5..fc49bd7 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -4,3 +4,12 @@ config HAS_NS16550 default y help This selects the 16550-series UART support. For most systems, say Y. + +# Xilinx Zynq Cadence UART support +config HAS_CADENCE_UART + bool + default y + depends on ARM_64 + help + This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq + based board, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 5e9d271..e86ba6f 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,6 +1,6 @@ obj-y += console.o obj-$(CONFIG_HAS_NS16550) += ns16550.o -obj-$(HAS_CADENCE_UART) += cadence-uart.o +obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:06 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28: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 1aBcu6-0006QN-1s; Wed, 23 Dec 2015 06:28:06 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcu5-0006QD-5r for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:05 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id CB/92-12831-4FE3A765; Wed, 23 Dec 2015 06:28:04 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1450852081!12376214!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 41306 invoked from network); 23 Dec 2015 06:28:01 -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; 23 Dec 2015 06:28:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcu0-0000s8-Rs for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcu0-0007MP-C5 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:00 +0000 Date: Wed, 23 Dec 2015 06:28:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_CADENCE_UART use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit d21e3663af228252036d72ba31cc8b9a856ccdfa Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:51:27 2015 +0100 build: convert HAS_CADENCE_UART use to Kconfig Use the Kconfig generated CONFIG_HAS_CADENCE_UART defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm64.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm64.mk b/config/arm64.mk index f35f6bf..2d119a6 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -7,7 +7,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc HAS_PL011 := y -HAS_CADENCE_UART := y HAS_MEM_ACCESS := y HAS_GICV3 := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index eb8c3b5..fc49bd7 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -4,3 +4,12 @@ config HAS_NS16550 default y help This selects the 16550-series UART support. For most systems, say Y. + +# Xilinx Zynq Cadence UART support +config HAS_CADENCE_UART + bool + default y + depends on ARM_64 + help + This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq + based board, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 5e9d271..e86ba6f 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,6 +1,6 @@ obj-y += console.o obj-$(CONFIG_HAS_NS16550) += ns16550.o -obj-$(HAS_CADENCE_UART) += cadence-uart.o +obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuG-0006Rp-6y; Wed, 23 Dec 2015 06:28:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuF-0006Rf-1w for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:15 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 51/88-16618-EFE3A765; Wed, 23 Dec 2015 06:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1450852092!12805183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8108 invoked from network); 23 Dec 2015 06:28:13 -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; 23 Dec 2015 06:28:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuC-0000si-E0 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuB-0007Mv-Ds for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:12 +0000 Date: Wed, 23 Dec 2015 06:28:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PL011 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 162df803d6707bc89a1d6d92f6b619c7ab678477 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:51:48 2015 +0100 build: convert HAS_PL011 use to Kconfig Use the Kconfig generated CONFIG_HAS_PL011 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - config/arm64.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index f963338..3bbdd2d 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_PL011 := y HAS_EXYNOS4210 := y HAS_OMAP := y HAS_SCIF := y diff --git a/config/arm64.mk b/config/arm64.mk index 2d119a6..1b9a47f 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -6,7 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc -HAS_PL011 := y HAS_MEM_ACCESS := y HAS_GICV3 := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index fc49bd7..e90104b 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -13,3 +13,12 @@ config HAS_CADENCE_UART help This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq based board, say Y. + +# ARM AMBA PL011 UART support +config HAS_PL011 + bool + default y + depends on ARM + help + This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have + an Integrator/PP2, Integrator/CP or Versatile platform, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index e86ba6f..df87594 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,7 +1,7 @@ obj-y += console.o obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o -obj-$(HAS_PL011) += pl011.o +obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o obj-$(HAS_SCIF) += scif-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:16 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuG-0006Rp-6y; Wed, 23 Dec 2015 06:28:16 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuF-0006Rf-1w for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:15 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id 51/88-16618-EFE3A765; Wed, 23 Dec 2015 06:28:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1450852092!12805183!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8108 invoked from network); 23 Dec 2015 06:28:13 -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; 23 Dec 2015 06:28:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuC-0000si-E0 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuB-0007Mv-Ds for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:12 +0000 Date: Wed, 23 Dec 2015 06:28:11 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_PL011 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 162df803d6707bc89a1d6d92f6b619c7ab678477 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:51:48 2015 +0100 build: convert HAS_PL011 use to Kconfig Use the Kconfig generated CONFIG_HAS_PL011 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - config/arm64.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index f963338..3bbdd2d 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_PL011 := y HAS_EXYNOS4210 := y HAS_OMAP := y HAS_SCIF := y diff --git a/config/arm64.mk b/config/arm64.mk index 2d119a6..1b9a47f 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -6,7 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc -HAS_PL011 := y HAS_MEM_ACCESS := y HAS_GICV3 := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index fc49bd7..e90104b 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -13,3 +13,12 @@ config HAS_CADENCE_UART help This selects the Xilinx Zynq Cadence UART. If you have a Xilinx Zynq based board, say Y. + +# ARM AMBA PL011 UART support +config HAS_PL011 + bool + default y + depends on ARM + help + This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have + an Integrator/PP2, Integrator/CP or Versatile platform, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index e86ba6f..df87594 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -1,7 +1,7 @@ obj-y += console.o obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o -obj-$(HAS_PL011) += pl011.o +obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o obj-$(HAS_SCIF) += scif-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuQ-0006TC-Bd; Wed, 23 Dec 2015 06:28:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuP-0006T2-Ef for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:25 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 87/AA-21571-80F3A765; Wed, 23 Dec 2015 06:28:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450852103!6799751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49523 invoked from network); 23 Dec 2015 06:28:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:28:24 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuN-0000sq-Gf for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuN-0007NH-66 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:23 +0000 Date: Wed, 23 Dec 2015 06:28:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_EXYNOS4210 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60e9b9670e13a6e3a492db5527c4f2ba706b493e Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:52:12 2015 +0100 build: convert HAS_EXYNOS4210 use to Kconfig Use the Kconfig generated CONFIG_HAS_EXYNOS4210 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 3bbdd2d..56b71d7 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_EXYNOS4210 := y HAS_OMAP := y HAS_SCIF := y HAS_MEM_ACCESS := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index e90104b..8f72f68 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -22,3 +22,12 @@ config HAS_PL011 help This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have an Integrator/PP2, Integrator/CP or Versatile platform, say Y. + +# Samsung Exynos 4210 UART support +config HAS_EXYNOS4210 + bool + default y + depends on ARM_32 + help + This selects the Samsung Exynos 4210 UART. If you have a Samsung + Exynos based board, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index df87594..f8e7b44 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -2,7 +2,7 @@ obj-y += console.o obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(CONFIG_HAS_PL011) += pl011.o -obj-$(HAS_EXYNOS4210) += exynos4210-uart.o +obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o obj-$(HAS_SCIF) += scif-uart.o obj-$(HAS_EHCI) += ehci-dbgp.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:26 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuQ-0006TC-Bd; Wed, 23 Dec 2015 06:28:26 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuP-0006T2-Ef for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:25 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 87/AA-21571-80F3A765; Wed, 23 Dec 2015 06:28:24 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450852103!6799751!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49523 invoked from network); 23 Dec 2015 06:28:24 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:28:24 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuN-0000sq-Gf for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:23 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuN-0007NH-66 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:23 +0000 Date: Wed, 23 Dec 2015 06:28:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_EXYNOS4210 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 60e9b9670e13a6e3a492db5527c4f2ba706b493e Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:52:12 2015 +0100 build: convert HAS_EXYNOS4210 use to Kconfig Use the Kconfig generated CONFIG_HAS_EXYNOS4210 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 3bbdd2d..56b71d7 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_EXYNOS4210 := y HAS_OMAP := y HAS_SCIF := y HAS_MEM_ACCESS := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index e90104b..8f72f68 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -22,3 +22,12 @@ config HAS_PL011 help This selects the ARM(R) AMBA(R) PrimeCell PL011 UART. If you have an Integrator/PP2, Integrator/CP or Versatile platform, say Y. + +# Samsung Exynos 4210 UART support +config HAS_EXYNOS4210 + bool + default y + depends on ARM_32 + help + This selects the Samsung Exynos 4210 UART. If you have a Samsung + Exynos based board, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index df87594..f8e7b44 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -2,7 +2,7 @@ obj-y += console.o obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(CONFIG_HAS_PL011) += pl011.o -obj-$(HAS_EXYNOS4210) += exynos4210-uart.o +obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(HAS_OMAP) += omap-uart.o obj-$(HAS_SCIF) += scif-uart.o obj-$(HAS_EHCI) += ehci-dbgp.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28: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 1aBcuc-0006Ui-GR; Wed, 23 Dec 2015 06:28:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcub-0006Ub-67 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:37 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 51/1D-05427-41F3A765; Wed, 23 Dec 2015 06:28:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1450852114!10821072!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38696 invoked from network); 23 Dec 2015 06:28:35 -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; 23 Dec 2015 06:28:35 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuY-0000sy-Gj for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuX-0007Nd-OV for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:34 +0000 Date: Wed, 23 Dec 2015 06:28:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_OMAP use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee6b91d12e45b76d3d3a4a893b4124c4e8c4f072 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:52:33 2015 +0100 build: convert HAS_OMAP use to Kconfig Use the Kconfig generated CONFIG_HAS_OMAP defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 56b71d7..b1de8da 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_OMAP := y HAS_SCIF := y HAS_MEM_ACCESS := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index 8f72f68..a424ab2 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -31,3 +31,12 @@ config HAS_EXYNOS4210 help This selects the Samsung Exynos 4210 UART. If you have a Samsung Exynos based board, say Y. + +# OMAP UART support +config HAS_OMAP + bool + default y + depends on ARM_32 + help + This selects the Texas Instruments OMAP UART. If you have a Texas + Instruments based CPU, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index f8e7b44..7118570 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -3,7 +3,7 @@ obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o -obj-$(HAS_OMAP) += omap-uart.o +obj-$(CONFIG_HAS_OMAP) += omap-uart.o obj-$(HAS_SCIF) += scif-uart.o obj-$(HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28: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 1aBcuc-0006Ui-GR; Wed, 23 Dec 2015 06:28:38 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcub-0006Ub-67 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:37 +0000 Received: from [193.109.254.147] by server-16.bemta-14.messagelabs.com id 51/1D-05427-41F3A765; Wed, 23 Dec 2015 06:28:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1450852114!10821072!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38696 invoked from network); 23 Dec 2015 06:28:35 -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; 23 Dec 2015 06:28:35 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuY-0000sy-Gj for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuX-0007Nd-OV for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:34 +0000 Date: Wed, 23 Dec 2015 06:28:33 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_OMAP use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ee6b91d12e45b76d3d3a4a893b4124c4e8c4f072 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:52:33 2015 +0100 build: convert HAS_OMAP use to Kconfig Use the Kconfig generated CONFIG_HAS_OMAP defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 56b71d7..b1de8da 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_OMAP := y HAS_SCIF := y HAS_MEM_ACCESS := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index 8f72f68..a424ab2 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -31,3 +31,12 @@ config HAS_EXYNOS4210 help This selects the Samsung Exynos 4210 UART. If you have a Samsung Exynos based board, say Y. + +# OMAP UART support +config HAS_OMAP + bool + default y + depends on ARM_32 + help + This selects the Texas Instruments OMAP UART. If you have a Texas + Instruments based CPU, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index f8e7b44..7118570 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -3,7 +3,7 @@ obj-$(CONFIG_HAS_NS16550) += ns16550.o obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o -obj-$(HAS_OMAP) += omap-uart.o +obj-$(CONFIG_HAS_OMAP) += omap-uart.o obj-$(HAS_SCIF) += scif-uart.o obj-$(HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28: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 1aBcun-0006W9-MM; Wed, 23 Dec 2015 06:28:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcul-0006Vz-US for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:48 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 47/CA-21571-F1F3A765; Wed, 23 Dec 2015 06:28:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450852126!6827726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38192 invoked from network); 23 Dec 2015 06:28:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:28:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuj-0000t3-Tn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcui-0007O2-Nn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:45 +0000 Date: Wed, 23 Dec 2015 06:28:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_SCIF use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ef6409ae1b5540fdb581817e5a56f47b140b73c8 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:52:54 2015 +0100 build: convert HAS_SCIF use to Kconfig Use the Kconfig generated CONFIG_HAS_SCIF defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index b1de8da..001b2cd 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_SCIF := y HAS_MEM_ACCESS := y # Use only if calling $(LD) directly. diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index a424ab2..c81b109 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -40,3 +40,12 @@ config HAS_OMAP help This selects the Texas Instruments OMAP UART. If you have a Texas Instruments based CPU, say Y. + +# SuperH SCI(F) UART support +config HAS_SCIF + bool + default y + depends on ARM_32 + help + This selects the SuperH SCI(F) UART. If you have a SuperH based board, + say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 7118570..f9d9a9c 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(CONFIG_HAS_OMAP) += omap-uart.o -obj-$(HAS_SCIF) += scif-uart.o +obj-$(CONFIG_HAS_SCIF) += scif-uart.o obj-$(HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o obj-y += serial.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:28:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:28: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 1aBcun-0006W9-MM; Wed, 23 Dec 2015 06:28:49 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcul-0006Vz-US for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:48 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 47/CA-21571-F1F3A765; Wed, 23 Dec 2015 06:28:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450852126!6827726!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38192 invoked from network); 23 Dec 2015 06:28:46 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:28:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuj-0000t3-Tn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcui-0007O2-Nn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:45 +0000 Date: Wed, 23 Dec 2015 06:28:44 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_SCIF use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ef6409ae1b5540fdb581817e5a56f47b140b73c8 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:52:54 2015 +0100 build: convert HAS_SCIF use to Kconfig Use the Kconfig generated CONFIG_HAS_SCIF defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich Acked-by: Ian Campbell --- config/arm32.mk | 1 - xen/drivers/char/Kconfig | 9 +++++++++ xen/drivers/char/Makefile | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index b1de8da..001b2cd 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,7 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_SCIF := y HAS_MEM_ACCESS := y # Use only if calling $(LD) directly. diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index a424ab2..c81b109 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -40,3 +40,12 @@ config HAS_OMAP help This selects the Texas Instruments OMAP UART. If you have a Texas Instruments based CPU, say Y. + +# SuperH SCI(F) UART support +config HAS_SCIF + bool + default y + depends on ARM_32 + help + This selects the SuperH SCI(F) UART. If you have a SuperH based board, + say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index 7118570..f9d9a9c 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -4,7 +4,7 @@ obj-$(CONFIG_HAS_CADENCE_UART) += cadence-uart.o obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(CONFIG_HAS_OMAP) += omap-uart.o -obj-$(HAS_SCIF) += scif-uart.o +obj-$(CONFIG_HAS_SCIF) += scif-uart.o obj-$(HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o obj-y += serial.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuz-0006Y1-RH; Wed, 23 Dec 2015 06:29:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcux-0006Xv-Mh for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:59 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 5F/1C-07165-B2F3A765; Wed, 23 Dec 2015 06:28:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1450852137!12761691!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60647 invoked from network); 23 Dec 2015 06:28:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:28:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuv-0000tE-8f for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuu-0007Pq-4a for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:56 +0000 Date: Wed, 23 Dec 2015 06:28:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_EHCI use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e02021d84ba3fcebfc23861965619bfb966f24f Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:53:15 2015 +0100 build: convert HAS_EHCI use to Kconfig Use the Kconfig generated CONFIG_HAS_EHCI defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/char/Kconfig | 7 +++++++ xen/drivers/char/Makefile | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 88955e7..393127d 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -5,6 +5,7 @@ config X86 def_bool y select HAS_ACPI select HAS_CPUFREQ + select HAS_EHCI select HAS_GDBSX select HAS_IOPORTS select HAS_KEXEC diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index c27e0d6..4ca69a1 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_EHCI := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index c81b109..08973cf 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -49,3 +49,10 @@ config HAS_SCIF help This selects the SuperH SCI(F) UART. If you have a SuperH based board, say Y. + +# USB EHCI debug port support +config HAS_EHCI + bool + help + This selects the USB based EHCI debug port to be used as a UART. If + you have an x86 based system with USB, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index f9d9a9c..aa620fc 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -5,6 +5,6 @@ obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(CONFIG_HAS_OMAP) += omap-uart.o obj-$(CONFIG_HAS_SCIF) += scif-uart.o -obj-$(HAS_EHCI) += ehci-dbgp.o +obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o obj-y += serial.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:01 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuz-0006Y1-RH; Wed, 23 Dec 2015 06:29:01 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcux-0006Xv-Mh for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:59 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 5F/1C-07165-B2F3A765; Wed, 23 Dec 2015 06:28:59 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1450852137!12761691!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60647 invoked from network); 23 Dec 2015 06:28:58 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-14.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:28:58 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcuv-0000tE-8f for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:57 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcuu-0007Pq-4a for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:28:56 +0000 Date: Wed, 23 Dec 2015 06:28:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_EHCI use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1e02021d84ba3fcebfc23861965619bfb966f24f Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:53:15 2015 +0100 build: convert HAS_EHCI use to Kconfig Use the Kconfig generated CONFIG_HAS_EHCI defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Jan Beulich --- xen/arch/x86/Kconfig | 1 + xen/arch/x86/Rules.mk | 1 - xen/drivers/char/Kconfig | 7 +++++++ xen/drivers/char/Makefile | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 88955e7..393127d 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -5,6 +5,7 @@ config X86 def_bool y select HAS_ACPI select HAS_CPUFREQ + select HAS_EHCI select HAS_GDBSX select HAS_IOPORTS select HAS_KEXEC diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk index c27e0d6..4ca69a1 100644 --- a/xen/arch/x86/Rules.mk +++ b/xen/arch/x86/Rules.mk @@ -2,7 +2,6 @@ # x86-specific definitions HAS_NUMA := y -HAS_EHCI := y HAS_CORE_PARKING := y xenoprof := y diff --git a/xen/drivers/char/Kconfig b/xen/drivers/char/Kconfig index c81b109..08973cf 100644 --- a/xen/drivers/char/Kconfig +++ b/xen/drivers/char/Kconfig @@ -49,3 +49,10 @@ config HAS_SCIF help This selects the SuperH SCI(F) UART. If you have a SuperH based board, say Y. + +# USB EHCI debug port support +config HAS_EHCI + bool + help + This selects the USB based EHCI debug port to be used as a UART. If + you have an x86 based system with USB, say Y. diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile index f9d9a9c..aa620fc 100644 --- a/xen/drivers/char/Makefile +++ b/xen/drivers/char/Makefile @@ -5,6 +5,6 @@ obj-$(CONFIG_HAS_PL011) += pl011.o obj-$(CONFIG_HAS_EXYNOS4210) += exynos4210-uart.o obj-$(CONFIG_HAS_OMAP) += omap-uart.o obj-$(CONFIG_HAS_SCIF) += scif-uart.o -obj-$(HAS_EHCI) += ehci-dbgp.o +obj-$(CONFIG_HAS_EHCI) += ehci-dbgp.o obj-$(CONFIG_ARM) += dt-uart.o obj-y += serial.o -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29: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 1aBcvM-0006Zz-0u; Wed, 23 Dec 2015 06:29:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvK-0006Zu-G3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:22 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id F1/B2-31122-14F3A765; Wed, 23 Dec 2015 06:29:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1450852160!6800188!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52501 invoked from network); 23 Dec 2015 06:29:21 -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; 23 Dec 2015 06:29:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvI-0000to-AD for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcv6-0007RC-GX for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:20 +0000 Date: Wed, 23 Dec 2015 06:29:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_MEM_ACCESS use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab26ab3084c73a191e0a1f15457de2b7ba4bd0ac Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:53:49 2015 +0100 build: convert HAS_MEM_ACCESS use to Kconfig Use the Kconfig generated CONFIG_HAS_MEM_ACCESS defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- config/arm32.mk | 2 -- config/arm64.mk | 1 - config/x86_32.mk | 1 - config/x86_64.mk | 1 - xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 4 ++++ xen/common/Makefile | 2 +- xen/common/domctl.c | 2 +- xen/common/vm_event.c | 2 +- xen/include/xen/mem_access.h | 2 +- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 001b2cd..001e214 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,8 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_MEM_ACCESS := y - # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL diff --git a/config/arm64.mk b/config/arm64.mk index 1b9a47f..4b8fdf6 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -6,7 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc -HAS_MEM_ACCESS := y HAS_GICV3 := y # Use only if calling $(LD) directly. diff --git a/config/x86_32.mk b/config/x86_32.mk index ed69447..0738192 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -5,7 +5,6 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_ACCESS := y HAS_MEM_PAGING := y HAS_MEM_SHARING := y diff --git a/config/x86_64.mk b/config/x86_64.mk index f74611f..eabc634 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -6,7 +6,6 @@ CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_ACCESS := y HAS_MEM_PAGING := y HAS_MEM_SHARING := y diff --git a/xen/Rules.mk b/xen/Rules.mk index 4ed0d11..9e2cff6 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index ec2406c..ec176a6 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM def_bool y select HAS_ARM_HDLCD select HAS_DEVICE_TREE + select HAS_MEM_ACCESS select HAS_PASSTHROUGH select HAS_PDX select HAS_VIDEO diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 393127d..b7705c2 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -9,6 +9,7 @@ config X86 select HAS_GDBSX select HAS_IOPORTS select HAS_KEXEC + select HAS_MEM_ACCESS select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 8d2ab4f..1193bbc 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,6 +5,10 @@ menu "Common Features" config HAS_DEVICE_TREE bool +# Select HAS_MEM_ACCESS if mem access is supported +config HAS_MEM_ACCESS + bool + # Select HAS_PDX if PDX is supported config HAS_PDX bool diff --git a/xen/common/Makefile b/xen/common/Makefile index 0acd2b0..8ab15ba 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_KEXEC) += kexec.o obj-$(CONFIG_KEXEC) += kimage.o obj-y += lib.o obj-y += lzo.o -obj-$(HAS_MEM_ACCESS) += mem_access.o +obj-$(CONFIG_HAS_MEM_ACCESS) += mem_access.o obj-y += memory.o obj-y += multicall.o obj-y += notifier.o diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 46b967e..1fab587 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1130,7 +1130,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) d->disable_migrate = op->u.disable_migrate.disable; break; -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS case XEN_DOMCTL_set_access_required: if ( unlikely(current->domain == d) ) ret = -EPERM; diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index e1f9580..0fe93dc 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -397,7 +397,7 @@ void vm_event_resume(struct domain *d, struct vm_event_domain *ved) vm_event_register_write_resume(v, &rsp); break; -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS case VM_EVENT_REASON_MEM_ACCESS: mem_access_resume(v, &rsp); break; diff --git a/xen/include/xen/mem_access.h b/xen/include/xen/mem_access.h index 111f1fe..272f1e4 100644 --- a/xen/include/xen/mem_access.h +++ b/xen/include/xen/mem_access.h @@ -25,7 +25,7 @@ #include #include -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS int mem_access_memop(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(xen_mem_access_op_t) arg); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 5e6ee71..bdc7d1b 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -560,7 +560,7 @@ static XSM_INLINE int xsm_vm_event_control(XSM_DEFAULT_ARG struct domain *d, int return xsm_default_action(action, current->domain, d); } -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS static XSM_INLINE int xsm_mem_access(XSM_DEFAULT_ARG struct domain *d) { XSM_ASSERT_ACTION(XSM_DM_PRIV); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 1dac834..714b3bf 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -152,7 +152,7 @@ struct xsm_operations { int (*vm_event_control) (struct domain *d, int mode, int op); -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS int (*mem_access) (struct domain *d); #endif @@ -604,7 +604,7 @@ static inline int xsm_vm_event_control (xsm_default_t def, struct domain *d, int return xsm_ops->vm_event_control(d, mode, op); } -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS static inline int xsm_mem_access (xsm_default_t def, struct domain *d) { return xsm_ops->mem_access(d); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 6f4101c..ee4d6f3 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -129,7 +129,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, vm_event_control); -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS set_to_dummy_if_null(ops, mem_access); #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 454b0ce..0102cc0 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1192,7 +1192,7 @@ static int flask_vm_event_control(struct domain *d, int mode, int op) return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__VM_EVENT); } -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS static int flask_mem_access(struct domain *d) { return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_ACCESS); @@ -1705,7 +1705,7 @@ static struct xsm_operations flask_ops = { .vm_event_control = flask_vm_event_control, -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS .mem_access = flask_mem_access, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:24 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29: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 1aBcvM-0006Zz-0u; Wed, 23 Dec 2015 06:29:24 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvK-0006Zu-G3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:22 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id F1/B2-31122-14F3A765; Wed, 23 Dec 2015 06:29:21 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1450852160!6800188!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52501 invoked from network); 23 Dec 2015 06:29:21 -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; 23 Dec 2015 06:29:21 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvI-0000to-AD for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:20 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcv6-0007RC-GX for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:20 +0000 Date: Wed, 23 Dec 2015 06:29:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_MEM_ACCESS use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit ab26ab3084c73a191e0a1f15457de2b7ba4bd0ac Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:53:49 2015 +0100 build: convert HAS_MEM_ACCESS use to Kconfig Use the Kconfig generated CONFIG_HAS_MEM_ACCESS defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- config/arm32.mk | 2 -- config/arm64.mk | 1 - config/x86_32.mk | 1 - config/x86_64.mk | 1 - xen/Rules.mk | 1 - xen/arch/arm/Kconfig | 1 + xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 4 ++++ xen/common/Makefile | 2 +- xen/common/domctl.c | 2 +- xen/common/vm_event.c | 2 +- xen/include/xen/mem_access.h | 2 +- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/arm32.mk b/config/arm32.mk index 001b2cd..001e214 100644 --- a/config/arm32.mk +++ b/config/arm32.mk @@ -9,8 +9,6 @@ CONFIG_XEN_INSTALL_SUFFIX := # Explicitly specifiy 32-bit ARM ISA since toolchain default can be -mthumb: CFLAGS += -marm -HAS_MEM_ACCESS := y - # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL diff --git a/config/arm64.mk b/config/arm64.mk index 1b9a47f..4b8fdf6 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -6,7 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc -HAS_MEM_ACCESS := y HAS_GICV3 := y # Use only if calling $(LD) directly. diff --git a/config/x86_32.mk b/config/x86_32.mk index ed69447..0738192 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -5,7 +5,6 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_ACCESS := y HAS_MEM_PAGING := y HAS_MEM_SHARING := y diff --git a/config/x86_64.mk b/config/x86_64.mk index f74611f..eabc634 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -6,7 +6,6 @@ CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_ACCESS := y HAS_MEM_PAGING := y HAS_MEM_SHARING := y diff --git a/xen/Rules.mk b/xen/Rules.mk index 4ed0d11..9e2cff6 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_MEM_ACCESS) += -DHAS_MEM_ACCESS CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index ec2406c..ec176a6 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -18,6 +18,7 @@ config ARM def_bool y select HAS_ARM_HDLCD select HAS_DEVICE_TREE + select HAS_MEM_ACCESS select HAS_PASSTHROUGH select HAS_PDX select HAS_VIDEO diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 393127d..b7705c2 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -9,6 +9,7 @@ config X86 select HAS_GDBSX select HAS_IOPORTS select HAS_KEXEC + select HAS_MEM_ACCESS select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 8d2ab4f..1193bbc 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -5,6 +5,10 @@ menu "Common Features" config HAS_DEVICE_TREE bool +# Select HAS_MEM_ACCESS if mem access is supported +config HAS_MEM_ACCESS + bool + # Select HAS_PDX if PDX is supported config HAS_PDX bool diff --git a/xen/common/Makefile b/xen/common/Makefile index 0acd2b0..8ab15ba 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_KEXEC) += kexec.o obj-$(CONFIG_KEXEC) += kimage.o obj-y += lib.o obj-y += lzo.o -obj-$(HAS_MEM_ACCESS) += mem_access.o +obj-$(CONFIG_HAS_MEM_ACCESS) += mem_access.o obj-y += memory.o obj-y += multicall.o obj-y += notifier.o diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 46b967e..1fab587 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -1130,7 +1130,7 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) d->disable_migrate = op->u.disable_migrate.disable; break; -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS case XEN_DOMCTL_set_access_required: if ( unlikely(current->domain == d) ) ret = -EPERM; diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index e1f9580..0fe93dc 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -397,7 +397,7 @@ void vm_event_resume(struct domain *d, struct vm_event_domain *ved) vm_event_register_write_resume(v, &rsp); break; -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS case VM_EVENT_REASON_MEM_ACCESS: mem_access_resume(v, &rsp); break; diff --git a/xen/include/xen/mem_access.h b/xen/include/xen/mem_access.h index 111f1fe..272f1e4 100644 --- a/xen/include/xen/mem_access.h +++ b/xen/include/xen/mem_access.h @@ -25,7 +25,7 @@ #include #include -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS int mem_access_memop(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(xen_mem_access_op_t) arg); diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 5e6ee71..bdc7d1b 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -560,7 +560,7 @@ static XSM_INLINE int xsm_vm_event_control(XSM_DEFAULT_ARG struct domain *d, int return xsm_default_action(action, current->domain, d); } -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS static XSM_INLINE int xsm_mem_access(XSM_DEFAULT_ARG struct domain *d) { XSM_ASSERT_ACTION(XSM_DM_PRIV); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 1dac834..714b3bf 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -152,7 +152,7 @@ struct xsm_operations { int (*vm_event_control) (struct domain *d, int mode, int op); -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS int (*mem_access) (struct domain *d); #endif @@ -604,7 +604,7 @@ static inline int xsm_vm_event_control (xsm_default_t def, struct domain *d, int return xsm_ops->vm_event_control(d, mode, op); } -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS static inline int xsm_mem_access (xsm_default_t def, struct domain *d) { return xsm_ops->mem_access(d); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 6f4101c..ee4d6f3 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -129,7 +129,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, vm_event_control); -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS set_to_dummy_if_null(ops, mem_access); #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 454b0ce..0102cc0 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1192,7 +1192,7 @@ static int flask_vm_event_control(struct domain *d, int mode, int op) return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__VM_EVENT); } -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS static int flask_mem_access(struct domain *d) { return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_ACCESS); @@ -1705,7 +1705,7 @@ static struct xsm_operations flask_ops = { .vm_event_control = flask_vm_event_control, -#ifdef HAS_MEM_ACCESS +#ifdef CONFIG_HAS_MEM_ACCESS .mem_access = flask_mem_access, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvW-0006bK-9K; Wed, 23 Dec 2015 06:29:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvV-0006bB-96 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:33 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id CA/EA-18316-C4F3A765; Wed, 23 Dec 2015 06:29:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450852171!6799869!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62167 invoked from network); 23 Dec 2015 06:29:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:29:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvT-0000tw-25 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvS-0007SB-O5 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:30 +0000 Date: Wed, 23 Dec 2015 06:29:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_MEM_PAGING use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c248338b7ab39265d84a527aa77eb2c2a6962b6b Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:54:31 2015 +0100 build: convert HAS_MEM_PAGING use to Kconfig Use the Kconfig generated CONFIG_HAS_MEM_PAGING defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- config/x86_32.mk | 1 - config/x86_64.mk | 1 - xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 4 ++++ xen/common/memory.c | 2 +- xen/common/vm_event.c | 8 ++++---- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 11 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config/x86_32.mk b/config/x86_32.mk index 0738192..0fbc20d 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -5,7 +5,6 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_PAGING := y HAS_MEM_SHARING := y CFLAGS += -m32 -march=i686 diff --git a/config/x86_64.mk b/config/x86_64.mk index eabc634..b4b0163 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -6,7 +6,6 @@ CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_PAGING := y HAS_MEM_SHARING := y CONFIG_XEN_INSTALL_SUFFIX := .gz diff --git a/xen/Rules.mk b/xen/Rules.mk index 9e2cff6..38c29b2 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index b7705c2..cca768b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -10,6 +10,7 @@ config X86 select HAS_IOPORTS select HAS_KEXEC select HAS_MEM_ACCESS + select HAS_MEM_PAGING select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 1193bbc..946cca2 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -9,6 +9,10 @@ config HAS_DEVICE_TREE config HAS_MEM_ACCESS bool +# Select HAS_MEM_PAGING if mem paging is supported +config HAS_MEM_PAGING + bool + # Select HAS_PDX if PDX is supported config HAS_PDX bool diff --git a/xen/common/memory.c b/xen/common/memory.c index 6b3a755..bd8bf75 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1323,7 +1323,7 @@ int prepare_ring_for_helper( page = get_page_from_gfn(d, gmfn, &p2mt, P2M_UNSHARE); -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING if ( p2m_is_paging(p2mt) ) { if ( page ) diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 0fe93dc..2e59e41 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -403,7 +403,7 @@ void vm_event_resume(struct domain *d, struct vm_event_domain *ved) break; #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING case VM_EVENT_REASON_MEM_PAGING: p2m_mem_paging_resume(d, &rsp); break; @@ -502,7 +502,7 @@ int __vm_event_claim_slot(struct domain *d, struct vm_event_domain *ved, return vm_event_grab_slot(ved, (current->domain != d)); } -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING /* Registered with Xen-bound event channel for incoming notifications. */ static void mem_paging_notification(struct vcpu *v, unsigned int port) { @@ -530,7 +530,7 @@ static void mem_sharing_notification(struct vcpu *v, unsigned int port) /* Clean up on domain destruction */ void vm_event_cleanup(struct domain *d) { -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING if ( d->vm_event->paging.ring_page ) { /* Destroying the wait queue head means waking up all @@ -592,7 +592,7 @@ int vm_event_domctl(struct domain *d, xen_domctl_vm_event_op_t *vec, switch ( vec->mode ) { -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING case XEN_DOMCTL_VM_EVENT_OP_PAGING: { struct vm_event_domain *ved = &d->vm_event->paging; diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index bdc7d1b..2825226 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -568,7 +568,7 @@ static XSM_INLINE int xsm_mem_access(XSM_DEFAULT_ARG struct domain *d) } #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING static XSM_INLINE int xsm_mem_paging(XSM_DEFAULT_ARG struct domain *d) { XSM_ASSERT_ACTION(XSM_DM_PRIV); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 714b3bf..f24b7c3 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -156,7 +156,7 @@ struct xsm_operations { int (*mem_access) (struct domain *d); #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING int (*mem_paging) (struct domain *d); #endif @@ -611,7 +611,7 @@ static inline int xsm_mem_access (xsm_default_t def, struct domain *d) } #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING static inline int xsm_mem_paging (xsm_default_t def, struct domain *d) { return xsm_ops->mem_paging(d); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index ee4d6f3..d061c5b 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -133,7 +133,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, mem_access); #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING set_to_dummy_if_null(ops, mem_paging); #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 0102cc0..52478ff 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1199,7 +1199,7 @@ static int flask_mem_access(struct domain *d) } #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING static int flask_mem_paging(struct domain *d) { return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_PAGING); @@ -1709,7 +1709,7 @@ static struct xsm_operations flask_ops = { .mem_access = flask_mem_access, #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING .mem_paging = flask_mem_paging, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:34 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvW-0006bK-9K; Wed, 23 Dec 2015 06:29:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvV-0006bB-96 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:33 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id CA/EA-18316-C4F3A765; Wed, 23 Dec 2015 06:29:32 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450852171!6799869!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 62167 invoked from network); 23 Dec 2015 06:29:31 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:29:31 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvT-0000tw-25 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvS-0007SB-O5 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:30 +0000 Date: Wed, 23 Dec 2015 06:29:30 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_MEM_PAGING use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit c248338b7ab39265d84a527aa77eb2c2a6962b6b Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:54:31 2015 +0100 build: convert HAS_MEM_PAGING use to Kconfig Use the Kconfig generated CONFIG_HAS_MEM_PAGING defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Daniel De Graaf Acked-by: Ian Campbell --- config/x86_32.mk | 1 - config/x86_64.mk | 1 - xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 4 ++++ xen/common/memory.c | 2 +- xen/common/vm_event.c | 8 ++++---- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 11 files changed, 16 insertions(+), 14 deletions(-) diff --git a/config/x86_32.mk b/config/x86_32.mk index 0738192..0fbc20d 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -5,7 +5,6 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_PAGING := y HAS_MEM_SHARING := y CFLAGS += -m32 -march=i686 diff --git a/config/x86_64.mk b/config/x86_64.mk index eabc634..b4b0163 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -6,7 +6,6 @@ CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_PAGING := y HAS_MEM_SHARING := y CONFIG_XEN_INSTALL_SUFFIX := .gz diff --git a/xen/Rules.mk b/xen/Rules.mk index 9e2cff6..38c29b2 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_MEM_PAGING) += -DHAS_MEM_PAGING CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index b7705c2..cca768b 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -10,6 +10,7 @@ config X86 select HAS_IOPORTS select HAS_KEXEC select HAS_MEM_ACCESS + select HAS_MEM_PAGING select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 1193bbc..946cca2 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -9,6 +9,10 @@ config HAS_DEVICE_TREE config HAS_MEM_ACCESS bool +# Select HAS_MEM_PAGING if mem paging is supported +config HAS_MEM_PAGING + bool + # Select HAS_PDX if PDX is supported config HAS_PDX bool diff --git a/xen/common/memory.c b/xen/common/memory.c index 6b3a755..bd8bf75 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1323,7 +1323,7 @@ int prepare_ring_for_helper( page = get_page_from_gfn(d, gmfn, &p2mt, P2M_UNSHARE); -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING if ( p2m_is_paging(p2mt) ) { if ( page ) diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 0fe93dc..2e59e41 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -403,7 +403,7 @@ void vm_event_resume(struct domain *d, struct vm_event_domain *ved) break; #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING case VM_EVENT_REASON_MEM_PAGING: p2m_mem_paging_resume(d, &rsp); break; @@ -502,7 +502,7 @@ int __vm_event_claim_slot(struct domain *d, struct vm_event_domain *ved, return vm_event_grab_slot(ved, (current->domain != d)); } -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING /* Registered with Xen-bound event channel for incoming notifications. */ static void mem_paging_notification(struct vcpu *v, unsigned int port) { @@ -530,7 +530,7 @@ static void mem_sharing_notification(struct vcpu *v, unsigned int port) /* Clean up on domain destruction */ void vm_event_cleanup(struct domain *d) { -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING if ( d->vm_event->paging.ring_page ) { /* Destroying the wait queue head means waking up all @@ -592,7 +592,7 @@ int vm_event_domctl(struct domain *d, xen_domctl_vm_event_op_t *vec, switch ( vec->mode ) { -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING case XEN_DOMCTL_VM_EVENT_OP_PAGING: { struct vm_event_domain *ved = &d->vm_event->paging; diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index bdc7d1b..2825226 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -568,7 +568,7 @@ static XSM_INLINE int xsm_mem_access(XSM_DEFAULT_ARG struct domain *d) } #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING static XSM_INLINE int xsm_mem_paging(XSM_DEFAULT_ARG struct domain *d) { XSM_ASSERT_ACTION(XSM_DM_PRIV); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index 714b3bf..f24b7c3 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -156,7 +156,7 @@ struct xsm_operations { int (*mem_access) (struct domain *d); #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING int (*mem_paging) (struct domain *d); #endif @@ -611,7 +611,7 @@ static inline int xsm_mem_access (xsm_default_t def, struct domain *d) } #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING static inline int xsm_mem_paging (xsm_default_t def, struct domain *d) { return xsm_ops->mem_paging(d); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index ee4d6f3..d061c5b 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -133,7 +133,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, mem_access); #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING set_to_dummy_if_null(ops, mem_paging); #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 0102cc0..52478ff 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1199,7 +1199,7 @@ static int flask_mem_access(struct domain *d) } #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING static int flask_mem_paging(struct domain *d) { return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_PAGING); @@ -1709,7 +1709,7 @@ static struct xsm_operations flask_ops = { .mem_access = flask_mem_access, #endif -#ifdef HAS_MEM_PAGING +#ifdef CONFIG_HAS_MEM_PAGING .mem_paging = flask_mem_paging, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvh-0006ck-Dy; Wed, 23 Dec 2015 06:29:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvg-0006cX-8r for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:44 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E6/79-06091-75F3A765; Wed, 23 Dec 2015 06:29:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1450852181!12392502!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35678 invoked from network); 23 Dec 2015 06:29:42 -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; 23 Dec 2015 06:29:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvd-0000u4-Oj for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvd-0007T4-Gr for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:41 +0000 Date: Wed, 23 Dec 2015 06:29:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_MEM_SHARING use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 384cc72afccb4c6069d4814a2ac01557d1d0a7b5 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:54:55 2015 +0100 build: convert HAS_MEM_SHARING use to Kconfig Use the Kconfig generated CONFIG_HAS_MEM_SHARING defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Daniel De Graaf --- config/x86_32.mk | 2 -- config/x86_64.mk | 2 -- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 4 ++++ xen/common/memory.c | 2 +- xen/common/vm_event.c | 6 +++--- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/x86_32.mk b/config/x86_32.mk index 0fbc20d..29d13f7 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -5,8 +5,6 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_SHARING := y - CFLAGS += -m32 -march=i686 # Use only if calling $(LD) directly. diff --git a/config/x86_64.mk b/config/x86_64.mk index b4b0163..f12d549 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -6,8 +6,6 @@ CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_SHARING := y - CONFIG_XEN_INSTALL_SUFFIX := .gz CFLAGS += -m64 diff --git a/xen/Rules.mk b/xen/Rules.mk index 38c29b2..8839dca 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index cca768b..07e366d 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -11,6 +11,7 @@ config X86 select HAS_KEXEC select HAS_MEM_ACCESS select HAS_MEM_PAGING + select HAS_MEM_SHARING select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 946cca2..7d0e9a9 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -13,6 +13,10 @@ config HAS_MEM_ACCESS config HAS_MEM_PAGING bool +# Select HAS_MEM_SHARING if mem sharing is supported +config HAS_MEM_SHARING + bool + # Select HAS_PDX if PDX is supported config HAS_PDX bool diff --git a/xen/common/memory.c b/xen/common/memory.c index bd8bf75..9ff1145 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1332,7 +1332,7 @@ int prepare_ring_for_helper( return -ENOENT; } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING if ( p2m_is_shared(p2mt) ) { if ( page ) diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 2e59e41..28a7add 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -518,7 +518,7 @@ static void monitor_notification(struct vcpu *v, unsigned int port) vm_event_resume(v->domain, &v->domain->vm_event->monitor); } -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING /* Registered with Xen-bound event channel for incoming notifications. */ static void mem_sharing_notification(struct vcpu *v, unsigned int port) { @@ -549,7 +549,7 @@ void vm_event_cleanup(struct domain *d) destroy_waitqueue_head(&d->vm_event->monitor.wq); (void)vm_event_disable(d, &d->vm_event->monitor); } -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING if ( d->vm_event->share.ring_page ) { destroy_waitqueue_head(&d->vm_event->share.wq); @@ -682,7 +682,7 @@ int vm_event_domctl(struct domain *d, xen_domctl_vm_event_op_t *vec, } break; -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING case XEN_DOMCTL_VM_EVENT_OP_SHARING: { struct vm_event_domain *ved = &d->vm_event->share; diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 2825226..81fba40 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -576,7 +576,7 @@ static XSM_INLINE int xsm_mem_paging(XSM_DEFAULT_ARG struct domain *d) } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING static XSM_INLINE int xsm_mem_sharing(XSM_DEFAULT_ARG struct domain *d) { XSM_ASSERT_ACTION(XSM_DM_PRIV); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index f24b7c3..3fc3824 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -160,7 +160,7 @@ struct xsm_operations { int (*mem_paging) (struct domain *d); #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING int (*mem_sharing) (struct domain *d); #endif @@ -618,7 +618,7 @@ static inline int xsm_mem_paging (xsm_default_t def, struct domain *d) } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING static inline int xsm_mem_sharing (xsm_default_t def, struct domain *d) { return xsm_ops->mem_sharing(d); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index d061c5b..0f32636 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -137,7 +137,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, mem_paging); #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING set_to_dummy_if_null(ops, mem_sharing); #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 52478ff..9b7de30 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1206,7 +1206,7 @@ static int flask_mem_paging(struct domain *d) } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING static int flask_mem_sharing(struct domain *d) { return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_SHARING); @@ -1713,7 +1713,7 @@ static struct xsm_operations flask_ops = { .mem_paging = flask_mem_paging, #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING .mem_sharing = flask_mem_sharing, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvh-0006ck-Dy; Wed, 23 Dec 2015 06:29:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvg-0006cX-8r for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:44 +0000 Received: from [85.158.139.211] by server-13.bemta-5.messagelabs.com id E6/79-06091-75F3A765; Wed, 23 Dec 2015 06:29:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1450852181!12392502!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35678 invoked from network); 23 Dec 2015 06:29:42 -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; 23 Dec 2015 06:29:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvd-0000u4-Oj for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:41 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvd-0007T4-Gr for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:41 +0000 Date: Wed, 23 Dec 2015 06:29:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_MEM_SHARING use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 384cc72afccb4c6069d4814a2ac01557d1d0a7b5 Author: Doug Goldstein AuthorDate: Tue Dec 15 14:14:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:54:55 2015 +0100 build: convert HAS_MEM_SHARING use to Kconfig Use the Kconfig generated CONFIG_HAS_MEM_SHARING defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Razvan Cojocaru Acked-by: Jan Beulich Acked-by: Daniel De Graaf --- config/x86_32.mk | 2 -- config/x86_64.mk | 2 -- xen/Rules.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 4 ++++ xen/common/memory.c | 2 +- xen/common/vm_event.c | 6 +++--- xen/include/xsm/dummy.h | 2 +- xen/include/xsm/xsm.h | 4 ++-- xen/xsm/dummy.c | 2 +- xen/xsm/flask/hooks.c | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/config/x86_32.mk b/config/x86_32.mk index 0fbc20d..29d13f7 100644 --- a/config/x86_32.mk +++ b/config/x86_32.mk @@ -5,8 +5,6 @@ CONFIG_X86_$(XEN_OS) := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_SHARING := y - CFLAGS += -m32 -march=i686 # Use only if calling $(LD) directly. diff --git a/config/x86_64.mk b/config/x86_64.mk index b4b0163..f12d549 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -6,8 +6,6 @@ CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y -HAS_MEM_SHARING := y - CONFIG_XEN_INSTALL_SUFFIX := .gz CFLAGS += -m64 diff --git a/xen/Rules.mk b/xen/Rules.mk index 38c29b2..8839dca 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -59,7 +59,6 @@ CFLAGS-$(crash_debug) += -DCRASH_DEBUG CFLAGS-$(perfc) += -DPERF_COUNTERS CFLAGS-$(perfc_arrays) += -DPERF_ARRAYS CFLAGS-$(lock_profile) += -DLOCK_PROFILE -CFLAGS-$(HAS_MEM_SHARING) += -DHAS_MEM_SHARING CFLAGS-$(frame_pointer) += -fno-omit-frame-pointer -DCONFIG_FRAME_POINTER ifneq ($(max_phys_cpus),) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index cca768b..07e366d 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -11,6 +11,7 @@ config X86 select HAS_KEXEC select HAS_MEM_ACCESS select HAS_MEM_PAGING + select HAS_MEM_SHARING select HAS_NS16550 select HAS_PASSTHROUGH select HAS_PCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 946cca2..7d0e9a9 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -13,6 +13,10 @@ config HAS_MEM_ACCESS config HAS_MEM_PAGING bool +# Select HAS_MEM_SHARING if mem sharing is supported +config HAS_MEM_SHARING + bool + # Select HAS_PDX if PDX is supported config HAS_PDX bool diff --git a/xen/common/memory.c b/xen/common/memory.c index bd8bf75..9ff1145 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -1332,7 +1332,7 @@ int prepare_ring_for_helper( return -ENOENT; } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING if ( p2m_is_shared(p2mt) ) { if ( page ) diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c index 2e59e41..28a7add 100644 --- a/xen/common/vm_event.c +++ b/xen/common/vm_event.c @@ -518,7 +518,7 @@ static void monitor_notification(struct vcpu *v, unsigned int port) vm_event_resume(v->domain, &v->domain->vm_event->monitor); } -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING /* Registered with Xen-bound event channel for incoming notifications. */ static void mem_sharing_notification(struct vcpu *v, unsigned int port) { @@ -549,7 +549,7 @@ void vm_event_cleanup(struct domain *d) destroy_waitqueue_head(&d->vm_event->monitor.wq); (void)vm_event_disable(d, &d->vm_event->monitor); } -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING if ( d->vm_event->share.ring_page ) { destroy_waitqueue_head(&d->vm_event->share.wq); @@ -682,7 +682,7 @@ int vm_event_domctl(struct domain *d, xen_domctl_vm_event_op_t *vec, } break; -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING case XEN_DOMCTL_VM_EVENT_OP_SHARING: { struct vm_event_domain *ved = &d->vm_event->share; diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 2825226..81fba40 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -576,7 +576,7 @@ static XSM_INLINE int xsm_mem_paging(XSM_DEFAULT_ARG struct domain *d) } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING static XSM_INLINE int xsm_mem_sharing(XSM_DEFAULT_ARG struct domain *d) { XSM_ASSERT_ACTION(XSM_DM_PRIV); diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index f24b7c3..3fc3824 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -160,7 +160,7 @@ struct xsm_operations { int (*mem_paging) (struct domain *d); #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING int (*mem_sharing) (struct domain *d); #endif @@ -618,7 +618,7 @@ static inline int xsm_mem_paging (xsm_default_t def, struct domain *d) } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING static inline int xsm_mem_sharing (xsm_default_t def, struct domain *d) { return xsm_ops->mem_sharing(d); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index d061c5b..0f32636 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -137,7 +137,7 @@ void xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, mem_paging); #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING set_to_dummy_if_null(ops, mem_sharing); #endif diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 52478ff..9b7de30 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1206,7 +1206,7 @@ static int flask_mem_paging(struct domain *d) } #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING static int flask_mem_sharing(struct domain *d) { return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_SHARING); @@ -1713,7 +1713,7 @@ static struct xsm_operations flask_ops = { .mem_paging = flask_mem_paging, #endif -#ifdef HAS_MEM_SHARING +#ifdef CONFIG_HAS_MEM_SHARING .mem_sharing = flask_mem_sharing, #endif -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:29:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvr-0006eu-IZ; Wed, 23 Dec 2015 06:29:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvq-0006dw-HN for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:54 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 3D/D2-31122-16F3A765; Wed, 23 Dec 2015 06:29:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450852192!6827820!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42198 invoked from network); 23 Dec 2015 06:29:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:29:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvo-0000uC-EU for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvo-0007U0-3F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:52 +0000 Date: Wed, 23 Dec 2015 06:29:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_GICV3 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7458d585358834cfb6c6fabb02009a646d42f105 Author: Doug Goldstein AuthorDate: Tue Dec 15 23:11:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:55:21 2015 +0100 build: convert HAS_GICV3 use to Kconfig Use the Kconfig generated CONFIG_HAS_GICV3 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Ian Campbell --- config/arm64.mk | 2 -- xen/arch/arm/Kconfig | 5 +++++ xen/arch/arm/Makefile | 2 +- xen/arch/arm/Rules.mk | 2 -- xen/arch/arm/vgic.c | 2 +- xen/include/asm-arm/domain.h | 2 +- xen/include/asm-arm/gic.h | 4 ++-- xen/include/asm-arm/vgic.h | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/config/arm64.mk b/config/arm64.mk index 4b8fdf6..5a8e534 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -6,8 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc -HAS_GICV3 := y - # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index ec176a6..2cab17b 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -13,6 +13,7 @@ config ARM_32 config ARM_64 def_bool y depends on 64BIT + select HAS_GICV3 config ARM def_bool y @@ -30,6 +31,10 @@ config ARCH_DEFCONFIG menu "Architecture Features" +# Select HAS_GICV3 if GICv3 is supported +config HAS_GICV3 + bool + endmenu source "common/Kconfig" diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 4ac5edd..2f050f5 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -13,7 +13,7 @@ obj-y += sysctl.o obj-y += domain_build.o obj-y += gic.o gic-v2.o obj-$(CONFIG_ARM_32) += gic-hip04.o -obj-$(HAS_GICV3) += gic-v3.o +obj-$(CONFIG_HAS_GICV3) += gic-v3.o obj-y += io.o obj-y += irq.o obj-y += kernel.o diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 2158bd8..4947e64 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -32,8 +32,6 @@ ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n) CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE endif -CFLAGS-$(HAS_GICV3) += -DHAS_GICV3 - EARLY_PRINTK := n ifeq ($(debug),y) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 531ce5d..ee35683 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -103,7 +103,7 @@ int domain_vgic_init(struct domain *d, unsigned int nr_spis) switch ( d->arch.vgic.version ) { -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 case GIC_V3: if ( vgic_v3_init(d) ) return -ENODEV; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index e7e40da..aa7f283 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -102,7 +102,7 @@ struct arch_domain struct pending_irq *pending_irqs; /* Base address for guest GIC */ paddr_t dbase; /* Distributor base address */ -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 /* GIC V3 addressing */ /* List of contiguous occupied by the redistributors */ struct vgic_rdist_region { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 630bb33..7bd06e1 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -167,7 +167,7 @@ #define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE("arm,gic-v3") -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 /* * GICv3 registers that needs to be saved/restored */ @@ -195,7 +195,7 @@ struct gic_v2 { */ union gic_state_data { struct gic_v2 v2; -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 struct gic_v3 v3; #endif }; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 005f822..a2fccc0 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -336,7 +336,7 @@ extern void vgic_free_virq(struct domain *d, unsigned int virq); void vgic_v2_setup_hw(paddr_t dbase, paddr_t cbase, paddr_t csize, paddr_t vbase, uint32_t aliased_offset); -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 struct rdist_region; void vgic_v3_setup_hw(paddr_t dbase, unsigned int nr_rdist_regions, -- generated by git-patchbot for /home/xen/git/xen.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 23 06:29:55 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:29:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvr-0006eu-IZ; Wed, 23 Dec 2015 06:29:55 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvq-0006dw-HN for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:54 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 3D/D2-31122-16F3A765; Wed, 23 Dec 2015 06:29:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1450852192!6827820!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 42198 invoked from network); 23 Dec 2015 06:29:53 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-5.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:29:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcvo-0000uC-EU for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvo-0007U0-3F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:29:52 +0000 Date: Wed, 23 Dec 2015 06:29:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert HAS_GICV3 use to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7458d585358834cfb6c6fabb02009a646d42f105 Author: Doug Goldstein AuthorDate: Tue Dec 15 23:11:00 2015 +0100 Commit: Jan Beulich CommitDate: Wed Dec 16 17:55:21 2015 +0100 build: convert HAS_GICV3 use to Kconfig Use the Kconfig generated CONFIG_HAS_GICV3 defines in the code base. Signed-off-by: Doug Goldstein Acked-by: Ian Campbell --- config/arm64.mk | 2 -- xen/arch/arm/Kconfig | 5 +++++ xen/arch/arm/Makefile | 2 +- xen/arch/arm/Rules.mk | 2 -- xen/arch/arm/vgic.c | 2 +- xen/include/asm-arm/domain.h | 2 +- xen/include/asm-arm/gic.h | 4 ++-- xen/include/asm-arm/vgic.h | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/config/arm64.mk b/config/arm64.mk index 4b8fdf6..5a8e534 100644 --- a/config/arm64.mk +++ b/config/arm64.mk @@ -6,8 +6,6 @@ CONFIG_XEN_INSTALL_SUFFIX := CFLAGS += #-marm -march= -mcpu= etc -HAS_GICV3 := y - # Use only if calling $(LD) directly. LDFLAGS_DIRECT += -EL diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index ec176a6..2cab17b 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -13,6 +13,7 @@ config ARM_32 config ARM_64 def_bool y depends on 64BIT + select HAS_GICV3 config ARM def_bool y @@ -30,6 +31,10 @@ config ARCH_DEFCONFIG menu "Architecture Features" +# Select HAS_GICV3 if GICv3 is supported +config HAS_GICV3 + bool + endmenu source "common/Kconfig" diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 4ac5edd..2f050f5 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -13,7 +13,7 @@ obj-y += sysctl.o obj-y += domain_build.o obj-y += gic.o gic-v2.o obj-$(CONFIG_ARM_32) += gic-hip04.o -obj-$(HAS_GICV3) += gic-v3.o +obj-$(CONFIG_HAS_GICV3) += gic-v3.o obj-y += io.o obj-y += irq.o obj-y += kernel.o diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk index 2158bd8..4947e64 100644 --- a/xen/arch/arm/Rules.mk +++ b/xen/arch/arm/Rules.mk @@ -32,8 +32,6 @@ ifneq ($(call cc-option,$(CC),-fvisibility=hidden,n),n) CFLAGS += -DGCC_HAS_VISIBILITY_ATTRIBUTE endif -CFLAGS-$(HAS_GICV3) += -DHAS_GICV3 - EARLY_PRINTK := n ifeq ($(debug),y) diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c index 531ce5d..ee35683 100644 --- a/xen/arch/arm/vgic.c +++ b/xen/arch/arm/vgic.c @@ -103,7 +103,7 @@ int domain_vgic_init(struct domain *d, unsigned int nr_spis) switch ( d->arch.vgic.version ) { -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 case GIC_V3: if ( vgic_v3_init(d) ) return -ENODEV; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index e7e40da..aa7f283 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -102,7 +102,7 @@ struct arch_domain struct pending_irq *pending_irqs; /* Base address for guest GIC */ paddr_t dbase; /* Distributor base address */ -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 /* GIC V3 addressing */ /* List of contiguous occupied by the redistributors */ struct vgic_rdist_region { diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 630bb33..7bd06e1 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -167,7 +167,7 @@ #define DT_MATCH_GIC_V3 DT_MATCH_COMPATIBLE("arm,gic-v3") -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 /* * GICv3 registers that needs to be saved/restored */ @@ -195,7 +195,7 @@ struct gic_v2 { */ union gic_state_data { struct gic_v2 v2; -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 struct gic_v3 v3; #endif }; diff --git a/xen/include/asm-arm/vgic.h b/xen/include/asm-arm/vgic.h index 005f822..a2fccc0 100644 --- a/xen/include/asm-arm/vgic.h +++ b/xen/include/asm-arm/vgic.h @@ -336,7 +336,7 @@ extern void vgic_free_virq(struct domain *d, unsigned int virq); void vgic_v2_setup_hw(paddr_t dbase, paddr_t cbase, paddr_t csize, paddr_t vbase, uint32_t aliased_offset); -#ifdef HAS_GICV3 +#ifdef CONFIG_HAS_GICV3 struct rdist_region; void vgic_v3_setup_hw(paddr_t dbase, unsigned int nr_rdist_regions, -- generated by git-patchbot for /home/xen/git/xen.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 23 06:30:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30: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 1aBcwF-0006gm-Ne; Wed, 23 Dec 2015 06:30:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwE-0006gf-8F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:18 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 22/B3-14900-67F3A765; Wed, 23 Dec 2015 06:30:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1450852213!12322325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17348 invoked from network); 23 Dec 2015 06:30:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcw8-0000vH-VW for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvz-0007Vb-Vr for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:12 +0000 Date: Wed, 23 Dec 2015 06:30:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't leak ST(n)/XMMn values to domains first using them X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81818b3f277544535974204f8d840da86fa8a44f Author: Jan Beulich AuthorDate: Thu Dec 17 14:22:13 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 17 14:22:13 2015 +0100 x86: don't leak ST(n)/XMMn values to domains first using them FNINIT doesn't alter these registers, and hence using it is insufficient to initialize a guest's initial state. This is CVE-2015-8555 / XSA-165. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 11 +++++++++++ xen/arch/x86/i387.c | 23 +++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2c3bb09..4ad5217 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -918,6 +918,17 @@ int arch_set_info_guest( XSTATE_COMPACTION_ENABLED; } } + else if ( v->arch.xsave_area ) + memset(&v->arch.xsave_area->xsave_hdr, 0, + sizeof(v->arch.xsave_area->xsave_hdr)); + else + { + typeof(v->arch.xsave_area->fpu_sse) *fpu_sse = v->arch.fpu_ctxt; + + memset(fpu_sse, 0, sizeof(*fpu_sse)); + fpu_sse->fcw = FCW_DEFAULT; + fpu_sse->mxcsr = MXCSR_DEFAULT; + } if ( !compat ) { diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index b661d39..9c29211 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -17,16 +17,6 @@ #include #include -static void fpu_init(void) -{ - uint32_t val = MXCSR_DEFAULT; - - asm volatile ( "fninit" ); - - /* load default value into MXCSR control/status register */ - asm volatile ( "ldmxcsr %0" : : "m" (val) ); -} - /*******************************/ /* FPU Restore Functions */ /*******************************/ @@ -228,10 +218,8 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); - else if ( v->fpu_initialised ) - fpu_fxrstor(v); else - fpu_init(); + fpu_fxrstor(v); v->fpu_initialised = 1; v->fpu_dirtied = 1; @@ -290,7 +278,14 @@ int vcpu_init_fpu(struct vcpu *v) else { v->arch.fpu_ctxt = _xzalloc(sizeof(v->arch.xsave_area->fpu_sse), 16); - if ( !v->arch.fpu_ctxt ) + if ( v->arch.fpu_ctxt ) + { + typeof(v->arch.xsave_area->fpu_sse) *fpu_sse = v->arch.fpu_ctxt; + + fpu_sse->fcw = FCW_DEFAULT; + fpu_sse->mxcsr = MXCSR_DEFAULT; + } + else rc = -ENOMEM; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:30:19 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30: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 1aBcwF-0006gm-Ne; Wed, 23 Dec 2015 06:30:19 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwE-0006gf-8F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:18 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 22/B3-14900-67F3A765; Wed, 23 Dec 2015 06:30:14 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-2.tower-31.messagelabs.com!1450852213!12322325!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17348 invoked from network); 23 Dec 2015 06:30:13 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-2.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:13 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcw8-0000vH-VW for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:12 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcvz-0007Vb-Vr for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:12 +0000 Date: Wed, 23 Dec 2015 06:30:03 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: don't leak ST(n)/XMMn values to domains first using them X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 81818b3f277544535974204f8d840da86fa8a44f Author: Jan Beulich AuthorDate: Thu Dec 17 14:22:13 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 17 14:22:13 2015 +0100 x86: don't leak ST(n)/XMMn values to domains first using them FNINIT doesn't alter these registers, and hence using it is insufficient to initialize a guest's initial state. This is CVE-2015-8555 / XSA-165. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/domain.c | 11 +++++++++++ xen/arch/x86/i387.c | 23 +++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2c3bb09..4ad5217 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -918,6 +918,17 @@ int arch_set_info_guest( XSTATE_COMPACTION_ENABLED; } } + else if ( v->arch.xsave_area ) + memset(&v->arch.xsave_area->xsave_hdr, 0, + sizeof(v->arch.xsave_area->xsave_hdr)); + else + { + typeof(v->arch.xsave_area->fpu_sse) *fpu_sse = v->arch.fpu_ctxt; + + memset(fpu_sse, 0, sizeof(*fpu_sse)); + fpu_sse->fcw = FCW_DEFAULT; + fpu_sse->mxcsr = MXCSR_DEFAULT; + } if ( !compat ) { diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c index b661d39..9c29211 100644 --- a/xen/arch/x86/i387.c +++ b/xen/arch/x86/i387.c @@ -17,16 +17,6 @@ #include #include -static void fpu_init(void) -{ - uint32_t val = MXCSR_DEFAULT; - - asm volatile ( "fninit" ); - - /* load default value into MXCSR control/status register */ - asm volatile ( "ldmxcsr %0" : : "m" (val) ); -} - /*******************************/ /* FPU Restore Functions */ /*******************************/ @@ -228,10 +218,8 @@ void vcpu_restore_fpu_lazy(struct vcpu *v) if ( cpu_has_xsave ) fpu_xrstor(v, XSTATE_LAZY); - else if ( v->fpu_initialised ) - fpu_fxrstor(v); else - fpu_init(); + fpu_fxrstor(v); v->fpu_initialised = 1; v->fpu_dirtied = 1; @@ -290,7 +278,14 @@ int vcpu_init_fpu(struct vcpu *v) else { v->arch.fpu_ctxt = _xzalloc(sizeof(v->arch.xsave_area->fpu_sse), 16); - if ( !v->arch.fpu_ctxt ) + if ( v->arch.fpu_ctxt ) + { + typeof(v->arch.xsave_area->fpu_sse) *fpu_sse = v->arch.fpu_ctxt; + + fpu_sse->fcw = FCW_DEFAULT; + fpu_sse->mxcsr = MXCSR_DEFAULT; + } + else rc = -ENOMEM; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:30:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwN-0006hi-SS; Wed, 23 Dec 2015 06:30:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwM-0006hW-FT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:26 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id C2/1B-24450-18F3A765; Wed, 23 Dec 2015 06:30:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450852224!9040175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10929 invoked from network); 23 Dec 2015 06:30:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwK-0000vP-9E for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwJ-0007Wx-TT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:24 +0000 Date: Wed, 23 Dec 2015 06:30:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: avoid reading ioreq state more than once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b452430a4cdfc801fa4bc391aed7522365e1deb6 Author: Jan Beulich AuthorDate: Thu Dec 17 14:22:46 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 17 14:22:46 2015 +0100 x86/HVM: avoid reading ioreq state more than once Otherwise, especially when the compiler chooses to translate the switch() to a jump table, unpredictable behavior (and in the jump table case arbitrary code execution) can result. This is XSA-166. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/hvm/hvm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 08cef1f..3bb31da 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -460,7 +460,10 @@ static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) { while ( sv->pending ) { - switch ( p->state ) + unsigned int state = p->state; + + rmb(); + switch ( state ) { case STATE_IOREQ_NONE: /* @@ -471,18 +474,15 @@ static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) hvm_io_assist(sv, ~0ul); break; case STATE_IORESP_READY: /* IORESP_READY -> NONE */ - rmb(); /* see IORESP_READY /then/ read contents of ioreq */ p->state = STATE_IOREQ_NONE; hvm_io_assist(sv, p->data); break; case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ case STATE_IOREQ_INPROCESS: - wait_on_xen_event_channel(sv->ioreq_evtchn, - (p->state != STATE_IOREQ_READY) && - (p->state != STATE_IOREQ_INPROCESS)); + wait_on_xen_event_channel(sv->ioreq_evtchn, p->state != state); break; default: - gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); + gdprintk(XENLOG_ERR, "Weird HVM iorequest state %u\n", state); sv->pending = 0; domain_crash(sv->vcpu->domain); return 0; /* bail */ -- generated by git-patchbot for /home/xen/git/xen.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 23 06:30:27 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwN-0006hi-SS; Wed, 23 Dec 2015 06:30:27 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwM-0006hW-FT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:26 +0000 Received: from [193.109.254.147] by server-8.bemta-14.messagelabs.com id C2/1B-24450-18F3A765; Wed, 23 Dec 2015 06:30:25 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450852224!9040175!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10929 invoked from network); 23 Dec 2015 06:30:25 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:25 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwK-0000vP-9E for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:24 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwJ-0007Wx-TT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:24 +0000 Date: Wed, 23 Dec 2015 06:30:23 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: avoid reading ioreq state more than once X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit b452430a4cdfc801fa4bc391aed7522365e1deb6 Author: Jan Beulich AuthorDate: Thu Dec 17 14:22:46 2015 +0100 Commit: Jan Beulich CommitDate: Thu Dec 17 14:22:46 2015 +0100 x86/HVM: avoid reading ioreq state more than once Otherwise, especially when the compiler chooses to translate the switch() to a jump table, unpredictable behavior (and in the jump table case arbitrary code execution) can result. This is XSA-166. Signed-off-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/hvm/hvm.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 08cef1f..3bb31da 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -460,7 +460,10 @@ static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) { while ( sv->pending ) { - switch ( p->state ) + unsigned int state = p->state; + + rmb(); + switch ( state ) { case STATE_IOREQ_NONE: /* @@ -471,18 +474,15 @@ static bool_t hvm_wait_for_io(struct hvm_ioreq_vcpu *sv, ioreq_t *p) hvm_io_assist(sv, ~0ul); break; case STATE_IORESP_READY: /* IORESP_READY -> NONE */ - rmb(); /* see IORESP_READY /then/ read contents of ioreq */ p->state = STATE_IOREQ_NONE; hvm_io_assist(sv, p->data); break; case STATE_IOREQ_READY: /* IOREQ_{READY,INPROCESS} -> IORESP_READY */ case STATE_IOREQ_INPROCESS: - wait_on_xen_event_channel(sv->ioreq_evtchn, - (p->state != STATE_IOREQ_READY) && - (p->state != STATE_IOREQ_INPROCESS)); + wait_on_xen_event_channel(sv->ioreq_evtchn, p->state != state); break; default: - gdprintk(XENLOG_ERR, "Weird HVM iorequest state %d.\n", p->state); + gdprintk(XENLOG_ERR, "Weird HVM iorequest state %u\n", state); sv->pending = 0; domain_crash(sv->vcpu->domain); return 0; /* bail */ -- generated by git-patchbot for /home/xen/git/xen.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 23 06:30:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30: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 1aBcwY-0006kV-3e; Wed, 23 Dec 2015 06:30:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwW-0006kB-Ss for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:36 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 97/9B-21571-C8F3A765; Wed, 23 Dec 2015 06:30:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450852234!6801148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11228 invoked from network); 23 Dec 2015 06:30:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:35 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwU-0000vX-Np for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwU-0007Xj-KX for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:34 +0000 Date: Wed, 23 Dec 2015 06:30:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Add RING_COPY_REQUEST() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f20b8def0f4c0d912f1ffc1893199b6e8820477 Author: David Vrabel AuthorDate: Fri Nov 20 11:59:05 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Fri Dec 18 09:49:07 2015 -0500 xen: Add RING_COPY_REQUEST() Using RING_GET_REQUEST() on a shared ring is easy to use incorrectly (i.e., by not considering that the other end may alter the data in the shared ring while it is being inspected). Safe usage of a request generally requires taking a local copy. Provide a RING_COPY_REQUEST() macro to use instead of RING_GET_REQUEST() and an open-coded memcpy(). This takes care of ensuring that the copy is done correctly regardless of any possible compiler optimizations. Use a volatile source to prevent the compiler from reordering or omitting the copy. This is part of XSA155. Signed-off-by: David Vrabel Signed-off-by: Konrad Rzeszutek Wilk --- xen/include/public/io/ring.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h index ba9401b..801c0da 100644 --- a/xen/include/public/io/ring.h +++ b/xen/include/public/io/ring.h @@ -212,6 +212,20 @@ typedef struct __name##_back_ring __name##_back_ring_t #define RING_GET_REQUEST(_r, _idx) \ (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].req)) +/* + * Get a local copy of a request. + * + * Use this in preference to RING_GET_REQUEST() so all processing is + * done on a local copy that cannot be modified by the other end. + * + * Note that https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58145 may cause this + * to be ineffective where _req is a struct which consists of only bitfields. + */ +#define RING_COPY_REQUEST(_r, _idx, _req) do { \ + /* Use volatile to force the copy into _req. */ \ + *(_req) = *(volatile typeof(_req))RING_GET_REQUEST(_r, _idx); \ +} while (0) + #define RING_GET_RESPONSE(_r, _idx) \ (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].rsp)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:30:38 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30: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 1aBcwY-0006kV-3e; Wed, 23 Dec 2015 06:30:38 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwW-0006kB-Ss for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:36 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 97/9B-21571-C8F3A765; Wed, 23 Dec 2015 06:30:36 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450852234!6801148!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11228 invoked from network); 23 Dec 2015 06:30:35 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:35 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwU-0000vX-Np for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:34 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwU-0007Xj-KX for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:34 +0000 Date: Wed, 23 Dec 2015 06:30:34 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] xen: Add RING_COPY_REQUEST() X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 3f20b8def0f4c0d912f1ffc1893199b6e8820477 Author: David Vrabel AuthorDate: Fri Nov 20 11:59:05 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Fri Dec 18 09:49:07 2015 -0500 xen: Add RING_COPY_REQUEST() Using RING_GET_REQUEST() on a shared ring is easy to use incorrectly (i.e., by not considering that the other end may alter the data in the shared ring while it is being inspected). Safe usage of a request generally requires taking a local copy. Provide a RING_COPY_REQUEST() macro to use instead of RING_GET_REQUEST() and an open-coded memcpy(). This takes care of ensuring that the copy is done correctly regardless of any possible compiler optimizations. Use a volatile source to prevent the compiler from reordering or omitting the copy. This is part of XSA155. Signed-off-by: David Vrabel Signed-off-by: Konrad Rzeszutek Wilk --- xen/include/public/io/ring.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/xen/include/public/io/ring.h b/xen/include/public/io/ring.h index ba9401b..801c0da 100644 --- a/xen/include/public/io/ring.h +++ b/xen/include/public/io/ring.h @@ -212,6 +212,20 @@ typedef struct __name##_back_ring __name##_back_ring_t #define RING_GET_REQUEST(_r, _idx) \ (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].req)) +/* + * Get a local copy of a request. + * + * Use this in preference to RING_GET_REQUEST() so all processing is + * done on a local copy that cannot be modified by the other end. + * + * Note that https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58145 may cause this + * to be ineffective where _req is a struct which consists of only bitfields. + */ +#define RING_COPY_REQUEST(_r, _idx, _req) do { \ + /* Use volatile to force the copy into _req. */ \ + *(_req) = *(volatile typeof(_req))RING_GET_REQUEST(_r, _idx); \ +} while (0) + #define RING_GET_RESPONSE(_r, _idx) \ (&((_r)->sring->ring[((_idx) & (RING_SIZE(_r) - 1))].rsp)) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:30:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30: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 1aBcwj-0006qo-9A; Wed, 23 Dec 2015 06:30:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwi-0006qU-0d for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:48 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 6D/54-14900-79F3A765; Wed, 23 Dec 2015 06:30:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1450852246!12345123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32063 invoked from network); 23 Dec 2015 06:30:46 -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; 23 Dec 2015 06:30:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwf-0000vf-Ru for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwf-0007Yu-2x for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:45 +0000 Date: Wed, 23 Dec 2015 06:30:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blktap2: Use RING_COPY_REQUEST X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19f6c522a6a9599317ee1d8c4a155d1400d04c89 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Nov 20 12:16:02 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Fri Dec 18 09:49:43 2015 -0500 blktap2: Use RING_COPY_REQUEST Instead of RING_GET_REQUEST. Using a local copy of the ring (and also with proper memory barriers) will mean we can do not have to worry about the compiler optimizing the code and doing a double-fetch in the shared memory space. This is part of XSA155. Signed-off-by: Konrad Rzeszutek Wilk --- tools/blktap2/drivers/block-log.c | 3 ++- tools/blktap2/drivers/tapdisk-vbd.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/blktap2/drivers/block-log.c b/tools/blktap2/drivers/block-log.c index 5330cdc..5f3bd35 100644 --- a/tools/blktap2/drivers/block-log.c +++ b/tools/blktap2/drivers/block-log.c @@ -494,11 +494,12 @@ static int ctl_kick(struct tdlog_state* s, int fd) reqstart = s->bring.req_cons; reqend = s->sring->req_prod; + xen_mb(); BDPRINTF("ctl: ring kicked (start = %u, end = %u)", reqstart, reqend); while (reqstart != reqend) { /* XXX actually submit these! */ - memcpy(&req, RING_GET_REQUEST(&s->bring, reqstart), sizeof(req)); + RING_COPY_REQUEST(&s->bring, reqstart, &req); BDPRINTF("ctl: read request %"PRIu64":%u", req.sector, req.count); s->bring.req_cons = ++reqstart; diff --git a/tools/blktap2/drivers/tapdisk-vbd.c b/tools/blktap2/drivers/tapdisk-vbd.c index 6d1d94a..89ef9ed 100644 --- a/tools/blktap2/drivers/tapdisk-vbd.c +++ b/tools/blktap2/drivers/tapdisk-vbd.c @@ -1555,7 +1555,7 @@ tapdisk_vbd_pull_ring_requests(td_vbd_t *vbd) int idx; RING_IDX rp, rc; td_ring_t *ring; - blkif_request_t *req; + blkif_request_t req; td_vbd_request_t *vreq; ring = &vbd->ring; @@ -1566,16 +1566,16 @@ tapdisk_vbd_pull_ring_requests(td_vbd_t *vbd) xen_rmb(); for (rc = ring->fe_ring.req_cons; rc != rp; rc++) { - req = RING_GET_REQUEST(&ring->fe_ring, rc); + RING_COPY_REQUEST(&ring->fe_ring, rc, &req); ++ring->fe_ring.req_cons; - idx = req->id; + idx = req.id; vreq = &vbd->request_list[idx]; ASSERT(list_empty(&vreq->next)); ASSERT(vreq->secs_pending == 0); - memcpy(&vreq->req, req, sizeof(blkif_request_t)); + memcpy(&vreq->req, &req, sizeof(blkif_request_t)); vbd->received++; vreq->vbd = vbd; -- generated by git-patchbot for /home/xen/git/xen.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 23 06:30:49 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:30: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 1aBcwj-0006qo-9A; Wed, 23 Dec 2015 06:30:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwi-0006qU-0d for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:48 +0000 Received: from [85.158.137.68] by server-12.bemta-3.messagelabs.com id 6D/54-14900-79F3A765; Wed, 23 Dec 2015 06:30:47 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1450852246!12345123!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32063 invoked from network); 23 Dec 2015 06:30:46 -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; 23 Dec 2015 06:30:46 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwf-0000vf-Ru for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:45 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwf-0007Yu-2x for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:45 +0000 Date: Wed, 23 Dec 2015 06:30:45 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] blktap2: Use RING_COPY_REQUEST X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 19f6c522a6a9599317ee1d8c4a155d1400d04c89 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Nov 20 12:16:02 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Fri Dec 18 09:49:43 2015 -0500 blktap2: Use RING_COPY_REQUEST Instead of RING_GET_REQUEST. Using a local copy of the ring (and also with proper memory barriers) will mean we can do not have to worry about the compiler optimizing the code and doing a double-fetch in the shared memory space. This is part of XSA155. Signed-off-by: Konrad Rzeszutek Wilk --- tools/blktap2/drivers/block-log.c | 3 ++- tools/blktap2/drivers/tapdisk-vbd.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/blktap2/drivers/block-log.c b/tools/blktap2/drivers/block-log.c index 5330cdc..5f3bd35 100644 --- a/tools/blktap2/drivers/block-log.c +++ b/tools/blktap2/drivers/block-log.c @@ -494,11 +494,12 @@ static int ctl_kick(struct tdlog_state* s, int fd) reqstart = s->bring.req_cons; reqend = s->sring->req_prod; + xen_mb(); BDPRINTF("ctl: ring kicked (start = %u, end = %u)", reqstart, reqend); while (reqstart != reqend) { /* XXX actually submit these! */ - memcpy(&req, RING_GET_REQUEST(&s->bring, reqstart), sizeof(req)); + RING_COPY_REQUEST(&s->bring, reqstart, &req); BDPRINTF("ctl: read request %"PRIu64":%u", req.sector, req.count); s->bring.req_cons = ++reqstart; diff --git a/tools/blktap2/drivers/tapdisk-vbd.c b/tools/blktap2/drivers/tapdisk-vbd.c index 6d1d94a..89ef9ed 100644 --- a/tools/blktap2/drivers/tapdisk-vbd.c +++ b/tools/blktap2/drivers/tapdisk-vbd.c @@ -1555,7 +1555,7 @@ tapdisk_vbd_pull_ring_requests(td_vbd_t *vbd) int idx; RING_IDX rp, rc; td_ring_t *ring; - blkif_request_t *req; + blkif_request_t req; td_vbd_request_t *vreq; ring = &vbd->ring; @@ -1566,16 +1566,16 @@ tapdisk_vbd_pull_ring_requests(td_vbd_t *vbd) xen_rmb(); for (rc = ring->fe_ring.req_cons; rc != rp; rc++) { - req = RING_GET_REQUEST(&ring->fe_ring, rc); + RING_COPY_REQUEST(&ring->fe_ring, rc, &req); ++ring->fe_ring.req_cons; - idx = req->id; + idx = req.id; vreq = &vbd->request_list[idx]; ASSERT(list_empty(&vreq->next)); ASSERT(vreq->secs_pending == 0); - memcpy(&vreq->req, req, sizeof(blkif_request_t)); + memcpy(&vreq->req, &req, sizeof(blkif_request_t)); vbd->received++; vreq->vbd = vbd; -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwu-00071c-EA; Wed, 23 Dec 2015 06:31:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcws-0006yx-RT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:58 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 27/E0-24494-2AF3A765; Wed, 23 Dec 2015 06:30:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1450852256!12342164!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27029 invoked from network); 23 Dec 2015 06:30:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:57 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwq-0000vk-ER for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwq-0007Zp-9b for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:56 +0000 Date: Wed, 23 Dec 2015 06:30:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: Read prod/cons only once. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d66a4ba695ab8d13b214fb816dd59e443ae1ec9 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Nov 20 12:22:14 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Fri Dec 18 09:50:02 2015 -0500 libvchan: Read prod/cons only once. We must ensure that the prod/cons are only read once and that the compiler won't try to optimize the reads. That is split the read of these in multiple instructions influencing later branch code. As such insert barriers when fetching the cons and prod index. This is part of XSA155. Signed-off-by: Konrad Rzeszutek Wilk --- tools/libvchan/io.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 8a9629b..381cc05 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -117,6 +117,7 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) static inline int raw_get_data_ready(struct libxenvchan *ctrl) { uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + xen_mb(); /* Ensure 'ready' is read only once. */ if (ready > rd_ring_size(ctrl)) /* We have no way to return errors. Locking up the ring is * better than the alternatives. */ @@ -158,6 +159,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) static inline int raw_get_buffer_space(struct libxenvchan *ctrl) { uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + xen_mb(); /* Ensure 'ready' is read only once. */ if (ready > wr_ring_size(ctrl)) /* We have no way to return errors. Locking up the ring is * better than the alternatives. */ -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:00 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31:00 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwu-00071c-EA; Wed, 23 Dec 2015 06:31:00 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcws-0006yx-RT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:58 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 27/E0-24494-2AF3A765; Wed, 23 Dec 2015 06:30:58 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1450852256!12342164!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27029 invoked from network); 23 Dec 2015 06:30:57 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:30:57 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcwq-0000vk-ER for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:56 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcwq-0007Zp-9b for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:30:56 +0000 Date: Wed, 23 Dec 2015 06:30:56 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] libvchan: Read prod/cons only once. X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 7d66a4ba695ab8d13b214fb816dd59e443ae1ec9 Author: Konrad Rzeszutek Wilk AuthorDate: Fri Nov 20 12:22:14 2015 -0500 Commit: Konrad Rzeszutek Wilk CommitDate: Fri Dec 18 09:50:02 2015 -0500 libvchan: Read prod/cons only once. We must ensure that the prod/cons are only read once and that the compiler won't try to optimize the reads. That is split the read of these in multiple instructions influencing later branch code. As such insert barriers when fetching the cons and prod index. This is part of XSA155. Signed-off-by: Konrad Rzeszutek Wilk --- tools/libvchan/io.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/libvchan/io.c b/tools/libvchan/io.c index 8a9629b..381cc05 100644 --- a/tools/libvchan/io.c +++ b/tools/libvchan/io.c @@ -117,6 +117,7 @@ static inline int send_notify(struct libxenvchan *ctrl, uint8_t bit) static inline int raw_get_data_ready(struct libxenvchan *ctrl) { uint32_t ready = rd_prod(ctrl) - rd_cons(ctrl); + xen_mb(); /* Ensure 'ready' is read only once. */ if (ready > rd_ring_size(ctrl)) /* We have no way to return errors. Locking up the ring is * better than the alternatives. */ @@ -158,6 +159,7 @@ int libxenvchan_data_ready(struct libxenvchan *ctrl) static inline int raw_get_buffer_space(struct libxenvchan *ctrl) { uint32_t ready = wr_ring_size(ctrl) - (wr_prod(ctrl) - wr_cons(ctrl)); + xen_mb(); /* Ensure 'ready' is read only once. */ if (ready > wr_ring_size(ctrl)) /* We have no way to return errors. Locking up the ring is * better than the alternatives. */ -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31: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 1aBcx3-00079Y-J2; Wed, 23 Dec 2015 06:31:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcx2-00079O-Qh for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:08 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 5A/AB-18316-CAF3A765; Wed, 23 Dec 2015 06:31:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450852267!6932653!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53002 invoked from network); 23 Dec 2015 06:31:07 -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; 23 Dec 2015 06:31:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcx0-0000wN-Tn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcx0-0007bB-Ok for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:06 +0000 Date: Wed, 23 Dec 2015 06:31:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e8b0d2181b385804dcb13aa7a4d5454417eba58 Author: Ian Jackson AuthorDate: Fri Dec 18 14:55:57 2015 +0000 Commit: Ian Jackson CommitDate: Fri Dec 18 14:55:57 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 216a642..7b2aa07 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 -# Wed Dec 9 11:47:35 2015 +0000 -# net: pcnet: add check to validate receive data size(CVE-2015-7504) +QEMU_TRADITIONAL_REVISION ?= a82794b1d5a6da06062a333b1db404e2448345dd +# Fri Nov 20 10:56:00 2015 -0500 +# blkif: Avoid double access to src->nr_segments # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:09 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31: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 1aBcx3-00079Y-J2; Wed, 23 Dec 2015 06:31:09 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcx2-00079O-Qh for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:08 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 5A/AB-18316-CAF3A765; Wed, 23 Dec 2015 06:31:08 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1450852267!6932653!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 53002 invoked from network); 23 Dec 2015 06:31:07 -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; 23 Dec 2015 06:31:07 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcx0-0000wN-Tn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:06 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcx0-0007bB-Ok for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:06 +0000 Date: Wed, 23 Dec 2015 06:31:06 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] QEMU_TAG update X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8e8b0d2181b385804dcb13aa7a4d5454417eba58 Author: Ian Jackson AuthorDate: Fri Dec 18 14:55:57 2015 +0000 Commit: Ian Jackson CommitDate: Fri Dec 18 14:55:57 2015 +0000 QEMU_TAG update --- Config.mk | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index 216a642..7b2aa07 100644 --- a/Config.mk +++ b/Config.mk @@ -266,9 +266,9 @@ SEABIOS_UPSTREAM_REVISION ?= rel-1.9.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= 91c15bfaec1764ce2896a393eabee1183afe1130 -# Wed Dec 9 11:47:35 2015 +0000 -# net: pcnet: add check to validate receive data size(CVE-2015-7504) +QEMU_TRADITIONAL_REVISION ?= a82794b1d5a6da06062a333b1db404e2448345dd +# Fri Nov 20 10:56:00 2015 -0500 +# blkif: Avoid double access to src->nr_segments # Specify which qemu-dm to use. This may be `ioemu' to use the old # Mercurial in-tree version, or a local directory, or a git URL. -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31: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 1aBcxE-0007Aw-Mt; Wed, 23 Dec 2015 06:31:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxD-0007Ap-G2 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:19 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 28/8E-31443-6BF3A765; Wed, 23 Dec 2015 06:31:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450852277!11802528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59021 invoked from network); 23 Dec 2015 06:31:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxB-0000wV-5b for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxB-0007ba-3P for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:17 +0000 Date: Wed, 23 Dec 2015 06:31:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: add support configuring for x86_32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4996f8b1f5d4a818aee3285eeb0db56b7f4d1134 Author: Doug Goldstein AuthorDate: Fri Dec 18 21:53:00 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:33:11 2015 +0100 build: add support configuring for x86_32 This will allow OSSTest to run `make dist` for XEN_TARGET_ARCH=x86_32 but will still not build the hypervisor for x86_32. Fixes: http://logs.test-lab.xenproject.org/osstest/logs/66454/ Signed-off-by: Doug Goldstein --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/configs/x86_32_defconfig b/xen/arch/x86/configs/x86_32_defconfig new file mode 100644 index 0000000..e69de29 -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:20 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31: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 1aBcxE-0007Aw-Mt; Wed, 23 Dec 2015 06:31:20 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxD-0007Ap-G2 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:19 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 28/8E-31443-6BF3A765; Wed, 23 Dec 2015 06:31:18 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-31.messagelabs.com!1450852277!11802528!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59021 invoked from network); 23 Dec 2015 06:31:18 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:18 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxB-0000wV-5b for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:17 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxB-0007ba-3P for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:17 +0000 Date: Wed, 23 Dec 2015 06:31:17 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: add support configuring for x86_32 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 4996f8b1f5d4a818aee3285eeb0db56b7f4d1134 Author: Doug Goldstein AuthorDate: Fri Dec 18 21:53:00 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:33:11 2015 +0100 build: add support configuring for x86_32 This will allow OSSTest to run `make dist` for XEN_TARGET_ARCH=x86_32 but will still not build the hypervisor for x86_32. Fixes: http://logs.test-lab.xenproject.org/osstest/logs/66454/ Signed-off-by: Doug Goldstein --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/xen/arch/x86/configs/x86_32_defconfig b/xen/arch/x86/configs/x86_32_defconfig new file mode 100644 index 0000000..e69de29 -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31: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 1aBcxO-0007Ci-RY; Wed, 23 Dec 2015 06:31:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxN-0007CT-PE for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:29 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id F7/EB-18316-1CF3A765; Wed, 23 Dec 2015 06:31:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450852287!6801255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14220 invoked from network); 23 Dec 2015 06:31:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxL-0000wd-K3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxL-0007bw-GJ for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:27 +0000 Date: Wed, 23 Dec 2015 06:31:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: allocate APIC access page from domain heap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2b4b8c20413302c0983b730925d59dc2fee3bb3 Author: Jan Beulich AuthorDate: Mon Dec 21 13:35:13 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:35:13 2015 +0100 VMX: allocate APIC access page from domain heap ... since we don't need its virtual address anywhere (it's a placeholder page only after all). For this to work (and possibly be done elsewhere too) share_xen_page_with_guest() needs to mark pages handed to it as Xen heap ones. To be on the safe side, also explicitly clear the page (not having done so was okay due to the XSA-100 fix, but is still a latent bug since we don't formally guarantee allocations to come out zeroed, and in fact this property may disappear again as soon as the asynchronous runtime scrubbing patches arrive). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 20 ++++++++++++-------- xen/arch/x86/mm.c | 13 ++++++++++++- xen/include/asm-x86/mm.h | 1 + 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2922673..e056515 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2489,18 +2489,21 @@ gp_fault: static int vmx_alloc_vlapic_mapping(struct domain *d) { - void *apic_va; + struct page_info *pg; + unsigned long mfn; if ( !cpu_has_vmx_virtualize_apic_accesses ) return 0; - apic_va = alloc_xenheap_page(); - if ( apic_va == NULL ) + pg = alloc_domheap_page(d, MEMF_no_owner); + if ( !pg ) return -ENOMEM; - share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); - set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), - _mfn(virt_to_mfn(apic_va)), p2m_get_hostp2m(d)->default_access); + mfn = page_to_mfn(pg); + clear_domain_page(_mfn(mfn)); + share_xen_page_with_guest(pg, d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = mfn; + set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(mfn), + p2m_get_hostp2m(d)->default_access); return 0; } @@ -2508,8 +2511,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) static void vmx_free_vlapic_mapping(struct domain *d) { unsigned long mfn = d->arch.hvm_domain.vmx.apic_access_mfn; + if ( mfn != 0 ) - free_xenheap_page(mfn_to_virt(mfn)); + free_shared_domheap_page(mfn_to_page(mfn)); } static void vmx_install_vlapic_mapping(struct vcpu *v) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 92df36f..d33eb10 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -454,7 +454,7 @@ void share_xen_page_with_guest( /* Only add to the allocation list if the domain isn't dying. */ if ( !d->is_dying ) { - page->count_info |= PGC_allocated | 1; + page->count_info |= PGC_xen_heap | PGC_allocated | 1; if ( unlikely(d->xenheap_pages++ == 0) ) get_knownalive_domain(d); page_list_add_tail(page, &d->xenpage_list); @@ -469,6 +469,17 @@ void share_xen_page_with_privileged_guests( share_xen_page_with_guest(page, dom_xen, readonly); } +void free_shared_domheap_page(struct page_info *page) +{ + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + if ( !test_and_clear_bit(_PGC_xen_heap, &page->count_info) ) + ASSERT_UNREACHABLE(); + page->u.inuse.type_info = 0; + page_set_owner(page, NULL); + free_domheap_page(page); +} + void make_cr3(struct vcpu *v, unsigned long mfn) { v->arch.cr3 = mfn << PAGE_SHIFT; diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 67b34c6..1f5e335 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -276,6 +276,7 @@ extern void share_xen_page_with_guest( struct page_info *page, struct domain *d, int readonly); extern void share_xen_page_with_privileged_guests( struct page_info *page, int readonly); +extern void free_shared_domheap_page(struct page_info *page); #define frame_table ((struct page_info *)FRAMETABLE_VIRT_START) #define spage_table ((struct spage_info *)SPAGETABLE_VIRT_START) -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:30 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31: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 1aBcxO-0007Ci-RY; Wed, 23 Dec 2015 06:31:30 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxN-0007CT-PE for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:29 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id F7/EB-18316-1CF3A765; Wed, 23 Dec 2015 06:31:29 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450852287!6801255!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14220 invoked from network); 23 Dec 2015 06:31:28 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:28 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxL-0000wd-K3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:27 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxL-0007bw-GJ for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:27 +0000 Date: Wed, 23 Dec 2015 06:31:27 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] VMX: allocate APIC access page from domain heap X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit a2b4b8c20413302c0983b730925d59dc2fee3bb3 Author: Jan Beulich AuthorDate: Mon Dec 21 13:35:13 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:35:13 2015 +0100 VMX: allocate APIC access page from domain heap ... since we don't need its virtual address anywhere (it's a placeholder page only after all). For this to work (and possibly be done elsewhere too) share_xen_page_with_guest() needs to mark pages handed to it as Xen heap ones. To be on the safe side, also explicitly clear the page (not having done so was okay due to the XSA-100 fix, but is still a latent bug since we don't formally guarantee allocations to come out zeroed, and in fact this property may disappear again as soon as the asynchronous runtime scrubbing patches arrive). Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 20 ++++++++++++-------- xen/arch/x86/mm.c | 13 ++++++++++++- xen/include/asm-x86/mm.h | 1 + 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 2922673..e056515 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2489,18 +2489,21 @@ gp_fault: static int vmx_alloc_vlapic_mapping(struct domain *d) { - void *apic_va; + struct page_info *pg; + unsigned long mfn; if ( !cpu_has_vmx_virtualize_apic_accesses ) return 0; - apic_va = alloc_xenheap_page(); - if ( apic_va == NULL ) + pg = alloc_domheap_page(d, MEMF_no_owner); + if ( !pg ) return -ENOMEM; - share_xen_page_with_guest(virt_to_page(apic_va), d, XENSHARE_writable); - d->arch.hvm_domain.vmx.apic_access_mfn = virt_to_mfn(apic_va); - set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), - _mfn(virt_to_mfn(apic_va)), p2m_get_hostp2m(d)->default_access); + mfn = page_to_mfn(pg); + clear_domain_page(_mfn(mfn)); + share_xen_page_with_guest(pg, d, XENSHARE_writable); + d->arch.hvm_domain.vmx.apic_access_mfn = mfn; + set_mmio_p2m_entry(d, paddr_to_pfn(APIC_DEFAULT_PHYS_BASE), _mfn(mfn), + p2m_get_hostp2m(d)->default_access); return 0; } @@ -2508,8 +2511,9 @@ static int vmx_alloc_vlapic_mapping(struct domain *d) static void vmx_free_vlapic_mapping(struct domain *d) { unsigned long mfn = d->arch.hvm_domain.vmx.apic_access_mfn; + if ( mfn != 0 ) - free_xenheap_page(mfn_to_virt(mfn)); + free_shared_domheap_page(mfn_to_page(mfn)); } static void vmx_install_vlapic_mapping(struct vcpu *v) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 92df36f..d33eb10 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -454,7 +454,7 @@ void share_xen_page_with_guest( /* Only add to the allocation list if the domain isn't dying. */ if ( !d->is_dying ) { - page->count_info |= PGC_allocated | 1; + page->count_info |= PGC_xen_heap | PGC_allocated | 1; if ( unlikely(d->xenheap_pages++ == 0) ) get_knownalive_domain(d); page_list_add_tail(page, &d->xenpage_list); @@ -469,6 +469,17 @@ void share_xen_page_with_privileged_guests( share_xen_page_with_guest(page, dom_xen, readonly); } +void free_shared_domheap_page(struct page_info *page) +{ + if ( test_and_clear_bit(_PGC_allocated, &page->count_info) ) + put_page(page); + if ( !test_and_clear_bit(_PGC_xen_heap, &page->count_info) ) + ASSERT_UNREACHABLE(); + page->u.inuse.type_info = 0; + page_set_owner(page, NULL); + free_domheap_page(page); +} + void make_cr3(struct vcpu *v, unsigned long mfn) { v->arch.cr3 = mfn << PAGE_SHIFT; diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 67b34c6..1f5e335 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -276,6 +276,7 @@ extern void share_xen_page_with_guest( struct page_info *page, struct domain *d, int readonly); extern void share_xen_page_with_privileged_guests( struct page_info *page, int readonly); +extern void free_shared_domheap_page(struct page_info *page); #define frame_table ((struct page_info *)FRAMETABLE_VIRT_START) #define spage_table ((struct spage_info *)SPAGETABLE_VIRT_START) -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxZ-0007EC-0N; Wed, 23 Dec 2015 06:31:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxX-0007Dv-KY for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:39 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id DC/FB-18316-BCF3A765; Wed, 23 Dec 2015 06:31:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450852297!6804710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27654 invoked from network); 23 Dec 2015 06:31:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxV-0000wl-Qk for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxV-0007cL-PT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:37 +0000 Date: Wed, 23 Dec 2015 06:31:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domain: compile with lock_profile=y enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8916fcf4577dbaf6e0a2f7b447e17e8820b22107 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Dec 21 13:35:55 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:35:55 2015 +0100 x86/domain: compile with lock_profile=y enabled Our 'struct domain' has when lock profiling is enabled is bigger than one page. We can't use vmap nor vzalloc as both of those stash the physical address in struct page which makes the assumptions in 'arch_init_memory' trip over ASSERTs. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: David Vrabel --- xen/arch/x86/domain.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 4ad5217..159d960 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -231,6 +231,7 @@ static unsigned int __init noinline _domain_struct_bits(void) struct domain *alloc_domain_struct(void) { struct domain *d; + unsigned int order = get_order_from_bytes(sizeof(*d)); #ifdef CONFIG_BIGMEM const unsigned int bits = 0; #else @@ -244,10 +245,18 @@ struct domain *alloc_domain_struct(void) bits = _domain_struct_bits(); #endif + +#ifndef LOCK_PROFILE BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); - d = alloc_xenheap_pages(0, MEMF_bits(bits)); +#endif + d = alloc_xenheap_pages(order, MEMF_bits(bits)); if ( d != NULL ) - clear_page(d); + { + unsigned int sz; + + for ( sz = 0; sz < (PAGE_SIZE << order); sz += PAGE_SIZE ) + clear_page((void *)d + sz); + } return d; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:31:41 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxZ-0007EC-0N; Wed, 23 Dec 2015 06:31:41 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxX-0007Dv-KY for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:39 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id DC/FB-18316-BCF3A765; Wed, 23 Dec 2015 06:31:39 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1450852297!6804710!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27654 invoked from network); 23 Dec 2015 06:31:38 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-10.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:38 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxV-0000wl-Qk for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:37 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxV-0007cL-PT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:37 +0000 Date: Wed, 23 Dec 2015 06:31:37 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/domain: compile with lock_profile=y enabled X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8916fcf4577dbaf6e0a2f7b447e17e8820b22107 Author: Konrad Rzeszutek Wilk AuthorDate: Mon Dec 21 13:35:55 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:35:55 2015 +0100 x86/domain: compile with lock_profile=y enabled Our 'struct domain' has when lock profiling is enabled is bigger than one page. We can't use vmap nor vzalloc as both of those stash the physical address in struct page which makes the assumptions in 'arch_init_memory' trip over ASSERTs. Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: David Vrabel --- xen/arch/x86/domain.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 4ad5217..159d960 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -231,6 +231,7 @@ static unsigned int __init noinline _domain_struct_bits(void) struct domain *alloc_domain_struct(void) { struct domain *d; + unsigned int order = get_order_from_bytes(sizeof(*d)); #ifdef CONFIG_BIGMEM const unsigned int bits = 0; #else @@ -244,10 +245,18 @@ struct domain *alloc_domain_struct(void) bits = _domain_struct_bits(); #endif + +#ifndef LOCK_PROFILE BUILD_BUG_ON(sizeof(*d) > PAGE_SIZE); - d = alloc_xenheap_pages(0, MEMF_bits(bits)); +#endif + d = alloc_xenheap_pages(order, MEMF_bits(bits)); if ( d != NULL ) - clear_page(d); + { + unsigned int sz; + + for ( sz = 0; sz < (PAGE_SIZE << order); sz += PAGE_SIZE ) + clear_page((void *)d + sz); + } return d; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:31:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxk-0007Fb-64; Wed, 23 Dec 2015 06:31:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxi-0007FN-IU for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:50 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id AE/22-25438-5DF3A765; Wed, 23 Dec 2015 06:31:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1450852308!12762065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11292 invoked from network); 23 Dec 2015 06:31: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; 23 Dec 2015 06:31:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxg-0000wt-3N for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxg-0007ch-2S for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:48 +0000 Date: Wed, 23 Dec 2015 06:31:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ept: invalidate guest physical mappings on VMENTER X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8eb2235599925b508bcbeb3402aba21fa2c266fd Author: David Vrabel AuthorDate: Mon Dec 21 13:36:41 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:36:41 2015 +0100 x86/ept: invalidate guest physical mappings on VMENTER If a guest allocates a page and the tlbflush_timestamp on the page indicates that a TLB flush of the previous owner is required, only the linear and combined mappings are invalidated. The guest-physical mappings are not invalidated. This is currently safe because the EPT code ensures that the guest-physical and combined mappings are invalidated /before/ the page is freed. However, this prevents us from deferring the EPT invalidate until after the page is freed (e.g., to defer the invalidate until the p2m locks are released). The TLB flush that may be done after allocating page already causes the original guest to VMEXIT, thus on VMENTER we can do an INVEPT if one is pending. This means __ept_sync_domain() need not do anything and the thus the on_selected_cpu() call does not need to wait for as long. ept_sync_domain() now marks all PCPUs as needing to be invalidated, including PCPUs that the domain has not run on. We still only IPI those PCPUs that are active so this does not result in any more INVEPT calls. We do not attempt to track when PCPUs may have cached translations because the only safe way to clear this per-CPU state is if immediately after an invalidate the PCPU is not active (i.e., the PCPU is not in d->domain_dirty_cpumask). Since we only invalidate on VMENTER or by IPIing active PCPUs this can never happen. Signed-off-by: David Vrabel Reviewed-by: George Dunlap Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 24 ++++++++++++------------ xen/arch/x86/mm/p2m-ept.c | 31 ++++++++++++++++++------------- xen/include/asm-x86/hvm/vmx/vmcs.h | 4 ++-- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index e056515..bda94a9 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -744,24 +744,12 @@ static void vmx_ctxt_switch_from(struct vcpu *v) static void vmx_ctxt_switch_to(struct vcpu *v) { - struct domain *d = v->domain; unsigned long old_cr4 = read_cr4(), new_cr4 = mmu_cr4_features; - struct ept_data *ept_data = &p2m_get_hostp2m(d)->ept; /* HOST_CR4 in VMCS is always mmu_cr4_features. Sync CR4 now. */ if ( old_cr4 != new_cr4 ) write_cr4(new_cr4); - if ( paging_mode_hap(d) ) - { - unsigned int cpu = smp_processor_id(); - /* Test-and-test-and-set this CPU in the EPT-is-synced mask. */ - if ( !cpumask_test_cpu(cpu, ept_get_synced_mask(ept_data)) && - !cpumask_test_and_set_cpu(cpu, - ept_get_synced_mask(ept_data)) ) - __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept_data), 0); - } - vmx_restore_guest_msrs(v); vmx_restore_dr(v); } @@ -3590,6 +3578,18 @@ void vmx_vmenter_helper(const struct cpu_user_regs *regs) if ( unlikely(need_flush) ) vpid_sync_all(); + if ( paging_mode_hap(curr->domain) ) + { + struct ept_data *ept = &p2m_get_hostp2m(curr->domain)->ept; + unsigned int cpu = smp_processor_id(); + + if ( cpumask_test_cpu(cpu, ept->invalidate) ) + { + cpumask_clear_cpu(cpu, ept->invalidate); + __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept), 0); + } + } + out: HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index eef0372..c094320 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1089,9 +1089,10 @@ static void ept_memory_type_changed(struct p2m_domain *p2m) static void __ept_sync_domain(void *info) { - struct ept_data *ept = &((struct p2m_domain *)info)->ept; - - __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept), 0); + /* + * The invalidation will be done before VMENTER (see + * vmx_vmenter_helper()). + */ } void ept_sync_domain(struct p2m_domain *p2m) @@ -1108,15 +1109,15 @@ void ept_sync_domain(struct p2m_domain *p2m) p2m_flush_nestedp2m(d); /* - * Flush active cpus synchronously. Flush others the next time this domain - * is scheduled onto them. We accept the race of other CPUs adding to - * the ept_synced mask before on_selected_cpus() reads it, resulting in - * unnecessary extra flushes, to avoid allocating a cpumask_t on the stack. + * Need to invalidate on all PCPUs because either: + * + * a) A VCPU has run and some translations may be cached. + * b) A VCPU has not run and and the initial invalidation in case + * of an EP4TA reuse is still needed. */ - cpumask_and(ept_get_synced_mask(ept), - d->domain_dirty_cpumask, &cpu_online_map); + cpumask_setall(ept->invalidate); - on_selected_cpus(ept_get_synced_mask(ept), + on_selected_cpus(d->domain_dirty_cpumask, __ept_sync_domain, p2m, 1); } @@ -1182,10 +1183,14 @@ int ept_p2m_init(struct p2m_domain *p2m) p2m->flush_hardware_cached_dirty = ept_flush_pml_buffers; } - if ( !zalloc_cpumask_var(&ept->synced_mask) ) + if ( !zalloc_cpumask_var(&ept->invalidate) ) return -ENOMEM; - on_each_cpu(__ept_sync_domain, p2m, 1); + /* + * Assume an initial invalidation is required, in case an EP4TA is + * reused. + */ + cpumask_setall(ept->invalidate); return 0; } @@ -1193,7 +1198,7 @@ int ept_p2m_init(struct p2m_domain *p2m) void ept_p2m_uninit(struct p2m_domain *p2m) { struct ept_data *ept = &p2m->ept; - free_cpumask_var(ept->synced_mask); + free_cpumask_var(ept->invalidate); } static void ept_dump_p2m_table(unsigned char key) diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index a8d4d5b..d1496b8 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -67,7 +67,8 @@ struct ept_data { }; u64 eptp; }; - cpumask_var_t synced_mask; + /* Set of PCPUs needing an INVEPT before a VMENTER. */ + cpumask_var_t invalidate; }; #define _VMX_DOMAIN_PML_ENABLED 0 @@ -97,7 +98,6 @@ struct pi_desc { #define ept_get_wl(ept) ((ept)->ept_wl) #define ept_get_asr(ept) ((ept)->asr) #define ept_get_eptp(ept) ((ept)->eptp) -#define ept_get_synced_mask(ept) ((ept)->synced_mask) #define NR_PML_ENTRIES 512 -- generated by git-patchbot for /home/xen/git/xen.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 23 06:31:52 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:31:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxk-0007Fb-64; Wed, 23 Dec 2015 06:31:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxi-0007FN-IU for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:50 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id AE/22-25438-5DF3A765; Wed, 23 Dec 2015 06:31:49 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-27.messagelabs.com!1450852308!12762065!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11292 invoked from network); 23 Dec 2015 06:31: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; 23 Dec 2015 06:31:49 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxg-0000wt-3N for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:48 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxg-0007ch-2S for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:48 +0000 Date: Wed, 23 Dec 2015 06:31:48 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/ept: invalidate guest physical mappings on VMENTER X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 8eb2235599925b508bcbeb3402aba21fa2c266fd Author: David Vrabel AuthorDate: Mon Dec 21 13:36:41 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:36:41 2015 +0100 x86/ept: invalidate guest physical mappings on VMENTER If a guest allocates a page and the tlbflush_timestamp on the page indicates that a TLB flush of the previous owner is required, only the linear and combined mappings are invalidated. The guest-physical mappings are not invalidated. This is currently safe because the EPT code ensures that the guest-physical and combined mappings are invalidated /before/ the page is freed. However, this prevents us from deferring the EPT invalidate until after the page is freed (e.g., to defer the invalidate until the p2m locks are released). The TLB flush that may be done after allocating page already causes the original guest to VMEXIT, thus on VMENTER we can do an INVEPT if one is pending. This means __ept_sync_domain() need not do anything and the thus the on_selected_cpu() call does not need to wait for as long. ept_sync_domain() now marks all PCPUs as needing to be invalidated, including PCPUs that the domain has not run on. We still only IPI those PCPUs that are active so this does not result in any more INVEPT calls. We do not attempt to track when PCPUs may have cached translations because the only safe way to clear this per-CPU state is if immediately after an invalidate the PCPU is not active (i.e., the PCPU is not in d->domain_dirty_cpumask). Since we only invalidate on VMENTER or by IPIing active PCPUs this can never happen. Signed-off-by: David Vrabel Reviewed-by: George Dunlap Acked-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 24 ++++++++++++------------ xen/arch/x86/mm/p2m-ept.c | 31 ++++++++++++++++++------------- xen/include/asm-x86/hvm/vmx/vmcs.h | 4 ++-- 3 files changed, 32 insertions(+), 27 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index e056515..bda94a9 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -744,24 +744,12 @@ static void vmx_ctxt_switch_from(struct vcpu *v) static void vmx_ctxt_switch_to(struct vcpu *v) { - struct domain *d = v->domain; unsigned long old_cr4 = read_cr4(), new_cr4 = mmu_cr4_features; - struct ept_data *ept_data = &p2m_get_hostp2m(d)->ept; /* HOST_CR4 in VMCS is always mmu_cr4_features. Sync CR4 now. */ if ( old_cr4 != new_cr4 ) write_cr4(new_cr4); - if ( paging_mode_hap(d) ) - { - unsigned int cpu = smp_processor_id(); - /* Test-and-test-and-set this CPU in the EPT-is-synced mask. */ - if ( !cpumask_test_cpu(cpu, ept_get_synced_mask(ept_data)) && - !cpumask_test_and_set_cpu(cpu, - ept_get_synced_mask(ept_data)) ) - __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept_data), 0); - } - vmx_restore_guest_msrs(v); vmx_restore_dr(v); } @@ -3590,6 +3578,18 @@ void vmx_vmenter_helper(const struct cpu_user_regs *regs) if ( unlikely(need_flush) ) vpid_sync_all(); + if ( paging_mode_hap(curr->domain) ) + { + struct ept_data *ept = &p2m_get_hostp2m(curr->domain)->ept; + unsigned int cpu = smp_processor_id(); + + if ( cpumask_test_cpu(cpu, ept->invalidate) ) + { + cpumask_clear_cpu(cpu, ept->invalidate); + __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept), 0); + } + } + out: HVMTRACE_ND(VMENTRY, 0, 1/*cycles*/, 0, 0, 0, 0, 0, 0, 0); diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c index eef0372..c094320 100644 --- a/xen/arch/x86/mm/p2m-ept.c +++ b/xen/arch/x86/mm/p2m-ept.c @@ -1089,9 +1089,10 @@ static void ept_memory_type_changed(struct p2m_domain *p2m) static void __ept_sync_domain(void *info) { - struct ept_data *ept = &((struct p2m_domain *)info)->ept; - - __invept(INVEPT_SINGLE_CONTEXT, ept_get_eptp(ept), 0); + /* + * The invalidation will be done before VMENTER (see + * vmx_vmenter_helper()). + */ } void ept_sync_domain(struct p2m_domain *p2m) @@ -1108,15 +1109,15 @@ void ept_sync_domain(struct p2m_domain *p2m) p2m_flush_nestedp2m(d); /* - * Flush active cpus synchronously. Flush others the next time this domain - * is scheduled onto them. We accept the race of other CPUs adding to - * the ept_synced mask before on_selected_cpus() reads it, resulting in - * unnecessary extra flushes, to avoid allocating a cpumask_t on the stack. + * Need to invalidate on all PCPUs because either: + * + * a) A VCPU has run and some translations may be cached. + * b) A VCPU has not run and and the initial invalidation in case + * of an EP4TA reuse is still needed. */ - cpumask_and(ept_get_synced_mask(ept), - d->domain_dirty_cpumask, &cpu_online_map); + cpumask_setall(ept->invalidate); - on_selected_cpus(ept_get_synced_mask(ept), + on_selected_cpus(d->domain_dirty_cpumask, __ept_sync_domain, p2m, 1); } @@ -1182,10 +1183,14 @@ int ept_p2m_init(struct p2m_domain *p2m) p2m->flush_hardware_cached_dirty = ept_flush_pml_buffers; } - if ( !zalloc_cpumask_var(&ept->synced_mask) ) + if ( !zalloc_cpumask_var(&ept->invalidate) ) return -ENOMEM; - on_each_cpu(__ept_sync_domain, p2m, 1); + /* + * Assume an initial invalidation is required, in case an EP4TA is + * reused. + */ + cpumask_setall(ept->invalidate); return 0; } @@ -1193,7 +1198,7 @@ int ept_p2m_init(struct p2m_domain *p2m) void ept_p2m_uninit(struct p2m_domain *p2m) { struct ept_data *ept = &p2m->ept; - free_cpumask_var(ept->synced_mask); + free_cpumask_var(ept->invalidate); } static void ept_dump_p2m_table(unsigned char key) diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index a8d4d5b..d1496b8 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -67,7 +67,8 @@ struct ept_data { }; u64 eptp; }; - cpumask_var_t synced_mask; + /* Set of PCPUs needing an INVEPT before a VMENTER. */ + cpumask_var_t invalidate; }; #define _VMX_DOMAIN_PML_ENABLED 0 @@ -97,7 +98,6 @@ struct pi_desc { #define ept_get_wl(ept) ((ept)->ept_wl) #define ept_get_asr(ept) ((ept)->asr) #define ept_get_eptp(ept) ((ept)->eptp) -#define ept_get_synced_mask(ept) ((ept)->synced_mask) #define NR_PML_ENTRIES 512 -- generated by git-patchbot for /home/xen/git/xen.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 23 06:32:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxu-0007Hx-HM; Wed, 23 Dec 2015 06:32:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxs-0007Hf-Sn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:00 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id C7/66-12889-0EF3A765; Wed, 23 Dec 2015 06:32:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1450852318!12780545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45168 invoked from network); 23 Dec 2015 06:31:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxq-0000x1-C3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxq-0007dC-9L for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:58 +0000 Date: Wed, 23 Dec 2015 06:31:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsaves: get_xsave_addr, check xsave header and support uncompressed format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a4b84706e5e67be4e3e3a023d4a0a7169b19b45 Author: Huaitong Han AuthorDate: Mon Dec 21 13:37:17 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:37:17 2015 +0100 x86/xsaves: get_xsave_addr, check xsave header and support uncompressed format The check needs to be against the xsave header in the area, rather than Xen's maximum xfeature_mask. A guest might easily have a smaller xcr0 than the maximum Xen is willing to allow, causing the pointer below to be bogus. The get_xsave_addr() is modified to support uncompressed xstate areas. Signed-off-by: Huaitong Han Reviewed-by: Andrew Cooper --- xen/arch/x86/xstate.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index b65da38..4e87ab3 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -146,12 +146,15 @@ static void __init setup_xstate_comp(void) } } -static void *get_xsave_addr(void *xsave, unsigned int xfeature_idx) +static void *get_xsave_addr(struct xsave_struct *xsave, + unsigned int xfeature_idx) { - if ( !((1ul << xfeature_idx) & xfeature_mask) ) + if ( !((1ul << xfeature_idx) & xsave->xsave_hdr.xstate_bv) ) return NULL; - return xsave + xstate_comp_offsets[xfeature_idx]; + return (void *)xsave + (xsave_area_compressed(xsave) + ? xstate_comp_offsets + : xstate_offsets)[xfeature_idx]; } void expand_xsave_states(struct vcpu *v, void *dest, unsigned int size) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:32:03 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxu-0007Hx-HM; Wed, 23 Dec 2015 06:32:02 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxs-0007Hf-Sn for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:00 +0000 Received: from [193.109.254.147] by server-2.bemta-14.messagelabs.com id C7/66-12889-0EF3A765; Wed, 23 Dec 2015 06:32:00 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-11.tower-27.messagelabs.com!1450852318!12780545!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 45168 invoked from network); 23 Dec 2015 06:31:59 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-11.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:31:59 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcxq-0000x1-C3 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:58 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcxq-0007dC-9L for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:31:58 +0000 Date: Wed, 23 Dec 2015 06:31:58 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/xsaves: get_xsave_addr, check xsave header and support uncompressed format X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 2a4b84706e5e67be4e3e3a023d4a0a7169b19b45 Author: Huaitong Han AuthorDate: Mon Dec 21 13:37:17 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:37:17 2015 +0100 x86/xsaves: get_xsave_addr, check xsave header and support uncompressed format The check needs to be against the xsave header in the area, rather than Xen's maximum xfeature_mask. A guest might easily have a smaller xcr0 than the maximum Xen is willing to allow, causing the pointer below to be bogus. The get_xsave_addr() is modified to support uncompressed xstate areas. Signed-off-by: Huaitong Han Reviewed-by: Andrew Cooper --- xen/arch/x86/xstate.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index b65da38..4e87ab3 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -146,12 +146,15 @@ static void __init setup_xstate_comp(void) } } -static void *get_xsave_addr(void *xsave, unsigned int xfeature_idx) +static void *get_xsave_addr(struct xsave_struct *xsave, + unsigned int xfeature_idx) { - if ( !((1ul << xfeature_idx) & xfeature_mask) ) + if ( !((1ul << xfeature_idx) & xsave->xsave_hdr.xstate_bv) ) return NULL; - return xsave + xstate_comp_offsets[xfeature_idx]; + return (void *)xsave + (xsave_area_compressed(xsave) + ? xstate_comp_offsets + : xstate_offsets)[xfeature_idx]; } void expand_xsave_states(struct vcpu *v, void *dest, unsigned int size) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:32:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcy4-0007JN-MY; Wed, 23 Dec 2015 06:32:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcy2-0007J7-SW for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:10 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 5F/27-21901-AEF3A765; Wed, 23 Dec 2015 06:32:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1450852328!12104842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40613 invoked from network); 23 Dec 2015 06:32:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:32:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcy0-0000xb-Np for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcy0-0007eG-Ln for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:08 +0000 Date: Wed, 23 Dec 2015 06:32:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: constrain MSR_IA32_DS_AREA loads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d0683a4f5b56e6d7f3f68727bf218f75782db8e Author: Jan Beulich AuthorDate: Mon Dec 21 13:38:22 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:38:22 2015 +0100 x86/vPMU: constrain MSR_IA32_DS_AREA loads For one, loading the MSR with a possibly non-canonical address was possible since the verification is conditional, while the MSR load wasn't. And then for PV guests we need to further limit the range of valid addresses to exclude the hypervisor range. Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/cpu/vpmu_intel.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index 4c16418..3eff1ae 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -366,7 +366,8 @@ static inline void __core2_vpmu_load(struct vcpu *v) } wrmsrl(MSR_CORE_PERF_FIXED_CTR_CTRL, core2_vpmu_cxt->fixed_ctrl); - wrmsrl(MSR_IA32_DS_AREA, core2_vpmu_cxt->ds_area); + if ( vpmu_is_set(vcpu_vpmu(v), VPMU_CPU_HAS_DS) ) + wrmsrl(MSR_IA32_DS_AREA, core2_vpmu_cxt->ds_area); wrmsrl(MSR_IA32_PEBS_ENABLE, core2_vpmu_cxt->pebs_enable); if ( !has_hvm_container_vcpu(v) ) @@ -415,8 +416,10 @@ static int core2_vpmu_verify(struct vcpu *v) enabled_cntrs |= (1ULL << i); } - if ( vpmu_is_set(vcpu_vpmu(v), VPMU_CPU_HAS_DS) && - !is_canonical_address(core2_vpmu_cxt->ds_area) ) + if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_DS) && + !(has_hvm_container_vcpu(v) + ? is_canonical_address(core2_vpmu_cxt->ds_area) + : __addr_ok(core2_vpmu_cxt->ds_area)) ) return -EINVAL; if ( (core2_vpmu_cxt->global_ctrl & enabled_cntrs) || @@ -609,7 +612,9 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, case MSR_IA32_DS_AREA: if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_DS) ) { - if ( !is_canonical_address(msr_content) ) + if ( !(has_hvm_container_vcpu(v) + ? is_canonical_address(msr_content) + : __addr_ok(msr_content)) ) { gdprintk(XENLOG_WARNING, "Illegal address for IA32_DS_AREA: %#" PRIx64 "x\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 Wed Dec 23 06:32:12 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcy4-0007JN-MY; Wed, 23 Dec 2015 06:32:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcy2-0007J7-SW for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:10 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 5F/27-21901-AEF3A765; Wed, 23 Dec 2015 06:32:10 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1450852328!12104842!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 40613 invoked from network); 23 Dec 2015 06:32:09 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-13.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:32:09 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcy0-0000xb-Np for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:08 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcy0-0007eG-Ln for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:08 +0000 Date: Wed, 23 Dec 2015 06:32:08 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/vPMU: constrain MSR_IA32_DS_AREA loads X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5d0683a4f5b56e6d7f3f68727bf218f75782db8e Author: Jan Beulich AuthorDate: Mon Dec 21 13:38:22 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:38:22 2015 +0100 x86/vPMU: constrain MSR_IA32_DS_AREA loads For one, loading the MSR with a possibly non-canonical address was possible since the verification is conditional, while the MSR load wasn't. And then for PV guests we need to further limit the range of valid addresses to exclude the hypervisor range. Signed-off-by: Jan Beulich Reviewed-by: Boris Ostrovsky Acked-by: Kevin Tian --- xen/arch/x86/cpu/vpmu_intel.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index 4c16418..3eff1ae 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -366,7 +366,8 @@ static inline void __core2_vpmu_load(struct vcpu *v) } wrmsrl(MSR_CORE_PERF_FIXED_CTR_CTRL, core2_vpmu_cxt->fixed_ctrl); - wrmsrl(MSR_IA32_DS_AREA, core2_vpmu_cxt->ds_area); + if ( vpmu_is_set(vcpu_vpmu(v), VPMU_CPU_HAS_DS) ) + wrmsrl(MSR_IA32_DS_AREA, core2_vpmu_cxt->ds_area); wrmsrl(MSR_IA32_PEBS_ENABLE, core2_vpmu_cxt->pebs_enable); if ( !has_hvm_container_vcpu(v) ) @@ -415,8 +416,10 @@ static int core2_vpmu_verify(struct vcpu *v) enabled_cntrs |= (1ULL << i); } - if ( vpmu_is_set(vcpu_vpmu(v), VPMU_CPU_HAS_DS) && - !is_canonical_address(core2_vpmu_cxt->ds_area) ) + if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_DS) && + !(has_hvm_container_vcpu(v) + ? is_canonical_address(core2_vpmu_cxt->ds_area) + : __addr_ok(core2_vpmu_cxt->ds_area)) ) return -EINVAL; if ( (core2_vpmu_cxt->global_ctrl & enabled_cntrs) || @@ -609,7 +612,9 @@ static int core2_vpmu_do_wrmsr(unsigned int msr, uint64_t msr_content, case MSR_IA32_DS_AREA: if ( vpmu_is_set(vpmu, VPMU_CPU_HAS_DS) ) { - if ( !is_canonical_address(msr_content) ) + if ( !(has_hvm_container_vcpu(v) + ? is_canonical_address(msr_content) + : __addr_ok(msr_content)) ) { gdprintk(XENLOG_WARNING, "Illegal address for IA32_DS_AREA: %#" PRIx64 "x\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 Wed Dec 23 06:32:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcyE-0007Kp-RG; Wed, 23 Dec 2015 06:32:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyD-0007Kb-9t for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:21 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 99/3C-31069-4FF3A765; Wed, 23 Dec 2015 06:32:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1450852339!12352145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61390 invoked from network); 23 Dec 2015 06:32:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:32:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyB-0000xj-1n for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyB-0007ec-0U for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:19 +0000 Date: Wed, 23 Dec 2015 06:32:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: add information about faulted page's presence to npfec structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a966b46a0b699190c1b634c7daee848e02cce37 Author: Boris Ostrovsky AuthorDate: Mon Dec 21 13:38:53 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:38:53 2015 +0100 x86/mm: add information about faulted page's presence to npfec structure This is provided explicitly in SVM and implicitly in VMX (when neither of the three EPT_EFFECTIVE_* bits is set). Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 5 ++++- xen/include/xen/mm.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 0078100..a66d854 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1491,7 +1491,8 @@ static void svm_do_nested_pgfault(struct vcpu *v, struct npfec npfec = { .read_access = !(pfec & PFEC_insn_fetch), .write_access = !!(pfec & PFEC_write_access), - .insn_fetch = !!(pfec & PFEC_insn_fetch) + .insn_fetch = !!(pfec & PFEC_insn_fetch), + .present = !!(pfec & PFEC_page_present), }; /* These bits are mutually exclusive */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index bda94a9..b918b8a 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2738,7 +2738,10 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) .read_access = !!(qualification & EPT_READ_VIOLATION) || !!(qualification & EPT_WRITE_VIOLATION), .write_access = !!(qualification & EPT_WRITE_VIOLATION), - .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION) + .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION), + .present = !!(qualification & (EPT_EFFECTIVE_READ | + EPT_EFFECTIVE_WRITE | + EPT_EFFECTIVE_EXEC)) }; if ( tb_init_done ) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 5d4b64b..a795dd6 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -159,6 +159,7 @@ struct npfec { unsigned int read_access:1; unsigned int write_access:1; unsigned int insn_fetch:1; + unsigned int present:1; unsigned int gla_valid:1; unsigned int kind:2; /* npfec_kind_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 Wed Dec 23 06:32:23 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcyE-0007Kp-RG; Wed, 23 Dec 2015 06:32:22 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyD-0007Kb-9t for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:21 +0000 Received: from [85.158.137.68] by server-8.bemta-3.messagelabs.com id 99/3C-31069-4FF3A765; Wed, 23 Dec 2015 06:32:20 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1450852339!12352145!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 61390 invoked from network); 23 Dec 2015 06:32:20 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-3.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:32:20 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyB-0000xj-1n for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:19 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyB-0007ec-0U for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:19 +0000 Date: Wed, 23 Dec 2015 06:32:19 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/mm: add information about faulted page's presence to npfec structure X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 1a966b46a0b699190c1b634c7daee848e02cce37 Author: Boris Ostrovsky AuthorDate: Mon Dec 21 13:38:53 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:38:53 2015 +0100 x86/mm: add information about faulted page's presence to npfec structure This is provided explicitly in SVM and implicitly in VMX (when neither of the three EPT_EFFECTIVE_* bits is set). Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich Acked-by: Kevin Tian --- xen/arch/x86/hvm/svm/svm.c | 3 ++- xen/arch/x86/hvm/vmx/vmx.c | 5 ++++- xen/include/xen/mm.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 0078100..a66d854 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1491,7 +1491,8 @@ static void svm_do_nested_pgfault(struct vcpu *v, struct npfec npfec = { .read_access = !(pfec & PFEC_insn_fetch), .write_access = !!(pfec & PFEC_write_access), - .insn_fetch = !!(pfec & PFEC_insn_fetch) + .insn_fetch = !!(pfec & PFEC_insn_fetch), + .present = !!(pfec & PFEC_page_present), }; /* These bits are mutually exclusive */ diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index bda94a9..b918b8a 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2738,7 +2738,10 @@ static void ept_handle_violation(unsigned long qualification, paddr_t gpa) .read_access = !!(qualification & EPT_READ_VIOLATION) || !!(qualification & EPT_WRITE_VIOLATION), .write_access = !!(qualification & EPT_WRITE_VIOLATION), - .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION) + .insn_fetch = !!(qualification & EPT_EXEC_VIOLATION), + .present = !!(qualification & (EPT_EFFECTIVE_READ | + EPT_EFFECTIVE_WRITE | + EPT_EFFECTIVE_EXEC)) }; if ( tb_init_done ) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index 5d4b64b..a795dd6 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -159,6 +159,7 @@ struct npfec { unsigned int read_access:1; unsigned int write_access:1; unsigned int insn_fetch:1; + unsigned int present:1; unsigned int gla_valid:1; unsigned int kind:2; /* npfec_kind_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 Wed Dec 23 06:32:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyO-0007MM-VP; Wed, 23 Dec 2015 06:32:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyN-0007M5-Hz for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:31 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 0D/71-00475-EFF3A765; Wed, 23 Dec 2015 06:32:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450852349!9040454!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19826 invoked from network); 23 Dec 2015 06:32:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:32:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyL-0000xr-AC for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyL-0007ez-7F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:29 +0000 Date: Wed, 23 Dec 2015 06:32:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert CONFIG_COMPAT to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df9f55670008c92dcafa23680e0bf8b325e9cf24 Author: Doug Goldstein AuthorDate: Mon Dec 21 13:39:27 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:39:27 2015 +0100 build: convert CONFIG_COMPAT to Kconfig Use the Kconfig generated CONFIG_COMPAT defines in the code base. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper --- config/x86_64.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 7 +++++++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/config/x86_64.mk b/config/x86_64.mk index f12d549..85fa27c 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -2,7 +2,6 @@ CONFIG_X86 := y CONFIG_X86_64 := y CONFIG_X86_$(XEN_OS) := y -CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 07e366d..7d2ed96 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select COMPAT select HAS_ACPI select HAS_CPUFREQ select HAS_EHCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 7d0e9a9..046e257 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -1,6 +1,13 @@ menu "Common Features" +config COMPAT + bool + help + 32-bit interface support on 64-bit Xen which is used for both + HVM and PV guests. HVMLoader makes 32-bit hypercalls irrespective + of the destination runmode of the guest. + # Select HAS_DEVICE_TREE if device tree is supported config HAS_DEVICE_TREE bool -- generated by git-patchbot for /home/xen/git/xen.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 23 06:32:33 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyO-0007MM-VP; Wed, 23 Dec 2015 06:32:32 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyN-0007M5-Hz for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:31 +0000 Received: from [193.109.254.147] by server-5.bemta-14.messagelabs.com id 0D/71-00475-EFF3A765; Wed, 23 Dec 2015 06:32:30 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1450852349!9040454!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19826 invoked from network); 23 Dec 2015 06:32:30 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-27.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:32:30 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyL-0000xr-AC for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:29 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyL-0007ez-7F for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:29 +0000 Date: Wed, 23 Dec 2015 06:32:29 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] build: convert CONFIG_COMPAT to Kconfig X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit df9f55670008c92dcafa23680e0bf8b325e9cf24 Author: Doug Goldstein AuthorDate: Mon Dec 21 13:39:27 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:39:27 2015 +0100 build: convert CONFIG_COMPAT to Kconfig Use the Kconfig generated CONFIG_COMPAT defines in the code base. Signed-off-by: Doug Goldstein Reviewed-by: Andrew Cooper --- config/x86_64.mk | 1 - xen/arch/x86/Kconfig | 1 + xen/common/Kconfig | 7 +++++++ 3 files changed, 8 insertions(+), 1 deletions(-) diff --git a/config/x86_64.mk b/config/x86_64.mk index f12d549..85fa27c 100644 --- a/config/x86_64.mk +++ b/config/x86_64.mk @@ -2,7 +2,6 @@ CONFIG_X86 := y CONFIG_X86_64 := y CONFIG_X86_$(XEN_OS) := y -CONFIG_COMPAT := y CONFIG_MIGRATE := y CONFIG_XCUTILS := y diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 07e366d..7d2ed96 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -3,6 +3,7 @@ config X86_64 config X86 def_bool y + select COMPAT select HAS_ACPI select HAS_CPUFREQ select HAS_EHCI diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 7d0e9a9..046e257 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -1,6 +1,13 @@ menu "Common Features" +config COMPAT + bool + help + 32-bit interface support on 64-bit Xen which is used for both + HVM and PV guests. HVMLoader makes 32-bit hypercalls irrespective + of the destination runmode of the guest. + # Select HAS_DEVICE_TREE if device tree is supported config HAS_DEVICE_TREE bool -- generated by git-patchbot for /home/xen/git/xen.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 23 06:32:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcyZ-0007Ng-2u; Wed, 23 Dec 2015 06:32:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyY-0007NV-9I for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:42 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id FE/C2-25438-9004A765; Wed, 23 Dec 2015 06:32:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1450852359!12749588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59098 invoked from network); 23 Dec 2015 06:32:40 -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; 23 Dec 2015 06:32:40 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyV-0000xz-Nb for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyV-0007fP-Kg for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:39 +0000 Date: Wed, 23 Dec 2015 06:32:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: merge HVM and PVH hypercall tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 506db9078c8c9a1c814fc9f542b198385448218e Author: Boris Ostrovsky AuthorDate: Mon Dec 21 13:40:13 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:40:13 2015 +0100 x86/HVM: merge HVM and PVH hypercall tables The tables are almost identical and therefore there is little reason to keep both sets. PVH needs 3 extra hypercalls: * mmuext_op. MMUEXT_PIN_L_TABLE are required by control domain (dom0) when building guests. We add MMUEXT_UNPIN_TABLE for completeness. * platform_op. These are only available to privileged domains. We will (eventually) have privileged HVMlite guests and therefore shouldn't limit this to PVH only. * xenpmu_op. any guest with !has_vlapic() (i.e. PV, PVH and HVMlite) should be able to use it. Note that until recently PVH guests used mmuext_op's MMUEXT_INVLPG_MULTI and MMUEXT_TLB_FLUSH_MULTI commands but it has been determined that using the former was incorrect and using the latter is correct for now but is not guaranteed to work in the future. Signed-off-by: Boris Ostrovsky Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 59 +++++--------------------------------- xen/arch/x86/mm.c | 24 ++++++++++++++++ xen/arch/x86/x86_64/compat/mm.c | 4 ++- xen/include/asm-x86/hypercall.h | 9 ++++++ 4 files changed, 44 insertions(+), 52 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3bb31da..dcda70a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5173,6 +5173,9 @@ static hvm_hypercall_t *const hvm_hypercall64_table[NR_hypercalls] = { HYPERCALL(sysctl), HYPERCALL(domctl), HYPERCALL(tmem_op), + HYPERCALL(platform_op), + HYPERCALL(mmuext_op), + HYPERCALL(xenpmu_op), [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; @@ -5194,48 +5197,8 @@ static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] = { HYPERCALL(sysctl), HYPERCALL(domctl), HYPERCALL(tmem_op), - [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation -}; - -static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { - HYPERCALL(platform_op), - HYPERCALL(memory_op), - HYPERCALL(xen_version), - HYPERCALL(console_io), - [ __HYPERVISOR_grant_table_op ] = (hvm_hypercall_t *)hvm_grant_table_op, - HYPERCALL(vcpu_op), - HYPERCALL(mmuext_op), - HYPERCALL(xsm_op), - HYPERCALL(sched_op), - HYPERCALL(event_channel_op), - [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op, - HYPERCALL(hvm_op), - HYPERCALL(sysctl), - HYPERCALL(domctl), - HYPERCALL(xenpmu_op), - [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation -}; - -extern int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(void) cmp_uops, - unsigned int count, - XEN_GUEST_HANDLE_PARAM(uint) pdone, - unsigned int foreigndom); -static hvm_hypercall_t *const pvh_hypercall32_table[NR_hypercalls] = { - HYPERCALL(platform_op), - COMPAT_CALL(memory_op), - HYPERCALL(xen_version), - HYPERCALL(console_io), - [ __HYPERVISOR_grant_table_op ] = - (hvm_hypercall_t *)hvm_grant_table_op_compat32, - COMPAT_CALL(vcpu_op), + COMPAT_CALL(platform_op), COMPAT_CALL(mmuext_op), - HYPERCALL(xsm_op), - COMPAT_CALL(sched_op), - HYPERCALL(event_channel_op), - [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op_compat32, - HYPERCALL(hvm_op), - HYPERCALL(sysctl), - HYPERCALL(domctl), HYPERCALL(xenpmu_op), [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; @@ -5269,9 +5232,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( (eax & 0x80000000) && is_viridian_domain(currd) ) return viridian_hypercall(regs); - if ( (eax >= NR_hypercalls) || - !(is_pvh_domain(currd) ? pvh_hypercall32_table[eax] - : hvm_hypercall32_table[eax]) ) + if ( (eax >= NR_hypercalls) || !hvm_hypercall32_table[eax] ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -5305,9 +5266,8 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) #endif curr->arch.hvm_vcpu.hcall_64bit = 1; - regs->rax = (is_pvh_domain(currd) - ? pvh_hypercall64_table - : hvm_hypercall64_table)[eax](rdi, rsi, rdx, r10, r8, r9); + regs->rax = hvm_hypercall64_table[eax](rdi, rsi, rdx, r10, r8, r9); + curr->arch.hvm_vcpu.hcall_64bit = 0; #ifndef NDEBUG @@ -5351,10 +5311,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif - regs->_eax = (is_pvh_vcpu(curr) - ? pvh_hypercall32_table - : hvm_hypercall32_table)[eax](ebx, ecx, edx, - esi, edi, ebp); + regs->_eax = hvm_hypercall32_table[eax](ebx, ecx, edx, esi, edi, ebp); #ifndef NDEBUG if ( !curr->arch.hvm_vcpu.hcall_preempted ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d33eb10..e6b2caf 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3008,6 +3008,12 @@ long do_mmuext_op( if ( (pg_owner = get_pg_owner(foreigndom)) == NULL ) return -ESRCH; + if ( !is_pv_domain(pg_owner) ) + { + put_pg_owner(pg_owner); + return -EINVAL; + } + rc = xsm_mmuext_op(XSM_TARGET, d, pg_owner); if ( rc ) { @@ -3030,6 +3036,23 @@ long do_mmuext_op( break; } + if ( has_hvm_container_domain(d) ) + { + switch ( op.cmd ) + { + case MMUEXT_PIN_L1_TABLE: + case MMUEXT_PIN_L2_TABLE: + case MMUEXT_PIN_L3_TABLE: + case MMUEXT_PIN_L4_TABLE: + case MMUEXT_UNPIN_TABLE: + break; + default: + MEM_LOG("Invalid extended pt command %#x", op.cmd); + rc = -EOPNOTSUPP; + goto done; + } + } + okay = 1; switch ( op.cmd ) @@ -3459,6 +3482,7 @@ long do_mmuext_op( break; } + done: if ( unlikely(!okay) && !rc ) rc = -EINVAL; if ( unlikely(rc) ) diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index 178e42d..58be8ad 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -215,13 +215,15 @@ int compat_update_va_mapping_otherdomain(unsigned long va, u32 lo, u32 hi, DEFINE_XEN_GUEST_HANDLE(mmuext_op_compat_t); -int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, +int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(void) arg, unsigned int count, XEN_GUEST_HANDLE_PARAM(uint) pdone, unsigned int foreigndom) { unsigned int i, preempt_mask; int rc = 0; + XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops = + guest_handle_cast(arg, mmuext_op_compat_t); XEN_GUEST_HANDLE_PARAM(mmuext_op_t) nat_ops; if ( unlikely(count == MMU_UPDATE_PREEMPTED) && diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h index afa8ba9..945d58a 100644 --- a/xen/include/asm-x86/hypercall.h +++ b/xen/include/asm-x86/hypercall.h @@ -110,4 +110,13 @@ extern int arch_compat_vcpu_op( int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg); +extern int compat_mmuext_op( + XEN_GUEST_HANDLE_PARAM(void) arg, + unsigned int count, + XEN_GUEST_HANDLE_PARAM(uint) pdone, + unsigned int foreigndom); + +extern int compat_platform_op( + XEN_GUEST_HANDLE_PARAM(void) u_xenpf_op); + #endif /* __ASM_X86_HYPERCALL_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:32:43 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcyZ-0007Ng-2u; Wed, 23 Dec 2015 06:32:43 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyY-0007NV-9I for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:42 +0000 Received: from [193.109.254.147] by server-10.bemta-14.messagelabs.com id FE/C2-25438-9004A765; Wed, 23 Dec 2015 06:32:41 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-9.tower-27.messagelabs.com!1450852359!12749588!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59098 invoked from network); 23 Dec 2015 06:32:40 -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; 23 Dec 2015 06:32:40 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyV-0000xz-Nb for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:39 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyV-0007fP-Kg for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:39 +0000 Date: Wed, 23 Dec 2015 06:32:39 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: merge HVM and PVH hypercall tables X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 506db9078c8c9a1c814fc9f542b198385448218e Author: Boris Ostrovsky AuthorDate: Mon Dec 21 13:40:13 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:40:13 2015 +0100 x86/HVM: merge HVM and PVH hypercall tables The tables are almost identical and therefore there is little reason to keep both sets. PVH needs 3 extra hypercalls: * mmuext_op. MMUEXT_PIN_L_TABLE are required by control domain (dom0) when building guests. We add MMUEXT_UNPIN_TABLE for completeness. * platform_op. These are only available to privileged domains. We will (eventually) have privileged HVMlite guests and therefore shouldn't limit this to PVH only. * xenpmu_op. any guest with !has_vlapic() (i.e. PV, PVH and HVMlite) should be able to use it. Note that until recently PVH guests used mmuext_op's MMUEXT_INVLPG_MULTI and MMUEXT_TLB_FLUSH_MULTI commands but it has been determined that using the former was incorrect and using the latter is correct for now but is not guaranteed to work in the future. Signed-off-by: Boris Ostrovsky Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 59 +++++--------------------------------- xen/arch/x86/mm.c | 24 ++++++++++++++++ xen/arch/x86/x86_64/compat/mm.c | 4 ++- xen/include/asm-x86/hypercall.h | 9 ++++++ 4 files changed, 44 insertions(+), 52 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 3bb31da..dcda70a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5173,6 +5173,9 @@ static hvm_hypercall_t *const hvm_hypercall64_table[NR_hypercalls] = { HYPERCALL(sysctl), HYPERCALL(domctl), HYPERCALL(tmem_op), + HYPERCALL(platform_op), + HYPERCALL(mmuext_op), + HYPERCALL(xenpmu_op), [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; @@ -5194,48 +5197,8 @@ static hvm_hypercall_t *const hvm_hypercall32_table[NR_hypercalls] = { HYPERCALL(sysctl), HYPERCALL(domctl), HYPERCALL(tmem_op), - [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation -}; - -static hvm_hypercall_t *const pvh_hypercall64_table[NR_hypercalls] = { - HYPERCALL(platform_op), - HYPERCALL(memory_op), - HYPERCALL(xen_version), - HYPERCALL(console_io), - [ __HYPERVISOR_grant_table_op ] = (hvm_hypercall_t *)hvm_grant_table_op, - HYPERCALL(vcpu_op), - HYPERCALL(mmuext_op), - HYPERCALL(xsm_op), - HYPERCALL(sched_op), - HYPERCALL(event_channel_op), - [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op, - HYPERCALL(hvm_op), - HYPERCALL(sysctl), - HYPERCALL(domctl), - HYPERCALL(xenpmu_op), - [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation -}; - -extern int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(void) cmp_uops, - unsigned int count, - XEN_GUEST_HANDLE_PARAM(uint) pdone, - unsigned int foreigndom); -static hvm_hypercall_t *const pvh_hypercall32_table[NR_hypercalls] = { - HYPERCALL(platform_op), - COMPAT_CALL(memory_op), - HYPERCALL(xen_version), - HYPERCALL(console_io), - [ __HYPERVISOR_grant_table_op ] = - (hvm_hypercall_t *)hvm_grant_table_op_compat32, - COMPAT_CALL(vcpu_op), + COMPAT_CALL(platform_op), COMPAT_CALL(mmuext_op), - HYPERCALL(xsm_op), - COMPAT_CALL(sched_op), - HYPERCALL(event_channel_op), - [ __HYPERVISOR_physdev_op ] = (hvm_hypercall_t *)hvm_physdev_op_compat32, - HYPERCALL(hvm_op), - HYPERCALL(sysctl), - HYPERCALL(domctl), HYPERCALL(xenpmu_op), [ __HYPERVISOR_arch_1 ] = (hvm_hypercall_t *)paging_domctl_continuation }; @@ -5269,9 +5232,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) if ( (eax & 0x80000000) && is_viridian_domain(currd) ) return viridian_hypercall(regs); - if ( (eax >= NR_hypercalls) || - !(is_pvh_domain(currd) ? pvh_hypercall32_table[eax] - : hvm_hypercall32_table[eax]) ) + if ( (eax >= NR_hypercalls) || !hvm_hypercall32_table[eax] ) { regs->eax = -ENOSYS; return HVM_HCALL_completed; @@ -5305,9 +5266,8 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) #endif curr->arch.hvm_vcpu.hcall_64bit = 1; - regs->rax = (is_pvh_domain(currd) - ? pvh_hypercall64_table - : hvm_hypercall64_table)[eax](rdi, rsi, rdx, r10, r8, r9); + regs->rax = hvm_hypercall64_table[eax](rdi, rsi, rdx, r10, r8, r9); + curr->arch.hvm_vcpu.hcall_64bit = 0; #ifndef NDEBUG @@ -5351,10 +5311,7 @@ int hvm_do_hypercall(struct cpu_user_regs *regs) } #endif - regs->_eax = (is_pvh_vcpu(curr) - ? pvh_hypercall32_table - : hvm_hypercall32_table)[eax](ebx, ecx, edx, - esi, edi, ebp); + regs->_eax = hvm_hypercall32_table[eax](ebx, ecx, edx, esi, edi, ebp); #ifndef NDEBUG if ( !curr->arch.hvm_vcpu.hcall_preempted ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index d33eb10..e6b2caf 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3008,6 +3008,12 @@ long do_mmuext_op( if ( (pg_owner = get_pg_owner(foreigndom)) == NULL ) return -ESRCH; + if ( !is_pv_domain(pg_owner) ) + { + put_pg_owner(pg_owner); + return -EINVAL; + } + rc = xsm_mmuext_op(XSM_TARGET, d, pg_owner); if ( rc ) { @@ -3030,6 +3036,23 @@ long do_mmuext_op( break; } + if ( has_hvm_container_domain(d) ) + { + switch ( op.cmd ) + { + case MMUEXT_PIN_L1_TABLE: + case MMUEXT_PIN_L2_TABLE: + case MMUEXT_PIN_L3_TABLE: + case MMUEXT_PIN_L4_TABLE: + case MMUEXT_UNPIN_TABLE: + break; + default: + MEM_LOG("Invalid extended pt command %#x", op.cmd); + rc = -EOPNOTSUPP; + goto done; + } + } + okay = 1; switch ( op.cmd ) @@ -3459,6 +3482,7 @@ long do_mmuext_op( break; } + done: if ( unlikely(!okay) && !rc ) rc = -EINVAL; if ( unlikely(rc) ) diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c index 178e42d..58be8ad 100644 --- a/xen/arch/x86/x86_64/compat/mm.c +++ b/xen/arch/x86/x86_64/compat/mm.c @@ -215,13 +215,15 @@ int compat_update_va_mapping_otherdomain(unsigned long va, u32 lo, u32 hi, DEFINE_XEN_GUEST_HANDLE(mmuext_op_compat_t); -int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops, +int compat_mmuext_op(XEN_GUEST_HANDLE_PARAM(void) arg, unsigned int count, XEN_GUEST_HANDLE_PARAM(uint) pdone, unsigned int foreigndom) { unsigned int i, preempt_mask; int rc = 0; + XEN_GUEST_HANDLE_PARAM(mmuext_op_compat_t) cmp_uops = + guest_handle_cast(arg, mmuext_op_compat_t); XEN_GUEST_HANDLE_PARAM(mmuext_op_t) nat_ops; if ( unlikely(count == MMU_UPDATE_PREEMPTED) && diff --git a/xen/include/asm-x86/hypercall.h b/xen/include/asm-x86/hypercall.h index afa8ba9..945d58a 100644 --- a/xen/include/asm-x86/hypercall.h +++ b/xen/include/asm-x86/hypercall.h @@ -110,4 +110,13 @@ extern int arch_compat_vcpu_op( int cmd, struct vcpu *v, XEN_GUEST_HANDLE_PARAM(void) arg); +extern int compat_mmuext_op( + XEN_GUEST_HANDLE_PARAM(void) arg, + unsigned int count, + XEN_GUEST_HANDLE_PARAM(uint) pdone, + unsigned int foreigndom); + +extern int compat_platform_op( + XEN_GUEST_HANDLE_PARAM(void) u_xenpf_op); + #endif /* __ASM_X86_HYPERCALL_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:32:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcyj-0007P0-7C; Wed, 23 Dec 2015 06:32:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyi-0007Om-7K for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:52 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id BB/64-31122-3104A765; Wed, 23 Dec 2015 06:32:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450852370!2420034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17668 invoked from network); 23 Dec 2015 06:32:51 -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; 23 Dec 2015 06:32:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyg-0000y7-99 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyg-0007fs-5T for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:50 +0000 Date: Wed, 23 Dec 2015 06:32:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make debug output consistent in hvm_set_callback_via X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c1048565ba5b240f47203bdb67572bee73d639e Author: Malcolm Crossley AuthorDate: Mon Dec 21 13:40:48 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:40:48 2015 +0100 x86: make debug output consistent in hvm_set_callback_via The unconditional printks in the switch statement of the hvm_set_callback_via function results in Xen log spam in non debug versions of Xen. The printks are for debug output only so conditionally compile the entire switch statement on debug versions of Xen only. This is XSA-169. Signed-off-by: Malcolm Crossley Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/hvm/irq.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 0f3ab6c..5323d7c 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -386,7 +386,8 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) spin_unlock(&d->arch.hvm_domain.irq_lock); - dprintk(XENLOG_G_INFO, "Dom%u callback via changed to ", d->domain_id); +#ifndef NDEBUG + printk(XENLOG_G_INFO "Dom%u callback via changed to ", d->domain_id); switch ( via_type ) { case HVMIRQ_callback_gsi: @@ -402,6 +403,7 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) printk("None\n"); break; } +#endif } struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:32:53 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:32: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 1aBcyj-0007P0-7C; Wed, 23 Dec 2015 06:32:53 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyi-0007Om-7K for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:52 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id BB/64-31122-3104A765; Wed, 23 Dec 2015 06:32:51 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450852370!2420034!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17668 invoked from network); 23 Dec 2015 06:32:51 -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; 23 Dec 2015 06:32:51 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyg-0000y7-99 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:50 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyg-0007fs-5T for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:32:50 +0000 Date: Wed, 23 Dec 2015 06:32:50 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86: make debug output consistent in hvm_set_callback_via X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 5c1048565ba5b240f47203bdb67572bee73d639e Author: Malcolm Crossley AuthorDate: Mon Dec 21 13:40:48 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 13:40:48 2015 +0100 x86: make debug output consistent in hvm_set_callback_via The unconditional printks in the switch statement of the hvm_set_callback_via function results in Xen log spam in non debug versions of Xen. The printks are for debug output only so conditionally compile the entire switch statement on debug versions of Xen only. This is XSA-169. Signed-off-by: Malcolm Crossley Reviewed-by: Jan Beulich Acked-by: Ian Campbell --- xen/arch/x86/hvm/irq.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c index 0f3ab6c..5323d7c 100644 --- a/xen/arch/x86/hvm/irq.c +++ b/xen/arch/x86/hvm/irq.c @@ -386,7 +386,8 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) spin_unlock(&d->arch.hvm_domain.irq_lock); - dprintk(XENLOG_G_INFO, "Dom%u callback via changed to ", d->domain_id); +#ifndef NDEBUG + printk(XENLOG_G_INFO "Dom%u callback via changed to ", d->domain_id); switch ( via_type ) { case HVMIRQ_callback_gsi: @@ -402,6 +403,7 @@ void hvm_set_callback_via(struct domain *d, uint64_t via) printk("None\n"); break; } +#endif } struct hvm_intack hvm_vcpu_has_pending_irq(struct vcpu *v) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:33:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33: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 1aBcyu-0007RQ-GJ; Wed, 23 Dec 2015 06:33:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyt-0007RF-HG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:03 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 13/08-21901-E104A765; Wed, 23 Dec 2015 06:33:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450852380!12110636!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19679 invoked from network); 23 Dec 2015 06:33:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyq-0000yI-Ok for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyq-0007gy-Lu for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:00 +0000 Date: Wed, 23 Dec 2015 06:33:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PCI: intercept accesses to RO MMIO from dom0s in HVM containers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33c19df9a5a097ad47c4e97dccc2aa3afa4b381d Author: Boris Ostrovsky AuthorDate: Mon Dec 21 14:05:02 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 14:05:02 2015 +0100 x86/PCI: intercept accesses to RO MMIO from dom0s in HVM containers Commit 9256f66c1606 ("x86/PCI: intercept all PV Dom0 MMCFG writes") added intercepts for writes to RO MMCFG space from PV dom0. Similar functionality, including access to RO non-MMCFG addresses, is needed by dom0s in HVM containers (such as PVH and, in the future, HVMlite). Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 46 +++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 8 ++++ xen/arch/x86/mm.c | 58 ++++++++++--------------------- xen/arch/x86/x86_64/mmconfig_64.c | 10 +++++ xen/arch/x86/x86_emulate/x86_emulate.c | 10 +++++ xen/arch/x86/x86_emulate/x86_emulate.h | 12 ++++++ xen/include/asm-x86/hvm/emulate.h | 1 + xen/include/asm-x86/mm.h | 17 +++++++++ xen/include/asm-x86/pci.h | 3 ++ 9 files changed, 126 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index e1017b5..f5dd1f8 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1778,6 +1778,52 @@ int hvm_emulate_one_no_write( return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops_no_write); } +int hvm_emulate_one_mmio(unsigned long mfn, unsigned long gla) +{ + static const struct x86_emulate_ops hvm_intercept_ops_mmcfg = { + .read = x86emul_unhandleable_rw, + .insn_fetch = hvmemul_insn_fetch, + .write = mmcfg_intercept_write, + }; + static const struct x86_emulate_ops hvm_ro_emulate_ops_mmio = { + .read = x86emul_unhandleable_rw, + .insn_fetch = hvmemul_insn_fetch, + .write = mmio_ro_emulated_write + }; + struct mmio_ro_emulate_ctxt mmio_ro_ctxt = { .cr2 = gla }; + struct hvm_emulate_ctxt ctxt; + const struct x86_emulate_ops *ops; + unsigned int seg, bdf; + int rc; + + if ( pci_ro_mmcfg_decode(mfn, &seg, &bdf) ) + { + mmio_ro_ctxt.seg = seg; + mmio_ro_ctxt.bdf = bdf; + ops = &hvm_intercept_ops_mmcfg; + } + else + ops = &hvm_ro_emulate_ops_mmio; + + hvm_emulate_prepare(&ctxt, guest_cpu_user_regs()); + ctxt.ctxt.data = &mmio_ro_ctxt; + rc = _hvm_emulate_one(&ctxt, ops); + switch ( rc ) + { + case X86EMUL_UNHANDLEABLE: + hvm_dump_emulation_state(XENLOG_G_WARNING "MMCFG", &ctxt); + break; + case X86EMUL_EXCEPTION: + if ( ctxt.exn_pending ) + hvm_inject_trap(&ctxt.trap); + /* fallthrough */ + default: + hvm_emulate_writeback(&ctxt); + } + + return rc; +} + void hvm_mem_access_emulate_one(enum emul_kind kind, unsigned int trapnr, unsigned int errcode) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index dcda70a..637d9a9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3115,6 +3115,14 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, goto out_put_gfn; } + if ( (p2mt == p2m_mmio_direct) && is_hardware_domain(currd) && + npfec.write_access && npfec.present && + (hvm_emulate_one_mmio(mfn_x(mfn), gla) == X86EMUL_OKAY) ) + { + rc = 1; + goto out_put_gfn; + } + /* If we fell through, the vcpu will retry now that access restrictions have * been removed. It may fault again if the p2m entry type still requires so. * Otherwise, this is an error condition. */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e6b2caf..717546a 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5278,31 +5278,14 @@ int ptwr_do_page_fault(struct vcpu *v, unsigned long addr, * fault handling for read-only MMIO pages */ -struct mmio_ro_emulate_ctxt { - struct x86_emulate_ctxt ctxt; - unsigned long cr2; - unsigned int seg, bdf; -}; - -static int mmio_ro_emulated_read( - enum x86_segment seg, - unsigned long offset, - void *p_data, - unsigned int bytes, - struct x86_emulate_ctxt *ctxt) -{ - return X86EMUL_UNHANDLEABLE; -} - -static int mmio_ro_emulated_write( +int mmio_ro_emulated_write( enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { - struct mmio_ro_emulate_ctxt *mmio_ro_ctxt = - container_of(ctxt, struct mmio_ro_emulate_ctxt, ctxt); + struct mmio_ro_emulate_ctxt *mmio_ro_ctxt = ctxt->data; /* Only allow naturally-aligned stores at the original %cr2 address. */ if ( ((bytes | offset) & (bytes - 1)) || offset != mmio_ro_ctxt->cr2 ) @@ -5316,20 +5299,19 @@ static int mmio_ro_emulated_write( } static const struct x86_emulate_ops mmio_ro_emulate_ops = { - .read = mmio_ro_emulated_read, + .read = x86emul_unhandleable_rw, .insn_fetch = ptwr_emulated_read, .write = mmio_ro_emulated_write, }; -static int mmio_intercept_write( +int mmcfg_intercept_write( enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { - struct mmio_ro_emulate_ctxt *mmio_ctxt = - container_of(ctxt, struct mmio_ro_emulate_ctxt, ctxt); + struct mmio_ro_emulate_ctxt *mmio_ctxt = ctxt->data; /* * Only allow naturally-aligned stores no wider than 4 bytes to the @@ -5338,7 +5320,7 @@ static int mmio_intercept_write( if ( ((bytes | offset) & (bytes - 1)) || bytes > 4 || offset != mmio_ctxt->cr2 ) { - MEM_LOG("mmio_intercept: bad write (cr2=%lx, addr=%lx, bytes=%u)", + MEM_LOG("mmcfg_intercept: bad write (cr2=%lx, addr=%lx, bytes=%u)", mmio_ctxt->cr2, offset, bytes); return X86EMUL_UNHANDLEABLE; } @@ -5353,10 +5335,10 @@ static int mmio_intercept_write( return X86EMUL_OKAY; } -static const struct x86_emulate_ops mmio_intercept_ops = { - .read = mmio_ro_emulated_read, +static const struct x86_emulate_ops mmcfg_intercept_ops = { + .read = x86emul_unhandleable_rw, .insn_fetch = ptwr_emulated_read, - .write = mmio_intercept_write, + .write = mmcfg_intercept_write, }; /* Check if guest is trying to modify a r/o MMIO page. */ @@ -5366,14 +5348,14 @@ int mmio_ro_do_page_fault(struct vcpu *v, unsigned long addr, l1_pgentry_t pte; unsigned long mfn; unsigned int addr_size = is_pv_32bit_vcpu(v) ? 32 : BITS_PER_LONG; - struct mmio_ro_emulate_ctxt mmio_ro_ctxt = { - .ctxt.regs = regs, - .ctxt.addr_size = addr_size, - .ctxt.sp_size = addr_size, - .ctxt.swint_emulate = x86_swint_emulate_none, - .cr2 = addr + struct mmio_ro_emulate_ctxt mmio_ro_ctxt = { .cr2 = addr }; + struct x86_emulate_ctxt ctxt = { + .regs = regs, + .addr_size = addr_size, + .sp_size = addr_size, + .swint_emulate = x86_swint_emulate_none, + .data = &mmio_ro_ctxt }; - const unsigned long *ro_map; int rc; /* Attempt to read the PTE that maps the VA being accessed. */ @@ -5398,12 +5380,10 @@ int mmio_ro_do_page_fault(struct vcpu *v, unsigned long addr, if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn) ) return 0; - if ( pci_mmcfg_decode(mfn, &mmio_ro_ctxt.seg, &mmio_ro_ctxt.bdf) && - ((ro_map = pci_get_ro_map(mmio_ro_ctxt.seg)) == NULL || - !test_bit(mmio_ro_ctxt.bdf, ro_map)) ) - rc = x86_emulate(&mmio_ro_ctxt.ctxt, &mmio_intercept_ops); + if ( pci_ro_mmcfg_decode(mfn, &mmio_ro_ctxt.seg, &mmio_ro_ctxt.bdf) ) + rc = x86_emulate(&ctxt, &mmcfg_intercept_ops); else - rc = x86_emulate(&mmio_ro_ctxt.ctxt, &mmio_ro_emulate_ops); + rc = x86_emulate(&ctxt, &mmio_ro_emulate_ops); return rc != X86EMUL_UNHANDLEABLE ? EXCRET_fault_fixed : 0; } diff --git a/xen/arch/x86/x86_64/mmconfig_64.c b/xen/arch/x86/x86_64/mmconfig_64.c index 1f9a996..7618d67 100644 --- a/xen/arch/x86/x86_64/mmconfig_64.c +++ b/xen/arch/x86/x86_64/mmconfig_64.c @@ -198,6 +198,16 @@ bool_t pci_mmcfg_decode(unsigned long mfn, unsigned int *seg, return 0; } +bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg, + unsigned int *bdf) +{ + const unsigned long *ro_map; + + return pci_mmcfg_decode(mfn, seg, bdf) && + ((ro_map = pci_get_ro_map(*seg)) == NULL || + !test_bit(*bdf, ro_map)); +} + int __init pci_mmcfg_arch_init(void) { int i; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index f1454ce..56aef3e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1444,6 +1444,16 @@ static int inject_swint(enum x86_swint_type type, return ops->inject_hw_exception(fault_type, error_code, ctxt); } +int x86emul_unhandleable_rw( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_UNHANDLEABLE; +} + int x86_emulate( struct x86_emulate_ctxt *ctxt, diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index cfac09b..9e4bca9 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -430,6 +430,9 @@ struct x86_emulate_ctxt } flags; uint8_t byte; } retire; + + /* Caller data that can be used by x86_emulate_ops' routines. */ + void *data; }; struct x86_emulate_stub { @@ -463,4 +466,13 @@ void * decode_register( uint8_t modrm_reg, struct cpu_user_regs *regs, int highbyte_regs); +/* Unhandleable read, write or instruction fetch */ +int +x86emul_unhandleable_rw( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt); + #endif /* __X86_EMULATE_H__ */ diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 49134b5..142d1b6 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -57,6 +57,7 @@ void hvm_emulate_writeback( struct segment_register *hvmemul_get_seg_reg( enum x86_segment seg, struct hvm_emulate_ctxt *hvmemul_ctxt); +int hvm_emulate_one_mmio(unsigned long mfn, unsigned long gla); int hvmemul_do_pio_buffer(uint16_t port, unsigned int size, diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 1f5e335..de3f973 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -7,6 +7,7 @@ #include #include #include +#include /* * Per-page-frame information. @@ -489,6 +490,22 @@ void memguard_unguard_range(void *p, unsigned long l); void memguard_guard_stack(void *p); void memguard_unguard_stack(void *p); +struct mmio_ro_emulate_ctxt { + unsigned long cr2; + unsigned int seg, bdf; +}; + +extern int mmio_ro_emulated_write(enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt); +extern int mmcfg_intercept_write(enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt); + int ptwr_do_page_fault(struct vcpu *, unsigned long, struct cpu_user_regs *); int mmio_ro_do_page_fault(struct vcpu *, unsigned long, diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index 38ace79..36801d3 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -23,4 +23,7 @@ int pci_msi_conf_write_intercept(struct pci_dev *, unsigned int reg, bool_t pci_mmcfg_decode(unsigned long mfn, unsigned int *seg, unsigned int *bdf); +bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg, + unsigned int *bdf); + #endif /* __X86_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:33:04 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33: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 1aBcyu-0007RQ-GJ; Wed, 23 Dec 2015 06:33:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyt-0007RF-HG for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:03 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id 13/08-21901-E104A765; Wed, 23 Dec 2015 06:33:02 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1450852380!12110636!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19679 invoked from network); 23 Dec 2015 06:33:01 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-206.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:01 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcyq-0000yI-Ok for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:00 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcyq-0007gy-Lu for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:00 +0000 Date: Wed, 23 Dec 2015 06:33:00 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/PCI: intercept accesses to RO MMIO from dom0s in HVM containers X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 33c19df9a5a097ad47c4e97dccc2aa3afa4b381d Author: Boris Ostrovsky AuthorDate: Mon Dec 21 14:05:02 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 14:05:02 2015 +0100 x86/PCI: intercept accesses to RO MMIO from dom0s in HVM containers Commit 9256f66c1606 ("x86/PCI: intercept all PV Dom0 MMCFG writes") added intercepts for writes to RO MMCFG space from PV dom0. Similar functionality, including access to RO non-MMCFG addresses, is needed by dom0s in HVM containers (such as PVH and, in the future, HVMlite). Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/emulate.c | 46 +++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 8 ++++ xen/arch/x86/mm.c | 58 ++++++++++--------------------- xen/arch/x86/x86_64/mmconfig_64.c | 10 +++++ xen/arch/x86/x86_emulate/x86_emulate.c | 10 +++++ xen/arch/x86/x86_emulate/x86_emulate.h | 12 ++++++ xen/include/asm-x86/hvm/emulate.h | 1 + xen/include/asm-x86/mm.h | 17 +++++++++ xen/include/asm-x86/pci.h | 3 ++ 9 files changed, 126 insertions(+), 39 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index e1017b5..f5dd1f8 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1778,6 +1778,52 @@ int hvm_emulate_one_no_write( return _hvm_emulate_one(hvmemul_ctxt, &hvm_emulate_ops_no_write); } +int hvm_emulate_one_mmio(unsigned long mfn, unsigned long gla) +{ + static const struct x86_emulate_ops hvm_intercept_ops_mmcfg = { + .read = x86emul_unhandleable_rw, + .insn_fetch = hvmemul_insn_fetch, + .write = mmcfg_intercept_write, + }; + static const struct x86_emulate_ops hvm_ro_emulate_ops_mmio = { + .read = x86emul_unhandleable_rw, + .insn_fetch = hvmemul_insn_fetch, + .write = mmio_ro_emulated_write + }; + struct mmio_ro_emulate_ctxt mmio_ro_ctxt = { .cr2 = gla }; + struct hvm_emulate_ctxt ctxt; + const struct x86_emulate_ops *ops; + unsigned int seg, bdf; + int rc; + + if ( pci_ro_mmcfg_decode(mfn, &seg, &bdf) ) + { + mmio_ro_ctxt.seg = seg; + mmio_ro_ctxt.bdf = bdf; + ops = &hvm_intercept_ops_mmcfg; + } + else + ops = &hvm_ro_emulate_ops_mmio; + + hvm_emulate_prepare(&ctxt, guest_cpu_user_regs()); + ctxt.ctxt.data = &mmio_ro_ctxt; + rc = _hvm_emulate_one(&ctxt, ops); + switch ( rc ) + { + case X86EMUL_UNHANDLEABLE: + hvm_dump_emulation_state(XENLOG_G_WARNING "MMCFG", &ctxt); + break; + case X86EMUL_EXCEPTION: + if ( ctxt.exn_pending ) + hvm_inject_trap(&ctxt.trap); + /* fallthrough */ + default: + hvm_emulate_writeback(&ctxt); + } + + return rc; +} + void hvm_mem_access_emulate_one(enum emul_kind kind, unsigned int trapnr, unsigned int errcode) { diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index dcda70a..637d9a9 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -3115,6 +3115,14 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, goto out_put_gfn; } + if ( (p2mt == p2m_mmio_direct) && is_hardware_domain(currd) && + npfec.write_access && npfec.present && + (hvm_emulate_one_mmio(mfn_x(mfn), gla) == X86EMUL_OKAY) ) + { + rc = 1; + goto out_put_gfn; + } + /* If we fell through, the vcpu will retry now that access restrictions have * been removed. It may fault again if the p2m entry type still requires so. * Otherwise, this is an error condition. */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e6b2caf..717546a 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5278,31 +5278,14 @@ int ptwr_do_page_fault(struct vcpu *v, unsigned long addr, * fault handling for read-only MMIO pages */ -struct mmio_ro_emulate_ctxt { - struct x86_emulate_ctxt ctxt; - unsigned long cr2; - unsigned int seg, bdf; -}; - -static int mmio_ro_emulated_read( - enum x86_segment seg, - unsigned long offset, - void *p_data, - unsigned int bytes, - struct x86_emulate_ctxt *ctxt) -{ - return X86EMUL_UNHANDLEABLE; -} - -static int mmio_ro_emulated_write( +int mmio_ro_emulated_write( enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { - struct mmio_ro_emulate_ctxt *mmio_ro_ctxt = - container_of(ctxt, struct mmio_ro_emulate_ctxt, ctxt); + struct mmio_ro_emulate_ctxt *mmio_ro_ctxt = ctxt->data; /* Only allow naturally-aligned stores at the original %cr2 address. */ if ( ((bytes | offset) & (bytes - 1)) || offset != mmio_ro_ctxt->cr2 ) @@ -5316,20 +5299,19 @@ static int mmio_ro_emulated_write( } static const struct x86_emulate_ops mmio_ro_emulate_ops = { - .read = mmio_ro_emulated_read, + .read = x86emul_unhandleable_rw, .insn_fetch = ptwr_emulated_read, .write = mmio_ro_emulated_write, }; -static int mmio_intercept_write( +int mmcfg_intercept_write( enum x86_segment seg, unsigned long offset, void *p_data, unsigned int bytes, struct x86_emulate_ctxt *ctxt) { - struct mmio_ro_emulate_ctxt *mmio_ctxt = - container_of(ctxt, struct mmio_ro_emulate_ctxt, ctxt); + struct mmio_ro_emulate_ctxt *mmio_ctxt = ctxt->data; /* * Only allow naturally-aligned stores no wider than 4 bytes to the @@ -5338,7 +5320,7 @@ static int mmio_intercept_write( if ( ((bytes | offset) & (bytes - 1)) || bytes > 4 || offset != mmio_ctxt->cr2 ) { - MEM_LOG("mmio_intercept: bad write (cr2=%lx, addr=%lx, bytes=%u)", + MEM_LOG("mmcfg_intercept: bad write (cr2=%lx, addr=%lx, bytes=%u)", mmio_ctxt->cr2, offset, bytes); return X86EMUL_UNHANDLEABLE; } @@ -5353,10 +5335,10 @@ static int mmio_intercept_write( return X86EMUL_OKAY; } -static const struct x86_emulate_ops mmio_intercept_ops = { - .read = mmio_ro_emulated_read, +static const struct x86_emulate_ops mmcfg_intercept_ops = { + .read = x86emul_unhandleable_rw, .insn_fetch = ptwr_emulated_read, - .write = mmio_intercept_write, + .write = mmcfg_intercept_write, }; /* Check if guest is trying to modify a r/o MMIO page. */ @@ -5366,14 +5348,14 @@ int mmio_ro_do_page_fault(struct vcpu *v, unsigned long addr, l1_pgentry_t pte; unsigned long mfn; unsigned int addr_size = is_pv_32bit_vcpu(v) ? 32 : BITS_PER_LONG; - struct mmio_ro_emulate_ctxt mmio_ro_ctxt = { - .ctxt.regs = regs, - .ctxt.addr_size = addr_size, - .ctxt.sp_size = addr_size, - .ctxt.swint_emulate = x86_swint_emulate_none, - .cr2 = addr + struct mmio_ro_emulate_ctxt mmio_ro_ctxt = { .cr2 = addr }; + struct x86_emulate_ctxt ctxt = { + .regs = regs, + .addr_size = addr_size, + .sp_size = addr_size, + .swint_emulate = x86_swint_emulate_none, + .data = &mmio_ro_ctxt }; - const unsigned long *ro_map; int rc; /* Attempt to read the PTE that maps the VA being accessed. */ @@ -5398,12 +5380,10 @@ int mmio_ro_do_page_fault(struct vcpu *v, unsigned long addr, if ( !rangeset_contains_singleton(mmio_ro_ranges, mfn) ) return 0; - if ( pci_mmcfg_decode(mfn, &mmio_ro_ctxt.seg, &mmio_ro_ctxt.bdf) && - ((ro_map = pci_get_ro_map(mmio_ro_ctxt.seg)) == NULL || - !test_bit(mmio_ro_ctxt.bdf, ro_map)) ) - rc = x86_emulate(&mmio_ro_ctxt.ctxt, &mmio_intercept_ops); + if ( pci_ro_mmcfg_decode(mfn, &mmio_ro_ctxt.seg, &mmio_ro_ctxt.bdf) ) + rc = x86_emulate(&ctxt, &mmcfg_intercept_ops); else - rc = x86_emulate(&mmio_ro_ctxt.ctxt, &mmio_ro_emulate_ops); + rc = x86_emulate(&ctxt, &mmio_ro_emulate_ops); return rc != X86EMUL_UNHANDLEABLE ? EXCRET_fault_fixed : 0; } diff --git a/xen/arch/x86/x86_64/mmconfig_64.c b/xen/arch/x86/x86_64/mmconfig_64.c index 1f9a996..7618d67 100644 --- a/xen/arch/x86/x86_64/mmconfig_64.c +++ b/xen/arch/x86/x86_64/mmconfig_64.c @@ -198,6 +198,16 @@ bool_t pci_mmcfg_decode(unsigned long mfn, unsigned int *seg, return 0; } +bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg, + unsigned int *bdf) +{ + const unsigned long *ro_map; + + return pci_mmcfg_decode(mfn, seg, bdf) && + ((ro_map = pci_get_ro_map(*seg)) == NULL || + !test_bit(*bdf, ro_map)); +} + int __init pci_mmcfg_arch_init(void) { int i; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index f1454ce..56aef3e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1444,6 +1444,16 @@ static int inject_swint(enum x86_swint_type type, return ops->inject_hw_exception(fault_type, error_code, ctxt); } +int x86emul_unhandleable_rw( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt) +{ + return X86EMUL_UNHANDLEABLE; +} + int x86_emulate( struct x86_emulate_ctxt *ctxt, diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index cfac09b..9e4bca9 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -430,6 +430,9 @@ struct x86_emulate_ctxt } flags; uint8_t byte; } retire; + + /* Caller data that can be used by x86_emulate_ops' routines. */ + void *data; }; struct x86_emulate_stub { @@ -463,4 +466,13 @@ void * decode_register( uint8_t modrm_reg, struct cpu_user_regs *regs, int highbyte_regs); +/* Unhandleable read, write or instruction fetch */ +int +x86emul_unhandleable_rw( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt); + #endif /* __X86_EMULATE_H__ */ diff --git a/xen/include/asm-x86/hvm/emulate.h b/xen/include/asm-x86/hvm/emulate.h index 49134b5..142d1b6 100644 --- a/xen/include/asm-x86/hvm/emulate.h +++ b/xen/include/asm-x86/hvm/emulate.h @@ -57,6 +57,7 @@ void hvm_emulate_writeback( struct segment_register *hvmemul_get_seg_reg( enum x86_segment seg, struct hvm_emulate_ctxt *hvmemul_ctxt); +int hvm_emulate_one_mmio(unsigned long mfn, unsigned long gla); int hvmemul_do_pio_buffer(uint16_t port, unsigned int size, diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 1f5e335..de3f973 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -7,6 +7,7 @@ #include #include #include +#include /* * Per-page-frame information. @@ -489,6 +490,22 @@ void memguard_unguard_range(void *p, unsigned long l); void memguard_guard_stack(void *p); void memguard_unguard_stack(void *p); +struct mmio_ro_emulate_ctxt { + unsigned long cr2; + unsigned int seg, bdf; +}; + +extern int mmio_ro_emulated_write(enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt); +extern int mmcfg_intercept_write(enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt); + int ptwr_do_page_fault(struct vcpu *, unsigned long, struct cpu_user_regs *); int mmio_ro_do_page_fault(struct vcpu *, unsigned long, diff --git a/xen/include/asm-x86/pci.h b/xen/include/asm-x86/pci.h index 38ace79..36801d3 100644 --- a/xen/include/asm-x86/pci.h +++ b/xen/include/asm-x86/pci.h @@ -23,4 +23,7 @@ int pci_msi_conf_write_intercept(struct pci_dev *, unsigned int reg, bool_t pci_mmcfg_decode(unsigned long mfn, unsigned int *seg, unsigned int *bdf); +bool_t pci_ro_mmcfg_decode(unsigned long mfn, unsigned int *seg, + unsigned int *bdf); + #endif /* __X86_PCI_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:33:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06: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 1aBcz4-0007Sw-M8; Wed, 23 Dec 2015 06:33:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcz3-0007Si-66 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:13 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 21/EC-21571-8204A765; Wed, 23 Dec 2015 06:33:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450852391!2420074!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19107 invoked from network); 23 Dec 2015 06:33:11 -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; 23 Dec 2015 06:33:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcz1-0000yz-1b for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcz0-0007hb-W6 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:11 +0000 Date: Wed, 23 Dec 2015 06:33:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: remove identical relationship between ioreq type and rangeset type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2b84f09ec8d0602d90cc437b4accea31c6d69ca Author: Yu Zhang AuthorDate: Mon Dec 21 17:07:55 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:07:55 2015 +0100 x86/HVM: remove identical relationship between ioreq type and rangeset type This patch uses HVMOP_IO_RANGE_XXX values rather than the raw ioreq type to select the ioreq server, therefore the identical relationship between ioreq type and rangeset type is no longer necessary. Signed-off-by: Yu Zhang Signed-off-by: Shuai Ruan Reviewed-by: Paul Durrant Acked-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/hvm.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 637d9a9..8c10d8e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2571,7 +2571,7 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, PCI_SLOT(CF8_BDF(cf8)), PCI_FUNC(CF8_BDF(cf8))); - type = IOREQ_TYPE_PCI_CONFIG; + type = HVMOP_IO_RANGE_PCI; addr = ((uint64_t)sbdf << 32) | CF8_ADDR_LO(cf8) | (p->addr & 3); @@ -2589,7 +2589,8 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, } else { - type = p->type; + type = (p->type == IOREQ_TYPE_PIO) ? + HVMOP_IO_RANGE_PORT : HVMOP_IO_RANGE_MEMORY; addr = p->addr; } @@ -2605,31 +2606,28 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, if ( !s->enabled ) continue; - BUILD_BUG_ON(IOREQ_TYPE_PIO != HVMOP_IO_RANGE_PORT); - BUILD_BUG_ON(IOREQ_TYPE_COPY != HVMOP_IO_RANGE_MEMORY); - BUILD_BUG_ON(IOREQ_TYPE_PCI_CONFIG != HVMOP_IO_RANGE_PCI); r = s->range[type]; switch ( type ) { unsigned long end; - case IOREQ_TYPE_PIO: + case HVMOP_IO_RANGE_PORT: end = addr + p->size - 1; if ( rangeset_contains_range(r, addr, end) ) return s; break; - case IOREQ_TYPE_COPY: + case HVMOP_IO_RANGE_MEMORY: end = addr + (p->size * p->count) - 1; if ( rangeset_contains_range(r, addr, end) ) return s; break; - case IOREQ_TYPE_PCI_CONFIG: + case HVMOP_IO_RANGE_PCI: if ( rangeset_contains_singleton(r, addr >> 32) ) { - p->type = type; + p->type = IOREQ_TYPE_PCI_CONFIG; p->addr = addr; return s; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:33:14 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06: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 1aBcz4-0007Sw-M8; Wed, 23 Dec 2015 06:33:14 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcz3-0007Si-66 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:13 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 21/EC-21571-8204A765; Wed, 23 Dec 2015 06:33:12 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1450852391!2420074!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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19107 invoked from network); 23 Dec 2015 06:33:11 -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; 23 Dec 2015 06:33:11 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBcz1-0000yz-1b for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:11 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBcz0-0007hb-W6 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:11 +0000 Date: Wed, 23 Dec 2015 06:33:10 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/HVM: remove identical relationship between ioreq type and rangeset type X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit e2b84f09ec8d0602d90cc437b4accea31c6d69ca Author: Yu Zhang AuthorDate: Mon Dec 21 17:07:55 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:07:55 2015 +0100 x86/HVM: remove identical relationship between ioreq type and rangeset type This patch uses HVMOP_IO_RANGE_XXX values rather than the raw ioreq type to select the ioreq server, therefore the identical relationship between ioreq type and rangeset type is no longer necessary. Signed-off-by: Yu Zhang Signed-off-by: Shuai Ruan Reviewed-by: Paul Durrant Acked-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/hvm.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 637d9a9..8c10d8e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2571,7 +2571,7 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, PCI_SLOT(CF8_BDF(cf8)), PCI_FUNC(CF8_BDF(cf8))); - type = IOREQ_TYPE_PCI_CONFIG; + type = HVMOP_IO_RANGE_PCI; addr = ((uint64_t)sbdf << 32) | CF8_ADDR_LO(cf8) | (p->addr & 3); @@ -2589,7 +2589,8 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, } else { - type = p->type; + type = (p->type == IOREQ_TYPE_PIO) ? + HVMOP_IO_RANGE_PORT : HVMOP_IO_RANGE_MEMORY; addr = p->addr; } @@ -2605,31 +2606,28 @@ struct hvm_ioreq_server *hvm_select_ioreq_server(struct domain *d, if ( !s->enabled ) continue; - BUILD_BUG_ON(IOREQ_TYPE_PIO != HVMOP_IO_RANGE_PORT); - BUILD_BUG_ON(IOREQ_TYPE_COPY != HVMOP_IO_RANGE_MEMORY); - BUILD_BUG_ON(IOREQ_TYPE_PCI_CONFIG != HVMOP_IO_RANGE_PCI); r = s->range[type]; switch ( type ) { unsigned long end; - case IOREQ_TYPE_PIO: + case HVMOP_IO_RANGE_PORT: end = addr + p->size - 1; if ( rangeset_contains_range(r, addr, end) ) return s; break; - case IOREQ_TYPE_COPY: + case HVMOP_IO_RANGE_MEMORY: end = addr + (p->size * p->count) - 1; if ( rangeset_contains_range(r, addr, end) ) return s; break; - case IOREQ_TYPE_PCI_CONFIG: + case HVMOP_IO_RANGE_PCI: if ( rangeset_contains_singleton(r, addr >> 32) ) { - p->type = type; + p->type = IOREQ_TYPE_PCI_CONFIG; p->addr = addr; return s; } -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:33:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33: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 1aBczF-0007UT-Ql; Wed, 23 Dec 2015 06:33:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczE-0007UC-1J for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:24 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 88/40-31443-3304A765; Wed, 23 Dec 2015 06:33:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1450852401!12470051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35884 invoked from network); 23 Dec 2015 06:33:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:22 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczB-0000z7-CX for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczB-0007hx-9c for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:21 +0000 Date: Wed, 23 Dec 2015 06:33:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: a flag to enable Memory Protection Keys X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28cf7493488f030be144df8d039ef4c324b8bb61 Author: Huaitong Han AuthorDate: Mon Dec 21 17:09:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:09:09 2015 +0100 x86/hvm: a flag to enable Memory Protection Keys Signed-off-by: Huaitong Han Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 10 ++++++++++ xen/arch/x86/cpu/common.c | 10 +++++++++- xen/include/asm-x86/cpufeature.h | 6 +++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 3a10432..467dc8f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1188,6 +1188,16 @@ This option can be specified more than once (up to 8 times at present). ### ple\_window > `= ` +### pku +> `= ` + +> Default: `true` + +Flag to enable Memory Protection Keys. + +The protection-key feature provides an additional mechanism by which IA-32e +paging controls access to usermode addresses. + ### psr (Intel) > `= List of ( cmt: | rmid_max: | cat: | cos_max: | cdp: )` diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 536a691..335f044 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -22,6 +22,10 @@ boolean_param("xsave", use_xsave); bool_t opt_arat = 1; boolean_param("arat", opt_arat); +/* pku: Flag to enable Memory Protection Keys (default on). */ +static bool_t opt_pku = 1; +boolean_param("pku", opt_pku); + unsigned int opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); unsigned int opt_cpuid_mask_edx = ~0u; @@ -270,7 +274,8 @@ static void generic_identify(struct cpuinfo_x86 *c) if ( c->cpuid_level >= 0x00000007 ) cpuid_count(0x00000007, 0, &tmp, &c->x86_capability[cpufeat_word(X86_FEATURE_FSGSBASE)], - &tmp, &tmp); + &c->x86_capability[cpufeat_word(X86_FEATURE_PKU)], + &tmp); } /* @@ -323,6 +328,9 @@ void identify_cpu(struct cpuinfo_x86 *c) if ( cpu_has_xsave ) xstate_init(c); + if ( !opt_pku ) + setup_clear_cpu_cap(X86_FEATURE_PKU); + /* * The vendor-specific functions might have changed features. Now * we do "generic changes." diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index af127cf..ef96514 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -11,7 +11,7 @@ #include -#define NCAPINTS 8 /* N 32-bit words worth of info */ +#define NCAPINTS 9 /* N 32-bit words worth of info */ /* Intel-defined CPU features, CPUID level 0x00000001 (edx), word 0 */ #define X86_FEATURE_FPU (0*32+ 0) /* Onboard FPU */ @@ -163,6 +163,10 @@ #define X86_FEATURE_ADX (7*32+19) /* ADCX, ADOX instructions */ #define X86_FEATURE_SMAP (7*32+20) /* Supervisor Mode Access Prevention */ +/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 8 */ +#define X86_FEATURE_PKU (8*32+ 3) /* Protection Keys for Userspace */ +#define X86_FEATURE_OSPKE (8*32+ 4) /* OS Protection Keys Enable */ + #define cpufeat_word(idx) ((idx) / 32) #define cpufeat_bit(idx) ((idx) % 32) #define cpufeat_mask(idx) (_AC(1, U) << cpufeat_bit(idx)) -- generated by git-patchbot for /home/xen/git/xen.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 23 06:33:25 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33: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 1aBczF-0007UT-Ql; Wed, 23 Dec 2015 06:33:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczE-0007UC-1J for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:24 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 88/40-31443-3304A765; Wed, 23 Dec 2015 06:33:23 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-31.messagelabs.com!1450852401!12470051!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 35884 invoked from network); 23 Dec 2015 06:33:22 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:22 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczB-0000z7-CX for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:21 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczB-0007hx-9c for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:21 +0000 Date: Wed, 23 Dec 2015 06:33:21 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: a flag to enable Memory Protection Keys X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 28cf7493488f030be144df8d039ef4c324b8bb61 Author: Huaitong Han AuthorDate: Mon Dec 21 17:09:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:09:09 2015 +0100 x86/hvm: a flag to enable Memory Protection Keys Signed-off-by: Huaitong Han Reviewed-by: Andrew Cooper --- docs/misc/xen-command-line.markdown | 10 ++++++++++ xen/arch/x86/cpu/common.c | 10 +++++++++- xen/include/asm-x86/cpufeature.h | 6 +++++- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 3a10432..467dc8f 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -1188,6 +1188,16 @@ This option can be specified more than once (up to 8 times at present). ### ple\_window > `= ` +### pku +> `= ` + +> Default: `true` + +Flag to enable Memory Protection Keys. + +The protection-key feature provides an additional mechanism by which IA-32e +paging controls access to usermode addresses. + ### psr (Intel) > `= List of ( cmt: | rmid_max: | cat: | cos_max: | cdp: )` diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 536a691..335f044 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -22,6 +22,10 @@ boolean_param("xsave", use_xsave); bool_t opt_arat = 1; boolean_param("arat", opt_arat); +/* pku: Flag to enable Memory Protection Keys (default on). */ +static bool_t opt_pku = 1; +boolean_param("pku", opt_pku); + unsigned int opt_cpuid_mask_ecx = ~0u; integer_param("cpuid_mask_ecx", opt_cpuid_mask_ecx); unsigned int opt_cpuid_mask_edx = ~0u; @@ -270,7 +274,8 @@ static void generic_identify(struct cpuinfo_x86 *c) if ( c->cpuid_level >= 0x00000007 ) cpuid_count(0x00000007, 0, &tmp, &c->x86_capability[cpufeat_word(X86_FEATURE_FSGSBASE)], - &tmp, &tmp); + &c->x86_capability[cpufeat_word(X86_FEATURE_PKU)], + &tmp); } /* @@ -323,6 +328,9 @@ void identify_cpu(struct cpuinfo_x86 *c) if ( cpu_has_xsave ) xstate_init(c); + if ( !opt_pku ) + setup_clear_cpu_cap(X86_FEATURE_PKU); + /* * The vendor-specific functions might have changed features. Now * we do "generic changes." diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index af127cf..ef96514 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -11,7 +11,7 @@ #include -#define NCAPINTS 8 /* N 32-bit words worth of info */ +#define NCAPINTS 9 /* N 32-bit words worth of info */ /* Intel-defined CPU features, CPUID level 0x00000001 (edx), word 0 */ #define X86_FEATURE_FPU (0*32+ 0) /* Onboard FPU */ @@ -163,6 +163,10 @@ #define X86_FEATURE_ADX (7*32+19) /* ADCX, ADOX instructions */ #define X86_FEATURE_SMAP (7*32+20) /* Supervisor Mode Access Prevention */ +/* Intel-defined CPU features, CPUID level 0x00000007:0 (ecx), word 8 */ +#define X86_FEATURE_PKU (8*32+ 3) /* Protection Keys for Userspace */ +#define X86_FEATURE_OSPKE (8*32+ 4) /* OS Protection Keys Enable */ + #define cpufeat_word(idx) ((idx) / 32) #define cpufeat_bit(idx) ((idx) % 32) #define cpufeat_mask(idx) (_AC(1, U) << cpufeat_bit(idx)) -- generated by git-patchbot for /home/xen/git/xen.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 23 06:33:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczO-0007Vl-W0; Wed, 23 Dec 2015 06:33:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczN-0007VY-JO for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:33 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 5B/B4-31122-D304A765; Wed, 23 Dec 2015 06:33:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450852411!6800386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13615 invoked from network); 23 Dec 2015 06:33:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:32 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczL-0000zF-NC for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczL-0007iK-LT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:31 +0000 Date: Wed, 23 Dec 2015 06:33:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: add pkeys support when setting CR4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 673807ab5cd115fd5858d2ed162dd52a6fd9ab34 Author: Huaitong Han AuthorDate: Mon Dec 21 17:09:36 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:09:36 2015 +0100 x86/hvm: add pkeys support when setting CR4 Signed-off-by: Huaitong Han Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8c10d8e..21470ec 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1923,6 +1923,7 @@ unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v,bool_t restore) leaf1_edx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_VME)]; leaf1_ecx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_PCID)]; leaf7_0_ebx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_FSGSBASE)]; + leaf7_0_ecx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_PKU)]; } return ~(unsigned long) @@ -1958,7 +1959,9 @@ unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v,bool_t restore) (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMEP) ? X86_CR4_SMEP : 0) | (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMAP) ? - X86_CR4_SMAP : 0)); + X86_CR4_SMAP : 0) | + (leaf7_0_ecx & cpufeat_mask(X86_FEATURE_PKU) ? + X86_CR4_PKE : 0)); } static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:33:35 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczO-0007Vl-W0; Wed, 23 Dec 2015 06:33:34 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczN-0007VY-JO for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:33 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 5B/B4-31122-D304A765; Wed, 23 Dec 2015 06:33:33 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1450852411!6800386!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13615 invoked from network); 23 Dec 2015 06:33:32 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-8.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:32 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczL-0000zF-NC for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:31 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczL-0007iK-LT for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:31 +0000 Date: Wed, 23 Dec 2015 06:33:31 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] x86/hvm: add pkeys support when setting CR4 X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 673807ab5cd115fd5858d2ed162dd52a6fd9ab34 Author: Huaitong Han AuthorDate: Mon Dec 21 17:09:36 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:09:36 2015 +0100 x86/hvm: add pkeys support when setting CR4 Signed-off-by: Huaitong Han Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 8c10d8e..21470ec 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1923,6 +1923,7 @@ unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v,bool_t restore) leaf1_edx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_VME)]; leaf1_ecx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_PCID)]; leaf7_0_ebx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_FSGSBASE)]; + leaf7_0_ecx = boot_cpu_data.x86_capability[cpufeat_word(X86_FEATURE_PKU)]; } return ~(unsigned long) @@ -1958,7 +1959,9 @@ unsigned long hvm_cr4_guest_reserved_bits(const struct vcpu *v,bool_t restore) (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMEP) ? X86_CR4_SMEP : 0) | (leaf7_0_ebx & cpufeat_mask(X86_FEATURE_SMAP) ? - X86_CR4_SMAP : 0)); + X86_CR4_SMAP : 0) | + (leaf7_0_ecx & cpufeat_mask(X86_FEATURE_PKU) ? + X86_CR4_PKE : 0)); } static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog From xen-changelog-bounces@lists.xen.org Wed Dec 23 06:33:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczZ-0007XE-5Q; Wed, 23 Dec 2015 06:33:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczX-0007Wz-W6 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:44 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 36/1D-21571-7404A765; Wed, 23 Dec 2015 06:33:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450852422!6801497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22178 invoked from network); 23 Dec 2015 06:33:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczW-0000zN-0x for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczV-0007ik-U4 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:41 +0000 Date: Wed, 23 Dec 2015 06:33:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: add missing newlines to printk()s X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68136245ecd502b6d1619c3956dca7c0b4061eb9 Author: Jan Beulich AuthorDate: Mon Dec 21 17:10:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:10:09 2015 +0100 arm: add missing newlines to printk()s Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/platforms/brcm.c | 2 +- xen/arch/arm/platforms/exynos5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/platforms/brcm.c b/xen/arch/arm/platforms/brcm.c index a10de22..6d8b5b9 100644 --- a/xen/arch/arm/platforms/brcm.c +++ b/xen/arch/arm/platforms/brcm.c @@ -162,7 +162,7 @@ static int brcm_cpu_power_on(int cpu) if ( timeout == 0 ) { - dprintk(XENLOG_ERR, "CPU%d power enable failed", cpu); + dprintk(XENLOG_ERR, "CPU%d power enable failed\n", cpu); return -ETIMEDOUT; } diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 79e3a5f..bf4964d 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -183,7 +183,7 @@ static int exynos5_cpu_power_up(void __iomem *power, int cpu) if ( timeout == 0 ) { - dprintk(XENLOG_ERR, "CPU%d power enable failed", cpu); + dprintk(XENLOG_ERR, "CPU%d power enable failed\n", cpu); return -ETIMEDOUT; } } -- generated by git-patchbot for /home/xen/git/xen.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 23 06:33:45 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczZ-0007XE-5Q; Wed, 23 Dec 2015 06:33:45 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczX-0007Wz-W6 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:44 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 36/1D-21571-7404A765; Wed, 23 Dec 2015 06:33:43 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1450852422!6801497!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 22178 invoked from network); 23 Dec 2015 06:33:42 -0000 Received: from mail.xen.org (HELO mail.xen.org) (50.57.168.107) by server-15.tower-21.messagelabs.com with AES256-SHA encrypted SMTP; 23 Dec 2015 06:33:42 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczW-0000zN-0x for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:42 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczV-0007ik-U4 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:41 +0000 Date: Wed, 23 Dec 2015 06:33:41 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] arm: add missing newlines to printk()s X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit 68136245ecd502b6d1619c3956dca7c0b4061eb9 Author: Jan Beulich AuthorDate: Mon Dec 21 17:10:09 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:10:09 2015 +0100 arm: add missing newlines to printk()s Signed-off-by: Jan Beulich Acked-by: Stefano Stabellini --- xen/arch/arm/platforms/brcm.c | 2 +- xen/arch/arm/platforms/exynos5.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/platforms/brcm.c b/xen/arch/arm/platforms/brcm.c index a10de22..6d8b5b9 100644 --- a/xen/arch/arm/platforms/brcm.c +++ b/xen/arch/arm/platforms/brcm.c @@ -162,7 +162,7 @@ static int brcm_cpu_power_on(int cpu) if ( timeout == 0 ) { - dprintk(XENLOG_ERR, "CPU%d power enable failed", cpu); + dprintk(XENLOG_ERR, "CPU%d power enable failed\n", cpu); return -ETIMEDOUT; } diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 79e3a5f..bf4964d 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -183,7 +183,7 @@ static int exynos5_cpu_power_up(void __iomem *power, int cpu) if ( timeout == 0 ) { - dprintk(XENLOG_ERR, "CPU%d power enable failed", cpu); + dprintk(XENLOG_ERR, "CPU%d power enable failed\n", cpu); return -ETIMEDOUT; } } -- generated by git-patchbot for /home/xen/git/xen.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 23 06:33:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczk-0007Zr-DD; Wed, 23 Dec 2015 06:33:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczi-0007Yr-LV for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:54 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 2D/68-12831-1504A765; Wed, 23 Dec 2015 06:33:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1450852432!12055451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23535 invoked from network); 23 Dec 2015 06:33:53 -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; 23 Dec 2015 06:33:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczg-0000zV-A2 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczg-0007j7-74 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:52 +0000 Date: Wed, 23 Dec 2015 06:33:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] get-fields.sh: use printf for POSIX compat X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf925a9f1254391749f569c1b8fc606036340488 Author: Alex Xu AuthorDate: Mon Dec 21 17:11:17 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:11:17 2015 +0100 get-fields.sh: use printf for POSIX compat xen/tools/get-fields.sh used echo -n which is not POSIX compatible and breaks building with dash (shell). Change it to use printf %s which is usable everywhere. Signed-off-by: Alex Xu --- xen/tools/get-fields.sh | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/tools/get-fields.sh b/xen/tools/get-fields.sh index 4547dc2..887feec 100644 --- a/xen/tools/get-fields.sh +++ b/xen/tools/get-fields.sh @@ -130,9 +130,9 @@ handle_field () echo " \\" if [ -z "$4" ] then - echo -n "$1(_d_)->$3 = (_s_)->$3;" + printf %s "$1(_d_)->$3 = (_s_)->$3;" else - echo -n "$1XLAT_${2}_HNDL_$(echo $3 | $SED 's,\.,_,g')(_d_, _s_);" + printf %s "$1XLAT_${2}_HNDL_$(echo $3 | $SED 's,\.,_,g')(_d_, _s_);" fi elif [ -z "$(echo "$5" | $SED 's,[^{}],,g')" ] then @@ -142,7 +142,7 @@ for line in sys.stdin.readlines(): print re.subn(r"\s*(struct|union)\s+(compat_)?(\w+)\s.*", r"\3", line)[0].rstrip() ') echo " \\" - echo -n "${1}XLAT_$tag(&(_d_)->$3, &(_s_)->$3);" + printf %s "${1}XLAT_$tag(&(_d_)->$3, &(_s_)->$3);" else local level=1 kind= fields= id= array= arrlvl=1 array_type= type= token for token in $5 @@ -156,7 +156,7 @@ for line in sys.stdin.readlines(): if [ $kind = union ] then echo " \\" - echo -n "${1}switch ($(echo $3 | $SED 's,\.,_,g')) {" + printf %s "${1}switch ($(echo $3 | $SED 's,\.,_,g')) {" fi fi ;; @@ -168,7 +168,7 @@ for line in sys.stdin.readlines(): if [ $level = 1 -a $kind = union ] then echo " \\" - echo -n "$1}" + printf %s "$1}" fi ;; "[") @@ -223,7 +223,7 @@ for line in sys.stdin.readlines(): if [ $kind = union ] then echo " \\" - echo -n "${1}case XLAT_${2}_$(echo $3.$id | $SED 's,\.,_,g'):" + printf %s "${1}case XLAT_${2}_$(echo $3.$id | $SED 's,\.,_,g'):" handle_field "$1 " $2 $3.$id "$type" "$fields" elif [ -z "$array" -a -z "$array_type" ] then @@ -239,7 +239,7 @@ for line in sys.stdin.readlines(): if [ $kind = union ] then echo " \\" - echo -n "$1 break;" + printf %s "$1 break;" fi fi ;; @@ -259,7 +259,7 @@ copy_array () { echo " \\" echo "${1}if ((_d_)->$2 != (_s_)->$2) \\" - echo -n "$1 memcpy((_d_)->$2, (_s_)->$2, sizeof((_d_)->$2));" + printf %s "$1 memcpy((_d_)->$2, (_s_)->$2, sizeof((_d_)->$2));" } handle_array () @@ -268,7 +268,7 @@ handle_array () echo " \\" echo "$1{ \\" echo "$1 unsigned int $i; \\" - echo -n "$1 for ($i = 0; $i < "${4%%;*}"; ++$i) {" + printf %s "$1 for ($i = 0; $i < "${4%%;*}"; ++$i) {" if [ "$4" = "${4#*;}" ] then handle_field "$1 " $2 $3[$i] "$5" "$6" @@ -277,13 +277,13 @@ handle_array () fi echo " \\" echo "$1 } \\" - echo -n "$1}" + printf %s "$1}" } build_body () { echo - echo -n "#define XLAT_$1(_d_, _s_) do {" + printf %s "#define XLAT_$1(_d_, _s_) do {" local level=1 fields= id= array= arrlvl=1 array_type= type= token for token in $2 do @@ -389,7 +389,7 @@ check_field () struct|union) ;; [a-zA-Z_]*) - echo -n " CHECK_${n#xen_}" + printf %s " CHECK_${n#xen_}" break ;; *) @@ -400,9 +400,9 @@ check_field () done elif [ $n = 0 ] then - echo -n " CHECK_FIELD_($1, $2, $3)" + printf %s " CHECK_FIELD_($1, $2, $3)" else - echo -n " CHECK_SUBFIELD_${n}_($1, $2, $(echo $3 | $SED 's!\.!, !g'))" + printf %s " CHECK_SUBFIELD_${n}_($1, $2, $(echo $3 | $SED 's!\.!, !g'))" fi else local level=1 fields= id= token @@ -446,7 +446,7 @@ build_check () if [ $level = 1 ] then kind=$token - echo -n " CHECK_SIZE_($kind, $1)" + printf %s " CHECK_SIZE_($kind, $1)" elif [ $level = 2 ] then fields=" " -- generated by git-patchbot for /home/xen/git/xen.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 23 06:33:56 2015 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 23 Dec 2015 06:33:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczk-0007Zr-DD; Wed, 23 Dec 2015 06:33:56 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczi-0007Yr-LV for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:54 +0000 Received: from [85.158.139.211] by server-12.bemta-5.messagelabs.com id 2D/68-12831-1504A765; Wed, 23 Dec 2015 06:33:53 +0000 X-Env-Sender: ian.jackson@eu.citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1450852432!12055451!1 X-Originating-IP: [50.57.168.107] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23535 invoked from network); 23 Dec 2015 06:33:53 -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; 23 Dec 2015 06:33:53 -0000 Received: from xenbits.xenproject.org ([50.57.170.242] helo=xenbits.xen.org) by mail.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aBczg-0000zV-A2 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:52 +0000 Received: from xen by xenbits.xen.org with local (Exim 4.72) (envelope-from ) id 1aBczg-0007j7-74 for xen-changelog@lists.xensource.com; Wed, 23 Dec 2015 06:33:52 +0000 Date: Wed, 23 Dec 2015 06:33:52 +0000 Message-Id: From: patchbot@xen.org To: xen-changelog@lists.xensource.com Subject: [Xen-changelog] [xen master] get-fields.sh: use printf for POSIX compat X-BeenThere: xen-changelog@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: xen-devel@lists.xensource.com List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: xen-changelog-bounces@lists.xen.org Errors-To: xen-changelog-bounces@lists.xen.org commit bf925a9f1254391749f569c1b8fc606036340488 Author: Alex Xu AuthorDate: Mon Dec 21 17:11:17 2015 +0100 Commit: Jan Beulich CommitDate: Mon Dec 21 17:11:17 2015 +0100 get-fields.sh: use printf for POSIX compat xen/tools/get-fields.sh used echo -n which is not POSIX compatible and breaks building with dash (shell). Change it to use printf %s which is usable everywhere. Signed-off-by: Alex Xu --- xen/tools/get-fields.sh | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/tools/get-fields.sh b/xen/tools/get-fields.sh index 4547dc2..887feec 100644 --- a/xen/tools/get-fields.sh +++ b/xen/tools/get-fields.sh @@ -130,9 +130,9 @@ handle_field () echo " \\" if [ -z "$4" ] then - echo -n "$1(_d_)->$3 = (_s_)->$3;" + printf %s "$1(_d_)->$3 = (_s_)->$3;" else - echo -n "$1XLAT_${2}_HNDL_$(echo $3 | $SED 's,\.,_,g')(_d_, _s_);" + printf %s "$1XLAT_${2}_HNDL_$(echo $3 | $SED 's,\.,_,g')(_d_, _s_);" fi elif [ -z "$(echo "$5" | $SED 's,[^{}],,g')" ] then @@ -142,7 +142,7 @@ for line in sys.stdin.readlines(): print re.subn(r"\s*(struct|union)\s+(compat_)?(\w+)\s.*", r"\3", line)[0].rstrip() ') echo " \\" - echo -n "${1}XLAT_$tag(&(_d_)->$3, &(_s_)->$3);" + printf %s "${1}XLAT_$tag(&(_d_)->$3, &(_s_)->$3);" else local level=1 kind= fields= id= array= arrlvl=1 array_type= type= token for token in $5 @@ -156,7 +156,7 @@ for line in sys.stdin.readlines(): if [ $kind = union ] then echo " \\" - echo -n "${1}switch ($(echo $3 | $SED 's,\.,_,g')) {" + printf %s "${1}switch ($(echo $3 | $SED 's,\.,_,g')) {" fi fi ;; @@ -168,7 +168,7 @@ for line in sys.stdin.readlines(): if [ $level = 1 -a $kind = union ] then echo " \\" - echo -n "$1}" + printf %s "$1}" fi ;; "[") @@ -223,7 +223,7 @@ for line in sys.stdin.readlines(): if [ $kind = union ] then echo " \\" - echo -n "${1}case XLAT_${2}_$(echo $3.$id | $SED 's,\.,_,g'):" + printf %s "${1}case XLAT_${2}_$(echo $3.$id | $SED 's,\.,_,g'):" handle_field "$1 " $2 $3.$id "$type" "$fields" elif [ -z "$array" -a -z "$array_type" ] then @@ -239,7 +239,7 @@ for line in sys.stdin.readlines(): if [ $kind = union ] then echo " \\" - echo -n "$1 break;" + printf %s "$1 break;" fi fi ;; @@ -259,7 +259,7 @@ copy_array () { echo " \\" echo "${1}if ((_d_)->$2 != (_s_)->$2) \\" - echo -n "$1 memcpy((_d_)->$2, (_s_)->$2, sizeof((_d_)->$2));" + printf %s "$1 memcpy((_d_)->$2, (_s_)->$2, sizeof((_d_)->$2));" } handle_array () @@ -268,7 +268,7 @@ handle_array () echo " \\" echo "$1{ \\" echo "$1 unsigned int $i; \\" - echo -n "$1 for ($i = 0; $i < "${4%%;*}"; ++$i) {" + printf %s "$1 for ($i = 0; $i < "${4%%;*}"; ++$i) {" if [ "$4" = "${4#*;}" ] then handle_field "$1 " $2 $3[$i] "$5" "$6" @@ -277,13 +277,13 @@ handle_array () fi echo " \\" echo "$1 } \\" - echo -n "$1}" + printf %s "$1}" } build_body () { echo - echo -n "#define XLAT_$1(_d_, _s_) do {" + printf %s "#define XLAT_$1(_d_, _s_) do {" local level=1 fields= id= array= arrlvl=1 array_type= type= token for token in $2 do @@ -389,7 +389,7 @@ check_field () struct|union) ;; [a-zA-Z_]*) - echo -n " CHECK_${n#xen_}" + printf %s " CHECK_${n#xen_}" break ;; *) @@ -400,9 +400,9 @@ check_field () done elif [ $n = 0 ] then - echo -n " CHECK_FIELD_($1, $2, $3)" + printf %s " CHECK_FIELD_($1, $2, $3)" else - echo -n " CHECK_SUBFIELD_${n}_($1, $2, $(echo $3 | $SED 's!\.!, !g'))" + printf %s " CHECK_SUBFIELD_${n}_($1, $2, $(echo $3 | $SED 's!\.!, !g'))" fi else local level=1 fields= id= token @@ -446,7 +446,7 @@ build_check () if [ $level = 1 ] then kind=$token - echo -n " CHECK_SIZE_($kind, $1)" + printf %s " CHECK_SIZE_($kind, $1)" elif [ $level = 2 ] then fields=" " -- generated by git-patchbot for /home/xen/git/xen.git#master _______________________________________________ Xen-changelog mailing list Xen-changelog@lists.xen.org http://lists.xensource.com/xen-changelog