From xen-changelog-bounces@lists.xenproject.org Fri May 01 21:55:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2020 21:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdcg-0002zZ-HG; Fri, 01 May 2020 21:55:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdcf-0002zT-8P for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:05 +0000 X-Inumbo-ID: 69de4b58-8bf6-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 69de4b58-8bf6-11ea-b9cf-bc764e2007e4; Fri, 01 May 2020 21:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NErdLzMoKqUCfCOOQ89KR0FAdSZ/6LC/+2eJT2rww/0=; b=6DcWS6IGpiqiUFXncOWRc6pW0A xTeBaYQRXnbaCPbIzB3cU3x4xor0EVEG5AxokIrO1qVxmjcQzaiG9HoTUpo4NUl36hEimBSPcavTq SFBVqHD6ELwCAZ9rze6UlS9mTQGfzt6xKDvua9ScL2RgTLu+aRJVlwuFp8+koFAw7V54=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdce-0003aH-5J for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jUdce-0006cx-1p for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: drop unnecessary page table walking in compat r/o M2P handling Message-Id: Date: Fri, 01 May 2020 21:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1df23a5ba85ca0266ebba25c7663465a8923d584 Author: Jan Beulich AuthorDate: Thu Apr 30 10:28:27 2020 +0200 Commit: Jan Beulich CommitDate: Thu Apr 30 10:28:27 2020 +0200 x86: drop unnecessary page table walking in compat r/o M2P handling We have a global variable where the necessary L2 table is recorded; no need to inspect L4 and L3 tables (and this way a few less places will eventually need adjustment when we want to support 5-level page tables). Also avoid setting up the L3 entry, as the address range never gets used anyway (it'll be dropped altogether in a subsequent patch). Signed-off-by: Jan Beulich Reviewed-by: Hongyan Xia Reviewed-by: Wei Liu --- xen/arch/x86/x86_64/mm.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 747941d48e..39c01cf907 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -218,9 +218,7 @@ static void destroy_compat_m2p_mapping(struct mem_hotadd_info *info) { unsigned long i, va, rwva, pt_pfn; unsigned long smap = info->spfn, emap = info->spfn; - - l3_pgentry_t *l3_ro_mpt; - l2_pgentry_t *l2_ro_mpt; + l2_pgentry_t *l2_ro_mpt = compat_idle_pg_table_l2; if ( smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) return; @@ -228,12 +226,6 @@ static void destroy_compat_m2p_mapping(struct mem_hotadd_info *info) if ( emap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) emap = (RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2; - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(HIRO_COMPAT_MPT_VIRT_START)]); - - ASSERT(l3e_get_flags(l3_ro_mpt[l3_table_offset(HIRO_COMPAT_MPT_VIRT_START)]) & _PAGE_PRESENT); - - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(HIRO_COMPAT_MPT_VIRT_START)]); - for ( i = smap; i < emap; ) { va = HIRO_COMPAT_MPT_VIRT_START + @@ -327,7 +319,6 @@ static int setup_compat_m2p_table(struct mem_hotadd_info *info) unsigned long i, va, smap, emap, rwva, epfn = info->epfn; mfn_t mfn; unsigned int n; - l3_pgentry_t *l3_ro_mpt = NULL; l2_pgentry_t *l2_ro_mpt = NULL; int err = 0; @@ -346,13 +337,7 @@ static int setup_compat_m2p_table(struct mem_hotadd_info *info) emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & ~((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1) ); - va = HIRO_COMPAT_MPT_VIRT_START + - smap * sizeof(*compat_machine_to_phys_mapping); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset(va)]); - - ASSERT(l3e_get_flags(l3_ro_mpt[l3_table_offset(va)]) & _PAGE_PRESENT); - - l2_ro_mpt = l3e_to_l2e(l3_ro_mpt[l3_table_offset(va)]); + l2_ro_mpt = compat_idle_pg_table_l2; #define MFN(x) (((x) << L2_PAGETABLE_SHIFT) / sizeof(unsigned int)) #define CNT ((sizeof(*frame_table) & -sizeof(*frame_table)) / \ @@ -631,16 +616,10 @@ void __init paging_init(void) #undef MFN /* Create user-accessible L2 directory to map the MPT for compat guests. */ - BUILD_BUG_ON(l4_table_offset(RDWR_MPT_VIRT_START) != - l4_table_offset(HIRO_COMPAT_MPT_VIRT_START)); - l3_ro_mpt = l4e_to_l3e(idle_pg_table[l4_table_offset( - HIRO_COMPAT_MPT_VIRT_START)]); if ( (l2_ro_mpt = alloc_xen_pagetable()) == NULL ) goto nomem; compat_idle_pg_table_l2 = l2_ro_mpt; clear_page(l2_ro_mpt); - l3e_write(&l3_ro_mpt[l3_table_offset(HIRO_COMPAT_MPT_VIRT_START)], - l3e_from_paddr(__pa(l2_ro_mpt), __PAGE_HYPERVISOR_RO)); l2_ro_mpt += l2_table_offset(HIRO_COMPAT_MPT_VIRT_START); /* Allocate and map the compatibility mode machine-to-phys table. */ mpt_size = (mpt_size >> 1) + (1UL << (L2_PAGETABLE_SHIFT - 1)); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 01 21:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2020 21:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdcq-00030P-Ir; Fri, 01 May 2020 21:55:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdcp-00030J-H2 for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:15 +0000 X-Inumbo-ID: 6fc929cb-8bf6-11ea-9b66-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6fc929cb-8bf6-11ea-9b66-12813bfff9fa; Fri, 01 May 2020 21:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1ZGwp0MfCvA8EFtWqRvo+gdiR3TEPJXc+PMHHv8rFjs=; b=Np6MBp+o5iTHbBy9vv6ZzY8olv sdUfJHysB9WTDrO1JcEvLuu7Nchxzzr+VIS6calu9/RCGeZiEYy+oSEsxt6xxjT0v7ScCbs+pjJRv z+AYh+EkqT2fpptenblENhPxScdtgkS7ZFwXmBH4amFcDEYoGzHlbbp4HUU6CT5g2FeM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdco-0003aN-Bt for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jUdco-0006dl-AY for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/msr: Fix XEN_MSR_PAT to build with older binutils Message-Id: Date: Fri, 01 May 2020 21:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4f1b2e581744d5f78e4c809faf0a3167644afb82 Author: Andrew Cooper AuthorDate: Thu Apr 30 10:34:56 2020 +0200 Commit: Jan Beulich CommitDate: Thu Apr 30 10:34:56 2020 +0200 x86/msr: Fix XEN_MSR_PAT to build with older binutils Older binutils complains with: trampoline.S:95: Error: junk `ul&0xffffffff' after expression Use an assembly-safe constant. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/include/asm-x86/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index ea6e5497f4..8f6f5a97dd 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -99,7 +99,7 @@ * Host IA32_CR_PAT value to cover all memory types. This is not the default * MSR_PAT value, and is an ABI with PV guests. */ -#define XEN_MSR_PAT 0x050100070406ul +#define XEN_MSR_PAT _AC(0x050100070406, ULL) #ifndef __ASSEMBLY__ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 01 21:55:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2020 21:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdd0-00031o-KR; Fri, 01 May 2020 21:55:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdcz-00031d-Ei for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:25 +0000 X-Inumbo-ID: 7605e8c8-8bf6-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7605e8c8-8bf6-11ea-b9cf-bc764e2007e4; Fri, 01 May 2020 21:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Yn1C3qSppJ73/Q+izHpscH8YAaN24KV1H5q68mGbM0Q=; b=fmiop2KA44QPiC3BLxfNrVGreB 5MFRM+6P1dc6c238ph+JdOSSnt2tyMI59MBMocWQYG5QcrtcVrcMuLTv5ZL4CJgJcqG3EbDkOtj9f zikqnCE/ULQncu1mLLoJwmJ/1IhWcs7ubBM+9ldclbAatzf5YQH/HwQVnvqp4TLiOlL4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdcy-0003ad-Iy for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jUdcy-0006el-Hf for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: drop high compat r/o M2P table address range Message-Id: Date: Fri, 01 May 2020 21:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5af040ef8b572ffccb7e3530e617d4259a9ff724 Author: Jan Beulich AuthorDate: Thu Apr 30 10:38:07 2020 +0200 Commit: Jan Beulich CommitDate: Thu Apr 30 10:38:07 2020 +0200 x86: drop high compat r/o M2P table address range Now that we don't properly hook things up into the page tables anymore we also don't need to set aside an address range. Drop it, using compat_idle_pg_table_l2[] simply (explicitly) from slot 0. While doing the re-arrangement, which is accompanied by the dropping or replacing of some local variables, restrict the scopes of some further ones at the same time. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu --- xen/arch/x86/mm.c | 3 +-- xen/arch/x86/x86_64/mm.c | 42 +++++++++++++++++------------------------- xen/include/asm-x86/config.h | 5 +---- 3 files changed, 19 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index ab9cd00225..355c50ff91 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1423,8 +1423,7 @@ static bool pae_xen_mappings_check(const struct domain *d, void init_xen_pae_l2_slots(l2_pgentry_t *l2t, const struct domain *d) { memcpy(&l2t[COMPAT_L2_PAGETABLE_FIRST_XEN_SLOT(d)], - &compat_idle_pg_table_l2[ - l2_table_offset(HIRO_COMPAT_MPT_VIRT_START)], + compat_idle_pg_table_l2, COMPAT_L2_PAGETABLE_XEN_SLOTS(d) * sizeof(*l2t)); } diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 39c01cf907..102079a801 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -216,9 +216,7 @@ static int share_hotadd_m2p_table(struct mem_hotadd_info *info) static void destroy_compat_m2p_mapping(struct mem_hotadd_info *info) { - unsigned long i, va, rwva, pt_pfn; - unsigned long smap = info->spfn, emap = info->spfn; - l2_pgentry_t *l2_ro_mpt = compat_idle_pg_table_l2; + unsigned long i, smap = info->spfn, emap = info->spfn; if ( smap > ((RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START) >> 2) ) return; @@ -228,18 +226,19 @@ static void destroy_compat_m2p_mapping(struct mem_hotadd_info *info) for ( i = smap; i < emap; ) { - va = HIRO_COMPAT_MPT_VIRT_START + - i * sizeof(*compat_machine_to_phys_mapping); - rwva = RDWR_COMPAT_MPT_VIRT_START + - i * sizeof(*compat_machine_to_phys_mapping); - if ( l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT ) + unsigned int off = i * sizeof(*compat_machine_to_phys_mapping); + l2_pgentry_t *pl2e = compat_idle_pg_table_l2 + l2_table_offset(off); + + if ( l2e_get_flags(*pl2e) & _PAGE_PRESENT ) { - pt_pfn = l2e_get_pfn(l2_ro_mpt[l2_table_offset(va)]); + unsigned long pt_pfn = l2e_get_pfn(*pl2e); + if ( hotadd_mem_valid(pt_pfn, info) ) { - destroy_xen_mappings(rwva, rwva + - (1UL << L2_PAGETABLE_SHIFT)); - l2e_write(&l2_ro_mpt[l2_table_offset(va)], l2e_empty()); + unsigned long rwva = RDWR_COMPAT_MPT_VIRT_START + off; + + destroy_xen_mappings(rwva, rwva + (1UL << L2_PAGETABLE_SHIFT)); + l2e_write(pl2e, l2e_empty()); } } @@ -316,10 +315,9 @@ static void destroy_m2p_mapping(struct mem_hotadd_info *info) */ static int setup_compat_m2p_table(struct mem_hotadd_info *info) { - unsigned long i, va, smap, emap, rwva, epfn = info->epfn; + unsigned long i, smap, emap, epfn = info->epfn; mfn_t mfn; unsigned int n; - l2_pgentry_t *l2_ro_mpt = NULL; int err = 0; smap = info->spfn & (~((1UL << (L2_PAGETABLE_SHIFT - 2)) -1)); @@ -337,8 +335,6 @@ static int setup_compat_m2p_table(struct mem_hotadd_info *info) emap = ( (epfn + ((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1 )) & ~((1UL << (L2_PAGETABLE_SHIFT - 2)) - 1) ); - l2_ro_mpt = compat_idle_pg_table_l2; - #define MFN(x) (((x) << L2_PAGETABLE_SHIFT) / sizeof(unsigned int)) #define CNT ((sizeof(*frame_table) & -sizeof(*frame_table)) / \ sizeof(*compat_machine_to_phys_mapping)) @@ -347,13 +343,11 @@ static int setup_compat_m2p_table(struct mem_hotadd_info *info) for ( i = smap; i < emap; i += (1UL << (L2_PAGETABLE_SHIFT - 2)) ) { - va = HIRO_COMPAT_MPT_VIRT_START + - i * sizeof(*compat_machine_to_phys_mapping); - - rwva = RDWR_COMPAT_MPT_VIRT_START + - i * sizeof(*compat_machine_to_phys_mapping); + unsigned int off = i * sizeof(*compat_machine_to_phys_mapping); + l2_pgentry_t *pl2e = compat_idle_pg_table_l2 + l2_table_offset(off); + unsigned long rwva = RDWR_COMPAT_MPT_VIRT_START + off; - if (l2e_get_flags(l2_ro_mpt[l2_table_offset(va)]) & _PAGE_PRESENT) + if ( l2e_get_flags(*pl2e) & _PAGE_PRESENT ) continue; for ( n = 0; n < CNT; ++n) @@ -370,8 +364,7 @@ static int setup_compat_m2p_table(struct mem_hotadd_info *info) /* Fill with INVALID_M2P_ENTRY. */ memset((void *)rwva, 0xFF, 1UL << L2_PAGETABLE_SHIFT); /* NB. Cannot be GLOBAL as the ptes get copied into per-VM space. */ - l2e_write(&l2_ro_mpt[l2_table_offset(va)], - l2e_from_mfn(mfn, _PAGE_PSE|_PAGE_PRESENT)); + l2e_write(pl2e, l2e_from_mfn(mfn, _PAGE_PSE|_PAGE_PRESENT)); } #undef CNT #undef MFN @@ -620,7 +613,6 @@ void __init paging_init(void) goto nomem; compat_idle_pg_table_l2 = l2_ro_mpt; clear_page(l2_ro_mpt); - l2_ro_mpt += l2_table_offset(HIRO_COMPAT_MPT_VIRT_START); /* Allocate and map the compatibility mode machine-to-phys table. */ mpt_size = (mpt_size >> 1) + (1UL << (L2_PAGETABLE_SHIFT - 1)); if ( mpt_size > RDWR_COMPAT_MPT_VIRT_END - RDWR_COMPAT_MPT_VIRT_START ) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 2d6393e64e..266d281718 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -215,11 +215,8 @@ extern unsigned char boot_edid_info[128]; /* Slot 261: compatibility machine-to-phys conversion table (1GB). */ #define RDWR_COMPAT_MPT_VIRT_START VMAP_VIRT_END #define RDWR_COMPAT_MPT_VIRT_END (RDWR_COMPAT_MPT_VIRT_START + GB(1)) -/* Slot 261: high read-only compat machine-to-phys conversion table (1GB). */ -#define HIRO_COMPAT_MPT_VIRT_START RDWR_COMPAT_MPT_VIRT_END -#define HIRO_COMPAT_MPT_VIRT_END (HIRO_COMPAT_MPT_VIRT_START + GB(1)) /* Slot 261: xen text, static data, bss, per-cpu stubs and executable fixmap (1GB). */ -#define XEN_VIRT_START (HIRO_COMPAT_MPT_VIRT_END) +#define XEN_VIRT_START RDWR_COMPAT_MPT_VIRT_END #define XEN_VIRT_END (XEN_VIRT_START + GB(1)) #ifndef CONFIG_BIGMEM -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 01 21:55:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2020 21:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddA-00032u-MN; Fri, 01 May 2020 21:55:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdd9-00032k-Iw for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:35 +0000 X-Inumbo-ID: 7c283dd2-8bf6-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7c283dd2-8bf6-11ea-9887-bc764e2007e4; Fri, 01 May 2020 21:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4tY2vmbpWwxH/lL6ppcFkGgtn7rZ3wLDxEul6wBcjBo=; b=QWYKKq28iQvEqhbz2JsYLfimt5 vcJJYCzKsxTLWf8HWvmxbVluxub4Fvt1ip4xztvxfJlraa19HH32SbokwQM4Q43uazIEtbA5z9UEB SXsbD/aezCA1ZUA5bzyYk27mMGhlx92PMSIewy7hPRTl8Sr8neyENnTN1YuoyvGqOGdM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdd8-0003am-SD for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jUdd8-0006fy-Qh for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/pass-through: avoid double IRQ unbind during domain cleanup Message-Id: Date: Fri, 01 May 2020 21:55:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5b58dad089880127674d460494d1a9d68109b3d7 Author: Jan Beulich AuthorDate: Thu Apr 30 10:40:59 2020 +0200 Commit: Jan Beulich CommitDate: Thu Apr 30 10:40:59 2020 +0200 x86/pass-through: avoid double IRQ unbind during domain cleanup XEN_DOMCTL_destroydomain creates a continuation if domain_kill -ERESTARTs. In that scenario, it is possible to receive multiple _pirq_guest_unbind calls for the same pirq from domain_kill, if the pirq has not yet been removed from the domain's pirq_tree, as: domain_kill() -> domain_relinquish_resources() -> pci_release_devices() -> pci_clean_dpci_irq() -> pirq_guest_unbind() -> __pirq_guest_unbind() Avoid recurring invocations of pirq_guest_unbind() by removing the pIRQ from the tree being iterated after the first call there. In case such a removed entry still has a softirq outstanding, record it and re-check upon re-invocation. Note that pirq_cleanup_check() gets relaxed beyond what's strictly needed here, to avoid introducing an asymmetry there between HVM and PV guests. Reported-by: Varad Gautam Signed-off-by: Jan Beulich Tested-by: Varad Gautam Reviewed-by: Paul Durrant Reviewed-by: Roger Pau Monné --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 21 +++++++++++++++++++-- xen/include/asm-x86/hvm/irq.h | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index cc2eb8e925..a69937c840 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1323,7 +1323,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG(); + BUG_ON(!d->is_dying); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 15114e7cbc..5846978890 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -873,7 +873,14 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; + radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); + + if ( !pt_pirq_softirq_active(pirq_dpci) ) + return 0; + + domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; + + return -ERESTART; } static int pci_clean_dpci_irqs(struct domain *d) @@ -890,8 +897,18 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + int ret = 0; + + if ( hvm_irq_dpci->pending_pirq_dpci ) + { + if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) + ret = -ERESTART; + else + hvm_irq_dpci->pending_pirq_dpci = NULL; + } + if ( !ret ) + ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 5b7e90c179..d306cfeade 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -158,6 +158,8 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; + /* Clean up: Entry with a softirq invocation pending / in progress. */ + struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 01 21:55:46 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2020 21:55:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddK-00033y-Nw; Fri, 01 May 2020 21:55:46 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddJ-00033p-OA for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:45 +0000 X-Inumbo-ID: 822f5e7c-8bf6-11ea-9b66-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 822f5e7c-8bf6-11ea-9b66-12813bfff9fa; Fri, 01 May 2020 21:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nsAj69kPuTRBzgTQIiuMN3RzwAKPV/5o3BWTKytN4Z0=; b=S9/KeIyeO4g2zHxXojOEN3mzkv qtGOnNZxrvEvL6nEr4D1Ah9BfsiEIhXbDn+3YlKVaqBhhtv7u5r0MxyDaY4NbNalaK/1VjQmUJ39f ppWyAAp3h1FfdrJGBdE2c7yXFUlp9WySdzSy2Lh0Sz1X+w+QuJg+TG1i3oLRJvoIVYu4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddI-0003av-V0 for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jUddI-0006gv-Tt for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] mem_sharing: map shared_info page to same gfn during fork Message-Id: Date: Fri, 01 May 2020 21:55:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1a0000ac775faf8ef9efedd6068814d245f1dd8a Author: Tamas K Lengyel AuthorDate: Thu Apr 30 10:43:52 2020 +0200 Commit: Jan Beulich CommitDate: Thu Apr 30 10:43:52 2020 +0200 mem_sharing: map shared_info page to same gfn during fork During a VM fork we copy the shared_info page; however, we also need to ensure that the page is mapped into the same GFN in the fork as its in the parent. Suggested-by: Roger Pau Monné Signed-off-by: Tamas K Lengyel Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm/mem_sharing.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 344a5bfb3d..7271e5c90b 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1656,6 +1656,7 @@ static void copy_tsc(struct domain *cd, struct domain *d) static int copy_special_pages(struct domain *cd, struct domain *d) { mfn_t new_mfn, old_mfn; + gfn_t new_gfn, old_gfn; struct p2m_domain *p2m = p2m_get_hostp2m(cd); static const unsigned int params[] = { @@ -1701,6 +1702,30 @@ static int copy_special_pages(struct domain *cd, struct domain *d) new_mfn = _mfn(virt_to_mfn(cd->shared_info)); copy_domain_page(new_mfn, old_mfn); + old_gfn = _gfn(get_gpfn_from_mfn(mfn_x(old_mfn))); + new_gfn = _gfn(get_gpfn_from_mfn(mfn_x(new_mfn))); + + if ( !gfn_eq(old_gfn, new_gfn) ) + { + if ( !gfn_eq(new_gfn, INVALID_GFN) ) + { + /* if shared_info is mapped to a different gfn just remove it */ + rc = p2m->set_entry(p2m, new_gfn, INVALID_MFN, PAGE_ORDER_4K, + p2m_invalid, p2m->default_access, -1); + if ( rc ) + return rc; + } + + if ( !gfn_eq(old_gfn, INVALID_GFN) ) + { + /* now map it to the same gfn as the parent */ + rc = p2m->set_entry(p2m, old_gfn, new_mfn, PAGE_ORDER_4K, + p2m_ram_rw, p2m->default_access, -1); + if ( rc ) + return rc; + } + } + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 01 21:55:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2020 21:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddU-00035E-Qh; Fri, 01 May 2020 21:55:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddT-000354-Up for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:55 +0000 X-Inumbo-ID: 88544cb8-8bf6-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 88544cb8-8bf6-11ea-9887-bc764e2007e4; Fri, 01 May 2020 21:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/XHmYTJDbUxzLTLuszsb9WgKXbbma0Z0CJ2etN3B7ek=; b=3XxLiHReuZUcDu0smyDJ4cpza/ YBm3X1lpdBA/OslNTT/RZQwo1ILXKOy+az7hS9d7AbRhHtDDuYNpa/FwVX5Af6SDsR9yC4LOFH13z c63QidmHdg0bsud6puHIi/ZJYp8Q8tJ80kkmr3rsx13I8pyUQTNbGpMQpzPZfmwklDPs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddT-0003b4-9v for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jUddT-0006hw-7J for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:55:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/pv: map and unmap page tables in mark_pv_pt_pages_rdonly Message-Id: Date: Fri, 01 May 2020 21:55:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d0234b2055b86919514381624d6ed6ec0686f241 Author: Wei Liu AuthorDate: Thu Apr 30 10:44:34 2020 +0200 Commit: Jan Beulich CommitDate: Thu Apr 30 10:44:34 2020 +0200 x86/pv: map and unmap page tables in mark_pv_pt_pages_rdonly Also, clean up the initialisation of plXe. Signed-off-by: Wei Liu Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- xen/arch/x86/pv/dom0_build.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index abfbe5f436..3522eb0114 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -49,18 +49,11 @@ static __init void mark_pv_pt_pages_rdonly(struct domain *d, { unsigned long count; struct page_info *page; - l4_pgentry_t *pl4e; - l3_pgentry_t *pl3e; - l2_pgentry_t *pl2e; - l1_pgentry_t *pl1e; - - pl4e = l4start + l4_table_offset(vpt_start); - pl3e = l4e_to_l3e(*pl4e); - pl3e += l3_table_offset(vpt_start); - pl2e = l3e_to_l2e(*pl3e); - pl2e += l2_table_offset(vpt_start); - pl1e = l2e_to_l1e(*pl2e); - pl1e += l1_table_offset(vpt_start); + l4_pgentry_t *pl4e = l4start + l4_table_offset(vpt_start); + l3_pgentry_t *pl3e = map_l3t_from_l4e(*pl4e) + l3_table_offset(vpt_start); + l2_pgentry_t *pl2e = map_l2t_from_l3e(*pl3e) + l2_table_offset(vpt_start); + l1_pgentry_t *pl1e = map_l1t_from_l2e(*pl2e) + l1_table_offset(vpt_start); + for ( count = 0; count < nr_pt_pages; count++ ) { l1e_remove_flags(*pl1e, _PAGE_RW); @@ -85,12 +78,21 @@ static __init void mark_pv_pt_pages_rdonly(struct domain *d, if ( !((unsigned long)++pl2e & (PAGE_SIZE - 1)) ) { if ( !((unsigned long)++pl3e & (PAGE_SIZE - 1)) ) - pl3e = l4e_to_l3e(*++pl4e); - pl2e = l3e_to_l2e(*pl3e); + { + /* Need to unmap the page before the increment. */ + unmap_domain_page(pl3e - 1); + pl3e = map_l3t_from_l4e(*++pl4e); + } + unmap_domain_page(pl2e - 1); + pl2e = map_l2t_from_l3e(*pl3e); } - pl1e = l2e_to_l1e(*pl2e); + unmap_domain_page(pl1e - 1); + pl1e = map_l1t_from_l2e(*pl2e); } } + unmap_domain_page(pl1e); + unmap_domain_page(pl2e); + unmap_domain_page(pl3e); } static __init void setup_pv_physmap(struct domain *d, unsigned long pgtbl_pfn, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 01 21:56:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 01 May 2020 21:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddf-00036j-SH; Fri, 01 May 2020 21:56:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUdde-00036a-Hw for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:56:06 +0000 X-Inumbo-ID: 8e927172-8bf6-11ea-9b66-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8e927172-8bf6-11ea-9b66-12813bfff9fa; Fri, 01 May 2020 21:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=FhtmjAPbLp7CESnYPpL/iGVW/E8UcI39XJyBGYGa2Gc=; b=MayxI3PLtjGgtPCY0LJyLGwN9Q pb5PxaPKCDW0n+jKIx4hMTDMRks4K1LdYikQbNOEoI6f3gnvPoPZy54leUdMX/ODG9gVFgmxfvi/w QghFB5I+G23BlhuSMOcc+uxDw18/qEG7VsO6EW0s6cbmOpND6AQmhx+zxEKKIwzw0kaA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jUddd-0003bu-Ob for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jUddd-0006jQ-L9 for xen-changelog@lists.xenproject.org; Fri, 01 May 2020 21:56:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/CPUID: correct error indicator for max extended leaf Message-Id: Date: Fri, 01 May 2020 21:56:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0135be8bd8cd60090298f02310691b688d95c3a8 Author: Jan Beulich AuthorDate: Thu Apr 30 10:45:09 2020 +0200 Commit: Jan Beulich CommitDate: Thu Apr 30 10:45:09 2020 +0200 x86/CPUID: correct error indicator for max extended leaf With the max base leaf using 0, this one should be using the extended leaf counterpart thereof, rather than some arbitrary extended leaf. Fixes: 588a966a572e ("libx86: Introduce x86_cpu_policies_are_compatible()") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- tools/tests/cpu-policy/test-cpu-policy.c | 2 +- xen/lib/x86/policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/cpu-policy/test-cpu-policy.c b/tools/tests/cpu-policy/test-cpu-policy.c index 20ebed923b..fe8cdf6ea9 100644 --- a/tools/tests/cpu-policy/test-cpu-policy.c +++ b/tools/tests/cpu-policy/test-cpu-policy.c @@ -570,7 +570,7 @@ static void test_is_compatible_failure(void) { .name = "Host extd.max_leaf out of range", .guest_cpuid.extd.max_leaf = 1, - .e = { 0x80000008, -1, -1 }, + .e = { 0x80000000, -1, -1 }, }, { .name = "Host no CPUID faulting, Guest wanted", diff --git a/xen/lib/x86/policy.c b/xen/lib/x86/policy.c index b156a304f4..4beca8767a 100644 --- a/xen/lib/x86/policy.c +++ b/xen/lib/x86/policy.c @@ -19,7 +19,7 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy *host, FAIL_CPUID(0, NA); if ( guest->cpuid->extd.max_leaf > host->cpuid->extd.max_leaf ) - FAIL_CPUID(0x80000008, NA); + FAIL_CPUID(0x80000000, NA); /* TODO: Audit more CPUID data. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 04 10:00:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2020 10:00:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtO-0001b9-Gi; Mon, 04 May 2020 10:00:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtN-0001XH-Eg for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:05 +0000 X-Inumbo-ID: 06ea01aa-8dee-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 06ea01aa-8dee-11ea-9887-bc764e2007e4; Mon, 04 May 2020 10:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jwrV+USYAZLiRvKjkPFEatO43ZHp6cdb7ptR8oegr34=; b=2wXFNZnwcqyKWICfPniSkSEqSm vBXywiI1yBnmOSafpGXHfirO6arODuA4qVRIw3YhAR6eD2IPUnj5knnL5GwMkfKf36ZU6YjyqjkJO 1QvLpOHy/9/YCHRcva+hhmrg+0uXiku+tnlwO/ab6SzERtbirKbpuLUIqn30DfGCItf4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtM-0005KE-Ge for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVXtM-0006N1-FE for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xenoprof: adjust ordering of page sharing vs domain type setting Message-Id: Date: Mon, 04 May 2020 10:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7f6a6e8c0a400d1a073b083fe0b7d25ef74b14e0 Author: Jan Beulich AuthorDate: Mon May 4 11:48:13 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:48:13 2020 +0200 xenoprof: adjust ordering of page sharing vs domain type setting Buffer pages should be shared with "ignored" or "active" guests only (besides, obviously, the primary profiling domain). Hence domain type should be set to "ignored" before unsharing from the primary domain (which implies even a previously "passive" domain may then access its buffers, albeit that's not very useful unless it gets promoted to "active" subsequently), i.e. such that no further writes of records to the buffer would occur, and (at least for consistency) also before sharing it (with the calling domain) from the XENOPROF_get_buffer path. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu --- xen/common/xenoprof.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index b04726cb49..3dad5dfb38 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -372,8 +372,8 @@ static void reset_passive(struct domain *d) if ( x == NULL ) return; - unshare_xenoprof_page_with_guest(x); x->domain_type = XENOPROF_DOMAIN_IGNORED; + unshare_xenoprof_page_with_guest(x); } static void reset_active_list(void) @@ -654,6 +654,13 @@ static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE_PARAM(void) arg) if ( ret < 0 ) return ret; } + else + { + d->xenoprof->domain_ready = 0; + d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; + } + + d->xenoprof->is_primary = (xenoprof_primary_profiler == d); ret = share_xenoprof_page_with_guest( d, virt_to_mfn(d->xenoprof->rawbuf), d->xenoprof->npages); @@ -662,10 +669,6 @@ static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE_PARAM(void) arg) xenoprof_reset_buf(d); - d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; - d->xenoprof->domain_ready = 0; - d->xenoprof->is_primary = (xenoprof_primary_profiler == current->domain); - xenoprof_get_buffer.nbuf = d->xenoprof->nbuf; xenoprof_get_buffer.bufsize = d->xenoprof->bufsize; if ( !paging_mode_translate(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 10:00:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2020 10:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtY-0001bu-Id; Mon, 04 May 2020 10:00:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtX-0001bm-A1 for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:15 +0000 X-Inumbo-ID: 0cef24e0-8dee-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0cef24e0-8dee-11ea-9887-bc764e2007e4; Mon, 04 May 2020 10:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HUX6DU+fIT3RFI0zC0qlmVfnm9Rc2buwNRCCvLI5uQ0=; b=CsxGSfEoL2af9al9kNnx/2voIT 0NFXayvNWZ80c4KfhXlTwPHy80uYpjMN60Kly2oifHc4i+C/OSbjIvaLMnIk4bKSSD1Qo88R/KNZj 8ceTiCD+wUrYaZPWQgZYL4vCC/6vF8zYeDNPzcP2eKiyHBn+t5Suoz8OT2v0qh+7HJV4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtW-0005KO-KN for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVXtW-0006OK-IO for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xenoprof: drop unused struct xenoprof fields Message-Id: Date: Mon, 04 May 2020 10:00:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e83719b53a9be1c69033b3ded8051d47e3dadab8 Author: Jan Beulich AuthorDate: Mon May 4 11:51:18 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:51:18 2020 +0200 xenoprof: drop unused struct xenoprof fields Both is_primary and domain_ready are only ever written to. Drop both fields and restrict structure visibility to just the one involved CU. While doing so (and just for starters) make "is_compat" properly bool. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu --- xen/common/xenoprof.c | 25 +++++++++++++++++-------- xen/include/xen/xenoprof.h | 19 ------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index 3dad5dfb38..8a78957fbe 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -33,6 +33,23 @@ static DEFINE_SPINLOCK(pmu_owner_lock); int pmu_owner = 0; int pmu_hvm_refcount = 0; +struct xenoprof_vcpu { + int event_size; + xenoprof_buf_t *buffer; +}; + +struct xenoprof { + char *rawbuf; + int npages; + int nbuf; + int bufsize; + int domain_type; +#ifdef CONFIG_COMPAT + bool is_compat; +#endif + struct xenoprof_vcpu *vcpu; +}; + static struct domain *active_domains[MAX_OPROF_DOMAINS]; static int active_ready[MAX_OPROF_DOMAINS]; static unsigned int adomains; @@ -259,7 +276,6 @@ static int alloc_xenoprof_struct( d->xenoprof->npages = npages; d->xenoprof->nbuf = nvcpu; d->xenoprof->bufsize = bufsize; - d->xenoprof->domain_ready = 0; d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; /* Update buffer pointers for active vcpus */ @@ -327,7 +343,6 @@ static int set_active(struct domain *d) if ( x == NULL ) return -EPERM; - x->domain_ready = 1; x->domain_type = XENOPROF_DOMAIN_ACTIVE; active_ready[ind] = 1; activated++; @@ -348,7 +363,6 @@ static int reset_active(struct domain *d) if ( x == NULL ) return -EPERM; - x->domain_ready = 0; x->domain_type = XENOPROF_DOMAIN_IGNORED; active_ready[ind] = 0; active_domains[ind] = NULL; @@ -655,12 +669,7 @@ static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE_PARAM(void) arg) return ret; } else - { - d->xenoprof->domain_ready = 0; d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; - } - - d->xenoprof->is_primary = (xenoprof_primary_profiler == d); ret = share_xenoprof_page_with_guest( d, virt_to_mfn(d->xenoprof->rawbuf), d->xenoprof->npages); diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index f1f9446bd5..35f3ea107b 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -40,25 +40,6 @@ typedef union { } xenoprof_buf_t; #endif -struct xenoprof_vcpu { - int event_size; - xenoprof_buf_t *buffer; -}; - -struct xenoprof { - char *rawbuf; - int npages; - int nbuf; - int bufsize; - int domain_type; - int domain_ready; - int is_primary; -#ifdef CONFIG_COMPAT - int is_compat; -#endif - struct xenoprof_vcpu *vcpu; -}; - #ifndef CONFIG_COMPAT #define XENOPROF_COMPAT(x) 0 #define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 10:00:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2020 10:00:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXti-0001dG-KT; Mon, 04 May 2020 10:00:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXth-0001d7-BO for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:25 +0000 X-Inumbo-ID: 12f5dbc2-8dee-11ea-9d0b-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 12f5dbc2-8dee-11ea-9d0b-12813bfff9fa; Mon, 04 May 2020 10:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4U455fLH0PV5WRNecB0IKyowbSzRAsv3mNWgm1svFU0=; b=c2auRHcutkrCk7SGuHYb9qFEYK qy4LV9+u2Z4ZIrrlnNG6qkCO4NqAv2Jbo4kgL9NwMxNDHqY+zx4cU0o/6daoEpfjchXRjsu6Tzm8C il9q8nqdXoEgZ6WQIFsQjRvOTHHrLxsEca+H3Q6ZROAYEF39uzvnK++csLbX6zf7m4hA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtg-0005Kc-NB for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVXtg-0006Or-M8 for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xenoprof: limit scope of types and #define-s Message-Id: Date: Mon, 04 May 2020 10:00:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8d928648fd816f97ba3ebe98ab5d4b4a7def58ff Author: Jan Beulich AuthorDate: Mon May 4 11:51:47 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:51:47 2020 +0200 xenoprof: limit scope of types and #define-s Quite a few of the items are used by xenoprof.c only, so move them there to limit their visibility as well as the amount of re-building needed in case of changes. Also drop the inclusion of the public header there. Signed-off-by: Jan Beulich Acked-by: Wei Liu --- xen/arch/x86/oprofile/nmi_int.c | 2 +- xen/common/xenoprof.c | 26 ++++++++++++++++++++++++++ xen/include/asm-x86/xenoprof.h | 2 ++ xen/include/xen/xenoprof.h | 33 ++------------------------------- xen/xsm/flask/hooks.c | 1 + 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index 2969db47fc..0f103d80a6 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index 8a78957fbe..1926a92fe4 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -23,6 +23,32 @@ #undef virt_to_mfn #define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) +#define XENOPROF_DOMAIN_IGNORED 0 +#define XENOPROF_DOMAIN_ACTIVE 1 +#define XENOPROF_DOMAIN_PASSIVE 2 + +#define XENOPROF_IDLE 0 +#define XENOPROF_INITIALIZED 1 +#define XENOPROF_COUNTERS_RESERVED 2 +#define XENOPROF_READY 3 +#define XENOPROF_PROFILING 4 + +#ifndef CONFIG_COMPAT +#define XENOPROF_COMPAT(x) false +typedef struct xenoprof_buf xenoprof_buf_t; +#define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field) +#else +#include +#define XENOPROF_COMPAT(x) ((x)->is_compat) +typedef union { + struct xenoprof_buf native; + struct compat_oprof_buf compat; +} xenoprof_buf_t; +#define xenoprof_buf(d, b, field) ACCESS_ONCE(*(!(d)->xenoprof->is_compat \ + ? &(b)->native.field \ + : &(b)->compat.field)) +#endif + /* Limit amount of pages used for shared buffer (per domain) */ #define MAX_OPROF_SHARED_PAGES 32 diff --git a/xen/include/asm-x86/xenoprof.h b/xen/include/asm-x86/xenoprof.h index eeac9f2ca1..1026ba2e1f 100644 --- a/xen/include/asm-x86/xenoprof.h +++ b/xen/include/asm-x86/xenoprof.h @@ -26,6 +26,8 @@ struct vcpu; #ifdef CONFIG_XENOPROF +#include + int nmi_reserve_counters(void); int nmi_setup_events(void); int nmi_enable_virq(void); diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index 35f3ea107b..101514c148 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -11,7 +11,6 @@ #define __XEN_XENOPROF_H__ #include -#include #include #define PMU_OWNER_NONE 0 @@ -20,37 +19,9 @@ #ifdef CONFIG_XENOPROF -#define XENOPROF_DOMAIN_IGNORED 0 -#define XENOPROF_DOMAIN_ACTIVE 1 -#define XENOPROF_DOMAIN_PASSIVE 2 - -#define XENOPROF_IDLE 0 -#define XENOPROF_INITIALIZED 1 -#define XENOPROF_COUNTERS_RESERVED 2 -#define XENOPROF_READY 3 -#define XENOPROF_PROFILING 4 - -#ifndef CONFIG_COMPAT -typedef struct xenoprof_buf xenoprof_buf_t; -#else -#include -typedef union { - struct xenoprof_buf native; - struct compat_oprof_buf compat; -} xenoprof_buf_t; -#endif - -#ifndef CONFIG_COMPAT -#define XENOPROF_COMPAT(x) 0 -#define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field) -#else -#define XENOPROF_COMPAT(x) ((x)->is_compat) -#define xenoprof_buf(d, b, field) ACCESS_ONCE(*(!(d)->xenoprof->is_compat \ - ? &(b)->native.field \ - : &(b)->compat.field)) -#endif - struct domain; +struct vcpu; +struct cpu_user_regs; int acquire_pmu_ownership(int pmu_ownership); void release_pmu_ownership(int pmu_ownership); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 8af8602b46..4649e6fd95 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 10:00:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2020 10:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXts-0001eJ-M6; Mon, 04 May 2020 10:00:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtr-0001e7-Dv for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:35 +0000 X-Inumbo-ID: 18f6de68-8dee-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 18f6de68-8dee-11ea-9887-bc764e2007e4; Mon, 04 May 2020 10:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BU59pnVMiozUYPGgPpRs0KquGwURhKjhG4cBnql0RY0=; b=IlyD+gQcDEppUeABpiL9VSXVjy tgFkEwFKS2z8K3LFTQ9HiXzluxFPExaAgSFWmeehXW2NkiA7RTp9N+h1FuoiN4xx5MDHUCsXp8nc2 ZxIYsbDagMBX7iAXib7ylT0MoZHvxNoaO9bHF6YsPO3M96+Ia7Vqy0T7MqVYpDJZiPv8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXtq-0005Kl-Pu for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVXtq-0006PP-Om for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/hap: be more selective with assisted TLB flush Message-Id: Date: Mon, 04 May 2020 10:00:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 17b997aa1edb9eb8d9bd1958457ff50927f46832 Author: Roger Pau Monné AuthorDate: Mon May 4 11:53:01 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:53:01 2020 +0200 x86/hap: be more selective with assisted TLB flush When doing an assisted flush on HAP the purpose of the on_selected_cpus is just to trigger a vmexit on remote CPUs that are in guest context, and hence just using is_vcpu_dirty_cpu is too lax, also check that the vCPU is running. Due to the lazy context switching done by Xen dirty_cpu won't always be cleared when the guest vCPU is not running, and hence relying on is_running allows more fine grained control of whether the vCPU is actually running. I've measured the time of the non-local branch of flush_area_mask inside the shim running with 32vCPUs over 100000 executions and averaged the result on a large Westmere system (80 ways total). The figures where fetched during the boot of a SLES 11 PV guest. The results are as follow (less is better): Non assisted flush with x2APIC: 112406ns Assisted flush without this patch: 820450ns Assisted flush with this patch: 8330ns While there also pass NULL as the data parameter of on_selected_cpus, the dummy handler doesn't consume the data in any way. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/mm/hap/hap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 580d1c2164..0275cdf5c8 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -719,7 +719,7 @@ static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), hvm_asid_flush_vcpu(v); cpu = read_atomic(&v->dirty_cpu); - if ( cpu != this_cpu && is_vcpu_dirty_cpu(cpu) ) + if ( cpu != this_cpu && is_vcpu_dirty_cpu(cpu) && v->is_running ) __cpumask_set_cpu(cpu, mask); } @@ -729,7 +729,7 @@ static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), * not currently running will already be flushed when scheduled because of * the ASID tickle done in the loop above. */ - on_selected_cpus(mask, dummy_flush, mask, 0); + on_selected_cpus(mask, dummy_flush, NULL, 0); return true; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 10:00:46 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2020 10:00:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXu2-0001fz-No; Mon, 04 May 2020 10:00:46 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXu1-0001fp-Co for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:45 +0000 X-Inumbo-ID: 1ef82e3e-8dee-11ea-9d0b-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1ef82e3e-8dee-11ea-9d0b-12813bfff9fa; Mon, 04 May 2020 10:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QZTquNMTeovyupWq3pMsy2hukkCcxOG1hNPcahS+Ia8=; b=ib341sp8k0rsZXScidOHiPbfzW XFySgaMzvecuV0sSi+SG6kawuRpjgU424Uj+J/TDt0nUsxY+Hd1C4Hst3rlIdIkbC30qFP+ONGZcN 6am7Fsx1IseOf64CliwxATqm6rWdMu6n4ndx1pNHxH3hXvUFPCwCIwoud8nPiP1V/F7w=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXu0-0005La-Sn for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVXu0-0006QJ-Rh for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/EFI: correct section offsets in mkreloc diagnostics Message-Id: Date: Mon, 04 May 2020 10:00:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b0f666c569b8af6a51ab8aeec3664d6acd1abee9 Author: Jan Beulich AuthorDate: Mon May 4 11:53:42 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:53:42 2020 +0200 x86/EFI: correct section offsets in mkreloc diagnostics These are more helpful if they point at the address where the relocated value starts, rather than at the specific byte of the difference. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/efi/mkreloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/mkreloc.c b/xen/arch/x86/efi/mkreloc.c index 1aca79672a..83a0afa00b 100644 --- a/xen/arch/x86/efi/mkreloc.c +++ b/xen/arch/x86/efi/mkreloc.c @@ -238,7 +238,7 @@ static void diff_sections(const unsigned char *ptr1, const unsigned char *ptr2, fprintf(stderr, "Difference at %.8s:%08" PRIxFAST32 " is %#" PRIxFAST64 " (expected %#" PRIxFAST64 ")\n", - sec->name, i, delta, diff); + sec->name, i - disp, delta, diff); continue; } if ( width == 8 && (val1.u64 < base || val1.u64 > end) ) @@ -263,14 +263,14 @@ static void diff_sections(const unsigned char *ptr1, const unsigned char *ptr2, { fprintf(stderr, "Cannot handle decreasing RVA (at %.8s:%08" PRIxFAST32 ")\n", - sec->name, i); + sec->name, i - disp); exit(3); } if ( !(sec->flags & COFF_SECTION_WRITEABLE) ) fprintf(stderr, "Warning: relocation to r/o section %.8s:%08" PRIxFAST32 "\n", - sec->name, i); + sec->name, i - disp); printf("\t.word (%u << 12) | 0x%03" PRIxFAST32 "\n", reloc, sec->rva + i - disp - rva); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 10:00:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2020 10:00:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXuC-0001h5-PW; Mon, 04 May 2020 10:00:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXuB-0001gt-H0 for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:55 +0000 X-Inumbo-ID: 24f9c176-8dee-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 24f9c176-8dee-11ea-b9cf-bc764e2007e4; Mon, 04 May 2020 10:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sPJO9C4Ry5fmPjEpxdvZk0fVkze4nrOfs2Ns814mzAw=; b=RdARgU566OFavlj1r/x4aFHrmi GGszDXYzEISvOiY1yXNnZ+H/rKJrYlAblfqRVFzrDL4WgZw944aoF62ioJlohU5XXe8gwfKQXcGCQ 43ayS1p4Gv/eAD5pc6Gmhji6A9+8W2NbsgpjGku2CSudqdAMIZrkA66lMZPEnUmXIjps=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVXuA-0005Lj-VP for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVXuA-0006Qy-UU for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:00:54 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/HyperV: correct hv_hcall_page for xen.efi build Message-Id: Date: Mon, 04 May 2020 10:00:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0c9751b53c2ee135fd484a03fd47f3bb5fbe63b8 Author: Jan Beulich AuthorDate: Mon May 4 11:54:35 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:54:35 2020 +0200 x86/HyperV: correct hv_hcall_page for xen.efi build Along the lines of what the not reverted part of 3c4b2eef4941 ("x86: refine link time stub area related assertion") did, we need to transform the absolute HV_HCALL_PAGE into the image base relative hv_hcall_page (or else there'd be no need for two distinct symbols). Otherwise mkreloc, as used for generating the base relocations of xen.efi, will spit out warnings like "Difference at .text:0009b74f is 0xc0000000 (expected 0x40000000)". As long as the offending relocations are PC relative ones, the generated binary is correct afaict, but if there ever was the absolute address stored, xen.efi would miss a fixup for it. Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Wei Liu --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 7f9459d683..0e3a733cab 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -327,7 +327,7 @@ SECTIONS #endif #ifdef CONFIG_HYPERV_GUEST - hv_hcall_page = ABSOLUTE(HV_HCALL_PAGE); + hv_hcall_page = ABSOLUTE(HV_HCALL_PAGE - XEN_VIRT_START + __XEN_VIRT_START); #endif /* Sections to be discarded */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 04 10:11:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 04 May 2020 10:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVY42-0002w8-6o; Mon, 04 May 2020 10:11:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVY41-0002w1-HF for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:11:05 +0000 X-Inumbo-ID: 9087e2c8-8def-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9087e2c8-8def-11ea-9887-bc764e2007e4; Mon, 04 May 2020 10:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ehzXQHGZe2NKxHtRhTQUUA6AOtV8XplovU43h0KuywQ=; b=HXH4Ys7RoOBwAt48Dx9CSThK4E VxpJqgiC49fK4q/bsbAlXURVZBm0MZsIEUCVDckK6sAHlLLltFdd/4lAO5KvNQ1KKDoSPYLHztRR/ fCLRmI3Q/SZxI8ELQI8d4Eo9Mj9cVJcJSDGSqsvqk07mUtSvNeVc9zWbAyH+k4jXSA2M=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVY40-0005Ya-TY for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVY40-00076S-SP for xen-changelog@lists.xenproject.org; Mon, 04 May 2020 10:11:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/amd: Initial support for Fam19h processors Message-Id: Date: Mon, 04 May 2020 10:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fe36a173d110fd792f5e337e208a5ed714df1536 Author: Andrew Cooper AuthorDate: Thu Apr 30 10:47:14 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 4 11:04:29 2020 +0100 x86/amd: Initial support for Fam19h processors Fam19h is very similar to Fam17h in these regards. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 1 + xen/arch/x86/cpu/microcode/amd.c | 4 ++++ xen/arch/x86/cpu/vpmu_amd.c | 1 + xen/arch/x86/nmi.c | 2 +- xen/arch/x86/traps.c | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index e00f2a82de..b83446e77d 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1356,6 +1356,7 @@ static void amd_cpuidle_init(struct acpi_processor_power *power) switch ( c->x86 ) { + case 0x19: case 0x18: if ( boot_cpu_data.x86_vendor != X86_VENDOR_HYGON ) { diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 13bf9f4dee..3f0969e70d 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -112,6 +112,7 @@ static bool_t verify_patch_size(uint32_t patch_size) #define F15H_MPB_MAX_SIZE 4096 #define F16H_MPB_MAX_SIZE 3458 #define F17H_MPB_MAX_SIZE 3200 +#define F19H_MPB_MAX_SIZE 4800 switch (boot_cpu_data.x86) { @@ -127,6 +128,9 @@ static bool_t verify_patch_size(uint32_t patch_size) case 0x17: max_size = F17H_MPB_MAX_SIZE; break; + case 0x19: + max_size = F19H_MPB_MAX_SIZE; + break; default: max_size = F1XH_MPB_MAX_SIZE; break; diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 3c6799b42c..eba47cd2a0 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -576,6 +576,7 @@ int __init amd_vpmu_init(void) { case 0x15: case 0x17: + case 0x19: num_counters = F15H_NUM_COUNTERS; counters = AMD_F15H_COUNTERS; ctrls = AMD_F15H_CTRLS; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index c3f92ed231..014524486f 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -398,7 +398,7 @@ void setup_apic_nmi_watchdog(void) case X86_VENDOR_AMD: switch (boot_cpu_data.x86) { case 6: - case 0xf ... 0x17: + case 0xf ... 0x19: setup_k7_watchdog(); break; default: diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0bcf554e93..33e5d21ece 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1939,7 +1939,7 @@ static unsigned int calc_ler_msr(void) switch ( boot_cpu_data.x86 ) { case 6: - case 0xf ... 0x17: + case 0xf ... 0x19: return MSR_IA32_LASTINTFROMIP; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:55:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 07:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVsPz-0001do-FE; Tue, 05 May 2020 07:55:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVsPy-0001dj-L7 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 07:55:06 +0000 X-Inumbo-ID: bb004c8c-8ea5-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bb004c8c-8ea5-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 07:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ds5d/pwlZvT4lpQ6a4Yl2QYHBi+CJfmx/pt4OtP6j0A=; b=Rq3bJqZwuja3XtNyy7+jaJ4vQx QxHuiKm8F+YLg0JPkNE9QcxfiLRJmkGVqBAaAdReZMc2jRT9gQ18vbgXRjqpIun2UW9pvPXS8kzlO twdp1oq3kCS+j+VMwIB1qIZgtkKrKnKYUMFdYTyCtdrfH4byxE76k+7TCriq6Pl4z/wc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVsPw-0004L0-I7 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 07:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVsPw-0008RT-Gn for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 07:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: extend x86_insn_is_mem_write() coverage Message-Id: Date: Tue, 05 May 2020 07:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fc6fa977be54a24a1325e3f2d08b1b1dcb675f44 Author: Jan Beulich AuthorDate: Tue May 5 09:50:54 2020 +0200 Commit: Jan Beulich CommitDate: Tue May 5 09:50:54 2020 +0200 x86emul: extend x86_insn_is_mem_write() coverage Several insns were missed when this function was first added. As far as insns already supported by the emulator go - SMSW and {,V}STMXCSR were wrongly considered r/o insns so far. Insns like the VMX, SVM, or CET-SS ones, PTWRITE, or AMD's new SNP ones are intentionally not covered just yet. VMPTRST is put there just to complete the respective group. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1959fc227a..7503da980f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -11551,13 +11551,39 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, break; case X86EMUL_OPC(0x0f, 0x01): - return !(state->modrm_reg & 6); /* SGDT / SIDT */ + switch ( state->modrm_reg & 7 ) + { + case 0: /* SGDT */ + case 1: /* SIDT */ + case 4: /* SMSW */ + return true; + } + break; + + case X86EMUL_OPC(0x0f, 0xae): + switch ( state->modrm_reg & 7 ) + { + case 0: /* FXSAVE */ + case 3: /* {,V}STMXCSR */ + case 4: /* XSAVE */ + case 6: /* XSAVEOPT */ + return true; + } + break; case X86EMUL_OPC(0x0f, 0xba): return (state->modrm_reg & 7) > 4; /* BTS / BTR / BTC */ case X86EMUL_OPC(0x0f, 0xc7): - return (state->modrm_reg & 7) == 1; /* CMPXCHG{8,16}B */ + switch ( state->modrm_reg & 7 ) + { + case 1: /* CMPXCHG{8,16}B */ + case 4: /* XSAVEC */ + case 5: /* XSAVES */ + case 7: /* VMPTRST */ + return true; + } + break; } return false; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 07:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 07:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVsQ8-0001eu-Gj; Tue, 05 May 2020 07:55:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVsQ7-0001el-MM for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 07:55:15 +0000 X-Inumbo-ID: c099ea19-8ea5-11ea-9d92-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c099ea19-8ea5-11ea-9d92-12813bfff9fa; Tue, 05 May 2020 07:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Fzrkz4tlCPgut+j8R8iTqVceczNZZPvZinMvwX3B8Xo=; b=F8G8GTq66mckm4GJH3S2oGTjtk bBtaTtCuO+srP6+6XXwpCIvf/Qw5Elz6YB9AYZQaL4ZOOpD5iP1sfk8m+9xN0+v34bQHt4s8qhGHA nJddchJZ3H9RE6ImRnG7Hm8h7Iaz0VT0hFIdI+dpeCH3wI2Bo1adnJyHtWNjqmGULgus=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVsQ6-0004Lh-Kx for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 07:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVsQ6-0008SB-Jp for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 07:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/hvm: simplify hvm_physdev_op allowance control Message-Id: Date: Tue, 05 May 2020 07:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a00e3737e085ebc1f313e36b188d4958e939e531 Author: Roger Pau Monné AuthorDate: Tue May 5 09:52:28 2020 +0200 Commit: Jan Beulich CommitDate: Tue May 5 09:52:28 2020 +0200 x86/hvm: simplify hvm_physdev_op allowance control PVHv1 dom0 was given access to all PHYSDEVOP hypercalls, and such restriction was not removed when PVHv1 code was removed. As a result the switch in hvm_physdev_op was more complicated than required, and relied on PVHv2 dom0 not having PIRQ support in order to prevent access to some PV specific PHYSDEVOPs. Fix this by moving the default case to the bottom of the switch, since there's no need for any fall through now. Also remove the hardware domain check, as all the not explicitly listed PHYSDEVOPs are forbidden for HVM domains. Finally tighten the condition to allow usage of PHYSDEVOP_pci_mmcfg_reserved: apart from having vPCI enabled it should only be used by the hardware domain. Note that the code in do_physdev_op is already restricting the call to privileged domains only, but it can be further restricted to the hardware domain only, as other privileged domains don't have access to MMCFG regions anyway. Overall no functional change should arise from this change. Reported-by: Julien Grall Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hypercall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 17ba0fe91b..c41c2179c9 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -82,26 +82,26 @@ static long hvm_grant_table_op( static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { const struct vcpu *curr = current; + const struct domain *currd = curr->domain; switch ( cmd ) { - default: - if ( !is_hardware_domain(curr->domain) ) - return -ENOSYS; - /* fall through */ case PHYSDEVOP_map_pirq: case PHYSDEVOP_unmap_pirq: case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: - if ( !has_pirq(curr->domain) ) + if ( !has_pirq(currd) ) return -ENOSYS; break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(curr->domain) ) + if ( !has_vpci(currd) || !is_hardware_domain(currd) ) return -ENOSYS; break; + + default: + return -ENOSYS; } if ( !curr->hcall_compat ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:22:20 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:22:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySW-00036L-FU; Tue, 05 May 2020 14:22:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySU-00036E-JT for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:06 +0000 X-Inumbo-ID: cb11b576-8edb-11ea-9dc1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cb11b576-8edb-11ea-9dc1-12813bfff9fa; Tue, 05 May 2020 14:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bAv0RoJJF3XFbi64Vz9rFlQWXwSFBSbQWzt3yqmqamI=; b=C6B20YzPADhWv+BO3ZLerU4rPX lnzkw5sdZ+LVOMKmZOzsofxv8YEZ2jHiWlbNGoDmohJSCZpIj+8ECwZZdA0brmu/UHy48qs6e48LW 9AHbYGk0yMaNCKuRPkKq9CEui8v/1oQ8opAB4SrUBfKYsgQJOP6Ks0fRkdqMhmGvBZbU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySS-0003v3-Af for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVySS-00082K-9V for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] tools/xentop: Fix calculation of used memory Message-Id: Date: Tue, 05 May 2020 14:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e04b94a54fd550636600f8d32f6076c6167dab52 Author: Sander Eikelenboom AuthorDate: Wed Feb 19 21:31:30 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:10:55 2020 +0100 tools/xentop: Fix calculation of used memory Used memory should be calculated by subtracting free memory from total memory. Fixes: c588c002cc1 ("tools: remove tmem code and commands") Signed-off-by: Sander Eikelenboom Acked-by: Wei Liu (cherry picked from commit 4b5b431edd984b26f43b3efc7de465f3560a949e) --- tools/xenstat/xentop/xentop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index af11ebfbf7..f9f4dfb453 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -969,7 +969,7 @@ void do_summary(void) "%u crashed, %u dying, %u shutdown \n", num_domains, run, block, pause, crash, dying, shutdown); - used = xenstat_node_tot_mem(cur_node); + used = xenstat_node_tot_mem(cur_node) - xenstat_node_free_mem(cur_node); freeable_mb = 0; /* Dump node memory and cpu information */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:22:21 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:22:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySe-00036h-H0; Tue, 05 May 2020 14:22:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySd-00036a-D6 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:15 +0000 X-Inumbo-ID: d110ffcc-8edb-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d110ffcc-8edb-11ea-b9cf-bc764e2007e4; Tue, 05 May 2020 14:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AqkOBDEDwWcMXl/EJ5Yefggi5YSrClbKvgMXKRE9c0g=; b=t271tAvPdVBo8vpBbIvlGTLyjv NH5NZLdnQFIwd1dV4zRWdJZz8ZCglAtv7Zgurn8cKqICEJp98RHSfqoax3OEhVTFbEJ56FoLR4DcX T+gEkqKFZlqpzn9ff5/78PM4HIQb2TxDCNCSsp9wD3IVRE410apVgvtCHuLmfRaLwI9w=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySc-0003vD-DQ for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVySc-00083D-CV for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Tue, 05 May 2020 14:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5f3c215eb5a537c5d5bcfbaafb3e547bcb62d960 Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:12:36 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:22:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySo-00038E-IU; Tue, 05 May 2020 14:22:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySn-000386-87 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:25 +0000 X-Inumbo-ID: d7163680-8edb-11ea-9dc1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d7163680-8edb-11ea-9dc1-12813bfff9fa; Tue, 05 May 2020 14:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=iGTbegKitEtKsEjJs+GbSD9dr6Aaj+i1d2iyyZtQfAY=; b=4fJo/l6v8vCs6jF6mVCmvpegki YnbMCDb7w4q0Fn9EajsxWdTClD3tPNqxNDidY/AqyQ0lUw9K/EiZperHqzmqDNfyCDunAXglB4puG Qt1xvq1wWgAm+tqGRx7O2OsyFUFNRlgHabxeSIrSkqTmeKta70m9RuEDrUM0x/IdQ96I=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySm-0003vM-Fy for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVySm-00083r-Ez for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] docs: document CONTROL command of xenstore protocol Message-Id: Date: Tue, 05 May 2020 14:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 003300eed37e76917ae44bfdf1cdbda1daf00e4d Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:12:41 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:22:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:22:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySy-00039f-KU; Tue, 05 May 2020 14:22:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySx-00039T-9s for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:35 +0000 X-Inumbo-ID: dd19952c-8edb-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id dd19952c-8edb-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2QeTtu3Y2+yK481bREbmWneirMena+Fwi2xiBCN4v+g=; b=PDjPkFHATl6G5pIY+xJSXadDAw KXS9yYk0YZ3Op4BSaF0IE4gNxa5zEN5timEriz33zEcTNR9Xv8yyp/Ksv4HIWOYD+IYBN1MXy6/0O 2/OMv7gBHHmP0wOkC9HAPlxJdkL2SrV8OHKtTugXHuhXXVKqdOHzuQs5tyho67LRo2SI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVySw-0003w5-In for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVySw-00085i-Hg for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] docs: Render .md files using pandoc Message-Id: Date: Tue, 05 May 2020 14:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b9c93d4e178b9b4705f63052ccab7b4f51b97d4c Author: Andrew Cooper AuthorDate: Fri Apr 3 14:12:12 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:12:47 2020 +0100 docs: Render .md files using pandoc This fixes the fact that qemu-deprivilege.md, non-cooperative-migration.md and xenstore-migration.md don't currently get rendered at all, and are therefore missing from xenbits.xen.org/docs Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Reviewed-by: Ian Jackson Backport: 4.12 (cherry picked from commit 37053578e8bd57de9d114b19a29f5ab1533d6071) --- docs/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index d8ba99b1dc..3eae2dae60 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,7 +15,7 @@ RST-SRC-y := $(sort $(filter-out %index.rst,$(shell find * -type f -name '*.rst' TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(shell find designs/ features/ misc/ process/ specs/ -name '*.pandoc' -print)) +PANDOCSRC-y := $(sort $(shell find designs/ features/ misc/ process/ specs/ \( -name '*.pandoc' -o -name '*.md' \) -print)) # Documentation targets $(foreach i,$(MAN_SECTIONS), \ @@ -24,15 +24,18 @@ $(foreach i,$(MAN_SECTIONS), \ DOC_HTML := html/SUPPORT.html \ $(patsubst %.pandoc,html/%.html,$(PANDOCSRC-y)) \ + $(patsubst %.md,html/%.html,$(PANDOCSRC-y)) \ $(patsubst %.rst,html/%.html,$(RST-SRC-y)) \ $(patsubst %,html/%.html,$(MAN-SRC-y)) \ $(patsubst %.txt,html/%.txt,$(TXTSRC-y)) \ $(patsubst %,html/hypercall/%/index.html,$(DOC_ARCHES)) DOC_TXT := $(patsubst %.txt,txt/%.txt,$(TXTSRC-y)) \ $(patsubst %.pandoc,txt/%.txt,$(PANDOCSRC-y)) \ + $(patsubst %.md,txt/%.txt,$(PANDOCSRC-y)) \ $(patsubst %.rst,txt/%.txt,$(RST-SRC-y)) \ $(patsubst %,txt/%.txt,$(MAN-SRC-y)) DOC_PDF := $(patsubst %.pandoc,pdf/%.pdf,$(PANDOCSRC-y)) \ + $(patsubst %.md,pdf/%.pdf,$(PANDOCSRC-y)) \ $(patsubst %.rst,pdf/%.pdf,$(RST-SRC-y)) # Top level build targets @@ -228,12 +231,10 @@ define GENERATE_PANDOC_RULE # $(1) is the target documentation format. $(2) is the source format. $(call GENERATE_PANDOC_RULE_RAW,$(1)/%.$(1),%.$(2)) endef -$(eval $(call GENERATE_PANDOC_RULE,pdf,pandoc)) # pdf/%.pdf: %.pandoc -$(eval $(call GENERATE_PANDOC_RULE,pdf,rst)) # pdf/%.pdf: %.rst -$(eval $(call GENERATE_PANDOC_RULE,txt,pandoc)) # txt/%.txt: %.pandoc -$(eval $(call GENERATE_PANDOC_RULE,txt,rst)) # txt/%.txt: %.rst -$(eval $(call GENERATE_PANDOC_RULE,html,pandoc)) # html/%.html: %.pandoc -$(eval $(call GENERATE_PANDOC_RULE,html,rst)) # html/%.html: %.rst + +$(foreach dst-fmt,pdf txt html,\ +$(foreach src-fmt,pandoc md rst,\ +$(eval $(call GENERATE_PANDOC_RULE,$(dst-fmt),$(src-fmt))))) $(eval $(call GENERATE_PANDOC_RULE_RAW,html/SUPPORT.html,$(XEN_ROOT)/SUPPORT.md)) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:22:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyT9-0003Ab-M4; Tue, 05 May 2020 14:22:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyT7-0003AS-PH for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:45 +0000 X-Inumbo-ID: e319c2d0-8edb-11ea-9dc1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e319c2d0-8edb-11ea-9dc1-12813bfff9fa; Tue, 05 May 2020 14:22:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0VwRB2mX5oFJferp5mjGjk2PXFyizRQATFt3UXhYghw=; b=qHaP/rjFURxR1pzOC4yegf/sVX xqrGOsqzdDt+tsuIWFi2P4mPiP54R1zOCjX2VG1TCaKUPTICeg+sA6zYqggZD1HahrLRRcmtcdoj5 5JHBE/c9hVEEYEXgdlC3rRagcReD0x0nvJFWoUB37YzId5u0qrn+LX5cZdpQJq1U+/II=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyT6-0003wE-Lh for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyT6-00086O-KX for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] tools/python: mismatch between pyxc_methods flags and PyObject definitions Message-Id: Date: Tue, 05 May 2020 14:22:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 93e762d1e2a769b11de5a725e8c59872ae9e055d Author: YOUNG, MICHAEL A AuthorDate: Tue Mar 17 23:01:43 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:13:11 2020 +0100 tools/python: mismatch between pyxc_methods flags and PyObject definitions pygrub in xen-4.13.0 with python 3.8.2 fails with the error Traceback (most recent call last): File "/usr/libexec/xen/bin/pygrub", line 21, in import xen.lowlevel.xc SystemError: bad call flags This patch fixes mismatches in tools/python/xen/lowlevel/xc/xc.c between the flag bits defined in pyxc_methods and the parameters passed to the corresponding PyObject definitions. With this patch applied pygrub works as expected. Signed-off-by: Michael Young Reviewed-by: Wei Liu Acked-by: Marek Marczykowski-Górecki (cherry picked from commit e19b4b3b55f84e0cfcc02fe5d66965969a81c965) --- tools/python/xen/lowlevel/xc/xc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index a751e85910..80b3452ac2 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -2106,7 +2106,7 @@ static PyMethodDef pyxc_methods[] = { { "gnttab_hvm_seed", (PyCFunction)pyxc_gnttab_hvm_seed, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Initialise HVM guest grant table.\n" " dom [int]: Identifier of domain to build into.\n" " console_gmfn [int]: \n" @@ -2175,7 +2175,7 @@ static PyMethodDef pyxc_methods[] = { { "sched_credit_domain_set", (PyCFunction)pyxc_sched_credit_domain_set, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Set the scheduling parameters for a domain when running with the\n" "SMP credit scheduler.\n" " domid [int]: domain id to set\n" @@ -2193,7 +2193,7 @@ static PyMethodDef pyxc_methods[] = { { "sched_credit2_domain_set", (PyCFunction)pyxc_sched_credit2_domain_set, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Set the scheduling parameters for a domain when running with the\n" "SMP credit2 scheduler.\n" " domid [int]: domain id to set\n" @@ -2491,21 +2491,21 @@ static PyMethodDef pyxc_methods[] = { { "flask_context_to_sid", (PyCFunction)pyflask_context_to_sid, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Convert a context string to a dynamic SID.\n" " context [str]: String specifying context to be converted\n" "Returns: [int]: Numeric SID on success; -1 on error.\n" }, { "flask_sid_to_context", (PyCFunction)pyflask_sid_to_context, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Convert a dynamic SID to context string.\n" " context [int]: SID to be converted\n" "Returns: [str]: Numeric SID on success; -1 on error.\n" }, { "flask_load", (PyCFunction)pyflask_load, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Loads a policy into the hypervisor.\n" " policy [str]: policy to be load\n" "Returns: [int]: 0 on success; -1 on failure.\n" }, @@ -2518,14 +2518,14 @@ static PyMethodDef pyxc_methods[] = { { "flask_setenforce", (PyCFunction)pyflask_setenforce, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Modifies the current mode for the Flask XSM module.\n" " mode [int]: mode to change to\n" "Returns: [int]: 0 on success; -1 on failure.\n" }, { "flask_access", (PyCFunction)pyflask_access, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Returns whether a source context has access to target context based on \ class and permissions requested.\n" " scon [str]: source context\n" -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:22:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:22:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTI-0003BR-Nj; Tue, 05 May 2020 14:22:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTH-0003BH-Cu for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:55 +0000 X-Inumbo-ID: e91d6ea2-8edb-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e91d6ea2-8edb-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ell9qcCVa5doijO6IOqkiqV5IrKLyvDyM8kU5l2tkHw=; b=Qsqs5gzf59htcdY0jxcm1HTbkt y6XE3g1j8cht9glq7+v8h21KGcdrRgOEFoqCjagnlxS9puXAdZgzIpmXOSJZDaesnU8Xm/GKC0owg 8fRJVreAZWQCq3yPBrqHIAii9XT2CDVU7mQ/NMnJ0VIhDhbRWfycHwA+x8M+/9I7VkTA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTG-0003wP-OJ for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyTG-00087I-NQ for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:22:54 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] docs/misc: pvcalls: Verbatim block should be indented with 4 spaces Message-Id: Date: Tue, 05 May 2020 14:22:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8b60270731eabe7a7dfd41bd625338505829a617 Author: Julien Grall AuthorDate: Sat Jan 11 00:03:44 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:19:01 2020 +0100 docs/misc: pvcalls: Verbatim block should be indented with 4 spaces At the moment, the diagram is only indented with 2 spaces. So pandoc will try to badly interpret it and not display it correctly. Fix it by indenting all the block by 4 spaces (i.e an extra 2 spaces). Fixes: d661611d08 ("docs/markdown: Switch to using pandoc, and fix underscore escaping") Signed-off-by: Julien Grall Acked-by: Andrew Cooper Acked-by: Stefano Stabellini (cherry picked from commit 9c8705f8fe5bfb75a6a00163308d297059b61f6a) --- docs/misc/pvcalls.pandoc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/misc/pvcalls.pandoc b/docs/misc/pvcalls.pandoc index 0c48b29842..729cf97bdf 100644 --- a/docs/misc/pvcalls.pandoc +++ b/docs/misc/pvcalls.pandoc @@ -867,24 +867,24 @@ and the second half to the **out** array. They are used as circular buffers for transferring data, and, together, they are the data ring. - +---------------------------+ Indexes page - | Command ring: | +----------------------+ - | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | - | @44: ref +-------------------------------->+@76: ring_order = 1 | - | | |@80: ref[0]+ | - +---------------------------+ |@84: ref[1]+ | - | | | - | | | - +----------------------+ - | - v (data ring) - +-------+-----------+ - | @0->4098: in | - | ref[0] | - |-------------------| - | @4099->8196: out | - | ref[1] | - +-------------------+ + +---------------------------+ Indexes page + | Command ring: | +----------------------+ + | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | + | @44: ref +-------------------------------->+@76: ring_order = 1 | + | | |@80: ref[0]+ | + +---------------------------+ |@84: ref[1]+ | + | | | + | | | + +----------------------+ + | + v (data ring) + +-------+-----------+ + | @0->4098: in | + | ref[0] | + |-------------------| + | @4099->8196: out | + | ref[1] | + +-------------------+ #### Indexes Page Structure -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:23:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:23:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTT-0003Da-R6; Tue, 05 May 2020 14:23:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTS-0003DT-Je for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:06 +0000 X-Inumbo-ID: ef96ed94-8edb-11ea-9dc1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ef96ed94-8edb-11ea-9dc1-12813bfff9fa; Tue, 05 May 2020 14:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=iyCpVqnPVBHuBlMJJyh9tR5rAjBqWl9gBVUXn3uifuc=; b=VXxOnCpXOVyAj6LZOR2Gy17B54 p6R4DJKeltPeivPjV6LqHtoJwDKDOuqSHT5EKHVKR/QTVd+og9QNKeT/8JQh/S/YE6s2HDwdZtyC2 C/+n2qZrPS7cuQD7+ht9IX1Bq9iZr9zJyc11azqIfto4dswY6hsa7OhgwH2XKxklygcQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTR-0003wo-II for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyTR-00088j-GS for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Tue, 05 May 2020 14:23:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5c1b607e8a4de32fc2238f4d29d477007eb5822c Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:13:40 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:23:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:23:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTc-0003EN-Sv; Tue, 05 May 2020 14:23:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTc-0003EI-9Z for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:16 +0000 X-Inumbo-ID: f5931ea2-8edb-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f5931ea2-8edb-11ea-b9cf-bc764e2007e4; Tue, 05 May 2020 14:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gVHiOnOacZZ0vip/yOm/S1Ki7MzLi0oZkNNSRkCTUEk=; b=erPah0EtP/iMdStCsxgnRI54D3 d9a1O6jbMMam20OhYPqeBy/YqodP56w+mYqOKqWTE+j3Czb0RTPLpSzmX1n9gMZASdUauGnwNQaiz l8AsjWGvQYfThXnrEpzSWIPTYtTETO/SJBRA9qkyVUmgJ+qUk3AIPbkeFedntNOtH77s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTb-0003x6-L8 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyTb-00089Y-K2 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] docs: document CONTROL command of xenstore protocol Message-Id: Date: Tue, 05 May 2020 14:23:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit daf71f0053e21ebefb0e21431ef48d53af1c3b31 Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:13:51 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:23:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTn-0003GD-Ug; Tue, 05 May 2020 14:23:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTm-0003G1-VG for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:26 +0000 X-Inumbo-ID: fbfa1b38-8edb-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fbfa1b38-8edb-11ea-b07b-bc764e2007e4; Tue, 05 May 2020 14:23:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BXze6ws0akdJ0Wl404f1lyMkStv6JFWLDZf95TwovVk=; b=hqG4px5vZAQi/hWJ3HdPZq5Td9 W0Itx+1sHHSCeaGWvW8Io9X9JpMxa5BzDiHrKGB+6D+QtIeHvYMl5mfrIiTmt4bvMH6y9fDo8xc36 wil1tx3JFgtHD9aDczYEEeutum1tnnQBwkXjK7RzvpXq1rtDIuHX3BJVepjSzezsjhUg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTm-0003xw-D3 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyTm-0008Am-Bw for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:26 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Tue, 05 May 2020 14:23:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e84b63444e190a8c4380c130c120e1d3e6f4cf31 Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:14:57 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) (cherry picked from commit 5c1b607e8a4de32fc2238f4d29d477007eb5822c) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:23:38 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:23:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTy-0003HO-0E; Tue, 05 May 2020 14:23:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTx-0003HF-3z for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:37 +0000 X-Inumbo-ID: 01fbaca4-8edc-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 01fbaca4-8edc-11ea-b9cf-bc764e2007e4; Tue, 05 May 2020 14:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BJaPh5mjmRwaAV8zOyNj5E2UtMgyQWsr4u0pZ17Kmdo=; b=AQeaifUogWB2jPFZdzaX5Klh/H pHmAc3KN15Os2yPBSTRf/JhdHg0wgPfdYYUmR+fsS5zG/Cpr1XlRq+XJB3WrieoKoNMNLbymHudGa QB4fJLVXTnXEXV/Eo5I87RWba6kdvt0V4Yy8GCtEWJi7smzm37nv+YBRYqB6zz0llpMo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyTw-0003y6-Fl for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyTw-0008BR-Ef for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:36 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] docs: document CONTROL command of xenstore protocol Message-Id: Date: Tue, 05 May 2020 14:23:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit afe82f5781bf402e56b23a46e41bbb055255a068 Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:14:58 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) (cherry picked from commit daf71f0053e21ebefb0e21431ef48d53af1c3b31) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:23:51 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:23:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyUB-0003If-21; Tue, 05 May 2020 14:23:51 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyUA-0003IY-H3 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:50 +0000 X-Inumbo-ID: 0866164c-8edc-11ea-9dc1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0866164c-8edc-11ea-9dc1-12813bfff9fa; Tue, 05 May 2020 14:23:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Wlyyn1UPnr498CwAhtynhXHDA92nVt3cpo70Tby3X+I=; b=aXlI5OCXT8iQ+6v0iALgfFAZc8 71vOIoOCd/qHhZTfg+daXBtAdXhFDBcPF7xIiik/87hm6pGv59XnG9eBdEiN4F6jENBIek0ZZs471 AhG5uSZiq0GagqnPHcxX7yeTVYXwbkVjn37RNXtQ8IzpPiUMdicelemDsCUXMvJF7zAg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyU7-0003yF-7s for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyU7-0008Cp-75 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:47 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Tue, 05 May 2020 14:23:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6e63a6f72d8d4cf16fee477384de9ffe55a53db1 Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:15:40 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) (cherry picked from commit 5c1b607e8a4de32fc2238f4d29d477007eb5822c) (cherry picked from commit e84b63444e190a8c4380c130c120e1d3e6f4cf31) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:23:59 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:23:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyUJ-0003Jn-3i; Tue, 05 May 2020 14:23:59 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyUI-0003Je-15 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:58 +0000 X-Inumbo-ID: 0e6ad5d2-8edc-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0e6ad5d2-8edc-11ea-b07b-bc764e2007e4; Tue, 05 May 2020 14:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=UivbTDAFQ+pCSkYZ0VrVPZGzgAXakR/ekUZL1I4KWfE=; b=JQUF6HzQ0Be6JUV7HQSyfedP9p TUcnfxNO+VU1kwgCj4QFmORmHxBq4etH5G4jfbvioYExbzLwYR6O7XA5Jby99nLuUpd5MTa5ZvzYI SJMRROBrMbRSxr/WMlohOd+QLuUbehMhQsloti1S1a05V+4+ll/GFmp7ljA+lUCdkEvc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyUH-0003yP-B5 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyUH-0008Df-9S for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:23:57 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] docs: document CONTROL command of xenstore protocol Message-Id: Date: Tue, 05 May 2020 14:23:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a4dd2feb8c52709d81d0b253e712a3531ac7294f Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:16:09 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) (cherry picked from commit daf71f0053e21ebefb0e21431ef48d53af1c3b31) (cherry picked from commit afe82f5781bf402e56b23a46e41bbb055255a068) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:33:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:33:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyd8-0004EI-1R; Tue, 05 May 2020 14:33:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyd7-0004ED-9g for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:33:05 +0000 X-Inumbo-ID: 5481ffb8-8edd-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5481ffb8-8edd-11ea-b9cf-bc764e2007e4; Tue, 05 May 2020 14:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=b6mZnOKr3xBF0HehE5wnVGbOfoY4yvkJRPZxUuKcrAo=; b=0Tv1PH3KG/+EmOtzA51XPzFXXG HlPgxVPZBDeSulGn/VqIAfjlZ63pji5Sbg6a/v0W21D1Hdh5/BBI5kMx5SoDj+3T6QmkVXD/g7TIy /YRwXMLKXKAPuQTwH6Wzl3vUOYhQbu2Dh8c+eewYX8wvpnM/vfht5F2pZeFK4Feacf7Y=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyd6-0004AT-CX for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyd6-0000Yt-AO for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] docs/misc: pvcalls: Verbatim block should be indented with 4 spaces Message-Id: Date: Tue, 05 May 2020 14:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5c56ea1f22d5cb1aa15c7fea76417e1b2ae0b136 Author: Julien Grall AuthorDate: Sat Jan 11 00:03:44 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:19:59 2020 +0100 docs/misc: pvcalls: Verbatim block should be indented with 4 spaces At the moment, the diagram is only indented with 2 spaces. So pandoc will try to badly interpret it and not display it correctly. Fix it by indenting all the block by 4 spaces (i.e an extra 2 spaces). Fixes: d661611d08 ("docs/markdown: Switch to using pandoc, and fix underscore escaping") Signed-off-by: Julien Grall Acked-by: Andrew Cooper Acked-by: Stefano Stabellini (cherry picked from commit 9c8705f8fe5bfb75a6a00163308d297059b61f6a) (cherry picked from commit 8b60270731eabe7a7dfd41bd625338505829a617) --- docs/misc/pvcalls.pandoc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/misc/pvcalls.pandoc b/docs/misc/pvcalls.pandoc index 0c48b29842..729cf97bdf 100644 --- a/docs/misc/pvcalls.pandoc +++ b/docs/misc/pvcalls.pandoc @@ -867,24 +867,24 @@ and the second half to the **out** array. They are used as circular buffers for transferring data, and, together, they are the data ring. - +---------------------------+ Indexes page - | Command ring: | +----------------------+ - | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | - | @44: ref +-------------------------------->+@76: ring_order = 1 | - | | |@80: ref[0]+ | - +---------------------------+ |@84: ref[1]+ | - | | | - | | | - +----------------------+ - | - v (data ring) - +-------+-----------+ - | @0->4098: in | - | ref[0] | - |-------------------| - | @4099->8196: out | - | ref[1] | - +-------------------+ + +---------------------------+ Indexes page + | Command ring: | +----------------------+ + | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | + | @44: ref +-------------------------------->+@76: ring_order = 1 | + | | |@80: ref[0]+ | + +---------------------------+ |@84: ref[1]+ | + | | | + | | | + +----------------------+ + | + v (data ring) + +-------+-----------+ + | @0->4098: in | + | ref[0] | + |-------------------| + | @4099->8196: out | + | ref[1] | + +-------------------+ #### Indexes Page Structure -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:44:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVynr-00058R-55; Tue, 05 May 2020 14:44:11 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVynp-00058M-Vj for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:10 +0000 X-Inumbo-ID: ddf59917-8ede-11ea-9dc3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ddf59917-8ede-11ea-9dc3-12813bfff9fa; Tue, 05 May 2020 14:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HmXEOLiyFBpL8YqqqRfL/NYADfvH/gjmBQpm99Z7Zj8=; b=3zL3kN0wzh3wxCVDq8nB7hkOeC IUuLtdNsEHnBtVX4HrQpZGZk++p8EFOozUqUEtp6Ndo54Zy7BHlAMRhAz4zRnc7ZZprimAyP/myWb khHNlwcEZE+pBzSeOLqWirgs8S2YEKy/5Xa44yBsj7UY8+1d8bb8TKGqZN020kE+6geI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVynk-0004Oe-OT for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVynk-0001ly-N5 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] libxl: Fix comment about dcs.sdss Message-Id: Date: Tue, 05 May 2020 14:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 48f4d695ee5713a25fc383d669b6142fbcbb7e20 Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:33:50 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index b5adbfe4b7..247518a7ac 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4148,7 +4148,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:44:21 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyo1-00059I-6h; Tue, 05 May 2020 14:44:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVynz-000592-NV for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:19 +0000 X-Inumbo-ID: e42aaeac-8ede-11ea-9dc3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e42aaeac-8ede-11ea-9dc3-12813bfff9fa; Tue, 05 May 2020 14:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CoerM5D3vllqkgsdmZT6azyUbzCzKcXjc51zYVXUq+g=; b=bVOXD1V4yD9Xo/A9BehzjuSGBI dhQwKdeBkRv73PRR1/y7vmnIw882nZbPidau3mGspxOESJZ/GAp9JlDqXL4JfPULFJdrkvkzncsfE LVNgYi9neX+q+ZqJkv4SU9BcTsjPYGlzKHTaDKxrufw768TD6jm+fuN+UF/g4xOf+ul0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVynu-0004On-Tz for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVynu-0001nc-Rn for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Tue, 05 May 2020 14:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dc5176d0f9434e275e0be1df8d0518e243798beb Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:35:54 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 1a83097952..1eae703ef6 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -214,6 +214,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -230,8 +231,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:44:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:44:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyo8-0005At-7z; Tue, 05 May 2020 14:44:28 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyo6-0005Ae-Bq for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:26 +0000 X-Inumbo-ID: ea95e27a-8ede-11ea-9dc3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ea95e27a-8ede-11ea-9dc3-12813bfff9fa; Tue, 05 May 2020 14:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vOVjou1mkDN30w37x0gbwcx2jds0o4UwUfinJ/c9nng=; b=Z9rk3jttKfzOWTRJt0vml4kFGS tATheyB15rum3UVyraBjRwXW2tvnaAr6hRTaRIK6K7N7JczxHzl3EjEAsjoMSvu/E5Fxuw9tAcZGH 4lVjqgU6ORJxX+mKDFh8cjui6Tefint7OZo8ZwGpaRLYMraT8yKYpS13YYfuA9UsSgM0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyo5-0004PU-Mm for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyo5-0001pE-Lk for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] libxl: Fix comment about dcs.sdss Message-Id: Date: Tue, 05 May 2020 14:44:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d1c9822b88463d91ca93fdc7e7fa6406efa7762f Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:31:08 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) (cherry picked from commit 5351a0a170fc7f6290d7d3d8be302d53d2426a87) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1b48293ebf..a119de7136 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4017,7 +4017,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:44:38 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoI-0005CG-9Z; Tue, 05 May 2020 14:44:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoG-0005C5-Kk for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:36 +0000 X-Inumbo-ID: f09a02c8-8ede-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f09a02c8-8ede-11ea-9887-bc764e2007e4; Tue, 05 May 2020 14:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Rk7KHe8p667l5KwYi8rakrSziKDhB1aTz0zKK0Tj9Ck=; b=o6agADNjzFEPhU0BwJjNHO/9lr f0DEfODWe8qJhRzRBk/W//1QolxNu1DR0oqBr49udS0XuvIf5mMb5VnL2X7ZJQwy/OxNhb/w6h7wy nY3GAmHFUdSeKpMwPqmOigE3B/VeteBF3lceesYcCdRIGw557qbqBVNXgWX5uohzdQHk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoF-0004Pt-QF for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyoF-0001px-OS for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Tue, 05 May 2020 14:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a997ffe678e698ff2b4c89ae5a98661d12247fef Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:03 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:44:48 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoS-0005DK-B1; Tue, 05 May 2020 14:44:48 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoR-0005D9-7J for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:47 +0000 X-Inumbo-ID: f71615f6-8ede-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f71615f6-8ede-11ea-9887-bc764e2007e4; Tue, 05 May 2020 14:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=yB5+ycYHQAqZVmHvoVzCUd6kP/R5SND+Ia4KRxUlgfY=; b=xh1V1w/hdLR02rft/NjExNYo+n wy+TVnm/SSSZclmK6/AHX7qAgDRFl5vfPU8zRQPP5U8nJD5MBlWorbHAmdIm4nikiP69uXr79otFj tQz+7i566vwk+HjTTtA8E6B4KgvzO6yGNCS5hRLOzN3S7HWC4rC8UdmzWatW4KREXu4g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoQ-0004Q4-Lt for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyoQ-0001rI-Kw for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:46 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] libxl: Fix comment about dcs.sdss Message-Id: Date: Tue, 05 May 2020 14:44:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2efca7ed3bf11b5c9467a0cb69f8e880378dec83 Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:31:15 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) (cherry picked from commit 5351a0a170fc7f6290d7d3d8be302d53d2426a87) (cherry picked from commit d1c9822b88463d91ca93fdc7e7fa6406efa7762f) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ad536b7e89..b9a3a3e0ab 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3827,7 +3827,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:44:59 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:44:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyod-0005EN-CX; Tue, 05 May 2020 14:44:59 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyob-0005EC-ED for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:57 +0000 X-Inumbo-ID: fd17ea10-8ede-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fd17ea10-8ede-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:44:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=c98JaHEjxFFCvSf+xnt+s0pOEv4TisrkUtcmD6fNj28=; b=Z8S0o2Gh9Gm04VRLjUnVC+3SDh bt9iFiSyG8iC/t36n/xmKNmVfPvCWxOAuslmoxN9Dk93yIJz791d4rhHX34uGbZlPaQKh3aU/jgnB tl58TdphbTcz138ld68OCGt+DDF30IwhOIxA9cRYM1Sm6XR6UxBHcEcPr86DC6H3qxUs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoa-0004QF-Oa for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyoa-0001sF-NZ for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:44:56 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Tue, 05 May 2020 14:44:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 48e8564435aca590f1c292ab7bb1f3dbc6b75693 Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:08 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) (cherry picked from commit a997ffe678e698ff2b4c89ae5a98661d12247fef) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:45:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:45:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyor-0005FQ-EI; Tue, 05 May 2020 14:45:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyop-0005FH-Ob for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:11 +0000 X-Inumbo-ID: 0386747a-8edf-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0386747a-8edf-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:45:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=VY7hqwxtkx/t6sZv8IxnKloo7cQGiNBlkJ42Brw1rAs=; b=B36w+KgZRr4oStlwORjjg112Qn FMxHChqUM6p+GGFzH8FNZzlHDC8BWq0DNLGC4YnELfIrOHkID36Ud/rEAdt4YKrfl7dBXXWWbLWjd EfPDwHxD6Q9Utbl6ovRUs/FyXUOR/+e/lwVma9FBXBmgbNk/RoOXI6jl2JR1iKZSPyP0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyol-0004Qt-Hr for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyol-0001uL-Gj for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:07 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] libxl: Fix comment about dcs.sdss Message-Id: Date: Tue, 05 May 2020 14:45:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fabfce8cabfb3073410a0ade74e54e105e8b078e Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:31:23 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) (cherry picked from commit 5351a0a170fc7f6290d7d3d8be302d53d2426a87) (cherry picked from commit d1c9822b88463d91ca93fdc7e7fa6406efa7762f) (cherry picked from commit 2efca7ed3bf11b5c9467a0cb69f8e880378dec83) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4d86e5cd2b..80e4abad19 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3763,7 +3763,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:45:20 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:45:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyoy-0005GF-He; Tue, 05 May 2020 14:45:20 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyox-0005G9-7V for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:19 +0000 X-Inumbo-ID: 098eb4e0-8edf-11ea-9dc5-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 098eb4e0-8edf-11ea-9dc5-12813bfff9fa; Tue, 05 May 2020 14:45:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gs5SxdXDUSdScFAl1a872Clo2S8h5SWJD/HRqoV0c1Y=; b=0AmI/+lqT6H2DKtBAe6dVRg0C5 EIeE8j9QJ8AlRmH7gKpA/Bw04+2rY9K7pV/+qHmaiXlwz7IgtAA9EPV+sdYO1OX+7noK8Xex/QfLp WQRpATW7IxkI0uR4t8RsdCOh55MVg/LZnnatdRIUD9HQXDFeAOyuzcbgweAg2shHvAGI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyov-0004R1-Lu for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:17 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyov-0001vM-Kj for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:17 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] xen/pvh: Fix segment selector ABI Message-Id: Date: Tue, 05 May 2020 14:45:17 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 59cf3a0111d8c428a6934c728083593f514bf03d Author: Andrew Cooper AuthorDate: Thu Mar 5 11:35:17 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:33:08 2020 +0100 xen/pvh: Fix segment selector ABI The written ABI states that %es will be set up, but libxc doesn't do so. In practice, it breaks `rep movs` inside guests before they reload %es. The written ABI doesn't mention %ss, but libxc does set it up. Having %ds different to %ss is obnoxous to work with, as different registers have different implicit segments. Modify the spec to state that %ss is set up as a flat read/write segment. This a) matches the Multiboot 1 spec, b) matches what is set up in practice, and c) is the more sane behaviour for guests to use. Fixes: 68e1183411b ('libxc: introduce a xc_dom_arch for hvm-3.0-x86_32 guests') Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Roger Pau Monné x86/pvh: Adjust dom0's starting state Fixes: b25fb1a04e "xen/pvh: Fix segment selector ABI" Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Acked-by: Jan Beulich master commit: b25fb1a04e99cc03359eade1affb56ef0eee766f master date: 2020-02-10 15:26:09 +0000 master commit: 6ee10313623c1f41fc72fe12372e176e744463c1 master date: 2020-02-11 11:04:26 +0000 (cherry picked from commit 722458767a297a3ced04743c0156e6ac614e89bf) --- docs/misc/pvh.markdown | 2 +- tools/libxc/xc_dom_x86.c | 3 +++ xen/arch/x86/hvm/dom0_build.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/misc/pvh.markdown b/docs/misc/pvh.markdown index e85fb15374..09db72b8bc 100644 --- a/docs/misc/pvh.markdown +++ b/docs/misc/pvh.markdown @@ -23,7 +23,7 @@ following machine state: * `cs`: must be a 32-bit read/execute code segment with a base of ‘0’ and a limit of ‘0xFFFFFFFF’. The selector value is unspecified. - * `ds`, `es`: must be a 32-bit read/write data segment with a base of + * `ds`, `es`, `ss`: must be a 32-bit read/write data segment with a base of ‘0’ and a limit of ‘0xFFFFFFFF’. The selector values are all unspecified. * `tr`: must be a 32-bit TSS (active) with a base of '0' and a limit of '0x67'. diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index f935d4991d..7ad9609103 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -998,14 +998,17 @@ static int vcpu_hvm(struct xc_dom_image *dom) /* Set the cached part of the relevant segment registers. */ bsp_ctx.cpu.cs_base = 0; bsp_ctx.cpu.ds_base = 0; + bsp_ctx.cpu.es_base = 0; bsp_ctx.cpu.ss_base = 0; bsp_ctx.cpu.tr_base = 0; bsp_ctx.cpu.cs_limit = ~0u; bsp_ctx.cpu.ds_limit = ~0u; + bsp_ctx.cpu.es_limit = ~0u; bsp_ctx.cpu.ss_limit = ~0u; bsp_ctx.cpu.tr_limit = 0x67; bsp_ctx.cpu.cs_arbytes = 0xc9b; bsp_ctx.cpu.ds_arbytes = 0xc93; + bsp_ctx.cpu.es_arbytes = 0xc93; bsp_ctx.cpu.ss_arbytes = 0xc93; bsp_ctx.cpu.tr_arbytes = 0x8b; diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 303ae4e7b5..d6763b8753 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -577,10 +577,12 @@ static int __init pvh_setup_cpus(struct domain *d, paddr_t entry, .cpu_regs.x86_32.cr0 = X86_CR0_PE | X86_CR0_ET, .cpu_regs.x86_32.cs_limit = ~0u, .cpu_regs.x86_32.ds_limit = ~0u, + .cpu_regs.x86_32.es_limit = ~0u, .cpu_regs.x86_32.ss_limit = ~0u, .cpu_regs.x86_32.tr_limit = 0x67, .cpu_regs.x86_32.cs_ar = 0xc9b, .cpu_regs.x86_32.ds_ar = 0xc93, + .cpu_regs.x86_32.es_ar = 0xc93, .cpu_regs.x86_32.ss_ar = 0xc93, .cpu_regs.x86_32.tr_ar = 0x8b, }; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:45:29 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:45:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyp7-0005ID-JF; Tue, 05 May 2020 14:45:29 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyp6-0005Hx-DI for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:28 +0000 X-Inumbo-ID: 0f927a34-8edf-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0f927a34-8edf-11ea-b07b-bc764e2007e4; Tue, 05 May 2020 14:45:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=D8iASdyjiB9/K5kyJK/DmTrMmh21d/6WYKfuYY79VQU=; b=Xoj8dT4UzpW261GpFwQIqYMPss ZGzSaxzH3oByj3cTSl6TrQhRHxs1nVj7lqIv00Klef2O1NokIHeOXO4fgxYDIdCtCxzifSSDn/r9v xtLe+fZ2PTM12E0QJ1eniyIrz6xy7cBBrxZ9CvHTgmPlJqPUpF6O+mPijCVtb7zEY0pM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyp5-0004Ru-Ox for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:27 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyp5-0001wF-O1 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:27 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Tue, 05 May 2020 14:45:27 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1e722e6971539eab4f484affd60490cbc8429951 Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:12 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) (cherry picked from commit a997ffe678e698ff2b4c89ae5a98661d12247fef) (cherry picked from commit 48e8564435aca590f1c292ab7bb1f3dbc6b75693) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:45:41 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:45:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVypJ-0005JQ-Kp; Tue, 05 May 2020 14:45:41 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVypH-0005JG-P4 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:39 +0000 X-Inumbo-ID: 15d72ea8-8edf-11ea-9dc5-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 15d72ea8-8edf-11ea-9dc5-12813bfff9fa; Tue, 05 May 2020 14:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Qt3IGHuGs6Cp/MThe4+uLty62CZBZc2x0ZXs6lfQw3E=; b=3qEnRJpDxHA0ma10bHuWPwdRfw baXvI0ppoO3jAVYGIRS3HkwK1OoEXYUF2YE55gk/TNcfb2jfE7YWb56MzhrAIYL+hl3OlT9uWUWaX Hk10WUZ+i18fUk/mqRxFqKv+Xkv+b87fMJJYhbAqV4B+uhaeBMQsE0xdnxGKhBNdsIwo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVypG-0004S8-9H for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:38 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVypG-0001xH-88 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:45:38 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.9] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Tue, 05 May 2020 14:45:38 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 93cc305d1f3e7c6949a8f4116446624fa2dbfdf4 Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:20 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) (cherry picked from commit a997ffe678e698ff2b4c89ae5a98661d12247fef) (cherry picked from commit 48e8564435aca590f1c292ab7bb1f3dbc6b75693) (cherry picked from commit 1e722e6971539eab4f484affd60490cbc8429951) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.9 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:55:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyQ-0006ZK-NC; Tue, 05 May 2020 14:55:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyQ-0006ZE-3K for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:06 +0000 X-Inumbo-ID: 67bbad7e-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 67bbad7e-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dk9GmRqY/2EGZKATG29dBvQMT99aoiWSV2UoMGuelmA=; b=d+4WBvWsNh1UDBtn7GGbPx9kdr NKUJHdbJHOnTWJrZe5AXmeVqLlRvKIuo8BYDkN20ssy/ovoAPLst5I6dgTVht+ykcGV7WGn1Bk/hY e0rPXuGjwgCzwTpQRfV+2x6IsDoS59FAXwyqo7GIwLKkcIUUCqty+04gPjunRc/2Onto=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyP-0004fc-5Z for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyyP-0002dh-4A for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Tue, 05 May 2020 14:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7b2225078b4b91044c365b2276c8897c46241c79 Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:45:43 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyya-0006aC-Os; Tue, 05 May 2020 14:55:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyya-0006a3-0M for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:16 +0000 X-Inumbo-ID: 6dbcc154-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6dbcc154-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NVhi36cjsAoVgI/l8bpGrGRxH2Eh68q8Xq1dBsw0m8E=; b=iiWIPbTThVub127yjDRKC+dfx3 fT8ya7uVZMlcTbMBjLexGSeuH2TbHmaNmEyU25ij6Z+tHdP6h6xqhxlC1VUmcYw4gmqN/Og2Fp+NT qIXCyxIhfC87o9oqTIwpKDas8Ru2kRBzxMo5FfY9eZIVHSslDU6TKVGtUIM86Jjsgv0c=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyZ-0004fn-8F for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyyZ-0002eL-7G for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Tue, 05 May 2020 14:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2 Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:26 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index a2dbf85157..9e9ff32d47 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyk-0006cP-QW; Tue, 05 May 2020 14:55:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyj-0006cG-U2 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:25 +0000 X-Inumbo-ID: 73c2ab4a-8ee0-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 73c2ab4a-8ee0-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=XSAo12qOm63fIM/FFo9F0iyrHysFaoYOodoe9wg5bHc=; b=gMYnRr0OrFquOot/W+vZ0Y2IFs znyM8aC42i/oOOrTowV2hfCVWIeQt2Xosp5b0zRsDxH581QQTA6nzYQv7LU+Fa20U5TqlyAlvgFEV uFpRjErJRsR15rynrb5Sc5uTSxF3tPgdRbEQNroXYthTBPQXz0xI6n3QxgVLdoF3qJL0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyj-0004g2-As for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyyj-0002fA-9u for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Tue, 05 May 2020 14:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:11 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 9e9ff32d47..c673b2670c 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,6 +825,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:55:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyu-0006ds-Te; Tue, 05 May 2020 14:55:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyu-0006di-2i for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:36 +0000 X-Inumbo-ID: 79c893ec-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 79c893ec-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=t77+VGIvm9ws4WB7+QEie7wUQlT2RSJfrdgJPcVPVPQ=; b=IHiVwuSipvLQ5a+DBfjQNnx/5j FBSPkGRxPRnjcMKsfFSo58akLtUujIGaqLqjOQVs4aONqbx5j612P8XNt7z2Ex/3iKmo2T/BGq5jC z9zCNZCJTrjJN2cfxx4uWRmxJtRCZ3cGOXyabP5VqPssTqV/YFnAyLdVtzImXX750sBw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyyt-0004gv-EH for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyyt-0002fy-DN for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] tools/libxc: Fix HVM_PARAM_PAE_ENABLED handling in xc_cpuid_apply_policy() Message-Id: Date: Tue, 05 May 2020 14:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 19e6009e5fd481ec6e3a4d7e464299076db4616b Author: Andrew Cooper AuthorDate: Fri Dec 20 15:26:00 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:48:05 2020 +0100 tools/libxc: Fix HVM_PARAM_PAE_ENABLED handling in xc_cpuid_apply_policy() Despite as suggested in c/s 685e922d6f3, not all HVM_PARAMs are handled in the same way. HVM_PARAM_PAE_ENABLED is a toolstack-only value, and the xc_cpuid_apply_policy() used to be the only consumer. Reinstate the old behaviour (mad as it is) to avoid regressions. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich (cherry picked from commit d79cc6bc2bac1cfba239e5b3e28a851fb22901dc) --- tools/libxc/xc_cpuid_x86.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 519d6d8bd0..2540aa1e1c 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -579,6 +579,8 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, } else { + uint64_t val; + /* * Topology for HVM guests is entirely controlled by Xen. For now, we * hardcode APIC_ID = vcpu_id * 2 to give the illusion of no SMT. @@ -633,6 +635,16 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, } /* + * HVM_PARAM_PAE_ENABLED is a parameter to this function, stashed in + * Xen. Nothing else has ever taken notice of the value. + */ + rc = xc_hvm_param_get(xch, domid, HVM_PARAM_PAE_ENABLED, &val); + if ( rc ) + goto out; + + p->basic.pae = val; + + /* * These settings are necessary to cause earlier HVM_PARAM_NESTEDHVM / * XEN_DOMCTL_disable_migrate settings to be reflected correctly in * CPUID. Xen will discard these bits if configuration hasn't been -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:55:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyz4-0006f3-Vf; Tue, 05 May 2020 14:55:46 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyz4-0006et-2t for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:46 +0000 X-Inumbo-ID: 7fcaefb0-8ee0-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7fcaefb0-8ee0-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=MU13kCqVlDjoNPfAqM0mDpL/sr63VdfH3R+jKH9tnU4=; b=LdXv6h7uKFfSKdgi8UXz5c4HE8 iB3yJIDzKNdRd7OcLqiD53SWjVN7/C4VElSFwmRqbu4dL09owe7qW7OiIkpqS6hhtqYlH8Cz9IMqz k+9Z2oci1MnHk9PibdDsDRyv9g352I3jtT69BDrnZXt6vbIHwZdizI+ak2Kaf35X0LxM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyz3-0004hC-H1 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyz3-0002gr-G7 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Tue, 05 May 2020 14:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d2aecd86c4481291b260869c47cf0a9a02321564 Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:10 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index c673b2670c..ee8b62ce58 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,10 +825,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:55:59 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:55:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzH-0006h1-8N; Tue, 05 May 2020 14:55:59 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzG-0006gl-0s for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:58 +0000 X-Inumbo-ID: 863e245c-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 863e245c-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/WguZtOsQb53D1VuJ+WrbkNZzxvq6D4WxoiOWu1JGNc=; b=1EVTJktOppjMTR49utPq7XdsKi 9kpdSwBlLcuebI0F6Vh8TmmryY3lYSFZElLsvTkFu2U/U/vptdxTfx1ZdxrZ3U904zjUkTcKiD5zE fiEJLtZtWuTubt5nG2IyeUYhhmTFXWTwZEdnzfecEH4WNRJhYP+64QWvn4/G9eXOlP6w=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzE-0004hT-Bl for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyzE-0002iQ-Aj for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:55:56 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Tue, 05 May 2020 14:55:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 66998bdd5220eaef895c66f99a5a74e8dcc187c1 Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:45:53 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) (cherry picked from commit 7b2225078b4b91044c365b2276c8897c46241c79) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:56:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:56:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzQ-0006ie-A6; Tue, 05 May 2020 14:56:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzP-0006iQ-7m for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:07 +0000 X-Inumbo-ID: 8c472074-8ee0-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8c472074-8ee0-11ea-b07b-bc764e2007e4; Tue, 05 May 2020 14:56:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=c8NwaJz87U1oJp0h7gxomwupzQmcaX7xLWHIY7r/d5E=; b=oLqLoalVLFidfXglkYOe9u7wX4 YMPQVe+7cWPZWwBhSbKGnnUQysVC7VsZWa7qNMPnWpoiOy5IoaKJttryfzrCBAPdmaWRXL7F4OT51 DHSLboA6E5DKvW0OrKkbuKeSfCIZbzi15CmHRecy5Jb6DmydW5o7dVBvvEb0GHul+nCw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzO-0004i0-FF for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyzO-0002jm-DW for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:06 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Tue, 05 May 2020 14:56:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 275475f1e8a772fee5b088eec1cad18fddce4a8f Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:34 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) (cherry picked from commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index a2dbf85157..9e9ff32d47 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:56:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:56:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyza-0006kg-Bw; Tue, 05 May 2020 14:56:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzZ-0006kR-8S for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:17 +0000 X-Inumbo-ID: 91f7813b-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 91f7813b-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bdRo3/aQnZ/EoZy922/zLZQbvYkJeqqQsKBRw145egs=; b=6tPJzIuixI37hogAGgo5jLS47e y+3zxNbVyw5JSyIOT4XHkoO4B3YeVEbR55dyQIFT6RBidXasR0Ihkg2LcekeEMXPg7y+BSAaSDICn ojTpsyT+XLnv3gyrgfc+fBY8MbaYE1cT/rmHU8vamMeGpayzO0DkroUjNv5YkEn7A/Lg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzY-0004iB-Hl for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyzY-0002kz-Gq for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Tue, 05 May 2020 14:56:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 288872ad3bb320bd9f31145d9bd4e53786fa3245 Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:17 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) (cherry picked from commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 9e9ff32d47..c673b2670c 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,6 +825,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:56:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:56:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzk-0006md-Dc; Tue, 05 May 2020 14:56:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzj-0006mO-5u for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:27 +0000 X-Inumbo-ID: 98480352-8ee0-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 98480352-8ee0-11ea-9887-bc764e2007e4; Tue, 05 May 2020 14:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mn/tkwPByVhH0WG0YRaVd7ZaJSgpDCwBiHOC7BBFUk4=; b=l65rXJ+/PWuYSkMqZhIBbYPtc4 jQ2zJXMTsLT3CDLxD6c8vHf7Kk46v5Obd9HOqYeVYu8ApqwOvgDC5ng0hQjXMYAwh9b6nLqcSqO+x N5f1vpaQHiCI+79ZtVItwcUfActp+409x+FqKgJg2Vo7lCmDV9OCwOlCCVwiG4AazPog=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzi-0004in-KS for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyzi-0002ly-JL for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:26 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Tue, 05 May 2020 14:56:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e43fc14ec58329813af876ed3b30899a04d65a08 Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:16 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) (cherry picked from commit d2aecd86c4481291b260869c47cf0a9a02321564) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index c673b2670c..ee8b62ce58 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,10 +825,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:56:40 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:56:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzw-0006oP-FN; Tue, 05 May 2020 14:56:40 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzu-0006oA-Kr for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:38 +0000 X-Inumbo-ID: 9eb87b22-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9eb87b22-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8bT3mRv/cNpFjX80o0Qh9hZKUgQQioLbjKPXh0uX9to=; b=BsDqOmf8kuUdAot2SXXiW+0a5A qjCCVUq/mMV3b5Lp748iQtREMDWexy3RkDwwUQsOSF5WJll/P8XjnUdgnVn3DR1jo+73YlLamVnYo 5QMCHzAbnpetKImtV4ii23fyfWOlKG47wFHd0pjB6B6ee2YaCUcpsvIZEWSc1iOhsVzo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVyzt-0004jt-E5 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:37 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVyzt-0002nO-Ci for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:37 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Tue, 05 May 2020 14:56:37 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 47772087eb799c3ffb3544c0030a6815fd15336e Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:45:59 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) (cherry picked from commit 7b2225078b4b91044c365b2276c8897c46241c79) (cherry picked from commit 66998bdd5220eaef895c66f99a5a74e8dcc187c1) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:56:49 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:56:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz05-0006q7-IE; Tue, 05 May 2020 14:56:49 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz04-0006pm-Bc for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:48 +0000 X-Inumbo-ID: a4bc9288-8ee0-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a4bc9288-8ee0-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:56:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hkQLYQszwUqm7PQ8oqhi5107L3Mel5kuA6s6QFVKCUg=; b=7CjBT//uysbL+Ii6Ab41bRMnIi Qw/M6BO+HI6NangSctim9VNpbJE1rR3tcG1PH5jG45U0lcwKeBMTMHkDKRiCAt1TbBhAbUVOsOV7y 5ruAlGWIs6d2JSOIuPSpTM2fMlYAsTfxWd8yyOQPK1AHq17On2x7zI/GWzu5aT6WyYu0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz03-0004k6-Gy for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:47 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVz03-0002oB-Fq for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:47 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Tue, 05 May 2020 14:56:47 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7d8fa6a902eccf06e31aa2433b5466a85afefe73 Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:46 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) (cherry picked from commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2) (cherry picked from commit 275475f1e8a772fee5b088eec1cad18fddce4a8f) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index d81dfdcca6..0f02751992 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:56:59 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:56:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0F-0006rn-K4; Tue, 05 May 2020 14:56:59 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0E-0006ra-70 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:58 +0000 X-Inumbo-ID: aabf4f72-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id aabf4f72-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:56:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7bIDgT56lvXWkAdxFi2oAGiKoqbXswM4v27U/mlttlo=; b=X1I1ofJ4Og2FScrpIoMNb8+Fcn 0DFjeuIy/ostNRu/b+C7u70vjW2U7Bf/mnsgWYoxXddxMLMewhxmEoOOa9vrybQ38gUAxeviPA9G9 Gy74OeJ0CbGpYt/21xVUZENLjUvFFMHL14rqpREJe/8a23uHhs/xffJjo7zv1d6FT+bA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0D-0004kH-Jb for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:57 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVz0D-0002pE-If for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:56:57 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Tue, 05 May 2020 14:56:57 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a58bba28da793da70b93b841289d99370800180c Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:21 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) (cherry picked from commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb) (cherry picked from commit 288872ad3bb320bd9f31145d9bd4e53786fa3245) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 0f02751992..8c7adaeeda 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,6 +825,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:57:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:57:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0P-0006t3-Lf; Tue, 05 May 2020 14:57:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0O-0006sh-An for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:08 +0000 X-Inumbo-ID: b0c177f6-8ee0-11ea-9dc6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b0c177f6-8ee0-11ea-9dc6-12813bfff9fa; Tue, 05 May 2020 14:57:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CJEOUjdkjyZgPBVHNczEG8Fk4n7pcAltWqXMFKi1UZk=; b=ojEgXt2OKBEBJ9iqsaYICTDY3d /hSvy9clepR6pSiX72MV3/jdwqulwM4BUT+TS/UIMgbzqNJefDV27frteBuwDF1uIwlaWH1Vn/EIM 59JwBNOrSmltIriDiDaa8xq7yp4CseD6qZh1nb2YnsWtEtAqn5UWmfZ1fMXxRxEc56Lg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0N-0004kh-MB for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:07 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVz0N-0002qG-LL for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:07 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.11] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Tue, 05 May 2020 14:57:07 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7dd2ac39e40f0afe1cc6d879bfe65cbf19520cab Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:22 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) (cherry picked from commit d2aecd86c4481291b260869c47cf0a9a02321564) (cherry picked from commit e43fc14ec58329813af876ed3b30899a04d65a08) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 8c7adaeeda..7e950ea03f 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,10 +825,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.11 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:57:20 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:57:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0a-0006uI-NI; Tue, 05 May 2020 14:57:20 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0Y-0006u3-Vt for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:19 +0000 X-Inumbo-ID: b72c76d6-8ee0-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b72c76d6-8ee0-11ea-b07b-bc764e2007e4; Tue, 05 May 2020 14:57:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3rRTs0p7R31eGbswjqqVEfiJVwWpKoVfizAkCNvIOwU=; b=2S2k2ESMBHsDwg9A7EpbFi7n+3 nrJpCz9Jcn6HOkO/VqkZncTfoxnCKhGLXfff0ke5IAc8JXX5K5ZauOd5+2G+meI3SAkPHjo66bl+a V4gqc6pCOIdUYzJyz4fXfObWzATrtvBZHF9FEVKcNhoKIbHpgOaRyDB2qsSfBxtit0eM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0Y-0004ks-Ev for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:18 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVz0Y-0002rx-Dy for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:18 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Tue, 05 May 2020 14:57:18 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b01c84e9c0ef1282d747bf4ef233699bc0a56374 Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:02 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) (cherry picked from commit 7b2225078b4b91044c365b2276c8897c46241c79) (cherry picked from commit 66998bdd5220eaef895c66f99a5a74e8dcc187c1) (cherry picked from commit 47772087eb799c3ffb3544c0030a6815fd15336e) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:57:30 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:57:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0k-0006wB-0Y; Tue, 05 May 2020 14:57:30 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0j-0006w5-9W for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:29 +0000 X-Inumbo-ID: bd301b82-8ee0-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bd301b82-8ee0-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:57:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mdujAfcWqKmuxPU8euW46V+HlLMxZtoRF9Pr4zAv6Og=; b=SQPohnGY3B4uPGMs2Nwq/zTWIv XthT4zMKngb/OOELeHjrOyzpWVV9GxW1s34jjgQAh4NMp3Cwd+L95Mze0B+vD0JqF6ZyBSaneql9T cm3yN4pKjdpWYtuOwi8E3VQr/T10zuXx/n8TszA4Ly27R/t63VggFJvlf6PraFMWgY2I=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0i-0004lh-Hl for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:28 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVz0i-0002se-Gm for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:28 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Tue, 05 May 2020 14:57:28 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3d6090342fdbbe2c74c1aae4657977616393f2ab Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:50 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) (cherry picked from commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2) (cherry picked from commit 275475f1e8a772fee5b088eec1cad18fddce4a8f) (cherry picked from commit 7d8fa6a902eccf06e31aa2433b5466a85afefe73) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index ed0fd0ead9..f058a37a64 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:57:40 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:57:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0u-0006y8-2F; Tue, 05 May 2020 14:57:40 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0t-0006xv-8e for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:39 +0000 X-Inumbo-ID: c3322b92-8ee0-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c3322b92-8ee0-11ea-b9cf-bc764e2007e4; Tue, 05 May 2020 14:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uk7plyii/rrZwP8Wlweya5kEvwDCwhxmbpBjMQuUU8A=; b=atr6TKVmXUfX0S9K+4Uu7vQYD+ RnG24vN0rPWWwBL7wSfCKmORMGg+FawZOINcssbITQIe72DCR9JZdgX+6aCvj40vSlSfrZaZc/Xv4 Piq75Vvphsy0LC9lDUfxOze40nWLgpG7gwBeIWKR64CxGe2y1pWJssNSlk/oK3pdqjys=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz0s-0004m1-KF for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:38 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVz0s-0002uU-JN for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:38 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Tue, 05 May 2020 14:57:38 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b413732087509fb15d6cf4373e0b2396ae4ee476 Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:23 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) (cherry picked from commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb) (cherry picked from commit 288872ad3bb320bd9f31145d9bd4e53786fa3245) (cherry picked from commit a58bba28da793da70b93b841289d99370800180c) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index f058a37a64..9d4c611bd5 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -824,6 +824,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 14:57:50 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 14:57:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz14-00070D-5a; Tue, 05 May 2020 14:57:50 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz13-000702-AB for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:49 +0000 X-Inumbo-ID: c935a30c-8ee0-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c935a30c-8ee0-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 14:57:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=t+drGi5ZSm9ytD1+2ZMJnriajkQIMGWa0XkEdq7MI5c=; b=z0YIxmez7QTbCg/yNZ2QdWc5/0 Uq4Jpbw/8JN0akb8MXScf6VdgVjhqltLoRL5HoztEgd4AAKyywABJITysk5zroXcSFhPc30NZgVBw MP3fYjWB0y60QPv5w80cZdVFaaOt3bSlR2qjJoCQaKQ2GlcwvjKOgv8PEwMDTzKNHgFY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVz12-0004mC-N0 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:48 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVz12-0002vI-Lx for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 14:57:48 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.10] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Tue, 05 May 2020 14:57:48 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b922c4431df33ed5b724e53c3f3348e470ddd349 Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:24 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) (cherry picked from commit d2aecd86c4481291b260869c47cf0a9a02321564) (cherry picked from commit e43fc14ec58329813af876ed3b30899a04d65a08) (cherry picked from commit 7dd2ac39e40f0afe1cc6d879bfe65cbf19520cab) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 9d4c611bd5..406ed60019 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -824,10 +824,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.10 From xen-changelog-bounces@lists.xenproject.org Tue May 05 15:22:19 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 15:22:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOa-0001YR-Jd; Tue, 05 May 2020 15:22:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOZ-0001YL-I1 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:07 +0000 X-Inumbo-ID: 2d20a7b1-8ee4-11ea-9dc9-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2d20a7b1-8ee4-11ea-9dc9-12813bfff9fa; Tue, 05 May 2020 15:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=rm9mRz90KFjgXx53PH3CgGmLFJ/h1aTGg7/eJE0/FKk=; b=RBElDYIZyj0YJVw3sbx7gp+/f+ AaAlQdeZAOQhp/IeN+KN0OjjAucYPAnPdDysS+Y5sm8AImtm5HQg/dGacBr25vXj8okKXOFuZ6hpq BAW8Oyi7rMym6aeseT6jtVwuOnmveRe0iBGnoq8/m2Pr6JFodrjvi6JN5sDPhB+kseuM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOX-0005MP-Il for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVzOX-00056U-HO for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/pv: Compile out emul-gate-op in !CONFIG_PV32 builds Message-Id: Date: Tue, 05 May 2020 15:22:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6a8f6cd8d788fc424cb2e2f426223d95da9c9898 Author: Andrew Cooper AuthorDate: Tue May 5 11:17:32 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 15:24:03 2020 +0100 x86/pv: Compile out emul-gate-op in !CONFIG_PV32 builds The caller is already guarded by is_pv_32bit_vcpu(). Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/pv/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/pv/Makefile b/xen/arch/x86/pv/Makefile index cf28434ba9..75b01b0062 100644 --- a/xen/arch/x86/pv/Makefile +++ b/xen/arch/x86/pv/Makefile @@ -2,7 +2,7 @@ obj-y += callback.o obj-y += descriptor-tables.o obj-y += domain.o obj-y += emulate.o -obj-y += emul-gate-op.o +obj-$(CONFIG_PV32) += emul-gate-op.o obj-y += emul-inv-op.o obj-y += emul-priv-op.o obj-$(CONFIG_GRANT_TABLE) += grant_table.o -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 15:22:30 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 15:22:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOl-0001ZO-LJ; Tue, 05 May 2020 15:22:19 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOk-0001Z4-D5 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:18 +0000 X-Inumbo-ID: 3395f104-8ee4-11ea-9dc9-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3395f104-8ee4-11ea-9dc9-12813bfff9fa; Tue, 05 May 2020 15:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wUEw3zxXMAOCqV8chKZwc3NMG79fBz8cv0XaYHG3WJQ=; b=etsyYUy8oZOTn41m1aOSImI2YW L97Icz3KIcMJKKc3CSpSqbS/Osx8bQiJndjSodqzBG1AfoLI+oYCzjPhsCmp7bacHfAbRupOX6w1M QmmhHDZ3NwHNSXp/qYuiN0ZU/P1lDZksANvym+8b1Sb75C5fzDmOKNa4x2KkLbtYI+Nw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOh-0005MV-Lr for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVzOh-00057Y-Kl for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/pv: Prune include lists Message-Id: Date: Tue, 05 May 2020 15:22:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f7aa6c36c5a8173236a68cb1f1b09c8bef9d6d3a Author: Andrew Cooper AuthorDate: Tue May 5 11:27:22 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 15:25:04 2020 +0100 x86/pv: Prune include lists Several of these in particular haven't been pruned since the logic was all part of arch/x86/traps.c Some adjustments to header files are required to avoid compile errors: * emulate.h needs xen/sched.h because gdt_ldt_desc_ptr() uses v->vcpu_id. * mmconfig.h needs to forward declare acpi_table_header. * shadow.h and trace.h need to have uint*_t in scope before including the Xen public headers. For shadow.h, reorder the includes. For trace.h, include types.h Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/pv/callback.c | 5 ----- xen/arch/x86/pv/emul-gate-op.c | 19 ------------------- xen/arch/x86/pv/emul-inv-op.c | 18 ------------------ xen/arch/x86/pv/emul-priv-op.c | 9 +-------- xen/arch/x86/pv/emulate.h | 2 ++ xen/arch/x86/pv/ro-page-fault.c | 8 -------- xen/arch/x86/pv/shim.c | 3 --- xen/arch/x86/x86_64/mmconfig.h | 1 + xen/include/asm-x86/shadow.h | 3 ++- xen/include/xen/trace.h | 1 + 10 files changed, 7 insertions(+), 62 deletions(-) diff --git a/xen/arch/x86/pv/callback.c b/xen/arch/x86/pv/callback.c index 106c16ed01..97242cd3d4 100644 --- a/xen/arch/x86/pv/callback.c +++ b/xen/arch/x86/pv/callback.c @@ -19,15 +19,10 @@ #include #include #include -#include -#include #include #include -#include -#include #include -#include #include diff --git a/xen/arch/x86/pv/emul-gate-op.c b/xen/arch/x86/pv/emul-gate-op.c index 3c7f6d70bc..61e65ce521 100644 --- a/xen/arch/x86/pv/emul-gate-op.c +++ b/xen/arch/x86/pv/emul-gate-op.c @@ -20,25 +20,6 @@ */ #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include "emulate.h" diff --git a/xen/arch/x86/pv/emul-inv-op.c b/xen/arch/x86/pv/emul-inv-op.c index 91d05790c2..59e3edc8c4 100644 --- a/xen/arch/x86/pv/emul-inv-op.c +++ b/xen/arch/x86/pv/emul-inv-op.c @@ -19,26 +19,8 @@ * along with this program; If not, see . */ -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - #include "emulate.h" static int emulate_forced_invalid_op(struct cpu_user_regs *regs) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index e24b84f46a..3b705299cf 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -19,25 +19,18 @@ * along with this program; If not, see . */ -#include +#include #include #include #include -#include -#include #include -#include #include #include #include #include -#include #include -#include #include -#include -#include #include diff --git a/xen/arch/x86/pv/emulate.h b/xen/arch/x86/pv/emulate.h index fd2aa0a484..4b845b08e3 100644 --- a/xen/arch/x86/pv/emulate.h +++ b/xen/arch/x86/pv/emulate.h @@ -1,6 +1,8 @@ #ifndef __PV_EMULATE_H__ #define __PV_EMULATE_H__ +#include + #include #include diff --git a/xen/arch/x86/pv/ro-page-fault.c b/xen/arch/x86/pv/ro-page-fault.c index a920fb5e15..0eedb70002 100644 --- a/xen/arch/x86/pv/ro-page-fault.c +++ b/xen/arch/x86/pv/ro-page-fault.c @@ -20,15 +20,7 @@ * along with this program; If not, see . */ -#include -#include -#include #include - -#include -#include -#include -#include #include #include "emulate.h" diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index 31264582cc..3a0525c209 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -25,14 +25,11 @@ #include #include #include -#include #include #include -#include #include #include -#include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 2e836848ad..4d3b9fcbdd 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -75,6 +75,7 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val) } /* function prototypes */ +struct acpi_table_header; int acpi_parse_mcfg(struct acpi_table_header *header); int pci_mmcfg_reserved(uint64_t address, unsigned int segment, unsigned int start_bus, unsigned int end_bus, diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 907c71f497..8335862c87 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -22,7 +22,6 @@ #ifndef _XEN_SHADOW_H #define _XEN_SHADOW_H -#include #include #include #include @@ -31,6 +30,8 @@ #include #include +#include + /***************************************************************************** * Macros to tell which shadow paging mode a domain is in*/ diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index af925bcfcc..3cbb542af8 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -28,6 +28,7 @@ extern int tb_init_done; #define tb_init_done false #endif +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 15:22:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 15:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOt-0001aw-Mp; Tue, 05 May 2020 15:22:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOs-0001af-Ex for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:26 +0000 X-Inumbo-ID: 399f108a-8ee4-11ea-9dc9-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 399f108a-8ee4-11ea-9dc9-12813bfff9fa; Tue, 05 May 2020 15:22:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wQYHxg+bo/qexfLOGOFtE7Gr/28hLESwNz4yd0iJfDM=; b=2yZvxI4qPJzaTPJ6sR5oECS36M fznx1NASo2encsaUHiRG+00tdMdlmdY7HH1FOfu0AS5TewUo9+wvnKDSbct5ar8IFnzm5fZI6jJpW or28TX1P0h2ipuStu1N23sKlH4inKA6TcUrE7GFSa/8kdSrPzJ+1ySqQS7yWMRGOhh1Y=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzOr-0005Mo-Pv for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVzOr-00058Y-Og for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/pv: Fix Clang build with !CONFIG_PV32 Message-Id: Date: Tue, 05 May 2020 15:22:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cdc3b1f26f80b57b28fb94cb4bf26f79a3cc2765 Author: Andrew Cooper AuthorDate: Tue May 5 14:03:35 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 16:12:54 2020 +0100 x86/pv: Fix Clang build with !CONFIG_PV32 Clang 3.5 doesn't do enough dead-code-elimination to drop the compat_gdt reference, resulting in a linker failure: hidden symbol `per_cpu__compat_gdt' isn't defined Drop the local variable, and move the evaluation of this_cpu(compat_gdt) to within the guarded region. Reported-by: Roger Pau Monné Signed-off-by: Andrew Cooper Tested-by: Roger Pau Monné Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/common.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 131ff03fcf..63f3893c7a 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -711,8 +711,6 @@ void load_system_tables(void) struct tss64 *tss = &this_cpu(tss_page).tss; seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; - seg_desc_t *compat_gdt = - this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY; const struct desc_ptr gdtr = { .base = (unsigned long)gdt, @@ -753,8 +751,9 @@ void load_system_tables(void) _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_avail); if ( IS_ENABLED(CONFIG_PV32) ) - _set_tssldt_desc(compat_gdt + TSS_ENTRY, (unsigned long)tss, - sizeof(*tss) - 1, SYS_DESC_tss_busy); + _set_tssldt_desc( + this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY + TSS_ENTRY, + (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_busy); per_cpu(full_gdt_loaded, cpu) = false; lgdt(&gdtr); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 15:22:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 15:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzP3-0001cK-OO; Tue, 05 May 2020 15:22:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzP2-0001c6-Q9 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:36 +0000 X-Inumbo-ID: 3fa65542-8ee4-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3fa65542-8ee4-11ea-b07b-bc764e2007e4; Tue, 05 May 2020 15:22:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=r75CuDaXlPPZ6ShD0N2X6NABGJ9CweshmebdRXZe5go=; b=h5x9stZr47hLUSr3tfG7YfXc9M HD4+ad+6pE4mGuG9GOnukJlpiCi3eRZvVTHvbij8Tw6ICYu7q/4VgVRGEkHwKTZMus9P6ZUth4C7c ev4nfylT5U2z7/mGXxoGlKaiDazZWxN3V4lCiZYfdXFIDbqrJG1T65PuzIgxHTuelnIk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jVzP1-0005NT-Tg for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jVzP1-0005AR-S6 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 15:22:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/traps: fix an off-by-one error Message-Id: Date: Tue, 05 May 2020 15:22:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2e3d87cc734a895ef5b486926274a178836b67a9 Author: Hongyan Xia AuthorDate: Tue May 5 15:17:35 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 16:13:44 2020 +0100 x86/traps: fix an off-by-one error stack++ can go into the next page and unmap_domain_page() will unmap the wrong one, causing mapcache and memory corruption. Fix. Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 33e5d21ece..73c6218660 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -236,6 +236,7 @@ static void compat_show_guest_stack(struct vcpu *v, int debug_stack_lines) { unsigned int i, *stack, addr, mask = STACK_SIZE; + void *stack_page = NULL; stack = (unsigned int *)(unsigned long)regs->esp; printk("Guest stack trace from esp=%08lx:\n ", (unsigned long)stack); @@ -258,7 +259,7 @@ static void compat_show_guest_stack(struct vcpu *v, break; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -285,11 +286,9 @@ static void compat_show_guest_stack(struct vcpu *v, printk(" %08x", addr); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + UNMAP_DOMAIN_PAGE(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); @@ -300,6 +299,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) int i; unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + void *stack_page = NULL; /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) @@ -328,7 +328,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -355,11 +355,9 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk(" %p", _p(addr)); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + UNMAP_DOMAIN_PAGE(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 19:22:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 19:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW38p-0005h1-Ba; Tue, 05 May 2020 19:22:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW38o-0005gw-P7 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:06 +0000 X-Inumbo-ID: b42c21f0-8f05-11ea-9de8-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b42c21f0-8f05-11ea-9de8-12813bfff9fa; Tue, 05 May 2020 19:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=JxR1KCOMBAYJzAYclpVsJA8zmGs2xwK9Pvtqo5uEV4g=; b=U5jhK4DkcxZ/IxAnuXZ/y9C/wk ylp/qSjOmNSLufaa2QR6UV1cbkW/+CRPXlJmIi3J3jxlJ3km3sKOAPBMSl3rjbEOTPH7ZpN9xmYDl dgb5zL3aVqqQ0QQuO0nQkWBaNqr+DZT0wVHXbfYp4LK1vFlKZzHvgG2WtRSG90hNUZGA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW38m-00028f-Og for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW38m-0006bb-N8 for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/smpboot: Write the top-of-stack block in cpu_smpboot_alloc() Message-Id: Date: Tue, 05 May 2020 19:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 434596bbd44ad75c3f84396a2b2d283eeb9f0688 Author: Andrew Cooper AuthorDate: Fri Apr 24 14:38:02 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 20:18:19 2020 +0100 x86/smpboot: Write the top-of-stack block in cpu_smpboot_alloc() This allows the AP boot assembly use per-cpu variables, and brings the semantics closer to that of the BSP, which can use per-cpu variables from the start of day. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/smpboot.c | 7 ++++++- xen/include/asm-x86/current.h | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 5a3786d399..f999323bc4 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -329,7 +329,6 @@ void start_secondary(void *unused) /* Critical region without IDT or TSS. Any fault is deadly! */ - set_processor_id(cpu); set_current(idle_vcpu[cpu]); this_cpu(curr_vcpu) = idle_vcpu[cpu]; rdmsrl(MSR_EFER, this_cpu(efer)); @@ -986,6 +985,7 @@ static void cpu_smpboot_free(unsigned int cpu, bool remove) static int cpu_smpboot_alloc(unsigned int cpu) { + struct cpu_info *info; unsigned int i, memflags = 0; nodeid_t node = cpu_to_node(cpu); seg_desc_t *gdt; @@ -999,6 +999,11 @@ static int cpu_smpboot_alloc(unsigned int cpu) stack_base[cpu] = alloc_xenheap_pages(STACK_ORDER, memflags); if ( stack_base[cpu] == NULL ) goto out; + + info = get_cpu_info_from_stack((unsigned long)stack_base[cpu]); + info->processor_id = cpu; + info->per_cpu_offset = __per_cpu_offset[cpu]; + memguard_guard_stack(stack_base[cpu]); gdt = per_cpu(gdt, cpu) ?: alloc_xenheap_pages(0, memflags); diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 0b47485337..5b8f4dbc79 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -100,11 +100,6 @@ static inline struct cpu_info *get_cpu_info(void) #define current (get_current()) #define get_processor_id() (get_cpu_info()->processor_id) -#define set_processor_id(id) do { \ - struct cpu_info *ci__ = get_cpu_info(); \ - ci__->per_cpu_offset = __per_cpu_offset[ci__->processor_id = (id)]; \ -} while (0) - #define guest_cpu_user_regs() (&get_cpu_info()->guest_cpu_user_regs) /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 19:22:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 19:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW38z-0005ht-EM; Tue, 05 May 2020 19:22:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW38y-0005hj-BB for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:16 +0000 X-Inumbo-ID: ba2c61b4-8f05-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ba2c61b4-8f05-11ea-ae69-bc764e2007e4; Tue, 05 May 2020 19:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=c6kg+Hgwa/cWnP2cxUvt1BxfP5eo+WZceNXHil+rSZ8=; b=2jbCByS6X4grUUwCrqJfU1UZgK SLjdVG+T1u2zRFWYM4Z+YCzOON4YxrxJE1R1/M9rYGKZPl8neOh8bbT0+CeBMKiWg53ZvT5X8w4PO fMr3IBehmCr/vGQQmmdxa4l/7568iu3Oql/242ZvY+oUXSGpKDDi3vhFvgEF5nzM37vw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW38w-00028l-RP for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW38w-0006cR-QP for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/ucode/intel: Writeback and invalidate caches before updating microcode Message-Id: Date: Tue, 05 May 2020 19:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 77c82949990edaf21130be842a289a7fb7a439e1 Author: Ashok Raj AuthorDate: Wed Feb 28 10:28:42 2018 +0000 Commit: Andrew Cooper CommitDate: Tue May 5 20:18:19 2020 +0100 x86/ucode/intel: Writeback and invalidate caches before updating microcode Updating microcode is less error prone when caches have been flushed and depending on what exactly the microcode is updating. For example, some of the issues around certain Broadwell parts can be addressed by doing a full cache flush. Signed-off-by: Ashok Raj Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner [Linux commit 91df9fdf51492aec9fed6b4cbd33160886740f47, ported to Xen] Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/microcode/intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index a9f4d6e829..d031196d4c 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -25,6 +25,7 @@ #include #include +#include #include "private.h" @@ -267,6 +268,8 @@ static int apply_microcode(const struct microcode_patch *patch) if ( microcode_update_match(patch) != NEW_UCODE ) return -EINVAL; + wbinvd(); + /* write microcode via MSR 0x79 */ wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); wrmsrl(MSR_IA32_UCODE_REV, 0x0ULL); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 05 19:22:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 05 May 2020 19:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW398-0005j1-Fx; Tue, 05 May 2020 19:22:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW397-0005ir-El for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:25 +0000 X-Inumbo-ID: c03139ea-8f05-11ea-9de8-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c03139ea-8f05-11ea-9de8-12813bfff9fa; Tue, 05 May 2020 19:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LQuPDImJ1Ck6j+JkUamD66uqktGoo+CjjU0no4n83Z8=; b=C5DI4qcdfl/HI+JrUYyK3LNifu kAnUPk46wk0/IrrvP1S4CULA3AIpTH50pwh2Qd0qw1owgiqhgvQdLIx6CQes+F7KFwZJx1cpfVXOX n9t0dBj02zmCd7GcjWzgqVKAzAXCMw/6pRQ0E7sgYgPLtn/RuP0lP51017XIpl6NCSIw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW396-00028u-Uf for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW396-0006dD-TO for xen-changelog@lists.xenproject.org; Tue, 05 May 2020 19:22:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxl: Plumb a restore boolean into libxl__domain_build_state Message-Id: Date: Tue, 05 May 2020 19:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 779efdbb502b38c66b774b124fa0ceed254875bd Author: Andrew Cooper AuthorDate: Fri Jan 24 17:52:52 2020 +0000 Commit: Andrew Cooper CommitDate: Tue May 5 20:18:19 2020 +0100 tools/libxl: Plumb a restore boolean into libxl__domain_build_state To fix CPUID handling, libxl__build_pre() is going to have to distinguish between a brand new VM vs one which is being migrated-in/resumed. Transcribe dcs->restore_fd into dbs->restore in initiate_domain_create() only (specifically avoiding the stubdom state in libxl__spawn_stub_dm()). While tweaking initiate_domain_create(), make a new dbs alias and simplify later code, and drop the local restore_fd alias as the new dbs->restore is more intuitive in context. No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 14 +++++++------- tools/libxl/libxl_internal.h | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e7cb2dbc2b..5a043df15f 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1181,18 +1181,18 @@ static void initiate_domain_create(libxl__egc *egc, /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; - const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *dbs = &dcs->build_state; libxl__xswait_init(&dcs->console_xswait); domid = dcs->domid; - libxl__domain_build_state_init(&dcs->build_state); + libxl__domain_build_state_init(dbs); + dbs->restore = dcs->restore_fd >= 0; ret = libxl__domain_config_setdefault(gc,d_config,domid); if (ret) goto error_out; - ret = libxl__domain_make(gc, d_config, &dcs->build_state, &domid, - dcs->soft_reset); + ret = libxl__domain_make(gc, d_config, dbs, &domid, dcs->soft_reset); if (ret) { LOGD(ERROR, domid, "cannot make domain: %d", ret); dcs->guest_domid = domid; @@ -1236,7 +1236,7 @@ static void initiate_domain_create(libxl__egc *egc, if (ret) goto error_out; - if (restore_fd >= 0 || dcs->soft_reset) { + if (dbs->restore || dcs->soft_reset) { LOGD(DEBUG, domid, "restoring, not running bootloader"); domcreate_bootloader_done(egc, &dcs->bl, 0); } else { @@ -1247,8 +1247,8 @@ static void initiate_domain_create(libxl__egc *egc, dcs->bl.disk = bootdisk; dcs->bl.domid = dcs->guest_domid; - dcs->bl.kernel = &dcs->build_state.pv_kernel; - dcs->bl.ramdisk = &dcs->build_state.pv_ramdisk; + dcs->bl.kernel = &dbs->pv_kernel; + dcs->bl.ramdisk = &dbs->pv_ramdisk; libxl__bootloader_run(egc, &dcs->bl); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5f39e44cb9..e5effd2ad1 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1397,6 +1397,10 @@ typedef struct { /* ARM only to deal with broken firmware */ uint32_t clock_frequency; + + /* Whether this domain is being migrated/restored, or booting fresh. Only + * applicable to the primary domain, not support domains (e.g. stub QEMU). */ + bool restore; } libxl__domain_build_state; _hidden void libxl__domain_build_state_init(libxl__domain_build_state *s); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:00:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:00:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Lw-0002lC-E2; Wed, 06 May 2020 02:00:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Lv-0002Hl-5I for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:03 +0000 X-Inumbo-ID: 4c34ab70-8f3d-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4c34ab70-8f3d-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 02:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ORtz1evf240pZcE5fALg2xv8X2dUXv3EWFdSYJ3DB8M=; b=MzoWQ2HsPCfU+w0hJSjIMvfdRF aogM8lx0vHmo02ewFo1DSypC2/aqcqApVvr7nVq3BAUexOYmTk7V4RSb9lakW7rQE3h+fBgBFNOlZ PZ+4yoiJErecihDzno1QAbpcqVKbQKia0dX01JDWe2GGh/nMhmqZuO2zIKWWwpAOPpsk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Lu-0007rn-5a for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9Lu-0002IL-41 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Wed, 06 May 2020 02:00:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6e63a6f72d8d4cf16fee477384de9ffe55a53db1 Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:15:40 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) (cherry picked from commit 5c1b607e8a4de32fc2238f4d29d477007eb5822c) (cherry picked from commit e84b63444e190a8c4380c130c120e1d3e6f4cf31) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:00:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:00:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9M6-00030q-G2; Wed, 06 May 2020 02:00:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9M4-00030g-TI for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:12 +0000 X-Inumbo-ID: 52398054-8f3d-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 52398054-8f3d-11ea-9887-bc764e2007e4; Wed, 06 May 2020 02:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zfJaL1ZXRtA8+WO46naiPy99s17X8macAXovFO8Rtlc=; b=Lc4aRYw9qI3TJM03tsqtdYxtUo 7brmhiz64fi4RGv+N0k9aE6qElOL/BjMNfdeUbBKPc+BJzcdAK/K9z/70+AxiEznc4/ebpJ4Sxh2E lKPfdx8wZ1lFN1L9N66xklkTPq78Eupeec7t5o8ZUPc2bqqnsWVzfd3cx7sB3nZBDXmY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9M4-0008AP-8q for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9M4-0002Qk-7h for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] docs: document CONTROL command of xenstore protocol Message-Id: Date: Wed, 06 May 2020 02:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a4dd2feb8c52709d81d0b253e712a3531ac7294f Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:16:09 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) (cherry picked from commit daf71f0053e21ebefb0e21431ef48d53af1c3b31) (cherry picked from commit afe82f5781bf402e56b23a46e41bbb055255a068) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:00:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9MG-00032M-Hw; Wed, 06 May 2020 02:00:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9ME-000323-V4 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:22 +0000 X-Inumbo-ID: 583e709a-8f3d-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 583e709a-8f3d-11ea-b07b-bc764e2007e4; Wed, 06 May 2020 02:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aqi5mc3oWQcd4BKE49++bol6el+0GJ/GS5DLBi/wYGs=; b=n2Mf0ctrIaa0f5I/CwT/MuLXuP yGMCm77pkZOcKp0O4JMAvMKAd2Sm4bDDZI2C4amkqJszroA9HLGySuxZjou/pJX6lZ91EuJSTV9so m9OrT+P8CPNgYtbWp3YRvwupwCtiiD49O7geSXzPEa4Lttm3INy44lYeQdzlCz2KJL58=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9ME-0008Ac-C1 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9ME-0002UD-As for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] libxl: Fix comment about dcs.sdss Message-Id: Date: Wed, 06 May 2020 02:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fabfce8cabfb3073410a0ade74e54e105e8b078e Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:31:23 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) (cherry picked from commit 5351a0a170fc7f6290d7d3d8be302d53d2426a87) (cherry picked from commit d1c9822b88463d91ca93fdc7e7fa6406efa7762f) (cherry picked from commit 2efca7ed3bf11b5c9467a0cb69f8e880378dec83) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4d86e5cd2b..80e4abad19 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3763,7 +3763,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:00:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:00:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9MQ-00033L-Jg; Wed, 06 May 2020 02:00:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9MP-000338-5u for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:33 +0000 X-Inumbo-ID: 5e3fbc88-8f3d-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5e3fbc88-8f3d-11ea-b9cf-bc764e2007e4; Wed, 06 May 2020 02:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BHzjxqO1byGRPHHbNZFzsYy/jqCUr2J2immnaaRRr3I=; b=hhc3RLY4BVrv1e8mkJ5D4x1lRh PMk5iLyo7VhBzRw+LlMFwro6qa++UpPswjhSefedDA0BLZ9WcK9S0BSf+J6qp6gRUsS3Rf4zj7YXU YHJAvfrOlVnr4qGqt5w+bsWazOFjoARqWM55y1J5fcTvCgQd4kclyFZabGsjuePAYEzk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9MO-0008At-Ez for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9MO-0002Uu-Dw for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] xen/pvh: Fix segment selector ABI Message-Id: Date: Wed, 06 May 2020 02:00:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 59cf3a0111d8c428a6934c728083593f514bf03d Author: Andrew Cooper AuthorDate: Thu Mar 5 11:35:17 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:33:08 2020 +0100 xen/pvh: Fix segment selector ABI The written ABI states that %es will be set up, but libxc doesn't do so. In practice, it breaks `rep movs` inside guests before they reload %es. The written ABI doesn't mention %ss, but libxc does set it up. Having %ds different to %ss is obnoxous to work with, as different registers have different implicit segments. Modify the spec to state that %ss is set up as a flat read/write segment. This a) matches the Multiboot 1 spec, b) matches what is set up in practice, and c) is the more sane behaviour for guests to use. Fixes: 68e1183411b ('libxc: introduce a xc_dom_arch for hvm-3.0-x86_32 guests') Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Reviewed-by: Roger Pau Monné x86/pvh: Adjust dom0's starting state Fixes: b25fb1a04e "xen/pvh: Fix segment selector ABI" Signed-off-by: Andrew Cooper Reviewed-by: Wei Liu Acked-by: Jan Beulich master commit: b25fb1a04e99cc03359eade1affb56ef0eee766f master date: 2020-02-10 15:26:09 +0000 master commit: 6ee10313623c1f41fc72fe12372e176e744463c1 master date: 2020-02-11 11:04:26 +0000 (cherry picked from commit 722458767a297a3ced04743c0156e6ac614e89bf) --- docs/misc/pvh.markdown | 2 +- tools/libxc/xc_dom_x86.c | 3 +++ xen/arch/x86/hvm/dom0_build.c | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/misc/pvh.markdown b/docs/misc/pvh.markdown index e85fb15374..09db72b8bc 100644 --- a/docs/misc/pvh.markdown +++ b/docs/misc/pvh.markdown @@ -23,7 +23,7 @@ following machine state: * `cs`: must be a 32-bit read/execute code segment with a base of ‘0’ and a limit of ‘0xFFFFFFFF’. The selector value is unspecified. - * `ds`, `es`: must be a 32-bit read/write data segment with a base of + * `ds`, `es`, `ss`: must be a 32-bit read/write data segment with a base of ‘0’ and a limit of ‘0xFFFFFFFF’. The selector values are all unspecified. * `tr`: must be a 32-bit TSS (active) with a base of '0' and a limit of '0x67'. diff --git a/tools/libxc/xc_dom_x86.c b/tools/libxc/xc_dom_x86.c index f935d4991d..7ad9609103 100644 --- a/tools/libxc/xc_dom_x86.c +++ b/tools/libxc/xc_dom_x86.c @@ -998,14 +998,17 @@ static int vcpu_hvm(struct xc_dom_image *dom) /* Set the cached part of the relevant segment registers. */ bsp_ctx.cpu.cs_base = 0; bsp_ctx.cpu.ds_base = 0; + bsp_ctx.cpu.es_base = 0; bsp_ctx.cpu.ss_base = 0; bsp_ctx.cpu.tr_base = 0; bsp_ctx.cpu.cs_limit = ~0u; bsp_ctx.cpu.ds_limit = ~0u; + bsp_ctx.cpu.es_limit = ~0u; bsp_ctx.cpu.ss_limit = ~0u; bsp_ctx.cpu.tr_limit = 0x67; bsp_ctx.cpu.cs_arbytes = 0xc9b; bsp_ctx.cpu.ds_arbytes = 0xc93; + bsp_ctx.cpu.es_arbytes = 0xc93; bsp_ctx.cpu.ss_arbytes = 0xc93; bsp_ctx.cpu.tr_arbytes = 0x8b; diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index 303ae4e7b5..d6763b8753 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -577,10 +577,12 @@ static int __init pvh_setup_cpus(struct domain *d, paddr_t entry, .cpu_regs.x86_32.cr0 = X86_CR0_PE | X86_CR0_ET, .cpu_regs.x86_32.cs_limit = ~0u, .cpu_regs.x86_32.ds_limit = ~0u, + .cpu_regs.x86_32.es_limit = ~0u, .cpu_regs.x86_32.ss_limit = ~0u, .cpu_regs.x86_32.tr_limit = 0x67, .cpu_regs.x86_32.cs_ar = 0xc9b, .cpu_regs.x86_32.ds_ar = 0xc93, + .cpu_regs.x86_32.es_ar = 0xc93, .cpu_regs.x86_32.ss_ar = 0xc93, .cpu_regs.x86_32.tr_ar = 0x8b, }; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:00:43 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:00:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9MZ-00035V-NP; Wed, 06 May 2020 02:00:43 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9MZ-00035M-6G for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:43 +0000 X-Inumbo-ID: 64441b1a-8f3d-11ea-9e14-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 64441b1a-8f3d-11ea-9e14-12813bfff9fa; Wed, 06 May 2020 02:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=OxDg1+cuyuuOdhawDa3qXScHSKOdPA1UMDPteVYx3Lc=; b=FXLTuBj1aiYAuNoyjZCbZYiym4 1NFySWe5iDT6F8kzuAn40hTfroq+rZSnUCbATNcqfthlSgXHIPZTyxqeI4jFXhuXXZwuuAYgkCISc v6oU0+e/I5q8U06kMqgGP30RJEBNvUQtNk5KKNMb2dmJuAAT9b4MefnfMXcWribBnmxM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9MY-0008B8-Hz for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9MY-0002Vc-Gq for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Wed, 06 May 2020 02:00:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1e722e6971539eab4f484affd60490cbc8429951 Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:12 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) (cherry picked from commit a997ffe678e698ff2b4c89ae5a98661d12247fef) (cherry picked from commit 48e8564435aca590f1c292ab7bb1f3dbc6b75693) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:00:53 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:00:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Mj-00036i-Oy; Wed, 06 May 2020 02:00:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Mj-00036Z-1Z for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:53 +0000 X-Inumbo-ID: 695d2cf5-8f3d-11ea-9e14-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 695d2cf5-8f3d-11ea-9e14-12813bfff9fa; Wed, 06 May 2020 02:00:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=GHZZfslcAl5fz3dp+jPReRyUQvxq/pdD458yxCLvMD4=; b=xuIHkhKtYIPObR3DpSZKmX4bwU JtLby2t2sXvZ4UI5jXdo3kL0IGVs3qLQmxqafk+/+BQZczpelsWzOH4m7RXSH/YoEy3zhFBKOHEVh g1oa9EhubWau3ieKfCf/ORXLAjsWXLjY6CyDyu+/gSar4X3Nkrl7txwZ6+TKeGnOVP6I=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Mi-0008Bo-Ko for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9Mi-0002WM-Jj for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:00:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Wed, 06 May 2020 02:00:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b01c84e9c0ef1282d747bf4ef233699bc0a56374 Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:02 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) (cherry picked from commit 7b2225078b4b91044c365b2276c8897c46241c79) (cherry picked from commit 66998bdd5220eaef895c66f99a5a74e8dcc187c1) (cherry picked from commit 47772087eb799c3ffb3544c0030a6815fd15336e) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:01:03 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:01:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Mt-00037p-Qj; Wed, 06 May 2020 02:01:03 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Mt-00037h-5w for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:03 +0000 X-Inumbo-ID: 704f026c-8f3d-11ea-9e14-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 704f026c-8f3d-11ea-9e14-12813bfff9fa; Wed, 06 May 2020 02:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=XY29QlsVJLS8ndeKjE+FBTA21Ox+XrF8OTV6bgOwhUM=; b=A/CvZ0NOk00qInboYU8h3bay9K PdfV/Lny7X+hMg0k0grSgWN27ow07Cq0teqE++sXx4ghYUjXGbD+zTQfF6huXyXBU0d5dazPuCFfR MzaZ1cgfOzs6e6YIAb/GgSEL0EcJJ90N6oONKmDSNuMGYO+gGnI5RDbytD/6pzUhF/Qg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9Ms-0008CF-OU for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9Ms-0002XM-MV for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Wed, 06 May 2020 02:01:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3d6090342fdbbe2c74c1aae4657977616393f2ab Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:50 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) (cherry picked from commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2) (cherry picked from commit 275475f1e8a772fee5b088eec1cad18fddce4a8f) (cherry picked from commit 7d8fa6a902eccf06e31aa2433b5466a85afefe73) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index ed0fd0ead9..f058a37a64 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:01:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:01:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9N3-00039P-SU; Wed, 06 May 2020 02:01:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9N3-00039H-8f for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:13 +0000 X-Inumbo-ID: 7654f2a2-8f3d-11ea-9e14-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7654f2a2-8f3d-11ea-9e14-12813bfff9fa; Wed, 06 May 2020 02:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0lSPvsVig5pdCC/wTPp0io9jPPp433jKYvBJo5OpkK8=; b=jtWSJWnCYqzmJZ+1ArxISwHxvN cIHr6/1S+eLOHoVvxGN4pEeiVz5h55YXCRRn21Z8eIKyIRrdROezH8+m5jcfSKfNq6PcWAlABkLl2 j/xFsA+1FrQ1kXGf/z+t75qPcuS46INnke5hXADFfpheZohfxOZGjTHukDcgafFrGeHY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9N2-0008CR-RN for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9N2-0002Y1-QC for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Wed, 06 May 2020 02:01:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b413732087509fb15d6cf4373e0b2396ae4ee476 Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:23 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) (cherry picked from commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb) (cherry picked from commit 288872ad3bb320bd9f31145d9bd4e53786fa3245) (cherry picked from commit a58bba28da793da70b93b841289d99370800180c) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index f058a37a64..9d4c611bd5 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -824,6 +824,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 02:01:23 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 02:01:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9ND-0003AK-UN; Wed, 06 May 2020 02:01:23 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9ND-0003AE-Fy for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:23 +0000 X-Inumbo-ID: 7c53e62c-8f3d-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7c53e62c-8f3d-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 02:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4zdm79G/gUEdrbiN/6QTsOEFeicQB5dUv+j+P5dMWhs=; b=I6KCQateI7HW4XuEOK0p2CTtRS 766FvZljnwLq1ZA1VQL4kyrYdyn5xyJTrpBpati9ah2LoWjla1PdMIMpxIOYA1dt5FOs0SoAbzN4x 4FVUU1x0jV0taJuK1VA/wbrLcz/yQRpmNfEcaWRzN5RR/y+b2z5vxhx+FEnGGJhjf03Q=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jW9NC-0008Ca-U8 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jW9NC-0002Yk-TB for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 02:01:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.10] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Wed, 06 May 2020 02:01:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b922c4431df33ed5b724e53c3f3348e470ddd349 Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:24 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) (cherry picked from commit d2aecd86c4481291b260869c47cf0a9a02321564) (cherry picked from commit e43fc14ec58329813af876ed3b30899a04d65a08) (cherry picked from commit 7dd2ac39e40f0afe1cc6d879bfe65cbf19520cab) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 9d4c611bd5..406ed60019 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -824,10 +824,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:44:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:44:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDmm-00019p-HH; Wed, 06 May 2020 06:44:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDml-00019k-7A for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:03 +0000 X-Inumbo-ID: f9073666-8f64-11ea-9e1d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f9073666-8f64-11ea-9e1d-12813bfff9fa; Wed, 06 May 2020 06:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jPJf/TwS0mAwTEctl323nAEjtFyrThwvfHQIwSpiP/g=; b=U5QtkRtqgAoQub0CBNsTfywaGh te9BDo2YCRpC2AWSF3nzv8iqFJU5m/JlBoh0Ttr+Lur9vfIcWiyl8FP4C6sCx+H4ckEF6jn2G7VJN TMXjO7GZ+yk6fI0gLpjV65lLpxe70irWrVQp/+Z5U03stoHGzbVApe8vPvtn072oaYEk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDmk-0005UP-Fu for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDmk-0004Y2-Eq for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Wed, 06 May 2020 06:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5c1b607e8a4de32fc2238f4d29d477007eb5822c Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:13:40 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:44:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDmw-0001AO-It; Wed, 06 May 2020 06:44:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDmw-0001AI-4Y for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:14 +0000 X-Inumbo-ID: ff0e8dca-8f64-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ff0e8dca-8f64-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 06:44:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=k9NGdszDAUrH93Xrtz8oXaKP2Vk1VfY49/1pANLmHCs=; b=Pba/F1ULbXVMdm8a5oE+KuU601 nqheZEvIiH4vdCgVoCEBORlLAsGV+YI+WaLyq3+Rg8pDvqSj5YvdoXNLso1VCRJYdqMsAL2u6OtjY ADuE9lLtg89aOT5K9/EU/5rtC5w26pY5ZvVqawFFHc96XLZZF+2jCS4w6j/7jqM9Vp30=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDmu-0005UV-IO for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDmu-0004Yp-Hc for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] docs: document CONTROL command of xenstore protocol Message-Id: Date: Wed, 06 May 2020 06:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit daf71f0053e21ebefb0e21431ef48d53af1c3b31 Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:13:51 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:44:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:44:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDn6-0001C2-Mo; Wed, 06 May 2020 06:44:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDn5-0001Bt-S5 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:23 +0000 X-Inumbo-ID: 051434c2-8f65-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 051434c2-8f65-11ea-9887-bc764e2007e4; Wed, 06 May 2020 06:44:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dpmgvmIpnJCGOR6jUrBa156EspcOfNM/4+jMUDv5TtE=; b=sgHmFOyHTmfWwULrLeyVeq/Ars GL6DIzuvAiE6ObP5WocSjJKqPsnl12umTwfJxOqzT1bL1L/jHbDk0MqIRaML1aEl0U0gpzK2eH71C 8Va2QkiF1jMT9sSYrvZgiRDe0TR/l3uJFJtwSrNbVcAB9eumhv+neOjeNJGsvqmaHl4c=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDn4-0005Uj-L7 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDn4-0004ZM-KG for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] docs/misc: pvcalls: Verbatim block should be indented with 4 spaces Message-Id: Date: Wed, 06 May 2020 06:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5c56ea1f22d5cb1aa15c7fea76417e1b2ae0b136 Author: Julien Grall AuthorDate: Sat Jan 11 00:03:44 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:19:59 2020 +0100 docs/misc: pvcalls: Verbatim block should be indented with 4 spaces At the moment, the diagram is only indented with 2 spaces. So pandoc will try to badly interpret it and not display it correctly. Fix it by indenting all the block by 4 spaces (i.e an extra 2 spaces). Fixes: d661611d08 ("docs/markdown: Switch to using pandoc, and fix underscore escaping") Signed-off-by: Julien Grall Acked-by: Andrew Cooper Acked-by: Stefano Stabellini (cherry picked from commit 9c8705f8fe5bfb75a6a00163308d297059b61f6a) (cherry picked from commit 8b60270731eabe7a7dfd41bd625338505829a617) --- docs/misc/pvcalls.pandoc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/misc/pvcalls.pandoc b/docs/misc/pvcalls.pandoc index 0c48b29842..729cf97bdf 100644 --- a/docs/misc/pvcalls.pandoc +++ b/docs/misc/pvcalls.pandoc @@ -867,24 +867,24 @@ and the second half to the **out** array. They are used as circular buffers for transferring data, and, together, they are the data ring. - +---------------------------+ Indexes page - | Command ring: | +----------------------+ - | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | - | @44: ref +-------------------------------->+@76: ring_order = 1 | - | | |@80: ref[0]+ | - +---------------------------+ |@84: ref[1]+ | - | | | - | | | - +----------------------+ - | - v (data ring) - +-------+-----------+ - | @0->4098: in | - | ref[0] | - |-------------------| - | @4099->8196: out | - | ref[1] | - +-------------------+ + +---------------------------+ Indexes page + | Command ring: | +----------------------+ + | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | + | @44: ref +-------------------------------->+@76: ring_order = 1 | + | | |@80: ref[0]+ | + +---------------------------+ |@84: ref[1]+ | + | | | + | | | + +----------------------+ + | + v (data ring) + +-------+-----------+ + | @0->4098: in | + | ref[0] | + |-------------------| + | @4099->8196: out | + | ref[1] | + +-------------------+ #### Indexes Page Structure -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:44:33 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnF-0001Cy-OR; Wed, 06 May 2020 06:44:33 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnF-0001Cr-4v for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:33 +0000 X-Inumbo-ID: 0b0ddeaa-8f65-11ea-9e1d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0b0ddeaa-8f65-11ea-9e1d-12813bfff9fa; Wed, 06 May 2020 06:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sO7i1CFa4LB7fHMbD5NSK6IcVU7CRYtUTvkE3BdW5Ak=; b=AmLs8oG23a/HXbhZ+FtylYM3qL IkdMbcHOL+ZA0HX1uqzSPwnAbUmMx6eLiIw4zjBnFTYJPNW5JPI0VoM2TBCfVBmjjOPMzhzhpoheN dkqndZWw95+p2OdUNfwzc8zkjd2U4p9i7XUuP02XPXS82uz9At7w+0/+44NlERQxEjBs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnE-0005V6-OI for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDnE-0004Zz-ND for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] libxl: Fix comment about dcs.sdss Message-Id: Date: Wed, 06 May 2020 06:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d1c9822b88463d91ca93fdc7e7fa6406efa7762f Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:31:08 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) (cherry picked from commit 5351a0a170fc7f6290d7d3d8be302d53d2426a87) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 1b48293ebf..a119de7136 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4017,7 +4017,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:44:43 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnP-0001E3-QD; Wed, 06 May 2020 06:44:43 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnP-0001Du-8R for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:43 +0000 X-Inumbo-ID: 1113c8aa-8f65-11ea-9e1d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1113c8aa-8f65-11ea-9e1d-12813bfff9fa; Wed, 06 May 2020 06:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bElfndRI3xXwu2g8A9kid1KErXDq4qpioXYPVbfrakw=; b=6VDooba0PwwTI3wIhQY1F7b0OQ 50db5v9yKCsqze+Wi1xouK9Mq5SxN/L6SemtEBD5PoeBIczTB6O5zvTwd0XPr5XVR2PmOgx9gcw8f h2lm/DK19dIyjaO/58qaQGVm01l6DCZ8VfbOEMTr2ZRigcl1qxOX9pko2rFY64F9UxH8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnO-0005VF-Rb for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDnO-0004aW-QX for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Wed, 06 May 2020 06:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a997ffe678e698ff2b4c89ae5a98661d12247fef Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:03 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:44:53 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnZ-0001FU-Ry; Wed, 06 May 2020 06:44:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnZ-0001FM-As for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:53 +0000 X-Inumbo-ID: 1715e6de-8f65-11ea-9e1d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1715e6de-8f65-11ea-9e1d-12813bfff9fa; Wed, 06 May 2020 06:44:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RDHsQJnXqjiqHS/39/VrNLdRd9C8zu5Uv6k+nS8ebeY=; b=bTnh2qhG1a5UAh/ztc9EVaHjsb waiJ2UJ4C0bB2bG5A3NCy8r2rBV8MyycBed+BByTO8fsmd4r/2tr8iCehLrwbKzd9JPq+xyoiY66n HleH1XDYQZWgB9Ga+KqDMYxGyhhDQ7tRPXFliP4Pv3prXas+yBxdZBafK1uPhM7l/9Uk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnY-0005Vp-UI for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDnY-0004b9-TQ for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:44:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Wed, 06 May 2020 06:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 66998bdd5220eaef895c66f99a5a74e8dcc187c1 Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:45:53 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) (cherry picked from commit 7b2225078b4b91044c365b2276c8897c46241c79) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:45:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:45:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnk-0001GW-Tp; Wed, 06 May 2020 06:45:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnk-0001GO-9v for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:04 +0000 X-Inumbo-ID: 1d1f1316-8f65-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1d1f1316-8f65-11ea-b9cf-bc764e2007e4; Wed, 06 May 2020 06:45:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wZxXPgLF10E/cupZIOhrCgfasC3aFW3PDAqCJPJWx/s=; b=aLXXy4wKntBDsnvsH74p0lSPNZ yzWrHxWDXIcn7idrj+VWZ/4PvVcyP2rW14frM6g96BFN+RI4/i3v0GFVaQcgVEtlipISUdX93EpAm fbS4nzuDulGgbgF7Ht6aBOxU6DbtNBqhHeTywJp78H7Z3rzUq4Y9p593W/40WMgyIRkU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnj-0005WO-0h for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDni-0004c7-W5 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Wed, 06 May 2020 06:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 275475f1e8a772fee5b088eec1cad18fddce4a8f Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:34 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) (cherry picked from commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index a2dbf85157..9e9ff32d47 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:45:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:45:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnu-0001HX-Vq; Wed, 06 May 2020 06:45:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnt-0001HK-Jt for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:13 +0000 X-Inumbo-ID: 231dc672-8f65-11ea-9e1d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 231dc672-8f65-11ea-9e1d-12813bfff9fa; Wed, 06 May 2020 06:45:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aCLwnamGERjctzmNjeXcl/+LC7oYXn5wmAwME1j246o=; b=DiT8npOk5o6lEde1rEToIn+Z2k qzv85QC2EjIo+RgLWsltcNYKQHq13+BAhpMp/uUqdg0NJ+GZJbp7KLY+AxJIT9Hxtyu9Lor5/qeFQ GPYnALul/xAOvgvQ7p+bIllT1UftU2E/SxhWojmfFQZhK+J90JgwcvJFwp8fOl1ZJ2To=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDnt-0005WX-3I for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDnt-0004ci-2Y for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Wed, 06 May 2020 06:45:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 288872ad3bb320bd9f31145d9bd4e53786fa3245 Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:17 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) (cherry picked from commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 9e9ff32d47..c673b2670c 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,6 +825,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 06:45:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 06:45:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDo5-0001Is-3n; Wed, 06 May 2020 06:45:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDo4-0001Ik-7K for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:24 +0000 X-Inumbo-ID: 2924988e-8f65-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2924988e-8f65-11ea-b9cf-bc764e2007e4; Wed, 06 May 2020 06:45:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=p37glew4xCNUgI6yZ8BY0CQl0TTeomkt5h40NWgDCDU=; b=1Mm0NTWS8wGKk1t1xFkQYSlYKK D1AGl2vp8OejU5RMnYrLF2zSFEqL04xYbYyrV5e5E2dHfrtMIckdzncWLvCf5821jp2jl6rhrr7Wg OkR94c1UB2miBfanuI9u026K3XEImmG7hG8QYUHHnwYBwhjd0nEIvL0XEG/MGIbr1pbY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWDo3-0005Wk-5m for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWDo3-0004dM-55 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 06:45:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Wed, 06 May 2020 06:45:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e43fc14ec58329813af876ed3b30899a04d65a08 Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:16 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) (cherry picked from commit d2aecd86c4481291b260869c47cf0a9a02321564) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index c673b2670c..ee8b62ce58 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,10 +825,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Wed May 06 09:44:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 09:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWGaz-0000Bl-I5; Wed, 06 May 2020 09:44:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWGay-0000Bg-OT for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 09:44:04 +0000 X-Inumbo-ID: 1f411bda-8f7e-11ea-9e2b-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1f411bda-8f7e-11ea-9e2b-12813bfff9fa; Wed, 06 May 2020 09:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xkCAP+4tXaRNHOcgtgkUaZcwtwqOCqwqlSh4TtYxrB0=; b=KIqq7xh06WyelRDzNIaAu9V3Gt HuZoF+RcFl3dlVXLfoh6tGBrl8UeCKNYB5SyTJ8YJMPoosnN4wzsvQNpeNv838TBEoDqxf71euaTM Be2SJQ3SUqMjs3G9UWyNmn7qGdAVzioDKoppRMtJSG1/DmdiNWjswbyMlDtsZpMIEWTM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWGay-0000vI-1x for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 09:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWGay-0000Pd-0y for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 09:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/hyperv: stash and use the configured max VP index Message-Id: Date: Wed, 06 May 2020 09:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b58dc6dbfa3a038c5a22f06861a7652da80eca28 Author: Wei Liu AuthorDate: Wed Apr 29 11:41:44 2020 +0100 Commit: Wei Liu CommitDate: Wed May 6 10:40:42 2020 +0100 x86/hyperv: stash and use the configured max VP index The value returned from CPUID is the maximum number for virtual processors supported by Hyper-V. It could be larger than the maximum number of virtual processors configured. Stash the configured number into a variable and use it in calculations. Signed-off-by: Wei Liu Reviewed-by: Roger Pau Monné --- xen/arch/x86/guest/hyperv/hyperv.c | 4 ++++ xen/arch/x86/guest/hyperv/private.h | 1 + xen/arch/x86/guest/hyperv/tlb.c | 2 +- xen/arch/x86/guest/hyperv/util.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index 91a6782cd9..84221b7514 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -33,6 +33,7 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +unsigned int __read_mostly hv_max_vp_index; static bool __read_mostly hcall_page_ready; static uint64_t generate_guest_id(void) @@ -143,6 +144,9 @@ static int setup_hypercall_pcpu_arg(void) rdmsrl(HV_X64_MSR_VP_INDEX, vp_index_msr); this_cpu(hv_vp_index) = vp_index_msr; + if ( vp_index_msr > hv_max_vp_index ) + hv_max_vp_index = vp_index_msr; + return 0; } diff --git a/xen/arch/x86/guest/hyperv/private.h b/xen/arch/x86/guest/hyperv/private.h index 354fc7f685..fea3e291e9 100644 --- a/xen/arch/x86/guest/hyperv/private.h +++ b/xen/arch/x86/guest/hyperv/private.h @@ -28,6 +28,7 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +extern unsigned int hv_max_vp_index; static inline unsigned int hv_vp_index(unsigned int cpu) { diff --git a/xen/arch/x86/guest/hyperv/tlb.c b/xen/arch/x86/guest/hyperv/tlb.c index 1d723d6ee6..f249b25925 100644 --- a/xen/arch/x86/guest/hyperv/tlb.c +++ b/xen/arch/x86/guest/hyperv/tlb.c @@ -166,7 +166,7 @@ int hyperv_flush_tlb(const cpumask_t *mask, const void *va, { unsigned int vpid = hv_vp_index(cpu); - if ( vpid >= ms_hyperv.max_vp_index ) + if ( vpid > hv_max_vp_index ) { local_irq_restore(irq_flags); return -ENXIO; diff --git a/xen/arch/x86/guest/hyperv/util.c b/xen/arch/x86/guest/hyperv/util.c index bec61c2afd..2c5f421b7b 100644 --- a/xen/arch/x86/guest/hyperv/util.c +++ b/xen/arch/x86/guest/hyperv/util.c @@ -33,7 +33,7 @@ int cpumask_to_vpset(struct hv_vpset *vpset, { int nr = 1; unsigned int cpu, vcpu_bank, vcpu_offset; - unsigned int max_banks = ms_hyperv.max_vp_index / 64; + unsigned int max_banks = hv_max_vp_index / 64; /* Up to 64 banks can be represented by valid_bank_mask */ if ( max_banks > 64 ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:11:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH17-0003Af-C8; Wed, 06 May 2020 10:11:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH15-0003AZ-RV for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:03 +0000 X-Inumbo-ID: e3eaac28-8f81-11ea-9e2f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e3eaac28-8f81-11ea-9e2f-12813bfff9fa; Wed, 06 May 2020 10:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ghqnjn4nQdcc6aSueS/VgJw7+ZVdogA92tQiAYLmiYw=; b=jA6yZbKRcIoG8jY8mMUmEnBMNj AEcqvLm8MKtGHYYwEv98DZNft4/g0xLcNue6HNzMtsNAvDFkvMneBFl7RhuS5cR6X2/9jlnEq9aab hmdD5qWH6YpUeJXw+N00F9PnP/8XjDCg36Wwy9WDxYQaA/afojbvBv7wL6BQoeVRuCQo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH14-0001ZK-G4 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH14-0002jH-Es for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] tools/xentop: Fix calculation of used memory Message-Id: Date: Wed, 06 May 2020 10:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e04b94a54fd550636600f8d32f6076c6167dab52 Author: Sander Eikelenboom AuthorDate: Wed Feb 19 21:31:30 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:10:55 2020 +0100 tools/xentop: Fix calculation of used memory Used memory should be calculated by subtracting free memory from total memory. Fixes: c588c002cc1 ("tools: remove tmem code and commands") Signed-off-by: Sander Eikelenboom Acked-by: Wei Liu (cherry picked from commit 4b5b431edd984b26f43b3efc7de465f3560a949e) --- tools/xenstat/xentop/xentop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstat/xentop/xentop.c b/tools/xenstat/xentop/xentop.c index af11ebfbf7..f9f4dfb453 100644 --- a/tools/xenstat/xentop/xentop.c +++ b/tools/xenstat/xentop/xentop.c @@ -969,7 +969,7 @@ void do_summary(void) "%u crashed, %u dying, %u shutdown \n", num_domains, run, block, pause, crash, dying, shutdown); - used = xenstat_node_tot_mem(cur_node); + used = xenstat_node_tot_mem(cur_node) - xenstat_node_free_mem(cur_node); freeable_mb = 0; /* Dump node memory and cpu information */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:11:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1G-0003Cw-E4; Wed, 06 May 2020 10:11:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1F-0003Cp-7d for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:13 +0000 X-Inumbo-ID: e9eb4678-8f81-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e9eb4678-8f81-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 10:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NL2EhlZUVD35WaczgZRf7ukyPKdo/6JqC9+iii1wNNU=; b=on+pcLECA2b5xHp9/pjv4MCmMV MnXAWwoLv0xUmCocmQtxkqptwWF9GRufkOjup+m9Zx832769jdGTK7uJU6Gc2A3+qHmF83CIDmOtu JU9AQ8D6PSWs9YZ1W8tv0n2jykIJMCm/ExnbZAUsLIwzS5YRIqKiTwT0pD96a4NPvCO8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1E-0001ZT-IZ for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH1E-0002kB-Hb for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Wed, 06 May 2020 10:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5f3c215eb5a537c5d5bcfbaafb3e547bcb62d960 Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:12:36 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:11:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1Q-0003EO-G5; Wed, 06 May 2020 10:11:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1P-0003EC-9F for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:23 +0000 X-Inumbo-ID: efee374c-8f81-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id efee374c-8f81-11ea-9887-bc764e2007e4; Wed, 06 May 2020 10:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=S29wr3ZLyhVyr6jhCIHoXRs8RxtkC79ut5aI1YQ9geg=; b=CyEF72G5ZwCgOUREOJ5xsUKcl1 FwdHZbY+CIlO9QengAKeUwQ6Lkb/YRnZq61P94XFCHd9ddsOkaIlE1+qoLTboRAwPs39/7+scU7su F7HAa+1Vt8BACU/BZuNcFX4o9Vva0WxL+DnSIm9tutaLkyEFbatwvbLlr1KLlulKV140=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1O-0001Zc-L8 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH1O-0002l0-K4 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] docs: document CONTROL command of xenstore protocol Message-Id: Date: Wed, 06 May 2020 10:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 003300eed37e76917ae44bfdf1cdbda1daf00e4d Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:12:41 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:11:35 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:11:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1b-0003FS-Hr; Wed, 06 May 2020 10:11:35 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1Z-0003FF-FJ for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:33 +0000 X-Inumbo-ID: f5ef9b40-8f81-11ea-9e2f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f5ef9b40-8f81-11ea-9e2f-12813bfff9fa; Wed, 06 May 2020 10:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ii/4Fgq+WFIKAWhow/d8RSeZ0nxyhH/sOqBywwUCjOc=; b=EKMCmEL9hh5P0eMm4Rw+3decfU ik3IaJtv5OWALrCtWCLcSgsYCV1cLhqQpQPJl4Y9CeBePhlbEibXfZ+E5gDxZdP3XN/B6rcrqxcyf moL82AbVJ71Mv7F77UtJI1bKKy32WCxIBTzv/bHuU3urpYn8G2T+FZJyxFlGucdizoX8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1Y-0001Zr-Ni for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH1Y-0002m1-Mj for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] docs: Render .md files using pandoc Message-Id: Date: Wed, 06 May 2020 10:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b9c93d4e178b9b4705f63052ccab7b4f51b97d4c Author: Andrew Cooper AuthorDate: Fri Apr 3 14:12:12 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:12:47 2020 +0100 docs: Render .md files using pandoc This fixes the fact that qemu-deprivilege.md, non-cooperative-migration.md and xenstore-migration.md don't currently get rendered at all, and are therefore missing from xenbits.xen.org/docs Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Reviewed-by: Ian Jackson Backport: 4.12 (cherry picked from commit 37053578e8bd57de9d114b19a29f5ab1533d6071) --- docs/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index d8ba99b1dc..3eae2dae60 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -15,7 +15,7 @@ RST-SRC-y := $(sort $(filter-out %index.rst,$(shell find * -type f -name '*.rst' TXTSRC-y := $(sort $(shell find misc -name '*.txt' -print)) -PANDOCSRC-y := $(sort $(shell find designs/ features/ misc/ process/ specs/ -name '*.pandoc' -print)) +PANDOCSRC-y := $(sort $(shell find designs/ features/ misc/ process/ specs/ \( -name '*.pandoc' -o -name '*.md' \) -print)) # Documentation targets $(foreach i,$(MAN_SECTIONS), \ @@ -24,15 +24,18 @@ $(foreach i,$(MAN_SECTIONS), \ DOC_HTML := html/SUPPORT.html \ $(patsubst %.pandoc,html/%.html,$(PANDOCSRC-y)) \ + $(patsubst %.md,html/%.html,$(PANDOCSRC-y)) \ $(patsubst %.rst,html/%.html,$(RST-SRC-y)) \ $(patsubst %,html/%.html,$(MAN-SRC-y)) \ $(patsubst %.txt,html/%.txt,$(TXTSRC-y)) \ $(patsubst %,html/hypercall/%/index.html,$(DOC_ARCHES)) DOC_TXT := $(patsubst %.txt,txt/%.txt,$(TXTSRC-y)) \ $(patsubst %.pandoc,txt/%.txt,$(PANDOCSRC-y)) \ + $(patsubst %.md,txt/%.txt,$(PANDOCSRC-y)) \ $(patsubst %.rst,txt/%.txt,$(RST-SRC-y)) \ $(patsubst %,txt/%.txt,$(MAN-SRC-y)) DOC_PDF := $(patsubst %.pandoc,pdf/%.pdf,$(PANDOCSRC-y)) \ + $(patsubst %.md,pdf/%.pdf,$(PANDOCSRC-y)) \ $(patsubst %.rst,pdf/%.pdf,$(RST-SRC-y)) # Top level build targets @@ -228,12 +231,10 @@ define GENERATE_PANDOC_RULE # $(1) is the target documentation format. $(2) is the source format. $(call GENERATE_PANDOC_RULE_RAW,$(1)/%.$(1),%.$(2)) endef -$(eval $(call GENERATE_PANDOC_RULE,pdf,pandoc)) # pdf/%.pdf: %.pandoc -$(eval $(call GENERATE_PANDOC_RULE,pdf,rst)) # pdf/%.pdf: %.rst -$(eval $(call GENERATE_PANDOC_RULE,txt,pandoc)) # txt/%.txt: %.pandoc -$(eval $(call GENERATE_PANDOC_RULE,txt,rst)) # txt/%.txt: %.rst -$(eval $(call GENERATE_PANDOC_RULE,html,pandoc)) # html/%.html: %.pandoc -$(eval $(call GENERATE_PANDOC_RULE,html,rst)) # html/%.html: %.rst + +$(foreach dst-fmt,pdf txt html,\ +$(foreach src-fmt,pandoc md rst,\ +$(eval $(call GENERATE_PANDOC_RULE,$(dst-fmt),$(src-fmt))))) $(eval $(call GENERATE_PANDOC_RULE_RAW,html/SUPPORT.html,$(XEN_ROOT)/SUPPORT.md)) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:11:44 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1k-0003GW-Jq; Wed, 06 May 2020 10:11:44 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1k-0003GP-1k for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:44 +0000 X-Inumbo-ID: fbdac07b-8f81-11ea-9e2f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fbdac07b-8f81-11ea-9e2f-12813bfff9fa; Wed, 06 May 2020 10:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WnFTJ6WxKzl2jj4hNWUnbKXEVe2RlF66zXLX3JndkWA=; b=C+Y7StdMD3Ottb7Vyp53Lft4Ir iM6adX8d5yb3aUBwszHrs2C0zIaoOrIGxssPE8Gen3jQvK8TPzUX427kbFWJ/R1+5xQM7c/hP5MFb LMztBZeX4RAxrUMS+j7kjoyI52uqsbp3zAZjSt89gtbqQGKFSMxl4CdRfa1FmgqTkxTw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1i-0001as-QR for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH1i-0002n4-PL for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] tools/python: mismatch between pyxc_methods flags and PyObject definitions Message-Id: Date: Wed, 06 May 2020 10:11:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 93e762d1e2a769b11de5a725e8c59872ae9e055d Author: YOUNG, MICHAEL A AuthorDate: Tue Mar 17 23:01:43 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:13:11 2020 +0100 tools/python: mismatch between pyxc_methods flags and PyObject definitions pygrub in xen-4.13.0 with python 3.8.2 fails with the error Traceback (most recent call last): File "/usr/libexec/xen/bin/pygrub", line 21, in import xen.lowlevel.xc SystemError: bad call flags This patch fixes mismatches in tools/python/xen/lowlevel/xc/xc.c between the flag bits defined in pyxc_methods and the parameters passed to the corresponding PyObject definitions. With this patch applied pygrub works as expected. Signed-off-by: Michael Young Reviewed-by: Wei Liu Acked-by: Marek Marczykowski-Górecki (cherry picked from commit e19b4b3b55f84e0cfcc02fe5d66965969a81c965) --- tools/python/xen/lowlevel/xc/xc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index a751e85910..80b3452ac2 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -2106,7 +2106,7 @@ static PyMethodDef pyxc_methods[] = { { "gnttab_hvm_seed", (PyCFunction)pyxc_gnttab_hvm_seed, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Initialise HVM guest grant table.\n" " dom [int]: Identifier of domain to build into.\n" " console_gmfn [int]: \n" @@ -2175,7 +2175,7 @@ static PyMethodDef pyxc_methods[] = { { "sched_credit_domain_set", (PyCFunction)pyxc_sched_credit_domain_set, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Set the scheduling parameters for a domain when running with the\n" "SMP credit scheduler.\n" " domid [int]: domain id to set\n" @@ -2193,7 +2193,7 @@ static PyMethodDef pyxc_methods[] = { { "sched_credit2_domain_set", (PyCFunction)pyxc_sched_credit2_domain_set, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Set the scheduling parameters for a domain when running with the\n" "SMP credit2 scheduler.\n" " domid [int]: domain id to set\n" @@ -2491,21 +2491,21 @@ static PyMethodDef pyxc_methods[] = { { "flask_context_to_sid", (PyCFunction)pyflask_context_to_sid, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Convert a context string to a dynamic SID.\n" " context [str]: String specifying context to be converted\n" "Returns: [int]: Numeric SID on success; -1 on error.\n" }, { "flask_sid_to_context", (PyCFunction)pyflask_sid_to_context, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Convert a dynamic SID to context string.\n" " context [int]: SID to be converted\n" "Returns: [str]: Numeric SID on success; -1 on error.\n" }, { "flask_load", (PyCFunction)pyflask_load, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Loads a policy into the hypervisor.\n" " policy [str]: policy to be load\n" "Returns: [int]: 0 on success; -1 on failure.\n" }, @@ -2518,14 +2518,14 @@ static PyMethodDef pyxc_methods[] = { { "flask_setenforce", (PyCFunction)pyflask_setenforce, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Modifies the current mode for the Flask XSM module.\n" " mode [int]: mode to change to\n" "Returns: [int]: 0 on success; -1 on failure.\n" }, { "flask_access", (PyCFunction)pyflask_access, - METH_KEYWORDS, "\n" + METH_VARARGS | METH_KEYWORDS, "\n" "Returns whether a source context has access to target context based on \ class and permissions requested.\n" " scon [str]: source context\n" -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:11:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1u-0003IW-PD; Wed, 06 May 2020 10:11:54 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1t-0003Hh-NU for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:53 +0000 X-Inumbo-ID: 01ebf7eb-8f82-11ea-9e2f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 01ebf7eb-8f82-11ea-9e2f-12813bfff9fa; Wed, 06 May 2020 10:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ng1Y38rATr70SPWZdSccTUyRSS+VUkMFhDmJPeNdTJE=; b=Getj6xPTSyuHsQ6OyCAL04cOTH r5BVl9vTHcYQ5CXJ3Lw10sUtku5NHos0f2d2Ong9AoWvNsetj5ISwnAI4EAJ5EC/1JeEUUV0woyFl qwwC/VgW1oeQy+CAAq9dcPcWHidOetJ6NRZL/0aP+gNJO2GLPH4QbMgaeFu9OqZFgM2g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH1s-0001b7-T0 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH1s-0002np-S2 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:11:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] docs/misc: pvcalls: Verbatim block should be indented with 4 spaces Message-Id: Date: Wed, 06 May 2020 10:11:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8b60270731eabe7a7dfd41bd625338505829a617 Author: Julien Grall AuthorDate: Sat Jan 11 00:03:44 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:19:01 2020 +0100 docs/misc: pvcalls: Verbatim block should be indented with 4 spaces At the moment, the diagram is only indented with 2 spaces. So pandoc will try to badly interpret it and not display it correctly. Fix it by indenting all the block by 4 spaces (i.e an extra 2 spaces). Fixes: d661611d08 ("docs/markdown: Switch to using pandoc, and fix underscore escaping") Signed-off-by: Julien Grall Acked-by: Andrew Cooper Acked-by: Stefano Stabellini (cherry picked from commit 9c8705f8fe5bfb75a6a00163308d297059b61f6a) --- docs/misc/pvcalls.pandoc | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/misc/pvcalls.pandoc b/docs/misc/pvcalls.pandoc index 0c48b29842..729cf97bdf 100644 --- a/docs/misc/pvcalls.pandoc +++ b/docs/misc/pvcalls.pandoc @@ -867,24 +867,24 @@ and the second half to the **out** array. They are used as circular buffers for transferring data, and, together, they are the data ring. - +---------------------------+ Indexes page - | Command ring: | +----------------------+ - | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | - | @44: ref +-------------------------------->+@76: ring_order = 1 | - | | |@80: ref[0]+ | - +---------------------------+ |@84: ref[1]+ | - | | | - | | | - +----------------------+ - | - v (data ring) - +-------+-----------+ - | @0->4098: in | - | ref[0] | - |-------------------| - | @4099->8196: out | - | ref[1] | - +-------------------+ + +---------------------------+ Indexes page + | Command ring: | +----------------------+ + | @0: xen_pvcalls_connect: | |@0 pvcalls_data_intf: | + | @44: ref +-------------------------------->+@76: ring_order = 1 | + | | |@80: ref[0]+ | + +---------------------------+ |@84: ref[1]+ | + | | | + | | | + +----------------------+ + | + v (data ring) + +-------+-----------+ + | @0->4098: in | + | ref[0] | + |-------------------| + | @4099->8196: out | + | ref[1] | + +-------------------+ #### Indexes Page Structure -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:12:04 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:12:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH24-0003Jc-RY; Wed, 06 May 2020 10:12:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH23-0003JR-IK for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:03 +0000 X-Inumbo-ID: 07f7fdaa-8f82-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 07f7fdaa-8f82-11ea-9887-bc764e2007e4; Wed, 06 May 2020 10:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=n+EWsmZRwBgbD1cFCy3L+O5bssru+GGWYm2Ig7bqMU4=; b=jadrTzoCF7qUA7kjJBzpava3ns hPEj76GsKtUNflXs6C4ZgRQ9xBR+PZ5ekZZ3d70kQkYOAVvBFN6SjfARWp0yUoiLO4PMV6pWaGpXl hHHiIxrRfvDAaVNQFIBCC9ujjReJNB+VRGJkqTSQFqhJtnzXtI3NJMMn0aMDt+4+IrZU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH22-0001c7-Vm for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH22-0002or-Ui for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] libxl: Fix comment about dcs.sdss Message-Id: Date: Wed, 06 May 2020 10:12:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 48f4d695ee5713a25fc383d669b6142fbcbb7e20 Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:33:50 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index b5adbfe4b7..247518a7ac 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4148,7 +4148,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:12:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:12:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2E-0003Ke-Ti; Wed, 06 May 2020 10:12:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2D-0003KV-Ll for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:13 +0000 X-Inumbo-ID: 0dfafaea-8f82-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0dfafaea-8f82-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 10:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CEhbwMxcpuLTxXuo7VU/Kw96rG3+tAD3exaVtDCwEWo=; b=Evv+e7rDO8l/4IymuXDKsw+wXo lYtUmm6OHUe0hWB/lR87luYGOhpuYkgcgOfWnBZQcbS4O03fd6whs55q/jlBiXa3D+S7stboUsB0Y Q0Lb4o+UFjaNySEuczdo3BC0klrt19wXbD2CY9cFe7je/46uZ0gwRNaux6rcIMjFA9ho=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2D-0001cG-2H for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH2D-0002pa-1E for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Wed, 06 May 2020 10:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dc5176d0f9434e275e0be1df8d0518e243798beb Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:35:54 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 1a83097952..1eae703ef6 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -214,6 +214,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -230,8 +231,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:12:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:12:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2O-0003Lb-VS; Wed, 06 May 2020 10:12:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2N-0003LT-N0 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:23 +0000 X-Inumbo-ID: 140087c0-8f82-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 140087c0-8f82-11ea-b07b-bc764e2007e4; Wed, 06 May 2020 10:12:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Y7fqZw57hbmqcMTM+WpjFbA59Icf6APMuqxzz/qDl/s=; b=yXTW267qA+ghOB8kPNouYefY3w HM3KndKCeBnKWERc6td1BaIi1VcgiTNHA8QniebsdKwx9GS1vJ8quF84nva4DAuulBnuguaTcM9oM y/LAdI56J/rEceIU2kYxFm/4b4Qj04JZ4Jpkopo6QT+pFz4M9YFLSVBpm2eXGCLze1iE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2N-0001cV-4i for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH2N-0002qM-3q for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Wed, 06 May 2020 10:12:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7b2225078b4b91044c365b2276c8897c46241c79 Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:45:43 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:12:35 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:12:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2Z-0003Mf-1B; Wed, 06 May 2020 10:12:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2X-0003MV-WB for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:34 +0000 X-Inumbo-ID: 19fdca52-8f82-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 19fdca52-8f82-11ea-9887-bc764e2007e4; Wed, 06 May 2020 10:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=opz+9GSqvyMtBemjEzTc2ZLjWIRaqUrXe+E2vp8eKm8=; b=QT3v4k80FxGKjNoT77wFr6dA++ t8ZSUGHfsoGcx3nYyYmeoWQ/k7kdQm801q5/8zZ1FV/dUaFHZ6iZk7QzqThpM8sAVWaQZRs7uUlrn WbsZkAIsxtuAlu0Nea+h1a3QlA2p6i+dQFLcE4fy5qOJ++hNs4muHVmvHCLKtfVsqpgQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2X-0001cn-7J for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH2X-0002s3-6P for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Wed, 06 May 2020 10:12:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2 Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:26 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index a2dbf85157..9e9ff32d47 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:12:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:12:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2j-0003Nq-3D; Wed, 06 May 2020 10:12:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2i-0003Ne-4Q for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:44 +0000 X-Inumbo-ID: 1f3d5169-8f82-11ea-9e2f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1f3d5169-8f82-11ea-9e2f-12813bfff9fa; Wed, 06 May 2020 10:12:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=StwrsQsaLdj87Kuv+gZ4rvLldlFhLf4vjY44vM02irg=; b=PyV29tYQ33aj1D1LBek3DnsSXU 2LoF9zOHhIwftRcL2AK8/lw6sNfxQYf9Mc1+1gZi1loYFcJKlTxojX7OA5yFjLWMwNrx6uhfoIEQb OyBS0qAsi+pCxuxqEE+UTzaaXdK9Ihu4bCqXhKq+ETbXPCc/+XEeQc/8aMP6ZVupejqc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2h-0001cz-9w for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH2h-0002so-8u for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Wed, 06 May 2020 10:12:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:11 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 9e9ff32d47..c673b2670c 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,6 +825,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:12:55 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:12:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2t-0003Q1-6R; Wed, 06 May 2020 10:12:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2r-0003PQ-Vn for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:54 +0000 X-Inumbo-ID: 260197fc-8f82-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 260197fc-8f82-11ea-9887-bc764e2007e4; Wed, 06 May 2020 10:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jHdrkyMOCmATX6jz3QBQWJWIahI6Ioo8WDZ+PtN7qzI=; b=1g4u7Yfbq2u/+MKxFtCQRPXEHQ +oK73CvxlHtQN1Ka+0MAQ9UCgvddQKWWqJHIM67e1jypufXnNZ4bfJ69pbxoyoS/3j0aCJZjfWSkt +aipncz/M2/Y8eP6gcZ7eKN5E4JHPp+RNcrgdGxswD769DBO4tJBxGIRcEP86qyjhYVk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH2r-0001d8-CL for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH2r-0002tg-BT for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:12:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] tools/libxc: Fix HVM_PARAM_PAE_ENABLED handling in xc_cpuid_apply_policy() Message-Id: Date: Wed, 06 May 2020 10:12:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 19e6009e5fd481ec6e3a4d7e464299076db4616b Author: Andrew Cooper AuthorDate: Fri Dec 20 15:26:00 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:48:05 2020 +0100 tools/libxc: Fix HVM_PARAM_PAE_ENABLED handling in xc_cpuid_apply_policy() Despite as suggested in c/s 685e922d6f3, not all HVM_PARAMs are handled in the same way. HVM_PARAM_PAE_ENABLED is a toolstack-only value, and the xc_cpuid_apply_policy() used to be the only consumer. Reinstate the old behaviour (mad as it is) to avoid regressions. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich (cherry picked from commit d79cc6bc2bac1cfba239e5b3e28a851fb22901dc) --- tools/libxc/xc_cpuid_x86.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 519d6d8bd0..2540aa1e1c 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -579,6 +579,8 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, } else { + uint64_t val; + /* * Topology for HVM guests is entirely controlled by Xen. For now, we * hardcode APIC_ID = vcpu_id * 2 to give the illusion of no SMT. @@ -633,6 +635,16 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, } /* + * HVM_PARAM_PAE_ENABLED is a parameter to this function, stashed in + * Xen. Nothing else has ever taken notice of the value. + */ + rc = xc_hvm_param_get(xch, domid, HVM_PARAM_PAE_ENABLED, &val); + if ( rc ) + goto out; + + p->basic.pae = val; + + /* * These settings are necessary to cause earlier HVM_PARAM_NESTEDHVM / * XEN_DOMCTL_disable_migrate settings to be reflected correctly in * CPUID. Xen will discard these bits if configuration hasn't been -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 10:13:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 10:13:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH33-0003Rv-88; Wed, 06 May 2020 10:13:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH32-0003Rl-7Z for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:13:04 +0000 X-Inumbo-ID: 2c07de90-8f82-11ea-9e2f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2c07de90-8f82-11ea-9e2f-12813bfff9fa; Wed, 06 May 2020 10:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=JdcQG/z1Db76rYScijhXFiIihMZxjnm7phWUcF592Sw=; b=obXtS21ZWA/71yE/od3AHt8rEJ n4BwxQCVe5cJZvCHd6iNrQ9e5OpGZpsyRRvB0or/lVp6mKqMWpIhu4+7E0woGeqzRLZ9emj+UKOQ/ QUj8nRQHKAKps7J82IRnq5ffZxCna9cNuJzjlfXoCO0LPF1f/UjcTyJNpboxKOnVM7cw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWH31-0001dx-Fh for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:13:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWH31-0002ub-EY for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 10:13:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Wed, 06 May 2020 10:13:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d2aecd86c4481291b260869c47cf0a9a02321564 Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:10 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index c673b2670c..ee8b62ce58 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,10 +825,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:55:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMO1-0006iW-Oy; Wed, 06 May 2020 15:55:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMO1-0006iP-9s for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:05 +0000 X-Inumbo-ID: f280d976-8fb1-11ea-9e8c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f280d976-8fb1-11ea-9e8c-12813bfff9fa; Wed, 06 May 2020 15:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Mf+7DslryCDmthNuhrlI1e0IGepNpyuVIQbuE/ehhe4=; b=MK96hJ+j0Gx2If+WLZrwAqD2z8 Da29qU+3Vp5NcjoOd9Y8Nz9JaQ2k00KPW+VZ8l1Wa+3GxSLcAVjXifSKiIx9ULSxHTg2zvOEs5Uw6 3cW3JnW6P9QDLBC7wpZgIosBC5DFezQF6ADb2Zje/7H95T5zMfkovmme/YY91UQGpzzc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMNy-00080Z-Oz for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMNy-0000wa-O4 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] docs: add DIRECTORY_PART specification do xenstore protocol doc Message-Id: Date: Wed, 06 May 2020 15:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e84b63444e190a8c4380c130c120e1d3e6f4cf31 Author: Juergen Gross AuthorDate: Mon Jan 27 17:50:50 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:14:57 2020 +0100 docs: add DIRECTORY_PART specification do xenstore protocol doc DIRECTORY_PART was missing in docs/misc/xenstore.txt. Add it. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Acked-by: Wei Liu Backport: 4.9+ (cherry picked from commit 94a0252c10cb9938bdee98cc456c23e17b28eafb) (cherry picked from commit 5c1b607e8a4de32fc2238f4d29d477007eb5822c) --- docs/misc/xenstore.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index ae1b6a8c6e..65570183b6 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -152,6 +152,15 @@ DIRECTORY | |* leafnames. The resulting children are each named /. +DIRECTORY_PART | ||* + Same as DIRECTORY, but to be used for children lists longer than + XENSTORE_PAYLOAD_MAX. Input are and the byte offset into + the list of children to return. Return values are the generation + count of the node (to be used to ensure the node hasn't + changed between two reads: being the same for multiple + reads guarantees the node hasn't changed) and the list of children + starting at the specified of the complete list. + GET_PERMS | |+ SET_PERMS ||+? is one of the following -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:55:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOA-0006jW-QV; Wed, 06 May 2020 15:55:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMO9-0006jP-W7 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:14 +0000 X-Inumbo-ID: f882add6-8fb1-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f882add6-8fb1-11ea-b9cf-bc764e2007e4; Wed, 06 May 2020 15:55:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6RAs6drrb9pk9L7W8wntxnjnBFyH7qPDNn2mJkEPduI=; b=EoRxpSZQsW/ExsHmLerXn9/M52 Nf+N0W5BSshhi0wqGKKAUHtrRPtayuk1MaYZ1ejqgNtQvZFUKRYMfCymLTMwyiuIwwDxGpUY0Ndgb +rX408H6nsQjxvDeIGY2pkTM00ZwRRVskSZmnyc8oVNU/wOiQ3/m/7gFCr1WgMVsMkC4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMO8-000818-Ru for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMO8-0000xS-Qk for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] docs: document CONTROL command of xenstore protocol Message-Id: Date: Wed, 06 May 2020 15:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit afe82f5781bf402e56b23a46e41bbb055255a068 Author: Juergen Gross AuthorDate: Tue Jan 28 06:21:07 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:14:58 2020 +0100 docs: document CONTROL command of xenstore protocol The CONTROL command (former DEBUG command) isn't specified in the xenstore protocol doc. Add it. Signed-off-by: Juergen Gross Acked-by: Ian Jackson Backport: 4.9+ (cherry picked from commit f910c3ebc6a178c5cbbc0868134be536fae7f7cf) (cherry picked from commit daf71f0053e21ebefb0e21431ef48d53af1c3b31) --- docs/misc/xenstore.txt | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 65570183b6..6f8569d576 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -318,12 +318,32 @@ SET_TARGET || ---------- Miscellaneous ---------- -DEBUG print||?? sends to debug log -DEBUG print| EINVAL -DEBUG check|?? checks xenstored innards -DEBUG no-op (future extension) - - These requests should not generally be used and may be - withdrawn in the future. - +CONTROL |[|] + Send a control command with optional parameters + () to Xenstore daemon. + + The set of commands and their semantics is implementation + specific and is likely to change from one Xen version to the + next. Out-of-tree users will encounter compatibility issues. + + Current commands are: + check + checks xenstored innards + log|on + turn xenstore logging on + log|off + turn xenstore logging off + logfile| + log to specified file + memreport|[] + print memory statistics to logfile (no + specified) or to specific file + print| + print to syslog (xenstore runs as daemon) or + to console (xenstore runs as stubdom) + help + return list of supported commands for CONTROL + +DEBUG + Deprecated, now named CONTROL -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:55:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:55:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOL-0006lL-S5; Wed, 06 May 2020 15:55:25 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOK-0006l8-OD for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:24 +0000 X-Inumbo-ID: fe83d7d2-8fb1-11ea-9e8c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fe83d7d2-8fb1-11ea-9e8c-12813bfff9fa; Wed, 06 May 2020 15:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=9d+1G/gD+fi2+XIku8Jl/vPnuR5/Vu7J3tYKyyP6vIA=; b=W+LWCwc0n8C2lr8tsYjYlZWRnV tirDRzDTmMoEs0/dWhQqG/U/k7X9S8XR8U4dcr8uNyGgRqtPa5viD8vH3fSaEqd41msmW7CwpVuc8 ye/MWrLDepLST1Gyocapi1JkJymJW95YIKR0aFZ+rLqxibdfJ48msp4Eka5eUvieaZVs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOI-00081P-Uw for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMOI-0000y1-Tr for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] libxl: Fix comment about dcs.sdss Message-Id: Date: Wed, 06 May 2020 15:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2efca7ed3bf11b5c9467a0cb69f8e880378dec83 Author: Anthony PERARD AuthorDate: Thu Jan 23 16:56:46 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:31:15 2020 +0100 libxl: Fix comment about dcs.sdss The field 'sdss' was named 'dmss' before, commit 3148bebbf0ab did the renamed but didn't update the comment. Fixes: 3148bebbf0ab ("libxl: rename a field in libxl__domain_create_state") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper (cherry picked from commit 035c4d771600f300382a1637f2da33023f76b4c1) (cherry picked from commit 5351a0a170fc7f6290d7d3d8be302d53d2426a87) (cherry picked from commit d1c9822b88463d91ca93fdc7e7fa6406efa7762f) --- tools/libxl/libxl_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index ad536b7e89..b9a3a3e0ab 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -3827,7 +3827,7 @@ struct libxl__domain_create_state { libxl__checkpoint_devices_state cds; libxl__bootloader_state bl; libxl__stub_dm_spawn_state sdss; - /* If we're not doing stubdom, we use only dmss.dm, + /* If we're not doing stubdom, we use only sdss.dm, * for the non-stubdom device model. */ libxl__stream_read_state srs; /* necessary if the domain creation failed and we have to destroy it */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:55:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOU-0006mT-Td; Wed, 06 May 2020 15:55:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOT-0006mJ-KY for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:33 +0000 X-Inumbo-ID: 04853b58-8fb2-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 04853b58-8fb2-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 15:55:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PljZvaIaSOatnbMkuA6UDfLZhjpM+0v8y+rs2g8QzKw=; b=c/ssPZQiUeh/rl4yML4FyLZK5p oCoQfTnk/Mp4R3d80oeL1aTDoqz/13t3pbinRg+RGVPed3Epl+9n47uBdiX077dLwdZLgOuqjshIF sT5NNqEQDkpckKdXzzE9RUDtozutU4HiEZdibL+jiOEp6ic5D454qcojqifVWAeW8H2o=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOT-00081Y-1V for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMOT-0000yg-0L for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Wed, 06 May 2020 15:55:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 48e8564435aca590f1c292ab7bb1f3dbc6b75693 Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:08 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) (cherry picked from commit a997ffe678e698ff2b4c89ae5a98661d12247fef) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:55:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:55:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOe-0006nb-VT; Wed, 06 May 2020 15:55:44 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOd-0006nR-M1 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:43 +0000 X-Inumbo-ID: 0a88e00e-8fb2-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0a88e00e-8fb2-11ea-b9cf-bc764e2007e4; Wed, 06 May 2020 15:55:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0jKhSrcrVsbD5ZfsTsor3RaU8r2Bao4ZPzzixbqWIJw=; b=FrDIHNCNOKW/4j9QLrmJCGmvSB f3WayTIhNhvNSA3X7c/kTEM6BKdLxxKFSvD9QzfMUAR4r+Gikd7sSjqODq7tIVYNgb0ttCHFNtKGR r//OHzCeQo//Z26Agofjr3MFswynpyVkt9l5VdYOmIVUQqiCpUnqGVr8vTwDsqOVNxfM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOd-00081j-46 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMOd-0000zM-3C for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] libxc/restore: Fix error message for unrecognised stream version Message-Id: Date: Wed, 06 May 2020 15:55:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 47772087eb799c3ffb3544c0030a6815fd15336e Author: Andrew Cooper AuthorDate: Tue Dec 17 13:49:56 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:45:59 2020 +0100 libxc/restore: Fix error message for unrecognised stream version The Expected and Got values are rendered in the wrong order. Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit f50a4f6e244cfc8e773300c03aaf4db391f3028a) (cherry picked from commit 7b2225078b4b91044c365b2276c8897c46241c79) (cherry picked from commit 66998bdd5220eaef895c66f99a5a74e8dcc187c1) --- tools/libxc/xc_sr_restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index ea7b0339ef..1ac404b97b 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -36,7 +36,7 @@ static int read_headers(struct xc_sr_context *ctx) else if ( ihdr.version != IHDR_VERSION ) { ERROR("Invalid Version: Expected %d, Got %d", - ihdr.version, IHDR_VERSION); + IHDR_VERSION, ihdr.version); return -1; } else if ( ihdr.options & IHDR_OPT_BIG_ENDIAN ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:55:55 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:55:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOp-0006ok-17; Wed, 06 May 2020 15:55:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOn-0006ob-W6 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:54 +0000 X-Inumbo-ID: 108b6b0c-8fb2-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 108b6b0c-8fb2-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 15:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LBCmECIx0FlUl1MkvSa8VOUyCssaZZ6PM1aHZgMrVCQ=; b=CR/paR3BLdMJ9sbZ6iO8FpgO1c KoF+NlhDhjEyjyDKzqV0VlP07VaikxAirAyJ2aG5ACR+7aQeC8gddqb0bz1dp6BPjRV3GrzH5Wcgu vQyCDRNOCL/KCpP8VpM4+UK/9Ig2l2SWxisIbGq3mni/IH/Jvqp/1Yq2IvY5VTHbSY6s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOn-00081y-6j for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMOn-0000zw-5k for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:55:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] libxc/restore: Fix data auditing in handle_x86_pv_info() Message-Id: Date: Wed, 06 May 2020 15:55:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7d8fa6a902eccf06e31aa2433b5466a85afefe73 Author: Andrew Cooper AuthorDate: Wed Dec 18 20:17:42 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:46:46 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_info() handle_x86_pv_info() has a subtle bug. It uses an 'else if' chain with a clause in the middle which doesn't exit unconditionally. In practice, this means that when restoring a 32bit PV guest, later sanity checks are skipped. Rework the logic a little to be simpler. There are exactly two valid combinations of fields in X86_PV_INFO, so factor this out and check them all in one go, before making adjustments to the current domain. Once adjustments have been completed successfully, sanity check the result against the X86_PV_INFO settings in one go, rather than piece-wise. Signed-off-by: Andrew Cooper Reviewed-by: Ian Jackson (cherry picked from commit aafae0e800e9936b9eb6566e5fcdbe823625a7d1) (cherry picked from commit 5932ee1e06047d71bcf6975e1a631e31afaf5fe2) (cherry picked from commit 275475f1e8a772fee5b088eec1cad18fddce4a8f) --- tools/libxc/xc_sr_restore_x86_pv.c | 69 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index d81dfdcca6..0f02751992 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -582,6 +582,21 @@ static int update_guest_p2m(struct xc_sr_context *ctx) } /* + * The valid width/pt_levels values in X86_PV_INFO are inextricably linked. + * Cross-check the legitimate combinations. + */ +static bool valid_x86_pv_info_combination( + const struct xc_sr_rec_x86_pv_info *info) +{ + switch ( info->guest_width ) + { + case 4: return info->pt_levels == 3; + case 8: return info->pt_levels == 4; + default: return false; + } +} + +/* * Process an X86_PV_INFO record. */ static int handle_x86_pv_info(struct xc_sr_context *ctx, @@ -602,29 +617,31 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, rec->length, sizeof(*info)); return -1; } - else if ( info->guest_width != 4 && - info->guest_width != 8 ) + + if ( !valid_x86_pv_info_combination(info) ) { - ERROR("Unexpected guest width %u, Expected 4 or 8", - info->guest_width); + ERROR("Invalid X86_PV_INFO combination: width %u, pt_levels %u", + info->guest_width, info->pt_levels); return -1; } - else if ( info->guest_width != ctx->x86_pv.width ) + + /* + * PV domains default to native width. For an incomming compat domain, we + * will typically be the first entity to inform Xen. + */ + if ( info->guest_width != ctx->x86_pv.width ) { - int rc; - struct xen_domctl domctl; - - /* Try to set address size, domain is always created 64 bit. */ - memset(&domctl, 0, sizeof(domctl)); - domctl.domain = ctx->domid; - domctl.cmd = XEN_DOMCTL_set_address_size; - domctl.u.address_size.size = info->guest_width * 8; - rc = do_domctl(xch, &domctl); + struct xen_domctl domctl = { + .domain = ctx->domid, + .cmd = XEN_DOMCTL_set_address_size, + .u.address_size.size = info->guest_width * 8, + }; + int rc = do_domctl(xch, &domctl); + if ( rc != 0 ) { - ERROR("Width of guest in stream (%u" - " bits) differs with existing domain (%u bits)", - info->guest_width * 8, ctx->x86_pv.width * 8); + ERROR("Failed to update d%d address size to %u", + ctx->domid, info->guest_width * 8); return -1; } @@ -636,18 +653,14 @@ static int handle_x86_pv_info(struct xc_sr_context *ctx, return -1; } } - else if ( info->pt_levels != 3 && - info->pt_levels != 4 ) - { - ERROR("Unexpected guest levels %u, Expected 3 or 4", - info->pt_levels); - return -1; - } - else if ( info->pt_levels != ctx->x86_pv.levels ) + + /* Sanity check (possibly new) domain settings. */ + if ( (info->guest_width != ctx->x86_pv.width) || + (info->pt_levels != ctx->x86_pv.levels) ) { - ERROR("Levels of guest in stream (%u" - ") differs with existing domain (%u)", - info->pt_levels, ctx->x86_pv.levels); + ERROR("X86_PV_INFO width/pt_levels settings %u/%u mismatch with d%d %u/%u", + info->guest_width, info->pt_levels, ctx->domid, + ctx->x86_pv.width, ctx->x86_pv.levels); return -1; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:56:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:56:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOz-0006qV-2m; Wed, 06 May 2020 15:56:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOy-0006qL-0u for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:56:04 +0000 X-Inumbo-ID: 16a83614-8fb2-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 16a83614-8fb2-11ea-b07b-bc764e2007e4; Wed, 06 May 2020 15:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZHIOSxM4rlns19RmIXgKYQvdwHS/U7PMtWOIhk69sjU=; b=qkSXbSKsjK/MftKDfeK1qfm+eT j+mRco7R6jA0dbdfseD5/sGlXkdVldZed+TygUnX0iVnazN1UxXAVIIzGjHPPzjGnqpn3E0pKgAkD vwDEcIqfGwF1RXFs4x/tImWqx5LC+PaO7vREh0t0PoxULv3TmyalGSNBjwQCLjZZVB8s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMOx-00082Q-El for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:56:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMOx-000114-DG for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:56:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() Message-Id: Date: Wed, 06 May 2020 15:56:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a58bba28da793da70b93b841289d99370800180c Author: Andrew Cooper AuthorDate: Thu Dec 19 20:32:20 2019 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:47:21 2020 +0100 libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob() The current logic only works by chance, in that XSAVE records also tend to be a multiple of 128. Implement the missing logic for XSAVE. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson (cherry picked from commit 2a62c22715bf81c5695ae0511f89a940c7c6a492) (cherry picked from commit 0e2bbcf8b4fe6f5fd23a341848f3785c213b26bb) (cherry picked from commit 288872ad3bb320bd9f31145d9bd4e53786fa3245) --- tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 0f02751992..8c7adaeeda 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,6 +825,15 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: + if ( blobsz < 128 ) + { + ERROR("%s record too short: min %zu, got %u", + rec_name, sizeof(*vhdr) + 128, rec->length); + goto out; + } + break; + + case REC_TYPE_X86_PV_VCPU_MSRS: if ( blobsz % sizeof(xen_domctl_vcpu_msr_t) != 0 ) { ERROR("%s record payload size %zu expected to be a multiple of %zu", -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 15:56:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 15:56:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMP9-0006rl-5j; Wed, 06 May 2020 15:56:15 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMP8-0006rd-CO for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:56:14 +0000 X-Inumbo-ID: 1caaab00-8fb2-11ea-9e8c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1caaab00-8fb2-11ea-9e8c-12813bfff9fa; Wed, 06 May 2020 15:56:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6sfRZN/XagySnNZDWrA+0De4mT27spulBMqFhltRj4E=; b=Z3Lo/JYfMw3xQHb7IaE9NYcG/V yVm2AubGOXhrWeDtPTon9kFSz6bwHGDz8Cj7R0ChUWKqWZ5D3BI3w9tE0N9S+Drre8ZyxgdJlVm5q NSPZlEKzCnh5rKk2OFkPc0wrLPKEMFePg2YwO6Mlpx43ZKgZDuKhYPZPWPjdhVrk9A2g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWMP7-00083J-Hf for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:56:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWMP7-000129-GV for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 15:56:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.11] libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) Message-Id: Date: Wed, 06 May 2020 15:56:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7dd2ac39e40f0afe1cc6d879bfe65cbf19520cab Author: Andrew Cooper AuthorDate: Tue Feb 4 20:29:38 2020 +0000 Commit: Ian Jackson CommitDate: Tue May 5 15:49:22 2020 +0100 libxc/restore: Fix REC_TYPE_X86_PV_VCPU_XSAVE data auditing (take 2) It turns out that a bug (since forever) in Xen causes XSAVE records to have non-architectural behaviour on xsave-capable hardware, when a PV guest has not touched the state. In such a case, the data record returned from Xen is 2*uint64_t, both claiming the (illegitimate) state of %xcr0 and %xcr0_accum being 0. Adjust the bound in handle_x86_pv_vcpu_blob() to cope with this. Fixes: 2a62c22715b "libxc/restore: Fix data auditing in handle_x86_pv_vcpu_blob()" Reported-by: Igor Druzhinin Signed-off-by: Andrew Cooper Acked-by: Wei Liu (cherry picked from commit 0729830cc425a8ff27a3137e87b93768ae3c853c) (cherry picked from commit d2aecd86c4481291b260869c47cf0a9a02321564) (cherry picked from commit e43fc14ec58329813af876ed3b30899a04d65a08) --- tools/libxc/xc_sr_restore_x86_pv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 8c7adaeeda..7e950ea03f 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -825,10 +825,10 @@ static int handle_x86_pv_vcpu_blob(struct xc_sr_context *ctx, break; case REC_TYPE_X86_PV_VCPU_XSAVE: - if ( blobsz < 128 ) + if ( blobsz < 16 ) { ERROR("%s record too short: min %zu, got %u", - rec_name, sizeof(*vhdr) + 128, rec->length); + rec_name, sizeof(*vhdr) + 16, rec->length); goto out; } break; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.11 From xen-changelog-bounces@lists.xenproject.org Wed May 06 16:55:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 16:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWNK7-0004D2-0x; Wed, 06 May 2020 16:55:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWNK5-0004Cx-ES for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 16:55:05 +0000 X-Inumbo-ID: 5536a87c-8fba-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5536a87c-8fba-11ea-ae69-bc764e2007e4; Wed, 06 May 2020 16:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WE/N54e08hcCFl5t2f3JLf85rhSlw2AAZjo0cBd93yk=; b=BLPbvSaHJTVHnGmpyLnl3Eaagr g4oI0mrK0oUgh8vUYMS+2tmhUoV1pIG8qfaC7KsGrX2QdilAAO4uT+4LOuMW0xZk6mPIwguVhgCPP /mZThdWATDuusYZ+S+Ro7bI1POk5ajte5VO6Yu70V08uBkT9qo8C6y5ujOOJY0x8JHaE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWNK4-0001Gk-Bt for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 16:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWNK4-0005hD-Am for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 16:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxc: add VM forking functions Message-Id: Date: Wed, 06 May 2020 16:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit caf745fdf839f09bf96db6a1bd99fafab47de471 Author: Tamas K Lengyel AuthorDate: Wed May 6 06:41:43 2020 -0700 Commit: Wei Liu CommitDate: Wed May 6 17:42:03 2020 +0100 tools/libxc: add VM forking functions Add functions to issue VM forking hypercalls Signed-off-by: Tamas K Lengyel Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 14 ++++++++++++++ tools/libxc/xc_memshr.c | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 5f25c5a6d4..0a6ff93229 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2232,6 +2232,20 @@ int xc_memshr_range_share(xc_interface *xch, uint64_t first_gfn, uint64_t last_gfn); +int xc_memshr_fork(xc_interface *xch, + uint32_t source_domain, + uint32_t client_domain, + bool allow_with_iommu); + +/* + * Note: this function is only intended to be used on short-lived forks that + * haven't yet aquired a lot of memory. In case the fork has a lot of memory + * it is likely more performant to create a new fork with xc_memshr_fork. + * + * With VMs that have a lot of memory this call may block for a long time. + */ +int xc_memshr_fork_reset(xc_interface *xch, uint32_t forked_domain); + /* Debug calls: return the number of pages referencing the shared frame backing * the input argument. Should be one or greater. * diff --git a/tools/libxc/xc_memshr.c b/tools/libxc/xc_memshr.c index 97e2e6a8d9..2300cc7075 100644 --- a/tools/libxc/xc_memshr.c +++ b/tools/libxc/xc_memshr.c @@ -239,6 +239,32 @@ int xc_memshr_debug_gref(xc_interface *xch, return xc_memshr_memop(xch, domid, &mso); } +int xc_memshr_fork(xc_interface *xch, uint32_t pdomid, uint32_t domid, + bool allow_with_iommu) +{ + xen_mem_sharing_op_t mso; + + memset(&mso, 0, sizeof(mso)); + + mso.op = XENMEM_sharing_op_fork; + mso.u.fork.parent_domain = pdomid; + + if ( allow_with_iommu ) + mso.u.fork.flags |= XENMEM_FORK_WITH_IOMMU_ALLOWED; + + return xc_memshr_memop(xch, domid, &mso); +} + +int xc_memshr_fork_reset(xc_interface *xch, uint32_t domid) +{ + xen_mem_sharing_op_t mso; + + memset(&mso, 0, sizeof(mso)); + mso.op = XENMEM_sharing_op_fork_reset; + + return xc_memshr_memop(xch, domid, &mso); +} + int xc_memshr_audit(xc_interface *xch) { xen_mem_sharing_op_t mso; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 06 16:55:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 06 May 2020 16:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWNKG-0004Dg-2S; Wed, 06 May 2020 16:55:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWNKF-0004Db-1S for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 16:55:15 +0000 X-Inumbo-ID: 5b37a10e-8fba-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5b37a10e-8fba-11ea-9887-bc764e2007e4; Wed, 06 May 2020 16:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HqltMlGTXoACjkUK0eHqQaFY9Dg/wiAzvSnvcyyMtho=; b=DXE2+HFa7austSjlKCMzz61OJD XY9jLB0vWvlKDjTbIzJto5iI3vqcJ8M2N0CAo9zZIsrwaS1Lz3AlTLAb/w1PNIFOytchSCXrk01cM qr5gsukGwEylKP7KwPzHhEL31krjll1NBwxN+XUFpvumKRW8o/lIB/1otbVdyfuivcyg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWNKE-0001HH-F2 for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 16:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWNKE-0005hs-Dt for xen-changelog@lists.xenproject.org; Wed, 06 May 2020 16:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS Message-Id: Date: Wed, 06 May 2020 16:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8a6b1665d987d043c12dc723d758a7d2ca765264 Author: Roger Pau Monne AuthorDate: Tue May 5 11:24:53 2020 +0200 Commit: Wei Liu CommitDate: Wed May 6 17:42:26 2020 +0100 configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS The path provided by EXTRA_PREFIX should be added to the search path of the configure script, like it's done in Config.mk. Not doing so makes the search path for configure differ from the search path used by the build. Signed-off-by: Roger Pau Monné [ wei: run autogen.sh ] Acked-by: Wei Liu --- m4/set_cflags_ldflags.m4 | 4 ++++ tools/configure | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 index cbad3c10b0..08f5c983cc 100644 --- a/m4/set_cflags_ldflags.m4 +++ b/m4/set_cflags_ldflags.m4 @@ -15,6 +15,10 @@ for ldflag in $APPEND_LIB do APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done +if [ ! -z $EXTRA_PREFIX ]; then + CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include" + LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib" +fi CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"]) diff --git a/tools/configure b/tools/configure index 375430df3f..36596389b8 100755 --- a/tools/configure +++ b/tools/configure @@ -4678,6 +4678,10 @@ for ldflag in $APPEND_LIB do APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done +if ! -z $EXTRA_PREFIX ; then + CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include" + LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib" +fi CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfK-0004ET-4v; Thu, 07 May 2020 10:22:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfJ-0004EM-8Y for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:05 +0000 X-Inumbo-ID: 97ceee82-904c-11ea-9ef8-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 97ceee82-904c-11ea-9ef8-12813bfff9fa; Thu, 07 May 2020 10:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pgRF3eipGvlqp2vQYVvJJgVrp6IQBUxbCCeaVlCv2Oc=; b=M4oevvRncdrVafKD0OCI/a76gk 1ZFa3EB/1ubXDh/wxg9crzI3fjLqCQOyapBO8hcwftE3BwAa38cp217OP5/sl4Lr9B2ntUALO0+FE eFV1Cw7w/uuxZuhizRhF1emWAJnVif2ivXv6+xlyP/V/73r+hINKeIsYPFo3eOoYJszc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfG-0003Wb-Jn for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdfG-0003r9-IO for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xenoprof: adjust ordering of page sharing vs domain type setting Message-Id: Date: Thu, 07 May 2020 10:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7f6a6e8c0a400d1a073b083fe0b7d25ef74b14e0 Author: Jan Beulich AuthorDate: Mon May 4 11:48:13 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:48:13 2020 +0200 xenoprof: adjust ordering of page sharing vs domain type setting Buffer pages should be shared with "ignored" or "active" guests only (besides, obviously, the primary profiling domain). Hence domain type should be set to "ignored" before unsharing from the primary domain (which implies even a previously "passive" domain may then access its buffers, albeit that's not very useful unless it gets promoted to "active" subsequently), i.e. such that no further writes of records to the buffer would occur, and (at least for consistency) also before sharing it (with the calling domain) from the XENOPROF_get_buffer path. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu --- xen/common/xenoprof.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index b04726cb49..3dad5dfb38 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -372,8 +372,8 @@ static void reset_passive(struct domain *d) if ( x == NULL ) return; - unshare_xenoprof_page_with_guest(x); x->domain_type = XENOPROF_DOMAIN_IGNORED; + unshare_xenoprof_page_with_guest(x); } static void reset_active_list(void) @@ -654,6 +654,13 @@ static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE_PARAM(void) arg) if ( ret < 0 ) return ret; } + else + { + d->xenoprof->domain_ready = 0; + d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; + } + + d->xenoprof->is_primary = (xenoprof_primary_profiler == d); ret = share_xenoprof_page_with_guest( d, virt_to_mfn(d->xenoprof->rawbuf), d->xenoprof->npages); @@ -662,10 +669,6 @@ static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE_PARAM(void) arg) xenoprof_reset_buf(d); - d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; - d->xenoprof->domain_ready = 0; - d->xenoprof->is_primary = (xenoprof_primary_profiler == current->domain); - xenoprof_get_buffer.nbuf = d->xenoprof->nbuf; xenoprof_get_buffer.bufsize = d->xenoprof->bufsize; if ( !paging_mode_translate(d) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:22:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:22:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfT-0004FQ-6h; Thu, 07 May 2020 10:22:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfR-0004FH-Pi for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:13 +0000 X-Inumbo-ID: 9dcf796e-904c-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9dcf796e-904c-11ea-9887-bc764e2007e4; Thu, 07 May 2020 10:22:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2hRbl5qWb15PaUCJqd4bKq64W9nR7yS4aqxqBtmeJdM=; b=TyVS8AxUJn3LqRSzDTfL7OqJoz oO0fL1gi2Z551JboWQCrmebVbZvBfjFC2ejwXoHygInUsCuXTj55ySdmBy+DIduCn7ksDKEWtXQwV hZZqIOERutztP6qtzCKEoM14qH/SEgxl/EHbqcz4wFcbJr3wub6E6bqoha2vcwiwWOAw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfQ-0003Wh-MW for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdfQ-0003rz-LO for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xenoprof: drop unused struct xenoprof fields Message-Id: Date: Thu, 07 May 2020 10:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e83719b53a9be1c69033b3ded8051d47e3dadab8 Author: Jan Beulich AuthorDate: Mon May 4 11:51:18 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:51:18 2020 +0200 xenoprof: drop unused struct xenoprof fields Both is_primary and domain_ready are only ever written to. Drop both fields and restrict structure visibility to just the one involved CU. While doing so (and just for starters) make "is_compat" properly bool. Signed-off-by: Jan Beulich Reviewed-by: Wei Liu --- xen/common/xenoprof.c | 25 +++++++++++++++++-------- xen/include/xen/xenoprof.h | 19 ------------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index 3dad5dfb38..8a78957fbe 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -33,6 +33,23 @@ static DEFINE_SPINLOCK(pmu_owner_lock); int pmu_owner = 0; int pmu_hvm_refcount = 0; +struct xenoprof_vcpu { + int event_size; + xenoprof_buf_t *buffer; +}; + +struct xenoprof { + char *rawbuf; + int npages; + int nbuf; + int bufsize; + int domain_type; +#ifdef CONFIG_COMPAT + bool is_compat; +#endif + struct xenoprof_vcpu *vcpu; +}; + static struct domain *active_domains[MAX_OPROF_DOMAINS]; static int active_ready[MAX_OPROF_DOMAINS]; static unsigned int adomains; @@ -259,7 +276,6 @@ static int alloc_xenoprof_struct( d->xenoprof->npages = npages; d->xenoprof->nbuf = nvcpu; d->xenoprof->bufsize = bufsize; - d->xenoprof->domain_ready = 0; d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; /* Update buffer pointers for active vcpus */ @@ -327,7 +343,6 @@ static int set_active(struct domain *d) if ( x == NULL ) return -EPERM; - x->domain_ready = 1; x->domain_type = XENOPROF_DOMAIN_ACTIVE; active_ready[ind] = 1; activated++; @@ -348,7 +363,6 @@ static int reset_active(struct domain *d) if ( x == NULL ) return -EPERM; - x->domain_ready = 0; x->domain_type = XENOPROF_DOMAIN_IGNORED; active_ready[ind] = 0; active_domains[ind] = NULL; @@ -655,12 +669,7 @@ static int xenoprof_op_get_buffer(XEN_GUEST_HANDLE_PARAM(void) arg) return ret; } else - { - d->xenoprof->domain_ready = 0; d->xenoprof->domain_type = XENOPROF_DOMAIN_IGNORED; - } - - d->xenoprof->is_primary = (xenoprof_primary_profiler == d); ret = share_xenoprof_page_with_guest( d, virt_to_mfn(d->xenoprof->rawbuf), d->xenoprof->npages); diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index f1f9446bd5..35f3ea107b 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -40,25 +40,6 @@ typedef union { } xenoprof_buf_t; #endif -struct xenoprof_vcpu { - int event_size; - xenoprof_buf_t *buffer; -}; - -struct xenoprof { - char *rawbuf; - int npages; - int nbuf; - int bufsize; - int domain_type; - int domain_ready; - int is_primary; -#ifdef CONFIG_COMPAT - int is_compat; -#endif - struct xenoprof_vcpu *vcpu; -}; - #ifndef CONFIG_COMPAT #define XENOPROF_COMPAT(x) 0 #define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:22:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfc-0004H0-8F; Thu, 07 May 2020 10:22:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfb-0004Gq-Ja for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:23 +0000 X-Inumbo-ID: a3d271f4-904c-11ea-9ef8-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a3d271f4-904c-11ea-9ef8-12813bfff9fa; Thu, 07 May 2020 10:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Wy3CDVh1tCFvI9xjNwCqPUQ9sG6uKPz6J0NA3EhLazQ=; b=KEFrrE+Myq7G91gPmmpGohTaxo 0u8j3lBWQV/N6mv+oSmgSdZeiPouFyvErlkJsLncPeYLbeXDJggafeSgB1sjgqpiJK+I8BUHOT5++ 1g6n8uejoL8dLgulZDQvV6lb7800IFfuLFLOEi9B4rfDwWTchId3pr2AO2KHjEPt3rzc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfa-0003Wq-PO for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdfa-0003sh-OH for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xenoprof: limit scope of types and #define-s Message-Id: Date: Thu, 07 May 2020 10:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8d928648fd816f97ba3ebe98ab5d4b4a7def58ff Author: Jan Beulich AuthorDate: Mon May 4 11:51:47 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:51:47 2020 +0200 xenoprof: limit scope of types and #define-s Quite a few of the items are used by xenoprof.c only, so move them there to limit their visibility as well as the amount of re-building needed in case of changes. Also drop the inclusion of the public header there. Signed-off-by: Jan Beulich Acked-by: Wei Liu --- xen/arch/x86/oprofile/nmi_int.c | 2 +- xen/common/xenoprof.c | 26 ++++++++++++++++++++++++++ xen/include/asm-x86/xenoprof.h | 2 ++ xen/include/xen/xenoprof.h | 33 ++------------------------------- xen/xsm/flask/hooks.c | 1 + 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index 2969db47fc..0f103d80a6 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/common/xenoprof.c b/xen/common/xenoprof.c index 8a78957fbe..1926a92fe4 100644 --- a/xen/common/xenoprof.c +++ b/xen/common/xenoprof.c @@ -23,6 +23,32 @@ #undef virt_to_mfn #define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) +#define XENOPROF_DOMAIN_IGNORED 0 +#define XENOPROF_DOMAIN_ACTIVE 1 +#define XENOPROF_DOMAIN_PASSIVE 2 + +#define XENOPROF_IDLE 0 +#define XENOPROF_INITIALIZED 1 +#define XENOPROF_COUNTERS_RESERVED 2 +#define XENOPROF_READY 3 +#define XENOPROF_PROFILING 4 + +#ifndef CONFIG_COMPAT +#define XENOPROF_COMPAT(x) false +typedef struct xenoprof_buf xenoprof_buf_t; +#define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field) +#else +#include +#define XENOPROF_COMPAT(x) ((x)->is_compat) +typedef union { + struct xenoprof_buf native; + struct compat_oprof_buf compat; +} xenoprof_buf_t; +#define xenoprof_buf(d, b, field) ACCESS_ONCE(*(!(d)->xenoprof->is_compat \ + ? &(b)->native.field \ + : &(b)->compat.field)) +#endif + /* Limit amount of pages used for shared buffer (per domain) */ #define MAX_OPROF_SHARED_PAGES 32 diff --git a/xen/include/asm-x86/xenoprof.h b/xen/include/asm-x86/xenoprof.h index eeac9f2ca1..1026ba2e1f 100644 --- a/xen/include/asm-x86/xenoprof.h +++ b/xen/include/asm-x86/xenoprof.h @@ -26,6 +26,8 @@ struct vcpu; #ifdef CONFIG_XENOPROF +#include + int nmi_reserve_counters(void); int nmi_setup_events(void); int nmi_enable_virq(void); diff --git a/xen/include/xen/xenoprof.h b/xen/include/xen/xenoprof.h index 35f3ea107b..101514c148 100644 --- a/xen/include/xen/xenoprof.h +++ b/xen/include/xen/xenoprof.h @@ -11,7 +11,6 @@ #define __XEN_XENOPROF_H__ #include -#include #include #define PMU_OWNER_NONE 0 @@ -20,37 +19,9 @@ #ifdef CONFIG_XENOPROF -#define XENOPROF_DOMAIN_IGNORED 0 -#define XENOPROF_DOMAIN_ACTIVE 1 -#define XENOPROF_DOMAIN_PASSIVE 2 - -#define XENOPROF_IDLE 0 -#define XENOPROF_INITIALIZED 1 -#define XENOPROF_COUNTERS_RESERVED 2 -#define XENOPROF_READY 3 -#define XENOPROF_PROFILING 4 - -#ifndef CONFIG_COMPAT -typedef struct xenoprof_buf xenoprof_buf_t; -#else -#include -typedef union { - struct xenoprof_buf native; - struct compat_oprof_buf compat; -} xenoprof_buf_t; -#endif - -#ifndef CONFIG_COMPAT -#define XENOPROF_COMPAT(x) 0 -#define xenoprof_buf(d, b, field) ACCESS_ONCE((b)->field) -#else -#define XENOPROF_COMPAT(x) ((x)->is_compat) -#define xenoprof_buf(d, b, field) ACCESS_ONCE(*(!(d)->xenoprof->is_compat \ - ? &(b)->native.field \ - : &(b)->compat.field)) -#endif - struct domain; +struct vcpu; +struct cpu_user_regs; int acquire_pmu_ownership(int pmu_ownership); void release_pmu_ownership(int pmu_ownership); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 8af8602b46..4649e6fd95 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:22:35 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:22:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfn-0004JC-Az; Thu, 07 May 2020 10:22:35 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfl-0004J0-Lz for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:33 +0000 X-Inumbo-ID: a9d26d34-904c-11ea-9ef8-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a9d26d34-904c-11ea-9ef8-12813bfff9fa; Thu, 07 May 2020 10:22:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0gJwRqp7Q939SkI6MJz0KGefCBL8LeAkIzy6ng61j2g=; b=c+7HZDdDNsYV/D+BE/YNaRB243 7BMbvUdUC3L2s0TwwtWSb0cy9elAyzxwmZZ4e+1Yba20cZxwPfI3ThN/B6nA6Df4uJPud/l1fFVtJ 925hv/PH6x+e+mgDhCcxBhNx0kw9fhCFPITFH2lm7IiqsSOBxlYoR1Sn0AH8X4jhqsew=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfk-0003X5-S3 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdfk-0003uH-R4 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/hap: be more selective with assisted TLB flush Message-Id: Date: Thu, 07 May 2020 10:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 17b997aa1edb9eb8d9bd1958457ff50927f46832 Author: Roger Pau Monné AuthorDate: Mon May 4 11:53:01 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:53:01 2020 +0200 x86/hap: be more selective with assisted TLB flush When doing an assisted flush on HAP the purpose of the on_selected_cpus is just to trigger a vmexit on remote CPUs that are in guest context, and hence just using is_vcpu_dirty_cpu is too lax, also check that the vCPU is running. Due to the lazy context switching done by Xen dirty_cpu won't always be cleared when the guest vCPU is not running, and hence relying on is_running allows more fine grained control of whether the vCPU is actually running. I've measured the time of the non-local branch of flush_area_mask inside the shim running with 32vCPUs over 100000 executions and averaged the result on a large Westmere system (80 ways total). The figures where fetched during the boot of a SLES 11 PV guest. The results are as follow (less is better): Non assisted flush with x2APIC: 112406ns Assisted flush without this patch: 820450ns Assisted flush with this patch: 8330ns While there also pass NULL as the data parameter of on_selected_cpus, the dummy handler doesn't consume the data in any way. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/mm/hap/hap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 580d1c2164..0275cdf5c8 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -719,7 +719,7 @@ static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), hvm_asid_flush_vcpu(v); cpu = read_atomic(&v->dirty_cpu); - if ( cpu != this_cpu && is_vcpu_dirty_cpu(cpu) ) + if ( cpu != this_cpu && is_vcpu_dirty_cpu(cpu) && v->is_running ) __cpumask_set_cpu(cpu, mask); } @@ -729,7 +729,7 @@ static bool flush_tlb(bool (*flush_vcpu)(void *ctxt, struct vcpu *v), * not currently running will already be flushed when scheduled because of * the ASID tickle done in the loop above. */ - on_selected_cpus(mask, dummy_flush, mask, 0); + on_selected_cpus(mask, dummy_flush, NULL, 0); return true; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:22:44 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfw-0004KO-CY; Thu, 07 May 2020 10:22:44 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfv-0004KD-Hw for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:43 +0000 X-Inumbo-ID: afd71946-904c-11ea-9ef8-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id afd71946-904c-11ea-9ef8-12813bfff9fa; Thu, 07 May 2020 10:22:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Fv3sd2ZdfBrclLKfcGVXQKSoqCIUmdY5W+ivwm1oh00=; b=HaBEsonXdD21vr3rEuIKkuHTJp dcV1mglP6V/b1ssuUfwkuxV2kG/LDOrzzRpsCGgCHutqH/u2JGzCCVWkLhdyXJupXmdpAOodIqtm+ RUEcUrK77YfoIFyTZbqqVhBT1T7Z+hS+eW3OxIwVIk82E9YCoo5hyYqw2e5ME9z6Vjwo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdfu-0003Xu-VF for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdfu-0003uv-Te for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/EFI: correct section offsets in mkreloc diagnostics Message-Id: Date: Thu, 07 May 2020 10:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b0f666c569b8af6a51ab8aeec3664d6acd1abee9 Author: Jan Beulich AuthorDate: Mon May 4 11:53:42 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:53:42 2020 +0200 x86/EFI: correct section offsets in mkreloc diagnostics These are more helpful if they point at the address where the relocated value starts, rather than at the specific byte of the difference. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/efi/mkreloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/efi/mkreloc.c b/xen/arch/x86/efi/mkreloc.c index 1aca79672a..83a0afa00b 100644 --- a/xen/arch/x86/efi/mkreloc.c +++ b/xen/arch/x86/efi/mkreloc.c @@ -238,7 +238,7 @@ static void diff_sections(const unsigned char *ptr1, const unsigned char *ptr2, fprintf(stderr, "Difference at %.8s:%08" PRIxFAST32 " is %#" PRIxFAST64 " (expected %#" PRIxFAST64 ")\n", - sec->name, i, delta, diff); + sec->name, i - disp, delta, diff); continue; } if ( width == 8 && (val1.u64 < base || val1.u64 > end) ) @@ -263,14 +263,14 @@ static void diff_sections(const unsigned char *ptr1, const unsigned char *ptr2, { fprintf(stderr, "Cannot handle decreasing RVA (at %.8s:%08" PRIxFAST32 ")\n", - sec->name, i); + sec->name, i - disp); exit(3); } if ( !(sec->flags & COFF_SECTION_WRITEABLE) ) fprintf(stderr, "Warning: relocation to r/o section %.8s:%08" PRIxFAST32 "\n", - sec->name, i); + sec->name, i - disp); printf("\t.word (%u << 12) | 0x%03" PRIxFAST32 "\n", reloc, sec->rva + i - disp - rva); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:22:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:22:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdg6-0004Ln-EN; Thu, 07 May 2020 10:22:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdg5-0004Ld-JL for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:53 +0000 X-Inumbo-ID: b5d8f6de-904c-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b5d8f6de-904c-11ea-9887-bc764e2007e4; Thu, 07 May 2020 10:22:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4ELYln0Fzccql8T/z1/O3g+ZacPiUQrzl6pDp0dXd7k=; b=BwSwC7omr6xLEKvmDYP1x+si5o F+WFo3pOLvuqvP1sEkxNtbYS3kFs7luT8ynRD3Sf4yza/A/GNDSy+AE1hNZNLNTY7QbPT3iGG19LL RkW6MZoz2jpSUaikqu+DRPzX4OJbF/MmG+VUdYqamD3/kJzhCA85kJBGoFeexxpWdcA0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdg5-0003Y3-1X for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdg5-0003vm-0a for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:22:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/HyperV: correct hv_hcall_page for xen.efi build Message-Id: Date: Thu, 07 May 2020 10:22:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0c9751b53c2ee135fd484a03fd47f3bb5fbe63b8 Author: Jan Beulich AuthorDate: Mon May 4 11:54:35 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 4 11:54:35 2020 +0200 x86/HyperV: correct hv_hcall_page for xen.efi build Along the lines of what the not reverted part of 3c4b2eef4941 ("x86: refine link time stub area related assertion") did, we need to transform the absolute HV_HCALL_PAGE into the image base relative hv_hcall_page (or else there'd be no need for two distinct symbols). Otherwise mkreloc, as used for generating the base relocations of xen.efi, will spit out warnings like "Difference at .text:0009b74f is 0xc0000000 (expected 0x40000000)". As long as the offending relocations are PC relative ones, the generated binary is correct afaict, but if there ever was the absolute address stored, xen.efi would miss a fixup for it. Reported-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Wei Liu --- xen/arch/x86/xen.lds.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 7f9459d683..0e3a733cab 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -327,7 +327,7 @@ SECTIONS #endif #ifdef CONFIG_HYPERV_GUEST - hv_hcall_page = ABSOLUTE(HV_HCALL_PAGE); + hv_hcall_page = ABSOLUTE(HV_HCALL_PAGE - XEN_VIRT_START + __XEN_VIRT_START); #endif /* Sections to be discarded */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:23:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:23:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgH-0004Nr-G3; Thu, 07 May 2020 10:23:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgF-0004Nh-Pd for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:03 +0000 X-Inumbo-ID: bbdef72c-904c-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bbdef72c-904c-11ea-ae69-bc764e2007e4; Thu, 07 May 2020 10:23:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NY7A/shBIVoktS4PR3cRRn2sCIN94GCVD1ifdHPfVf8=; b=VJe3ZC8QuEJSHqua5F2eQelYbI pf4D3lraOowF6O6Kg20lti+4AT1W9KiBZFiZrxedrwjCfxt31IDI235zn1VYVcpKgHF4AbeHxEEs+ hGD+spdNcWvNOdOIDbN5m1ugL806HPBb5evhVKXEBpMmdSbWy8d5R3yVmlyujByzvqVs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgF-0003YX-4n for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdgF-0003wb-3b for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/amd: Initial support for Fam19h processors Message-Id: Date: Thu, 07 May 2020 10:23:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fe36a173d110fd792f5e337e208a5ed714df1536 Author: Andrew Cooper AuthorDate: Thu Apr 30 10:47:14 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 4 11:04:29 2020 +0100 x86/amd: Initial support for Fam19h processors Fam19h is very similar to Fam17h in these regards. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 1 + xen/arch/x86/cpu/microcode/amd.c | 4 ++++ xen/arch/x86/cpu/vpmu_amd.c | 1 + xen/arch/x86/nmi.c | 2 +- xen/arch/x86/traps.c | 2 +- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index e00f2a82de..b83446e77d 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -1356,6 +1356,7 @@ static void amd_cpuidle_init(struct acpi_processor_power *power) switch ( c->x86 ) { + case 0x19: case 0x18: if ( boot_cpu_data.x86_vendor != X86_VENDOR_HYGON ) { diff --git a/xen/arch/x86/cpu/microcode/amd.c b/xen/arch/x86/cpu/microcode/amd.c index 13bf9f4dee..3f0969e70d 100644 --- a/xen/arch/x86/cpu/microcode/amd.c +++ b/xen/arch/x86/cpu/microcode/amd.c @@ -112,6 +112,7 @@ static bool_t verify_patch_size(uint32_t patch_size) #define F15H_MPB_MAX_SIZE 4096 #define F16H_MPB_MAX_SIZE 3458 #define F17H_MPB_MAX_SIZE 3200 +#define F19H_MPB_MAX_SIZE 4800 switch (boot_cpu_data.x86) { @@ -127,6 +128,9 @@ static bool_t verify_patch_size(uint32_t patch_size) case 0x17: max_size = F17H_MPB_MAX_SIZE; break; + case 0x19: + max_size = F19H_MPB_MAX_SIZE; + break; default: max_size = F1XH_MPB_MAX_SIZE; break; diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c index 3c6799b42c..eba47cd2a0 100644 --- a/xen/arch/x86/cpu/vpmu_amd.c +++ b/xen/arch/x86/cpu/vpmu_amd.c @@ -576,6 +576,7 @@ int __init amd_vpmu_init(void) { case 0x15: case 0x17: + case 0x19: num_counters = F15H_NUM_COUNTERS; counters = AMD_F15H_COUNTERS; ctrls = AMD_F15H_CTRLS; diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c index c3f92ed231..014524486f 100644 --- a/xen/arch/x86/nmi.c +++ b/xen/arch/x86/nmi.c @@ -398,7 +398,7 @@ void setup_apic_nmi_watchdog(void) case X86_VENDOR_AMD: switch (boot_cpu_data.x86) { case 6: - case 0xf ... 0x17: + case 0xf ... 0x19: setup_k7_watchdog(); break; default: diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 0bcf554e93..33e5d21ece 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1939,7 +1939,7 @@ static unsigned int calc_ler_msr(void) switch ( boot_cpu_data.x86 ) { case 6: - case 0xf ... 0x17: + case 0xf ... 0x19: return MSR_IA32_LASTINTFROMIP; } break; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:23:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:23:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgR-0004P6-Hj; Thu, 07 May 2020 10:23:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgP-0004Os-Rf for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:13 +0000 X-Inumbo-ID: c1e10d0e-904c-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c1e10d0e-904c-11ea-9887-bc764e2007e4; Thu, 07 May 2020 10:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=l7L6jRE/ohxVR9v2ksuIeMZtPvrbTn2SuLhPxlfOWw8=; b=F5Oqgvxig8fwCuAZngQs/CXKVe 8UXeOhz/B62kzsx3eR209WvK/im0+aEb6YFpkqmeuaaAmWqJrzHg361Pt8WT6buvSel2rUlbEO8uH cLTJkwjj2J9P3cpOugOy6mqIs0i+Aac6rIQvtISYywOyiDKl7EvxcBYma3anQRLaL6aw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgP-0003Yp-7i for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdgP-0003xY-6r for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86emul: extend x86_insn_is_mem_write() coverage Message-Id: Date: Thu, 07 May 2020 10:23:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fc6fa977be54a24a1325e3f2d08b1b1dcb675f44 Author: Jan Beulich AuthorDate: Tue May 5 09:50:54 2020 +0200 Commit: Jan Beulich CommitDate: Tue May 5 09:50:54 2020 +0200 x86emul: extend x86_insn_is_mem_write() coverage Several insns were missed when this function was first added. As far as insns already supported by the emulator go - SMSW and {,V}STMXCSR were wrongly considered r/o insns so far. Insns like the VMX, SVM, or CET-SS ones, PTWRITE, or AMD's new SNP ones are intentionally not covered just yet. VMPTRST is put there just to complete the respective group. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1959fc227a..7503da980f 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -11551,13 +11551,39 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, break; case X86EMUL_OPC(0x0f, 0x01): - return !(state->modrm_reg & 6); /* SGDT / SIDT */ + switch ( state->modrm_reg & 7 ) + { + case 0: /* SGDT */ + case 1: /* SIDT */ + case 4: /* SMSW */ + return true; + } + break; + + case X86EMUL_OPC(0x0f, 0xae): + switch ( state->modrm_reg & 7 ) + { + case 0: /* FXSAVE */ + case 3: /* {,V}STMXCSR */ + case 4: /* XSAVE */ + case 6: /* XSAVEOPT */ + return true; + } + break; case X86EMUL_OPC(0x0f, 0xba): return (state->modrm_reg & 7) > 4; /* BTS / BTR / BTC */ case X86EMUL_OPC(0x0f, 0xc7): - return (state->modrm_reg & 7) == 1; /* CMPXCHG{8,16}B */ + switch ( state->modrm_reg & 7 ) + { + case 1: /* CMPXCHG{8,16}B */ + case 4: /* XSAVEC */ + case 5: /* XSAVES */ + case 7: /* VMPTRST */ + return true; + } + break; } return false; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:23:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:23:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgb-0004QC-Jf; Thu, 07 May 2020 10:23:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgZ-0004Q4-VG for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:23 +0000 X-Inumbo-ID: c7e48b04-904c-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c7e48b04-904c-11ea-ae69-bc764e2007e4; Thu, 07 May 2020 10:23:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DQAmBDKFLEDYG6S4vO9r8K5nhRg8zjVI3l9Ivp0I1IQ=; b=13Kc0ndHT+2MwGsfJ1ep37kJF8 xkBI995zhGZt1FwyD78ekFSzatf0b0skuQtw3F0TtAn08oS4xlJjbevrYsUnG6YdCyfFBcQIpNHD5 qTAZxWHBoT6NEbm5WdHX7B0A+6yXg13oAqd4/rpBmponf9h9ptgWsYabB9hvVo2lUSB0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgZ-0003Yy-AA for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdgZ-0003y3-9E for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/hvm: simplify hvm_physdev_op allowance control Message-Id: Date: Thu, 07 May 2020 10:23:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a00e3737e085ebc1f313e36b188d4958e939e531 Author: Roger Pau Monné AuthorDate: Tue May 5 09:52:28 2020 +0200 Commit: Jan Beulich CommitDate: Tue May 5 09:52:28 2020 +0200 x86/hvm: simplify hvm_physdev_op allowance control PVHv1 dom0 was given access to all PHYSDEVOP hypercalls, and such restriction was not removed when PVHv1 code was removed. As a result the switch in hvm_physdev_op was more complicated than required, and relied on PVHv2 dom0 not having PIRQ support in order to prevent access to some PV specific PHYSDEVOPs. Fix this by moving the default case to the bottom of the switch, since there's no need for any fall through now. Also remove the hardware domain check, as all the not explicitly listed PHYSDEVOPs are forbidden for HVM domains. Finally tighten the condition to allow usage of PHYSDEVOP_pci_mmcfg_reserved: apart from having vPCI enabled it should only be used by the hardware domain. Note that the code in do_physdev_op is already restricting the call to privileged domains only, but it can be further restricted to the hardware domain only, as other privileged domains don't have access to MMCFG regions anyway. Overall no functional change should arise from this change. Reported-by: Julien Grall Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hypercall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 17ba0fe91b..c41c2179c9 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -82,26 +82,26 @@ static long hvm_grant_table_op( static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { const struct vcpu *curr = current; + const struct domain *currd = curr->domain; switch ( cmd ) { - default: - if ( !is_hardware_domain(curr->domain) ) - return -ENOSYS; - /* fall through */ case PHYSDEVOP_map_pirq: case PHYSDEVOP_unmap_pirq: case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: - if ( !has_pirq(curr->domain) ) + if ( !has_pirq(currd) ) return -ENOSYS; break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(curr->domain) ) + if ( !has_vpci(currd) || !is_hardware_domain(currd) ) return -ENOSYS; break; + + default: + return -ENOSYS; } if ( !curr->hcall_compat ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:23:35 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:23:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgl-0004Rk-LG; Thu, 07 May 2020 10:23:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgj-0004RX-Sz for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:33 +0000 X-Inumbo-ID: cde4d1e4-904c-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cde4d1e4-904c-11ea-b9cf-bc764e2007e4; Thu, 07 May 2020 10:23:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Udnn4y/P5D8BSihx9vtcoKr52b4dGjEdGINzl/5PeU8=; b=Z2xY18QwqcLIKT+PMmjfiWXrQm Zw+wCR9SeiTYuo3k3Io6euz1x3I6J3ukSiQQktLwnSwkg4WQEcdO46mIFoJdteMizUxmFAPc09RtY f7Zq+pda7+NZ9a4m0iZxNe39KF2jfy55yWfAC3ibmbYvR+0d4Lu8IrEiFfwPZLIpOsTQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgj-0003Z8-Cf for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdgj-0003yj-Bn for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/pv: Compile out emul-gate-op in !CONFIG_PV32 builds Message-Id: Date: Thu, 07 May 2020 10:23:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6a8f6cd8d788fc424cb2e2f426223d95da9c9898 Author: Andrew Cooper AuthorDate: Tue May 5 11:17:32 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 15:24:03 2020 +0100 x86/pv: Compile out emul-gate-op in !CONFIG_PV32 builds The caller is already guarded by is_pv_32bit_vcpu(). Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/pv/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/pv/Makefile b/xen/arch/x86/pv/Makefile index cf28434ba9..75b01b0062 100644 --- a/xen/arch/x86/pv/Makefile +++ b/xen/arch/x86/pv/Makefile @@ -2,7 +2,7 @@ obj-y += callback.o obj-y += descriptor-tables.o obj-y += domain.o obj-y += emulate.o -obj-y += emul-gate-op.o +obj-$(CONFIG_PV32) += emul-gate-op.o obj-y += emul-inv-op.o obj-y += emul-priv-op.o obj-$(CONFIG_GRANT_TABLE) += grant_table.o -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:23:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:23:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgv-0004Sz-OP; Thu, 07 May 2020 10:23:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgu-0004Sp-BG for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:44 +0000 X-Inumbo-ID: d3e74a72-904c-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d3e74a72-904c-11ea-b07b-bc764e2007e4; Thu, 07 May 2020 10:23:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PVCrzow3JFZm3OCt6dLPkfWV+FONohQz69S6PMTQcMc=; b=au7AI5ml6XbCiOiua70d/6z579 iAAhd1d/rTuW1iA2ee4IJ8GmzkmOLGzbs3evfZ3+04fgqhaZg/Vnjdwct/8/d32uFwECxvwEC6nk/ x6sfYiN1s/Z3WoCP+D+w1kbZK6AuI2hVdgf9SBdrpqOpJTfmyjJ/Rhmi1zgHqStLmhpw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdgt-0003Zo-FG for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdgt-0003zX-EU for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/pv: Prune include lists Message-Id: Date: Thu, 07 May 2020 10:23:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f7aa6c36c5a8173236a68cb1f1b09c8bef9d6d3a Author: Andrew Cooper AuthorDate: Tue May 5 11:27:22 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 15:25:04 2020 +0100 x86/pv: Prune include lists Several of these in particular haven't been pruned since the logic was all part of arch/x86/traps.c Some adjustments to header files are required to avoid compile errors: * emulate.h needs xen/sched.h because gdt_ldt_desc_ptr() uses v->vcpu_id. * mmconfig.h needs to forward declare acpi_table_header. * shadow.h and trace.h need to have uint*_t in scope before including the Xen public headers. For shadow.h, reorder the includes. For trace.h, include types.h Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/pv/callback.c | 5 ----- xen/arch/x86/pv/emul-gate-op.c | 19 ------------------- xen/arch/x86/pv/emul-inv-op.c | 18 ------------------ xen/arch/x86/pv/emul-priv-op.c | 9 +-------- xen/arch/x86/pv/emulate.h | 2 ++ xen/arch/x86/pv/ro-page-fault.c | 8 -------- xen/arch/x86/pv/shim.c | 3 --- xen/arch/x86/x86_64/mmconfig.h | 1 + xen/include/asm-x86/shadow.h | 3 ++- xen/include/xen/trace.h | 1 + 10 files changed, 7 insertions(+), 62 deletions(-) diff --git a/xen/arch/x86/pv/callback.c b/xen/arch/x86/pv/callback.c index 106c16ed01..97242cd3d4 100644 --- a/xen/arch/x86/pv/callback.c +++ b/xen/arch/x86/pv/callback.c @@ -19,15 +19,10 @@ #include #include #include -#include -#include #include #include -#include -#include #include -#include #include diff --git a/xen/arch/x86/pv/emul-gate-op.c b/xen/arch/x86/pv/emul-gate-op.c index 3c7f6d70bc..61e65ce521 100644 --- a/xen/arch/x86/pv/emul-gate-op.c +++ b/xen/arch/x86/pv/emul-gate-op.c @@ -20,25 +20,6 @@ */ #include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include #include "emulate.h" diff --git a/xen/arch/x86/pv/emul-inv-op.c b/xen/arch/x86/pv/emul-inv-op.c index 91d05790c2..59e3edc8c4 100644 --- a/xen/arch/x86/pv/emul-inv-op.c +++ b/xen/arch/x86/pv/emul-inv-op.c @@ -19,26 +19,8 @@ * along with this program; If not, see . */ -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - #include "emulate.h" static int emulate_forced_invalid_op(struct cpu_user_regs *regs) diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index e24b84f46a..3b705299cf 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -19,25 +19,18 @@ * along with this program; If not, see . */ -#include +#include #include #include #include -#include -#include #include -#include #include #include #include #include -#include #include -#include #include -#include -#include #include diff --git a/xen/arch/x86/pv/emulate.h b/xen/arch/x86/pv/emulate.h index fd2aa0a484..4b845b08e3 100644 --- a/xen/arch/x86/pv/emulate.h +++ b/xen/arch/x86/pv/emulate.h @@ -1,6 +1,8 @@ #ifndef __PV_EMULATE_H__ #define __PV_EMULATE_H__ +#include + #include #include diff --git a/xen/arch/x86/pv/ro-page-fault.c b/xen/arch/x86/pv/ro-page-fault.c index a920fb5e15..0eedb70002 100644 --- a/xen/arch/x86/pv/ro-page-fault.c +++ b/xen/arch/x86/pv/ro-page-fault.c @@ -20,15 +20,7 @@ * along with this program; If not, see . */ -#include -#include -#include #include - -#include -#include -#include -#include #include #include "emulate.h" diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c index 31264582cc..3a0525c209 100644 --- a/xen/arch/x86/pv/shim.c +++ b/xen/arch/x86/pv/shim.c @@ -25,14 +25,11 @@ #include #include #include -#include #include #include -#include #include #include -#include #include #include diff --git a/xen/arch/x86/x86_64/mmconfig.h b/xen/arch/x86/x86_64/mmconfig.h index 2e836848ad..4d3b9fcbdd 100644 --- a/xen/arch/x86/x86_64/mmconfig.h +++ b/xen/arch/x86/x86_64/mmconfig.h @@ -75,6 +75,7 @@ static inline void mmio_config_writel(void __iomem *pos, u32 val) } /* function prototypes */ +struct acpi_table_header; int acpi_parse_mcfg(struct acpi_table_header *header); int pci_mmcfg_reserved(uint64_t address, unsigned int segment, unsigned int start_bus, unsigned int end_bus, diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 907c71f497..8335862c87 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -22,7 +22,6 @@ #ifndef _XEN_SHADOW_H #define _XEN_SHADOW_H -#include #include #include #include @@ -31,6 +30,8 @@ #include #include +#include + /***************************************************************************** * Macros to tell which shadow paging mode a domain is in*/ diff --git a/xen/include/xen/trace.h b/xen/include/xen/trace.h index af925bcfcc..3cbb542af8 100644 --- a/xen/include/xen/trace.h +++ b/xen/include/xen/trace.h @@ -28,6 +28,7 @@ extern int tb_init_done; #define tb_init_done false #endif +#include #include #include #include -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:23:55 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:23:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdh5-0004UE-Pz; Thu, 07 May 2020 10:23:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdh4-0004U3-Ch for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:54 +0000 X-Inumbo-ID: d9e969e6-904c-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d9e969e6-904c-11ea-b07b-bc764e2007e4; Thu, 07 May 2020 10:23:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=446IZqjW8K4LsBoXk51w9Go8uFhzy3UdtltNNIOZDeI=; b=AxJNlI4kgBpURWx+FEd45sKkeo 0fzMqtYHTxRoO7yzYzPru7uOVCOrsLq0J2uhgxB2YtONxMW5y99Qtxyj3TFd6Lefer6zXxWq7wI/c GglW9twROZUr0MAsNYfvZ8YsvgDBlxvpwNsr8c6DXLs0f+NtqOKLWwLU5I9K5t1h63Ls=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdh3-0003Zy-Hm for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdh3-000406-Gl for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:23:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/pv: Fix Clang build with !CONFIG_PV32 Message-Id: Date: Thu, 07 May 2020 10:23:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cdc3b1f26f80b57b28fb94cb4bf26f79a3cc2765 Author: Andrew Cooper AuthorDate: Tue May 5 14:03:35 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 16:12:54 2020 +0100 x86/pv: Fix Clang build with !CONFIG_PV32 Clang 3.5 doesn't do enough dead-code-elimination to drop the compat_gdt reference, resulting in a linker failure: hidden symbol `per_cpu__compat_gdt' isn't defined Drop the local variable, and move the evaluation of this_cpu(compat_gdt) to within the guarded region. Reported-by: Roger Pau Monné Signed-off-by: Andrew Cooper Tested-by: Roger Pau Monné Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/common.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 131ff03fcf..63f3893c7a 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -711,8 +711,6 @@ void load_system_tables(void) struct tss64 *tss = &this_cpu(tss_page).tss; seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; - seg_desc_t *compat_gdt = - this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY; const struct desc_ptr gdtr = { .base = (unsigned long)gdt, @@ -753,8 +751,9 @@ void load_system_tables(void) _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_avail); if ( IS_ENABLED(CONFIG_PV32) ) - _set_tssldt_desc(compat_gdt + TSS_ENTRY, (unsigned long)tss, - sizeof(*tss) - 1, SYS_DESC_tss_busy); + _set_tssldt_desc( + this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY + TSS_ENTRY, + (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_busy); per_cpu(full_gdt_loaded, cpu) = false; lgdt(&gdtr); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 10:24:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 10:24:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdhF-0004VG-Rk; Thu, 07 May 2020 10:24:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdhE-0004V6-MA for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:24:04 +0000 X-Inumbo-ID: dfeb98b4-904c-11ea-9ef8-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id dfeb98b4-904c-11ea-9ef8-12813bfff9fa; Thu, 07 May 2020 10:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3g/Tin2i4VzZaWiFnllBaez+lQJUPatE9sI9OfXsTrg=; b=ZKw4zmQyGvZGE97bUkk2pYumFA acl40na3tczbQjE6SrP5J3iuWeFNwggmpcc0SvZTSBtdQQUnXkacJlTDWLOxIVC9xLpie0+IUUqVt 5MRt7J3MCDmsJ07fSJkEcb8smm7p6pi5JDxJVMXoiXeTd7CrL0f7rxjF4o2Hs/WN2wJo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWdhD-0003aK-KU for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:24:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWdhD-000412-JV for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 10:24:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/traps: fix an off-by-one error Message-Id: Date: Thu, 07 May 2020 10:24:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2e3d87cc734a895ef5b486926274a178836b67a9 Author: Hongyan Xia AuthorDate: Tue May 5 15:17:35 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 16:13:44 2020 +0100 x86/traps: fix an off-by-one error stack++ can go into the next page and unmap_domain_page() will unmap the wrong one, causing mapcache and memory corruption. Fix. Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 33e5d21ece..73c6218660 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -236,6 +236,7 @@ static void compat_show_guest_stack(struct vcpu *v, int debug_stack_lines) { unsigned int i, *stack, addr, mask = STACK_SIZE; + void *stack_page = NULL; stack = (unsigned int *)(unsigned long)regs->esp; printk("Guest stack trace from esp=%08lx:\n ", (unsigned long)stack); @@ -258,7 +259,7 @@ static void compat_show_guest_stack(struct vcpu *v, break; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -285,11 +286,9 @@ static void compat_show_guest_stack(struct vcpu *v, printk(" %08x", addr); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + UNMAP_DOMAIN_PAGE(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); @@ -300,6 +299,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) int i; unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + void *stack_page = NULL; /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) @@ -328,7 +328,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -355,11 +355,9 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk(" %p", _p(addr)); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + UNMAP_DOMAIN_PAGE(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 07 11:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 11:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWebQ-0000tT-31; Thu, 07 May 2020 11:22:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWebO-0000tO-Ez for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 11:22:06 +0000 X-Inumbo-ID: faf2b40a-9054-11ea-9f02-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id faf2b40a-9054-11ea-9f02-12813bfff9fa; Thu, 07 May 2020 11:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TQgmwx6c1UZHadGqrnA1rz4o3Qrt3MiAoNx1OzZ7Uvk=; b=YoVWX19EHP02IC4otoc+VpxtK+ G4yvWzqI4PIUOJtq6jZYaHrZkpg3wyUyojPqgz49g/VrioL3l6eUk3rSuO8iDkQ3QtSV773eKURWI bH8/nj2eznxXzzYbUj58Xf2LpUBKMxYhdfrnx2xGxifQVT9rlsI8PuVdKojliWCMb6VY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWebM-0004fG-U3 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 11:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWebM-0007ej-Sv for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 11:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: adjustments to guest handle treatment Message-Id: Date: Thu, 07 May 2020 11:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dd5520f9df05b84116ad57f16fff45323042cc63 Author: Jan Beulich AuthorDate: Thu May 7 13:15:13 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 13:15:13 2020 +0200 x86: adjustments to guest handle treatment First of all avoid excessive conversions. copy_{from,to}_guest(), for example, work fine with all of XEN_GUEST_HANDLE{,_64,_PARAM}(). Further - do_physdev_op_compat() didn't use the param form for its parameter, - {hap,shadow}_track_dirty_vram() wrongly used the param form, - compat processor Px logic failed to check compatibility of native and compat structures not further converted. As this eliminates all users of guest_handle_from_param() and as there's no real need to allow for conversions in both directions, drop the macros as well. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Julien Grall --- xen/arch/x86/compat.c | 2 +- xen/arch/x86/cpu/microcode/core.c | 2 +- xen/arch/x86/mm.c | 16 +++++----------- xen/arch/x86/mm/hap/hap.c | 2 +- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/oprofile/backtrace.c | 5 +---- xen/arch/x86/platform_hypercall.c | 8 ++------ xen/arch/x86/x86_64/compat.c | 1 + xen/arch/x86/x86_64/cpu_idle.c | 8 ++------ xen/arch/x86/x86_64/cpufreq.c | 8 +++----- xen/drivers/acpi/pmstat.c | 2 +- xen/include/asm-arm/guest_access.h | 14 +------------- xen/include/asm-x86/guest_access.h | 12 +----------- xen/include/asm-x86/hap.h | 2 +- xen/include/asm-x86/microcode.h | 2 +- xen/include/asm-x86/shadow.h | 2 +- xen/include/xen/acpi.h | 4 ++-- 17 files changed, 26 insertions(+), 66 deletions(-) diff --git a/xen/arch/x86/compat.c b/xen/arch/x86/compat.c index a40ec295ae..58b202f701 100644 --- a/xen/arch/x86/compat.c +++ b/xen/arch/x86/compat.c @@ -15,7 +15,7 @@ typedef long ret_t; #endif /* Legacy hypercall (as of 0x00030202). */ -ret_t do_physdev_op_compat(XEN_GUEST_HANDLE(physdev_op_t) uop) +ret_t do_physdev_op_compat(XEN_GUEST_HANDLE_PARAM(physdev_op_t) uop) { typeof(do_physdev_op) *fn = (void *)pv_hypercall_table[__HYPERVISOR_physdev_op].native; diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index a220f908b8..d879d28787 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -678,7 +678,7 @@ static long microcode_update_helper(void *data) return ret; } -int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void) buf, unsigned long len) +int microcode_update(XEN_GUEST_HANDLE(const_void) buf, unsigned long len) { int ret; struct ucode_buf *buffer; diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 355c50ff91..f2d8190b5e 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4441,20 +4441,16 @@ static int _handle_iomem_range(unsigned long s, unsigned long e, { if ( s > ctxt->s && !(s >> (paddr_bits - PAGE_SHIFT)) ) { - e820entry_t ent; - XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer_param; - XEN_GUEST_HANDLE(e820entry_t) buffer; - if ( !guest_handle_is_null(ctxt->map.buffer) ) { + e820entry_t ent; + if ( ctxt->n + 1 >= ctxt->map.nr_entries ) return -EINVAL; ent.addr = (uint64_t)ctxt->s << PAGE_SHIFT; ent.size = (uint64_t)(s - ctxt->s) << PAGE_SHIFT; ent.type = E820_RESERVED; - buffer_param = guest_handle_cast(ctxt->map.buffer, e820entry_t); - buffer = guest_handle_from_param(buffer_param, e820entry_t); - if ( __copy_to_guest_offset(buffer, ctxt->n, &ent, 1) ) + if ( __copy_to_guest_offset(ctxt->map.buffer, ctxt->n, &ent, 1) ) return -EFAULT; } ctxt->n++; @@ -4715,8 +4711,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENMEM_machine_memory_map: { struct memory_map_context ctxt; - XEN_GUEST_HANDLE(e820entry_t) buffer; - XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer_param; + XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer; unsigned int i; bool store; @@ -4732,8 +4727,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( store && ctxt.map.nr_entries < e820.nr_map + 1 ) return -EINVAL; - buffer_param = guest_handle_cast(ctxt.map.buffer, e820entry_t); - buffer = guest_handle_from_param(buffer_param, e820entry_t); + buffer = guest_handle_cast(ctxt.map.buffer, e820entry_t); if ( store && !guest_handle_okay(buffer, ctxt.map.nr_entries) ) return -EFAULT; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 0275cdf5c8..7f84d0c6ea 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -59,7 +59,7 @@ int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) guest_dirty_bitmap) + XEN_GUEST_HANDLE(void) guest_dirty_bitmap) { long rc = 0; struct sh_dirty_vram *dirty_vram; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 7ed8e7b71b..0ac3f880e1 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3171,7 +3171,7 @@ static void sh_clean_dirty_bitmap(struct domain *d) int shadow_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) guest_dirty_bitmap) + XEN_GUEST_HANDLE(void) guest_dirty_bitmap) { int rc = 0; unsigned long end_pfn = begin_pfn + nr; diff --git a/xen/arch/x86/oprofile/backtrace.c b/xen/arch/x86/oprofile/backtrace.c index 316821fd34..8233d87caa 100644 --- a/xen/arch/x86/oprofile/backtrace.c +++ b/xen/arch/x86/oprofile/backtrace.c @@ -74,11 +74,8 @@ dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head, } else { - XEN_GUEST_HANDLE(const_frame_head_t) guest_head; - XEN_GUEST_HANDLE_PARAM(const_frame_head_t) guest_head_param = + XEN_GUEST_HANDLE_PARAM(const_frame_head_t) guest_head = const_guest_handle_from_ptr(head, frame_head_t); - guest_head = guest_handle_from_param(guest_head_param, - const_frame_head_t); /* Also check accessibility of one struct frame_head beyond */ if (!guest_handle_okay(guest_head, 2)) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index ee2efdd875..23fadbc782 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -285,9 +285,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op) guest_from_compat_handle(data, op->u.microcode.data); - ret = microcode_update( - guest_handle_to_param(data, const_void), - op->u.microcode.length); + ret = microcode_update(data, op->u.microcode.length); } break; @@ -531,9 +529,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op) XEN_GUEST_HANDLE(uint32) pdc; guest_from_compat_handle(pdc, op->u.set_pminfo.u.pdc); - ret = acpi_set_pdc_bits( - op->u.set_pminfo.id, - guest_handle_to_param(pdc, uint32)); + ret = acpi_set_pdc_bits(op->u.set_pminfo.id, pdc); } break; diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 179d0c637a..0e4c71f2aa 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -15,6 +15,7 @@ EMIT_FILE; #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) +#define _XEN_GUEST_HANDLE_PARAM(t) XEN_GUEST_HANDLE_PARAM(t) typedef int ret_t; #include "../compat.c" diff --git a/xen/arch/x86/x86_64/cpu_idle.c b/xen/arch/x86/x86_64/cpu_idle.c index f991fd900a..e2195d57be 100644 --- a/xen/arch/x86/x86_64/cpu_idle.c +++ b/xen/arch/x86/x86_64/cpu_idle.c @@ -52,13 +52,9 @@ static int copy_from_compat_state(xen_processor_cx_t *xen_state, compat_processor_cx_t *state) { #define XLAT_processor_cx_HNDL_dp(_d_, _s_) do { \ - XEN_GUEST_HANDLE(compat_processor_csd_t) dps; \ - XEN_GUEST_HANDLE_PARAM(xen_processor_csd_t) dps_param; \ if ( unlikely(!compat_handle_okay((_s_)->dp, (_s_)->dpcnt)) ) \ - return -EFAULT; \ - guest_from_compat_handle(dps, (_s_)->dp); \ - dps_param = guest_handle_cast(dps, xen_processor_csd_t); \ - (_d_)->dp = guest_handle_from_param(dps_param, xen_processor_csd_t); \ + return -EFAULT; \ + guest_from_compat_handle((_d_)->dp, (_s_)->dp); \ } while (0) XLAT_processor_cx(xen_state, state); #undef XLAT_processor_cx_HNDL_dp diff --git a/xen/arch/x86/x86_64/cpufreq.c b/xen/arch/x86/x86_64/cpufreq.c index e018b5e198..9e1e2050da 100644 --- a/xen/arch/x86/x86_64/cpufreq.c +++ b/xen/arch/x86/x86_64/cpufreq.c @@ -26,6 +26,8 @@ #include #include +CHECK_processor_px; + DEFINE_XEN_GUEST_HANDLE(compat_processor_px_t); int @@ -42,13 +44,9 @@ compat_set_px_pminfo(uint32_t cpu, struct compat_processor_performance *perf) return -EFAULT; #define XLAT_processor_performance_HNDL_states(_d_, _s_) do { \ - XEN_GUEST_HANDLE(compat_processor_px_t) states; \ - XEN_GUEST_HANDLE_PARAM(xen_processor_px_t) states_t; \ if ( unlikely(!compat_handle_okay((_s_)->states, (_s_)->state_count)) ) \ return -EFAULT; \ - guest_from_compat_handle(states, (_s_)->states); \ - states_t = guest_handle_cast(states, xen_processor_px_t); \ - (_d_)->states = guest_handle_from_param(states_t, xen_processor_px_t); \ + guest_from_compat_handle((_d_)->states, (_s_)->states); \ } while (0) XLAT_processor_performance(xen_perf, perf); diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 426447e1a7..2f528f9ca3 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -492,7 +492,7 @@ int do_pm_op(struct xen_sysctl_pm_op *op) return ret; } -int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE_PARAM(uint32) pdc) +int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32) pdc) { u32 bits[3]; int ret; diff --git a/xen/include/asm-arm/guest_access.h b/xen/include/asm-arm/guest_access.h index 64d01951a9..31b9f03f00 100644 --- a/xen/include/asm-arm/guest_access.h +++ b/xen/include/asm-arm/guest_access.h @@ -40,7 +40,7 @@ int access_guest_memory_by_ipa(struct domain *d, paddr_t ipa, void *buf, (XEN_GUEST_HANDLE_PARAM(type)) { _x }; \ }) -/* Cast a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ +/* Convert a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ #define guest_handle_to_param(hnd, type) ({ \ typeof((hnd).p) _x = (hnd).p; \ XEN_GUEST_HANDLE_PARAM(type) _y = { _x }; \ @@ -51,18 +51,6 @@ int access_guest_memory_by_ipa(struct domain *d, paddr_t ipa, void *buf, _y; \ }) - -/* Cast a XEN_GUEST_HANDLE_PARAM to XEN_GUEST_HANDLE */ -#define guest_handle_from_param(hnd, type) ({ \ - typeof((hnd).p) _x = (hnd).p; \ - XEN_GUEST_HANDLE(type) _y = { _x }; \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)(&_x == &_y.p); \ - _y; \ -}) - #define guest_handle_for_field(hnd, type, fld) \ ((XEN_GUEST_HANDLE(type)) { &(hnd).p->fld }) diff --git a/xen/include/asm-x86/guest_access.h b/xen/include/asm-x86/guest_access.h index 064527895f..2be3577bd3 100644 --- a/xen/include/asm-x86/guest_access.h +++ b/xen/include/asm-x86/guest_access.h @@ -52,7 +52,7 @@ (XEN_GUEST_HANDLE_PARAM(type)) { _x }; \ }) -/* Cast a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ +/* Convert a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ #define guest_handle_to_param(hnd, type) ({ \ /* type checking: make sure that the pointers inside \ * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ @@ -62,16 +62,6 @@ (hnd); \ }) -/* Cast a XEN_GUEST_HANDLE_PARAM to XEN_GUEST_HANDLE */ -#define guest_handle_from_param(hnd, type) ({ \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)((typeof(&(hnd).p)) 0 == \ - (typeof(&((XEN_GUEST_HANDLE_PARAM(type)) {}).p)) 0); \ - (hnd); \ -}) - #define guest_handle_for_field(hnd, type, fld) \ ((XEN_GUEST_HANDLE(type)) { &(hnd).p->fld }) diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 1bf07e49fe..faf856913a 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -41,7 +41,7 @@ void hap_vcpu_init(struct vcpu *v); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) dirty_bitmap); + XEN_GUEST_HANDLE(void) dirty_bitmap); extern const struct paging_mode *hap_paging_get_mode(struct vcpu *); int hap_set_allocation(struct domain *d, unsigned int pages, bool *preempted); diff --git a/xen/include/asm-x86/microcode.h b/xen/include/asm-x86/microcode.h index cbbe28cb45..9da63f992e 100644 --- a/xen/include/asm-x86/microcode.h +++ b/xen/include/asm-x86/microcode.h @@ -20,7 +20,7 @@ struct cpu_signature { DECLARE_PER_CPU(struct cpu_signature, cpu_sig); void microcode_set_module(unsigned int idx); -int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); +int microcode_update(XEN_GUEST_HANDLE(const_void), unsigned long len); int early_microcode_init(void); int microcode_update_one(bool start_update); diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 8335862c87..224d1bc2f9 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -65,7 +65,7 @@ int shadow_enable(struct domain *d, u32 mode); int shadow_track_dirty_vram(struct domain *d, unsigned long first_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) dirty_bitmap); + XEN_GUEST_HANDLE(void) dirty_bitmap); /* Handler for shadow control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 5cfa06005b..c945ab05c8 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -184,8 +184,8 @@ static inline unsigned int acpi_get_csubstate_limit(void) { return 0; } static inline void acpi_set_csubstate_limit(unsigned int new_limit) { return; } #endif -#ifdef XEN_GUEST_HANDLE_PARAM -int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE_PARAM(uint32)); +#ifdef XEN_GUEST_HANDLE +int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32)); #endif int arch_acpi_set_pdc_bits(u32 acpi_id, u32 *, u32 mask); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 11:22:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 11:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWebZ-0000uF-6O; Thu, 07 May 2020 11:22:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWebX-0000u8-GD for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 11:22:15 +0000 X-Inumbo-ID: 00fc8a7e-9055-11ea-9f02-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 00fc8a7e-9055-11ea-9f02-12813bfff9fa; Thu, 07 May 2020 11:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xP4/wJhRIokdi86W9aXgWO8KD9VA9/i2E1RYVQXXU8U=; b=kXAE/kuDU7eEGjcj7S2rT1b8hB L6R1bVxGxBKvKtSddaBY75DZVY8KNX2lnZXQIn02PqMj8HAr5COTx/+Do5L6v6M7a52U7+1QP1xr8 JUbXOPrH2Yat6cYt+GjrnxqCz7ptGQIoFaj5oX2p9yy4+hlQ+e77icg4M/+Q0s8wIm0E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWebX-0004fM-0L for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 11:22:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWebW-0007fU-VX for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 11:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] Arm: fix build with CONFIG_DTB_FILE set Message-Id: Date: Thu, 07 May 2020 11:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 40675b4b874cb9fee0d4f0e12bb3e153ee1c135a Author: Jan Beulich AuthorDate: Thu May 7 13:18:24 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 13:18:24 2020 +0200 Arm: fix build with CONFIG_DTB_FILE set Recent changes no longer allow modification of AFLAGS. The needed conversion was apparently missed in 2740d96efdd3 ("xen/build: have the root Makefile generates the CFLAGS"). Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index b79ad55646..c1a1b5e803 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -68,7 +68,7 @@ extra-y += $(TARGET_SUBARCH)/head.o ifdef CONFIG_DTB_FILE obj-y += dtb.o -AFLAGS += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\" +AFLAGS-y += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\" endif ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:55:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3O-0008Pp-DI; Thu, 07 May 2020 12:55:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3N-0008Pk-Uk for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:06 +0000 X-Inumbo-ID: f8a393f6-9061-11ea-9f11-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f8a393f6-9061-11ea-9f11-12813bfff9fa; Thu, 07 May 2020 12:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZuIyNfTT/GzWimqy2h1hE8DslJlGM43dbCaC6ITTv2o=; b=UzI0gf+S1rBG1RuyUNgd0AYUbq Wp9HzckNf+0CI1hEdYNAn3vwmz0JOQo//vArbGp2Dfl4KjGNhZ/TybL1y02s4/kVhgPIRnQBvxHlt Yns93XxESknC6xOD0FiXK++dj6pRVLUnAWTRuPt/pArdUe5CDB0HHpBLeo+jyjE+0T10=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3M-0006Og-Ge for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg3M-0005xu-FB for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/svm: Clean up vmcbcleanbits_t handling Message-Id: Date: Thu, 07 May 2020 12:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 06e6f3176804b7eabfd028ec3777a69668fad36a Author: Andrew Cooper AuthorDate: Tue Apr 21 18:18:08 2020 +0100 Commit: Andrew Cooper CommitDate: Thu May 7 13:50:38 2020 +0100 x86/svm: Clean up vmcbcleanbits_t handling Rework the vmcbcleanbits_t definitons to use bool, drop 'fields' from the namespace, position the comments in an unambiguous position, and include the bit position. In svm_vmexit_handler(), don't bother conditionally writing ~0 or 0 based on hardware support. The field was entirely unused and ignored on older hardware (and we're already setting reserved cleanbits anyway). In nsvm_vmcb_prepare4vmrun(), simplify the logic massively by dropping the vcleanbit_set() macro using a vmcbcleanbits_t local variable which only gets filled in the case that clean bits were valid previously. Fix up the style on impacted lines. No practical change in behaviour. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/nestedsvm.c | 45 +++++++++++++++++++------------------- xen/arch/x86/hvm/svm/svm.c | 10 ++++----- xen/arch/x86/hvm/svm/svmdebug.c | 2 +- xen/include/asm-x86/hvm/svm/vmcb.h | 45 ++++++++++++++------------------------ 4 files changed, 44 insertions(+), 58 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index bbd06e342e..ffdc1d8da0 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -343,7 +343,7 @@ static int nsvm_vcpu_hostrestore(struct vcpu *v, struct cpu_user_regs *regs) n1vmcb->exit_int_info.raw = 0; /* Cleanbits */ - n1vmcb->cleanbits.bytes = 0; + n1vmcb->cleanbits.raw = 0; return 0; } @@ -423,7 +423,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) struct nestedvcpu *nv = &vcpu_nestedhvm(v); struct nestedsvm *svm = &vcpu_nestedsvm(v); struct vmcb_struct *ns_vmcb, *n1vmcb, *n2vmcb; - bool_t vcleanbits_valid; + vmcbcleanbits_t clean = {}; int rc; uint64_t cr0; @@ -435,17 +435,13 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) ASSERT(n2vmcb != NULL); /* Check if virtual VMCB cleanbits are valid */ - vcleanbits_valid = 1; - if ( svm->ns_ovvmcb_pa == INVALID_PADDR ) - vcleanbits_valid = 0; - if (svm->ns_ovvmcb_pa != nv->nv_vvmcxaddr) - vcleanbits_valid = 0; - -#define vcleanbit_set(_name) \ - (vcleanbits_valid && ns_vmcb->cleanbits.fields._name) + if ( svm->ns_ovvmcb_pa != INVALID_PADDR && + svm->ns_ovvmcb_pa == nv->nv_vvmcxaddr ) + clean = ns_vmcb->cleanbits; /* Enable l2 guest intercepts */ - if (!vcleanbit_set(intercepts)) { + if ( !clean.intercepts ) + { svm->ns_cr_intercepts = ns_vmcb->_cr_intercepts; svm->ns_dr_intercepts = ns_vmcb->_dr_intercepts; svm->ns_exception_intercepts = ns_vmcb->_exception_intercepts; @@ -492,7 +488,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) n2vmcb->_tsc_offset = n1vmcb->_tsc_offset + ns_vmcb->_tsc_offset; /* Nested IO permission bitmaps */ - rc = nsvm_vmrun_permissionmap(v, vcleanbit_set(iopm)); + rc = nsvm_vmrun_permissionmap(v, clean.iopm); if (rc) return rc; @@ -502,7 +498,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) n2vmcb->tlb_control = ns_vmcb->tlb_control; /* Virtual Interrupts */ - if (!vcleanbit_set(tpr)) { + if ( !clean.tpr ) + { n2vmcb->_vintr = ns_vmcb->_vintr; n2vmcb->_vintr.fields.intr_masking = 1; } @@ -520,9 +517,9 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) n2vmcb->event_inj = ns_vmcb->event_inj; /* LBR and other virtualization */ - if (!vcleanbit_set(lbr)) { + if ( !clean.lbr ) svm->ns_virt_ext = ns_vmcb->virt_ext; - } + n2vmcb->virt_ext.bytes = n1vmcb->virt_ext.bytes | ns_vmcb->virt_ext.bytes; @@ -533,7 +530,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) */ /* Segments */ - if (!vcleanbit_set(seg)) { + if ( !clean.seg ) + { n2vmcb->es = ns_vmcb->es; n2vmcb->cs = ns_vmcb->cs; n2vmcb->ss = ns_vmcb->ss; @@ -541,7 +539,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) /* CPL */ n2vmcb->_cpl = ns_vmcb->_cpl; } - if (!vcleanbit_set(dt)) { + if ( !clean.dt ) + { n2vmcb->gdtr = ns_vmcb->gdtr; n2vmcb->idtr = ns_vmcb->idtr; } @@ -614,7 +613,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) } /* DRn */ - if (!vcleanbit_set(dr)) { + if ( !clean.dr ) + { n2vmcb->_dr7 = ns_vmcb->_dr7; n2vmcb->_dr6 = ns_vmcb->_dr6; } @@ -637,11 +637,11 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) */ /* PAT */ - if (!vcleanbit_set(np)) { + if ( !clean.np ) n2vmcb->_g_pat = ns_vmcb->_g_pat; - } - if (!vcleanbit_set(lbr)) { + if ( !clean.lbr ) + { /* Debug Control MSR */ n2vmcb->_debugctlmsr = ns_vmcb->_debugctlmsr; @@ -653,7 +653,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) } /* Cleanbits */ - n2vmcb->cleanbits.bytes = 0; + n2vmcb->cleanbits.raw = 0; rc = svm_vmcb_isvalid(__func__, ns_vmcb, v, true); if (rc) { @@ -673,7 +673,6 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) regs->rsp = ns_vmcb->rsp; regs->rflags = ns_vmcb->rflags; -#undef vcleanbit_set return 0; } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 5950e4d52b..46a1aac949 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -345,7 +345,7 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c) else vmcb->event_inj.raw = 0; - vmcb->cleanbits.bytes = 0; + vmcb->cleanbits.raw = 0; paging_update_paging_modes(v); return 0; @@ -693,12 +693,12 @@ static void svm_set_segment_register(struct vcpu *v, enum x86_segment seg, case x86_seg_ds: case x86_seg_es: case x86_seg_ss: /* cpl */ - vmcb->cleanbits.fields.seg = 0; + vmcb->cleanbits.seg = false; break; case x86_seg_gdtr: case x86_seg_idtr: - vmcb->cleanbits.fields.dt = 0; + vmcb->cleanbits.dt = false; break; case x86_seg_fs: @@ -980,7 +980,7 @@ static void svm_ctxt_switch_to(struct vcpu *v) svm_restore_dr(v); svm_vmsave_pa(per_cpu(host_vmcb, cpu)); - vmcb->cleanbits.bytes = 0; + vmcb->cleanbits.raw = 0; svm_tsc_ratio_load(v); if ( cpu_has_msr_tsc_aux ) @@ -2594,7 +2594,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) hvm_maybe_deassert_evtchn_irq(); - vmcb->cleanbits.bytes = cpu_has_svm_cleanbits ? ~0u : 0u; + vmcb->cleanbits.raw = ~0u; /* Event delivery caused this intercept? Queue for redelivery. */ if ( unlikely(vmcb->exit_int_info.v) && diff --git a/xen/arch/x86/hvm/svm/svmdebug.c b/xen/arch/x86/hvm/svm/svmdebug.c index 91f5d9400c..ba26b6a80b 100644 --- a/xen/arch/x86/hvm/svm/svmdebug.c +++ b/xen/arch/x86/hvm/svm/svmdebug.c @@ -83,7 +83,7 @@ void svm_vmcb_dump(const char *from, const struct vmcb_struct *vmcb) printk("KernGSBase = 0x%016"PRIx64" PAT = 0x%016"PRIx64"\n", vmcb->kerngsbase, vmcb_get_g_pat(vmcb)); printk("H_CR3 = 0x%016"PRIx64" CleanBits = %#x\n", - vmcb_get_h_cr3(vmcb), vmcb->cleanbits.bytes); + vmcb_get_h_cr3(vmcb), vmcb->cleanbits.raw); /* print out all the selectors */ printk(" sel attr limit base\n"); diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index c2e1972feb..c4fda389b3 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -384,34 +384,21 @@ typedef union typedef union { - uint32_t bytes; - struct - { - /* cr_intercepts, dr_intercepts, exception_intercepts, - * general{1,2}_intercepts, pause_filter_count, tsc_offset */ - uint32_t intercepts: 1; - /* iopm_base_pa, msrpm_base_pa */ - uint32_t iopm: 1; - /* guest_asid */ - uint32_t asid: 1; - /* vintr */ - uint32_t tpr: 1; - /* np_enable, h_cr3, g_pat */ - uint32_t np: 1; - /* cr0, cr3, cr4, efer */ - uint32_t cr: 1; - /* dr6, dr7 */ - uint32_t dr: 1; - /* gdtr, idtr */ - uint32_t dt: 1; - /* cs, ds, es, ss, cpl */ - uint32_t seg: 1; - /* cr2 */ - uint32_t cr2: 1; - /* debugctlmsr, last{branch,int}{to,from}ip */ - uint32_t lbr: 1; - uint32_t resv: 21; - } fields; + struct { + bool intercepts:1; /* 0: cr/dr/exception/general intercepts, + * pause_filter_count, tsc_offset */ + bool iopm:1; /* 1: iopm_base_pa, msrpm_base_pa */ + bool asid:1; /* 2: guest_asid */ + bool tpr:1; /* 3: vintr */ + bool np:1; /* 4: np_enable, h_cr3, g_pat */ + bool cr:1; /* 5: cr0, cr3, cr4, efer */ + bool dr:1; /* 6: dr6, dr7 */ + bool dt:1; /* 7: gdtr, idtr */ + bool seg:1; /* 8: cs, ds, es, ss, cpl */ + bool cr2:1; /* 9: cr2 */ + bool lbr:1; /* 10: debugctlmsr, last{branch,int}{to,from}ip */ + }; + uint32_t raw; } vmcbcleanbits_t; #define IOPM_SIZE (12 * 1024) @@ -604,7 +591,7 @@ vmcb_set_ ## name(struct vmcb_struct *vmcb, \ type value) \ { \ vmcb->_ ## name = value; \ - vmcb->cleanbits.fields.cleanbit = 0; \ + vmcb->cleanbits.cleanbit = false; \ } \ static inline type \ vmcb_get_ ## name(const struct vmcb_struct *vmcb) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3Y-0008QO-Ew; Thu, 07 May 2020 12:55:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3X-0008QI-Qs for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:15 +0000 X-Inumbo-ID: feac41a8-9061-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id feac41a8-9061-11ea-9887-bc764e2007e4; Thu, 07 May 2020 12:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cc2JebCl9J6EM8zbyvVF4Etc6x9NP1Wpxn4onzc+3Kg=; b=Dn2YhMHzQA1883lGxyKbscEQFR AEEZKazi/ZCNQeKc2OWD1AYdvml+Hgbl/gcynO1Wp4Oi2d/saWYEGCbszqClgJRAyDCqBHkw+Bclx TLgiGwR3RYkhKRFNdMO9bu5Ap5A/ZvtlveUsgXC5W41lf89i89BdPpt+1jXQthuMqs+Y=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3W-0006Om-JT for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg3W-0005yV-IM for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/svm: Use flush-by-asid when available Message-Id: Date: Thu, 07 May 2020 12:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 64b1da5a2fcf37e3542c277fde194ff3e8bba2d2 Author: Andrew Cooper AuthorDate: Tue Feb 12 18:37:04 2019 +0000 Commit: Andrew Cooper CommitDate: Thu May 7 13:50:38 2020 +0100 x86/svm: Use flush-by-asid when available AMD Fam15h processors introduced the flush-by-asid feature, for more fine grain flushing purposes. Flushing everything including ASID 0 (i.e. Xen context) is an an unnecesserily large hammer, and never necessary in the context of guest TLBs needing invalidating. When available, use TLB_CTRL_FLUSH_ASID in preference to TLB_CTRL_FLUSH_ALL. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/asid.c | 9 ++++++--- xen/include/asm-x86/hvm/svm/svm.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 9be90058c7..ab06dd3f3a 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -18,6 +18,7 @@ #include #include #include +#include void svm_asid_init(const struct cpuinfo_x86 *c) { @@ -47,15 +48,17 @@ void svm_asid_handle_vmrun(void) if ( p_asid->asid == 0 ) { vmcb_set_guest_asid(vmcb, 1); - /* TODO: investigate using TLB_CTRL_FLUSH_ASID here instead. */ - vmcb->tlb_control = TLB_CTRL_FLUSH_ALL; + vmcb->tlb_control = + cpu_has_svm_flushbyasid ? TLB_CTRL_FLUSH_ASID : TLB_CTRL_FLUSH_ALL; return; } if ( vmcb_get_guest_asid(vmcb) != p_asid->asid ) vmcb_set_guest_asid(vmcb, p_asid->asid); - vmcb->tlb_control = need_flush ? TLB_CTRL_FLUSH_ALL : TLB_CTRL_NO_FLUSH; + vmcb->tlb_control = + !need_flush ? TLB_CTRL_NO_FLUSH : + cpu_has_svm_flushbyasid ? TLB_CTRL_FLUSH_ASID : TLB_CTRL_FLUSH_ALL; } /* diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index 16a994ec74..cd71402cbb 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -79,6 +79,7 @@ extern u32 svm_feature_flags; #define cpu_has_svm_svml cpu_has_svm_feature(SVM_FEATURE_SVML) #define cpu_has_svm_nrips cpu_has_svm_feature(SVM_FEATURE_NRIPS) #define cpu_has_svm_cleanbits cpu_has_svm_feature(SVM_FEATURE_VMCBCLEAN) +#define cpu_has_svm_flushbyasid cpu_has_svm_feature(SVM_FEATURE_FLUSHBYASID) #define cpu_has_svm_decode cpu_has_svm_feature(SVM_FEATURE_DECODEASSISTS) #define cpu_has_svm_vgif cpu_has_svm_feature(SVM_FEATURE_VGIF) #define cpu_has_pause_filter cpu_has_svm_feature(SVM_FEATURE_PAUSEFILTER) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3i-0008Ri-GN; Thu, 07 May 2020 12:55:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3i-0008Rc-00 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:26 +0000 X-Inumbo-ID: 0515e40e-9062-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0515e40e-9062-11ea-b9cf-bc764e2007e4; Thu, 07 May 2020 12:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/EthNfdaiCBLBOvx7DUmS0v3imLa1bdazv02IkMSSJk=; b=wFK/EVaBMLnWKXQ4MH5TIcSktR n5rcRZjuGEh/AB5q7xC0ykdKpYPKVCUxszQ2cQftVCeSH63+//fxigibS7fXXHA2KkcbplNlo0TQV S1Qug/ncLRcra+1gm/2AkW+dc6Whaptn6whNk8X6yyEooeuNq/53sVoyurvhMLYZJrMQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3h-0006Oz-Cx for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg3h-00060D-Bx for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] xen/grants: fix hypercall continuation for GNTTABOP_cache_flush Message-Id: Date: Thu, 07 May 2020 12:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8b6d4e234b51e24bd35ffbd0448380d49347473e Author: Juergen Gross AuthorDate: Thu May 7 14:45:17 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:45:17 2020 +0200 xen/grants: fix hypercall continuation for GNTTABOP_cache_flush The GNTTABOP_cache_flush hypercall has a wrong test for hypercall continuation, the test today is: if ( rc > 0 || opaque_out != 0 ) Unfortunately this will be true even in case of an error (rc < 0), possibly leading to very long lasting hypercalls (times of more than an hour have been observed in a test case). Correct the test condition to result in false with rc < 0 and set opaque_out only if no error occurred, to be on the safe side. Partially-suggested-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Reviewed-by: Stefano Stabellini master commit: 46d8f69d466a05863737fb81d8c9ef39c3be8b45 master date: 2020-04-29 14:12:50 +0100 --- xen/common/grant_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 917e63d370..41fd89f5d9 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3633,12 +3633,12 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(cflush, count)) ) goto out; rc = gnttab_cache_flush(cflush, &opaque_in, count); - if ( rc > 0 ) + if ( rc >= 0 ) { guest_handle_add_offset(cflush, rc); uop = guest_handle_cast(cflush, void); + opaque_out = opaque_in; } - opaque_out = opaque_in; break; } @@ -3648,7 +3648,7 @@ do_grant_table_op( } out: - if ( rc > 0 || opaque_out != 0 ) + if ( rc > 0 || (opaque_out != 0 && rc == 0) ) { /* Adjust rc, see gnttab_copy() for why this is needed. */ if ( cmd == GNTTABOP_copy ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:55:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:55:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3t-0008TL-Hw; Thu, 07 May 2020 12:55:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3s-0008TA-6h for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:36 +0000 X-Inumbo-ID: 0b1cf496-9062-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0b1cf496-9062-11ea-ae69-bc764e2007e4; Thu, 07 May 2020 12:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jnoVcGegpY50cZ6kGnXswSHG8vPVwTEk3LM3Of4f0ak=; b=fhMJuEGE2FpmXmCpXDNDl9SnPH pU2t5QZ5fIzZuHBDbYeU3PB3Uf2f3rnsyTBBTSjzG/Q0S74r26eXW2eXH4Nl/HJDlFNaFQq1lhFx2 1IIhamWOFBExeR4mQOHt0+FeWi4vYZpFg33UlRStQnRYvTsj6HBaR6U3FvqK0O7NTswk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg3r-0006PB-Fj for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg3r-00060n-Eh for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] x86/pass-through: avoid double IRQ unbind during domain cleanup Message-Id: Date: Thu, 07 May 2020 12:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6a1036e28240217d1dbfcb096800313a468cdb0e Author: Jan Beulich AuthorDate: Thu May 7 14:46:24 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:46:24 2020 +0200 x86/pass-through: avoid double IRQ unbind during domain cleanup XEN_DOMCTL_destroydomain creates a continuation if domain_kill -ERESTARTs. In that scenario, it is possible to receive multiple _pirq_guest_unbind calls for the same pirq from domain_kill, if the pirq has not yet been removed from the domain's pirq_tree, as: domain_kill() -> domain_relinquish_resources() -> pci_release_devices() -> pci_clean_dpci_irq() -> pirq_guest_unbind() -> __pirq_guest_unbind() Avoid recurring invocations of pirq_guest_unbind() by removing the pIRQ from the tree being iterated after the first call there. In case such a removed entry still has a softirq outstanding, record it and re-check upon re-invocation. Note that pirq_cleanup_check() gets relaxed beyond what's strictly needed here, to avoid introducing an asymmetry there between HVM and PV guests. Reported-by: Varad Gautam Signed-off-by: Jan Beulich Tested-by: Varad Gautam Reviewed-by: Paul Durrant Reviewed-by: Roger Pau Monné master commit: 5b58dad089880127674d460494d1a9d68109b3d7 master date: 2020-04-30 10:40:59 +0200 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 21 +++++++++++++++++++-- xen/include/asm-x86/hvm/irq.h | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 5d0d94c66c..ed32318659 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1504,7 +1504,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG(); + BUG_ON(!d->is_dying); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index cbd232c131..1efd8d0eeb 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -872,7 +872,14 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; + radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); + + if ( !pt_pirq_softirq_active(pirq_dpci) ) + return 0; + + domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; + + return -ERESTART; } static int pci_clean_dpci_irqs(struct domain *d) @@ -889,8 +896,18 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + int ret = 0; + if ( hvm_irq_dpci->pending_pirq_dpci ) + { + if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) + ret = -ERESTART; + else + hvm_irq_dpci->pending_pirq_dpci = NULL; + } + + if ( !ret ) + ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 5b7e90c179..d306cfeade 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -158,6 +158,8 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; + /* Clean up: Entry with a softirq invocation pending / in progress. */ + struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:55:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg43-0008UM-Jb; Thu, 07 May 2020 12:55:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg42-0008UA-9L for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:46 +0000 X-Inumbo-ID: 111823b6-9062-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 111823b6-9062-11ea-b07b-bc764e2007e4; Thu, 07 May 2020 12:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hypNi95DhirnZcZNq2gqBGGBP01jXY+lgztSTxiuywI=; b=mHVp3G3hvMbMZuIsGJooOxI7Ue tYw+hUDay7yYAxaU1lMwR6n3DfVmivCtPcR+ogrDftfct20+xV9OZlwcBX4N0Rf+3evPo7gtTRleR wJaFS4cLq2gNO7WUa7+RcXupS6071Q35Ok325i5Iu3geZA1KH+Wr8ao4wzLZsq4QjN24=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg41-0006Pl-IP for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg41-00061O-HM for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] x86/CPUID: correct error indicator for max extended leaf Message-Id: Date: Thu, 07 May 2020 12:55:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 70ed2d5f0d51d3bea012170bbf70553463862073 Author: Jan Beulich AuthorDate: Thu May 7 14:47:47 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:47:47 2020 +0200 x86/CPUID: correct error indicator for max extended leaf With the max base leaf using 0, this one should be using the extended leaf counterpart thereof, rather than some arbitrary extended leaf. Fixes: 588a966a572e ("libx86: Introduce x86_cpu_policies_are_compatible()") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 0135be8bd8cd60090298f02310691b688d95c3a8 master date: 2020-04-30 10:45:09 +0200 --- tools/tests/cpu-policy/test-cpu-policy.c | 2 +- xen/lib/x86/policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/cpu-policy/test-cpu-policy.c b/tools/tests/cpu-policy/test-cpu-policy.c index 20ebed923b..fe8cdf6ea9 100644 --- a/tools/tests/cpu-policy/test-cpu-policy.c +++ b/tools/tests/cpu-policy/test-cpu-policy.c @@ -570,7 +570,7 @@ static void test_is_compatible_failure(void) { .name = "Host extd.max_leaf out of range", .guest_cpuid.extd.max_leaf = 1, - .e = { 0x80000008, -1, -1 }, + .e = { 0x80000000, -1, -1 }, }, { .name = "Host no CPUID faulting, Guest wanted", diff --git a/xen/lib/x86/policy.c b/xen/lib/x86/policy.c index b156a304f4..4beca8767a 100644 --- a/xen/lib/x86/policy.c +++ b/xen/lib/x86/policy.c @@ -19,7 +19,7 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy *host, FAIL_CPUID(0, NA); if ( guest->cpuid->extd.max_leaf > host->cpuid->extd.max_leaf ) - FAIL_CPUID(0x80000008, NA); + FAIL_CPUID(0x80000000, NA); /* TODO: Audit more CPUID data. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:55:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:55:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4D-0008Va-Mo; Thu, 07 May 2020 12:55:57 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4C-0008VS-9x for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:56 +0000 X-Inumbo-ID: 171e2986-9062-11ea-9f11-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 171e2986-9062-11ea-9f11-12813bfff9fa; Thu, 07 May 2020 12:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ebfKGfl7LJgIuvOrD8bjFZpWQvrxpuC+HgZIgBrTBcY=; b=SuBPqIs/Sj1S9nETx3mT1z+3cG bTpTnHp2P7sNFiZECMrUUsPAE6oIV+d7GcNmVj0P89nbRhJN15Uo+N2GGHldIiPV99s8xJqjSm2rS sji62V4WO2RXPUxG0P2eDp4jtlZjAW/0f/ZptMH5Mw67p7S5N5SqeNOIBKwpkhCL6xZg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4B-0006Pu-Lf for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg4B-00062S-KZ for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:55:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] x86emul: extend x86_insn_is_mem_write() coverage Message-Id: Date: Thu, 07 May 2020 12:55:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 71a9ffa4332eee20efdaff71efcb1de32500e0d0 Author: Jan Beulich AuthorDate: Thu May 7 14:48:44 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:48:44 2020 +0200 x86emul: extend x86_insn_is_mem_write() coverage Several insns were missed when this function was first added. As far as insns already supported by the emulator go - SMSW and {,V}STMXCSR were wrongly considered r/o insns so far. Insns like the VMX, SVM, or CET-SS ones, PTWRITE, or AMD's new SNP ones are intentionally not covered just yet. VMPTRST is put there just to complete the respective group. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: fc6fa977be54a24a1325e3f2d08b1b1dcb675f44 master date: 2020-05-05 09:50:54 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 777cac2b29..0a3ef4a9fe 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -11431,13 +11431,39 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, break; case X86EMUL_OPC(0x0f, 0x01): - return !(state->modrm_reg & 6); /* SGDT / SIDT */ + switch ( state->modrm_reg & 7 ) + { + case 0: /* SGDT */ + case 1: /* SIDT */ + case 4: /* SMSW */ + return true; + } + break; + + case X86EMUL_OPC(0x0f, 0xae): + switch ( state->modrm_reg & 7 ) + { + case 0: /* FXSAVE */ + case 3: /* {,V}STMXCSR */ + case 4: /* XSAVE */ + case 6: /* XSAVEOPT */ + return true; + } + break; case X86EMUL_OPC(0x0f, 0xba): return (state->modrm_reg & 7) > 4; /* BTS / BTR / BTC */ case X86EMUL_OPC(0x0f, 0xc7): - return (state->modrm_reg & 7) == 1; /* CMPXCHG{8,16}B */ + switch ( state->modrm_reg & 7 ) + { + case 1: /* CMPXCHG{8,16}B */ + case 4: /* XSAVEC */ + case 5: /* XSAVES */ + case 7: /* VMPTRST */ + return true; + } + break; } return false; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:56:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:56:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4N-000053-OG; Thu, 07 May 2020 12:56:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4M-00004t-CJ for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:06 +0000 X-Inumbo-ID: 1d22a136-9062-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1d22a136-9062-11ea-9887-bc764e2007e4; Thu, 07 May 2020 12:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Pu/vW0IMP46JwCzb4CSmM4XPP62A3hRSUOAUroh9wCs=; b=oneRWfZQRkeEQnydp6Pjs47YO8 DgEV12yNLxmy4CP4KlT2Qdedzc7judpWbO5aYM43YOQsi8JQiGswMm7NzTMAdYNjt1wIRkv38aijq UUIPckCuMyVLpQiwBoDHGNEDaF2rIqR6PS7aKIgLwV+I9b7eOe1yrD542GxFg3Z2qOuQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4L-0006QJ-OU for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg4L-00063r-NL for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] x86/hvm: simplify hvm_physdev_op allowance control Message-Id: Date: Thu, 07 May 2020 12:56:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 905de40c3031ae7ba47b4a659626b62d900aab1f Author: Roger Pau Monné AuthorDate: Thu May 7 14:49:42 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:49:42 2020 +0200 x86/hvm: simplify hvm_physdev_op allowance control PVHv1 dom0 was given access to all PHYSDEVOP hypercalls, and such restriction was not removed when PVHv1 code was removed. As a result the switch in hvm_physdev_op was more complicated than required, and relied on PVHv2 dom0 not having PIRQ support in order to prevent access to some PV specific PHYSDEVOPs. Fix this by moving the default case to the bottom of the switch, since there's no need for any fall through now. Also remove the hardware domain check, as all the not explicitly listed PHYSDEVOPs are forbidden for HVM domains. Finally tighten the condition to allow usage of PHYSDEVOP_pci_mmcfg_reserved: apart from having vPCI enabled it should only be used by the hardware domain. Note that the code in do_physdev_op is already restricting the call to privileged domains only, but it can be further restricted to the hardware domain only, as other privileged domains don't have access to MMCFG regions anyway. Overall no functional change should arise from this change. Reported-by: Julien Grall Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: a00e3737e085ebc1f313e36b188d4958e939e531 master date: 2020-05-05 09:52:28 +0200 --- xen/arch/x86/hvm/hypercall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 0d24550dcc..cacc3a57fc 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -77,26 +77,26 @@ static long hvm_grant_table_op( static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { const struct vcpu *curr = current; + const struct domain *currd = curr->domain; switch ( cmd ) { - default: - if ( !is_hardware_domain(curr->domain) ) - return -ENOSYS; - /* fall through */ case PHYSDEVOP_map_pirq: case PHYSDEVOP_unmap_pirq: case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: - if ( !has_pirq(curr->domain) ) + if ( !has_pirq(currd) ) return -ENOSYS; break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(curr->domain) ) + if ( !has_vpci(currd) || !is_hardware_domain(currd) ) return -ENOSYS; break; + + default: + return -ENOSYS; } if ( !curr->hcall_compat ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:56:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:56:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4X-00006H-Pp; Thu, 07 May 2020 12:56:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4W-00006B-II for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:16 +0000 X-Inumbo-ID: 2329a05c-9062-11ea-9f11-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2329a05c-9062-11ea-9f11-12813bfff9fa; Thu, 07 May 2020 12:56:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3zBXxPH2sRP2NgwZ7//I2eSthi4wCHxS/V6C3aTpOvc=; b=WpZHpi69hqjZFMEziI/JjEuGlk oq5K6hp/tHrLFmVY1aeBk3pd/ufIFmm/EBM3998dE3pYnncbTQ9tsLIdEaSDEI2x7/QNxqH+PCE6v jIIRPC7sL8PNQaIZ6NAUuiRX9M6UVbbWC37Cxi+isO8U1jOM3fRVUawHqnc71A7eALxQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4V-0006QS-Rl for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg4V-000658-QJ for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] x86/traps: fix an off-by-one error Message-Id: Date: Thu, 07 May 2020 12:56:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 68a843a7b089565f27a9a460bfa5bdb9175d88c8 Author: Hongyan Xia AuthorDate: Thu May 7 14:50:23 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:50:23 2020 +0200 x86/traps: fix an off-by-one error stack++ can go into the next page and unmap_domain_page() will unmap the wrong one, causing mapcache and memory corruption. Fix. Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich master commit: 2e3d87cc734a895ef5b486926274a178836b67a9 master date: 2020-05-05 16:13:44 +0100 --- xen/arch/x86/traps.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 8705ec8315..54aca36714 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -232,6 +232,7 @@ static void compat_show_guest_stack(struct vcpu *v, int debug_stack_lines) { unsigned int i, *stack, addr, mask = STACK_SIZE; + void *stack_page = NULL; stack = (unsigned int *)(unsigned long)regs->esp; printk("Guest stack trace from esp=%08lx:\n ", (unsigned long)stack); @@ -254,7 +255,7 @@ static void compat_show_guest_stack(struct vcpu *v, break; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -281,11 +282,10 @@ static void compat_show_guest_stack(struct vcpu *v, printk(" %08x", addr); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); @@ -296,6 +296,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) int i; unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + void *stack_page = NULL; /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) @@ -324,7 +325,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -351,11 +352,10 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk(" %p", _p(addr)); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 07 12:56:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 12:56:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4h-00007S-RL; Thu, 07 May 2020 12:56:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4g-00007K-GN for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:26 +0000 X-Inumbo-ID: 2928c910-9062-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2928c910-9062-11ea-b07b-bc764e2007e4; Thu, 07 May 2020 12:56:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8fAXoeQqKsd+QgWJsa0o8S/Niyqy+pwgH+2QGL4IgHw=; b=MZ8a25oHMCWJHjKgD7W+VJ4vP8 EpK1Vvel/n/UIyq/m385GkQsAOpDX2fYPGjwh59C6HoWuUyhgk66/2pl9mXPJopTcSYZc7RBQuPeA 3V8wrCWO3GfeX0HIQPLQ0kTJnRQmvSl2RLg6zkgUxa5PBPmwF2Ai+TiZuwSn25V+DwJI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg4f-0006Qb-UJ for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg4f-00065y-TP for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 12:56:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] x86/ucode/intel: Writeback and invalidate caches before updating microcode Message-Id: Date: Thu, 07 May 2020 12:56:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9649b83b2ab4707de79da42307f8757e317bf217 Author: Ashok Raj AuthorDate: Thu May 7 14:51:20 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:51:20 2020 +0200 x86/ucode/intel: Writeback and invalidate caches before updating microcode Updating microcode is less error prone when caches have been flushed and depending on what exactly the microcode is updating. For example, some of the issues around certain Broadwell parts can be addressed by doing a full cache flush. Signed-off-by: Ashok Raj Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner [Linux commit 91df9fdf51492aec9fed6b4cbd33160886740f47, ported to Xen] Signed-off-by: Andrew Cooper Acked-by: Jan Beulich master commit: 77c82949990edaf21130be842a289a7fb7a439e1 master date: 2020-05-05 20:18:19 +0100 --- xen/arch/x86/microcode_intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index e37c46a836..42fbd19551 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -30,6 +30,7 @@ #include #include +#include #include #define pr_debug(x...) ((void)0) @@ -300,6 +301,8 @@ static int apply_microcode(const struct microcode_patch *patch) BUG_ON(local_irq_is_enabled()); + wbinvd(); + /* write microcode via MSR 0x79 */ wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)mc_intel->bits); wrmsrl(MSR_IA32_UCODE_REV, 0x0ULL); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 07 13:00:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 13:00:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8F-0000rp-5G; Thu, 07 May 2020 13:00:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8E-0000oC-0L for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:06 +0000 X-Inumbo-ID: ab855c3e-9062-11ea-9f13-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ab855c3e-9062-11ea-9f13-12813bfff9fa; Thu, 07 May 2020 13:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=y6cXB5wQhg84CAuvele3FqSz9F8g+50Sil0GBJq+6mA=; b=qqnpnESZ/qH0HyPfZCuNrrzllt 875A3KRjOvoIFKyYSZbAJVf72/HRtLHqjT6YUYSR1QuSAI1AFIfFeXIrzEw/Pg3Fb9/8rpl9Pc4Sz Ymb5ce5P3o5SXwoLNyG6s5qAcsIabjAyQrfyqqbTj8nJ0mTqXM97orhD93o95nsPnGH8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8C-0006XC-L4 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg8C-0006XS-Jf for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] xen/grants: fix hypercall continuation for GNTTABOP_cache_flush Message-Id: Date: Thu, 07 May 2020 13:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9756cbede6772a2c4b225fef4875be65ef75e1f7 Author: Juergen Gross AuthorDate: Thu May 7 14:53:13 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:53:13 2020 +0200 xen/grants: fix hypercall continuation for GNTTABOP_cache_flush The GNTTABOP_cache_flush hypercall has a wrong test for hypercall continuation, the test today is: if ( rc > 0 || opaque_out != 0 ) Unfortunately this will be true even in case of an error (rc < 0), possibly leading to very long lasting hypercalls (times of more than an hour have been observed in a test case). Correct the test condition to result in false with rc < 0 and set opaque_out only if no error occurred, to be on the safe side. Partially-suggested-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Reviewed-by: Stefano Stabellini master commit: 46d8f69d466a05863737fb81d8c9ef39c3be8b45 master date: 2020-04-29 14:12:50 +0100 --- xen/common/grant_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 38d5524a0e..1adb173e06 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3571,12 +3571,12 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(cflush, count)) ) goto out; rc = gnttab_cache_flush(cflush, &opaque_in, count); - if ( rc > 0 ) + if ( rc >= 0 ) { guest_handle_add_offset(cflush, rc); uop = guest_handle_cast(cflush, void); + opaque_out = opaque_in; } - opaque_out = opaque_in; break; } @@ -3586,7 +3586,7 @@ do_grant_table_op( } out: - if ( rc > 0 || opaque_out != 0 ) + if ( rc > 0 || (opaque_out != 0 && rc == 0) ) { /* Adjust rc, see gnttab_copy() for why this is needed. */ if ( cmd == GNTTABOP_copy ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu May 07 13:00:19 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 13:00:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8P-0000sy-9S; Thu, 07 May 2020 13:00:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8N-0000sc-LP for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:15 +0000 X-Inumbo-ID: b18f39c4-9062-11ea-9f13-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b18f39c4-9062-11ea-9f13-12813bfff9fa; Thu, 07 May 2020 13:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wgvWM+FarLvoAu1i0BYKSNrav/5Qxukw2Pcj7/KYXJU=; b=wJt3Mod3xcBwJcz2ACLaxUIE1e Be4uzAwcTGBzeIOcpcplWR//9QWFswTXeGbE7TAt3C3dItkR7p66ATB/LhV/rnfRCK1wpKb5mSoX0 r26pjKXB/gzGoeXQbOf1moJg2g8L8Su+cczXT/bmyrFrnoW0tKkxWXZ5XIaPDlOIOOa4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8M-0006XL-O2 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg8M-0006Ym-N0 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] x86/pass-through: avoid double IRQ unbind during domain cleanup Message-Id: Date: Thu, 07 May 2020 13:00:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0d1c383c8f37667f82bd503fba920ff8b33e32c5 Author: Jan Beulich AuthorDate: Thu May 7 14:54:39 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:54:39 2020 +0200 x86/pass-through: avoid double IRQ unbind during domain cleanup XEN_DOMCTL_destroydomain creates a continuation if domain_kill -ERESTARTs. In that scenario, it is possible to receive multiple _pirq_guest_unbind calls for the same pirq from domain_kill, if the pirq has not yet been removed from the domain's pirq_tree, as: domain_kill() -> domain_relinquish_resources() -> pci_release_devices() -> pci_clean_dpci_irq() -> pirq_guest_unbind() -> __pirq_guest_unbind() Avoid recurring invocations of pirq_guest_unbind() by removing the pIRQ from the tree being iterated after the first call there. In case such a removed entry still has a softirq outstanding, record it and re-check upon re-invocation. Note that pirq_cleanup_check() gets relaxed beyond what's strictly needed here, to avoid introducing an asymmetry there between HVM and PV guests. Reported-by: Varad Gautam Signed-off-by: Jan Beulich Tested-by: Varad Gautam Reviewed-by: Paul Durrant Reviewed-by: Roger Pau Monné master commit: 5b58dad089880127674d460494d1a9d68109b3d7 master date: 2020-04-30 10:40:59 +0200 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 21 +++++++++++++++++++-- xen/include/asm-x86/hvm/irq.h | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 8ed030c151..ade659c3c2 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1407,7 +1407,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG(); + BUG_ON(!d->is_dying); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 41e5f7f63e..f079238b78 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -877,7 +877,14 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; + radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); + + if ( !pt_pirq_softirq_active(pirq_dpci) ) + return 0; + + domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; + + return -ERESTART; } static int pci_clean_dpci_irqs(struct domain *d) @@ -894,8 +901,18 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + int ret = 0; + if ( hvm_irq_dpci->pending_pirq_dpci ) + { + if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) + ret = -ERESTART; + else + hvm_irq_dpci->pending_pirq_dpci = NULL; + } + + if ( !ret ) + ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 5b7e90c179..d306cfeade 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -158,6 +158,8 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; + /* Clean up: Entry with a softirq invocation pending / in progress. */ + struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu May 07 13:00:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 13:00:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8Y-0000up-CN; Thu, 07 May 2020 13:00:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8X-0000ug-Fr for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:25 +0000 X-Inumbo-ID: b78d7db8-9062-11ea-9f13-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b78d7db8-9062-11ea-9f13-12813bfff9fa; Thu, 07 May 2020 13:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oSuh2bJ9wXpjxDniBl2r74WDkHV1gJ66HI/VTktx0kQ=; b=Y3Hl49DOM+5k4cvpcbdfz3wEL7 YWFAgfs28iSJofurkeHfgBzlMiIPxFDMiQ71k6IqFcpmv+rYoFbgo3EFD7n2WIk4wb/kd5w87B2Ei MbVtBrD6o4iixJAV10kVLq1ncFEx99djSkOZqmi6gGBJYUB3xqg7098dmTynZDRvrC7w=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8W-0006Xb-Qy for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg8W-0006Zf-Q0 for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] x86emul: extend x86_insn_is_mem_write() coverage Message-Id: Date: Thu, 07 May 2020 13:00:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c85cb312b9fd02df9f5c605c7753373de1256bf7 Author: Jan Beulich AuthorDate: Thu May 7 14:56:03 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:56:03 2020 +0200 x86emul: extend x86_insn_is_mem_write() coverage Several insns were missed when this function was first added. As far as insns already supported by the emulator go - SMSW and {,V}STMXCSR were wrongly considered r/o insns so far. Insns like the VMX, SVM, or CET-SS ones, PTWRITE, or AMD's new SNP ones are intentionally not covered just yet. VMPTRST is put there just to complete the respective group. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: fc6fa977be54a24a1325e3f2d08b1b1dcb675f44 master date: 2020-05-05 09:50:54 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 225931f5ac..facd88d2b8 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -10097,13 +10097,39 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, break; case X86EMUL_OPC(0x0f, 0x01): - return !(state->modrm_reg & 6); /* SGDT / SIDT */ + switch ( state->modrm_reg & 7 ) + { + case 0: /* SGDT */ + case 1: /* SIDT */ + case 4: /* SMSW */ + return true; + } + break; + + case X86EMUL_OPC(0x0f, 0xae): + switch ( state->modrm_reg & 7 ) + { + case 0: /* FXSAVE */ + case 3: /* {,V}STMXCSR */ + case 4: /* XSAVE */ + case 6: /* XSAVEOPT */ + return true; + } + break; case X86EMUL_OPC(0x0f, 0xba): return (state->modrm_reg & 7) > 4; /* BTS / BTR / BTC */ case X86EMUL_OPC(0x0f, 0xc7): - return (state->modrm_reg & 7) == 1; /* CMPXCHG{8,16}B */ + switch ( state->modrm_reg & 7 ) + { + case 1: /* CMPXCHG{8,16}B */ + case 4: /* XSAVEC */ + case 5: /* XSAVES */ + case 7: /* VMPTRST */ + return true; + } + break; } return false; -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu May 07 13:00:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 13:00:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8i-0000x1-Do; Thu, 07 May 2020 13:00:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8h-0000wF-IJ for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:35 +0000 X-Inumbo-ID: bcd8b289-9062-11ea-9f13-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bcd8b289-9062-11ea-9f13-12813bfff9fa; Thu, 07 May 2020 13:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eV+pln5PGZ3Hi56GcTQZEvnqamvWI4g2uq12igX2J4Y=; b=RoxWNbqeNE+3JsBmPhfHoQqyZI Fz8gOuluqK751wDwgw6yp1iOZatSbmmJlP5LLjfWKbXl9mBXfBhb/3/0YtTtcsB2AialihPjJng+j 63Qr9odZ7SLfu0SVLn5LetPrr4vx6G8r9tmqLapp7XNNczVTBnjXxsZG79+tEOSIMB3k=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8g-0006Xk-Tc for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg8g-0006aW-SZ for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] x86/hvm: simplify hvm_physdev_op allowance control Message-Id: Date: Thu, 07 May 2020 13:00:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d461833db80825829dcac7ecc50b9eb485937c0b Author: Roger Pau Monné AuthorDate: Thu May 7 14:56:56 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:56:56 2020 +0200 x86/hvm: simplify hvm_physdev_op allowance control PVHv1 dom0 was given access to all PHYSDEVOP hypercalls, and such restriction was not removed when PVHv1 code was removed. As a result the switch in hvm_physdev_op was more complicated than required, and relied on PVHv2 dom0 not having PIRQ support in order to prevent access to some PV specific PHYSDEVOPs. Fix this by moving the default case to the bottom of the switch, since there's no need for any fall through now. Also remove the hardware domain check, as all the not explicitly listed PHYSDEVOPs are forbidden for HVM domains. Finally tighten the condition to allow usage of PHYSDEVOP_pci_mmcfg_reserved: apart from having vPCI enabled it should only be used by the hardware domain. Note that the code in do_physdev_op is already restricting the call to privileged domains only, but it can be further restricted to the hardware domain only, as other privileged domains don't have access to MMCFG regions anyway. Overall no functional change should arise from this change. Reported-by: Julien Grall Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: a00e3737e085ebc1f313e36b188d4958e939e531 master date: 2020-05-05 09:52:28 +0200 --- xen/arch/x86/hvm/hypercall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 7fcfc92b39..d66c8c3a6e 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -75,26 +75,26 @@ static long hvm_grant_table_op( static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { const struct vcpu *curr = current; + const struct domain *currd = curr->domain; switch ( cmd ) { - default: - if ( !is_hardware_domain(curr->domain) ) - return -ENOSYS; - /* fall through */ case PHYSDEVOP_map_pirq: case PHYSDEVOP_unmap_pirq: case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: - if ( !has_pirq(curr->domain) ) + if ( !has_pirq(currd) ) return -ENOSYS; break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(curr->domain) ) + if ( !has_vpci(currd) || !is_hardware_domain(currd) ) return -ENOSYS; break; + + default: + return -ENOSYS; } if ( !curr->hcall_compat ) -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu May 07 13:00:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 13:00:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8t-0000yE-FN; Thu, 07 May 2020 13:00:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8r-0000y0-Me for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:45 +0000 X-Inumbo-ID: c39cdc66-9062-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c39cdc66-9062-11ea-b07b-bc764e2007e4; Thu, 07 May 2020 13:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5dN4VaqwdFkWZ/uTE15Jdl06zM2Aeqw9fr1tJAljyBY=; b=f4Tte//TP5vB/oY49WukpMR3fF Cu/Cdkr5kFkJyEm2mOhp1bOSoOK88jyf9h8m3zw0xVWP10EBecKDr7xPCrqW4P0GoFUCzqnPhfx9P tvLiU21ddnZWyIi2OXArmjpq8kZU4XCq+QkSTapQk+f1yh0E/ZyZVVw1o4haLlSPH7uk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg8r-0006YX-0X for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg8q-0006ba-Vt for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] x86/traps: fix an off-by-one error Message-Id: Date: Thu, 07 May 2020 13:00:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2291b9795e69f4ec34c6a997d66a50a9fa014775 Author: Hongyan Xia AuthorDate: Thu May 7 14:57:35 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:57:35 2020 +0200 x86/traps: fix an off-by-one error stack++ can go into the next page and unmap_domain_page() will unmap the wrong one, causing mapcache and memory corruption. Fix. Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich master commit: 2e3d87cc734a895ef5b486926274a178836b67a9 master date: 2020-05-05 16:13:44 +0100 --- xen/arch/x86/traps.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 6851f9dbab..3241951805 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -230,6 +230,7 @@ static void compat_show_guest_stack(struct vcpu *v, int debug_stack_lines) { unsigned int i, *stack, addr, mask = STACK_SIZE; + void *stack_page = NULL; stack = (unsigned int *)(unsigned long)regs->esp; printk("Guest stack trace from esp=%08lx:\n ", (unsigned long)stack); @@ -252,7 +253,7 @@ static void compat_show_guest_stack(struct vcpu *v, break; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -279,11 +280,10 @@ static void compat_show_guest_stack(struct vcpu *v, printk(" %08x", addr); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); @@ -294,6 +294,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) int i; unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + void *stack_page = NULL; /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) @@ -322,7 +323,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -349,11 +350,10 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk(" %p", _p(addr)); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu May 07 13:00:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 13:00:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg93-0000zG-Gt; Thu, 07 May 2020 13:00:57 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg92-0000z5-6e for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:56 +0000 X-Inumbo-ID: c9a0279e-9062-11ea-9f13-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c9a0279e-9062-11ea-9f13-12813bfff9fa; Thu, 07 May 2020 13:00:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=N1eP6ECwlfzGk5vHcOC4cSvJagD546S7oDUywBzTtzo=; b=exl6Vhk9Dma0HZatky8ANbt70N /3rVTLG3XXU6R+jBEEINaoi/b7ZyJ2xPKB9DLmPQm1Zeh0SL1qZifggeNz+U9PJipakgPm2NZ6w5C eRVI6pVh00KHrkwOOD/GxjOC+x/ksI68bKb4xoyKvcZEtkaGWsY6Pf15hv5byceqgkSU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWg91-0006Yg-3K for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWg91-0006cU-2J for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 13:00:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] x86/ucode/intel: Writeback and invalidate caches before updating microcode Message-Id: Date: Thu, 07 May 2020 13:00:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c26841f0aad0af887a6b3658d71959c4946e480d Author: Ashok Raj AuthorDate: Thu May 7 14:58:16 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:58:16 2020 +0200 x86/ucode/intel: Writeback and invalidate caches before updating microcode Updating microcode is less error prone when caches have been flushed and depending on what exactly the microcode is updating. For example, some of the issues around certain Broadwell parts can be addressed by doing a full cache flush. Signed-off-by: Ashok Raj Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner [Linux commit 91df9fdf51492aec9fed6b4cbd33160886740f47, ported to Xen] Signed-off-by: Andrew Cooper Acked-by: Jan Beulich master commit: 77c82949990edaf21130be842a289a7fb7a439e1 master date: 2020-05-05 20:18:19 +0100 --- xen/arch/x86/microcode_intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index e511bd853c..f8e375a960 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -30,6 +30,7 @@ #include #include +#include #include #define pr_debug(x...) ((void)0) @@ -294,6 +295,8 @@ static int apply_microcode(unsigned int cpu) /* serialize access to the physical write to MSR 0x79 */ spin_lock_irqsave(µcode_update_lock, flags); + wbinvd(); + /* write microcode via MSR 0x79 */ wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)uci->mc.mc_intel->bits); wrmsrl(MSR_IA32_UCODE_REV, 0x0ULL); -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu May 07 18:11:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 07 May 2020 18:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWkzD-0003Gs-BE; Thu, 07 May 2020 18:11:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWkzC-0003Gn-1F for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 18:11:06 +0000 X-Inumbo-ID: 1d713de2-908e-11ea-9f57-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1d713de2-908e-11ea-9f57-12813bfff9fa; Thu, 07 May 2020 18:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=KbZTQsuHnme5S1mSGDTLrW9c3a8C87hXZcZhIVcbARM=; b=X9rp8cALWElnUu3q+PX6Ism1uU uXDMsLhFBNn03Vbu/lrUKWEEznksCYHa2zs05mFINmbUqj3ju0dy/mnjEDkpNBvIk5HiMMUDFxRtq KmkQVU2kkmsvWUFRIAy5vtaIKM7x42fE8cnGoCohCw/epDsMmQ47P4KwhQo0safV56D4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWkzA-0004Z6-2t for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 18:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWkzA-0004WL-1i for xen-changelog@lists.xenproject.org; Thu, 07 May 2020 18:11:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] sched: print information about scheduling granularity Message-Id: Date: Thu, 07 May 2020 18:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 35b819c45c4603fdb1d400925d6b2e6f8689a9d5 Author: Sergey Dyasli AuthorDate: Wed May 6 11:00:24 2020 +0100 Commit: Andrew Cooper CommitDate: Thu May 7 18:58:04 2020 +0100 sched: print information about scheduling granularity Currently it might be not obvious which scheduling mode (e.g. core- scheduling) is being used by the scheduler. Alleviate this by printing additional information about the selected granularity per-cpupool. Note: per-cpupool granularity selection is not implemented yet. Every cpupool gets its granularity from the single global value. Take this opportunity to introduce struct sched_gran_name array and refactor sched_select_granularity(). Signed-off-by: Sergey Dyasli Acked-by: Dario Faggioli --- xen/common/sched/cpupool.c | 51 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index d40345b585..97c2d5b3c1 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -40,19 +40,50 @@ static DEFINE_SPINLOCK(cpupool_lock); static enum sched_gran __read_mostly opt_sched_granularity = SCHED_GRAN_cpu; static unsigned int __read_mostly sched_granularity = 1; +struct sched_gran_name { + enum sched_gran mode; + char name[8]; +}; + +static const struct sched_gran_name sg_name[] = { + {SCHED_GRAN_cpu, "cpu"}, + {SCHED_GRAN_core, "core"}, + {SCHED_GRAN_socket, "socket"}, +}; + +static void sched_gran_print(enum sched_gran mode, unsigned int gran) +{ + const char *name = ""; + unsigned int i; + + for ( i = 0; i < ARRAY_SIZE(sg_name); i++ ) + { + if ( mode == sg_name[i].mode ) + { + name = sg_name[i].name; + break; + } + } + + printk("Scheduling granularity: %s, %u CPU%s per sched-resource\n", + name, gran, gran == 1 ? "" : "s"); +} + #ifdef CONFIG_HAS_SCHED_GRANULARITY static int __init sched_select_granularity(const char *str) { - if ( strcmp("cpu", str) == 0 ) - opt_sched_granularity = SCHED_GRAN_cpu; - else if ( strcmp("core", str) == 0 ) - opt_sched_granularity = SCHED_GRAN_core; - else if ( strcmp("socket", str) == 0 ) - opt_sched_granularity = SCHED_GRAN_socket; - else - return -EINVAL; + unsigned int i; - return 0; + for ( i = 0; i < ARRAY_SIZE(sg_name); i++ ) + { + if ( strcmp(sg_name[i].name, str) == 0 ) + { + opt_sched_granularity = sg_name[i].mode; + return 0; + } + } + + return -EINVAL; } custom_param("sched-gran", sched_select_granularity); #endif @@ -115,6 +146,7 @@ static void __init cpupool_gran_init(void) warning_add(fallback); sched_granularity = gran; + sched_gran_print(opt_sched_granularity, sched_granularity); } unsigned int cpupool_get_granularity(const struct cpupool *c) @@ -911,6 +943,7 @@ void dump_runq(unsigned char key) { printk("Cpupool %d:\n", (*c)->cpupool_id); printk("Cpus: %*pbl\n", CPUMASK_PR((*c)->cpu_valid)); + sched_gran_print((*c)->gran, cpupool_get_granularity(*c)); schedule_dump(*c); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 08 05:22:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 05:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSX-0006YJ-PU; Fri, 08 May 2020 05:22:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSV-0006YE-Ms for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:03 +0000 X-Inumbo-ID: d90d7fcc-90eb-11ea-9fc2-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d90d7fcc-90eb-11ea-9fc2-12813bfff9fa; Fri, 08 May 2020 05:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vn1SUSsNRfna+FQdK+gguLoTPmlnDOqu2yTkU+uUpiw=; b=q5/53nEEKYpQKwRhusMdN0taoU mifd2gw72WIFMPkQ8BfzMEltp8JXKtYxHrOUqGOI8tMZ3hY2/J9v6fIFg5fm+IBTmBoEO9l54azou nINb4YFW0Uts0UcZWtrd7vYAtgvjWxsLrOEzFLh68AaR99d21gH+rCjSGLvcoP6c66Ec=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSU-0007YO-0o for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWvST-0000y7-Vq for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/smpboot: Write the top-of-stack block in cpu_smpboot_alloc() Message-Id: Date: Fri, 08 May 2020 05:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 434596bbd44ad75c3f84396a2b2d283eeb9f0688 Author: Andrew Cooper AuthorDate: Fri Apr 24 14:38:02 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 5 20:18:19 2020 +0100 x86/smpboot: Write the top-of-stack block in cpu_smpboot_alloc() This allows the AP boot assembly use per-cpu variables, and brings the semantics closer to that of the BSP, which can use per-cpu variables from the start of day. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/smpboot.c | 7 ++++++- xen/include/asm-x86/current.h | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 5a3786d399..f999323bc4 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -329,7 +329,6 @@ void start_secondary(void *unused) /* Critical region without IDT or TSS. Any fault is deadly! */ - set_processor_id(cpu); set_current(idle_vcpu[cpu]); this_cpu(curr_vcpu) = idle_vcpu[cpu]; rdmsrl(MSR_EFER, this_cpu(efer)); @@ -986,6 +985,7 @@ static void cpu_smpboot_free(unsigned int cpu, bool remove) static int cpu_smpboot_alloc(unsigned int cpu) { + struct cpu_info *info; unsigned int i, memflags = 0; nodeid_t node = cpu_to_node(cpu); seg_desc_t *gdt; @@ -999,6 +999,11 @@ static int cpu_smpboot_alloc(unsigned int cpu) stack_base[cpu] = alloc_xenheap_pages(STACK_ORDER, memflags); if ( stack_base[cpu] == NULL ) goto out; + + info = get_cpu_info_from_stack((unsigned long)stack_base[cpu]); + info->processor_id = cpu; + info->per_cpu_offset = __per_cpu_offset[cpu]; + memguard_guard_stack(stack_base[cpu]); gdt = per_cpu(gdt, cpu) ?: alloc_xenheap_pages(0, memflags); diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 0b47485337..5b8f4dbc79 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -100,11 +100,6 @@ static inline struct cpu_info *get_cpu_info(void) #define current (get_current()) #define get_processor_id() (get_cpu_info()->processor_id) -#define set_processor_id(id) do { \ - struct cpu_info *ci__ = get_cpu_info(); \ - ci__->per_cpu_offset = __per_cpu_offset[ci__->processor_id = (id)]; \ -} while (0) - #define guest_cpu_user_regs() (&get_cpu_info()->guest_cpu_user_regs) /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 08 05:22:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 05:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSf-0006Yv-SZ; Fri, 08 May 2020 05:22:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSf-0006Yq-I3 for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:13 +0000 X-Inumbo-ID: df122cf6-90eb-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id df122cf6-90eb-11ea-b9cf-bc764e2007e4; Fri, 08 May 2020 05:22:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eMdRhmYMV13RHRBAZ1hy4WnS3DbvWeW8Ca6DKpaErQc=; b=RD8MeD7R4Ea9C5PiCySoPst6Wd EYUnsfCt/pjV1kS3mSOmGyftwTELU9cT3VAWvpoY7c2kEZAb7UTRyBaRQsWUiJQ7RqSOzhtwCOpHs zhSJIkqH1ydwCrgN/0j0R0Qq8XnOYK2tu0k75evKm6/dEoToueiT6LVHkOJ8ZPhF9bRc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSe-0007Ys-3m for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWvSe-0000z8-2U for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/ucode/intel: Writeback and invalidate caches before updating microcode Message-Id: Date: Fri, 08 May 2020 05:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 77c82949990edaf21130be842a289a7fb7a439e1 Author: Ashok Raj AuthorDate: Wed Feb 28 10:28:42 2018 +0000 Commit: Andrew Cooper CommitDate: Tue May 5 20:18:19 2020 +0100 x86/ucode/intel: Writeback and invalidate caches before updating microcode Updating microcode is less error prone when caches have been flushed and depending on what exactly the microcode is updating. For example, some of the issues around certain Broadwell parts can be addressed by doing a full cache flush. Signed-off-by: Ashok Raj Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner [Linux commit 91df9fdf51492aec9fed6b4cbd33160886740f47, ported to Xen] Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/cpu/microcode/intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/cpu/microcode/intel.c b/xen/arch/x86/cpu/microcode/intel.c index a9f4d6e829..d031196d4c 100644 --- a/xen/arch/x86/cpu/microcode/intel.c +++ b/xen/arch/x86/cpu/microcode/intel.c @@ -25,6 +25,7 @@ #include #include +#include #include "private.h" @@ -267,6 +268,8 @@ static int apply_microcode(const struct microcode_patch *patch) if ( microcode_update_match(patch) != NEW_UCODE ) return -EINVAL; + wbinvd(); + /* write microcode via MSR 0x79 */ wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)patch->data); wrmsrl(MSR_IA32_UCODE_REV, 0x0ULL); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 08 05:22:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 05:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSp-0006Zu-UB; Fri, 08 May 2020 05:22:23 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSp-0006Zf-0J for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:23 +0000 X-Inumbo-ID: e50edbb8-90eb-11ea-9fc2-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e50edbb8-90eb-11ea-9fc2-12813bfff9fa; Fri, 08 May 2020 05:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xMO8je2v93GHtjahb2FOijHP/5sEwfCr/nJy2eIR26k=; b=7A4rbZKwKnttfGSjrkfBc91rSA Kc+8jvxxPyZVBodoEQ9yHoSoYGCy8DNZxQEAbly2ch1WftV+6FMbDU4capFNNidhp7gdcpDm86wun 1TvoUJjtWTBvZoVbyRZgToqjrm0bEIGd5Ry/Hgo4lRk5HUUKtZq4egvTT6L2JcVNow30=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSo-0007Z7-6l for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWvSo-0000ze-5j for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/libxl: Plumb a restore boolean into libxl__domain_build_state Message-Id: Date: Fri, 08 May 2020 05:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 779efdbb502b38c66b774b124fa0ceed254875bd Author: Andrew Cooper AuthorDate: Fri Jan 24 17:52:52 2020 +0000 Commit: Andrew Cooper CommitDate: Tue May 5 20:18:19 2020 +0100 tools/libxl: Plumb a restore boolean into libxl__domain_build_state To fix CPUID handling, libxl__build_pre() is going to have to distinguish between a brand new VM vs one which is being migrated-in/resumed. Transcribe dcs->restore_fd into dbs->restore in initiate_domain_create() only (specifically avoiding the stubdom state in libxl__spawn_stub_dm()). While tweaking initiate_domain_create(), make a new dbs alias and simplify later code, and drop the local restore_fd alias as the new dbs->restore is more intuitive in context. No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 14 +++++++------- tools/libxl/libxl_internal.h | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index e7cb2dbc2b..5a043df15f 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1181,18 +1181,18 @@ static void initiate_domain_create(libxl__egc *egc, /* convenience aliases */ libxl_domain_config *const d_config = dcs->guest_config; - const int restore_fd = dcs->restore_fd; + libxl__domain_build_state *dbs = &dcs->build_state; libxl__xswait_init(&dcs->console_xswait); domid = dcs->domid; - libxl__domain_build_state_init(&dcs->build_state); + libxl__domain_build_state_init(dbs); + dbs->restore = dcs->restore_fd >= 0; ret = libxl__domain_config_setdefault(gc,d_config,domid); if (ret) goto error_out; - ret = libxl__domain_make(gc, d_config, &dcs->build_state, &domid, - dcs->soft_reset); + ret = libxl__domain_make(gc, d_config, dbs, &domid, dcs->soft_reset); if (ret) { LOGD(ERROR, domid, "cannot make domain: %d", ret); dcs->guest_domid = domid; @@ -1236,7 +1236,7 @@ static void initiate_domain_create(libxl__egc *egc, if (ret) goto error_out; - if (restore_fd >= 0 || dcs->soft_reset) { + if (dbs->restore || dcs->soft_reset) { LOGD(DEBUG, domid, "restoring, not running bootloader"); domcreate_bootloader_done(egc, &dcs->bl, 0); } else { @@ -1247,8 +1247,8 @@ static void initiate_domain_create(libxl__egc *egc, dcs->bl.disk = bootdisk; dcs->bl.domid = dcs->guest_domid; - dcs->bl.kernel = &dcs->build_state.pv_kernel; - dcs->bl.ramdisk = &dcs->build_state.pv_ramdisk; + dcs->bl.kernel = &dbs->pv_kernel; + dcs->bl.ramdisk = &dbs->pv_ramdisk; libxl__bootloader_run(egc, &dcs->bl); } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 5f39e44cb9..e5effd2ad1 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -1397,6 +1397,10 @@ typedef struct { /* ARM only to deal with broken firmware */ uint32_t clock_frequency; + + /* Whether this domain is being migrated/restored, or booting fresh. Only + * applicable to the primary domain, not support domains (e.g. stub QEMU). */ + bool restore; } libxl__domain_build_state; _hidden void libxl__domain_build_state_init(libxl__domain_build_state *s); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 08 05:22:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 05:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSz-0006b9-Vh; Fri, 08 May 2020 05:22:33 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSz-0006b1-HP for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:33 +0000 X-Inumbo-ID: eb1084f8-90eb-11ea-9fc2-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id eb1084f8-90eb-11ea-9fc2-12813bfff9fa; Fri, 08 May 2020 05:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=imrUQ0U9QQ0C8uAiuwru2OMvcuGomvKy6zTigcc6AAc=; b=TZNy/ahKjaNk6kYjPEi+RySXcB ufHdQUFlYqzU3psaJiDKeky1GhdvSkaXfkAR+nx7MY/EABbIMaN00tRRyU79nLGeuBGrjMKkph9ms 54AsdgGTvSbT7FCD+7/S+gWqbHQaxOIA+ulx9Puj1Cbh/NkBx21oi5fB8qPV2TMFWDjc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvSy-0007ZJ-9q for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWvSy-000114-8V for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/hyperv: stash and use the configured max VP index Message-Id: Date: Fri, 08 May 2020 05:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b58dc6dbfa3a038c5a22f06861a7652da80eca28 Author: Wei Liu AuthorDate: Wed Apr 29 11:41:44 2020 +0100 Commit: Wei Liu CommitDate: Wed May 6 10:40:42 2020 +0100 x86/hyperv: stash and use the configured max VP index The value returned from CPUID is the maximum number for virtual processors supported by Hyper-V. It could be larger than the maximum number of virtual processors configured. Stash the configured number into a variable and use it in calculations. Signed-off-by: Wei Liu Reviewed-by: Roger Pau Monné --- xen/arch/x86/guest/hyperv/hyperv.c | 4 ++++ xen/arch/x86/guest/hyperv/private.h | 1 + xen/arch/x86/guest/hyperv/tlb.c | 2 +- xen/arch/x86/guest/hyperv/util.c | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/guest/hyperv/hyperv.c b/xen/arch/x86/guest/hyperv/hyperv.c index 91a6782cd9..84221b7514 100644 --- a/xen/arch/x86/guest/hyperv/hyperv.c +++ b/xen/arch/x86/guest/hyperv/hyperv.c @@ -33,6 +33,7 @@ DEFINE_PER_CPU_READ_MOSTLY(void *, hv_input_page); DEFINE_PER_CPU_READ_MOSTLY(void *, hv_vp_assist); DEFINE_PER_CPU_READ_MOSTLY(unsigned int, hv_vp_index); +unsigned int __read_mostly hv_max_vp_index; static bool __read_mostly hcall_page_ready; static uint64_t generate_guest_id(void) @@ -143,6 +144,9 @@ static int setup_hypercall_pcpu_arg(void) rdmsrl(HV_X64_MSR_VP_INDEX, vp_index_msr); this_cpu(hv_vp_index) = vp_index_msr; + if ( vp_index_msr > hv_max_vp_index ) + hv_max_vp_index = vp_index_msr; + return 0; } diff --git a/xen/arch/x86/guest/hyperv/private.h b/xen/arch/x86/guest/hyperv/private.h index 354fc7f685..fea3e291e9 100644 --- a/xen/arch/x86/guest/hyperv/private.h +++ b/xen/arch/x86/guest/hyperv/private.h @@ -28,6 +28,7 @@ DECLARE_PER_CPU(void *, hv_input_page); DECLARE_PER_CPU(void *, hv_vp_assist); DECLARE_PER_CPU(unsigned int, hv_vp_index); +extern unsigned int hv_max_vp_index; static inline unsigned int hv_vp_index(unsigned int cpu) { diff --git a/xen/arch/x86/guest/hyperv/tlb.c b/xen/arch/x86/guest/hyperv/tlb.c index 1d723d6ee6..f249b25925 100644 --- a/xen/arch/x86/guest/hyperv/tlb.c +++ b/xen/arch/x86/guest/hyperv/tlb.c @@ -166,7 +166,7 @@ int hyperv_flush_tlb(const cpumask_t *mask, const void *va, { unsigned int vpid = hv_vp_index(cpu); - if ( vpid >= ms_hyperv.max_vp_index ) + if ( vpid > hv_max_vp_index ) { local_irq_restore(irq_flags); return -ENXIO; diff --git a/xen/arch/x86/guest/hyperv/util.c b/xen/arch/x86/guest/hyperv/util.c index bec61c2afd..2c5f421b7b 100644 --- a/xen/arch/x86/guest/hyperv/util.c +++ b/xen/arch/x86/guest/hyperv/util.c @@ -33,7 +33,7 @@ int cpumask_to_vpset(struct hv_vpset *vpset, { int nr = 1; unsigned int cpu, vcpu_bank, vcpu_offset; - unsigned int max_banks = ms_hyperv.max_vp_index / 64; + unsigned int max_banks = hv_max_vp_index / 64; /* Up to 64 banks can be represented by valid_bank_mask */ if ( max_banks > 64 ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 08 05:22:44 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 05:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvTA-0006c5-1G; Fri, 08 May 2020 05:22:44 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvT9-0006bx-3p for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:43 +0000 X-Inumbo-ID: f1151864-90eb-11ea-9fc2-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f1151864-90eb-11ea-9fc2-12813bfff9fa; Fri, 08 May 2020 05:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gn1lTT1hQbyUdxXphT+a50ZRkyIt+E3RRwle1AaBAY4=; b=FYUHi3BHHa+WzYqIANGqCepFaC Dnx9zTUZkZUfGrmr9f6mMQgkLOWIplVgvGicw55kZs5KBXPFuD0Oyw58S0uGOlDZkbUwIKclMm55d XMeD6jd1Oj7nFkOjsKonfLtRTEodz7hpTAcLVmG4gMVelLl2SRa3qN+c+ZG2r8Bq130s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvT8-0007ZX-Cz for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWvT8-00011t-Bi for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/libxc: add VM forking functions Message-Id: Date: Fri, 08 May 2020 05:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit caf745fdf839f09bf96db6a1bd99fafab47de471 Author: Tamas K Lengyel AuthorDate: Wed May 6 06:41:43 2020 -0700 Commit: Wei Liu CommitDate: Wed May 6 17:42:03 2020 +0100 tools/libxc: add VM forking functions Add functions to issue VM forking hypercalls Signed-off-by: Tamas K Lengyel Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 14 ++++++++++++++ tools/libxc/xc_memshr.c | 26 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 5f25c5a6d4..0a6ff93229 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -2232,6 +2232,20 @@ int xc_memshr_range_share(xc_interface *xch, uint64_t first_gfn, uint64_t last_gfn); +int xc_memshr_fork(xc_interface *xch, + uint32_t source_domain, + uint32_t client_domain, + bool allow_with_iommu); + +/* + * Note: this function is only intended to be used on short-lived forks that + * haven't yet aquired a lot of memory. In case the fork has a lot of memory + * it is likely more performant to create a new fork with xc_memshr_fork. + * + * With VMs that have a lot of memory this call may block for a long time. + */ +int xc_memshr_fork_reset(xc_interface *xch, uint32_t forked_domain); + /* Debug calls: return the number of pages referencing the shared frame backing * the input argument. Should be one or greater. * diff --git a/tools/libxc/xc_memshr.c b/tools/libxc/xc_memshr.c index 97e2e6a8d9..2300cc7075 100644 --- a/tools/libxc/xc_memshr.c +++ b/tools/libxc/xc_memshr.c @@ -239,6 +239,32 @@ int xc_memshr_debug_gref(xc_interface *xch, return xc_memshr_memop(xch, domid, &mso); } +int xc_memshr_fork(xc_interface *xch, uint32_t pdomid, uint32_t domid, + bool allow_with_iommu) +{ + xen_mem_sharing_op_t mso; + + memset(&mso, 0, sizeof(mso)); + + mso.op = XENMEM_sharing_op_fork; + mso.u.fork.parent_domain = pdomid; + + if ( allow_with_iommu ) + mso.u.fork.flags |= XENMEM_FORK_WITH_IOMMU_ALLOWED; + + return xc_memshr_memop(xch, domid, &mso); +} + +int xc_memshr_fork_reset(xc_interface *xch, uint32_t domid) +{ + xen_mem_sharing_op_t mso; + + memset(&mso, 0, sizeof(mso)); + mso.op = XENMEM_sharing_op_fork_reset; + + return xc_memshr_memop(xch, domid, &mso); +} + int xc_memshr_audit(xc_interface *xch) { xen_mem_sharing_op_t mso; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 08 05:22:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 05:22:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvTM-0006dY-32; Fri, 08 May 2020 05:22:56 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvTK-0006dR-Rt for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:54 +0000 X-Inumbo-ID: f71b8ebe-90eb-11ea-9fc2-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f71b8ebe-90eb-11ea-9fc2-12813bfff9fa; Fri, 08 May 2020 05:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uamKpobFzg7OQjgVap39Cb32hmh5bXfwWfwpCmuGH1A=; b=naAAodE2/rLTOO4iK8s6GDDaQs OOY7LO1S7QNq+f0d9B6WmE/qDH8ynIq82wxBrQxw5Qbv6t/4QoaP7FYdsAkk59mfkW05MT3dV45YK w9JfRH2x9O3wwfobgziRNqxxvJu/6OAO2EJC4OuGy8bwVujHShJm9LgPh0DiENlOfQ/E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWvTI-0007Zg-Fn for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWvTI-00012b-Ex for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 05:22:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS Message-Id: Date: Fri, 08 May 2020 05:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8a6b1665d987d043c12dc723d758a7d2ca765264 Author: Roger Pau Monne AuthorDate: Tue May 5 11:24:53 2020 +0200 Commit: Wei Liu CommitDate: Wed May 6 17:42:26 2020 +0100 configure: also add EXTRA_PREFIX to {CPP/LD}FLAGS The path provided by EXTRA_PREFIX should be added to the search path of the configure script, like it's done in Config.mk. Not doing so makes the search path for configure differ from the search path used by the build. Signed-off-by: Roger Pau Monné [ wei: run autogen.sh ] Acked-by: Wei Liu --- m4/set_cflags_ldflags.m4 | 4 ++++ tools/configure | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/m4/set_cflags_ldflags.m4 b/m4/set_cflags_ldflags.m4 index cbad3c10b0..08f5c983cc 100644 --- a/m4/set_cflags_ldflags.m4 +++ b/m4/set_cflags_ldflags.m4 @@ -15,6 +15,10 @@ for ldflag in $APPEND_LIB do APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done +if [ ! -z $EXTRA_PREFIX ]; then + CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include" + LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib" +fi CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"]) diff --git a/tools/configure b/tools/configure index 375430df3f..36596389b8 100755 --- a/tools/configure +++ b/tools/configure @@ -4678,6 +4678,10 @@ for ldflag in $APPEND_LIB do APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag" done +if ! -z $EXTRA_PREFIX ; then + CPPFLAGS="$CPPFLAGS -I$EXTRA_PREFIX/include" + LDFLAGS="$LDFLAGS -L$EXTRA_PREFIX/lib" +fi CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS" LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS" -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 08 08:55:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 08:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWymh-0000px-GL; Fri, 08 May 2020 08:55:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWymg-0000ps-2U for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 08:55:06 +0000 X-Inumbo-ID: 9c7019da-9109-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9c7019da-9109-11ea-ae69-bc764e2007e4; Fri, 08 May 2020 08:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=IMhTXqcJGO3D5Pzekz/lfdk77mKZhYNv8Yv9tCKoCoI=; b=l1akW1Z0BJ92fLO82T1yxpkGnJ 6LoZs3FlRIj7b5bAys3X9A4sUbZdxObiRoXLOLQlItl+VyVvcfoWnmjxA8KgmxKSiXRQonx1kKPV3 f3c362lQJWQzAmjo2S0x7DZs2v9UxmbG3m19KpAiQ603N6J4oQyeLJl1tsxjknJ53Yp4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWymf-0003hG-7z for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 08:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWymf-0008IZ-5c for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 08:55:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] cpupool: fix removing cpu from a cpupool Message-Id: Date: Fri, 08 May 2020 08:55:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 498d73647fa17d9eb7a67d2e9bdccac6b438e559 Author: Juergen Gross AuthorDate: Fri May 8 10:44:22 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 8 10:44:22 2020 +0200 cpupool: fix removing cpu from a cpupool Commit cb563d7665f2 ("xen/sched: support core scheduling for moving cpus to/from cpupools") introduced a regression when trying to remove an offline cpu from a cpupool, as the system would crash in this situation. Fix that by testing the cpu to be online. Fixes: cb563d7665f2 ("xen/sched: support core scheduling for moving cpus to/from cpupools") Signed-off-by: Juergen Gross Acked-by: Dario Faggioli --- xen/common/sched/cpupool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 97c2d5b3c1..0664f7fa3d 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -552,6 +552,9 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) debugtrace_printk("cpupool_unassign_cpu(pool=%d,cpu=%d)\n", c->cpupool_id, cpu); + if ( !cpu_online(cpu) ) + return -EINVAL; + master_cpu = sched_get_resource_cpu(cpu); ret = cpupool_unassign_cpu_start(c, master_cpu); if ( ret ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 08 08:55:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 08:55:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWymr-0000r5-IB; Fri, 08 May 2020 08:55:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWymr-0000r0-6J for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 08:55:17 +0000 X-Inumbo-ID: a27ce646-9109-11ea-9fce-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a27ce646-9109-11ea-9fce-12813bfff9fa; Fri, 08 May 2020 08:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RyT/VYOCejIuMAUSQrGAV/jhIQfEBkv5Q8ayLPCkRBs=; b=So9qHrZnGVwUXGKAUZj8qeqV5S PjNuM+Q0WZ+fpxYcBv1Tu5Fd3Dm8DoSQRrQQcgDKjHJGJ6KU4B6uyW2z0mCaj7723CruS5oSeKSiD O0aIC1o6gkwF4kgpvjBI/F4e4rJNJ0i8ccqqcej97KomG7Y8DN4Bth8c4V6We7k2RvK0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jWymp-0003hM-DI for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 08:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jWymp-0008JB-9q for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 08:55:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] sched: always modify vcpu pause flags atomically Message-Id: Date: Fri, 08 May 2020 08:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e0d92d9bd7997c6bcda17a19aba4f3957dd1a2e9 Author: Juergen Gross AuthorDate: Fri May 8 10:47:38 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 8 10:47:38 2020 +0200 sched: always modify vcpu pause flags atomically credit2 is currently modifying the pause flags of vcpus non-atomically via sched_set_pause_flags() and sched_clear_pause_flags(). This is dangerous as there are cases where the paus flags are modified without any lock held. So drop the non-atomic pause flag modification functions and rename the atomic ones dropping the _atomic suffix. Fixes: a76255b4266516 ("xen/sched: make credit2 scheduler vcpu agnostic.") Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli --- xen/common/sched/credit.c | 4 ++-- xen/common/sched/private.h | 22 +--------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index 93d89da278..d0aa017c64 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -453,7 +453,7 @@ static inline void __runq_tickle(const struct csched_unit *new) SCHED_UNIT_STAT_CRANK(cur, kicked_away); SCHED_UNIT_STAT_CRANK(cur, migrate_r); SCHED_STAT_CRANK(migrate_kicked_away); - sched_set_pause_flags_atomic(cur->unit, _VPF_migrating); + sched_set_pause_flags(cur->unit, _VPF_migrating); } /* Tickle cpu anyway, to let new preempt cur. */ SCHED_STAT_CRANK(tickled_busy_cpu); @@ -973,7 +973,7 @@ csched_unit_acct(struct csched_private *prv, unsigned int cpu) { SCHED_UNIT_STAT_CRANK(svc, migrate_r); SCHED_STAT_CRANK(migrate_running); - sched_set_pause_flags_atomic(currunit, _VPF_migrating); + sched_set_pause_flags(currunit, _VPF_migrating); /* * As we are about to tickle cpu, we should clear its bit in * idlers. But, if we are here, it means there is someone running diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index 367811a12f..b9a5b4c01c 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -172,7 +172,7 @@ static inline void sched_set_pause_flags(struct sched_unit *unit, struct vcpu *v; for_each_sched_unit_vcpu ( unit, v ) - __set_bit(bit, &v->pause_flags); + set_bit(bit, &v->pause_flags); } /* Clear a bit in pause_flags of all vcpus of a unit. */ @@ -182,26 +182,6 @@ static inline void sched_clear_pause_flags(struct sched_unit *unit, struct vcpu *v; for_each_sched_unit_vcpu ( unit, v ) - __clear_bit(bit, &v->pause_flags); -} - -/* Set a bit in pause_flags of all vcpus of a unit via atomic updates. */ -static inline void sched_set_pause_flags_atomic(struct sched_unit *unit, - unsigned int bit) -{ - struct vcpu *v; - - for_each_sched_unit_vcpu ( unit, v ) - set_bit(bit, &v->pause_flags); -} - -/* Clear a bit in pause_flags of all vcpus of a unit via atomic updates. */ -static inline void sched_clear_pause_flags_atomic(struct sched_unit *unit, - unsigned int bit) -{ - struct vcpu *v; - - for_each_sched_unit_vcpu ( unit, v ) clear_bit(bit, &v->pause_flags); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:44:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 11:44:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QC-0006KQ-Fw; Fri, 08 May 2020 11:44:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QB-0006KL-LT for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:03 +0000 X-Inumbo-ID: 3657d1d4-9121-11ea-9fe1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3657d1d4-9121-11ea-9fe1-12813bfff9fa; Fri, 08 May 2020 11:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=cK3FOT6iRa21dfOb+Ys2IEeQ6smVJohLuGBfSC6qJjY=; b=mhgTcDidJb5ew3o1UxAu2g3PXp xw2gCxD9xMG3QIHrpTry5qAJ0h4eAGsZiZPnDWPpDfeh2Lcj6N1QAP77rxwG0HQNCiHVy+VT9ZQhy a9zG+Kay9rx69qisOkg2GiBfFPSK50M0q2Wk9RfMZBV6rbjc+cV2w484E4IU4SBSDKCA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Q9-0006sC-TN for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX1Q9-0002Su-Rc for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] xen/grants: fix hypercall continuation for GNTTABOP_cache_flush Message-Id: Date: Fri, 08 May 2020 11:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8b6d4e234b51e24bd35ffbd0448380d49347473e Author: Juergen Gross AuthorDate: Thu May 7 14:45:17 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:45:17 2020 +0200 xen/grants: fix hypercall continuation for GNTTABOP_cache_flush The GNTTABOP_cache_flush hypercall has a wrong test for hypercall continuation, the test today is: if ( rc > 0 || opaque_out != 0 ) Unfortunately this will be true even in case of an error (rc < 0), possibly leading to very long lasting hypercalls (times of more than an hour have been observed in a test case). Correct the test condition to result in false with rc < 0 and set opaque_out only if no error occurred, to be on the safe side. Partially-suggested-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Reviewed-by: Stefano Stabellini master commit: 46d8f69d466a05863737fb81d8c9ef39c3be8b45 master date: 2020-04-29 14:12:50 +0100 --- xen/common/grant_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 917e63d370..41fd89f5d9 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3633,12 +3633,12 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(cflush, count)) ) goto out; rc = gnttab_cache_flush(cflush, &opaque_in, count); - if ( rc > 0 ) + if ( rc >= 0 ) { guest_handle_add_offset(cflush, rc); uop = guest_handle_cast(cflush, void); + opaque_out = opaque_in; } - opaque_out = opaque_in; break; } @@ -3648,7 +3648,7 @@ do_grant_table_op( } out: - if ( rc > 0 || opaque_out != 0 ) + if ( rc > 0 || (opaque_out != 0 && rc == 0) ) { /* Adjust rc, see gnttab_copy() for why this is needed. */ if ( cmd == GNTTABOP_copy ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:44:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 11:44:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QM-0006LW-Hp; Fri, 08 May 2020 11:44:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QK-0006Ky-Sl for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:12 +0000 X-Inumbo-ID: 3c5b8314-9121-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3c5b8314-9121-11ea-9887-bc764e2007e4; Fri, 08 May 2020 11:44:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Vz/Q9mmuwmPsZLY/+czxJTTd6/1MkJnPZLh13UQJ8ss=; b=I/Mv6kKDEYYKvlM8U4ULRqBLtm H+1ameu55YvQbMxxGUux3wi05U2QmwmmR7AWdm8Zks6uDgRDBhW4/jJGXc8Nzbl8849CN3Mkgluv3 ik89YdlQgDRhbwMNGis44Bz78Y72ULFoQcs/7DxVr8gvgl0RyaLJsHyTJjTtClJXCxB0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QK-0006sX-0A for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX1QJ-0002TV-VD for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:11 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] x86/pass-through: avoid double IRQ unbind during domain cleanup Message-Id: Date: Fri, 08 May 2020 11:44:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6a1036e28240217d1dbfcb096800313a468cdb0e Author: Jan Beulich AuthorDate: Thu May 7 14:46:24 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:46:24 2020 +0200 x86/pass-through: avoid double IRQ unbind during domain cleanup XEN_DOMCTL_destroydomain creates a continuation if domain_kill -ERESTARTs. In that scenario, it is possible to receive multiple _pirq_guest_unbind calls for the same pirq from domain_kill, if the pirq has not yet been removed from the domain's pirq_tree, as: domain_kill() -> domain_relinquish_resources() -> pci_release_devices() -> pci_clean_dpci_irq() -> pirq_guest_unbind() -> __pirq_guest_unbind() Avoid recurring invocations of pirq_guest_unbind() by removing the pIRQ from the tree being iterated after the first call there. In case such a removed entry still has a softirq outstanding, record it and re-check upon re-invocation. Note that pirq_cleanup_check() gets relaxed beyond what's strictly needed here, to avoid introducing an asymmetry there between HVM and PV guests. Reported-by: Varad Gautam Signed-off-by: Jan Beulich Tested-by: Varad Gautam Reviewed-by: Paul Durrant Reviewed-by: Roger Pau Monné master commit: 5b58dad089880127674d460494d1a9d68109b3d7 master date: 2020-04-30 10:40:59 +0200 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 21 +++++++++++++++++++-- xen/include/asm-x86/hvm/irq.h | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 5d0d94c66c..ed32318659 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1504,7 +1504,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG(); + BUG_ON(!d->is_dying); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index cbd232c131..1efd8d0eeb 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -872,7 +872,14 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; + radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); + + if ( !pt_pirq_softirq_active(pirq_dpci) ) + return 0; + + domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; + + return -ERESTART; } static int pci_clean_dpci_irqs(struct domain *d) @@ -889,8 +896,18 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + int ret = 0; + if ( hvm_irq_dpci->pending_pirq_dpci ) + { + if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) + ret = -ERESTART; + else + hvm_irq_dpci->pending_pirq_dpci = NULL; + } + + if ( !ret ) + ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 5b7e90c179..d306cfeade 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -158,6 +158,8 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; + /* Clean up: Entry with a softirq invocation pending / in progress. */ + struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:44:23 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 11:44:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QV-0006Ma-JY; Fri, 08 May 2020 11:44:23 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QU-0006MU-GR for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:22 +0000 X-Inumbo-ID: 425d941e-9121-11ea-9fe1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 425d941e-9121-11ea-9fe1-12813bfff9fa; Fri, 08 May 2020 11:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=VL/xkn0OFi3NPmYGv1bvjd1Eb8itbV+v2U3JM2PaoUo=; b=Hg1XQiCWc1zVDw1h80jpUKpuL5 i6HoZy6+806Ab7sNHN+56ZEOT68ZJA9XTiSi/qtX8mUnCV79BvPiJHDJG67IDtPEvRx9vFWHgFWSv +SRmildR4DFi7rYS0ZwffE8+Vd0FycBtTmhmDMD9Galdps251mxITrHjZEGBRz4BvofA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1QU-0006tC-2f for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX1QU-0002UJ-1j for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] x86/CPUID: correct error indicator for max extended leaf Message-Id: Date: Fri, 08 May 2020 11:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 70ed2d5f0d51d3bea012170bbf70553463862073 Author: Jan Beulich AuthorDate: Thu May 7 14:47:47 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:47:47 2020 +0200 x86/CPUID: correct error indicator for max extended leaf With the max base leaf using 0, this one should be using the extended leaf counterpart thereof, rather than some arbitrary extended leaf. Fixes: 588a966a572e ("libx86: Introduce x86_cpu_policies_are_compatible()") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 0135be8bd8cd60090298f02310691b688d95c3a8 master date: 2020-04-30 10:45:09 +0200 --- tools/tests/cpu-policy/test-cpu-policy.c | 2 +- xen/lib/x86/policy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/cpu-policy/test-cpu-policy.c b/tools/tests/cpu-policy/test-cpu-policy.c index 20ebed923b..fe8cdf6ea9 100644 --- a/tools/tests/cpu-policy/test-cpu-policy.c +++ b/tools/tests/cpu-policy/test-cpu-policy.c @@ -570,7 +570,7 @@ static void test_is_compatible_failure(void) { .name = "Host extd.max_leaf out of range", .guest_cpuid.extd.max_leaf = 1, - .e = { 0x80000008, -1, -1 }, + .e = { 0x80000000, -1, -1 }, }, { .name = "Host no CPUID faulting, Guest wanted", diff --git a/xen/lib/x86/policy.c b/xen/lib/x86/policy.c index b156a304f4..4beca8767a 100644 --- a/xen/lib/x86/policy.c +++ b/xen/lib/x86/policy.c @@ -19,7 +19,7 @@ int x86_cpu_policies_are_compatible(const struct cpu_policy *host, FAIL_CPUID(0, NA); if ( guest->cpuid->extd.max_leaf > host->cpuid->extd.max_leaf ) - FAIL_CPUID(0x80000008, NA); + FAIL_CPUID(0x80000000, NA); /* TODO: Audit more CPUID data. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:44:33 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 11:44:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qf-0006Ne-LC; Fri, 08 May 2020 11:44:33 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qe-0006NX-KZ for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:32 +0000 X-Inumbo-ID: 4860960e-9121-11ea-9fe1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4860960e-9121-11ea-9fe1-12813bfff9fa; Fri, 08 May 2020 11:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=qCNT7CkOukLR2ZvAt/roMS73hIUJ8Kl+I/KsDGwKXqY=; b=w9WtQ5y0Xh57DfemulrF/GYAD4 T1onpLFVJUNU/lY1URqC5pve2AAMCPVN/XNP9wUB2VbPFs/QB03dHg5rQ8u3N5UpNen+P66oZOjRu DRxqgo1itCdm9xgxQ7LPqRizvW6RWpJ+i7ijajAvf/1UHe/eOwohlCq+ZOJXl/gN4O1U=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qe-0006tZ-5z for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX1Qe-0002VD-4m for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] x86emul: extend x86_insn_is_mem_write() coverage Message-Id: Date: Fri, 08 May 2020 11:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 71a9ffa4332eee20efdaff71efcb1de32500e0d0 Author: Jan Beulich AuthorDate: Thu May 7 14:48:44 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:48:44 2020 +0200 x86emul: extend x86_insn_is_mem_write() coverage Several insns were missed when this function was first added. As far as insns already supported by the emulator go - SMSW and {,V}STMXCSR were wrongly considered r/o insns so far. Insns like the VMX, SVM, or CET-SS ones, PTWRITE, or AMD's new SNP ones are intentionally not covered just yet. VMPTRST is put there just to complete the respective group. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: fc6fa977be54a24a1325e3f2d08b1b1dcb675f44 master date: 2020-05-05 09:50:54 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 777cac2b29..0a3ef4a9fe 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -11431,13 +11431,39 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, break; case X86EMUL_OPC(0x0f, 0x01): - return !(state->modrm_reg & 6); /* SGDT / SIDT */ + switch ( state->modrm_reg & 7 ) + { + case 0: /* SGDT */ + case 1: /* SIDT */ + case 4: /* SMSW */ + return true; + } + break; + + case X86EMUL_OPC(0x0f, 0xae): + switch ( state->modrm_reg & 7 ) + { + case 0: /* FXSAVE */ + case 3: /* {,V}STMXCSR */ + case 4: /* XSAVE */ + case 6: /* XSAVEOPT */ + return true; + } + break; case X86EMUL_OPC(0x0f, 0xba): return (state->modrm_reg & 7) > 4; /* BTS / BTR / BTC */ case X86EMUL_OPC(0x0f, 0xc7): - return (state->modrm_reg & 7) == 1; /* CMPXCHG{8,16}B */ + switch ( state->modrm_reg & 7 ) + { + case 1: /* CMPXCHG{8,16}B */ + case 4: /* XSAVEC */ + case 5: /* XSAVES */ + case 7: /* VMPTRST */ + return true; + } + break; } return false; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:44:43 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 11:44:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qp-0006Om-N8; Fri, 08 May 2020 11:44:43 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qo-0006Oe-Ng for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:42 +0000 X-Inumbo-ID: 4e677cac-9121-11ea-9fe1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4e677cac-9121-11ea-9fe1-12813bfff9fa; Fri, 08 May 2020 11:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5Z60UyL46p9xTb6c8XYIpSW0XC/VCPsn1hLKd5Zgzhg=; b=ON3pW6YMDUVVIzZkQQRA3gf9KS 8KzUsBl0G97TeGZ3BDs2nW4FO80Lt7+kgmqbKQ5/4jH1nFJdUlM0nFlw/fVnJnJ2uUAk6xCyjpxIM Xi92pUMzzAsgKTnnEgR8WINv+u4PJygZS+EFmxAGNmymiNrGSNs6qf8RO3MTG8xc0ny8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qo-0006ti-8U for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX1Qo-0002Vm-7Y for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] x86/hvm: simplify hvm_physdev_op allowance control Message-Id: Date: Fri, 08 May 2020 11:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 905de40c3031ae7ba47b4a659626b62d900aab1f Author: Roger Pau Monné AuthorDate: Thu May 7 14:49:42 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:49:42 2020 +0200 x86/hvm: simplify hvm_physdev_op allowance control PVHv1 dom0 was given access to all PHYSDEVOP hypercalls, and such restriction was not removed when PVHv1 code was removed. As a result the switch in hvm_physdev_op was more complicated than required, and relied on PVHv2 dom0 not having PIRQ support in order to prevent access to some PV specific PHYSDEVOPs. Fix this by moving the default case to the bottom of the switch, since there's no need for any fall through now. Also remove the hardware domain check, as all the not explicitly listed PHYSDEVOPs are forbidden for HVM domains. Finally tighten the condition to allow usage of PHYSDEVOP_pci_mmcfg_reserved: apart from having vPCI enabled it should only be used by the hardware domain. Note that the code in do_physdev_op is already restricting the call to privileged domains only, but it can be further restricted to the hardware domain only, as other privileged domains don't have access to MMCFG regions anyway. Overall no functional change should arise from this change. Reported-by: Julien Grall Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: a00e3737e085ebc1f313e36b188d4958e939e531 master date: 2020-05-05 09:52:28 +0200 --- xen/arch/x86/hvm/hypercall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 0d24550dcc..cacc3a57fc 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -77,26 +77,26 @@ static long hvm_grant_table_op( static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { const struct vcpu *curr = current; + const struct domain *currd = curr->domain; switch ( cmd ) { - default: - if ( !is_hardware_domain(curr->domain) ) - return -ENOSYS; - /* fall through */ case PHYSDEVOP_map_pirq: case PHYSDEVOP_unmap_pirq: case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: - if ( !has_pirq(curr->domain) ) + if ( !has_pirq(currd) ) return -ENOSYS; break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(curr->domain) ) + if ( !has_vpci(currd) || !is_hardware_domain(currd) ) return -ENOSYS; break; + + default: + return -ENOSYS; } if ( !curr->hcall_compat ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:44:53 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 11:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qz-0006Po-Om; Fri, 08 May 2020 11:44:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qy-0006Pe-SK for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:52 +0000 X-Inumbo-ID: 546c722e-9121-11ea-9fe1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 546c722e-9121-11ea-9fe1-12813bfff9fa; Fri, 08 May 2020 11:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1m+uRd2WVHXjcWz0nVYHuyU+JzJ6zGBHiu69PZXpn0w=; b=5rijlUEqA5nmYd5VzGNm3tdzj6 S1VbSbTaGJOe3BW+ir2GjDl+HdwIVEQOV3LozRV2vy5dt+TjOF+dP8/rVzxFABXbp/YP1jIiuqRsP 5BrdQ7BsKYYoTFoJEPAgZ6cV4vYF9RKoElvVoQWk8Dgm8P3QVLZwauXyEzZ1sWbgCCOI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1Qy-0006tr-Co for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX1Qy-0002We-B3 for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:44:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] x86/traps: fix an off-by-one error Message-Id: Date: Fri, 08 May 2020 11:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 68a843a7b089565f27a9a460bfa5bdb9175d88c8 Author: Hongyan Xia AuthorDate: Thu May 7 14:50:23 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:50:23 2020 +0200 x86/traps: fix an off-by-one error stack++ can go into the next page and unmap_domain_page() will unmap the wrong one, causing mapcache and memory corruption. Fix. Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich master commit: 2e3d87cc734a895ef5b486926274a178836b67a9 master date: 2020-05-05 16:13:44 +0100 --- xen/arch/x86/traps.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 8705ec8315..54aca36714 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -232,6 +232,7 @@ static void compat_show_guest_stack(struct vcpu *v, int debug_stack_lines) { unsigned int i, *stack, addr, mask = STACK_SIZE; + void *stack_page = NULL; stack = (unsigned int *)(unsigned long)regs->esp; printk("Guest stack trace from esp=%08lx:\n ", (unsigned long)stack); @@ -254,7 +255,7 @@ static void compat_show_guest_stack(struct vcpu *v, break; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -281,11 +282,10 @@ static void compat_show_guest_stack(struct vcpu *v, printk(" %08x", addr); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); @@ -296,6 +296,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) int i; unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + void *stack_page = NULL; /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) @@ -324,7 +325,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -351,11 +352,10 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk(" %p", _p(addr)); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 08 11:45:04 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 11:45:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1RA-0006R8-Rc; Fri, 08 May 2020 11:45:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1R9-0006Qz-3W for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:45:03 +0000 X-Inumbo-ID: 5a766bac-9121-11ea-9fe1-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5a766bac-9121-11ea-9fe1-12813bfff9fa; Fri, 08 May 2020 11:45:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ck23TLIclONjfbhHt+6dm4OizQWIFW3JU+iq6IRT6po=; b=vcHZ17Cy2jsxiTn2DZWiZkkqIQ 7Z//Y1SMVfjv3aeOab7EiBDm7VMnSsrCg44TU8cwG/XFcUp7q0h3j3DTOBX0M7bQ7b7tPZRYvfiB5 zjJktQkwbqoACuRjAk8eJrHxDe48OJSRhLUVk7CrYasZH18g7WvR7DebE7Y+2Qi2TLI4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX1R8-0006uQ-Gy for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:45:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX1R8-0002XX-En for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 11:45:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] x86/ucode/intel: Writeback and invalidate caches before updating microcode Message-Id: Date: Fri, 08 May 2020 11:45:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9649b83b2ab4707de79da42307f8757e317bf217 Author: Ashok Raj AuthorDate: Thu May 7 14:51:20 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:51:20 2020 +0200 x86/ucode/intel: Writeback and invalidate caches before updating microcode Updating microcode is less error prone when caches have been flushed and depending on what exactly the microcode is updating. For example, some of the issues around certain Broadwell parts can be addressed by doing a full cache flush. Signed-off-by: Ashok Raj Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner [Linux commit 91df9fdf51492aec9fed6b4cbd33160886740f47, ported to Xen] Signed-off-by: Andrew Cooper Acked-by: Jan Beulich master commit: 77c82949990edaf21130be842a289a7fb7a439e1 master date: 2020-05-05 20:18:19 +0100 --- xen/arch/x86/microcode_intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index e37c46a836..42fbd19551 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -30,6 +30,7 @@ #include #include +#include #include #define pr_debug(x...) ((void)0) @@ -300,6 +301,8 @@ static int apply_microcode(const struct microcode_patch *patch) BUG_ON(local_irq_is_enabled()); + wbinvd(); + /* write microcode via MSR 0x79 */ wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)mc_intel->bits); wrmsrl(MSR_IA32_UCODE_REV, 0x0ULL); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 08 15:44:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 15:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5AT-00041R-Uu; Fri, 08 May 2020 15:44:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5AR-00041K-W6 for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:04 +0000 X-Inumbo-ID: bda9835b-9142-11ea-a026-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bda9835b-9142-11ea-a026-12813bfff9fa; Fri, 08 May 2020 15:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=n7zROHZ4XKJhlhMczCF59uf1pnkzFB8dy7BOWjQz5R4=; b=lDop+hu7NnLY3Z1sKKNWA3x946 Q8TeOYOYRxoBD+7Qu5DeiyPrYXaw6UhVIHHNStJg3KCRtwJVL7RL/I9bGxcRDM9bmDfofMaR1/mGv FAbFFR4KyLkOiwOQPrxARnv+dVKCfKghWV8D8Qw9Mq4E1ODz7xddkbsRf1naTbw5Jck0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5AQ-00037z-8Z for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX5AQ-00026Z-7B for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] xen/grants: fix hypercall continuation for GNTTABOP_cache_flush Message-Id: Date: Fri, 08 May 2020 15:44:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9756cbede6772a2c4b225fef4875be65ef75e1f7 Author: Juergen Gross AuthorDate: Thu May 7 14:53:13 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:53:13 2020 +0200 xen/grants: fix hypercall continuation for GNTTABOP_cache_flush The GNTTABOP_cache_flush hypercall has a wrong test for hypercall continuation, the test today is: if ( rc > 0 || opaque_out != 0 ) Unfortunately this will be true even in case of an error (rc < 0), possibly leading to very long lasting hypercalls (times of more than an hour have been observed in a test case). Correct the test condition to result in false with rc < 0 and set opaque_out only if no error occurred, to be on the safe side. Partially-suggested-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Reviewed-by: Stefano Stabellini master commit: 46d8f69d466a05863737fb81d8c9ef39c3be8b45 master date: 2020-04-29 14:12:50 +0100 --- xen/common/grant_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 38d5524a0e..1adb173e06 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3571,12 +3571,12 @@ do_grant_table_op( if ( unlikely(!guest_handle_okay(cflush, count)) ) goto out; rc = gnttab_cache_flush(cflush, &opaque_in, count); - if ( rc > 0 ) + if ( rc >= 0 ) { guest_handle_add_offset(cflush, rc); uop = guest_handle_cast(cflush, void); + opaque_out = opaque_in; } - opaque_out = opaque_in; break; } @@ -3586,7 +3586,7 @@ do_grant_table_op( } out: - if ( rc > 0 || opaque_out != 0 ) + if ( rc > 0 || (opaque_out != 0 && rc == 0) ) { /* Adjust rc, see gnttab_copy() for why this is needed. */ if ( cmd == GNTTABOP_copy ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Fri May 08 15:44:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 15:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Ad-00041x-0L; Fri, 08 May 2020 15:44:15 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Ab-00041p-Rg for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:13 +0000 X-Inumbo-ID: c32f2209-9142-11ea-a026-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c32f2209-9142-11ea-a026-12813bfff9fa; Fri, 08 May 2020 15:44:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=n7dZ3zfHq4+xXhoGPc5Xwx72lzK2VGAjg9gjkEdC6vk=; b=RllFj0qs3dUnoeRqcbb4iv70qf GgxuutSeVXubpXOFV/uQOkivkeddjNAMWLsRe03EWtY3/H0QlV9kSjxnd32pK3dJ4MLBBRWa1ZrQB hpqSuUCoeseA85igzYFShMBUjnVokLta/r3qK981D1QOg+8tw8QA8G4SLa2FOlt/flV8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Aa-000385-Bi for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX5Aa-000278-AZ for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] x86/pass-through: avoid double IRQ unbind during domain cleanup Message-Id: Date: Fri, 08 May 2020 15:44:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0d1c383c8f37667f82bd503fba920ff8b33e32c5 Author: Jan Beulich AuthorDate: Thu May 7 14:54:39 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:54:39 2020 +0200 x86/pass-through: avoid double IRQ unbind during domain cleanup XEN_DOMCTL_destroydomain creates a continuation if domain_kill -ERESTARTs. In that scenario, it is possible to receive multiple _pirq_guest_unbind calls for the same pirq from domain_kill, if the pirq has not yet been removed from the domain's pirq_tree, as: domain_kill() -> domain_relinquish_resources() -> pci_release_devices() -> pci_clean_dpci_irq() -> pirq_guest_unbind() -> __pirq_guest_unbind() Avoid recurring invocations of pirq_guest_unbind() by removing the pIRQ from the tree being iterated after the first call there. In case such a removed entry still has a softirq outstanding, record it and re-check upon re-invocation. Note that pirq_cleanup_check() gets relaxed beyond what's strictly needed here, to avoid introducing an asymmetry there between HVM and PV guests. Reported-by: Varad Gautam Signed-off-by: Jan Beulich Tested-by: Varad Gautam Reviewed-by: Paul Durrant Reviewed-by: Roger Pau Monné master commit: 5b58dad089880127674d460494d1a9d68109b3d7 master date: 2020-04-30 10:40:59 +0200 --- xen/arch/x86/irq.c | 2 +- xen/drivers/passthrough/pci.c | 21 +++++++++++++++++++-- xen/include/asm-x86/hvm/irq.h | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 8ed030c151..ade659c3c2 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -1407,7 +1407,7 @@ void (pirq_cleanup_check)(struct pirq *pirq, struct domain *d) } if ( radix_tree_delete(&d->pirq_tree, pirq->pirq) != pirq ) - BUG(); + BUG_ON(!d->is_dying); } /* Flush all ready EOIs from the top of this CPU's pending-EOI stack. */ diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index 41e5f7f63e..f079238b78 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -877,7 +877,14 @@ static int pci_clean_dpci_irq(struct domain *d, xfree(digl); } - return pt_pirq_softirq_active(pirq_dpci) ? -ERESTART : 0; + radix_tree_delete(&d->pirq_tree, dpci_pirq(pirq_dpci)->pirq); + + if ( !pt_pirq_softirq_active(pirq_dpci) ) + return 0; + + domain_get_irq_dpci(d)->pending_pirq_dpci = pirq_dpci; + + return -ERESTART; } static int pci_clean_dpci_irqs(struct domain *d) @@ -894,8 +901,18 @@ static int pci_clean_dpci_irqs(struct domain *d) hvm_irq_dpci = domain_get_irq_dpci(d); if ( hvm_irq_dpci != NULL ) { - int ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); + int ret = 0; + if ( hvm_irq_dpci->pending_pirq_dpci ) + { + if ( pt_pirq_softirq_active(hvm_irq_dpci->pending_pirq_dpci) ) + ret = -ERESTART; + else + hvm_irq_dpci->pending_pirq_dpci = NULL; + } + + if ( !ret ) + ret = pt_pirq_iterate(d, pci_clean_dpci_irq, NULL); if ( ret ) { spin_unlock(&d->event_lock); diff --git a/xen/include/asm-x86/hvm/irq.h b/xen/include/asm-x86/hvm/irq.h index 5b7e90c179..d306cfeade 100644 --- a/xen/include/asm-x86/hvm/irq.h +++ b/xen/include/asm-x86/hvm/irq.h @@ -158,6 +158,8 @@ struct hvm_irq_dpci { DECLARE_BITMAP(isairq_map, NR_ISAIRQS); /* Record of mapped Links */ uint8_t link_cnt[NR_LINK]; + /* Clean up: Entry with a softirq invocation pending / in progress. */ + struct hvm_pirq_dpci *pending_pirq_dpci; }; /* Machine IRQ to guest device/intx mapping. */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Fri May 08 15:44:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 15:44:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5An-00043g-29; Fri, 08 May 2020 15:44:25 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Al-00043Q-3j for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:23 +0000 X-Inumbo-ID: c9a68ae0-9142-11ea-a026-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c9a68ae0-9142-11ea-a026-12813bfff9fa; Fri, 08 May 2020 15:44:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=z4HMd6y7VNAFBlg3qrl+9fYr9SBhhjd2eRvDsVuAnmg=; b=6bkJ3B5Ale7B5uv0XWekM7+lHa 0Q7NTvxJ+jMDoTLVmntGopbQVcYlVYWPOKQiGDtYJWEoakML7rGTF7AT1bZK1hElZqYQzPUJZYHHL kcZtVdZ4FKR39dOQ+xE6ootg5t0zpf+MAVPgqosx4grJafNnUcJj+naZAIpozrTVkAB8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Ak-00038M-Ey for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX5Ak-00027i-Dq for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] x86emul: extend x86_insn_is_mem_write() coverage Message-Id: Date: Fri, 08 May 2020 15:44:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c85cb312b9fd02df9f5c605c7753373de1256bf7 Author: Jan Beulich AuthorDate: Thu May 7 14:56:03 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:56:03 2020 +0200 x86emul: extend x86_insn_is_mem_write() coverage Several insns were missed when this function was first added. As far as insns already supported by the emulator go - SMSW and {,V}STMXCSR were wrongly considered r/o insns so far. Insns like the VMX, SVM, or CET-SS ones, PTWRITE, or AMD's new SNP ones are intentionally not covered just yet. VMPTRST is put there just to complete the respective group. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper master commit: fc6fa977be54a24a1325e3f2d08b1b1dcb675f44 master date: 2020-05-05 09:50:54 +0200 --- xen/arch/x86/x86_emulate/x86_emulate.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 225931f5ac..facd88d2b8 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -10097,13 +10097,39 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, break; case X86EMUL_OPC(0x0f, 0x01): - return !(state->modrm_reg & 6); /* SGDT / SIDT */ + switch ( state->modrm_reg & 7 ) + { + case 0: /* SGDT */ + case 1: /* SIDT */ + case 4: /* SMSW */ + return true; + } + break; + + case X86EMUL_OPC(0x0f, 0xae): + switch ( state->modrm_reg & 7 ) + { + case 0: /* FXSAVE */ + case 3: /* {,V}STMXCSR */ + case 4: /* XSAVE */ + case 6: /* XSAVEOPT */ + return true; + } + break; case X86EMUL_OPC(0x0f, 0xba): return (state->modrm_reg & 7) > 4; /* BTS / BTR / BTC */ case X86EMUL_OPC(0x0f, 0xc7): - return (state->modrm_reg & 7) == 1; /* CMPXCHG{8,16}B */ + switch ( state->modrm_reg & 7 ) + { + case 1: /* CMPXCHG{8,16}B */ + case 4: /* XSAVEC */ + case 5: /* XSAVES */ + case 7: /* VMPTRST */ + return true; + } + break; } return false; -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Fri May 08 15:44:35 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 15:44:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Ax-00044q-3j; Fri, 08 May 2020 15:44:35 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Av-00044i-KC for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:33 +0000 X-Inumbo-ID: cfadbb2a-9142-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cfadbb2a-9142-11ea-ae69-bc764e2007e4; Fri, 08 May 2020 15:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Js+YXOZLsWk19XfolMbaVr3im3lvoZ9CK7ACXPpEuEY=; b=6wQOmFX1/dBnMt6b030RbfrFTK mm9cqKpq+dKozz9aVD0LUUFvxMwFCJAhwmpuIrbumkVkgk6CK7kcOLJRkIvGQReDEgsRVlMIc7Nmx EasyZiq5ZrGFGnuILvX5f4A/h6MhAUPn+216uk0N9HYHGZrdpmHSOB0Y3UsLz9MqzShU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5Au-000397-Hp for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX5Au-00028P-Ga for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] x86/hvm: simplify hvm_physdev_op allowance control Message-Id: Date: Fri, 08 May 2020 15:44:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d461833db80825829dcac7ecc50b9eb485937c0b Author: Roger Pau Monné AuthorDate: Thu May 7 14:56:56 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:56:56 2020 +0200 x86/hvm: simplify hvm_physdev_op allowance control PVHv1 dom0 was given access to all PHYSDEVOP hypercalls, and such restriction was not removed when PVHv1 code was removed. As a result the switch in hvm_physdev_op was more complicated than required, and relied on PVHv2 dom0 not having PIRQ support in order to prevent access to some PV specific PHYSDEVOPs. Fix this by moving the default case to the bottom of the switch, since there's no need for any fall through now. Also remove the hardware domain check, as all the not explicitly listed PHYSDEVOPs are forbidden for HVM domains. Finally tighten the condition to allow usage of PHYSDEVOP_pci_mmcfg_reserved: apart from having vPCI enabled it should only be used by the hardware domain. Note that the code in do_physdev_op is already restricting the call to privileged domains only, but it can be further restricted to the hardware domain only, as other privileged domains don't have access to MMCFG regions anyway. Overall no functional change should arise from this change. Reported-by: Julien Grall Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper master commit: a00e3737e085ebc1f313e36b188d4958e939e531 master date: 2020-05-05 09:52:28 +0200 --- xen/arch/x86/hvm/hypercall.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index 7fcfc92b39..d66c8c3a6e 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -75,26 +75,26 @@ static long hvm_grant_table_op( static long hvm_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) { const struct vcpu *curr = current; + const struct domain *currd = curr->domain; switch ( cmd ) { - default: - if ( !is_hardware_domain(curr->domain) ) - return -ENOSYS; - /* fall through */ case PHYSDEVOP_map_pirq: case PHYSDEVOP_unmap_pirq: case PHYSDEVOP_eoi: case PHYSDEVOP_irq_status_query: case PHYSDEVOP_get_free_pirq: - if ( !has_pirq(curr->domain) ) + if ( !has_pirq(currd) ) return -ENOSYS; break; case PHYSDEVOP_pci_mmcfg_reserved: - if ( !has_vpci(curr->domain) ) + if ( !has_vpci(currd) || !is_hardware_domain(currd) ) return -ENOSYS; break; + + default: + return -ENOSYS; } if ( !curr->hcall_compat ) -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Fri May 08 15:44:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 15:44:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5B7-00045l-5Y; Fri, 08 May 2020 15:44:45 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5B5-00045d-9I for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:43 +0000 X-Inumbo-ID: d5af8530-9142-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d5af8530-9142-11ea-b9cf-bc764e2007e4; Fri, 08 May 2020 15:44:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fSboNmufngMUuOtWk36O8/W5ysIYcGslqiyy59SX0RQ=; b=QdXBGqO4L1bhhb47GUGIDIDicD 8rO8HkzVIX/L5ze5rOOkmUHFQjOZQOWwj0U2JxhcHdE61QVow3q1CNIyXGQvmlWqIn2itdlw66Ivs NDPG9NBYxUH8GF0DDI2W1kzSd/G+nXohPXj8sn/l7qR45AH5mD7Jd5yYG0RnKsVqkobA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5B4-00039G-KY for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX5B4-000292-JV for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] x86/traps: fix an off-by-one error Message-Id: Date: Fri, 08 May 2020 15:44:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2291b9795e69f4ec34c6a997d66a50a9fa014775 Author: Hongyan Xia AuthorDate: Thu May 7 14:57:35 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:57:35 2020 +0200 x86/traps: fix an off-by-one error stack++ can go into the next page and unmap_domain_page() will unmap the wrong one, causing mapcache and memory corruption. Fix. Signed-off-by: Hongyan Xia Reviewed-by: Jan Beulich master commit: 2e3d87cc734a895ef5b486926274a178836b67a9 master date: 2020-05-05 16:13:44 +0100 --- xen/arch/x86/traps.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 6851f9dbab..3241951805 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -230,6 +230,7 @@ static void compat_show_guest_stack(struct vcpu *v, int debug_stack_lines) { unsigned int i, *stack, addr, mask = STACK_SIZE; + void *stack_page = NULL; stack = (unsigned int *)(unsigned long)regs->esp; printk("Guest stack trace from esp=%08lx:\n ", (unsigned long)stack); @@ -252,7 +253,7 @@ static void compat_show_guest_stack(struct vcpu *v, break; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -279,11 +280,10 @@ static void compat_show_guest_stack(struct vcpu *v, printk(" %08x", addr); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); @@ -294,6 +294,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) int i; unsigned long *stack, addr; unsigned long mask = STACK_SIZE; + void *stack_page = NULL; /* Avoid HVM as we don't know what the stack looks like. */ if ( is_hvm_vcpu(v) ) @@ -322,7 +323,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) vcpu = maddr_get_owner(read_cr3()) == v->domain ? v : NULL; if ( !vcpu ) { - stack = do_page_walk(v, (unsigned long)stack); + stack_page = stack = do_page_walk(v, (unsigned long)stack); if ( (unsigned long)stack < PAGE_SIZE ) { printk("Inaccessible guest memory.\n"); @@ -349,11 +350,10 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) printk(" %p", _p(addr)); stack++; } - if ( mask == PAGE_SIZE ) - { - BUILD_BUG_ON(PAGE_SIZE == STACK_SIZE); - unmap_domain_page(stack); - } + + if ( stack_page ) + unmap_domain_page(stack_page); + if ( i == 0 ) printk("Stack empty."); printk("\n"); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Fri May 08 15:44:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 08 May 2020 15:44:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5BG-00046l-78; Fri, 08 May 2020 15:44:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5BF-00046e-Ai for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:53 +0000 X-Inumbo-ID: dbb00036-9142-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id dbb00036-9142-11ea-ae69-bc764e2007e4; Fri, 08 May 2020 15:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=088FKfzCcItVTdasHdWIdSBXp2n4XJXnREpzNPdAPUc=; b=QokCxYCTyvfmtHHK2MJuPJrBoH CBHZmR3vw3obMZvvh5YFtuwoReEJgNEFhuGTDiGMUwTUeFYkIHBjM+ElWyctKbnOEc375uaARugpq vedHbleaT/NOzWL5vTuu1x03y6LisWgDHEOdLQTCyjiuS6mrbHVEIhz4R3UVfgbZs128=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jX5BE-00039P-NJ for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jX5BE-00029f-M8 for xen-changelog@lists.xenproject.org; Fri, 08 May 2020 15:44:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] x86/ucode/intel: Writeback and invalidate caches before updating microcode Message-Id: Date: Fri, 08 May 2020 15:44:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c26841f0aad0af887a6b3658d71959c4946e480d Author: Ashok Raj AuthorDate: Thu May 7 14:58:16 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 14:58:16 2020 +0200 x86/ucode/intel: Writeback and invalidate caches before updating microcode Updating microcode is less error prone when caches have been flushed and depending on what exactly the microcode is updating. For example, some of the issues around certain Broadwell parts can be addressed by doing a full cache flush. Signed-off-by: Ashok Raj Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner [Linux commit 91df9fdf51492aec9fed6b4cbd33160886740f47, ported to Xen] Signed-off-by: Andrew Cooper Acked-by: Jan Beulich master commit: 77c82949990edaf21130be842a289a7fb7a439e1 master date: 2020-05-05 20:18:19 +0100 --- xen/arch/x86/microcode_intel.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c index e511bd853c..f8e375a960 100644 --- a/xen/arch/x86/microcode_intel.c +++ b/xen/arch/x86/microcode_intel.c @@ -30,6 +30,7 @@ #include #include +#include #include #define pr_debug(x...) ((void)0) @@ -294,6 +295,8 @@ static int apply_microcode(unsigned int cpu) /* serialize access to the physical write to MSR 0x79 */ spin_lock_irqsave(µcode_update_lock, flags); + wbinvd(); + /* write microcode via MSR 0x79 */ wrmsrl(MSR_IA32_UCODE_WRITE, (unsigned long)uci->mc.mc_intel->bits); wrmsrl(MSR_IA32_UCODE_REV, 0x0ULL); -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Sun May 10 01:22:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 01:22:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafP-0000WX-Ka; Sun, 10 May 2020 01:22:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafO-0000WR-94 for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:06 +0000 X-Inumbo-ID: a651f3c1-925c-11ea-a14d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a651f3c1-925c-11ea-a14d-12813bfff9fa; Sun, 10 May 2020 01:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q05Lxs5J+l0PH3qFaCdocOIJC/AwVqt/zoC37bzrNEw=; b=2Mt72laSjvleh53O4p7IBYN/ly UTZ6h6gPHpRAQuqZIjZXjLANqGjmVb0rxY8U/moEbBFhMwdsYl3GpUyxJPp1V3dDuIUVy2GC7w13s +FbPjsNTQ8U10dtRxj8yJppIcs4eAsfx7+rmYhXaOKnvKAkD6h7L1WkaXKRDvWVfleZI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafK-0006dy-08 for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXafJ-0002p7-VC for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: adjustments to guest handle treatment Message-Id: Date: Sun, 10 May 2020 01:22:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dd5520f9df05b84116ad57f16fff45323042cc63 Author: Jan Beulich AuthorDate: Thu May 7 13:15:13 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 13:15:13 2020 +0200 x86: adjustments to guest handle treatment First of all avoid excessive conversions. copy_{from,to}_guest(), for example, work fine with all of XEN_GUEST_HANDLE{,_64,_PARAM}(). Further - do_physdev_op_compat() didn't use the param form for its parameter, - {hap,shadow}_track_dirty_vram() wrongly used the param form, - compat processor Px logic failed to check compatibility of native and compat structures not further converted. As this eliminates all users of guest_handle_from_param() and as there's no real need to allow for conversions in both directions, drop the macros as well. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Julien Grall --- xen/arch/x86/compat.c | 2 +- xen/arch/x86/cpu/microcode/core.c | 2 +- xen/arch/x86/mm.c | 16 +++++----------- xen/arch/x86/mm/hap/hap.c | 2 +- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/oprofile/backtrace.c | 5 +---- xen/arch/x86/platform_hypercall.c | 8 ++------ xen/arch/x86/x86_64/compat.c | 1 + xen/arch/x86/x86_64/cpu_idle.c | 8 ++------ xen/arch/x86/x86_64/cpufreq.c | 8 +++----- xen/drivers/acpi/pmstat.c | 2 +- xen/include/asm-arm/guest_access.h | 14 +------------- xen/include/asm-x86/guest_access.h | 12 +----------- xen/include/asm-x86/hap.h | 2 +- xen/include/asm-x86/microcode.h | 2 +- xen/include/asm-x86/shadow.h | 2 +- xen/include/xen/acpi.h | 4 ++-- 17 files changed, 26 insertions(+), 66 deletions(-) diff --git a/xen/arch/x86/compat.c b/xen/arch/x86/compat.c index a40ec295ae..58b202f701 100644 --- a/xen/arch/x86/compat.c +++ b/xen/arch/x86/compat.c @@ -15,7 +15,7 @@ typedef long ret_t; #endif /* Legacy hypercall (as of 0x00030202). */ -ret_t do_physdev_op_compat(XEN_GUEST_HANDLE(physdev_op_t) uop) +ret_t do_physdev_op_compat(XEN_GUEST_HANDLE_PARAM(physdev_op_t) uop) { typeof(do_physdev_op) *fn = (void *)pv_hypercall_table[__HYPERVISOR_physdev_op].native; diff --git a/xen/arch/x86/cpu/microcode/core.c b/xen/arch/x86/cpu/microcode/core.c index a220f908b8..d879d28787 100644 --- a/xen/arch/x86/cpu/microcode/core.c +++ b/xen/arch/x86/cpu/microcode/core.c @@ -678,7 +678,7 @@ static long microcode_update_helper(void *data) return ret; } -int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void) buf, unsigned long len) +int microcode_update(XEN_GUEST_HANDLE(const_void) buf, unsigned long len) { int ret; struct ucode_buf *buffer; diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 355c50ff91..f2d8190b5e 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4441,20 +4441,16 @@ static int _handle_iomem_range(unsigned long s, unsigned long e, { if ( s > ctxt->s && !(s >> (paddr_bits - PAGE_SHIFT)) ) { - e820entry_t ent; - XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer_param; - XEN_GUEST_HANDLE(e820entry_t) buffer; - if ( !guest_handle_is_null(ctxt->map.buffer) ) { + e820entry_t ent; + if ( ctxt->n + 1 >= ctxt->map.nr_entries ) return -EINVAL; ent.addr = (uint64_t)ctxt->s << PAGE_SHIFT; ent.size = (uint64_t)(s - ctxt->s) << PAGE_SHIFT; ent.type = E820_RESERVED; - buffer_param = guest_handle_cast(ctxt->map.buffer, e820entry_t); - buffer = guest_handle_from_param(buffer_param, e820entry_t); - if ( __copy_to_guest_offset(buffer, ctxt->n, &ent, 1) ) + if ( __copy_to_guest_offset(ctxt->map.buffer, ctxt->n, &ent, 1) ) return -EFAULT; } ctxt->n++; @@ -4715,8 +4711,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) case XENMEM_machine_memory_map: { struct memory_map_context ctxt; - XEN_GUEST_HANDLE(e820entry_t) buffer; - XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer_param; + XEN_GUEST_HANDLE_PARAM(e820entry_t) buffer; unsigned int i; bool store; @@ -4732,8 +4727,7 @@ long arch_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) if ( store && ctxt.map.nr_entries < e820.nr_map + 1 ) return -EINVAL; - buffer_param = guest_handle_cast(ctxt.map.buffer, e820entry_t); - buffer = guest_handle_from_param(buffer_param, e820entry_t); + buffer = guest_handle_cast(ctxt.map.buffer, e820entry_t); if ( store && !guest_handle_okay(buffer, ctxt.map.nr_entries) ) return -EFAULT; diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c index 0275cdf5c8..7f84d0c6ea 100644 --- a/xen/arch/x86/mm/hap/hap.c +++ b/xen/arch/x86/mm/hap/hap.c @@ -59,7 +59,7 @@ int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) guest_dirty_bitmap) + XEN_GUEST_HANDLE(void) guest_dirty_bitmap) { long rc = 0; struct sh_dirty_vram *dirty_vram; diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 7ed8e7b71b..0ac3f880e1 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -3171,7 +3171,7 @@ static void sh_clean_dirty_bitmap(struct domain *d) int shadow_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) guest_dirty_bitmap) + XEN_GUEST_HANDLE(void) guest_dirty_bitmap) { int rc = 0; unsigned long end_pfn = begin_pfn + nr; diff --git a/xen/arch/x86/oprofile/backtrace.c b/xen/arch/x86/oprofile/backtrace.c index 316821fd34..8233d87caa 100644 --- a/xen/arch/x86/oprofile/backtrace.c +++ b/xen/arch/x86/oprofile/backtrace.c @@ -74,11 +74,8 @@ dump_guest_backtrace(struct vcpu *vcpu, const struct frame_head *head, } else { - XEN_GUEST_HANDLE(const_frame_head_t) guest_head; - XEN_GUEST_HANDLE_PARAM(const_frame_head_t) guest_head_param = + XEN_GUEST_HANDLE_PARAM(const_frame_head_t) guest_head = const_guest_handle_from_ptr(head, frame_head_t); - guest_head = guest_handle_from_param(guest_head_param, - const_frame_head_t); /* Also check accessibility of one struct frame_head beyond */ if (!guest_handle_okay(guest_head, 2)) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index ee2efdd875..23fadbc782 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -285,9 +285,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op) guest_from_compat_handle(data, op->u.microcode.data); - ret = microcode_update( - guest_handle_to_param(data, const_void), - op->u.microcode.length); + ret = microcode_update(data, op->u.microcode.length); } break; @@ -531,9 +529,7 @@ ret_t do_platform_op(XEN_GUEST_HANDLE_PARAM(xen_platform_op_t) u_xenpf_op) XEN_GUEST_HANDLE(uint32) pdc; guest_from_compat_handle(pdc, op->u.set_pminfo.u.pdc); - ret = acpi_set_pdc_bits( - op->u.set_pminfo.id, - guest_handle_to_param(pdc, uint32)); + ret = acpi_set_pdc_bits(op->u.set_pminfo.id, pdc); } break; diff --git a/xen/arch/x86/x86_64/compat.c b/xen/arch/x86/x86_64/compat.c index 179d0c637a..0e4c71f2aa 100644 --- a/xen/arch/x86/x86_64/compat.c +++ b/xen/arch/x86/x86_64/compat.c @@ -15,6 +15,7 @@ EMIT_FILE; #define COMPAT #define _XEN_GUEST_HANDLE(t) XEN_GUEST_HANDLE(t) +#define _XEN_GUEST_HANDLE_PARAM(t) XEN_GUEST_HANDLE_PARAM(t) typedef int ret_t; #include "../compat.c" diff --git a/xen/arch/x86/x86_64/cpu_idle.c b/xen/arch/x86/x86_64/cpu_idle.c index f991fd900a..e2195d57be 100644 --- a/xen/arch/x86/x86_64/cpu_idle.c +++ b/xen/arch/x86/x86_64/cpu_idle.c @@ -52,13 +52,9 @@ static int copy_from_compat_state(xen_processor_cx_t *xen_state, compat_processor_cx_t *state) { #define XLAT_processor_cx_HNDL_dp(_d_, _s_) do { \ - XEN_GUEST_HANDLE(compat_processor_csd_t) dps; \ - XEN_GUEST_HANDLE_PARAM(xen_processor_csd_t) dps_param; \ if ( unlikely(!compat_handle_okay((_s_)->dp, (_s_)->dpcnt)) ) \ - return -EFAULT; \ - guest_from_compat_handle(dps, (_s_)->dp); \ - dps_param = guest_handle_cast(dps, xen_processor_csd_t); \ - (_d_)->dp = guest_handle_from_param(dps_param, xen_processor_csd_t); \ + return -EFAULT; \ + guest_from_compat_handle((_d_)->dp, (_s_)->dp); \ } while (0) XLAT_processor_cx(xen_state, state); #undef XLAT_processor_cx_HNDL_dp diff --git a/xen/arch/x86/x86_64/cpufreq.c b/xen/arch/x86/x86_64/cpufreq.c index e018b5e198..9e1e2050da 100644 --- a/xen/arch/x86/x86_64/cpufreq.c +++ b/xen/arch/x86/x86_64/cpufreq.c @@ -26,6 +26,8 @@ #include #include +CHECK_processor_px; + DEFINE_XEN_GUEST_HANDLE(compat_processor_px_t); int @@ -42,13 +44,9 @@ compat_set_px_pminfo(uint32_t cpu, struct compat_processor_performance *perf) return -EFAULT; #define XLAT_processor_performance_HNDL_states(_d_, _s_) do { \ - XEN_GUEST_HANDLE(compat_processor_px_t) states; \ - XEN_GUEST_HANDLE_PARAM(xen_processor_px_t) states_t; \ if ( unlikely(!compat_handle_okay((_s_)->states, (_s_)->state_count)) ) \ return -EFAULT; \ - guest_from_compat_handle(states, (_s_)->states); \ - states_t = guest_handle_cast(states, xen_processor_px_t); \ - (_d_)->states = guest_handle_from_param(states_t, xen_processor_px_t); \ + guest_from_compat_handle((_d_)->states, (_s_)->states); \ } while (0) XLAT_processor_performance(xen_perf, perf); diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c index 426447e1a7..2f528f9ca3 100644 --- a/xen/drivers/acpi/pmstat.c +++ b/xen/drivers/acpi/pmstat.c @@ -492,7 +492,7 @@ int do_pm_op(struct xen_sysctl_pm_op *op) return ret; } -int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE_PARAM(uint32) pdc) +int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32) pdc) { u32 bits[3]; int ret; diff --git a/xen/include/asm-arm/guest_access.h b/xen/include/asm-arm/guest_access.h index 64d01951a9..31b9f03f00 100644 --- a/xen/include/asm-arm/guest_access.h +++ b/xen/include/asm-arm/guest_access.h @@ -40,7 +40,7 @@ int access_guest_memory_by_ipa(struct domain *d, paddr_t ipa, void *buf, (XEN_GUEST_HANDLE_PARAM(type)) { _x }; \ }) -/* Cast a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ +/* Convert a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ #define guest_handle_to_param(hnd, type) ({ \ typeof((hnd).p) _x = (hnd).p; \ XEN_GUEST_HANDLE_PARAM(type) _y = { _x }; \ @@ -51,18 +51,6 @@ int access_guest_memory_by_ipa(struct domain *d, paddr_t ipa, void *buf, _y; \ }) - -/* Cast a XEN_GUEST_HANDLE_PARAM to XEN_GUEST_HANDLE */ -#define guest_handle_from_param(hnd, type) ({ \ - typeof((hnd).p) _x = (hnd).p; \ - XEN_GUEST_HANDLE(type) _y = { _x }; \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)(&_x == &_y.p); \ - _y; \ -}) - #define guest_handle_for_field(hnd, type, fld) \ ((XEN_GUEST_HANDLE(type)) { &(hnd).p->fld }) diff --git a/xen/include/asm-x86/guest_access.h b/xen/include/asm-x86/guest_access.h index 064527895f..2be3577bd3 100644 --- a/xen/include/asm-x86/guest_access.h +++ b/xen/include/asm-x86/guest_access.h @@ -52,7 +52,7 @@ (XEN_GUEST_HANDLE_PARAM(type)) { _x }; \ }) -/* Cast a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ +/* Convert a XEN_GUEST_HANDLE to XEN_GUEST_HANDLE_PARAM */ #define guest_handle_to_param(hnd, type) ({ \ /* type checking: make sure that the pointers inside \ * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ @@ -62,16 +62,6 @@ (hnd); \ }) -/* Cast a XEN_GUEST_HANDLE_PARAM to XEN_GUEST_HANDLE */ -#define guest_handle_from_param(hnd, type) ({ \ - /* type checking: make sure that the pointers inside \ - * XEN_GUEST_HANDLE and XEN_GUEST_HANDLE_PARAM are of \ - * the same type, then return hnd */ \ - (void)((typeof(&(hnd).p)) 0 == \ - (typeof(&((XEN_GUEST_HANDLE_PARAM(type)) {}).p)) 0); \ - (hnd); \ -}) - #define guest_handle_for_field(hnd, type, fld) \ ((XEN_GUEST_HANDLE(type)) { &(hnd).p->fld }) diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h index 1bf07e49fe..faf856913a 100644 --- a/xen/include/asm-x86/hap.h +++ b/xen/include/asm-x86/hap.h @@ -41,7 +41,7 @@ void hap_vcpu_init(struct vcpu *v); int hap_track_dirty_vram(struct domain *d, unsigned long begin_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) dirty_bitmap); + XEN_GUEST_HANDLE(void) dirty_bitmap); extern const struct paging_mode *hap_paging_get_mode(struct vcpu *); int hap_set_allocation(struct domain *d, unsigned int pages, bool *preempted); diff --git a/xen/include/asm-x86/microcode.h b/xen/include/asm-x86/microcode.h index cbbe28cb45..9da63f992e 100644 --- a/xen/include/asm-x86/microcode.h +++ b/xen/include/asm-x86/microcode.h @@ -20,7 +20,7 @@ struct cpu_signature { DECLARE_PER_CPU(struct cpu_signature, cpu_sig); void microcode_set_module(unsigned int idx); -int microcode_update(XEN_GUEST_HANDLE_PARAM(const_void), unsigned long len); +int microcode_update(XEN_GUEST_HANDLE(const_void), unsigned long len); int early_microcode_init(void); int microcode_update_one(bool start_update); diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h index 8335862c87..224d1bc2f9 100644 --- a/xen/include/asm-x86/shadow.h +++ b/xen/include/asm-x86/shadow.h @@ -65,7 +65,7 @@ int shadow_enable(struct domain *d, u32 mode); int shadow_track_dirty_vram(struct domain *d, unsigned long first_pfn, unsigned long nr, - XEN_GUEST_HANDLE_PARAM(void) dirty_bitmap); + XEN_GUEST_HANDLE(void) dirty_bitmap); /* Handler for shadow control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index 5cfa06005b..c945ab05c8 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -184,8 +184,8 @@ static inline unsigned int acpi_get_csubstate_limit(void) { return 0; } static inline void acpi_set_csubstate_limit(unsigned int new_limit) { return; } #endif -#ifdef XEN_GUEST_HANDLE_PARAM -int acpi_set_pdc_bits(u32 acpi_id, XEN_GUEST_HANDLE_PARAM(uint32)); +#ifdef XEN_GUEST_HANDLE +int acpi_set_pdc_bits(uint32_t acpi_id, XEN_GUEST_HANDLE(uint32)); #endif int arch_acpi_set_pdc_bits(u32 acpi_id, u32 *, u32 mask); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 10 01:22:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 01:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafV-0000Xk-MB; Sun, 10 May 2020 01:22:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafU-0000Xc-Lc for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:12 +0000 X-Inumbo-ID: acc896e6-925c-11ea-a14d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id acc896e6-925c-11ea-a14d-12813bfff9fa; Sun, 10 May 2020 01:22:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=789DtWgytnOqKtgoSHAFObxt1/AVvG/0ThEgTy4RfXQ=; b=luVyQdsd35oS36i8FipHEX6H3/ BQCJ/3B67zyytgvRWnCxho/zJL1mJgH6Zq2rIcwDhPf8OiKzmTbR8SmNS33e4f0+LwU47kvG2bW6/ eonAb+1BLcG668fNXs7HNVzW8TsoJ5XBTqV+rvVDuc8A0VZ4bkDiKWVXcjf/YQEV5x9E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafU-0006e3-2y for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXafU-0002pl-1u for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] Arm: fix build with CONFIG_DTB_FILE set Message-Id: Date: Sun, 10 May 2020 01:22:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 40675b4b874cb9fee0d4f0e12bb3e153ee1c135a Author: Jan Beulich AuthorDate: Thu May 7 13:18:24 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 7 13:18:24 2020 +0200 Arm: fix build with CONFIG_DTB_FILE set Recent changes no longer allow modification of AFLAGS. The needed conversion was apparently missed in 2740d96efdd3 ("xen/build: have the root Makefile generates the CFLAGS"). Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index b79ad55646..c1a1b5e803 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -68,7 +68,7 @@ extra-y += $(TARGET_SUBARCH)/head.o ifdef CONFIG_DTB_FILE obj-y += dtb.o -AFLAGS += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\" +AFLAGS-y += -DCONFIG_DTB_FILE=\"$(CONFIG_DTB_FILE)\" endif ALL_OBJS := $(TARGET_SUBARCH)/head.o $(ALL_OBJS) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 10 01:22:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 01:22:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafg-0000Yz-Nv; Sun, 10 May 2020 01:22:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXaff-0000Yn-5m for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:23 +0000 X-Inumbo-ID: b2ca37fc-925c-11ea-a14d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b2ca37fc-925c-11ea-a14d-12813bfff9fa; Sun, 10 May 2020 01:22:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=A0EysHE6ixzNg3r3DTiqvpEVFWBrqKIflapWPCmZEjo=; b=ltgjL+7E+XxYktBUCamsiG8Xm7 texYtZZj2QwbfM7MTwQoqdv7mD7UG9ADvlPUJb2kHes3WxCjxNTtg1N3kWHVfi/pxCPVS2telx/uH UJ6lJlGrtwwROUNsXl/dfWxptQ1FXmGxdSn+kRER/PRSlEt2A0L8YCs00bonj7IiSfwo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafe-0006eI-5w for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXafe-0002qR-4s for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/svm: Clean up vmcbcleanbits_t handling Message-Id: Date: Sun, 10 May 2020 01:22:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 06e6f3176804b7eabfd028ec3777a69668fad36a Author: Andrew Cooper AuthorDate: Tue Apr 21 18:18:08 2020 +0100 Commit: Andrew Cooper CommitDate: Thu May 7 13:50:38 2020 +0100 x86/svm: Clean up vmcbcleanbits_t handling Rework the vmcbcleanbits_t definitons to use bool, drop 'fields' from the namespace, position the comments in an unambiguous position, and include the bit position. In svm_vmexit_handler(), don't bother conditionally writing ~0 or 0 based on hardware support. The field was entirely unused and ignored on older hardware (and we're already setting reserved cleanbits anyway). In nsvm_vmcb_prepare4vmrun(), simplify the logic massively by dropping the vcleanbit_set() macro using a vmcbcleanbits_t local variable which only gets filled in the case that clean bits were valid previously. Fix up the style on impacted lines. No practical change in behaviour. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/nestedsvm.c | 45 +++++++++++++++++++------------------- xen/arch/x86/hvm/svm/svm.c | 10 ++++----- xen/arch/x86/hvm/svm/svmdebug.c | 2 +- xen/include/asm-x86/hvm/svm/vmcb.h | 45 ++++++++++++++------------------------ 4 files changed, 44 insertions(+), 58 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index bbd06e342e..ffdc1d8da0 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -343,7 +343,7 @@ static int nsvm_vcpu_hostrestore(struct vcpu *v, struct cpu_user_regs *regs) n1vmcb->exit_int_info.raw = 0; /* Cleanbits */ - n1vmcb->cleanbits.bytes = 0; + n1vmcb->cleanbits.raw = 0; return 0; } @@ -423,7 +423,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) struct nestedvcpu *nv = &vcpu_nestedhvm(v); struct nestedsvm *svm = &vcpu_nestedsvm(v); struct vmcb_struct *ns_vmcb, *n1vmcb, *n2vmcb; - bool_t vcleanbits_valid; + vmcbcleanbits_t clean = {}; int rc; uint64_t cr0; @@ -435,17 +435,13 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) ASSERT(n2vmcb != NULL); /* Check if virtual VMCB cleanbits are valid */ - vcleanbits_valid = 1; - if ( svm->ns_ovvmcb_pa == INVALID_PADDR ) - vcleanbits_valid = 0; - if (svm->ns_ovvmcb_pa != nv->nv_vvmcxaddr) - vcleanbits_valid = 0; - -#define vcleanbit_set(_name) \ - (vcleanbits_valid && ns_vmcb->cleanbits.fields._name) + if ( svm->ns_ovvmcb_pa != INVALID_PADDR && + svm->ns_ovvmcb_pa == nv->nv_vvmcxaddr ) + clean = ns_vmcb->cleanbits; /* Enable l2 guest intercepts */ - if (!vcleanbit_set(intercepts)) { + if ( !clean.intercepts ) + { svm->ns_cr_intercepts = ns_vmcb->_cr_intercepts; svm->ns_dr_intercepts = ns_vmcb->_dr_intercepts; svm->ns_exception_intercepts = ns_vmcb->_exception_intercepts; @@ -492,7 +488,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) n2vmcb->_tsc_offset = n1vmcb->_tsc_offset + ns_vmcb->_tsc_offset; /* Nested IO permission bitmaps */ - rc = nsvm_vmrun_permissionmap(v, vcleanbit_set(iopm)); + rc = nsvm_vmrun_permissionmap(v, clean.iopm); if (rc) return rc; @@ -502,7 +498,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) n2vmcb->tlb_control = ns_vmcb->tlb_control; /* Virtual Interrupts */ - if (!vcleanbit_set(tpr)) { + if ( !clean.tpr ) + { n2vmcb->_vintr = ns_vmcb->_vintr; n2vmcb->_vintr.fields.intr_masking = 1; } @@ -520,9 +517,9 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) n2vmcb->event_inj = ns_vmcb->event_inj; /* LBR and other virtualization */ - if (!vcleanbit_set(lbr)) { + if ( !clean.lbr ) svm->ns_virt_ext = ns_vmcb->virt_ext; - } + n2vmcb->virt_ext.bytes = n1vmcb->virt_ext.bytes | ns_vmcb->virt_ext.bytes; @@ -533,7 +530,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) */ /* Segments */ - if (!vcleanbit_set(seg)) { + if ( !clean.seg ) + { n2vmcb->es = ns_vmcb->es; n2vmcb->cs = ns_vmcb->cs; n2vmcb->ss = ns_vmcb->ss; @@ -541,7 +539,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) /* CPL */ n2vmcb->_cpl = ns_vmcb->_cpl; } - if (!vcleanbit_set(dt)) { + if ( !clean.dt ) + { n2vmcb->gdtr = ns_vmcb->gdtr; n2vmcb->idtr = ns_vmcb->idtr; } @@ -614,7 +613,8 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) } /* DRn */ - if (!vcleanbit_set(dr)) { + if ( !clean.dr ) + { n2vmcb->_dr7 = ns_vmcb->_dr7; n2vmcb->_dr6 = ns_vmcb->_dr6; } @@ -637,11 +637,11 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) */ /* PAT */ - if (!vcleanbit_set(np)) { + if ( !clean.np ) n2vmcb->_g_pat = ns_vmcb->_g_pat; - } - if (!vcleanbit_set(lbr)) { + if ( !clean.lbr ) + { /* Debug Control MSR */ n2vmcb->_debugctlmsr = ns_vmcb->_debugctlmsr; @@ -653,7 +653,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) } /* Cleanbits */ - n2vmcb->cleanbits.bytes = 0; + n2vmcb->cleanbits.raw = 0; rc = svm_vmcb_isvalid(__func__, ns_vmcb, v, true); if (rc) { @@ -673,7 +673,6 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) regs->rsp = ns_vmcb->rsp; regs->rflags = ns_vmcb->rflags; -#undef vcleanbit_set return 0; } diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 5950e4d52b..46a1aac949 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -345,7 +345,7 @@ static int svm_vmcb_restore(struct vcpu *v, struct hvm_hw_cpu *c) else vmcb->event_inj.raw = 0; - vmcb->cleanbits.bytes = 0; + vmcb->cleanbits.raw = 0; paging_update_paging_modes(v); return 0; @@ -693,12 +693,12 @@ static void svm_set_segment_register(struct vcpu *v, enum x86_segment seg, case x86_seg_ds: case x86_seg_es: case x86_seg_ss: /* cpl */ - vmcb->cleanbits.fields.seg = 0; + vmcb->cleanbits.seg = false; break; case x86_seg_gdtr: case x86_seg_idtr: - vmcb->cleanbits.fields.dt = 0; + vmcb->cleanbits.dt = false; break; case x86_seg_fs: @@ -980,7 +980,7 @@ static void svm_ctxt_switch_to(struct vcpu *v) svm_restore_dr(v); svm_vmsave_pa(per_cpu(host_vmcb, cpu)); - vmcb->cleanbits.bytes = 0; + vmcb->cleanbits.raw = 0; svm_tsc_ratio_load(v); if ( cpu_has_msr_tsc_aux ) @@ -2594,7 +2594,7 @@ void svm_vmexit_handler(struct cpu_user_regs *regs) hvm_maybe_deassert_evtchn_irq(); - vmcb->cleanbits.bytes = cpu_has_svm_cleanbits ? ~0u : 0u; + vmcb->cleanbits.raw = ~0u; /* Event delivery caused this intercept? Queue for redelivery. */ if ( unlikely(vmcb->exit_int_info.v) && diff --git a/xen/arch/x86/hvm/svm/svmdebug.c b/xen/arch/x86/hvm/svm/svmdebug.c index 91f5d9400c..ba26b6a80b 100644 --- a/xen/arch/x86/hvm/svm/svmdebug.c +++ b/xen/arch/x86/hvm/svm/svmdebug.c @@ -83,7 +83,7 @@ void svm_vmcb_dump(const char *from, const struct vmcb_struct *vmcb) printk("KernGSBase = 0x%016"PRIx64" PAT = 0x%016"PRIx64"\n", vmcb->kerngsbase, vmcb_get_g_pat(vmcb)); printk("H_CR3 = 0x%016"PRIx64" CleanBits = %#x\n", - vmcb_get_h_cr3(vmcb), vmcb->cleanbits.bytes); + vmcb_get_h_cr3(vmcb), vmcb->cleanbits.raw); /* print out all the selectors */ printk(" sel attr limit base\n"); diff --git a/xen/include/asm-x86/hvm/svm/vmcb.h b/xen/include/asm-x86/hvm/svm/vmcb.h index c2e1972feb..c4fda389b3 100644 --- a/xen/include/asm-x86/hvm/svm/vmcb.h +++ b/xen/include/asm-x86/hvm/svm/vmcb.h @@ -384,34 +384,21 @@ typedef union typedef union { - uint32_t bytes; - struct - { - /* cr_intercepts, dr_intercepts, exception_intercepts, - * general{1,2}_intercepts, pause_filter_count, tsc_offset */ - uint32_t intercepts: 1; - /* iopm_base_pa, msrpm_base_pa */ - uint32_t iopm: 1; - /* guest_asid */ - uint32_t asid: 1; - /* vintr */ - uint32_t tpr: 1; - /* np_enable, h_cr3, g_pat */ - uint32_t np: 1; - /* cr0, cr3, cr4, efer */ - uint32_t cr: 1; - /* dr6, dr7 */ - uint32_t dr: 1; - /* gdtr, idtr */ - uint32_t dt: 1; - /* cs, ds, es, ss, cpl */ - uint32_t seg: 1; - /* cr2 */ - uint32_t cr2: 1; - /* debugctlmsr, last{branch,int}{to,from}ip */ - uint32_t lbr: 1; - uint32_t resv: 21; - } fields; + struct { + bool intercepts:1; /* 0: cr/dr/exception/general intercepts, + * pause_filter_count, tsc_offset */ + bool iopm:1; /* 1: iopm_base_pa, msrpm_base_pa */ + bool asid:1; /* 2: guest_asid */ + bool tpr:1; /* 3: vintr */ + bool np:1; /* 4: np_enable, h_cr3, g_pat */ + bool cr:1; /* 5: cr0, cr3, cr4, efer */ + bool dr:1; /* 6: dr6, dr7 */ + bool dt:1; /* 7: gdtr, idtr */ + bool seg:1; /* 8: cs, ds, es, ss, cpl */ + bool cr2:1; /* 9: cr2 */ + bool lbr:1; /* 10: debugctlmsr, last{branch,int}{to,from}ip */ + }; + uint32_t raw; } vmcbcleanbits_t; #define IOPM_SIZE (12 * 1024) @@ -604,7 +591,7 @@ vmcb_set_ ## name(struct vmcb_struct *vmcb, \ type value) \ { \ vmcb->_ ## name = value; \ - vmcb->cleanbits.fields.cleanbit = 0; \ + vmcb->cleanbits.cleanbit = false; \ } \ static inline type \ vmcb_get_ ## name(const struct vmcb_struct *vmcb) \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 10 01:22:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 01:22:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafq-0000aH-RY; Sun, 10 May 2020 01:22:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafp-0000a4-2f for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:33 +0000 X-Inumbo-ID: b8d1177e-925c-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b8d1177e-925c-11ea-ae69-bc764e2007e4; Sun, 10 May 2020 01:22:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=t7yxmSSjKtG4vtt0DZYUTlJI0IPHIylfLFBwY0N0V+o=; b=qgYdHEavhMuoNQGm+wSEC+4h8H i5zgxmkTHPZ301gNjNXD0jRcO6PIwgOCqvFV8TvO1QzweKayGM7/3wH9T6z5O64NAND9egrZXyvyl FNqDLlXKFRUcNLY2x23XMzlvDqg5ahKiORGfnjwNe+Cego2PZDPp0GFv+FebNgRbfCxo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafo-0006f8-96 for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXafo-0002ry-7i for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/svm: Use flush-by-asid when available Message-Id: Date: Sun, 10 May 2020 01:22:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 64b1da5a2fcf37e3542c277fde194ff3e8bba2d2 Author: Andrew Cooper AuthorDate: Tue Feb 12 18:37:04 2019 +0000 Commit: Andrew Cooper CommitDate: Thu May 7 13:50:38 2020 +0100 x86/svm: Use flush-by-asid when available AMD Fam15h processors introduced the flush-by-asid feature, for more fine grain flushing purposes. Flushing everything including ASID 0 (i.e. Xen context) is an an unnecesserily large hammer, and never necessary in the context of guest TLBs needing invalidating. When available, use TLB_CTRL_FLUSH_ASID in preference to TLB_CTRL_FLUSH_ALL. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/asid.c | 9 ++++++--- xen/include/asm-x86/hvm/svm/svm.h | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c index 9be90058c7..ab06dd3f3a 100644 --- a/xen/arch/x86/hvm/svm/asid.c +++ b/xen/arch/x86/hvm/svm/asid.c @@ -18,6 +18,7 @@ #include #include #include +#include void svm_asid_init(const struct cpuinfo_x86 *c) { @@ -47,15 +48,17 @@ void svm_asid_handle_vmrun(void) if ( p_asid->asid == 0 ) { vmcb_set_guest_asid(vmcb, 1); - /* TODO: investigate using TLB_CTRL_FLUSH_ASID here instead. */ - vmcb->tlb_control = TLB_CTRL_FLUSH_ALL; + vmcb->tlb_control = + cpu_has_svm_flushbyasid ? TLB_CTRL_FLUSH_ASID : TLB_CTRL_FLUSH_ALL; return; } if ( vmcb_get_guest_asid(vmcb) != p_asid->asid ) vmcb_set_guest_asid(vmcb, p_asid->asid); - vmcb->tlb_control = need_flush ? TLB_CTRL_FLUSH_ALL : TLB_CTRL_NO_FLUSH; + vmcb->tlb_control = + !need_flush ? TLB_CTRL_NO_FLUSH : + cpu_has_svm_flushbyasid ? TLB_CTRL_FLUSH_ASID : TLB_CTRL_FLUSH_ALL; } /* diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index 16a994ec74..cd71402cbb 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -79,6 +79,7 @@ extern u32 svm_feature_flags; #define cpu_has_svm_svml cpu_has_svm_feature(SVM_FEATURE_SVML) #define cpu_has_svm_nrips cpu_has_svm_feature(SVM_FEATURE_NRIPS) #define cpu_has_svm_cleanbits cpu_has_svm_feature(SVM_FEATURE_VMCBCLEAN) +#define cpu_has_svm_flushbyasid cpu_has_svm_feature(SVM_FEATURE_FLUSHBYASID) #define cpu_has_svm_decode cpu_has_svm_feature(SVM_FEATURE_DECODEASSISTS) #define cpu_has_svm_vgif cpu_has_svm_feature(SVM_FEATURE_VGIF) #define cpu_has_pause_filter cpu_has_svm_feature(SVM_FEATURE_PAUSEFILTER) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 10 01:22:44 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 01:22:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXag0-0000bY-T6; Sun, 10 May 2020 01:22:44 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafz-0000bL-Sm for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:43 +0000 X-Inumbo-ID: bed85e48-925c-11ea-a14d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bed85e48-925c-11ea-a14d-12813bfff9fa; Sun, 10 May 2020 01:22:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=MJTEVffONj1IPZXkFli1yZI1V8Bx/kJdajH8xuQO5Ek=; b=Tqto/tiLneCqbEYQE8RoCnrMIU K4TTLPgoELdKJVEtwEFGhHgRWUw7xYWpO0OYWMH7h3MAXVlifIOXYnEKeCYWeKmi+D+AAWGmCNQa8 pL83/XmV+1yFZ27VhtpEUp3j9f+84RroFFIsT+HVOU2LSQFx0bbmlrCvxwTVSJJgTkWA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXafy-0006fH-Cc for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXafy-0002sm-BX for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] sched: print information about scheduling granularity Message-Id: Date: Sun, 10 May 2020 01:22:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 35b819c45c4603fdb1d400925d6b2e6f8689a9d5 Author: Sergey Dyasli AuthorDate: Wed May 6 11:00:24 2020 +0100 Commit: Andrew Cooper CommitDate: Thu May 7 18:58:04 2020 +0100 sched: print information about scheduling granularity Currently it might be not obvious which scheduling mode (e.g. core- scheduling) is being used by the scheduler. Alleviate this by printing additional information about the selected granularity per-cpupool. Note: per-cpupool granularity selection is not implemented yet. Every cpupool gets its granularity from the single global value. Take this opportunity to introduce struct sched_gran_name array and refactor sched_select_granularity(). Signed-off-by: Sergey Dyasli Acked-by: Dario Faggioli --- xen/common/sched/cpupool.c | 51 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index d40345b585..97c2d5b3c1 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -40,19 +40,50 @@ static DEFINE_SPINLOCK(cpupool_lock); static enum sched_gran __read_mostly opt_sched_granularity = SCHED_GRAN_cpu; static unsigned int __read_mostly sched_granularity = 1; +struct sched_gran_name { + enum sched_gran mode; + char name[8]; +}; + +static const struct sched_gran_name sg_name[] = { + {SCHED_GRAN_cpu, "cpu"}, + {SCHED_GRAN_core, "core"}, + {SCHED_GRAN_socket, "socket"}, +}; + +static void sched_gran_print(enum sched_gran mode, unsigned int gran) +{ + const char *name = ""; + unsigned int i; + + for ( i = 0; i < ARRAY_SIZE(sg_name); i++ ) + { + if ( mode == sg_name[i].mode ) + { + name = sg_name[i].name; + break; + } + } + + printk("Scheduling granularity: %s, %u CPU%s per sched-resource\n", + name, gran, gran == 1 ? "" : "s"); +} + #ifdef CONFIG_HAS_SCHED_GRANULARITY static int __init sched_select_granularity(const char *str) { - if ( strcmp("cpu", str) == 0 ) - opt_sched_granularity = SCHED_GRAN_cpu; - else if ( strcmp("core", str) == 0 ) - opt_sched_granularity = SCHED_GRAN_core; - else if ( strcmp("socket", str) == 0 ) - opt_sched_granularity = SCHED_GRAN_socket; - else - return -EINVAL; + unsigned int i; - return 0; + for ( i = 0; i < ARRAY_SIZE(sg_name); i++ ) + { + if ( strcmp(sg_name[i].name, str) == 0 ) + { + opt_sched_granularity = sg_name[i].mode; + return 0; + } + } + + return -EINVAL; } custom_param("sched-gran", sched_select_granularity); #endif @@ -115,6 +146,7 @@ static void __init cpupool_gran_init(void) warning_add(fallback); sched_granularity = gran; + sched_gran_print(opt_sched_granularity, sched_granularity); } unsigned int cpupool_get_granularity(const struct cpupool *c) @@ -911,6 +943,7 @@ void dump_runq(unsigned char key) { printk("Cpupool %d:\n", (*c)->cpupool_id); printk("Cpus: %*pbl\n", CPUMASK_PR((*c)->cpu_valid)); + sched_gran_print((*c)->gran, cpupool_get_granularity(*c)); schedule_dump(*c); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 10 01:22:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 01:22:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXagA-0000ci-Uq; Sun, 10 May 2020 01:22:54 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXag9-0000cW-4I for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:53 +0000 X-Inumbo-ID: c4dba7aa-925c-11ea-a14d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c4dba7aa-925c-11ea-a14d-12813bfff9fa; Sun, 10 May 2020 01:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LbRAgEQtemxVrg0JJrE7i+dt+ByQIVDAV5V4paWJMeE=; b=4A9Jwt/rTRLpTk/ybkC0KMdKa/ maiGKwCb1j01goIdlygf+B5bafdAxbgbFPcJGqlguDxMp1kU+5/9cm2wHySRUWoJ80H7Kl6Kgl/ZM 60RXU5oj9eZlnepqVgKSJRd+NuHdquwjjNZaQdrdSkoA4w7zCdOu7WRIRrEFpVWbqJyQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXag8-0006fQ-FT for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXag8-0002ta-EL for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:22:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] cpupool: fix removing cpu from a cpupool Message-Id: Date: Sun, 10 May 2020 01:22:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 498d73647fa17d9eb7a67d2e9bdccac6b438e559 Author: Juergen Gross AuthorDate: Fri May 8 10:44:22 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 8 10:44:22 2020 +0200 cpupool: fix removing cpu from a cpupool Commit cb563d7665f2 ("xen/sched: support core scheduling for moving cpus to/from cpupools") introduced a regression when trying to remove an offline cpu from a cpupool, as the system would crash in this situation. Fix that by testing the cpu to be online. Fixes: cb563d7665f2 ("xen/sched: support core scheduling for moving cpus to/from cpupools") Signed-off-by: Juergen Gross Acked-by: Dario Faggioli --- xen/common/sched/cpupool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 97c2d5b3c1..0664f7fa3d 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -552,6 +552,9 @@ static int cpupool_unassign_cpu(struct cpupool *c, unsigned int cpu) debugtrace_printk("cpupool_unassign_cpu(pool=%d,cpu=%d)\n", c->cpupool_id, cpu); + if ( !cpu_online(cpu) ) + return -EINVAL; + master_cpu = sched_get_resource_cpu(cpu); ret = cpupool_unassign_cpu_start(c, master_cpu); if ( ret ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 10 01:23:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 01:23:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXagL-0000ec-0J; Sun, 10 May 2020 01:23:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXagJ-0000eP-7X for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:23:03 +0000 X-Inumbo-ID: cae175f8-925c-11ea-a14d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cae175f8-925c-11ea-a14d-12813bfff9fa; Sun, 10 May 2020 01:23:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=gY+mZkiQ8BcA391WKr30NUWgt4MbSso4gAXAakTOhOQ=; b=IeT0aoW5LtV5V7RHh8By3PPlFq Vnj2h1p16vlPZOQ4F4Iww7hdEhHO+yz9JVvY2Q+UcAIYQ1A8+ewswmkOerFKpEQzUohw3gBwp5Rtk pYxX3G6DCofMfrMEIzE4jaUno9Y1ZHyXAMc0jcd2CgAtSAPWR640SB/FoJyEuF1N5E2U=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXagI-0006fr-Ir for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:23:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXagI-0002uK-Hs for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 01:23:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] sched: always modify vcpu pause flags atomically Message-Id: Date: Sun, 10 May 2020 01:23:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e0d92d9bd7997c6bcda17a19aba4f3957dd1a2e9 Author: Juergen Gross AuthorDate: Fri May 8 10:47:38 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 8 10:47:38 2020 +0200 sched: always modify vcpu pause flags atomically credit2 is currently modifying the pause flags of vcpus non-atomically via sched_set_pause_flags() and sched_clear_pause_flags(). This is dangerous as there are cases where the paus flags are modified without any lock held. So drop the non-atomic pause flag modification functions and rename the atomic ones dropping the _atomic suffix. Fixes: a76255b4266516 ("xen/sched: make credit2 scheduler vcpu agnostic.") Signed-off-by: Juergen Gross Reviewed-by: Dario Faggioli --- xen/common/sched/credit.c | 4 ++-- xen/common/sched/private.h | 22 +--------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/xen/common/sched/credit.c b/xen/common/sched/credit.c index 93d89da278..d0aa017c64 100644 --- a/xen/common/sched/credit.c +++ b/xen/common/sched/credit.c @@ -453,7 +453,7 @@ static inline void __runq_tickle(const struct csched_unit *new) SCHED_UNIT_STAT_CRANK(cur, kicked_away); SCHED_UNIT_STAT_CRANK(cur, migrate_r); SCHED_STAT_CRANK(migrate_kicked_away); - sched_set_pause_flags_atomic(cur->unit, _VPF_migrating); + sched_set_pause_flags(cur->unit, _VPF_migrating); } /* Tickle cpu anyway, to let new preempt cur. */ SCHED_STAT_CRANK(tickled_busy_cpu); @@ -973,7 +973,7 @@ csched_unit_acct(struct csched_private *prv, unsigned int cpu) { SCHED_UNIT_STAT_CRANK(svc, migrate_r); SCHED_STAT_CRANK(migrate_running); - sched_set_pause_flags_atomic(currunit, _VPF_migrating); + sched_set_pause_flags(currunit, _VPF_migrating); /* * As we are about to tickle cpu, we should clear its bit in * idlers. But, if we are here, it means there is someone running diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index 367811a12f..b9a5b4c01c 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -172,7 +172,7 @@ static inline void sched_set_pause_flags(struct sched_unit *unit, struct vcpu *v; for_each_sched_unit_vcpu ( unit, v ) - __set_bit(bit, &v->pause_flags); + set_bit(bit, &v->pause_flags); } /* Clear a bit in pause_flags of all vcpus of a unit. */ @@ -182,26 +182,6 @@ static inline void sched_clear_pause_flags(struct sched_unit *unit, struct vcpu *v; for_each_sched_unit_vcpu ( unit, v ) - __clear_bit(bit, &v->pause_flags); -} - -/* Set a bit in pause_flags of all vcpus of a unit via atomic updates. */ -static inline void sched_set_pause_flags_atomic(struct sched_unit *unit, - unsigned int bit) -{ - struct vcpu *v; - - for_each_sched_unit_vcpu ( unit, v ) - set_bit(bit, &v->pause_flags); -} - -/* Clear a bit in pause_flags of all vcpus of a unit via atomic updates. */ -static inline void sched_clear_pause_flags_atomic(struct sched_unit *unit, - unsigned int bit) -{ - struct vcpu *v; - - for_each_sched_unit_vcpu ( unit, v ) clear_bit(bit, &v->pause_flags); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 10 12:11:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 12:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXknX-0007Fb-1j; Sun, 10 May 2020 12:11:11 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXknW-0007FW-1H for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 12:11:10 +0000 X-Inumbo-ID: 528cda88-92b7-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 528cda88-92b7-11ea-ae69-bc764e2007e4; Sun, 10 May 2020 12:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=C9HuFTldaeSJ+rNlNpfJ4UXGWkD1tbEAqNv9kNvlUcg=; b=k0aJraV4amhkjCTTB0rMTNbUET DRLWGfbnfhEuQ4MM2S4tVJ0f3iwYyrP4hRsWHp+fWCM7vnlsRnj6k903QvG15VdmP9arXOcFrYX+Z TIurCScbr1Nbq+nhrOC0DGPXy1qpuQvUTcCegl5MJ1QLc1L/+cmaerlPL/LZsRk6Skks=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXknQ-0008TL-R4 for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 12:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXknQ-0002sx-Pf for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 12:11:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: update libxlu_disk_l.[ch] Message-Id: Date: Sun, 10 May 2020 12:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4cefd87ed38822d6c53e81f1dfa552d5b4bf5940 Author: Wei Liu AuthorDate: Wed May 6 17:50:18 2020 +0100 Commit: Wei Liu CommitDate: Sun May 10 13:00:30 2020 +0100 libxl: update libxlu_disk_l.[ch] Use flex 2.6.4 that is shipped in Debian Buster. Signed-off-by: Wei Liu Acked-by: Roger Pau Monné --- tools/libxl/libxlu_disk_l.c | 867 +++++++++++++++++++++++++++----------------- tools/libxl/libxlu_disk_l.h | 474 ++++++++++++++++++++---- 2 files changed, 947 insertions(+), 394 deletions(-) diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index 944990732b..b0ac3a865a 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1,10 +1,7 @@ #line 2 "libxlu_disk_l.c" -#line 31 "libxlu_disk_l.l" #include "libxl_osdeps.h" /* must come before any other headers */ - - -#line 8 "libxlu_disk_l.c" +#line 5 "libxlu_disk_l.c" #define YY_INT_ALIGNED short int @@ -12,12 +9,222 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define xlu__disk_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer xlu__disk_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define xlu__disk_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer xlu__disk_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define xlu__disk_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer xlu__disk_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define xlu__disk_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string xlu__disk_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define xlu__disk_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes xlu__disk_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define xlu__disk_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer xlu__disk_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define xlu__disk_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer xlu__disk_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define xlu__disk_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state xlu__disk_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define xlu__disk_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer xlu__disk_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define xlu__disk_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state xlu__disk_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define xlu__disk_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state xlu__disk_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define xlu__disk_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack xlu__disk_yyensure_buffer_stack +#endif + +#ifdef yylex +#define xlu__disk_yylex_ALREADY_DEFINED +#else +#define yylex xlu__disk_yylex +#endif + +#ifdef yyrestart +#define xlu__disk_yyrestart_ALREADY_DEFINED +#else +#define yyrestart xlu__disk_yyrestart +#endif + +#ifdef yylex_init +#define xlu__disk_yylex_init_ALREADY_DEFINED +#else +#define yylex_init xlu__disk_yylex_init +#endif + +#ifdef yylex_init_extra +#define xlu__disk_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra xlu__disk_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define xlu__disk_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy xlu__disk_yylex_destroy +#endif + +#ifdef yyget_debug +#define xlu__disk_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug xlu__disk_yyget_debug +#endif + +#ifdef yyset_debug +#define xlu__disk_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug xlu__disk_yyset_debug +#endif + +#ifdef yyget_extra +#define xlu__disk_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra xlu__disk_yyget_extra +#endif + +#ifdef yyset_extra +#define xlu__disk_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra xlu__disk_yyset_extra +#endif + +#ifdef yyget_in +#define xlu__disk_yyget_in_ALREADY_DEFINED +#else +#define yyget_in xlu__disk_yyget_in +#endif + +#ifdef yyset_in +#define xlu__disk_yyset_in_ALREADY_DEFINED +#else +#define yyset_in xlu__disk_yyset_in +#endif + +#ifdef yyget_out +#define xlu__disk_yyget_out_ALREADY_DEFINED +#else +#define yyget_out xlu__disk_yyget_out +#endif + +#ifdef yyset_out +#define xlu__disk_yyset_out_ALREADY_DEFINED +#else +#define yyset_out xlu__disk_yyset_out +#endif + +#ifdef yyget_leng +#define xlu__disk_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng xlu__disk_yyget_leng +#endif + +#ifdef yyget_text +#define xlu__disk_yyget_text_ALREADY_DEFINED +#else +#define yyget_text xlu__disk_yyget_text +#endif + +#ifdef yyget_lineno +#define xlu__disk_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno xlu__disk_yyget_lineno +#endif + +#ifdef yyset_lineno +#define xlu__disk_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno xlu__disk_yyset_lineno +#endif + +#ifdef yyget_column +#define xlu__disk_yyget_column_ALREADY_DEFINED +#else +#define yyget_column xlu__disk_yyget_column +#endif + +#ifdef yyset_column +#define xlu__disk_yyset_column_ALREADY_DEFINED +#else +#define yyset_column xlu__disk_yyset_column +#endif + +#ifdef yywrap +#define xlu__disk_yywrap_ALREADY_DEFINED +#else +#define yywrap xlu__disk_yywrap +#endif + +#ifdef yyalloc +#define xlu__disk_yyalloc_ALREADY_DEFINED +#else +#define yyalloc xlu__disk_yyalloc +#endif + +#ifdef yyrealloc +#define xlu__disk_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc xlu__disk_yyrealloc +#endif + +#ifdef yyfree +#define xlu__disk_yyfree_ALREADY_DEFINED +#else +#define yyfree xlu__disk_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -88,40 +295,32 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus +/* begin standard C++ headers. */ -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* An opaque pointer. */ #ifndef YY_TYPEDEF_YY_SCANNER_T @@ -145,20 +344,16 @@ typedef void* yyscan_t; * definition of BEGIN. */ #define BEGIN yyg->yy_start = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START ((yyg->yy_start - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE xlu__disk_yyrestart(yyin ,yyscanner ) - +#define YY_NEW_FILE yyrestart( yyin , yyscanner ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -191,7 +386,7 @@ typedef size_t yy_size_t; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -208,7 +403,6 @@ typedef size_t yy_size_t; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -223,12 +417,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -251,7 +445,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -268,7 +462,7 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via xlu__disk_yyrestart()), so that the user can continue scanning by + * (via yyrestart()), so that the user can continue scanning by * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -285,71 +479,65 @@ struct yy_buffer_state #define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] -void xlu__disk_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void xlu__disk_yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner ); -static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner ); -static void xlu__disk_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); +static void yyensure_buffer_stack ( yyscan_t yyscanner ); +static void yy_load_buffer_state ( yyscan_t yyscanner ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) -#define YY_FLUSH_BUFFER xlu__disk_yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); - -void *xlu__disk_yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *xlu__disk_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); - -#define yy_new_buffer xlu__disk_yy_create_buffer +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ - xlu__disk_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ - xlu__disk_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) -#define xlu__disk_yywrap(yyscanner) 1 +#define xlu__disk_yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; typedef int yy_state_type; #define yytext_ptr yytext_r -static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); -static int yy_get_next_buffer (yyscan_t yyscanner ); -static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); +static yy_state_type yy_get_previous_state ( yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state , yyscan_t yyscanner); +static int yy_get_next_buffer ( yyscan_t yyscanner ); +static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -357,11 +545,10 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); #define YY_DO_BEFORE_ACTION \ yyg->yytext_ptr = yy_bp; \ yyg->yytext_ptr -= yyg->yy_more_len; \ - yyleng = (size_t) (yy_cp - yyg->yytext_ptr); \ + yyleng = (int) (yy_cp - yyg->yytext_ptr); \ yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; - #define YY_NUM_RULES 36 #define YY_END_OF_BUFFER 37 /* This struct is not used in this scanner, @@ -371,7 +558,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_acclist[575] = +static const flex_int16_t yy_acclist[575] = { 0, 35, 35, 37, 33, 34, 36, 8193, 33, 34, 36, 16385, 8193, 33, 36,16385, 33, 34, 36, 34, 36, @@ -438,7 +625,7 @@ static yyconst flex_int16_t yy_acclist[575] = 21, 23, 12, 33 } ; -static yyconst flex_int16_t yy_accept[356] = +static const flex_int16_t yy_accept[356] = { 0, 1, 1, 1, 2, 3, 4, 7, 12, 16, 19, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, @@ -481,7 +668,7 @@ static yyconst flex_int16_t yy_accept[356] = 570, 571, 573, 575, 575 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -513,7 +700,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[35] = +static const YY_CHAR yy_meta[35] = { 0, 1, 1, 2, 3, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -521,7 +708,7 @@ static yyconst flex_int32_t yy_meta[35] = 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[424] = +static const flex_int16_t yy_base[424] = { 0, 0, 0, 901, 900, 902, 897, 33, 36, 905, 905, 45, 63, 31, 42, 51, 52, 890, 33, 65, 67, @@ -572,7 +759,7 @@ static yyconst flex_int16_t yy_base[424] = 883, 887, 891 } ; -static yyconst flex_int16_t yy_def[424] = +static const flex_int16_t yy_def[424] = { 0, 354, 1, 355, 355, 354, 356, 357, 357, 354, 354, 358, 358, 12, 12, 12, 12, 12, 12, 12, 12, @@ -623,7 +810,7 @@ static yyconst flex_int16_t yy_def[424] = 354, 354, 354 } ; -static yyconst flex_int16_t yy_nxt[940] = +static const flex_int16_t yy_nxt[940] = { 0, 6, 7, 8, 9, 6, 6, 6, 6, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 17, 17, @@ -730,7 +917,7 @@ static yyconst flex_int16_t yy_nxt[940] = 354, 354, 354, 354, 354, 354, 354, 354, 354 } ; -static yyconst flex_int16_t yy_chk[940] = +static const flex_int16_t yy_chk[940] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1001,8 +1188,9 @@ static int vdev_and_devtype(DiskParseContext *dpc, char *str) { #undef DPC /* needs to be defined differently the actual lexer */ #define DPC ((DiskParseContext*)yyextra) +#line 1192 "libxlu_disk_l.c" -#line 1006 "libxlu_disk_l.c" +#line 1194 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1032,8 +1220,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - yy_size_t yy_n_chars; - yy_size_t yyleng_r; + int yy_n_chars; + int yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -1064,44 +1252,44 @@ struct yyguts_t }; /* end struct yyguts_t */ -static int yy_init_globals (yyscan_t yyscanner ); +static int yy_init_globals ( yyscan_t yyscanner ); -int xlu__disk_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int xlu__disk_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int xlu__disk_yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int xlu__disk_yyget_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void xlu__disk_yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void xlu__disk_yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void xlu__disk_yyset_out (FILE * out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *xlu__disk_yyget_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int xlu__disk_yyget_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int xlu__disk_yyget_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1109,26 +1297,29 @@ void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int xlu__disk_yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int xlu__disk_yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); +static int yyinput ( yyscan_t yyscanner ); #else -static int input (yyscan_t yyscanner ); +static int input ( yyscan_t yyscanner ); #endif #endif @@ -1148,7 +1339,7 @@ static int input (yyscan_t yyscanner ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1172,7 +1363,7 @@ static int input (yyscan_t yyscanner ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1213,9 +1404,9 @@ static int input (yyscan_t yyscanner ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int xlu__disk_yylex (yyscan_t yyscanner); +extern int yylex (yyscan_t yyscanner); -#define YY_DECL int xlu__disk_yylex (yyscan_t yyscanner) +#define YY_DECL int yylex (yyscan_t yyscanner) #endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng @@ -1227,7 +1418,7 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1237,9 +1428,9 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( !yyg->yy_init ) @@ -1252,9 +1443,9 @@ YY_DECL /* Create the reject buffer large enough to save one state per allowed character. */ if ( ! yyg->yy_state_buf ) - yyg->yy_state_buf = (yy_state_type *)xlu__disk_yyalloc(YY_STATE_BUF_SIZE ,yyscanner); + yyg->yy_state_buf = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE , yyscanner); if ( ! yyg->yy_state_buf ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yylex()" ); + YY_FATAL_ERROR( "out of dynamic memory in yylex()" ); if ( ! yyg->yy_start ) yyg->yy_start = 1; /* first start state */ @@ -1266,28 +1457,29 @@ YY_DECL yyout = stdout; if ( ! YY_CURRENT_BUFFER ) { - xlu__disk_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } { #line 166 "libxlu_disk_l.l" +#line 169 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1284 "libxlu_disk_l.c" +#line 1476 "libxlu_disk_l.c" - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yyg->yy_more_len = 0; if ( yyg->yy_more_flag ) { - yyg->yy_more_len = yyg->yy_c_buf_p - yyg->yytext_ptr; + yyg->yy_more_len = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); yyg->yy_more_flag = 0; } yy_cp = yyg->yy_c_buf_p; @@ -1308,14 +1500,14 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 355 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *yyg->yy_state_ptr++ = yy_current_state; ++yy_cp; } @@ -1369,135 +1561,135 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 170 "libxlu_disk_l.l" +#line 171 "libxlu_disk_l.l" { /* ignore whitespace before parameters */ } YY_BREAK /* ordinary parameters setting enums or strings */ case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 174 "libxlu_disk_l.l" +#line 175 "libxlu_disk_l.l" { STRIP(','); setformat(DPC, FROMEQUALS); } YY_BREAK case 3: YY_RULE_SETUP -#line 176 "libxlu_disk_l.l" +#line 177 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 4: YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 178 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 5: YY_RULE_SETUP -#line 178 "libxlu_disk_l.l" +#line 179 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 0; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 179 "libxlu_disk_l.l" +#line 180 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown value for type"); } YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 181 "libxlu_disk_l.l" +#line 182 "libxlu_disk_l.l" { STRIP(','); setaccess(DPC, FROMEQUALS); } YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 182 "libxlu_disk_l.l" +#line 183 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("backend", backend_domname, FROMEQUALS); } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 183 "libxlu_disk_l.l" +#line 184 "libxlu_disk_l.l" { STRIP(','); setbackendtype(DPC,FROMEQUALS); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 185 "libxlu_disk_l.l" +#line 186 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 186 "libxlu_disk_l.l" +#line 187 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } YY_BREAK case 12: YY_RULE_SETUP -#line 187 "libxlu_disk_l.l" +#line 188 "libxlu_disk_l.l" { DPC->disk->direct_io_safe = 1; } YY_BREAK case 13: YY_RULE_SETUP -#line 188 "libxlu_disk_l.l" +#line 189 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, true); } YY_BREAK case 14: YY_RULE_SETUP -#line 189 "libxlu_disk_l.l" +#line 190 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, false); } YY_BREAK /* Note that the COLO configuration settings should be considered unstable. * They may change incompatibly in future versions of Xen. */ case 15: YY_RULE_SETUP -#line 192 "libxlu_disk_l.l" +#line 193 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, true); } YY_BREAK case 16: YY_RULE_SETUP -#line 193 "libxlu_disk_l.l" +#line 194 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, false); } YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 194 "libxlu_disk_l.l" +#line 195 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-host", colo_host, FROMEQUALS); } YY_BREAK case 18: /* rule 18 can match eol */ YY_RULE_SETUP -#line 195 "libxlu_disk_l.l" +#line 196 "libxlu_disk_l.l" { STRIP(','); setcoloport(DPC, FROMEQUALS); } YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 196 "libxlu_disk_l.l" +#line 197 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-export", colo_export, FROMEQUALS); } YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 197 "libxlu_disk_l.l" +#line 198 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("active-disk", active_disk, FROMEQUALS); } YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 198 "libxlu_disk_l.l" +#line 199 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("hidden-disk", hidden_disk, FROMEQUALS); } YY_BREAK /* the target magic parameter, eats the rest of the string */ case 22: YY_RULE_SETUP -#line 202 "libxlu_disk_l.l" +#line 203 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } YY_BREAK /* unknown parameters */ case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 206 "libxlu_disk_l.l" +#line 207 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown parameter"); } YY_BREAK /* deprecated prefixes */ @@ -1505,7 +1697,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 24: YY_RULE_SETUP -#line 213 "libxlu_disk_l.l" +#line 214 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1514,7 +1706,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 219 "libxlu_disk_l.l" +#line 220 "libxlu_disk_l.l" { char *newscript; STRIP(':'); @@ -1533,12 +1725,12 @@ case 26: yyg->yy_c_buf_p = yy_cp = yy_bp + 8; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 232 "libxlu_disk_l.l" +#line 233 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 27: YY_RULE_SETUP -#line 233 "libxlu_disk_l.l" +#line 234 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 28: @@ -1546,7 +1738,7 @@ case 28: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 234 "libxlu_disk_l.l" +#line 235 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 29: @@ -1554,7 +1746,7 @@ case 29: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 235 "libxlu_disk_l.l" +#line 236 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 30: @@ -1562,7 +1754,7 @@ case 30: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 236 "libxlu_disk_l.l" +#line 237 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 31: @@ -1570,13 +1762,13 @@ case 31: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 237 "libxlu_disk_l.l" +#line 238 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 32: /* rule 32 can match eol */ YY_RULE_SETUP -#line 239 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); return 0; @@ -1586,7 +1778,7 @@ YY_RULE_SETUP case 33: /* rule 33 can match eol */ YY_RULE_SETUP -#line 246 "libxlu_disk_l.l" +#line 247 "libxlu_disk_l.l" { STRIP(','); @@ -1615,7 +1807,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 272 "libxlu_disk_l.l" +#line 273 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1623,17 +1815,17 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 276 "libxlu_disk_l.l" +#line 277 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 36: YY_RULE_SETUP -#line 279 "libxlu_disk_l.l" +#line 280 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1637 "libxlu_disk_l.c" +#line 1829 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -1652,7 +1844,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called - * xlu__disk_yylex(). If so, then we have to assure + * yylex(). If so, then we have to assure * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a @@ -1712,7 +1904,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); { yyg->yy_did_buffer_switch_on_eof = 0; - if ( xlu__disk_yywrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1766,7 +1958,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); } /* end of action switch */ } /* end of scanning one token */ } /* end of user's declarations */ -} /* end of xlu__disk_yylex */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1778,9 +1970,9 @@ YY_FATAL_ERROR( "flex scanner jammed" ); static int yy_get_next_buffer (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = yyg->yytext_ptr; - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = yyg->yytext_ptr; + int number_to_move, i; int ret_val; if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) @@ -1809,7 +2001,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1848,7 +2040,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - xlu__disk_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); } else @@ -1862,12 +2054,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xlu__disk_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } yyg->yy_n_chars += number_to_move; @@ -1883,8 +2078,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) static yy_state_type yy_get_previous_state (yyscan_t yyscanner) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yy_current_state = yyg->yy_start; @@ -1894,14 +2089,14 @@ static int yy_get_next_buffer (yyscan_t yyscanner) for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 355 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *yyg->yy_state_ptr++ = yy_current_state; } @@ -1915,17 +2110,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) { - register int yy_is_jam; + int yy_is_jam; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 355 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 354); if ( ! yy_is_jam ) *yyg->yy_state_ptr++ = yy_current_state; @@ -1934,6 +2129,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner) return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (yyscan_t yyscanner) @@ -1959,7 +2158,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1976,14 +2175,14 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ /* Reset buffer status. */ - xlu__disk_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( xlu__disk_yywrap(yyscanner ) ) - return EOF; + if ( yywrap( yyscanner ) ) + return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -2014,34 +2213,34 @@ static int yy_get_next_buffer (yyscan_t yyscanner) * @param yyscanner The scanner object. * @note This function does not reset the start condition to @c INITIAL . */ - void xlu__disk_yyrestart (FILE * input_file , yyscan_t yyscanner) + void yyrestart (FILE * input_file , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! YY_CURRENT_BUFFER ){ - xlu__disk_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - xlu__disk_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @param yyscanner The scanner object. */ - void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* TODO. We should be able to replace this entire function body * with - * xlu__disk_yypop_buffer_state(); - * xlu__disk_yypush_buffer_state(new_buffer); + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); */ - xlu__disk_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); if ( YY_CURRENT_BUFFER == new_buffer ) return; @@ -2054,17 +2253,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); /* We don't actually know whether we did this switch during - * EOF (xlu__disk_yywrap()) processing, but the only time this flag - * is looked at is after xlu__disk_yywrap() is called, so it's safe + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ yyg->yy_did_buffer_switch_on_eof = 1; } -static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) +static void yy_load_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; @@ -2079,35 +2278,35 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the allocated buffer state. */ - YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) xlu__disk_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) xlu__disk_yyalloc(b->yy_buf_size + 2 ,yyscanner ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - xlu__disk_yy_init_buffer(b,file ,yyscanner); + yy_init_buffer( b, file , yyscanner); return b; } /** Destroy the buffer. - * @param b a buffer created with xlu__disk_yy_create_buffer() + * @param b a buffer created with yy_create_buffer() * @param yyscanner The scanner object. */ - void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -2118,28 +2317,28 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - xlu__disk_yyfree((void *) b->yy_ch_buf ,yyscanner ); + yyfree( (void *) b->yy_ch_buf , yyscanner ); - xlu__disk_yyfree((void *) b ,yyscanner ); + yyfree( (void *) b , yyscanner ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, - * such as during a xlu__disk_yyrestart() or at EOF. + * such as during a yyrestart() or at EOF. */ - static void xlu__disk_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) { int oerrno = errno; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - xlu__disk_yy_flush_buffer(b ,yyscanner); + yy_flush_buffer( b , yyscanner); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then xlu__disk_yy_init_buffer was _probably_ - * called from xlu__disk_yyrestart() or through yy_get_next_buffer. + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. * In that case, we don't want to reset the lineno or column. */ if (b != YY_CURRENT_BUFFER){ @@ -2156,7 +2355,7 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * @param yyscanner The scanner object. */ - void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! b ) @@ -2177,7 +2376,7 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } /** Pushes the new state onto the stack. The new state becomes @@ -2186,15 +2385,15 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) * @param new_buffer The new state. * @param yyscanner The scanner object. */ -void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (new_buffer == NULL) return; - xlu__disk_yyensure_buffer_stack(yyscanner); + yyensure_buffer_stack(yyscanner); - /* This block is copied from xlu__disk_yy_switch_to_buffer. */ + /* This block is copied from yy_switch_to_buffer. */ if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ @@ -2208,8 +2407,8 @@ void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscan yyg->yy_buffer_stack_top++; YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from xlu__disk_yy_switch_to_buffer. */ - xlu__disk_yy_load_buffer_state(yyscanner ); + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } @@ -2217,19 +2416,19 @@ void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscan * The next element becomes the new top. * @param yyscanner The scanner object. */ -void xlu__disk_yypop_buffer_state (yyscan_t yyscanner) +void yypop_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!YY_CURRENT_BUFFER) return; - xlu__disk_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); YY_CURRENT_BUFFER_LVALUE = NULL; if (yyg->yy_buffer_stack_top > 0) --yyg->yy_buffer_stack_top; if (YY_CURRENT_BUFFER) { - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } } @@ -2237,7 +2436,7 @@ void xlu__disk_yypop_buffer_state (yyscan_t yyscanner) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) +static void yyensure_buffer_stack (yyscan_t yyscanner) { yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -2248,15 +2447,15 @@ static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; - yyg->yy_buffer_stack = (struct yy_buffer_state**)xlu__disk_yyalloc + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yyensure_buffer_stack()" ); - + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_top = 0; return; @@ -2265,15 +2464,15 @@ static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)xlu__disk_yyrealloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc (yyg->yy_buffer_stack, num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yyensure_buffer_stack()" ); + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -2285,9 +2484,9 @@ static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; @@ -2295,69 +2494,69 @@ YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char * base, yy_size_t size , yyscan base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) xlu__disk_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - xlu__disk_yy_switch_to_buffer(b ,yyscanner ); + yy_switch_to_buffer( b , yyscanner ); return b; } -/** Setup the input buffer state to scan a string. The next call to xlu__disk_yylex() will +/** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan * @param yyscanner The scanner object. * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use - * xlu__disk_yy_scan_bytes() instead. + * yy_scan_bytes() instead. */ -YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) { - return xlu__disk_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); + return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); } -/** Setup the input buffer state to scan the given bytes. The next call to xlu__disk_yylex() will +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) xlu__disk_yyalloc(n ,yyscanner ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n , yyscanner ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); for ( i = 0; i < _yybytes_len; ++i ) buf[i] = yybytes[i]; buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = xlu__disk_yy_scan_buffer(buf,n ,yyscanner); + b = yy_scan_buffer( buf, n , yyscanner); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in xlu__disk_yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -2371,9 +2570,11 @@ YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yy #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) { - (void) fprintf( stderr, "%s\n", msg ); + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2399,7 +2600,7 @@ static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) /** Get the user-defined data for this scanner. * @param yyscanner The scanner object. */ -YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner) +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyextra; @@ -2408,10 +2609,10 @@ YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner) /** Get the current line number. * @param yyscanner The scanner object. */ -int xlu__disk_yyget_lineno (yyscan_t yyscanner) +int yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2421,10 +2622,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner) /** Get the current column number. * @param yyscanner The scanner object. */ -int xlu__disk_yyget_column (yyscan_t yyscanner) +int yyget_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2434,7 +2635,7 @@ int xlu__disk_yyget_column (yyscan_t yyscanner) /** Get the input stream. * @param yyscanner The scanner object. */ -FILE *xlu__disk_yyget_in (yyscan_t yyscanner) +FILE *yyget_in (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyin; @@ -2443,7 +2644,7 @@ FILE *xlu__disk_yyget_in (yyscan_t yyscanner) /** Get the output stream. * @param yyscanner The scanner object. */ -FILE *xlu__disk_yyget_out (yyscan_t yyscanner) +FILE *yyget_out (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyout; @@ -2452,7 +2653,7 @@ FILE *xlu__disk_yyget_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner) +int yyget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -2462,7 +2663,7 @@ yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner) * @param yyscanner The scanner object. */ -char *xlu__disk_yyget_text (yyscan_t yyscanner) +char *yyget_text (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yytext; @@ -2472,90 +2673,88 @@ char *xlu__disk_yyget_text (yyscan_t yyscanner) * @param user_defined The data to be associated with this scanner. * @param yyscanner The scanner object. */ -void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyextra = user_defined ; } /** Set the current line number. - * @param line_number + * @param _line_number line number * @param yyscanner The scanner object. */ -void xlu__disk_yyset_lineno (int line_number , yyscan_t yyscanner) +void yyset_lineno (int _line_number , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "xlu__disk_yyset_lineno called with no buffer" ); + YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); - yylineno = line_number; + yylineno = _line_number; } /** Set the current column. - * @param line_number + * @param _column_no column number * @param yyscanner The scanner object. */ -void xlu__disk_yyset_column (int column_no , yyscan_t yyscanner) +void yyset_column (int _column_no , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "xlu__disk_yyset_column called with no buffer" ); + YY_FATAL_ERROR( "yyset_column called with no buffer" ); - yycolumn = column_no; + yycolumn = _column_no; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * @param yyscanner The scanner object. - * @see xlu__disk_yy_switch_to_buffer + * @see yy_switch_to_buffer */ -void xlu__disk_yyset_in (FILE * in_str , yyscan_t yyscanner) +void yyset_in (FILE * _in_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = in_str ; + yyin = _in_str ; } -void xlu__disk_yyset_out (FILE * out_str , yyscan_t yyscanner) +void yyset_out (FILE * _out_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = out_str ; + yyout = _out_str ; } -int xlu__disk_yyget_debug (yyscan_t yyscanner) +int yyget_debug (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yy_flex_debug; } -void xlu__disk_yyset_debug (int bdebug , yyscan_t yyscanner) +void yyset_debug (int _bdebug , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } /* Accessor methods for yylval and yylloc */ /* User-visible API */ -/* xlu__disk_yylex_init is special because it creates the scanner itself, so it is +/* yylex_init is special because it creates the scanner itself, so it is * the ONLY reentrant function that doesn't take the scanner as the last argument. * That's why we explicitly handle the declaration, instead of using our macros. */ - -int xlu__disk_yylex_init(yyscan_t* ptr_yy_globals) - +int yylex_init(yyscan_t* ptr_yy_globals) { if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - *ptr_yy_globals = (yyscan_t) xlu__disk_yyalloc ( sizeof( struct yyguts_t ), NULL ); + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); if (*ptr_yy_globals == NULL){ errno = ENOMEM; @@ -2568,39 +2767,37 @@ int xlu__disk_yylex_init(yyscan_t* ptr_yy_globals) return yy_init_globals ( *ptr_yy_globals ); } -/* xlu__disk_yylex_init_extra has the same functionality as xlu__disk_yylex_init, but follows the +/* yylex_init_extra has the same functionality as yylex_init, but follows the * convention of taking the scanner as the last argument. Note however, that * this is a *pointer* to a scanner, as it will be allocated by this call (and * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to xlu__disk_yyalloc in + * The user defined value in the first argument will be available to yyalloc in * the yyextra field. */ - -int xlu__disk_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - +int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) { struct yyguts_t dummy_yyguts; - xlu__disk_yyset_extra (yy_user_defined, &dummy_yyguts); + yyset_extra (yy_user_defined, &dummy_yyguts); if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - - *ptr_yy_globals = (yyscan_t) xlu__disk_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - xlu__disk_yyset_extra (yy_user_defined, *ptr_yy_globals); - + + yyset_extra (yy_user_defined, *ptr_yy_globals); + return yy_init_globals ( *ptr_yy_globals ); } @@ -2608,13 +2805,13 @@ static int yy_init_globals (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Initialization is the same as for the non-reentrant scanner. - * This function is called from xlu__disk_yylex_destroy(), so don't allocate here. + * This function is called from yylex_destroy(), so don't allocate here. */ - yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack = NULL; yyg->yy_buffer_stack_top = 0; yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = (char *) 0; + yyg->yy_c_buf_p = NULL; yyg->yy_init = 0; yyg->yy_start = 0; @@ -2632,45 +2829,45 @@ static int yy_init_globals (yyscan_t yyscanner) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by - * xlu__disk_yylex_init() + * yylex_init() */ return 0; } -/* xlu__disk_yylex_destroy is for both reentrant and non-reentrant scanners. */ -int xlu__disk_yylex_destroy (yyscan_t yyscanner) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - xlu__disk_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); YY_CURRENT_BUFFER_LVALUE = NULL; - xlu__disk_yypop_buffer_state(yyscanner); + yypop_buffer_state(yyscanner); } /* Destroy the stack itself. */ - xlu__disk_yyfree(yyg->yy_buffer_stack ,yyscanner); + yyfree(yyg->yy_buffer_stack , yyscanner); yyg->yy_buffer_stack = NULL; /* Destroy the start condition stack. */ - xlu__disk_yyfree(yyg->yy_start_stack ,yyscanner ); + yyfree( yyg->yy_start_stack , yyscanner ); yyg->yy_start_stack = NULL; - xlu__disk_yyfree ( yyg->yy_state_buf , yyscanner); + yyfree ( yyg->yy_state_buf , yyscanner); yyg->yy_state_buf = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time - * xlu__disk_yylex() is called, initialization will occur. */ + * yylex() is called, initialization will occur. */ yy_init_globals( yyscanner); /* Destroy the main struct (reentrant only). */ - xlu__disk_yyfree ( yyscanner , yyscanner ); + yyfree ( yyscanner , yyscanner ); yyscanner = NULL; return 0; } @@ -2680,18 +2877,21 @@ int xlu__disk_yylex_destroy (yyscan_t yyscanner) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +static void yy_flex_strncpy (char* s1, const char * s2, int n , yyscan_t yyscanner) { - register int i; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +static int yy_flex_strlen (const char * s , yyscan_t yyscanner) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2699,13 +2899,18 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) } #endif -void *xlu__disk_yyalloc (yy_size_t size , yyscan_t yyscanner) +void *yyalloc (yy_size_t size , yyscan_t yyscanner) { - return (void *) malloc( size ); + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + return malloc(size); } -void *xlu__disk_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) { + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2713,14 +2918,16 @@ void *xlu__disk_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } -void xlu__disk_yyfree (void * ptr , yyscan_t yyscanner) +void yyfree (void * ptr , yyscan_t yyscanner) { - free( (char *) ptr ); /* see xlu__disk_yyrealloc() for (char *) cast */ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 278 "libxlu_disk_l.l" +#line 280 "libxlu_disk_l.l" diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 4d60d5c563..9275a3ab55 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -3,12 +3,9 @@ #define xlu__disk_yyIN_HEADER 1 #line 6 "libxlu_disk_l.h" -#line 31 "libxlu_disk_l.l" #include "libxl_osdeps.h" /* must come before any other headers */ - - -#line 12 "libxlu_disk_l.h" +#line 9 "libxlu_disk_l.h" #define YY_INT_ALIGNED short int @@ -16,12 +13,222 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define xlu__disk_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer xlu__disk_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define xlu__disk_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer xlu__disk_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define xlu__disk_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer xlu__disk_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define xlu__disk_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string xlu__disk_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define xlu__disk_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes xlu__disk_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define xlu__disk_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer xlu__disk_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define xlu__disk_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer xlu__disk_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define xlu__disk_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state xlu__disk_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define xlu__disk_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer xlu__disk_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define xlu__disk_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state xlu__disk_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define xlu__disk_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state xlu__disk_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define xlu__disk_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack xlu__disk_yyensure_buffer_stack +#endif + +#ifdef yylex +#define xlu__disk_yylex_ALREADY_DEFINED +#else +#define yylex xlu__disk_yylex +#endif + +#ifdef yyrestart +#define xlu__disk_yyrestart_ALREADY_DEFINED +#else +#define yyrestart xlu__disk_yyrestart +#endif + +#ifdef yylex_init +#define xlu__disk_yylex_init_ALREADY_DEFINED +#else +#define yylex_init xlu__disk_yylex_init +#endif + +#ifdef yylex_init_extra +#define xlu__disk_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra xlu__disk_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define xlu__disk_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy xlu__disk_yylex_destroy +#endif + +#ifdef yyget_debug +#define xlu__disk_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug xlu__disk_yyget_debug +#endif + +#ifdef yyset_debug +#define xlu__disk_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug xlu__disk_yyset_debug +#endif + +#ifdef yyget_extra +#define xlu__disk_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra xlu__disk_yyget_extra +#endif + +#ifdef yyset_extra +#define xlu__disk_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra xlu__disk_yyset_extra +#endif + +#ifdef yyget_in +#define xlu__disk_yyget_in_ALREADY_DEFINED +#else +#define yyget_in xlu__disk_yyget_in +#endif + +#ifdef yyset_in +#define xlu__disk_yyset_in_ALREADY_DEFINED +#else +#define yyset_in xlu__disk_yyset_in +#endif + +#ifdef yyget_out +#define xlu__disk_yyget_out_ALREADY_DEFINED +#else +#define yyget_out xlu__disk_yyget_out +#endif + +#ifdef yyset_out +#define xlu__disk_yyset_out_ALREADY_DEFINED +#else +#define yyset_out xlu__disk_yyset_out +#endif + +#ifdef yyget_leng +#define xlu__disk_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng xlu__disk_yyget_leng +#endif + +#ifdef yyget_text +#define xlu__disk_yyget_text_ALREADY_DEFINED +#else +#define yyget_text xlu__disk_yyget_text +#endif + +#ifdef yyget_lineno +#define xlu__disk_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno xlu__disk_yyget_lineno +#endif + +#ifdef yyset_lineno +#define xlu__disk_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno xlu__disk_yyset_lineno +#endif + +#ifdef yyget_column +#define xlu__disk_yyget_column_ALREADY_DEFINED +#else +#define yyget_column xlu__disk_yyget_column +#endif + +#ifdef yyset_column +#define xlu__disk_yyset_column_ALREADY_DEFINED +#else +#define yyset_column xlu__disk_yyset_column +#endif + +#ifdef yywrap +#define xlu__disk_yywrap_ALREADY_DEFINED +#else +#define yywrap xlu__disk_yywrap +#endif + +#ifdef yyalloc +#define xlu__disk_yyalloc_ALREADY_DEFINED +#else +#define yyalloc xlu__disk_yyalloc +#endif + +#ifdef yyrealloc +#define xlu__disk_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc xlu__disk_yyrealloc +#endif + +#ifdef yyfree +#define xlu__disk_yyfree_ALREADY_DEFINED +#else +#define yyfree xlu__disk_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -92,29 +299,23 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* An opaque pointer. */ @@ -169,12 +370,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -197,7 +398,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -208,23 +409,23 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void xlu__disk_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void xlu__disk_yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *xlu__disk_yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *xlu__disk_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); -#define xlu__disk_yywrap(yyscanner) 1 +#define xlu__disk_yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP #define yytext_ptr yytext_r @@ -247,42 +448,42 @@ void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); #define YY_EXTRA_TYPE void * #endif -int xlu__disk_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int xlu__disk_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int xlu__disk_yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int xlu__disk_yyget_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void xlu__disk_yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void xlu__disk_yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void xlu__disk_yyset_out (FILE * out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *xlu__disk_yyget_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int xlu__disk_yyget_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int xlu__disk_yyget_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -290,18 +491,18 @@ void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int xlu__disk_yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int xlu__disk_yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -329,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int xlu__disk_yylex (yyscan_t yyscanner); +extern int yylex (yyscan_t yyscanner); -#define YY_DECL int xlu__disk_yylex (yyscan_t yyscanner) +#define YY_DECL int yylex (yyscan_t yyscanner) #endif /* !YY_DECL */ /* yy_get_previous_state - get the state just before the EOB char was reached */ @@ -348,8 +549,153 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); #undef YY_DECL #endif -#line 278 "libxlu_disk_l.l" +#ifndef xlu__disk_yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef xlu__disk_yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef xlu__disk_yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef xlu__disk_yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef xlu__disk_yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef xlu__disk_yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef xlu__disk_yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef xlu__disk_yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef xlu__disk_yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef xlu__disk_yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef xlu__disk_yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef xlu__disk_yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef xlu__disk_yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef xlu__disk_yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef xlu__disk_yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef xlu__disk_yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef xlu__disk_yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef xlu__disk_yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef xlu__disk_yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef xlu__disk_yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef xlu__disk_yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef xlu__disk_yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef xlu__disk_yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef xlu__disk_yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef xlu__disk_yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef xlu__disk_yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef xlu__disk_yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef xlu__disk_yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef xlu__disk_yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef xlu__disk_yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef xlu__disk_yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef xlu__disk_yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef xlu__disk_yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef xlu__disk_yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef xlu__disk_yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef xlu__disk_yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef xlu__disk_yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef xlu__disk_yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef xlu__disk_yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef xlu__disk_yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef xlu__disk_yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef xlu__disk_yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef xlu__disk_yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef xlu__disk_yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef xlu__disk_yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef xlu__disk_yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef xlu__disk_yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef xlu__disk_yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 280 "libxlu_disk_l.l" -#line 354 "libxlu_disk_l.h" +#line 700 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sun May 10 12:11:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 12:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXkne-0007GD-5c; Sun, 10 May 2020 12:11:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXknc-0007G3-Tz for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 12:11:16 +0000 X-Inumbo-ID: 588b11e8-92b7-11ea-a18c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 588b11e8-92b7-11ea-a18c-12813bfff9fa; Sun, 10 May 2020 12:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8nyvSmQki98mmtEg1sOEf0RoqjXl9Aoy6bDWqdYa6Wc=; b=ks0F2Zjqox6fWs9MhgNYz1i6NL Q5ictvqbN1/cUx6ONnGxvGGH6KSZxRODc3vWBzHUTMNzBKW0cGSecUBwUsvDdDtF4U+05MBfVnyUT Xzlz+ZUdIVNKXw2/o/O5SP26DXcM8qIydZ8thzEMtT77gmkORypG6mEDXxsrYYC7aUIc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXkna-0008TR-U9 for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 12:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXkna-0002to-Sx for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 12:11:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxl: disable clang indentation check for the disk parser Message-Id: Date: Sun, 10 May 2020 12:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 190c60f12db469472476041ecd0e6c9a0d4b0f8a Author: Roger Pau Monne AuthorDate: Tue May 5 11:24:54 2020 +0200 Commit: Wei Liu CommitDate: Sun May 10 13:02:18 2020 +0100 tools/libxl: disable clang indentation check for the disk parser Clang 10 complains with: 13: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] if ( ! yyg->yy_state_buf ) ^ libxlu_disk_l.c:1259:9: note: previous statement is here if ( ! yyg->yy_state_buf ) ^ Due to the missing braces in single line statements and the wrong indentation. Fix this by disabling the warning for that specific file. I haven't found a way to force flex to add braces around single line statements in conditional blocks. Signed-off-by: Roger Pau Monné [ wei: regenerate output files ] Acked-by: Wei Liu --- tools/libxl/libxlu_disk_l.c | 97 +++++++++++++++++++++++++-------------------- tools/libxl/libxlu_disk_l.h | 2 +- tools/libxl/libxlu_disk_l.l | 11 +++++ 3 files changed, 66 insertions(+), 44 deletions(-) diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index b0ac3a865a..05f7ac74a0 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1074,6 +1074,17 @@ goto find_rule; \ #define YY_NO_INPUT +/* The code generated by flex is missing braces in single line expressions and + * is not properly indented, which triggers the clang misleading-indentation + * check that has been made part of -Wall since clang 10. In order to safely + * disable it on clang versions that don't have the diagnostic implemented + * also disable the unknown option and pragma warning. */ +#ifdef __clang__ +# pragma clang diagnostic ignored "-Wunknown-pragmas" +# pragma clang diagnostic ignored "-Wunknown-warning-option" +# pragma clang diagnostic ignored "-Wmisleading-indentation" +#endif + /* Some versions of flex have a bug (Fedora bugzilla 612465) which causes * it to fail to declare these functions, which it defines. So declare * them ourselves. Hopefully we won't have to simultaneously support @@ -1188,9 +1199,9 @@ static int vdev_and_devtype(DiskParseContext *dpc, char *str) { #undef DPC /* needs to be defined differently the actual lexer */ #define DPC ((DiskParseContext*)yyextra) -#line 1192 "libxlu_disk_l.c" +#line 1203 "libxlu_disk_l.c" -#line 1194 "libxlu_disk_l.c" +#line 1205 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1466,13 +1477,13 @@ YY_DECL } { -#line 166 "libxlu_disk_l.l" +#line 177 "libxlu_disk_l.l" -#line 169 "libxlu_disk_l.l" +#line 180 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1476 "libxlu_disk_l.c" +#line 1487 "libxlu_disk_l.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1561,135 +1572,135 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 171 "libxlu_disk_l.l" +#line 182 "libxlu_disk_l.l" { /* ignore whitespace before parameters */ } YY_BREAK /* ordinary parameters setting enums or strings */ case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 175 "libxlu_disk_l.l" +#line 186 "libxlu_disk_l.l" { STRIP(','); setformat(DPC, FROMEQUALS); } YY_BREAK case 3: YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 188 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 4: YY_RULE_SETUP -#line 178 "libxlu_disk_l.l" +#line 189 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 5: YY_RULE_SETUP -#line 179 "libxlu_disk_l.l" +#line 190 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 0; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 180 "libxlu_disk_l.l" +#line 191 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown value for type"); } YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 182 "libxlu_disk_l.l" +#line 193 "libxlu_disk_l.l" { STRIP(','); setaccess(DPC, FROMEQUALS); } YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 183 "libxlu_disk_l.l" +#line 194 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("backend", backend_domname, FROMEQUALS); } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 184 "libxlu_disk_l.l" +#line 195 "libxlu_disk_l.l" { STRIP(','); setbackendtype(DPC,FROMEQUALS); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 186 "libxlu_disk_l.l" +#line 197 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 187 "libxlu_disk_l.l" +#line 198 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } YY_BREAK case 12: YY_RULE_SETUP -#line 188 "libxlu_disk_l.l" +#line 199 "libxlu_disk_l.l" { DPC->disk->direct_io_safe = 1; } YY_BREAK case 13: YY_RULE_SETUP -#line 189 "libxlu_disk_l.l" +#line 200 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, true); } YY_BREAK case 14: YY_RULE_SETUP -#line 190 "libxlu_disk_l.l" +#line 201 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, false); } YY_BREAK /* Note that the COLO configuration settings should be considered unstable. * They may change incompatibly in future versions of Xen. */ case 15: YY_RULE_SETUP -#line 193 "libxlu_disk_l.l" +#line 204 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, true); } YY_BREAK case 16: YY_RULE_SETUP -#line 194 "libxlu_disk_l.l" +#line 205 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, false); } YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 195 "libxlu_disk_l.l" +#line 206 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-host", colo_host, FROMEQUALS); } YY_BREAK case 18: /* rule 18 can match eol */ YY_RULE_SETUP -#line 196 "libxlu_disk_l.l" +#line 207 "libxlu_disk_l.l" { STRIP(','); setcoloport(DPC, FROMEQUALS); } YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 197 "libxlu_disk_l.l" +#line 208 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-export", colo_export, FROMEQUALS); } YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 198 "libxlu_disk_l.l" +#line 209 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("active-disk", active_disk, FROMEQUALS); } YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 199 "libxlu_disk_l.l" +#line 210 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("hidden-disk", hidden_disk, FROMEQUALS); } YY_BREAK /* the target magic parameter, eats the rest of the string */ case 22: YY_RULE_SETUP -#line 203 "libxlu_disk_l.l" +#line 214 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } YY_BREAK /* unknown parameters */ case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 207 "libxlu_disk_l.l" +#line 218 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown parameter"); } YY_BREAK /* deprecated prefixes */ @@ -1697,7 +1708,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 24: YY_RULE_SETUP -#line 214 "libxlu_disk_l.l" +#line 225 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1706,7 +1717,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 220 "libxlu_disk_l.l" +#line 231 "libxlu_disk_l.l" { char *newscript; STRIP(':'); @@ -1725,12 +1736,12 @@ case 26: yyg->yy_c_buf_p = yy_cp = yy_bp + 8; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 233 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 27: YY_RULE_SETUP -#line 234 "libxlu_disk_l.l" +#line 245 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 28: @@ -1738,7 +1749,7 @@ case 28: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 235 "libxlu_disk_l.l" +#line 246 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 29: @@ -1746,7 +1757,7 @@ case 29: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 236 "libxlu_disk_l.l" +#line 247 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 30: @@ -1754,7 +1765,7 @@ case 30: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 237 "libxlu_disk_l.l" +#line 248 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 31: @@ -1762,13 +1773,13 @@ case 31: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 238 "libxlu_disk_l.l" +#line 249 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 32: /* rule 32 can match eol */ YY_RULE_SETUP -#line 240 "libxlu_disk_l.l" +#line 251 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); return 0; @@ -1778,7 +1789,7 @@ YY_RULE_SETUP case 33: /* rule 33 can match eol */ YY_RULE_SETUP -#line 247 "libxlu_disk_l.l" +#line 258 "libxlu_disk_l.l" { STRIP(','); @@ -1807,7 +1818,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 273 "libxlu_disk_l.l" +#line 284 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1815,17 +1826,17 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 277 "libxlu_disk_l.l" +#line 288 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 36: YY_RULE_SETUP -#line 280 "libxlu_disk_l.l" +#line 291 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1829 "libxlu_disk_l.c" +#line 1840 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -2930,4 +2941,4 @@ void yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 280 "libxlu_disk_l.l" +#line 291 "libxlu_disk_l.l" diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 9275a3ab55..54f4662d7a 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -694,7 +694,7 @@ extern int yylex (yyscan_t yyscanner); #undef yyTABLES_NAME #endif -#line 280 "libxlu_disk_l.l" +#line 291 "libxlu_disk_l.l" #line 700 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER diff --git a/tools/libxl/libxlu_disk_l.l b/tools/libxl/libxlu_disk_l.l index 97039a2800..7a46f4a30c 100644 --- a/tools/libxl/libxlu_disk_l.l +++ b/tools/libxl/libxlu_disk_l.l @@ -36,6 +36,17 @@ #define YY_NO_INPUT +/* The code generated by flex is missing braces in single line expressions and + * is not properly indented, which triggers the clang misleading-indentation + * check that has been made part of -Wall since clang 10. In order to safely + * disable it on clang versions that don't have the diagnostic implemented + * also disable the unknown option and pragma warning. */ +#ifdef __clang__ +# pragma clang diagnostic ignored "-Wunknown-pragmas" +# pragma clang diagnostic ignored "-Wunknown-warning-option" +# pragma clang diagnostic ignored "-Wmisleading-indentation" +#endif + /* Some versions of flex have a bug (Fedora bugzilla 612465) which causes * it to fail to declare these functions, which it defines. So declare * them ourselves. Hopefully we won't have to simultaneously support -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sun May 10 20:55:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 10 May 2020 20:55:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXsyW-0007xh-1U; Sun, 10 May 2020 20:55:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXsyU-0007xc-HC for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 20:55:02 +0000 X-Inumbo-ID: 8448b7d8-9300-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8448b7d8-9300-11ea-b07b-bc764e2007e4; Sun, 10 May 2020 20:55:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RyPFLBL957vDVTHwv5tYS+G5YsXdgmtoQ8ABh3BOej4=; b=i8U5tx40SBEaPcihaQmKkWiFKg yMbU95Nx+D1OaxCbpRLiaCqL040hWgi82qjySW/uct2EGkhwTksDsDazmkJnXH6uYypybANHxVatr uWEjWAmc/i5sjhOPW/EgJ1cQdb52kan6hSbrUmBOsYO5nTT60ZRMLqvoP13DPDTfDULg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jXsyT-0002pJ-JE for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 20:55:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jXsyT-0002x6-Hd for xen-changelog@lists.xenproject.org; Sun, 10 May 2020 20:55:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.9] tools/xenstore: fix a use after free problem in xenstored Message-Id: Date: Sun, 10 May 2020 20:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 93cc305d1f3e7c6949a8f4116446624fa2dbfdf4 Author: Juergen Gross AuthorDate: Fri Apr 3 13:03:40 2020 +0100 Commit: Ian Jackson CommitDate: Tue May 5 15:36:20 2020 +0100 tools/xenstore: fix a use after free problem in xenstored Commit 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") introduced a potential use after free problem in domain_cleanup(): after calling talloc_unlink() for domain->conn domain->conn is set to NULL. The problem is that domain is registered as talloc child of domain->conn, so it might be freed by the talloc_unlink() call. With Xenstore being single threaded there are normally no concurrent memory allocations running and freeing a virtual memory area normally doesn't result in that area no longer being accessible. A problem could occur only in case either a signal received results in some memory allocation done in the signal handler (SIGHUP is a primary candidate leading to reopening the log file), or in case the talloc framework would do some internal memory allocation during freeing of the memory (which would lead to clobbering of the freed domain structure). Fixes: 562a1c0f7ef3fb ("tools/xenstore: dont unlink connection object twice") Signed-off-by: Juergen Gross Reviewed-by: Julien Grall (cherry picked from commit bb2a34fd740e9a26be9e2244f1a5b4cef439e5a8) (cherry picked from commit dc5176d0f9434e275e0be1df8d0518e243798beb) (cherry picked from commit a997ffe678e698ff2b4c89ae5a98661d12247fef) (cherry picked from commit 48e8564435aca590f1c292ab7bb1f3dbc6b75693) (cherry picked from commit 1e722e6971539eab4f484affd60490cbc8429951) --- tools/xenstore/xenstored_domain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index fa6655033a..eb1f541188 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -222,6 +222,7 @@ static void domain_cleanup(void) { xc_dominfo_t dominfo; struct domain *domain; + struct connection *conn; int notify = 0; again: @@ -238,8 +239,10 @@ static void domain_cleanup(void) continue; } if (domain->conn) { - talloc_unlink(talloc_autofree_context(), domain->conn); + /* domain is a talloc child of domain->conn. */ + conn = domain->conn; domain->conn = NULL; + talloc_unlink(talloc_autofree_context(), conn); notify = 0; /* destroy_domain() fires the watch */ goto again; } -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.9 From xen-changelog-bounces@lists.xenproject.org Mon May 11 09:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 May 2020 09:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59Y-0001XW-Dd; Mon, 11 May 2020 09:55:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59X-0001XQ-EV for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:15 +0000 X-Inumbo-ID: 82f66c14-936d-11ea-a1fd-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 82f66c14-936d-11ea-a1fd-12813bfff9fa; Mon, 11 May 2020 09:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=e6MBGu0WmbgpyCZBQO+kiLigAV19LdMi74kDol1o3Us=; b=rsPSd5PgRQyG7fmoQU23LmPRnI 60OwauIFCYOCvP3jqRh4KEbMf0LdBW7HYxa75G+ZmkQVnxLt8z/4YitVjhgAXJ4ZuXZ+lpJsoR/8V CGMhozsvRKaWmJeMtiNRHxtX1wD94ULOk90xbuurtWYvOoSH0FBan+1qL3wAJWpiFIkQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59W-0002RX-FR for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jY59W-0006bD-DP for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: atomic: Allow read_atomic() to be used in more cases Message-Id: Date: Mon, 11 May 2020 09:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9efda0281b29ac8ac5793457b8f71e6ff35f898c Author: Julien Grall AuthorDate: Sat May 2 15:06:22 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:47:57 2020 +0100 xen/arm: atomic: Allow read_atomic() to be used in more cases The current implementation of read_atomic() on Arm will not allow to: 1) Read a value from a pointer to const because the temporary variable will be const and therefore it is not possible to assign any value. This can be solved by using a union between the type and a char[0]. 2) Read a pointer value (e.g void *) because the switch contains cast from other type than the size of a pointer. This can be solved by by introducing a static inline for the switch and use void * for the pointer. Reported-by: Juergen Gross Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/atomic.h | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index e81bf80e30..3c3d6bb04e 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -71,18 +71,37 @@ build_add_sized(add_u32_sized, "", WORD, uint32_t) #undef build_atomic_write #undef build_add_sized +void __bad_atomic_read(const volatile void *p, void *res); void __bad_atomic_size(void); +static always_inline void read_atomic_size(const volatile void *p, + void *res, + unsigned int size) +{ + switch ( size ) + { + case 1: + *(uint8_t *)res = read_u8_atomic(p); + break; + case 2: + *(uint16_t *)res = read_u16_atomic(p); + break; + case 4: + *(uint32_t *)res = read_u32_atomic(p); + break; + case 8: + *(uint64_t *)res = read_u64_atomic(p); + break; + default: + __bad_atomic_read(p, res); + break; + } +} + #define read_atomic(p) ({ \ - typeof(*p) __x; \ - switch ( sizeof(*p) ) { \ - case 1: __x = (typeof(*p))read_u8_atomic((uint8_t *)p); break; \ - case 2: __x = (typeof(*p))read_u16_atomic((uint16_t *)p); break; \ - case 4: __x = (typeof(*p))read_u32_atomic((uint32_t *)p); break; \ - case 8: __x = (typeof(*p))read_u64_atomic((uint64_t *)p); break; \ - default: __x = 0; __bad_atomic_size(); break; \ - } \ - __x; \ + union { typeof(*p) val; char c[0]; } x_; \ + read_atomic_size(p, x_.c, sizeof(*p)); \ + x_.val; \ }) #define write_atomic(p, x) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 11 09:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 May 2020 09:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59R-0001Wd-C9; Mon, 11 May 2020 09:55:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59P-0001WY-Nb for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:07 +0000 X-Inumbo-ID: 7ceb5e38-936d-11ea-a1fd-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7ceb5e38-936d-11ea-a1fd-12813bfff9fa; Mon, 11 May 2020 09:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7Bf5wgZPvepH7mfqHTuCDAaqyETiRZBrrGu5VGOK3kk=; b=qmCIjO/AGLrY/S2YJgFC3bnrl5 B5x7HQFdN2DESpNG/+X+IxnW6L7V/fJBUaLqU2Vt4hy1NN2t1Br2543T5TujH6FeMO/YpmIdcSxJJ u1RkJ4WIOAe5A1ygd5CbIV2eMj0uz0LlExIuGi9jTNBSEX51+LSNJz8aDAgSr0mlJ9yA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59M-0002RU-Bf for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jY59M-0006aX-AV for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/xl: vcpu-pin: Skip global affinity when the hard affinity is not changed Message-Id: Date: Mon, 11 May 2020 09:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3748c81fa1ff5e67c0442978c583e722820b1690 Author: Julien Grall AuthorDate: Thu Apr 30 11:20:44 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:18:22 2020 +0100 tools/xl: vcpu-pin: Skip global affinity when the hard affinity is not changed After XSA-273, it is not possible to modify the vCPU soft affinity using xl vcpu-pin without modifying the hard affinity. Instead the command will crash. 42sh> gdb /usr/local/sbin/xl (gdb) r vcpu-pin 0 0 - 10 [...] Program received signal SIGSEGV, Segmentation fault. [...] (gdb) bt This is happening because 'xl' will use NULL when an affinity doesn't need to be modified. However, we will still try to apply the global affinity in the this case. As the hard affinity is not changed, then we don't need to apply the global affinity. So skip it when hard is NULL. Backport: 4.6+ # Any release with XSA-273 Fixes: aa67b97ed342 ("xl.conf: Add global affinity masks") Reported-by: Pawel Wieczorkiewicz Signed-off-by: Julien Grall Acked-by: Wei Liu --- tools/xl/xl_vcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xl/xl_vcpu.c b/tools/xl/xl_vcpu.c index 9ff5354f74..66877a57de 100644 --- a/tools/xl/xl_vcpu.c +++ b/tools/xl/xl_vcpu.c @@ -283,7 +283,7 @@ int main_vcpupin(int argc, char **argv) } /* Only hard affinity matters here */ - if (!ignore_masks) { + if (!ignore_masks && hard) { libxl_dominfo dominfo; if (libxl_domain_info(ctx, &dominfo, domid)) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 11 09:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 May 2020 09:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59i-0001Yt-F8; Mon, 11 May 2020 09:55:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59h-0001Yf-6y for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:25 +0000 X-Inumbo-ID: 88ed6384-936d-11ea-a1fd-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 88ed6384-936d-11ea-a1fd-12813bfff9fa; Mon, 11 May 2020 09:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=XahsogdH+E0xlUv13naW9/KoJKbdCauIdWrPUTGSWlI=; b=HvjiG3pgxL8Q3sII6i93pXD/bs arn0hEgfo7xC4Yn2e4AEhSfZ6T2Aj21cbbvfz3Q4YDbIRRfIFRJ39/LzOqnF1Q3nZnIm4FVZCJ7GQ 5hNEWake3A3ZoNz8DEwBrYahS63KlczH6NcOLKSbhA5sh4YMYpUqSpsS+wBa3OfkGfX8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59g-0002SK-I4 for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jY59g-0006bm-H7 for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: atomic: Rewrite write_atomic() Message-Id: Date: Mon, 11 May 2020 09:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 52ffcfb73997e43717fa05802acc4503483d2d71 Author: Julien Grall AuthorDate: Sat May 2 16:39:58 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:48:30 2020 +0100 xen/arm: atomic: Rewrite write_atomic() The current implementation of write_atomic has two issues: 1) It cannot be used to write pointer value because the switch contains cast to other size than the size of the pointer. 2) It will happily allow to write to a pointer to const. Additionally, the Arm implementation is returning a value when the x86 implementation does not anymore. This was introduced in commit 2934148a0773 "x86: simplify a few macros / inline functions". There are no users of the return value, so it is fine to drop it. The switch is now moved in a static inline helper allowing the compiler to prevent use of const pointer and also allow to write pointer value. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/atomic.h | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 3c3d6bb04e..ac2798d095 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -98,23 +98,41 @@ static always_inline void read_atomic_size(const volatile void *p, } } +static always_inline void write_atomic_size(volatile void *p, + void *val, + unsigned int size) +{ + switch ( size ) + { + case 1: + write_u8_atomic(p, *(uint8_t *)val); + break; + case 2: + write_u16_atomic(p, *(uint16_t *)val); + break; + case 4: + write_u32_atomic(p, *(uint32_t *)val); + break; + case 8: + write_u64_atomic(p, *(uint64_t *)val); + break; + default: + __bad_atomic_size(); + break; + } +} + #define read_atomic(p) ({ \ union { typeof(*p) val; char c[0]; } x_; \ read_atomic_size(p, x_.c, sizeof(*p)); \ x_.val; \ }) -#define write_atomic(p, x) ({ \ - typeof(*p) __x = (x); \ - switch ( sizeof(*p) ) { \ - case 1: write_u8_atomic((uint8_t *)p, (uint8_t)__x); break; \ - case 2: write_u16_atomic((uint16_t *)p, (uint16_t)__x); break; \ - case 4: write_u32_atomic((uint32_t *)p, (uint32_t)__x); break; \ - case 8: write_u64_atomic((uint64_t *)p, (uint64_t)__x); break; \ - default: __bad_atomic_size(); break; \ - } \ - __x; \ -}) +#define write_atomic(p, x) \ + do { \ + typeof(*p) x_ = (x); \ + write_atomic_size(p, &x_, sizeof(*p)); \ + } while ( false ) #define add_sized(p, x) ({ \ typeof(*(p)) __x = (x); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 11 09:55:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 May 2020 09:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59s-0001aX-Ht; Mon, 11 May 2020 09:55:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59r-0001aN-Fm for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:35 +0000 X-Inumbo-ID: 8ef1c81a-936d-11ea-a1fd-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8ef1c81a-936d-11ea-a1fd-12813bfff9fa; Mon, 11 May 2020 09:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6rPW6dDbnU/nxvfL1XITB1cD8VGc+VxM6mgw4kc54Vc=; b=3RG25XbLlemu0FknAA+/KGdciU 2VqSzAnFNc/OFLyettkuLh3XCZEqWXQmZNi+Qs2tzFNqp1Z2qt2UuAxfDqnIj6SEZRwDYe83nK01l q1ZiqySagLtQH+ZgQUz6is/nspaC9eXhm7yVa03vIwd4GBzUnT71LY1eu92n0dEWJsAQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY59q-0002Sa-Kz for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jY59q-0006cP-Jl for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 09:55:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/x86: atomic: Don't allow to write atomically in a pointer to const Message-Id: Date: Mon, 11 May 2020 09:55:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a82582b1af6a4a57ca53bcfad9f71428cb5f9a54 Author: Julien Grall AuthorDate: Sat May 2 15:26:10 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:50:17 2020 +0100 xen/x86: atomic: Don't allow to write atomically in a pointer to const At the moment, write_atomic() will happily write to a pointer to const. While there are no use in Xen, it would be best to catch them at compilation time. Signed-off-by: Julien Grall Acked-by: Jan Beulich --- xen/include/asm-x86/atomic.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h index 6b40f9c9f8..27aad43aaa 100644 --- a/xen/include/asm-x86/atomic.h +++ b/xen/include/asm-x86/atomic.h @@ -63,6 +63,8 @@ void __bad_atomic_size(void); #define write_atomic(p, x) ({ \ typeof(*(p)) __x = (x); \ + /* Check that the pointer is not a const type */ \ + void *__maybe_unused p_ = &__x; \ unsigned long x_ = (unsigned long)__x; \ switch ( sizeof(*(p)) ) { \ case 1: write_u8_atomic((uint8_t *)(p), x_); break; \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 11 10:11:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 May 2020 10:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY5Ou-0003Dd-GE; Mon, 11 May 2020 10:11:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY5Ot-0003DS-3C for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 10:11:07 +0000 X-Inumbo-ID: b7deea9e-936f-11ea-a1fe-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b7deea9e-936f-11ea-a1fe-12813bfff9fa; Mon, 11 May 2020 10:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=t9vRTeZqxPrm/SLI9z9QRRQmC7b+2iNmttTGVIC26g0=; b=Y8wooa1nJ+x5lfiwDjIbjN0jCh XLhsLsZA7B0/0zxPwsDXZ8kmo914RXOx7/R0Fz+Bwj4RDix+Ncq2zDmnVUh/y9RMtQMjsfPCLnoCE VFTMOTYGq80CsK76xJwzJQnrkIlXGcfgAb/pN+SfKIDvIZr3RgLcNuAONRoiM46+ZZto=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY5Oo-0002r7-8Z for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 10:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jY5Oo-0007sh-7A for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 10:11:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: update libxlu_disk_l.[ch] Message-Id: Date: Mon, 11 May 2020 10:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4cefd87ed38822d6c53e81f1dfa552d5b4bf5940 Author: Wei Liu AuthorDate: Wed May 6 17:50:18 2020 +0100 Commit: Wei Liu CommitDate: Sun May 10 13:00:30 2020 +0100 libxl: update libxlu_disk_l.[ch] Use flex 2.6.4 that is shipped in Debian Buster. Signed-off-by: Wei Liu Acked-by: Roger Pau Monné --- tools/libxl/libxlu_disk_l.c | 867 +++++++++++++++++++++++++++----------------- tools/libxl/libxlu_disk_l.h | 474 ++++++++++++++++++++---- 2 files changed, 947 insertions(+), 394 deletions(-) diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index 944990732b..b0ac3a865a 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1,10 +1,7 @@ #line 2 "libxlu_disk_l.c" -#line 31 "libxlu_disk_l.l" #include "libxl_osdeps.h" /* must come before any other headers */ - - -#line 8 "libxlu_disk_l.c" +#line 5 "libxlu_disk_l.c" #define YY_INT_ALIGNED short int @@ -12,12 +9,222 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define xlu__disk_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer xlu__disk_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define xlu__disk_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer xlu__disk_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define xlu__disk_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer xlu__disk_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define xlu__disk_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string xlu__disk_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define xlu__disk_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes xlu__disk_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define xlu__disk_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer xlu__disk_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define xlu__disk_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer xlu__disk_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define xlu__disk_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state xlu__disk_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define xlu__disk_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer xlu__disk_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define xlu__disk_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state xlu__disk_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define xlu__disk_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state xlu__disk_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define xlu__disk_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack xlu__disk_yyensure_buffer_stack +#endif + +#ifdef yylex +#define xlu__disk_yylex_ALREADY_DEFINED +#else +#define yylex xlu__disk_yylex +#endif + +#ifdef yyrestart +#define xlu__disk_yyrestart_ALREADY_DEFINED +#else +#define yyrestart xlu__disk_yyrestart +#endif + +#ifdef yylex_init +#define xlu__disk_yylex_init_ALREADY_DEFINED +#else +#define yylex_init xlu__disk_yylex_init +#endif + +#ifdef yylex_init_extra +#define xlu__disk_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra xlu__disk_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define xlu__disk_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy xlu__disk_yylex_destroy +#endif + +#ifdef yyget_debug +#define xlu__disk_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug xlu__disk_yyget_debug +#endif + +#ifdef yyset_debug +#define xlu__disk_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug xlu__disk_yyset_debug +#endif + +#ifdef yyget_extra +#define xlu__disk_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra xlu__disk_yyget_extra +#endif + +#ifdef yyset_extra +#define xlu__disk_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra xlu__disk_yyset_extra +#endif + +#ifdef yyget_in +#define xlu__disk_yyget_in_ALREADY_DEFINED +#else +#define yyget_in xlu__disk_yyget_in +#endif + +#ifdef yyset_in +#define xlu__disk_yyset_in_ALREADY_DEFINED +#else +#define yyset_in xlu__disk_yyset_in +#endif + +#ifdef yyget_out +#define xlu__disk_yyget_out_ALREADY_DEFINED +#else +#define yyget_out xlu__disk_yyget_out +#endif + +#ifdef yyset_out +#define xlu__disk_yyset_out_ALREADY_DEFINED +#else +#define yyset_out xlu__disk_yyset_out +#endif + +#ifdef yyget_leng +#define xlu__disk_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng xlu__disk_yyget_leng +#endif + +#ifdef yyget_text +#define xlu__disk_yyget_text_ALREADY_DEFINED +#else +#define yyget_text xlu__disk_yyget_text +#endif + +#ifdef yyget_lineno +#define xlu__disk_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno xlu__disk_yyget_lineno +#endif + +#ifdef yyset_lineno +#define xlu__disk_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno xlu__disk_yyset_lineno +#endif + +#ifdef yyget_column +#define xlu__disk_yyget_column_ALREADY_DEFINED +#else +#define yyget_column xlu__disk_yyget_column +#endif + +#ifdef yyset_column +#define xlu__disk_yyset_column_ALREADY_DEFINED +#else +#define yyset_column xlu__disk_yyset_column +#endif + +#ifdef yywrap +#define xlu__disk_yywrap_ALREADY_DEFINED +#else +#define yywrap xlu__disk_yywrap +#endif + +#ifdef yyalloc +#define xlu__disk_yyalloc_ALREADY_DEFINED +#else +#define yyalloc xlu__disk_yyalloc +#endif + +#ifdef yyrealloc +#define xlu__disk_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc xlu__disk_yyrealloc +#endif + +#ifdef yyfree +#define xlu__disk_yyfree_ALREADY_DEFINED +#else +#define yyfree xlu__disk_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -88,40 +295,32 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus +/* begin standard C++ headers. */ -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ - -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* Returned upon end-of-file. */ #define YY_NULL 0 -/* Promotes a possibly negative, possibly signed char to an unsigned - * integer for use as an array index. If the signed char is negative, - * we want to instead treat it as an 8-bit unsigned char, hence the - * double cast. +/* Promotes a possibly negative, possibly signed char to an + * integer in range [0..255] for use as an array index. */ -#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c) +#define YY_SC_TO_UI(c) ((YY_CHAR) (c)) /* An opaque pointer. */ #ifndef YY_TYPEDEF_YY_SCANNER_T @@ -145,20 +344,16 @@ typedef void* yyscan_t; * definition of BEGIN. */ #define BEGIN yyg->yy_start = 1 + 2 * - /* Translate the current start state into a value that can be later handed * to BEGIN to return to the state. The YYSTATE alias is for lex * compatibility. */ #define YY_START ((yyg->yy_start - 1) / 2) #define YYSTATE YY_START - /* Action number for EOF rule of a given start state. */ #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1) - /* Special action meaning "start processing a new file". */ -#define YY_NEW_FILE xlu__disk_yyrestart(yyin ,yyscanner ) - +#define YY_NEW_FILE yyrestart( yyin , yyscanner ) #define YY_END_OF_BUFFER_CHAR 0 /* Size of default input buffer. */ @@ -191,7 +386,7 @@ typedef size_t yy_size_t; #define EOB_ACT_CONTINUE_SCAN 0 #define EOB_ACT_END_OF_FILE 1 #define EOB_ACT_LAST_MATCH 2 - + #define YY_LESS_LINENO(n) #define YY_LINENO_REWIND_TO(ptr) @@ -208,7 +403,6 @@ typedef size_t yy_size_t; YY_DO_BEFORE_ACTION; /* set up yytext again */ \ } \ while ( 0 ) - #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner ) #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -223,12 +417,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -251,7 +445,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -268,7 +462,7 @@ struct yy_buffer_state * possible backing-up. * * When we actually see the EOF, we change the status to "new" - * (via xlu__disk_yyrestart()), so that the user can continue scanning by + * (via yyrestart()), so that the user can continue scanning by * just pointing yyin at a new input file. */ #define YY_BUFFER_EOF_PENDING 2 @@ -285,71 +479,65 @@ struct yy_buffer_state #define YY_CURRENT_BUFFER ( yyg->yy_buffer_stack \ ? yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] \ : NULL) - /* Same as previous macro, but useful when we know that the buffer stack is not * NULL or when we need an lvalue. For internal use only. */ #define YY_CURRENT_BUFFER_LVALUE yyg->yy_buffer_stack[yyg->yy_buffer_stack_top] -void xlu__disk_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void xlu__disk_yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner ); -static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner ); -static void xlu__disk_yy_init_buffer (YY_BUFFER_STATE b,FILE *file ,yyscan_t yyscanner ); +static void yyensure_buffer_stack ( yyscan_t yyscanner ); +static void yy_load_buffer_state ( yyscan_t yyscanner ); +static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner ); +#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER , yyscanner) -#define YY_FLUSH_BUFFER xlu__disk_yy_flush_buffer(YY_CURRENT_BUFFER ,yyscanner) +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); - -void *xlu__disk_yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *xlu__disk_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); - -#define yy_new_buffer xlu__disk_yy_create_buffer +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); +#define yy_new_buffer yy_create_buffer #define yy_set_interactive(is_interactive) \ { \ if ( ! YY_CURRENT_BUFFER ){ \ - xlu__disk_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \ } - #define yy_set_bol(at_bol) \ { \ if ( ! YY_CURRENT_BUFFER ){\ - xlu__disk_yyensure_buffer_stack (yyscanner); \ + yyensure_buffer_stack (yyscanner); \ YY_CURRENT_BUFFER_LVALUE = \ - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); \ + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); \ } \ YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \ } - #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol) -#define xlu__disk_yywrap(yyscanner) 1 +#define xlu__disk_yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP - -typedef unsigned char YY_CHAR; +typedef flex_uint8_t YY_CHAR; typedef int yy_state_type; #define yytext_ptr yytext_r -static yy_state_type yy_get_previous_state (yyscan_t yyscanner ); -static yy_state_type yy_try_NUL_trans (yy_state_type current_state ,yyscan_t yyscanner); -static int yy_get_next_buffer (yyscan_t yyscanner ); -static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); +static yy_state_type yy_get_previous_state ( yyscan_t yyscanner ); +static yy_state_type yy_try_NUL_trans ( yy_state_type current_state , yyscan_t yyscanner); +static int yy_get_next_buffer ( yyscan_t yyscanner ); +static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner ); /* Done after the current pattern has been matched and before the * corresponding action - sets up yytext. @@ -357,11 +545,10 @@ static void yy_fatal_error (yyconst char msg[] ,yyscan_t yyscanner ); #define YY_DO_BEFORE_ACTION \ yyg->yytext_ptr = yy_bp; \ yyg->yytext_ptr -= yyg->yy_more_len; \ - yyleng = (size_t) (yy_cp - yyg->yytext_ptr); \ + yyleng = (int) (yy_cp - yyg->yytext_ptr); \ yyg->yy_hold_char = *yy_cp; \ *yy_cp = '\0'; \ yyg->yy_c_buf_p = yy_cp; - #define YY_NUM_RULES 36 #define YY_END_OF_BUFFER 37 /* This struct is not used in this scanner, @@ -371,7 +558,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_acclist[575] = +static const flex_int16_t yy_acclist[575] = { 0, 35, 35, 37, 33, 34, 36, 8193, 33, 34, 36, 16385, 8193, 33, 36,16385, 33, 34, 36, 34, 36, @@ -438,7 +625,7 @@ static yyconst flex_int16_t yy_acclist[575] = 21, 23, 12, 33 } ; -static yyconst flex_int16_t yy_accept[356] = +static const flex_int16_t yy_accept[356] = { 0, 1, 1, 1, 2, 3, 4, 7, 12, 16, 19, 21, 24, 27, 30, 33, 36, 39, 42, 45, 48, @@ -481,7 +668,7 @@ static yyconst flex_int16_t yy_accept[356] = 570, 571, 573, 575, 575 } ; -static yyconst flex_int32_t yy_ec[256] = +static const YY_CHAR yy_ec[256] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 2, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -513,7 +700,7 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[35] = +static const YY_CHAR yy_meta[35] = { 0, 1, 1, 2, 3, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -521,7 +708,7 @@ static yyconst flex_int32_t yy_meta[35] = 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[424] = +static const flex_int16_t yy_base[424] = { 0, 0, 0, 901, 900, 902, 897, 33, 36, 905, 905, 45, 63, 31, 42, 51, 52, 890, 33, 65, 67, @@ -572,7 +759,7 @@ static yyconst flex_int16_t yy_base[424] = 883, 887, 891 } ; -static yyconst flex_int16_t yy_def[424] = +static const flex_int16_t yy_def[424] = { 0, 354, 1, 355, 355, 354, 356, 357, 357, 354, 354, 358, 358, 12, 12, 12, 12, 12, 12, 12, 12, @@ -623,7 +810,7 @@ static yyconst flex_int16_t yy_def[424] = 354, 354, 354 } ; -static yyconst flex_int16_t yy_nxt[940] = +static const flex_int16_t yy_nxt[940] = { 0, 6, 7, 8, 9, 6, 6, 6, 6, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 17, 17, @@ -730,7 +917,7 @@ static yyconst flex_int16_t yy_nxt[940] = 354, 354, 354, 354, 354, 354, 354, 354, 354 } ; -static yyconst flex_int16_t yy_chk[940] = +static const flex_int16_t yy_chk[940] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1001,8 +1188,9 @@ static int vdev_and_devtype(DiskParseContext *dpc, char *str) { #undef DPC /* needs to be defined differently the actual lexer */ #define DPC ((DiskParseContext*)yyextra) +#line 1192 "libxlu_disk_l.c" -#line 1006 "libxlu_disk_l.c" +#line 1194 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1032,8 +1220,8 @@ struct yyguts_t size_t yy_buffer_stack_max; /**< capacity of stack. */ YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */ char yy_hold_char; - yy_size_t yy_n_chars; - yy_size_t yyleng_r; + int yy_n_chars; + int yyleng_r; char *yy_c_buf_p; int yy_init; int yy_start; @@ -1064,44 +1252,44 @@ struct yyguts_t }; /* end struct yyguts_t */ -static int yy_init_globals (yyscan_t yyscanner ); +static int yy_init_globals ( yyscan_t yyscanner ); -int xlu__disk_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int xlu__disk_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int xlu__disk_yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int xlu__disk_yyget_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void xlu__disk_yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void xlu__disk_yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void xlu__disk_yyset_out (FILE * out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *xlu__disk_yyget_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int xlu__disk_yyget_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int xlu__disk_yyget_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1109,26 +1297,29 @@ void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int xlu__disk_yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int xlu__disk_yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif +#ifndef YY_NO_UNPUT + +#endif + #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT - #ifdef __cplusplus -static int yyinput (yyscan_t yyscanner ); +static int yyinput ( yyscan_t yyscanner ); #else -static int input (yyscan_t yyscanner ); +static int input ( yyscan_t yyscanner ); #endif #endif @@ -1148,7 +1339,7 @@ static int input (yyscan_t yyscanner ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1172,7 +1363,7 @@ static int input (yyscan_t yyscanner ); else \ { \ errno=0; \ - while ( (result = fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ + while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \ { \ if( errno != EINTR) \ { \ @@ -1213,9 +1404,9 @@ static int input (yyscan_t yyscanner ); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int xlu__disk_yylex (yyscan_t yyscanner); +extern int yylex (yyscan_t yyscanner); -#define YY_DECL int xlu__disk_yylex (yyscan_t yyscanner) +#define YY_DECL int yylex (yyscan_t yyscanner) #endif /* !YY_DECL */ /* Code executed at the beginning of each rule, after yytext and yyleng @@ -1227,7 +1418,7 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); /* Code executed at the end of each rule. */ #ifndef YY_BREAK -#define YY_BREAK break; +#define YY_BREAK /*LINTED*/break; #endif #define YY_RULE_SETUP \ @@ -1237,9 +1428,9 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); */ YY_DECL { - register yy_state_type yy_current_state; - register char *yy_cp, *yy_bp; - register int yy_act; + yy_state_type yy_current_state; + char *yy_cp, *yy_bp; + int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( !yyg->yy_init ) @@ -1252,9 +1443,9 @@ YY_DECL /* Create the reject buffer large enough to save one state per allowed character. */ if ( ! yyg->yy_state_buf ) - yyg->yy_state_buf = (yy_state_type *)xlu__disk_yyalloc(YY_STATE_BUF_SIZE ,yyscanner); + yyg->yy_state_buf = (yy_state_type *)yyalloc(YY_STATE_BUF_SIZE , yyscanner); if ( ! yyg->yy_state_buf ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yylex()" ); + YY_FATAL_ERROR( "out of dynamic memory in yylex()" ); if ( ! yyg->yy_start ) yyg->yy_start = 1; /* first start state */ @@ -1266,28 +1457,29 @@ YY_DECL yyout = stdout; if ( ! YY_CURRENT_BUFFER ) { - xlu__disk_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } { #line 166 "libxlu_disk_l.l" +#line 169 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1284 "libxlu_disk_l.c" +#line 1476 "libxlu_disk_l.c" - while ( 1 ) /* loops until end-of-file is reached */ + while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { yyg->yy_more_len = 0; if ( yyg->yy_more_flag ) { - yyg->yy_more_len = yyg->yy_c_buf_p - yyg->yytext_ptr; + yyg->yy_more_len = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); yyg->yy_more_flag = 0; } yy_cp = yyg->yy_c_buf_p; @@ -1308,14 +1500,14 @@ YY_DECL yy_match: do { - register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; + YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 355 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *yyg->yy_state_ptr++ = yy_current_state; ++yy_cp; } @@ -1369,135 +1561,135 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 170 "libxlu_disk_l.l" +#line 171 "libxlu_disk_l.l" { /* ignore whitespace before parameters */ } YY_BREAK /* ordinary parameters setting enums or strings */ case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 174 "libxlu_disk_l.l" +#line 175 "libxlu_disk_l.l" { STRIP(','); setformat(DPC, FROMEQUALS); } YY_BREAK case 3: YY_RULE_SETUP -#line 176 "libxlu_disk_l.l" +#line 177 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 4: YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 178 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 5: YY_RULE_SETUP -#line 178 "libxlu_disk_l.l" +#line 179 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 0; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 179 "libxlu_disk_l.l" +#line 180 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown value for type"); } YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 181 "libxlu_disk_l.l" +#line 182 "libxlu_disk_l.l" { STRIP(','); setaccess(DPC, FROMEQUALS); } YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 182 "libxlu_disk_l.l" +#line 183 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("backend", backend_domname, FROMEQUALS); } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 183 "libxlu_disk_l.l" +#line 184 "libxlu_disk_l.l" { STRIP(','); setbackendtype(DPC,FROMEQUALS); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 185 "libxlu_disk_l.l" +#line 186 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 186 "libxlu_disk_l.l" +#line 187 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } YY_BREAK case 12: YY_RULE_SETUP -#line 187 "libxlu_disk_l.l" +#line 188 "libxlu_disk_l.l" { DPC->disk->direct_io_safe = 1; } YY_BREAK case 13: YY_RULE_SETUP -#line 188 "libxlu_disk_l.l" +#line 189 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, true); } YY_BREAK case 14: YY_RULE_SETUP -#line 189 "libxlu_disk_l.l" +#line 190 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, false); } YY_BREAK /* Note that the COLO configuration settings should be considered unstable. * They may change incompatibly in future versions of Xen. */ case 15: YY_RULE_SETUP -#line 192 "libxlu_disk_l.l" +#line 193 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, true); } YY_BREAK case 16: YY_RULE_SETUP -#line 193 "libxlu_disk_l.l" +#line 194 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, false); } YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 194 "libxlu_disk_l.l" +#line 195 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-host", colo_host, FROMEQUALS); } YY_BREAK case 18: /* rule 18 can match eol */ YY_RULE_SETUP -#line 195 "libxlu_disk_l.l" +#line 196 "libxlu_disk_l.l" { STRIP(','); setcoloport(DPC, FROMEQUALS); } YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 196 "libxlu_disk_l.l" +#line 197 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-export", colo_export, FROMEQUALS); } YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 197 "libxlu_disk_l.l" +#line 198 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("active-disk", active_disk, FROMEQUALS); } YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 198 "libxlu_disk_l.l" +#line 199 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("hidden-disk", hidden_disk, FROMEQUALS); } YY_BREAK /* the target magic parameter, eats the rest of the string */ case 22: YY_RULE_SETUP -#line 202 "libxlu_disk_l.l" +#line 203 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } YY_BREAK /* unknown parameters */ case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 206 "libxlu_disk_l.l" +#line 207 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown parameter"); } YY_BREAK /* deprecated prefixes */ @@ -1505,7 +1697,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 24: YY_RULE_SETUP -#line 213 "libxlu_disk_l.l" +#line 214 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1514,7 +1706,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 219 "libxlu_disk_l.l" +#line 220 "libxlu_disk_l.l" { char *newscript; STRIP(':'); @@ -1533,12 +1725,12 @@ case 26: yyg->yy_c_buf_p = yy_cp = yy_bp + 8; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 232 "libxlu_disk_l.l" +#line 233 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 27: YY_RULE_SETUP -#line 233 "libxlu_disk_l.l" +#line 234 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 28: @@ -1546,7 +1738,7 @@ case 28: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 234 "libxlu_disk_l.l" +#line 235 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 29: @@ -1554,7 +1746,7 @@ case 29: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 235 "libxlu_disk_l.l" +#line 236 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 30: @@ -1562,7 +1754,7 @@ case 30: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 236 "libxlu_disk_l.l" +#line 237 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 31: @@ -1570,13 +1762,13 @@ case 31: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 237 "libxlu_disk_l.l" +#line 238 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 32: /* rule 32 can match eol */ YY_RULE_SETUP -#line 239 "libxlu_disk_l.l" +#line 240 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); return 0; @@ -1586,7 +1778,7 @@ YY_RULE_SETUP case 33: /* rule 33 can match eol */ YY_RULE_SETUP -#line 246 "libxlu_disk_l.l" +#line 247 "libxlu_disk_l.l" { STRIP(','); @@ -1615,7 +1807,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 272 "libxlu_disk_l.l" +#line 273 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1623,17 +1815,17 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 276 "libxlu_disk_l.l" +#line 277 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 36: YY_RULE_SETUP -#line 279 "libxlu_disk_l.l" +#line 280 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1637 "libxlu_disk_l.c" +#line 1829 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -1652,7 +1844,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); /* We're scanning a new file or input source. It's * possible that this happened because the user * just pointed yyin at a new source and called - * xlu__disk_yylex(). If so, then we have to assure + * yylex(). If so, then we have to assure * consistency between YY_CURRENT_BUFFER and our * globals. Here is the right place to do so, because * this is the first action (other than possibly a @@ -1712,7 +1904,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); { yyg->yy_did_buffer_switch_on_eof = 0; - if ( xlu__disk_yywrap(yyscanner ) ) + if ( yywrap( yyscanner ) ) { /* Note: because we've taken care in * yy_get_next_buffer() to have set up @@ -1766,7 +1958,7 @@ YY_FATAL_ERROR( "flex scanner jammed" ); } /* end of action switch */ } /* end of scanning one token */ } /* end of user's declarations */ -} /* end of xlu__disk_yylex */ +} /* end of yylex */ /* yy_get_next_buffer - try to read in a new buffer * @@ -1778,9 +1970,9 @@ YY_FATAL_ERROR( "flex scanner jammed" ); static int yy_get_next_buffer (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; - register char *source = yyg->yytext_ptr; - register int number_to_move, i; + char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf; + char *source = yyg->yytext_ptr; + int number_to_move, i; int ret_val; if ( yyg->yy_c_buf_p > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] ) @@ -1809,7 +2001,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) /* Try to read more data. */ /* First move last chars to start of buffer. */ - number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr) - 1; + number_to_move = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr - 1); for ( i = 0; i < number_to_move; ++i ) *(dest++) = *(source++); @@ -1848,7 +2040,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) if ( number_to_move == YY_MORE_ADJ ) { ret_val = EOB_ACT_END_OF_FILE; - xlu__disk_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); } else @@ -1862,12 +2054,15 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else ret_val = EOB_ACT_CONTINUE_SCAN; - if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + if ((yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { /* Extend the array by 50%, plus the number we really need. */ - yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); - YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xlu__disk_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner ); + int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc( + (void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size , yyscanner ); if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + /* "- 2" to take care of EOB's */ + YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2); } yyg->yy_n_chars += number_to_move; @@ -1883,8 +2078,8 @@ static int yy_get_next_buffer (yyscan_t yyscanner) static yy_state_type yy_get_previous_state (yyscan_t yyscanner) { - register yy_state_type yy_current_state; - register char *yy_cp; + yy_state_type yy_current_state; + char *yy_cp; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yy_current_state = yyg->yy_start; @@ -1894,14 +2089,14 @@ static int yy_get_next_buffer (yyscan_t yyscanner) for ( yy_cp = yyg->yytext_ptr + YY_MORE_ADJ; yy_cp < yyg->yy_c_buf_p; ++yy_cp ) { - register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); + YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1); while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 355 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; *yyg->yy_state_ptr++ = yy_current_state; } @@ -1915,17 +2110,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state , yyscan_t yyscanner) { - register int yy_is_jam; + int yy_is_jam; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* This var may be unused depending upon options. */ - register YY_CHAR yy_c = 1; + YY_CHAR yy_c = 1; while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; if ( yy_current_state >= 355 ) - yy_c = yy_meta[(unsigned int) yy_c]; + yy_c = yy_meta[yy_c]; } - yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; + yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; yy_is_jam = (yy_current_state == 354); if ( ! yy_is_jam ) *yyg->yy_state_ptr++ = yy_current_state; @@ -1934,6 +2129,10 @@ static int yy_get_next_buffer (yyscan_t yyscanner) return yy_is_jam ? 0 : yy_current_state; } +#ifndef YY_NO_UNPUT + +#endif + #ifndef YY_NO_INPUT #ifdef __cplusplus static int yyinput (yyscan_t yyscanner) @@ -1959,7 +2158,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner) else { /* need more input */ - yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr; + int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr); ++yyg->yy_c_buf_p; switch ( yy_get_next_buffer( yyscanner ) ) @@ -1976,14 +2175,14 @@ static int yy_get_next_buffer (yyscan_t yyscanner) */ /* Reset buffer status. */ - xlu__disk_yyrestart(yyin ,yyscanner); + yyrestart( yyin , yyscanner); /*FALLTHROUGH*/ case EOB_ACT_END_OF_FILE: { - if ( xlu__disk_yywrap(yyscanner ) ) - return EOF; + if ( yywrap( yyscanner ) ) + return 0; if ( ! yyg->yy_did_buffer_switch_on_eof ) YY_NEW_FILE; @@ -2014,34 +2213,34 @@ static int yy_get_next_buffer (yyscan_t yyscanner) * @param yyscanner The scanner object. * @note This function does not reset the start condition to @c INITIAL . */ - void xlu__disk_yyrestart (FILE * input_file , yyscan_t yyscanner) + void yyrestart (FILE * input_file , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! YY_CURRENT_BUFFER ){ - xlu__disk_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); YY_CURRENT_BUFFER_LVALUE = - xlu__disk_yy_create_buffer(yyin,YY_BUF_SIZE ,yyscanner); + yy_create_buffer( yyin, YY_BUF_SIZE , yyscanner); } - xlu__disk_yy_init_buffer(YY_CURRENT_BUFFER,input_file ,yyscanner); - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_init_buffer( YY_CURRENT_BUFFER, input_file , yyscanner); + yy_load_buffer_state( yyscanner ); } /** Switch to a different input buffer. * @param new_buffer The new input buffer. * @param yyscanner The scanner object. */ - void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) + void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* TODO. We should be able to replace this entire function body * with - * xlu__disk_yypop_buffer_state(); - * xlu__disk_yypush_buffer_state(new_buffer); + * yypop_buffer_state(); + * yypush_buffer_state(new_buffer); */ - xlu__disk_yyensure_buffer_stack (yyscanner); + yyensure_buffer_stack (yyscanner); if ( YY_CURRENT_BUFFER == new_buffer ) return; @@ -2054,17 +2253,17 @@ static int yy_get_next_buffer (yyscan_t yyscanner) } YY_CURRENT_BUFFER_LVALUE = new_buffer; - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); /* We don't actually know whether we did this switch during - * EOF (xlu__disk_yywrap()) processing, but the only time this flag - * is looked at is after xlu__disk_yywrap() is called, so it's safe + * EOF (yywrap()) processing, but the only time this flag + * is looked at is after yywrap() is called, so it's safe * to go ahead and always set it. */ yyg->yy_did_buffer_switch_on_eof = 1; } -static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) +static void yy_load_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyg->yy_n_chars = YY_CURRENT_BUFFER_LVALUE->yy_n_chars; @@ -2079,35 +2278,35 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) * @param yyscanner The scanner object. * @return the allocated buffer state. */ - YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) + YY_BUFFER_STATE yy_create_buffer (FILE * file, int size , yyscan_t yyscanner) { YY_BUFFER_STATE b; - b = (YY_BUFFER_STATE) xlu__disk_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_buf_size = size; /* yy_ch_buf has to be 2 characters longer than the size given because * we need to put in 2 end-of-buffer characters. */ - b->yy_ch_buf = (char *) xlu__disk_yyalloc(b->yy_buf_size + 2 ,yyscanner ); + b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2) , yyscanner ); if ( ! b->yy_ch_buf ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_create_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" ); b->yy_is_our_buffer = 1; - xlu__disk_yy_init_buffer(b,file ,yyscanner); + yy_init_buffer( b, file , yyscanner); return b; } /** Destroy the buffer. - * @param b a buffer created with xlu__disk_yy_create_buffer() + * @param b a buffer created with yy_create_buffer() * @param yyscanner The scanner object. */ - void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_delete_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -2118,28 +2317,28 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0; if ( b->yy_is_our_buffer ) - xlu__disk_yyfree((void *) b->yy_ch_buf ,yyscanner ); + yyfree( (void *) b->yy_ch_buf , yyscanner ); - xlu__disk_yyfree((void *) b ,yyscanner ); + yyfree( (void *) b , yyscanner ); } /* Initializes or reinitializes a buffer. * This function is sometimes called more than once on the same buffer, - * such as during a xlu__disk_yyrestart() or at EOF. + * such as during a yyrestart() or at EOF. */ - static void xlu__disk_yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) + static void yy_init_buffer (YY_BUFFER_STATE b, FILE * file , yyscan_t yyscanner) { int oerrno = errno; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - xlu__disk_yy_flush_buffer(b ,yyscanner); + yy_flush_buffer( b , yyscanner); b->yy_input_file = file; b->yy_fill_buffer = 1; - /* If b is the current buffer, then xlu__disk_yy_init_buffer was _probably_ - * called from xlu__disk_yyrestart() or through yy_get_next_buffer. + /* If b is the current buffer, then yy_init_buffer was _probably_ + * called from yyrestart() or through yy_get_next_buffer. * In that case, we don't want to reset the lineno or column. */ if (b != YY_CURRENT_BUFFER){ @@ -2156,7 +2355,7 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. * @param yyscanner The scanner object. */ - void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) + void yy_flush_buffer (YY_BUFFER_STATE b , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if ( ! b ) @@ -2177,7 +2376,7 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) b->yy_buffer_status = YY_BUFFER_NEW; if ( b == YY_CURRENT_BUFFER ) - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); } /** Pushes the new state onto the stack. The new state becomes @@ -2186,15 +2385,15 @@ static void xlu__disk_yy_load_buffer_state (yyscan_t yyscanner) * @param new_buffer The new state. * @param yyscanner The scanner object. */ -void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) +void yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (new_buffer == NULL) return; - xlu__disk_yyensure_buffer_stack(yyscanner); + yyensure_buffer_stack(yyscanner); - /* This block is copied from xlu__disk_yy_switch_to_buffer. */ + /* This block is copied from yy_switch_to_buffer. */ if ( YY_CURRENT_BUFFER ) { /* Flush out information for old buffer. */ @@ -2208,8 +2407,8 @@ void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscan yyg->yy_buffer_stack_top++; YY_CURRENT_BUFFER_LVALUE = new_buffer; - /* copied from xlu__disk_yy_switch_to_buffer. */ - xlu__disk_yy_load_buffer_state(yyscanner ); + /* copied from yy_switch_to_buffer. */ + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } @@ -2217,19 +2416,19 @@ void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer , yyscan_t yyscan * The next element becomes the new top. * @param yyscanner The scanner object. */ -void xlu__disk_yypop_buffer_state (yyscan_t yyscanner) +void yypop_buffer_state (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; if (!YY_CURRENT_BUFFER) return; - xlu__disk_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner); + yy_delete_buffer(YY_CURRENT_BUFFER , yyscanner); YY_CURRENT_BUFFER_LVALUE = NULL; if (yyg->yy_buffer_stack_top > 0) --yyg->yy_buffer_stack_top; if (YY_CURRENT_BUFFER) { - xlu__disk_yy_load_buffer_state(yyscanner ); + yy_load_buffer_state( yyscanner ); yyg->yy_did_buffer_switch_on_eof = 1; } } @@ -2237,7 +2436,7 @@ void xlu__disk_yypop_buffer_state (yyscan_t yyscanner) /* Allocates the stack if it does not exist. * Guarantees space for at least one push. */ -static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) +static void yyensure_buffer_stack (yyscan_t yyscanner) { yy_size_t num_to_alloc; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; @@ -2248,15 +2447,15 @@ static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) * scanner will even need a stack. We use 2 instead of 1 to avoid an * immediate realloc on the next call. */ - num_to_alloc = 1; - yyg->yy_buffer_stack = (struct yy_buffer_state**)xlu__disk_yyalloc + num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */ + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyalloc (num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yyensure_buffer_stack()" ); - + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); + memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*)); - + yyg->yy_buffer_stack_max = num_to_alloc; yyg->yy_buffer_stack_top = 0; return; @@ -2265,15 +2464,15 @@ static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) if (yyg->yy_buffer_stack_top >= (yyg->yy_buffer_stack_max) - 1){ /* Increase the buffer to prepare for a possible push. */ - int grow_size = 8 /* arbitrary grow size */; + yy_size_t grow_size = 8 /* arbitrary grow size */; num_to_alloc = yyg->yy_buffer_stack_max + grow_size; - yyg->yy_buffer_stack = (struct yy_buffer_state**)xlu__disk_yyrealloc + yyg->yy_buffer_stack = (struct yy_buffer_state**)yyrealloc (yyg->yy_buffer_stack, num_to_alloc * sizeof(struct yy_buffer_state*) , yyscanner); if ( ! yyg->yy_buffer_stack ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yyensure_buffer_stack()" ); + YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" ); /* zero only the new slots.*/ memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -2285,9 +2484,9 @@ static void xlu__disk_yyensure_buffer_stack (yyscan_t yyscanner) * @param base the character buffer * @param size the size in bytes of the character buffer * @param yyscanner The scanner object. - * @return the newly allocated buffer state object. + * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_buffer (char * base, yy_size_t size , yyscan_t yyscanner) { YY_BUFFER_STATE b; @@ -2295,69 +2494,69 @@ YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char * base, yy_size_t size , yyscan base[size-2] != YY_END_OF_BUFFER_CHAR || base[size-1] != YY_END_OF_BUFFER_CHAR ) /* They forgot to leave room for the EOB's. */ - return 0; + return NULL; - b = (YY_BUFFER_STATE) xlu__disk_yyalloc(sizeof( struct yy_buffer_state ) ,yyscanner ); + b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state ) , yyscanner ); if ( ! b ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_scan_buffer()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" ); - b->yy_buf_size = size - 2; /* "- 2" to take care of EOB's */ + b->yy_buf_size = (int) (size - 2); /* "- 2" to take care of EOB's */ b->yy_buf_pos = b->yy_ch_buf = base; b->yy_is_our_buffer = 0; - b->yy_input_file = 0; + b->yy_input_file = NULL; b->yy_n_chars = b->yy_buf_size; b->yy_is_interactive = 0; b->yy_at_bol = 1; b->yy_fill_buffer = 0; b->yy_buffer_status = YY_BUFFER_NEW; - xlu__disk_yy_switch_to_buffer(b ,yyscanner ); + yy_switch_to_buffer( b , yyscanner ); return b; } -/** Setup the input buffer state to scan a string. The next call to xlu__disk_yylex() will +/** Setup the input buffer state to scan a string. The next call to yylex() will * scan from a @e copy of @a str. * @param yystr a NUL-terminated string to scan * @param yyscanner The scanner object. * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use - * xlu__disk_yy_scan_bytes() instead. + * yy_scan_bytes() instead. */ -YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner) { - return xlu__disk_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner); + return yy_scan_bytes( yystr, (int) strlen(yystr) , yyscanner); } -/** Setup the input buffer state to scan the given bytes. The next call to xlu__disk_yylex() will +/** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. * @param yybytes the byte buffer to scan * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * @param yyscanner The scanner object. * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len , yyscan_t yyscanner) +YY_BUFFER_STATE yy_scan_bytes (const char * yybytes, int _yybytes_len , yyscan_t yyscanner) { YY_BUFFER_STATE b; char *buf; yy_size_t n; - yy_size_t i; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ - n = _yybytes_len + 2; - buf = (char *) xlu__disk_yyalloc(n ,yyscanner ); + n = (yy_size_t) (_yybytes_len + 2); + buf = (char *) yyalloc( n , yyscanner ); if ( ! buf ) - YY_FATAL_ERROR( "out of dynamic memory in xlu__disk_yy_scan_bytes()" ); + YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" ); for ( i = 0; i < _yybytes_len; ++i ) buf[i] = yybytes[i]; buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR; - b = xlu__disk_yy_scan_buffer(buf,n ,yyscanner); + b = yy_scan_buffer( buf, n , yyscanner); if ( ! b ) - YY_FATAL_ERROR( "bad buffer in xlu__disk_yy_scan_bytes()" ); + YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" ); /* It's okay to grow etc. this buffer, and we should throw it * away when we're done. @@ -2371,9 +2570,11 @@ YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yy #define YY_EXIT_FAILURE 2 #endif -static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) +static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner) { - (void) fprintf( stderr, "%s\n", msg ); + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + fprintf( stderr, "%s\n", msg ); exit( YY_EXIT_FAILURE ); } @@ -2399,7 +2600,7 @@ static void yy_fatal_error (yyconst char* msg , yyscan_t yyscanner) /** Get the user-defined data for this scanner. * @param yyscanner The scanner object. */ -YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner) +YY_EXTRA_TYPE yyget_extra (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyextra; @@ -2408,10 +2609,10 @@ YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner) /** Get the current line number. * @param yyscanner The scanner object. */ -int xlu__disk_yyget_lineno (yyscan_t yyscanner) +int yyget_lineno (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2421,10 +2622,10 @@ int xlu__disk_yyget_lineno (yyscan_t yyscanner) /** Get the current column number. * @param yyscanner The scanner object. */ -int xlu__disk_yyget_column (yyscan_t yyscanner) +int yyget_column (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - + if (! YY_CURRENT_BUFFER) return 0; @@ -2434,7 +2635,7 @@ int xlu__disk_yyget_column (yyscan_t yyscanner) /** Get the input stream. * @param yyscanner The scanner object. */ -FILE *xlu__disk_yyget_in (yyscan_t yyscanner) +FILE *yyget_in (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyin; @@ -2443,7 +2644,7 @@ FILE *xlu__disk_yyget_in (yyscan_t yyscanner) /** Get the output stream. * @param yyscanner The scanner object. */ -FILE *xlu__disk_yyget_out (yyscan_t yyscanner) +FILE *yyget_out (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyout; @@ -2452,7 +2653,7 @@ FILE *xlu__disk_yyget_out (yyscan_t yyscanner) /** Get the length of the current token. * @param yyscanner The scanner object. */ -yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner) +int yyget_leng (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yyleng; @@ -2462,7 +2663,7 @@ yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner) * @param yyscanner The scanner object. */ -char *xlu__disk_yyget_text (yyscan_t yyscanner) +char *yyget_text (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yytext; @@ -2472,90 +2673,88 @@ char *xlu__disk_yyget_text (yyscan_t yyscanner) * @param user_defined The data to be associated with this scanner. * @param yyscanner The scanner object. */ -void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) +void yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; yyextra = user_defined ; } /** Set the current line number. - * @param line_number + * @param _line_number line number * @param yyscanner The scanner object. */ -void xlu__disk_yyset_lineno (int line_number , yyscan_t yyscanner) +void yyset_lineno (int _line_number , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* lineno is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "xlu__disk_yyset_lineno called with no buffer" ); + YY_FATAL_ERROR( "yyset_lineno called with no buffer" ); - yylineno = line_number; + yylineno = _line_number; } /** Set the current column. - * @param line_number + * @param _column_no column number * @param yyscanner The scanner object. */ -void xlu__disk_yyset_column (int column_no , yyscan_t yyscanner) +void yyset_column (int _column_no , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* column is only valid if an input buffer exists. */ if (! YY_CURRENT_BUFFER ) - YY_FATAL_ERROR( "xlu__disk_yyset_column called with no buffer" ); + YY_FATAL_ERROR( "yyset_column called with no buffer" ); - yycolumn = column_no; + yycolumn = _column_no; } /** Set the input stream. This does not discard the current * input buffer. - * @param in_str A readable stream. + * @param _in_str A readable stream. * @param yyscanner The scanner object. - * @see xlu__disk_yy_switch_to_buffer + * @see yy_switch_to_buffer */ -void xlu__disk_yyset_in (FILE * in_str , yyscan_t yyscanner) +void yyset_in (FILE * _in_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyin = in_str ; + yyin = _in_str ; } -void xlu__disk_yyset_out (FILE * out_str , yyscan_t yyscanner) +void yyset_out (FILE * _out_str , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yyout = out_str ; + yyout = _out_str ; } -int xlu__disk_yyget_debug (yyscan_t yyscanner) +int yyget_debug (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; return yy_flex_debug; } -void xlu__disk_yyset_debug (int bdebug , yyscan_t yyscanner) +void yyset_debug (int _bdebug , yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; - yy_flex_debug = bdebug ; + yy_flex_debug = _bdebug ; } /* Accessor methods for yylval and yylloc */ /* User-visible API */ -/* xlu__disk_yylex_init is special because it creates the scanner itself, so it is +/* yylex_init is special because it creates the scanner itself, so it is * the ONLY reentrant function that doesn't take the scanner as the last argument. * That's why we explicitly handle the declaration, instead of using our macros. */ - -int xlu__disk_yylex_init(yyscan_t* ptr_yy_globals) - +int yylex_init(yyscan_t* ptr_yy_globals) { if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - *ptr_yy_globals = (yyscan_t) xlu__disk_yyalloc ( sizeof( struct yyguts_t ), NULL ); + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), NULL ); if (*ptr_yy_globals == NULL){ errno = ENOMEM; @@ -2568,39 +2767,37 @@ int xlu__disk_yylex_init(yyscan_t* ptr_yy_globals) return yy_init_globals ( *ptr_yy_globals ); } -/* xlu__disk_yylex_init_extra has the same functionality as xlu__disk_yylex_init, but follows the +/* yylex_init_extra has the same functionality as yylex_init, but follows the * convention of taking the scanner as the last argument. Note however, that * this is a *pointer* to a scanner, as it will be allocated by this call (and * is the reason, too, why this function also must handle its own declaration). - * The user defined value in the first argument will be available to xlu__disk_yyalloc in + * The user defined value in the first argument will be available to yyalloc in * the yyextra field. */ - -int xlu__disk_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals ) - +int yylex_init_extra( YY_EXTRA_TYPE yy_user_defined, yyscan_t* ptr_yy_globals ) { struct yyguts_t dummy_yyguts; - xlu__disk_yyset_extra (yy_user_defined, &dummy_yyguts); + yyset_extra (yy_user_defined, &dummy_yyguts); if (ptr_yy_globals == NULL){ errno = EINVAL; return 1; } - - *ptr_yy_globals = (yyscan_t) xlu__disk_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); - + + *ptr_yy_globals = (yyscan_t) yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts ); + if (*ptr_yy_globals == NULL){ errno = ENOMEM; return 1; } - + /* By setting to 0xAA, we expose bugs in yy_init_globals. Leave at 0x00 for releases. */ memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t)); - - xlu__disk_yyset_extra (yy_user_defined, *ptr_yy_globals); - + + yyset_extra (yy_user_defined, *ptr_yy_globals); + return yy_init_globals ( *ptr_yy_globals ); } @@ -2608,13 +2805,13 @@ static int yy_init_globals (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Initialization is the same as for the non-reentrant scanner. - * This function is called from xlu__disk_yylex_destroy(), so don't allocate here. + * This function is called from yylex_destroy(), so don't allocate here. */ - yyg->yy_buffer_stack = 0; + yyg->yy_buffer_stack = NULL; yyg->yy_buffer_stack_top = 0; yyg->yy_buffer_stack_max = 0; - yyg->yy_c_buf_p = (char *) 0; + yyg->yy_c_buf_p = NULL; yyg->yy_init = 0; yyg->yy_start = 0; @@ -2632,45 +2829,45 @@ static int yy_init_globals (yyscan_t yyscanner) yyin = stdin; yyout = stdout; #else - yyin = (FILE *) 0; - yyout = (FILE *) 0; + yyin = NULL; + yyout = NULL; #endif /* For future reference: Set errno on error, since we are called by - * xlu__disk_yylex_init() + * yylex_init() */ return 0; } -/* xlu__disk_yylex_destroy is for both reentrant and non-reentrant scanners. */ -int xlu__disk_yylex_destroy (yyscan_t yyscanner) +/* yylex_destroy is for both reentrant and non-reentrant scanners. */ +int yylex_destroy (yyscan_t yyscanner) { struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; /* Pop the buffer stack, destroying each element. */ while(YY_CURRENT_BUFFER){ - xlu__disk_yy_delete_buffer(YY_CURRENT_BUFFER ,yyscanner ); + yy_delete_buffer( YY_CURRENT_BUFFER , yyscanner ); YY_CURRENT_BUFFER_LVALUE = NULL; - xlu__disk_yypop_buffer_state(yyscanner); + yypop_buffer_state(yyscanner); } /* Destroy the stack itself. */ - xlu__disk_yyfree(yyg->yy_buffer_stack ,yyscanner); + yyfree(yyg->yy_buffer_stack , yyscanner); yyg->yy_buffer_stack = NULL; /* Destroy the start condition stack. */ - xlu__disk_yyfree(yyg->yy_start_stack ,yyscanner ); + yyfree( yyg->yy_start_stack , yyscanner ); yyg->yy_start_stack = NULL; - xlu__disk_yyfree ( yyg->yy_state_buf , yyscanner); + yyfree ( yyg->yy_state_buf , yyscanner); yyg->yy_state_buf = NULL; /* Reset the globals. This is important in a non-reentrant scanner so the next time - * xlu__disk_yylex() is called, initialization will occur. */ + * yylex() is called, initialization will occur. */ yy_init_globals( yyscanner); /* Destroy the main struct (reentrant only). */ - xlu__disk_yyfree ( yyscanner , yyscanner ); + yyfree ( yyscanner , yyscanner ); yyscanner = NULL; return 0; } @@ -2680,18 +2877,21 @@ int xlu__disk_yylex_destroy (yyscan_t yyscanner) */ #ifndef yytext_ptr -static void yy_flex_strncpy (char* s1, yyconst char * s2, int n , yyscan_t yyscanner) +static void yy_flex_strncpy (char* s1, const char * s2, int n , yyscan_t yyscanner) { - register int i; + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + + int i; for ( i = 0; i < n; ++i ) s1[i] = s2[i]; } #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) +static int yy_flex_strlen (const char * s , yyscan_t yyscanner) { - register int n; + int n; for ( n = 0; s[n]; ++n ) ; @@ -2699,13 +2899,18 @@ static int yy_flex_strlen (yyconst char * s , yyscan_t yyscanner) } #endif -void *xlu__disk_yyalloc (yy_size_t size , yyscan_t yyscanner) +void *yyalloc (yy_size_t size , yyscan_t yyscanner) { - return (void *) malloc( size ); + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + return malloc(size); } -void *xlu__disk_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) +void *yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) { + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + /* The cast to (char *) in the following accommodates both * implementations that use char* generic pointers, and those * that use void* generic pointers. It works with the latter @@ -2713,14 +2918,16 @@ void *xlu__disk_yyrealloc (void * ptr, yy_size_t size , yyscan_t yyscanner) * any pointer type to void*, and deal with argument conversions * as though doing an assignment. */ - return (void *) realloc( (char *) ptr, size ); + return realloc(ptr, size); } -void xlu__disk_yyfree (void * ptr , yyscan_t yyscanner) +void yyfree (void * ptr , yyscan_t yyscanner) { - free( (char *) ptr ); /* see xlu__disk_yyrealloc() for (char *) cast */ + struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; + (void)yyg; + free( (char *) ptr ); /* see yyrealloc() for (char *) cast */ } #define YYTABLES_NAME "yytables" -#line 278 "libxlu_disk_l.l" +#line 280 "libxlu_disk_l.l" diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 4d60d5c563..9275a3ab55 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -3,12 +3,9 @@ #define xlu__disk_yyIN_HEADER 1 #line 6 "libxlu_disk_l.h" -#line 31 "libxlu_disk_l.l" #include "libxl_osdeps.h" /* must come before any other headers */ - - -#line 12 "libxlu_disk_l.h" +#line 9 "libxlu_disk_l.h" #define YY_INT_ALIGNED short int @@ -16,12 +13,222 @@ #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 -#define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 39 +#define YY_FLEX_MINOR_VERSION 6 +#define YY_FLEX_SUBMINOR_VERSION 4 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif +#ifdef yy_create_buffer +#define xlu__disk_yy_create_buffer_ALREADY_DEFINED +#else +#define yy_create_buffer xlu__disk_yy_create_buffer +#endif + +#ifdef yy_delete_buffer +#define xlu__disk_yy_delete_buffer_ALREADY_DEFINED +#else +#define yy_delete_buffer xlu__disk_yy_delete_buffer +#endif + +#ifdef yy_scan_buffer +#define xlu__disk_yy_scan_buffer_ALREADY_DEFINED +#else +#define yy_scan_buffer xlu__disk_yy_scan_buffer +#endif + +#ifdef yy_scan_string +#define xlu__disk_yy_scan_string_ALREADY_DEFINED +#else +#define yy_scan_string xlu__disk_yy_scan_string +#endif + +#ifdef yy_scan_bytes +#define xlu__disk_yy_scan_bytes_ALREADY_DEFINED +#else +#define yy_scan_bytes xlu__disk_yy_scan_bytes +#endif + +#ifdef yy_init_buffer +#define xlu__disk_yy_init_buffer_ALREADY_DEFINED +#else +#define yy_init_buffer xlu__disk_yy_init_buffer +#endif + +#ifdef yy_flush_buffer +#define xlu__disk_yy_flush_buffer_ALREADY_DEFINED +#else +#define yy_flush_buffer xlu__disk_yy_flush_buffer +#endif + +#ifdef yy_load_buffer_state +#define xlu__disk_yy_load_buffer_state_ALREADY_DEFINED +#else +#define yy_load_buffer_state xlu__disk_yy_load_buffer_state +#endif + +#ifdef yy_switch_to_buffer +#define xlu__disk_yy_switch_to_buffer_ALREADY_DEFINED +#else +#define yy_switch_to_buffer xlu__disk_yy_switch_to_buffer +#endif + +#ifdef yypush_buffer_state +#define xlu__disk_yypush_buffer_state_ALREADY_DEFINED +#else +#define yypush_buffer_state xlu__disk_yypush_buffer_state +#endif + +#ifdef yypop_buffer_state +#define xlu__disk_yypop_buffer_state_ALREADY_DEFINED +#else +#define yypop_buffer_state xlu__disk_yypop_buffer_state +#endif + +#ifdef yyensure_buffer_stack +#define xlu__disk_yyensure_buffer_stack_ALREADY_DEFINED +#else +#define yyensure_buffer_stack xlu__disk_yyensure_buffer_stack +#endif + +#ifdef yylex +#define xlu__disk_yylex_ALREADY_DEFINED +#else +#define yylex xlu__disk_yylex +#endif + +#ifdef yyrestart +#define xlu__disk_yyrestart_ALREADY_DEFINED +#else +#define yyrestart xlu__disk_yyrestart +#endif + +#ifdef yylex_init +#define xlu__disk_yylex_init_ALREADY_DEFINED +#else +#define yylex_init xlu__disk_yylex_init +#endif + +#ifdef yylex_init_extra +#define xlu__disk_yylex_init_extra_ALREADY_DEFINED +#else +#define yylex_init_extra xlu__disk_yylex_init_extra +#endif + +#ifdef yylex_destroy +#define xlu__disk_yylex_destroy_ALREADY_DEFINED +#else +#define yylex_destroy xlu__disk_yylex_destroy +#endif + +#ifdef yyget_debug +#define xlu__disk_yyget_debug_ALREADY_DEFINED +#else +#define yyget_debug xlu__disk_yyget_debug +#endif + +#ifdef yyset_debug +#define xlu__disk_yyset_debug_ALREADY_DEFINED +#else +#define yyset_debug xlu__disk_yyset_debug +#endif + +#ifdef yyget_extra +#define xlu__disk_yyget_extra_ALREADY_DEFINED +#else +#define yyget_extra xlu__disk_yyget_extra +#endif + +#ifdef yyset_extra +#define xlu__disk_yyset_extra_ALREADY_DEFINED +#else +#define yyset_extra xlu__disk_yyset_extra +#endif + +#ifdef yyget_in +#define xlu__disk_yyget_in_ALREADY_DEFINED +#else +#define yyget_in xlu__disk_yyget_in +#endif + +#ifdef yyset_in +#define xlu__disk_yyset_in_ALREADY_DEFINED +#else +#define yyset_in xlu__disk_yyset_in +#endif + +#ifdef yyget_out +#define xlu__disk_yyget_out_ALREADY_DEFINED +#else +#define yyget_out xlu__disk_yyget_out +#endif + +#ifdef yyset_out +#define xlu__disk_yyset_out_ALREADY_DEFINED +#else +#define yyset_out xlu__disk_yyset_out +#endif + +#ifdef yyget_leng +#define xlu__disk_yyget_leng_ALREADY_DEFINED +#else +#define yyget_leng xlu__disk_yyget_leng +#endif + +#ifdef yyget_text +#define xlu__disk_yyget_text_ALREADY_DEFINED +#else +#define yyget_text xlu__disk_yyget_text +#endif + +#ifdef yyget_lineno +#define xlu__disk_yyget_lineno_ALREADY_DEFINED +#else +#define yyget_lineno xlu__disk_yyget_lineno +#endif + +#ifdef yyset_lineno +#define xlu__disk_yyset_lineno_ALREADY_DEFINED +#else +#define yyset_lineno xlu__disk_yyset_lineno +#endif + +#ifdef yyget_column +#define xlu__disk_yyget_column_ALREADY_DEFINED +#else +#define yyget_column xlu__disk_yyget_column +#endif + +#ifdef yyset_column +#define xlu__disk_yyset_column_ALREADY_DEFINED +#else +#define yyset_column xlu__disk_yyset_column +#endif + +#ifdef yywrap +#define xlu__disk_yywrap_ALREADY_DEFINED +#else +#define yywrap xlu__disk_yywrap +#endif + +#ifdef yyalloc +#define xlu__disk_yyalloc_ALREADY_DEFINED +#else +#define yyalloc xlu__disk_yyalloc +#endif + +#ifdef yyrealloc +#define xlu__disk_yyrealloc_ALREADY_DEFINED +#else +#define yyrealloc xlu__disk_yyrealloc +#endif + +#ifdef yyfree +#define xlu__disk_yyfree_ALREADY_DEFINED +#else +#define yyfree xlu__disk_yyfree +#endif + /* First, we deal with platform-specific or compiler-specific issues. */ /* begin standard C headers. */ @@ -92,29 +299,23 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#ifndef SIZE_MAX +#define SIZE_MAX (~(size_t)0) +#endif + #endif /* ! C99 */ #endif /* ! FLEXINT_H */ -#ifdef __cplusplus - -/* The "const" storage-class-modifier is valid. */ -#define YY_USE_CONST - -#else /* ! __cplusplus */ - -/* C99 requires __STDC__ to be defined as 1. */ -#if defined (__STDC__) - -#define YY_USE_CONST - -#endif /* defined (__STDC__) */ -#endif /* ! __cplusplus */ +/* begin standard C++ headers. */ -#ifdef YY_USE_CONST +/* TODO: this is always defined, so inline it */ #define yyconst const + +#if defined(__GNUC__) && __GNUC__ >= 3 +#define yynoreturn __attribute__((__noreturn__)) #else -#define yyconst +#define yynoreturn #endif /* An opaque pointer. */ @@ -169,12 +370,12 @@ struct yy_buffer_state /* Size of input buffer in bytes, not including room for EOB * characters. */ - yy_size_t yy_buf_size; + int yy_buf_size; /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int yy_n_chars; /* Whether we "own" the buffer - i.e., we know we created it, * and can realloc() it to grow it, and should free() it to @@ -197,7 +398,7 @@ struct yy_buffer_state int yy_bs_lineno; /**< The line count. */ int yy_bs_column; /**< The column count. */ - + /* Whether to try to fill the input buffer when we reach the * end of it. */ @@ -208,23 +409,23 @@ struct yy_buffer_state }; #endif /* !YY_STRUCT_YY_BUFFER_STATE */ -void xlu__disk_yyrestart (FILE *input_file ,yyscan_t yyscanner ); -void xlu__disk_yy_switch_to_buffer (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_create_buffer (FILE *file,int size ,yyscan_t yyscanner ); -void xlu__disk_yy_delete_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yy_flush_buffer (YY_BUFFER_STATE b ,yyscan_t yyscanner ); -void xlu__disk_yypush_buffer_state (YY_BUFFER_STATE new_buffer ,yyscan_t yyscanner ); -void xlu__disk_yypop_buffer_state (yyscan_t yyscanner ); +void yyrestart ( FILE *input_file , yyscan_t yyscanner ); +void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size , yyscan_t yyscanner ); +void yy_delete_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yy_flush_buffer ( YY_BUFFER_STATE b , yyscan_t yyscanner ); +void yypush_buffer_state ( YY_BUFFER_STATE new_buffer , yyscan_t yyscanner ); +void yypop_buffer_state ( yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_buffer (char *base,yy_size_t size ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_string (yyconst char *yy_str ,yyscan_t yyscanner ); -YY_BUFFER_STATE xlu__disk_yy_scan_bytes (yyconst char *bytes,yy_size_t len ,yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner ); +YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner ); -void *xlu__disk_yyalloc (yy_size_t ,yyscan_t yyscanner ); -void *xlu__disk_yyrealloc (void *,yy_size_t ,yyscan_t yyscanner ); -void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); +void *yyalloc ( yy_size_t , yyscan_t yyscanner ); +void *yyrealloc ( void *, yy_size_t , yyscan_t yyscanner ); +void yyfree ( void * , yyscan_t yyscanner ); -#define xlu__disk_yywrap(yyscanner) 1 +#define xlu__disk_yywrap(yyscanner) (/*CONSTCOND*/1) #define YY_SKIP_YYWRAP #define yytext_ptr yytext_r @@ -247,42 +448,42 @@ void xlu__disk_yyfree (void * ,yyscan_t yyscanner ); #define YY_EXTRA_TYPE void * #endif -int xlu__disk_yylex_init (yyscan_t* scanner); +int yylex_init (yyscan_t* scanner); -int xlu__disk_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner); +int yylex_init_extra ( YY_EXTRA_TYPE user_defined, yyscan_t* scanner); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int xlu__disk_yylex_destroy (yyscan_t yyscanner ); +int yylex_destroy ( yyscan_t yyscanner ); -int xlu__disk_yyget_debug (yyscan_t yyscanner ); +int yyget_debug ( yyscan_t yyscanner ); -void xlu__disk_yyset_debug (int debug_flag ,yyscan_t yyscanner ); +void yyset_debug ( int debug_flag , yyscan_t yyscanner ); -YY_EXTRA_TYPE xlu__disk_yyget_extra (yyscan_t yyscanner ); +YY_EXTRA_TYPE yyget_extra ( yyscan_t yyscanner ); -void xlu__disk_yyset_extra (YY_EXTRA_TYPE user_defined ,yyscan_t yyscanner ); +void yyset_extra ( YY_EXTRA_TYPE user_defined , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_in (yyscan_t yyscanner ); +FILE *yyget_in ( yyscan_t yyscanner ); -void xlu__disk_yyset_in (FILE * in_str ,yyscan_t yyscanner ); +void yyset_in ( FILE * _in_str , yyscan_t yyscanner ); -FILE *xlu__disk_yyget_out (yyscan_t yyscanner ); +FILE *yyget_out ( yyscan_t yyscanner ); -void xlu__disk_yyset_out (FILE * out_str ,yyscan_t yyscanner ); +void yyset_out ( FILE * _out_str , yyscan_t yyscanner ); -yy_size_t xlu__disk_yyget_leng (yyscan_t yyscanner ); + int yyget_leng ( yyscan_t yyscanner ); -char *xlu__disk_yyget_text (yyscan_t yyscanner ); +char *yyget_text ( yyscan_t yyscanner ); -int xlu__disk_yyget_lineno (yyscan_t yyscanner ); +int yyget_lineno ( yyscan_t yyscanner ); -void xlu__disk_yyset_lineno (int line_number ,yyscan_t yyscanner ); +void yyset_lineno ( int _line_number , yyscan_t yyscanner ); -int xlu__disk_yyget_column (yyscan_t yyscanner ); +int yyget_column ( yyscan_t yyscanner ); -void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); +void yyset_column ( int _column_no , yyscan_t yyscanner ); /* Macros after this point can all be overridden by user definitions in * section 1. @@ -290,18 +491,18 @@ void xlu__disk_yyset_column (int column_no ,yyscan_t yyscanner ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int xlu__disk_yywrap (yyscan_t yyscanner ); +extern "C" int yywrap ( yyscan_t yyscanner ); #else -extern int xlu__disk_yywrap (yyscan_t yyscanner ); +extern int yywrap ( yyscan_t yyscanner ); #endif #endif #ifndef yytext_ptr -static void yy_flex_strncpy (char *,yyconst char *,int ,yyscan_t yyscanner); +static void yy_flex_strncpy ( char *, const char *, int , yyscan_t yyscanner); #endif #ifdef YY_NEED_STRLEN -static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); +static int yy_flex_strlen ( const char * , yyscan_t yyscanner); #endif #ifndef YY_NO_INPUT @@ -329,9 +530,9 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t yyscanner); #ifndef YY_DECL #define YY_DECL_IS_OURS 1 -extern int xlu__disk_yylex (yyscan_t yyscanner); +extern int yylex (yyscan_t yyscanner); -#define YY_DECL int xlu__disk_yylex (yyscan_t yyscanner) +#define YY_DECL int yylex (yyscan_t yyscanner) #endif /* !YY_DECL */ /* yy_get_previous_state - get the state just before the EOB char was reached */ @@ -348,8 +549,153 @@ extern int xlu__disk_yylex (yyscan_t yyscanner); #undef YY_DECL #endif -#line 278 "libxlu_disk_l.l" +#ifndef xlu__disk_yy_create_buffer_ALREADY_DEFINED +#undef yy_create_buffer +#endif +#ifndef xlu__disk_yy_delete_buffer_ALREADY_DEFINED +#undef yy_delete_buffer +#endif +#ifndef xlu__disk_yy_scan_buffer_ALREADY_DEFINED +#undef yy_scan_buffer +#endif +#ifndef xlu__disk_yy_scan_string_ALREADY_DEFINED +#undef yy_scan_string +#endif +#ifndef xlu__disk_yy_scan_bytes_ALREADY_DEFINED +#undef yy_scan_bytes +#endif +#ifndef xlu__disk_yy_init_buffer_ALREADY_DEFINED +#undef yy_init_buffer +#endif +#ifndef xlu__disk_yy_flush_buffer_ALREADY_DEFINED +#undef yy_flush_buffer +#endif +#ifndef xlu__disk_yy_load_buffer_state_ALREADY_DEFINED +#undef yy_load_buffer_state +#endif +#ifndef xlu__disk_yy_switch_to_buffer_ALREADY_DEFINED +#undef yy_switch_to_buffer +#endif +#ifndef xlu__disk_yypush_buffer_state_ALREADY_DEFINED +#undef yypush_buffer_state +#endif +#ifndef xlu__disk_yypop_buffer_state_ALREADY_DEFINED +#undef yypop_buffer_state +#endif +#ifndef xlu__disk_yyensure_buffer_stack_ALREADY_DEFINED +#undef yyensure_buffer_stack +#endif +#ifndef xlu__disk_yylex_ALREADY_DEFINED +#undef yylex +#endif +#ifndef xlu__disk_yyrestart_ALREADY_DEFINED +#undef yyrestart +#endif +#ifndef xlu__disk_yylex_init_ALREADY_DEFINED +#undef yylex_init +#endif +#ifndef xlu__disk_yylex_init_extra_ALREADY_DEFINED +#undef yylex_init_extra +#endif +#ifndef xlu__disk_yylex_destroy_ALREADY_DEFINED +#undef yylex_destroy +#endif +#ifndef xlu__disk_yyget_debug_ALREADY_DEFINED +#undef yyget_debug +#endif +#ifndef xlu__disk_yyset_debug_ALREADY_DEFINED +#undef yyset_debug +#endif +#ifndef xlu__disk_yyget_extra_ALREADY_DEFINED +#undef yyget_extra +#endif +#ifndef xlu__disk_yyset_extra_ALREADY_DEFINED +#undef yyset_extra +#endif +#ifndef xlu__disk_yyget_in_ALREADY_DEFINED +#undef yyget_in +#endif +#ifndef xlu__disk_yyset_in_ALREADY_DEFINED +#undef yyset_in +#endif +#ifndef xlu__disk_yyget_out_ALREADY_DEFINED +#undef yyget_out +#endif +#ifndef xlu__disk_yyset_out_ALREADY_DEFINED +#undef yyset_out +#endif +#ifndef xlu__disk_yyget_leng_ALREADY_DEFINED +#undef yyget_leng +#endif +#ifndef xlu__disk_yyget_text_ALREADY_DEFINED +#undef yyget_text +#endif +#ifndef xlu__disk_yyget_lineno_ALREADY_DEFINED +#undef yyget_lineno +#endif +#ifndef xlu__disk_yyset_lineno_ALREADY_DEFINED +#undef yyset_lineno +#endif +#ifndef xlu__disk_yyget_column_ALREADY_DEFINED +#undef yyget_column +#endif +#ifndef xlu__disk_yyset_column_ALREADY_DEFINED +#undef yyset_column +#endif +#ifndef xlu__disk_yywrap_ALREADY_DEFINED +#undef yywrap +#endif +#ifndef xlu__disk_yyget_lval_ALREADY_DEFINED +#undef yyget_lval +#endif +#ifndef xlu__disk_yyset_lval_ALREADY_DEFINED +#undef yyset_lval +#endif +#ifndef xlu__disk_yyget_lloc_ALREADY_DEFINED +#undef yyget_lloc +#endif +#ifndef xlu__disk_yyset_lloc_ALREADY_DEFINED +#undef yyset_lloc +#endif +#ifndef xlu__disk_yyalloc_ALREADY_DEFINED +#undef yyalloc +#endif +#ifndef xlu__disk_yyrealloc_ALREADY_DEFINED +#undef yyrealloc +#endif +#ifndef xlu__disk_yyfree_ALREADY_DEFINED +#undef yyfree +#endif +#ifndef xlu__disk_yytext_ALREADY_DEFINED +#undef yytext +#endif +#ifndef xlu__disk_yyleng_ALREADY_DEFINED +#undef yyleng +#endif +#ifndef xlu__disk_yyin_ALREADY_DEFINED +#undef yyin +#endif +#ifndef xlu__disk_yyout_ALREADY_DEFINED +#undef yyout +#endif +#ifndef xlu__disk_yy_flex_debug_ALREADY_DEFINED +#undef yy_flex_debug +#endif +#ifndef xlu__disk_yylineno_ALREADY_DEFINED +#undef yylineno +#endif +#ifndef xlu__disk_yytables_fload_ALREADY_DEFINED +#undef yytables_fload +#endif +#ifndef xlu__disk_yytables_destroy_ALREADY_DEFINED +#undef yytables_destroy +#endif +#ifndef xlu__disk_yyTABLES_NAME_ALREADY_DEFINED +#undef yyTABLES_NAME +#endif + +#line 280 "libxlu_disk_l.l" -#line 354 "libxlu_disk_l.h" +#line 700 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER #endif /* xlu__disk_yyHEADER_H */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 11 10:11:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 11 May 2020 10:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY5P0-0003Et-Kr; Mon, 11 May 2020 10:11:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY5Oz-0003Eg-Ed for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 10:11:13 +0000 X-Inumbo-ID: bde3b12c-936f-11ea-a1fe-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bde3b12c-936f-11ea-a1fe-12813bfff9fa; Mon, 11 May 2020 10:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YrBEpIAjo++g/8MdCoKQ+Ut8h3X4djxqnUHUuYCaGYA=; b=H3u8l3i3DMy2oHnMCrdwng0w8+ UK3fzRgSxY2V7+SzyhCTLxdTypCbArCg5AFFFwJJNP+fpGVmxF7YXj/WTpg/J7AEdjKSKuzIgNdKW eNKSwpfeqJajXrdjM9so0EIN89RuxyNE9Qh9HD9fhjBQfesLy/2hG1hk47gHLil7kTSc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jY5Oy-0002rD-CY for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 10:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jY5Oy-0007ug-Ad for xen-changelog@lists.xenproject.org; Mon, 11 May 2020 10:11:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/libxl: disable clang indentation check for the disk parser Message-Id: Date: Mon, 11 May 2020 10:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 190c60f12db469472476041ecd0e6c9a0d4b0f8a Author: Roger Pau Monne AuthorDate: Tue May 5 11:24:54 2020 +0200 Commit: Wei Liu CommitDate: Sun May 10 13:02:18 2020 +0100 tools/libxl: disable clang indentation check for the disk parser Clang 10 complains with: 13: error: misleading indentation; statement is not part of the previous 'if' [-Werror,-Wmisleading-indentation] if ( ! yyg->yy_state_buf ) ^ libxlu_disk_l.c:1259:9: note: previous statement is here if ( ! yyg->yy_state_buf ) ^ Due to the missing braces in single line statements and the wrong indentation. Fix this by disabling the warning for that specific file. I haven't found a way to force flex to add braces around single line statements in conditional blocks. Signed-off-by: Roger Pau Monné [ wei: regenerate output files ] Acked-by: Wei Liu --- tools/libxl/libxlu_disk_l.c | 97 +++++++++++++++++++++++++-------------------- tools/libxl/libxlu_disk_l.h | 2 +- tools/libxl/libxlu_disk_l.l | 11 +++++ 3 files changed, 66 insertions(+), 44 deletions(-) diff --git a/tools/libxl/libxlu_disk_l.c b/tools/libxl/libxlu_disk_l.c index b0ac3a865a..05f7ac74a0 100644 --- a/tools/libxl/libxlu_disk_l.c +++ b/tools/libxl/libxlu_disk_l.c @@ -1074,6 +1074,17 @@ goto find_rule; \ #define YY_NO_INPUT +/* The code generated by flex is missing braces in single line expressions and + * is not properly indented, which triggers the clang misleading-indentation + * check that has been made part of -Wall since clang 10. In order to safely + * disable it on clang versions that don't have the diagnostic implemented + * also disable the unknown option and pragma warning. */ +#ifdef __clang__ +# pragma clang diagnostic ignored "-Wunknown-pragmas" +# pragma clang diagnostic ignored "-Wunknown-warning-option" +# pragma clang diagnostic ignored "-Wmisleading-indentation" +#endif + /* Some versions of flex have a bug (Fedora bugzilla 612465) which causes * it to fail to declare these functions, which it defines. So declare * them ourselves. Hopefully we won't have to simultaneously support @@ -1188,9 +1199,9 @@ static int vdev_and_devtype(DiskParseContext *dpc, char *str) { #undef DPC /* needs to be defined differently the actual lexer */ #define DPC ((DiskParseContext*)yyextra) -#line 1192 "libxlu_disk_l.c" +#line 1203 "libxlu_disk_l.c" -#line 1194 "libxlu_disk_l.c" +#line 1205 "libxlu_disk_l.c" #define INITIAL 0 #define LEXERR 1 @@ -1466,13 +1477,13 @@ YY_DECL } { -#line 166 "libxlu_disk_l.l" +#line 177 "libxlu_disk_l.l" -#line 169 "libxlu_disk_l.l" +#line 180 "libxlu_disk_l.l" /*----- the scanner rules which do the parsing -----*/ -#line 1476 "libxlu_disk_l.c" +#line 1487 "libxlu_disk_l.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1561,135 +1572,135 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 171 "libxlu_disk_l.l" +#line 182 "libxlu_disk_l.l" { /* ignore whitespace before parameters */ } YY_BREAK /* ordinary parameters setting enums or strings */ case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 175 "libxlu_disk_l.l" +#line 186 "libxlu_disk_l.l" { STRIP(','); setformat(DPC, FROMEQUALS); } YY_BREAK case 3: YY_RULE_SETUP -#line 177 "libxlu_disk_l.l" +#line 188 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 4: YY_RULE_SETUP -#line 178 "libxlu_disk_l.l" +#line 189 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 1; } YY_BREAK case 5: YY_RULE_SETUP -#line 179 "libxlu_disk_l.l" +#line 190 "libxlu_disk_l.l" { DPC->disk->is_cdrom = 0; } YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 180 "libxlu_disk_l.l" +#line 191 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown value for type"); } YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 182 "libxlu_disk_l.l" +#line 193 "libxlu_disk_l.l" { STRIP(','); setaccess(DPC, FROMEQUALS); } YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 183 "libxlu_disk_l.l" +#line 194 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("backend", backend_domname, FROMEQUALS); } YY_BREAK case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 184 "libxlu_disk_l.l" +#line 195 "libxlu_disk_l.l" { STRIP(','); setbackendtype(DPC,FROMEQUALS); } YY_BREAK case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 186 "libxlu_disk_l.l" +#line 197 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("vdev", vdev, FROMEQUALS); } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 187 "libxlu_disk_l.l" +#line 198 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("script", script, FROMEQUALS); } YY_BREAK case 12: YY_RULE_SETUP -#line 188 "libxlu_disk_l.l" +#line 199 "libxlu_disk_l.l" { DPC->disk->direct_io_safe = 1; } YY_BREAK case 13: YY_RULE_SETUP -#line 189 "libxlu_disk_l.l" +#line 200 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, true); } YY_BREAK case 14: YY_RULE_SETUP -#line 190 "libxlu_disk_l.l" +#line 201 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->discard_enable, false); } YY_BREAK /* Note that the COLO configuration settings should be considered unstable. * They may change incompatibly in future versions of Xen. */ case 15: YY_RULE_SETUP -#line 193 "libxlu_disk_l.l" +#line 204 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, true); } YY_BREAK case 16: YY_RULE_SETUP -#line 194 "libxlu_disk_l.l" +#line 205 "libxlu_disk_l.l" { libxl_defbool_set(&DPC->disk->colo_enable, false); } YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 195 "libxlu_disk_l.l" +#line 206 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-host", colo_host, FROMEQUALS); } YY_BREAK case 18: /* rule 18 can match eol */ YY_RULE_SETUP -#line 196 "libxlu_disk_l.l" +#line 207 "libxlu_disk_l.l" { STRIP(','); setcoloport(DPC, FROMEQUALS); } YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 197 "libxlu_disk_l.l" +#line 208 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("colo-export", colo_export, FROMEQUALS); } YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 198 "libxlu_disk_l.l" +#line 209 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("active-disk", active_disk, FROMEQUALS); } YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 199 "libxlu_disk_l.l" +#line 210 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("hidden-disk", hidden_disk, FROMEQUALS); } YY_BREAK /* the target magic parameter, eats the rest of the string */ case 22: YY_RULE_SETUP -#line 203 "libxlu_disk_l.l" +#line 214 "libxlu_disk_l.l" { STRIP(','); SAVESTRING("target", pdev_path, FROMEQUALS); } YY_BREAK /* unknown parameters */ case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 207 "libxlu_disk_l.l" +#line 218 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown parameter"); } YY_BREAK /* deprecated prefixes */ @@ -1697,7 +1708,7 @@ YY_RULE_SETUP * matched the whole string, so these patterns take precedence */ case 24: YY_RULE_SETUP -#line 214 "libxlu_disk_l.l" +#line 225 "libxlu_disk_l.l" { STRIP(':'); DPC->had_depr_prefix=1; DEPRECATE("use `[format=]...,'"); @@ -1706,7 +1717,7 @@ YY_RULE_SETUP YY_BREAK case 25: YY_RULE_SETUP -#line 220 "libxlu_disk_l.l" +#line 231 "libxlu_disk_l.l" { char *newscript; STRIP(':'); @@ -1725,12 +1736,12 @@ case 26: yyg->yy_c_buf_p = yy_cp = yy_bp + 8; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 233 "libxlu_disk_l.l" +#line 244 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 27: YY_RULE_SETUP -#line 234 "libxlu_disk_l.l" +#line 245 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 28: @@ -1738,7 +1749,7 @@ case 28: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 235 "libxlu_disk_l.l" +#line 246 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 29: @@ -1746,7 +1757,7 @@ case 29: yyg->yy_c_buf_p = yy_cp = yy_bp + 6; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 236 "libxlu_disk_l.l" +#line 247 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 30: @@ -1754,7 +1765,7 @@ case 30: yyg->yy_c_buf_p = yy_cp = yy_bp + 5; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 237 "libxlu_disk_l.l" +#line 248 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 31: @@ -1762,13 +1773,13 @@ case 31: yyg->yy_c_buf_p = yy_cp = yy_bp + 4; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 238 "libxlu_disk_l.l" +#line 249 "libxlu_disk_l.l" { DPC->had_depr_prefix=1; DEPRECATE(0); } YY_BREAK case 32: /* rule 32 can match eol */ YY_RULE_SETUP -#line 240 "libxlu_disk_l.l" +#line 251 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"unknown deprecated disk prefix"); return 0; @@ -1778,7 +1789,7 @@ YY_RULE_SETUP case 33: /* rule 33 can match eol */ YY_RULE_SETUP -#line 247 "libxlu_disk_l.l" +#line 258 "libxlu_disk_l.l" { STRIP(','); @@ -1807,7 +1818,7 @@ YY_RULE_SETUP YY_BREAK case 34: YY_RULE_SETUP -#line 273 "libxlu_disk_l.l" +#line 284 "libxlu_disk_l.l" { BEGIN(LEXERR); yymore(); @@ -1815,17 +1826,17 @@ YY_RULE_SETUP YY_BREAK case 35: YY_RULE_SETUP -#line 277 "libxlu_disk_l.l" +#line 288 "libxlu_disk_l.l" { xlu__disk_err(DPC,yytext,"bad disk syntax"); return 0; } YY_BREAK case 36: YY_RULE_SETUP -#line 280 "libxlu_disk_l.l" +#line 291 "libxlu_disk_l.l" YY_FATAL_ERROR( "flex scanner jammed" ); YY_BREAK -#line 1829 "libxlu_disk_l.c" +#line 1840 "libxlu_disk_l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(LEXERR): yyterminate(); @@ -2930,4 +2941,4 @@ void yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 280 "libxlu_disk_l.l" +#line 291 "libxlu_disk_l.l" diff --git a/tools/libxl/libxlu_disk_l.h b/tools/libxl/libxlu_disk_l.h index 9275a3ab55..54f4662d7a 100644 --- a/tools/libxl/libxlu_disk_l.h +++ b/tools/libxl/libxlu_disk_l.h @@ -694,7 +694,7 @@ extern int yylex (yyscan_t yyscanner); #undef yyTABLES_NAME #endif -#line 280 "libxlu_disk_l.l" +#line 291 "libxlu_disk_l.l" #line 700 "libxlu_disk_l.h" #undef xlu__disk_yyIN_HEADER diff --git a/tools/libxl/libxlu_disk_l.l b/tools/libxl/libxlu_disk_l.l index 97039a2800..7a46f4a30c 100644 --- a/tools/libxl/libxlu_disk_l.l +++ b/tools/libxl/libxlu_disk_l.l @@ -36,6 +36,17 @@ #define YY_NO_INPUT +/* The code generated by flex is missing braces in single line expressions and + * is not properly indented, which triggers the clang misleading-indentation + * check that has been made part of -Wall since clang 10. In order to safely + * disable it on clang versions that don't have the diagnostic implemented + * also disable the unknown option and pragma warning. */ +#ifdef __clang__ +# pragma clang diagnostic ignored "-Wunknown-pragmas" +# pragma clang diagnostic ignored "-Wunknown-warning-option" +# pragma clang diagnostic ignored "-Wmisleading-indentation" +#endif + /* Some versions of flex have a bug (Fedora bugzilla 612465) which causes * it to fail to declare these functions, which it defines. So declare * them ourselves. Hopefully we won't have to simultaneously support -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 14:11:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2020 14:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVce-0008Rf-Jt; Tue, 12 May 2020 14:11:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVcd-0008RZ-4J for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:03 +0000 X-Inumbo-ID: 695691ce-945a-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 695691ce-945a-11ea-b9cf-bc764e2007e4; Tue, 12 May 2020 14:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oWmlEAkLbWOubUKBPIVolythBcVEFHx7X4gte/l/G0o=; b=BmeSZGqKouOHM5QFtf/YZKmr3V VGTt8jaJjijGRzHKwzi+yguFoacVVjtsxAV4J/Mx/Pxf65TBngOz5daim/5MAtuODg5YOOBjsfwGJ o4/ALkSplCOY3lVQzof/9K++joAOHmseYIACaxJrCsoLFxr1JnRwJ0DX3AyC5J95HQsE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVcc-00085O-99 for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYVcc-00089F-7q for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/xl: vcpu-pin: Skip global affinity when the hard affinity is not changed Message-Id: Date: Tue, 12 May 2020 14:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3748c81fa1ff5e67c0442978c583e722820b1690 Author: Julien Grall AuthorDate: Thu Apr 30 11:20:44 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:18:22 2020 +0100 tools/xl: vcpu-pin: Skip global affinity when the hard affinity is not changed After XSA-273, it is not possible to modify the vCPU soft affinity using xl vcpu-pin without modifying the hard affinity. Instead the command will crash. 42sh> gdb /usr/local/sbin/xl (gdb) r vcpu-pin 0 0 - 10 [...] Program received signal SIGSEGV, Segmentation fault. [...] (gdb) bt This is happening because 'xl' will use NULL when an affinity doesn't need to be modified. However, we will still try to apply the global affinity in the this case. As the hard affinity is not changed, then we don't need to apply the global affinity. So skip it when hard is NULL. Backport: 4.6+ # Any release with XSA-273 Fixes: aa67b97ed342 ("xl.conf: Add global affinity masks") Reported-by: Pawel Wieczorkiewicz Signed-off-by: Julien Grall Acked-by: Wei Liu --- tools/xl/xl_vcpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xl/xl_vcpu.c b/tools/xl/xl_vcpu.c index 9ff5354f74..66877a57de 100644 --- a/tools/xl/xl_vcpu.c +++ b/tools/xl/xl_vcpu.c @@ -283,7 +283,7 @@ int main_vcpupin(int argc, char **argv) } /* Only hard affinity matters here */ - if (!ignore_masks) { + if (!ignore_masks && hard) { libxl_dominfo dominfo; if (libxl_domain_info(ctx, &dominfo, domid)) { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 14:11:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2020 14:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVco-0008SS-LU; Tue, 12 May 2020 14:11:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVcn-0008SK-16 for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:13 +0000 X-Inumbo-ID: 6f5c4258-945a-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6f5c4258-945a-11ea-b9cf-bc764e2007e4; Tue, 12 May 2020 14:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Yu3JOMau1fmv4Cow0Zt3U79t+Cb1r4CueZoWGiVT3Jc=; b=bphVISZ7qelrc065uqWLXfUBXk TdSCXNhTn+rMdavreEfDi9kLPIpHBXJpzS2j0wdgKjWPr7iAxOvFd/ejgYWtpY2BM/qtKyu2r3v0u 5YUWc6ftRXbRKDqhcGK8NEkuiDjedsGdtMIW2yRf9cKimOLOk8U+3lXxGVNn84krRZKI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVcm-00085U-Ck for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYVcm-0008Av-B0 for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/arm: atomic: Allow read_atomic() to be used in more cases Message-Id: Date: Tue, 12 May 2020 14:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9efda0281b29ac8ac5793457b8f71e6ff35f898c Author: Julien Grall AuthorDate: Sat May 2 15:06:22 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:47:57 2020 +0100 xen/arm: atomic: Allow read_atomic() to be used in more cases The current implementation of read_atomic() on Arm will not allow to: 1) Read a value from a pointer to const because the temporary variable will be const and therefore it is not possible to assign any value. This can be solved by using a union between the type and a char[0]. 2) Read a pointer value (e.g void *) because the switch contains cast from other type than the size of a pointer. This can be solved by by introducing a static inline for the switch and use void * for the pointer. Reported-by: Juergen Gross Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/atomic.h | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index e81bf80e30..3c3d6bb04e 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -71,18 +71,37 @@ build_add_sized(add_u32_sized, "", WORD, uint32_t) #undef build_atomic_write #undef build_add_sized +void __bad_atomic_read(const volatile void *p, void *res); void __bad_atomic_size(void); +static always_inline void read_atomic_size(const volatile void *p, + void *res, + unsigned int size) +{ + switch ( size ) + { + case 1: + *(uint8_t *)res = read_u8_atomic(p); + break; + case 2: + *(uint16_t *)res = read_u16_atomic(p); + break; + case 4: + *(uint32_t *)res = read_u32_atomic(p); + break; + case 8: + *(uint64_t *)res = read_u64_atomic(p); + break; + default: + __bad_atomic_read(p, res); + break; + } +} + #define read_atomic(p) ({ \ - typeof(*p) __x; \ - switch ( sizeof(*p) ) { \ - case 1: __x = (typeof(*p))read_u8_atomic((uint8_t *)p); break; \ - case 2: __x = (typeof(*p))read_u16_atomic((uint16_t *)p); break; \ - case 4: __x = (typeof(*p))read_u32_atomic((uint32_t *)p); break; \ - case 8: __x = (typeof(*p))read_u64_atomic((uint64_t *)p); break; \ - default: __x = 0; __bad_atomic_size(); break; \ - } \ - __x; \ + union { typeof(*p) val; char c[0]; } x_; \ + read_atomic_size(p, x_.c, sizeof(*p)); \ + x_.val; \ }) #define write_atomic(p, x) ({ \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 14:11:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2020 14:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVcy-0008Tl-NE; Tue, 12 May 2020 14:11:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVcx-0008Tb-OW for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:23 +0000 X-Inumbo-ID: 75608d58-945a-11ea-a2b0-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 75608d58-945a-11ea-a2b0-12813bfff9fa; Tue, 12 May 2020 14:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=9WtAK32XAEbpMAwJDoP4vmsnwW8QBAb1Uw6ZgnZdrpY=; b=Kzx/EWWhuSDl+ky48NgeahvJZC cHwSUhJ0nWphYQDAs3X+QeZuesEGUwzzUOzcZ1+xyOXuT7XIS26J0ipEDF7mOjrQGtK63QenLDBQF wOni3bSsAJ8fOK62WIWVzx+4xKFRT1WREoRxLHcNAPkW/R6jw/QISMAjAb3LhfUuCmts=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVcw-00085g-FU for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYVcw-0008Be-EV for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/arm: atomic: Rewrite write_atomic() Message-Id: Date: Tue, 12 May 2020 14:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 52ffcfb73997e43717fa05802acc4503483d2d71 Author: Julien Grall AuthorDate: Sat May 2 16:39:58 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:48:30 2020 +0100 xen/arm: atomic: Rewrite write_atomic() The current implementation of write_atomic has two issues: 1) It cannot be used to write pointer value because the switch contains cast to other size than the size of the pointer. 2) It will happily allow to write to a pointer to const. Additionally, the Arm implementation is returning a value when the x86 implementation does not anymore. This was introduced in commit 2934148a0773 "x86: simplify a few macros / inline functions". There are no users of the return value, so it is fine to drop it. The switch is now moved in a static inline helper allowing the compiler to prevent use of const pointer and also allow to write pointer value. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/atomic.h | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 3c3d6bb04e..ac2798d095 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -98,23 +98,41 @@ static always_inline void read_atomic_size(const volatile void *p, } } +static always_inline void write_atomic_size(volatile void *p, + void *val, + unsigned int size) +{ + switch ( size ) + { + case 1: + write_u8_atomic(p, *(uint8_t *)val); + break; + case 2: + write_u16_atomic(p, *(uint16_t *)val); + break; + case 4: + write_u32_atomic(p, *(uint32_t *)val); + break; + case 8: + write_u64_atomic(p, *(uint64_t *)val); + break; + default: + __bad_atomic_size(); + break; + } +} + #define read_atomic(p) ({ \ union { typeof(*p) val; char c[0]; } x_; \ read_atomic_size(p, x_.c, sizeof(*p)); \ x_.val; \ }) -#define write_atomic(p, x) ({ \ - typeof(*p) __x = (x); \ - switch ( sizeof(*p) ) { \ - case 1: write_u8_atomic((uint8_t *)p, (uint8_t)__x); break; \ - case 2: write_u16_atomic((uint16_t *)p, (uint16_t)__x); break; \ - case 4: write_u32_atomic((uint32_t *)p, (uint32_t)__x); break; \ - case 8: write_u64_atomic((uint64_t *)p, (uint64_t)__x); break; \ - default: __bad_atomic_size(); break; \ - } \ - __x; \ -}) +#define write_atomic(p, x) \ + do { \ + typeof(*p) x_ = (x); \ + write_atomic_size(p, &x_, sizeof(*p)); \ + } while ( false ) #define add_sized(p, x) ({ \ typeof(*(p)) __x = (x); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 12 14:11:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 12 May 2020 14:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVd8-0008Uu-P1; Tue, 12 May 2020 14:11:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVd7-0008Uj-3o for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:33 +0000 X-Inumbo-ID: 7b640054-945a-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7b640054-945a-11ea-b9cf-bc764e2007e4; Tue, 12 May 2020 14:11:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5gujUMM9RpAmupQXtC7VDjjk6CR1c7Qp2bXSl4/WQOY=; b=iVUZkUDafrEEhXfm/35Ti2qjZR xWt5lGVKq0bnZMie7oqOKHlWfe73mq8Uc59kHidWl/AtsaFkENzOy2qW6rDeHBuPmYGb83d+jzPTC DvYMvcRJozYZM1RCjq9ar0xD/PJCvLaGaPgYe1cjd1ZvexfBOO3n9Ozi2tPFhbNzYXTE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYVd6-00085w-Ik for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYVd6-0008CJ-HI for xen-changelog@lists.xenproject.org; Tue, 12 May 2020 14:11:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/x86: atomic: Don't allow to write atomically in a pointer to const Message-Id: Date: Tue, 12 May 2020 14:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a82582b1af6a4a57ca53bcfad9f71428cb5f9a54 Author: Julien Grall AuthorDate: Sat May 2 15:26:10 2020 +0100 Commit: Julien Grall CommitDate: Mon May 11 10:50:17 2020 +0100 xen/x86: atomic: Don't allow to write atomically in a pointer to const At the moment, write_atomic() will happily write to a pointer to const. While there are no use in Xen, it would be best to catch them at compilation time. Signed-off-by: Julien Grall Acked-by: Jan Beulich --- xen/include/asm-x86/atomic.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h index 6b40f9c9f8..27aad43aaa 100644 --- a/xen/include/asm-x86/atomic.h +++ b/xen/include/asm-x86/atomic.h @@ -63,6 +63,8 @@ void __bad_atomic_size(void); #define write_atomic(p, x) ({ \ typeof(*(p)) __x = (x); \ + /* Check that the pointer is not a const type */ \ + void *__maybe_unused p_ = &__x; \ unsigned long x_ = (unsigned long)__x; \ switch ( sizeof(*(p)) ) { \ case 1: write_u8_atomic((uint8_t *)(p), x_); break; \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 13 12:33:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 12:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqZQ-0000A7-2N; Wed, 13 May 2020 12:33:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqZO-00009z-RQ for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:33:06 +0000 X-Inumbo-ID: e47105cc-9515-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e47105cc-9515-11ea-b9cf-bc764e2007e4; Wed, 13 May 2020 12:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=qqtcGa6Zf3lV3HRsrIVCUjP5x0Z8x4OzEEBLXnB9vug=; b=QQh1QdRkSzB5hNUWHYpltYqdjJ KW6B/a4cFsAC5J6N4l+m04H4pJgXLLX34jszRSNotrhyfKHo9ZcoNmpjU9S3w0nQ+51xCCOeQKn5M 274qOxjQslI3Fl3L0fYeppSaVGCOcKW44g3X77ersSqd2Az5qhSraVI6HRcoGSMjx8v4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqZM-0006Ba-KM for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYqZM-0008NI-Iy for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] docs/designs: re-work the xenstore migration document... Message-Id: Date: Wed, 13 May 2020 12:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 13dd372834a4398e01ded09d23549a037877c11d Author: Paul Durrant AuthorDate: Tue Apr 28 16:06:24 2020 +0100 Commit: Julien Grall CommitDate: Wed May 13 13:26:06 2020 +0100 docs/designs: re-work the xenstore migration document... ... to specify a separate migration stream that will also be suitable for live update. The original scope of the document was to support non-cooperative migration of guests [1] but, since then, live update of xenstored has been brought into scope. Thus it makes more sense to define a separate image format for serializing xenstore state that is suitable for both purposes. The document has been limited to specifying a new image format. The mechanism for acquiring the image for live update or migration is not covered as that is more appropriately dealt with by a patch to docs/misc/xenstore.txt. It is also expected that, when the first implementation of live update or migration making use of this specification is committed, that the document is moved from docs/designs into docs/specs. NOTE: It will only be necessary to save and restore state for active xenstore connections, but the documentation for 'RESUME' in xenstore.txt implies otherwise. That command is unused so this patch deletes it from the specification. [1] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/designs/non-cooperative-migration.md Signed-off-by: Paul Durrant Reviewed-by: Juergen Gross Acked-by: Julien Grall --- docs/designs/xenstore-migration.md | 469 ++++++++++++++++++++++++------------- docs/misc/xenstore.txt | 17 -- 2 files changed, 307 insertions(+), 179 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index 6ab351e8fe..34a2afd17e 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -3,254 +3,399 @@ ## Background The design for *Non-Cooperative Migration of Guests*[1] explains that extra -save records are required in the migrations stream to allow a guest running -PV drivers to be migrated without its co-operation. Moreover the save -records must include details of registered xenstore watches as well as -content; information that cannot currently be recovered from `xenstored`, -and hence some extension to the xenstore protocol[2] will also be required. - -The *libxenlight Domain Image Format* specification[3] already defines a -record type `EMULATOR_XENSTORE_DATA` but this is not suitable for -transferring xenstore data pertaining to the domain directly as it is -specified such that keys are relative to the path -`/local/domain/$dm_domid/device-model/$domid`. Thus it is necessary to -define at least one new save record type. +save records are required in the migrations stream to allow a guest running PV +drivers to be migrated without its co-operation. Moreover the save records must +include details of registered xenstore watches as well as content; information +that cannot currently be recovered from `xenstored`, and hence some extension +to the xenstored implementations will also be required. + +As a similar set of data is needed for transferring xenstore data from one +instance to another when live updating xenstored this document proposes an +image format for a 'migration stream' suitable for both purposes. ## Proposal -### New Save Record +The image format consists of a _header_ followed by 1 or more _records_. Each +record consists of a type and length field, followed by any data mandated by +the record type. At minimum there will be a single record of type `END` +(defined below). -A new mandatory record type should be defined within the libxenlight Domain -Image Format: +### Header -`0x00000007: DOMAIN_XENSTORE_DATA` +The header identifies the stream as a `xenstore` stream, including the version +of the specification that it complies with. -An arbitrary number of these records may be present in the migration -stream and may appear in any order. The format of each record should be as -follows: +All fields in this header must be in _big-endian_ byte order, regardless of +the setting of the endianness bit. ``` 0 1 2 3 4 5 6 7 octet +-------+-------+-------+-------+-------+-------+-------+-------+ -| type | record specific data | -+-------------------------------+ | -... -+---------------------------------------------------------------+ +| ident | ++-------------------------------+-------------------------------| +| version | flags | ++-------------------------------+-------------------------------+ ``` -where type is one of the following values +| Field | Description | +|-----------|---------------------------------------------------| +| `ident` | 0x78656e73746f7265 ('xenstore' in ASCII) | +| | | +| `version` | 0x00000001 (the version of the specification) | +| | | +| `flags` | 0 (LSB): Endianness: 0 = little, 1 = big | +| | | +| | 1-31: Reserved (must be zero) | -| Field | Description | -|--------|--------------------------------------------------| -| `type` | 0x00000000: invalid | -| | 0x00000001: NODE_DATA | -| | 0x00000002: WATCH_DATA | -| | 0x00000003: TRANSACTION_DATA | -| | 0x00000004 - 0xFFFFFFFF: reserved for future use | +### Records +Records immediately follow the header and have the following format: -and data is one of the record data formats described in the following -sections. + +``` + 0 1 2 3 4 5 6 7 octet ++-------+-------+-------+-------+-------+-------+-------+-------+ +| type | len | ++-------------------------------+-------------------------------+ +| body +... +| | padding (0 to 7 octets) | ++-------+-------------------------------------------------------+ +``` + +NOTE: padding octets here and in all subsequent format specifications must be + written as zero and should be ignored when the stream is read. -NOTE: The record data does not contain an overall length because the -libxenlight record header specifies the length. +| Field | Description | +|--------|------------------------------------------------------| +| `type` | 0x00000000: END | +| | 0x00000001: GLOBAL_DATA | +| | 0x00000002: CONNECTION_DATA | +| | 0x00000003: WATCH_DATA | +| | 0x00000004: TRANSACTION_DATA | +| | 0x00000005: NODE_DATA | +| | 0x00000006 - 0xFFFFFFFF: reserved for future use | +| | | +| `len` | The length (in octets) of `body` | +| | | +| `body` | The type-specific record data | +Some records will depend on other records in the migration stream. Records +upon which other records depend must always appear earlier in the stream. -**NODE_DATA** +The various formats of the type-specific data are described in the following +sections: +\pagebreak -Each NODE_DATA record specifies a single node in xenstore and is formatted -as follows: +### END +The end record marks the end of the image, and is the final record +in the stream. ``` - 0 1 2 3 octet -+-------+-------+-------+-------+ -| NODE_DATA | -+-------------------------------+ -| path length | -+-------------------------------+ -| path data | -... -| pad (0 to 3 octets) | -+-------------------------------+ -| perm count (N) | -+-------------------------------+ -| perm0 | -+-------------------------------+ -... -+-------------------------------+ -| permN | -+-------------------------------+ -| value length | -+-------------------------------+ -| value data | -... -| pad (0 to 3 octets) | -+-------------------------------+ + 0 1 2 3 4 5 6 7 octet ++-------+-------+-------+-------+-------+-------+-------+-------+ ``` -where perm0..N are formatted as follows: +The end record contains no fields; its body length is 0. + +\pagebreak + +### GLOBAL_DATA + +This record is only relevant for live update. It contains details of global +xenstored state that needs to be restored. ``` - 0 1 2 3 octet + 0 1 2 3 octet +-------+-------+-------+-------+ -| perm | pad | domid | +| rw-socket-fd | ++-------------------------------+ +| ro-socket-fd | +-------------------------------+ ``` -path length and value length are specified in octets (excluding the NUL -terminator of the path). perm should be one of the ASCII values `w`, `r`, -`b` or `n` as described in [2]. All pad values should be 0. -All paths should be absolute (i.e. start with `/`) and as described in -[2]. +| Field | Description | +|----------------|----------------------------------------------| +| `rw-socket-fd` | The file descriptor of the socket accepting | +| | read-write connections | +| | | +| `ro-socket-fd` | The file descriptor of the socket accepting | +| | read-only connections | + +xenstored will resume in the original process context. Hence `rw-socket-fd` and +`ro-socket-fd` simply specify the file descriptors of the sockets. Sockets +are not always used, however, and so -1 will be used to denote an unused +socket. -**WATCH_DATA** +\pagebreak +### CONNECTION_DATA -Each WATCH_DATA record specifies a registered watch and is formatted as -follows: +For live update the image format will contain a `CONNECTION_DATA` record for +each connection to xenstore. For migration it will only contain a record for +the domain being migrated. ``` - 0 1 2 3 octet -+-------+-------+-------+-------+ -| WATCH_DATA | -+-------------------------------+ -| wpath length | -+-------------------------------+ -| wpath data | -... -| pad (0 to 3 octets) | -+-------------------------------+ + 0 1 2 3 4 5 6 7 octet ++-------+-------+-------+-------+-------+-------+-------+-------+ +| conn-id | conn-type | conn-spec ... ++-------------------------------+-------------------------------+ +| data-len | data +-------------------------------+ -| token length | -+-------------------------------+ -| token data | ... -| pad (0 to 3 octets) | -+-------------------------------+ ``` -wpath length and token length are specified in octets (excluding the NUL -terminator). The wpath should be as described for the `WATCH` operation in -[2]. The token is an arbitrary string of octets not containing any NUL -values. +| Field | Description | +|-------------|-------------------------------------------------| +| `conn-id` | A non-zero number used to identify this | +| | connection in subsequent connection-specific | +| | records | +| | | +| `conn-type` | 0x0000: shared ring | +| | 0x0001: socket | +| | 0x0002 - 0xFFFF: reserved for future use | +| | | +| `conn-spec` | See below | +| | | +| `data-len` | The length (in octets) of any pending data not | +| | yet written to the connection | +| | | +| `data` | Pending data (may be empty) | -**TRANSACTION_DATA** +The format of `conn-spec` is dependent upon `conn-type`. +\pagebreak -Each TRANSACTION_DATA record specifies an open transaction and is formatted -as follows: +For `shared ring` connections it is as follows: ``` - 0 1 2 3 octet -+-------+-------+-------+-------+ -| TRANSACTION_DATA | -+-------------------------------+ -| tx_id | -+-------------------------------+ + 0 1 2 3 4 5 6 7 octet + +-------+-------+ + | flags | ++---------------+---------------+---------------+---------------+ +| domid | tdomid | evtchn | ++-------------------------------+-------------------------------+ ``` -where tx_id is the non-zero identifier values of an open transaction. +| Field | Description | +|-----------|---------------------------------------------------| +| `domid` | The domain-id that owns the shared page | +| | | +| `tdomid` | The domain-id that `domid` acts on behalf of if | +| | it has been subject to an SET_TARGET | +| | operation [2] or DOMID_INVALID [3] otherwise | +| | | +| `flags` | Must be zero | +| | | +| `evtchn` | The port number of the interdomain channel used | +| | by `domid` to communicate with xenstored | +| | | -### Protocol Extension +Since the ABI guarantees that entry 1 in `domid`'s grant table will always +contain the GFN of the shared page. -Before xenstore state is migrated it is necessary to wait for any pending -reads, writes, watch registrations etc. to complete, and also to make sure -that xenstored does not start processing any new requests (so that new -requests remain pending on the shared ring for subsequent processing on the -new host). Hence the following operation is needed: +For `socket` connections it is as follows: -``` -QUIESCE | -Complete processing of any request issued by the specified domain, and -do not process any further requests from the shared ring. +``` + +-------+-------+ + | flags | ++---------------+---------------+---------------+---------------+ +| socket-fd | pad | ++-------------------------------+-------------------------------+ ``` -The `WATCH` operation does not allow specification of a ``; it is -assumed that the watch pertains to the domain that owns the shared ring -over which the operation is passed. Hence, for the tool-stack to be able -to register a watch on behalf of a domain a new operation is needed: -``` -ADD_DOMAIN_WATCHES ||+ +| Field | Description | +|-------------|-------------------------------------------------| +| `flags` | A bit-wise OR of: | +| | 0001: read-only | +| | | +| `socket-fd` | The file descriptor of the connected socket | -Adds watches on behalf of the specified domain. +This type of connection is only relevant for live update, where the xenstored +resumes in the original process context. Hence `socket-fd` simply specify +the file descriptor of the socket connection. - is a NUL separated tuple of |. The semantics of this -operation are identical to the domain issuing WATCH || for -each . -``` +\pagebreak + +### WATCH_DATA + +The image format will contain a `WATCH_DATA` record for each watch registered +by a connection for which there is `CONNECTION_DATA` record previously present. -The watch information for a domain also needs to be extracted from the -sending xenstored so the following operation is also needed: ``` -GET_DOMAIN_WATCHES | ||* + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++---------------+---------------+ +| wpath-len | token-len | ++---------------+---------------+ +| wpath +... +| token +... +``` + + +| Field | Description | +|-------------|-------------------------------------------------| +| `conn-id` | The connection that issued the `WATCH` | +| | operation [2] | +| | | +| `wpath-len` | The length (in octets) of `wpath` including the | +| | NUL terminator | +| | | +| `token-len` | The length (in octets) of `token` including the | +| | NUL terminator | +| | | +| `wpath` | The watch path, as specified in the `WATCH` | +| | operation | +| | | +| `token` | The watch identifier token, as specified in the | +| | `WATCH` operation | + +\pagebreak -Gets the list of watches that are currently registered for the domain. +### TRANSACTION_DATA - is a NUL separated tuple of |. The sub-list returned -will start at items into the the overall list of watches and may -be truncated (at a boundary) such that the returned data fits -within XENSTORE_PAYLOAD_MAX. +The image format will contain a `TRANSACTION_DATA` record for each transaction +that is pending on a connection for which there is `CONNECTION_DATA` record +previously present. -If is beyond the end of the overall list then the returned sub- -list will be empty. If the value of changes then it indicates -that the overall watch list has changed and thus it may be necessary -to re-issue the operation for previous values of . + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++-------------------------------+ +| tx-id | ++-------------------------------+ ``` -To deal with transactions that were pending when the domain is migrated -it is necessary to start transactions with the same tx_id on behalf of the -domain in the receiving xenstored. -NOTE: For safety each such transaction should result in an `EAGAIN` when -the `TRANSACTION_END` operation is performed, as modifications made under -the tx_id will not be part of the migration stream. +| Field | Description | +|----------------|----------------------------------------------| +| `conn-id` | The connection that issued the | +| | `TRANSACTION_START` operation [2] | +| | | +| `tx-id` | The transaction id passed back to the domain | +| | by the `TRANSACTION_START` operation | -The `TRANSACTION_START` operation does not allow specification of a -``; it is assumed that the transaction pertains to the domain that -owns the shared ring over which the operation is passed. Neither does it -allow a `` to be specified; it is always chosen by xenstored. -Hence, for the tool-stack to be able to open a transaction on behalf of a -domain a new operation is needed: +\pagebreak +### NODE_DATA + +For live update the image format will contain a `NODE_DATA` record for each +node in xenstore. For migration it will only contain a record for the nodes +relating to the domain being migrated. The `NODE_DATA` may be related to +a _committed_ node (globally visible in xenstored) or a _pending_ node (created +or modified by a transaction for which there is also a `TRANSACTION_DATA` +record previously present). + + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++-------------------------------+ +| tx-id | ++---------------+---------------+ +| path-len | value-len | ++---------------+---------------+ +| access | perm-count | ++---------------+---------------+ +| perm1 | ++-------------------------------+ +... ++-------------------------------+ +| permN | ++---------------+---------------+ +| path +... +| value +... ``` -START_DOMAIN_TRANSACTION || -Starts a transaction on behalf of a domain. -The semantics of this are similar to the domain issuing -TRANSACTION_START and receiving the specified as the response. -The main difference is that the transaction will be immediately marked as -'conflicting' such that when the domain issues TRANSACTION_END T|, it will -result in EAGAIN. +| Field | Description | +|--------------|------------------------------------------------| +| `conn-id` | If this value is non-zero then this record | +| | related to a pending transaction | +| | | +| `tx-id` | This value should be ignored if `conn-id` is | +| | zero. Otherwise it specifies the id of the | +| | pending transaction | +| | | +| `path-len` | The length (in octets) of `path` including the | +| | NUL terminator | +| | | +| `value-len` | The length (in octets) of `value` (which will | +| | be zero for a deleted node) | +| | | +| `access` | This value should be ignored if this record | +| | does not relate to a pending transaction, | +| | otherwise it specifies the accesses made to | +| | the node and hence is a bitwise OR of: | +| | | +| | 0x0001: read | +| | 0x0002: written | +| | | +| | The value will be zero for a deleted node | +| | | +| `perm-count` | The number (N) of node permission specifiers | +| | (which will be 0 for a node deleted in a | +| | pending transaction) | +| | | +| `perm1..N` | A list of zero or more node permission | +| | specifiers (see below) | +| | | +| `path` | The absolute path of the node | +| | | +| `value` | The node value (which may be empty or contain | +| | NUL octets) | + + +A node permission specifier has the following format: + + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| perm | pad | domid | ++-------+-------+---------------+ ``` -It may also be desirable to state in the protocol specification that -the `INTRODUCE` operation should not clear the `` specified such that -a `RELEASE` operation followed by an `INTRODUCE` operation form an -idempotent pair. The current implementation of *C xentored* does this -(in the `domain_conn_reset()` function) but this could be dropped as this -behaviour is not currently specified and the page will always be zeroed -for a newly created domain. +| Field | Description | +|---------|-----------------------------------------------------| +| `perm` | One of the ASCII values `w`, `r`, `b` or `n` as | +| | specified for the `SET_PERMS` operation [2] | +| | | +| `domid` | The domain-id to which the permission relates | +Note that perm1 defines the domain owning the code. See [4] for more +explanation of node permissions. * * * [1] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/designs/non-cooperative-migration.md + [2] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/misc/xenstore.txt -[3] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/specs/libxl-migration-stream.pandoc + +[3] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=xen/include/public/xen.h;hb=HEAD#l612 + +[4] https://wiki.xen.org/wiki/XenBus \ No newline at end of file diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 04ce0ba607..cb8009cb68 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -289,23 +289,6 @@ IS_DOMAIN_INTRODUCED | T| or F| ie, if INTRODUCE for the domain has not yet been followed by domain destruction or explicit RELEASE. -RESUME | - - Arranges that @releaseDomain events will once more be - generated when the domain becomes shut down. This might have - to be used if a domain were to be shut down (generating one - @releaseDomain) and then subsequently restarted, since the - state-sensitive algorithm in xenstored will not otherwise send - further watch event notifications if the domain were to be - shut down again. - - It is not clear whether this is possible since one would - normally expect a domain not to be restarted after being shut - down without being destroyed in the meantime. There are - currently no users of this request in xen-unstable. - - xenstored prevents the use of RESUME other than by dom0. - SET_TARGET || Notifies xenstored that domain is targeting domain . This grants domain full access to paths -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 12:44:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 12:44:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqk1-00011A-TO; Wed, 13 May 2020 12:44:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqk1-000115-6J for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:05 +0000 X-Inumbo-ID: 6da475bc-9517-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6da475bc-9517-11ea-b9cf-bc764e2007e4; Wed, 13 May 2020 12:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Kk6dvkkG17z/v0gn2pyTy9KQP+H5hIljnVTUETl6HLk=; b=hi9+Apvqz1CsxX1+os3mriOfH4 eLj485rhlnLIES4gedZFEGfrE+rOIC6R89IBa2Li/Xe5Uoe6zVxZ7lS/N3NFClzmtyVqSg2gDjLJI gXK1eGLYAbSb+gRR+E6iFVMNrkqAG4WYOXPeWNXORMB1bKSVgTf4OAkO7370Aw014j90=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqk0-0006P0-AV for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYqk0-0000uu-9M for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang/xenlight: add NameToDomid and DomidToName util functions Message-Id: Date: Wed, 13 May 2020 12:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7a060a393d9a9cdfdb15dc6616559a06942a8459 Author: Nick Rosbrook AuthorDate: Tue May 12 20:55:50 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 13:41:56 2020 +0100 golang/xenlight: add NameToDomid and DomidToName util functions Many exported functions in xenlight require a domid as an argument. Make it easier for package users to use these functions by adding wrappers for the libxl utility functions libxl_name_to_domid and libxl_domid_to_name. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- tools/golang/xenlight/xenlight.go | 40 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenlight.go index 6b4f492550..742e5e11f1 100644 --- a/tools/golang/xenlight/xenlight.go +++ b/tools/golang/xenlight/xenlight.go @@ -21,13 +21,15 @@ package xenlight #cgo LDFLAGS: -lxenlight -lyajl -lxentoollog #include #include +#include + +#define INVALID_DOMID_TYPED ((uint32_t) INVALID_DOMID) static const libxl_childproc_hooks childproc_hooks = { .chldowner = libxl_sigchld_owner_mainloop }; void xenlight_set_chldproc(libxl_ctx *ctx) { libxl_childproc_setmode(ctx, &childproc_hooks, NULL); } - */ import "C" @@ -75,6 +77,10 @@ var libxlErrors = map[Error]string{ ErrorFeatureRemoved: "Feature removed", } +const ( + DomidInvalid Domid = Domid(C.INVALID_DOMID_TYPED) +) + func (e Error) Error() string { if s, ok := libxlErrors[e]; ok { return s @@ -190,6 +196,38 @@ func (ctx *Context) Close() error { type Domid uint32 +// NameToDomid returns the Domid for a domain, given its name, if it exists. +// +// NameToDomid does not guarantee that the domid associated with name at +// the time NameToDomid is called is the same as the domid associated with +// name at the time NameToDomid returns. +func (Ctx *Context) NameToDomid(name string) (Domid, error) { + var domid C.uint32_t + + cname := C.CString(name) + defer C.free(unsafe.Pointer(cname)) + + if ret := C.libxl_name_to_domid(Ctx.ctx, cname, &domid); ret != 0 { + return DomidInvalid, Error(ret) + } + + return Domid(domid), nil +} + +// DomidToName returns the name for a domain, given its domid. If there +// is no domain with the given domid, DomidToName will return the empty +// string. +// +// DomidToName does not guarantee that the name (if any) associated with domid +// at the time DomidToName is called is the same as the name (if any) associated +// with domid at the time DomidToName returns. +func (Ctx *Context) DomidToName(domid Domid) string { + cname := C.libxl_domid_to_name(Ctx.ctx, C.uint32_t(domid)) + defer C.free(unsafe.Pointer(cname)) + + return C.GoString(cname) +} + // Devid is a device ID. type Devid int -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 12:44:21 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 12:44:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqkH-00012H-0U; Wed, 13 May 2020 12:44:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqkF-000129-In for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:19 +0000 X-Inumbo-ID: 73a92f48-9517-11ea-a36c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 73a92f48-9517-11ea-a36c-12813bfff9fa; Wed, 13 May 2020 12:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xW/TcmmlD7gzB4fWVv0/t795l2yzLHwCzlCI7cnjF0s=; b=2+Ufw2vV/V3L+DndeBNrrGdVLO XZSFnLGAAobJhGMkXMeO5p79kR6851S1AjjpC8PUiXsHhlCnp/jZrYk+VRVw8+8G8kcH2zrIhakFl h6ZKdgXmCPQphOaMgz4XPHobbQf/ESvDGEfackaY0vEQv+3iOkQXq4MG0j2oW8gHYw2Y=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqkA-0006P6-FS for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYqkA-0000vl-DV for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang/xenlight: re-track generated go code Message-Id: Date: Wed, 13 May 2020 12:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ab2b8799e90cb9f3306cf2cf8e5336992240e8a3 Author: Nick Rosbrook AuthorDate: Tue May 12 20:58:05 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 13:41:57 2020 +0100 golang/xenlight: re-track generated go code Commit df669de074c395a3b2eeb975fddd3da4c148da13 un-tracked the generated Go code, but it was decided that we actually keep the generated code in-tree. Undo the changes to ignore the generated code, and re-generate it. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- .gitignore | 3 - .hgignore | 2 - tools/golang/xenlight/Makefile | 1 - tools/golang/xenlight/helpers.gen.go | 4728 ++++++++++++++++++++++++++++++++++ tools/golang/xenlight/types.gen.go | 1226 +++++++++ 5 files changed, 5954 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9c8a31f896..bfa53723b3 100644 --- a/.gitignore +++ b/.gitignore @@ -406,9 +406,6 @@ tools/xenstore/xenstore-watch tools/xl/_paths.h tools/xl/xl -tools/golang/src -tools/golang/*/*.gen.go - docs/txt/misc/*.txt docs/txt/man/*.txt docs/figs/*.png diff --git a/.hgignore b/.hgignore index 2ec52982e1..2d41670632 100644 --- a/.hgignore +++ b/.hgignore @@ -282,8 +282,6 @@ ^tools/ocaml/test/xtl$ ^tools/ocaml/test/send_debug_keys$ ^tools/ocaml/test/list_domains$ -^tools/golang/src$ -^tools/golang/.*/.*\.gen\.go$ ^tools/autom4te\.cache$ ^tools/config\.h$ ^tools/config\.log$ diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 144c133ced..753132306a 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -49,7 +49,6 @@ install: build clean: $(RM) -r $(XEN_GOPATH)$(GOXL_PKG_DIR) $(RM) $(XEN_GOPATH)/pkg/*/$(XEN_GOCODE_URL)/xenlight.a - $(RM) *.gen.go .PHONY: distclean distclean: clean diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go new file mode 100644 index 0000000000..109e9515a2 --- /dev/null +++ b/tools/golang/xenlight/helpers.gen.go @@ -0,0 +1,4728 @@ +// DO NOT EDIT. +// +// This file is generated by: +// gengotypes.py ../../libxl/libxl_types.idl +// +package xenlight + +import ( + "errors" + "fmt" + "unsafe" +) + +/* +#cgo LDFLAGS: -lxenlight +#include +#include + +typedef typeof(((struct libxl_channelinfo *)NULL)->u.pty)libxl_channelinfo_connection_union_pty; +typedef typeof(((struct libxl_domain_build_info *)NULL)->u.hvm)libxl_domain_build_info_type_union_hvm; +typedef typeof(((struct libxl_domain_build_info *)NULL)->u.pv)libxl_domain_build_info_type_union_pv; +typedef typeof(((struct libxl_domain_build_info *)NULL)->u.pvh)libxl_domain_build_info_type_union_pvh; +typedef typeof(((struct libxl_device_usbdev *)NULL)->u.hostdev)libxl_device_usbdev_type_union_hostdev; +typedef typeof(((struct libxl_device_channel *)NULL)->u.socket)libxl_device_channel_connection_union_socket; +typedef typeof(((struct libxl_event *)NULL)->u.domain_shutdown)libxl_event_type_union_domain_shutdown; +typedef typeof(((struct libxl_event *)NULL)->u.disk_eject)libxl_event_type_union_disk_eject; +typedef typeof(((struct libxl_event *)NULL)->u.operation_complete)libxl_event_type_union_operation_complete; +typedef typeof(((struct libxl_psr_hw_info *)NULL)->u.cat)libxl_psr_hw_info_type_union_cat; +typedef typeof(((struct libxl_psr_hw_info *)NULL)->u.mba)libxl_psr_hw_info_type_union_mba; +*/ +import "C" + +// NewIoportRange returns an instance of IoportRange initialized with defaults. +func NewIoportRange() (*IoportRange, error) { + var ( + x IoportRange + xc C.libxl_ioport_range + ) + + C.libxl_ioport_range_init(&xc) + defer C.libxl_ioport_range_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *IoportRange) fromC(xc *C.libxl_ioport_range) error { + x.First = uint32(xc.first) + x.Number = uint32(xc.number) + + return nil +} + +func (x *IoportRange) toC(xc *C.libxl_ioport_range) (err error) { + defer func() { + if err != nil { + C.libxl_ioport_range_dispose(xc) + } + }() + + xc.first = C.uint32_t(x.First) + xc.number = C.uint32_t(x.Number) + + return nil +} + +// NewIomemRange returns an instance of IomemRange initialized with defaults. +func NewIomemRange() (*IomemRange, error) { + var ( + x IomemRange + xc C.libxl_iomem_range + ) + + C.libxl_iomem_range_init(&xc) + defer C.libxl_iomem_range_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *IomemRange) fromC(xc *C.libxl_iomem_range) error { + x.Start = uint64(xc.start) + x.Number = uint64(xc.number) + x.Gfn = uint64(xc.gfn) + + return nil +} + +func (x *IomemRange) toC(xc *C.libxl_iomem_range) (err error) { + defer func() { + if err != nil { + C.libxl_iomem_range_dispose(xc) + } + }() + + xc.start = C.uint64_t(x.Start) + xc.number = C.uint64_t(x.Number) + xc.gfn = C.uint64_t(x.Gfn) + + return nil +} + +// NewVgaInterfaceInfo returns an instance of VgaInterfaceInfo initialized with defaults. +func NewVgaInterfaceInfo() (*VgaInterfaceInfo, error) { + var ( + x VgaInterfaceInfo + xc C.libxl_vga_interface_info + ) + + C.libxl_vga_interface_info_init(&xc) + defer C.libxl_vga_interface_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VgaInterfaceInfo) fromC(xc *C.libxl_vga_interface_info) error { + x.Kind = VgaInterfaceType(xc.kind) + + return nil +} + +func (x *VgaInterfaceInfo) toC(xc *C.libxl_vga_interface_info) (err error) { + defer func() { + if err != nil { + C.libxl_vga_interface_info_dispose(xc) + } + }() + + xc.kind = C.libxl_vga_interface_type(x.Kind) + + return nil +} + +// NewVncInfo returns an instance of VncInfo initialized with defaults. +func NewVncInfo() (*VncInfo, error) { + var ( + x VncInfo + xc C.libxl_vnc_info + ) + + C.libxl_vnc_info_init(&xc) + defer C.libxl_vnc_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VncInfo) fromC(xc *C.libxl_vnc_info) error { + if err := x.Enable.fromC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + x.Listen = C.GoString(xc.listen) + x.Passwd = C.GoString(xc.passwd) + x.Display = int(xc.display) + if err := x.Findunused.fromC(&xc.findunused); err != nil { + return fmt.Errorf("converting field Findunused: %v", err) + } + + return nil +} + +func (x *VncInfo) toC(xc *C.libxl_vnc_info) (err error) { + defer func() { + if err != nil { + C.libxl_vnc_info_dispose(xc) + } + }() + + if err := x.Enable.toC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + if x.Listen != "" { + xc.listen = C.CString(x.Listen) + } + if x.Passwd != "" { + xc.passwd = C.CString(x.Passwd) + } + xc.display = C.int(x.Display) + if err := x.Findunused.toC(&xc.findunused); err != nil { + return fmt.Errorf("converting field Findunused: %v", err) + } + + return nil +} + +// NewSpiceInfo returns an instance of SpiceInfo initialized with defaults. +func NewSpiceInfo() (*SpiceInfo, error) { + var ( + x SpiceInfo + xc C.libxl_spice_info + ) + + C.libxl_spice_info_init(&xc) + defer C.libxl_spice_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *SpiceInfo) fromC(xc *C.libxl_spice_info) error { + if err := x.Enable.fromC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + x.Port = int(xc.port) + x.TlsPort = int(xc.tls_port) + x.Host = C.GoString(xc.host) + if err := x.DisableTicketing.fromC(&xc.disable_ticketing); err != nil { + return fmt.Errorf("converting field DisableTicketing: %v", err) + } + x.Passwd = C.GoString(xc.passwd) + if err := x.AgentMouse.fromC(&xc.agent_mouse); err != nil { + return fmt.Errorf("converting field AgentMouse: %v", err) + } + if err := x.Vdagent.fromC(&xc.vdagent); err != nil { + return fmt.Errorf("converting field Vdagent: %v", err) + } + if err := x.ClipboardSharing.fromC(&xc.clipboard_sharing); err != nil { + return fmt.Errorf("converting field ClipboardSharing: %v", err) + } + x.Usbredirection = int(xc.usbredirection) + x.ImageCompression = C.GoString(xc.image_compression) + x.StreamingVideo = C.GoString(xc.streaming_video) + + return nil +} + +func (x *SpiceInfo) toC(xc *C.libxl_spice_info) (err error) { + defer func() { + if err != nil { + C.libxl_spice_info_dispose(xc) + } + }() + + if err := x.Enable.toC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + xc.port = C.int(x.Port) + xc.tls_port = C.int(x.TlsPort) + if x.Host != "" { + xc.host = C.CString(x.Host) + } + if err := x.DisableTicketing.toC(&xc.disable_ticketing); err != nil { + return fmt.Errorf("converting field DisableTicketing: %v", err) + } + if x.Passwd != "" { + xc.passwd = C.CString(x.Passwd) + } + if err := x.AgentMouse.toC(&xc.agent_mouse); err != nil { + return fmt.Errorf("converting field AgentMouse: %v", err) + } + if err := x.Vdagent.toC(&xc.vdagent); err != nil { + return fmt.Errorf("converting field Vdagent: %v", err) + } + if err := x.ClipboardSharing.toC(&xc.clipboard_sharing); err != nil { + return fmt.Errorf("converting field ClipboardSharing: %v", err) + } + xc.usbredirection = C.int(x.Usbredirection) + if x.ImageCompression != "" { + xc.image_compression = C.CString(x.ImageCompression) + } + if x.StreamingVideo != "" { + xc.streaming_video = C.CString(x.StreamingVideo) + } + + return nil +} + +// NewSdlInfo returns an instance of SdlInfo initialized with defaults. +func NewSdlInfo() (*SdlInfo, error) { + var ( + x SdlInfo + xc C.libxl_sdl_info + ) + + C.libxl_sdl_info_init(&xc) + defer C.libxl_sdl_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *SdlInfo) fromC(xc *C.libxl_sdl_info) error { + if err := x.Enable.fromC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + if err := x.Opengl.fromC(&xc.opengl); err != nil { + return fmt.Errorf("converting field Opengl: %v", err) + } + x.Display = C.GoString(xc.display) + x.Xauthority = C.GoString(xc.xauthority) + + return nil +} + +func (x *SdlInfo) toC(xc *C.libxl_sdl_info) (err error) { + defer func() { + if err != nil { + C.libxl_sdl_info_dispose(xc) + } + }() + + if err := x.Enable.toC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + if err := x.Opengl.toC(&xc.opengl); err != nil { + return fmt.Errorf("converting field Opengl: %v", err) + } + if x.Display != "" { + xc.display = C.CString(x.Display) + } + if x.Xauthority != "" { + xc.xauthority = C.CString(x.Xauthority) + } + + return nil +} + +// NewDominfo returns an instance of Dominfo initialized with defaults. +func NewDominfo() (*Dominfo, error) { + var ( + x Dominfo + xc C.libxl_dominfo + ) + + C.libxl_dominfo_init(&xc) + defer C.libxl_dominfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Dominfo) fromC(xc *C.libxl_dominfo) error { + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + x.Domid = Domid(xc.domid) + x.Ssidref = uint32(xc.ssidref) + x.SsidLabel = C.GoString(xc.ssid_label) + x.Running = bool(xc.running) + x.Blocked = bool(xc.blocked) + x.Paused = bool(xc.paused) + x.Shutdown = bool(xc.shutdown) + x.Dying = bool(xc.dying) + x.NeverStop = bool(xc.never_stop) + x.ShutdownReason = ShutdownReason(xc.shutdown_reason) + x.OutstandingMemkb = uint64(xc.outstanding_memkb) + x.CurrentMemkb = uint64(xc.current_memkb) + x.SharedMemkb = uint64(xc.shared_memkb) + x.PagedMemkb = uint64(xc.paged_memkb) + x.MaxMemkb = uint64(xc.max_memkb) + x.CpuTime = uint64(xc.cpu_time) + x.VcpuMaxId = uint32(xc.vcpu_max_id) + x.VcpuOnline = uint32(xc.vcpu_online) + x.Cpupool = uint32(xc.cpupool) + x.DomainType = DomainType(xc.domain_type) + + return nil +} + +func (x *Dominfo) toC(xc *C.libxl_dominfo) (err error) { + defer func() { + if err != nil { + C.libxl_dominfo_dispose(xc) + } + }() + + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + xc.domid = C.libxl_domid(x.Domid) + xc.ssidref = C.uint32_t(x.Ssidref) + if x.SsidLabel != "" { + xc.ssid_label = C.CString(x.SsidLabel) + } + xc.running = C.bool(x.Running) + xc.blocked = C.bool(x.Blocked) + xc.paused = C.bool(x.Paused) + xc.shutdown = C.bool(x.Shutdown) + xc.dying = C.bool(x.Dying) + xc.never_stop = C.bool(x.NeverStop) + xc.shutdown_reason = C.libxl_shutdown_reason(x.ShutdownReason) + xc.outstanding_memkb = C.uint64_t(x.OutstandingMemkb) + xc.current_memkb = C.uint64_t(x.CurrentMemkb) + xc.shared_memkb = C.uint64_t(x.SharedMemkb) + xc.paged_memkb = C.uint64_t(x.PagedMemkb) + xc.max_memkb = C.uint64_t(x.MaxMemkb) + xc.cpu_time = C.uint64_t(x.CpuTime) + xc.vcpu_max_id = C.uint32_t(x.VcpuMaxId) + xc.vcpu_online = C.uint32_t(x.VcpuOnline) + xc.cpupool = C.uint32_t(x.Cpupool) + xc.domain_type = C.libxl_domain_type(x.DomainType) + + return nil +} + +// NewCpupoolinfo returns an instance of Cpupoolinfo initialized with defaults. +func NewCpupoolinfo() (*Cpupoolinfo, error) { + var ( + x Cpupoolinfo + xc C.libxl_cpupoolinfo + ) + + C.libxl_cpupoolinfo_init(&xc) + defer C.libxl_cpupoolinfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Cpupoolinfo) fromC(xc *C.libxl_cpupoolinfo) error { + x.Poolid = uint32(xc.poolid) + x.PoolName = C.GoString(xc.pool_name) + x.Sched = Scheduler(xc.sched) + x.NDom = uint32(xc.n_dom) + if err := x.Cpumap.fromC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + + return nil +} + +func (x *Cpupoolinfo) toC(xc *C.libxl_cpupoolinfo) (err error) { + defer func() { + if err != nil { + C.libxl_cpupoolinfo_dispose(xc) + } + }() + + xc.poolid = C.uint32_t(x.Poolid) + if x.PoolName != "" { + xc.pool_name = C.CString(x.PoolName) + } + xc.sched = C.libxl_scheduler(x.Sched) + xc.n_dom = C.uint32_t(x.NDom) + if err := x.Cpumap.toC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + + return nil +} + +// NewChannelinfo returns an instance of Channelinfo initialized with defaults. +func NewChannelinfo(connection ChannelConnection) (*Channelinfo, error) { + var ( + x Channelinfo + xc C.libxl_channelinfo + ) + + C.libxl_channelinfo_init(&xc) + C.libxl_channelinfo_init_connection(&xc, C.libxl_channel_connection(connection)) + defer C.libxl_channelinfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Channelinfo) fromC(xc *C.libxl_channelinfo) error { + x.Backend = C.GoString(xc.backend) + x.BackendId = uint32(xc.backend_id) + x.Frontend = C.GoString(xc.frontend) + x.FrontendId = uint32(xc.frontend_id) + x.Devid = Devid(xc.devid) + x.State = int(xc.state) + x.Evtch = int(xc.evtch) + x.Rref = int(xc.rref) + x.Connection = ChannelConnection(xc.connection) + switch x.Connection { + case ChannelConnectionUnknown: + x.ConnectionUnion = nil + case ChannelConnectionPty: + var connectionPty ChannelinfoConnectionUnionPty + if err := connectionPty.fromC(xc); err != nil { + return fmt.Errorf("converting field connectionPty: %v", err) + } + x.ConnectionUnion = connectionPty + case ChannelConnectionSocket: + x.ConnectionUnion = nil + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +func (x *ChannelinfoConnectionUnionPty) fromC(xc *C.libxl_channelinfo) error { + if ChannelConnection(xc.connection) != ChannelConnectionPty { + return errors.New("expected union key ChannelConnectionPty") + } + + tmp := (*C.libxl_channelinfo_connection_union_pty)(unsafe.Pointer(&xc.u[0])) + x.Path = C.GoString(tmp.path) + return nil +} + +func (x *Channelinfo) toC(xc *C.libxl_channelinfo) (err error) { + defer func() { + if err != nil { + C.libxl_channelinfo_dispose(xc) + } + }() + + if x.Backend != "" { + xc.backend = C.CString(x.Backend) + } + xc.backend_id = C.uint32_t(x.BackendId) + if x.Frontend != "" { + xc.frontend = C.CString(x.Frontend) + } + xc.frontend_id = C.uint32_t(x.FrontendId) + xc.devid = C.libxl_devid(x.Devid) + xc.state = C.int(x.State) + xc.evtch = C.int(x.Evtch) + xc.rref = C.int(x.Rref) + xc.connection = C.libxl_channel_connection(x.Connection) + switch x.Connection { + case ChannelConnectionUnknown: + break + case ChannelConnectionPty: + tmp, ok := x.ConnectionUnion.(ChannelinfoConnectionUnionPty) + if !ok { + return errors.New("wrong type for union key connection") + } + var pty C.libxl_channelinfo_connection_union_pty + if tmp.Path != "" { + pty.path = C.CString(tmp.Path) + } + ptyBytes := C.GoBytes(unsafe.Pointer(&pty), C.sizeof_libxl_channelinfo_connection_union_pty) + copy(xc.u[:], ptyBytes) + case ChannelConnectionSocket: + break + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +// NewVminfo returns an instance of Vminfo initialized with defaults. +func NewVminfo() (*Vminfo, error) { + var ( + x Vminfo + xc C.libxl_vminfo + ) + + C.libxl_vminfo_init(&xc) + defer C.libxl_vminfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Vminfo) fromC(xc *C.libxl_vminfo) error { + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + x.Domid = Domid(xc.domid) + + return nil +} + +func (x *Vminfo) toC(xc *C.libxl_vminfo) (err error) { + defer func() { + if err != nil { + C.libxl_vminfo_dispose(xc) + } + }() + + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + xc.domid = C.libxl_domid(x.Domid) + + return nil +} + +// NewVersionInfo returns an instance of VersionInfo initialized with defaults. +func NewVersionInfo() (*VersionInfo, error) { + var ( + x VersionInfo + xc C.libxl_version_info + ) + + C.libxl_version_info_init(&xc) + defer C.libxl_version_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VersionInfo) fromC(xc *C.libxl_version_info) error { + x.XenVersionMajor = int(xc.xen_version_major) + x.XenVersionMinor = int(xc.xen_version_minor) + x.XenVersionExtra = C.GoString(xc.xen_version_extra) + x.Compiler = C.GoString(xc.compiler) + x.CompileBy = C.GoString(xc.compile_by) + x.CompileDomain = C.GoString(xc.compile_domain) + x.CompileDate = C.GoString(xc.compile_date) + x.Capabilities = C.GoString(xc.capabilities) + x.Changeset = C.GoString(xc.changeset) + x.VirtStart = uint64(xc.virt_start) + x.Pagesize = int(xc.pagesize) + x.Commandline = C.GoString(xc.commandline) + x.BuildId = C.GoString(xc.build_id) + + return nil +} + +func (x *VersionInfo) toC(xc *C.libxl_version_info) (err error) { + defer func() { + if err != nil { + C.libxl_version_info_dispose(xc) + } + }() + + xc.xen_version_major = C.int(x.XenVersionMajor) + xc.xen_version_minor = C.int(x.XenVersionMinor) + if x.XenVersionExtra != "" { + xc.xen_version_extra = C.CString(x.XenVersionExtra) + } + if x.Compiler != "" { + xc.compiler = C.CString(x.Compiler) + } + if x.CompileBy != "" { + xc.compile_by = C.CString(x.CompileBy) + } + if x.CompileDomain != "" { + xc.compile_domain = C.CString(x.CompileDomain) + } + if x.CompileDate != "" { + xc.compile_date = C.CString(x.CompileDate) + } + if x.Capabilities != "" { + xc.capabilities = C.CString(x.Capabilities) + } + if x.Changeset != "" { + xc.changeset = C.CString(x.Changeset) + } + xc.virt_start = C.uint64_t(x.VirtStart) + xc.pagesize = C.int(x.Pagesize) + if x.Commandline != "" { + xc.commandline = C.CString(x.Commandline) + } + if x.BuildId != "" { + xc.build_id = C.CString(x.BuildId) + } + + return nil +} + +// NewDomainCreateInfo returns an instance of DomainCreateInfo initialized with defaults. +func NewDomainCreateInfo() (*DomainCreateInfo, error) { + var ( + x DomainCreateInfo + xc C.libxl_domain_create_info + ) + + C.libxl_domain_create_info_init(&xc) + defer C.libxl_domain_create_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainCreateInfo) fromC(xc *C.libxl_domain_create_info) error { + x.Type = DomainType(xc._type) + if err := x.Hap.fromC(&xc.hap); err != nil { + return fmt.Errorf("converting field Hap: %v", err) + } + if err := x.Oos.fromC(&xc.oos); err != nil { + return fmt.Errorf("converting field Oos: %v", err) + } + x.Ssidref = uint32(xc.ssidref) + x.SsidLabel = C.GoString(xc.ssid_label) + x.Name = C.GoString(xc.name) + x.Domid = Domid(xc.domid) + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + if err := x.Xsdata.fromC(&xc.xsdata); err != nil { + return fmt.Errorf("converting field Xsdata: %v", err) + } + if err := x.Platformdata.fromC(&xc.platformdata); err != nil { + return fmt.Errorf("converting field Platformdata: %v", err) + } + x.Poolid = uint32(xc.poolid) + x.PoolName = C.GoString(xc.pool_name) + if err := x.RunHotplugScripts.fromC(&xc.run_hotplug_scripts); err != nil { + return fmt.Errorf("converting field RunHotplugScripts: %v", err) + } + if err := x.DriverDomain.fromC(&xc.driver_domain); err != nil { + return fmt.Errorf("converting field DriverDomain: %v", err) + } + x.Passthrough = Passthrough(xc.passthrough) + if err := x.XendSuspendEvtchnCompat.fromC(&xc.xend_suspend_evtchn_compat); err != nil { + return fmt.Errorf("converting field XendSuspendEvtchnCompat: %v", err) + } + + return nil +} + +func (x *DomainCreateInfo) toC(xc *C.libxl_domain_create_info) (err error) { + defer func() { + if err != nil { + C.libxl_domain_create_info_dispose(xc) + } + }() + + xc._type = C.libxl_domain_type(x.Type) + if err := x.Hap.toC(&xc.hap); err != nil { + return fmt.Errorf("converting field Hap: %v", err) + } + if err := x.Oos.toC(&xc.oos); err != nil { + return fmt.Errorf("converting field Oos: %v", err) + } + xc.ssidref = C.uint32_t(x.Ssidref) + if x.SsidLabel != "" { + xc.ssid_label = C.CString(x.SsidLabel) + } + if x.Name != "" { + xc.name = C.CString(x.Name) + } + xc.domid = C.libxl_domid(x.Domid) + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + if err := x.Xsdata.toC(&xc.xsdata); err != nil { + return fmt.Errorf("converting field Xsdata: %v", err) + } + if err := x.Platformdata.toC(&xc.platformdata); err != nil { + return fmt.Errorf("converting field Platformdata: %v", err) + } + xc.poolid = C.uint32_t(x.Poolid) + if x.PoolName != "" { + xc.pool_name = C.CString(x.PoolName) + } + if err := x.RunHotplugScripts.toC(&xc.run_hotplug_scripts); err != nil { + return fmt.Errorf("converting field RunHotplugScripts: %v", err) + } + if err := x.DriverDomain.toC(&xc.driver_domain); err != nil { + return fmt.Errorf("converting field DriverDomain: %v", err) + } + xc.passthrough = C.libxl_passthrough(x.Passthrough) + if err := x.XendSuspendEvtchnCompat.toC(&xc.xend_suspend_evtchn_compat); err != nil { + return fmt.Errorf("converting field XendSuspendEvtchnCompat: %v", err) + } + + return nil +} + +// NewDomainRestoreParams returns an instance of DomainRestoreParams initialized with defaults. +func NewDomainRestoreParams() (*DomainRestoreParams, error) { + var ( + x DomainRestoreParams + xc C.libxl_domain_restore_params + ) + + C.libxl_domain_restore_params_init(&xc) + defer C.libxl_domain_restore_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainRestoreParams) fromC(xc *C.libxl_domain_restore_params) error { + x.CheckpointedStream = int(xc.checkpointed_stream) + x.StreamVersion = uint32(xc.stream_version) + x.ColoProxyScript = C.GoString(xc.colo_proxy_script) + if err := x.UserspaceColoProxy.fromC(&xc.userspace_colo_proxy); err != nil { + return fmt.Errorf("converting field UserspaceColoProxy: %v", err) + } + + return nil +} + +func (x *DomainRestoreParams) toC(xc *C.libxl_domain_restore_params) (err error) { + defer func() { + if err != nil { + C.libxl_domain_restore_params_dispose(xc) + } + }() + + xc.checkpointed_stream = C.int(x.CheckpointedStream) + xc.stream_version = C.uint32_t(x.StreamVersion) + if x.ColoProxyScript != "" { + xc.colo_proxy_script = C.CString(x.ColoProxyScript) + } + if err := x.UserspaceColoProxy.toC(&xc.userspace_colo_proxy); err != nil { + return fmt.Errorf("converting field UserspaceColoProxy: %v", err) + } + + return nil +} + +// NewSchedParams returns an instance of SchedParams initialized with defaults. +func NewSchedParams() (*SchedParams, error) { + var ( + x SchedParams + xc C.libxl_sched_params + ) + + C.libxl_sched_params_init(&xc) + defer C.libxl_sched_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *SchedParams) fromC(xc *C.libxl_sched_params) error { + x.Vcpuid = int(xc.vcpuid) + x.Weight = int(xc.weight) + x.Cap = int(xc.cap) + x.Period = int(xc.period) + x.Extratime = int(xc.extratime) + x.Budget = int(xc.budget) + + return nil +} + +func (x *SchedParams) toC(xc *C.libxl_sched_params) (err error) { + defer func() { + if err != nil { + C.libxl_sched_params_dispose(xc) + } + }() + + xc.vcpuid = C.int(x.Vcpuid) + xc.weight = C.int(x.Weight) + xc.cap = C.int(x.Cap) + xc.period = C.int(x.Period) + xc.extratime = C.int(x.Extratime) + xc.budget = C.int(x.Budget) + + return nil +} + +// NewVcpuSchedParams returns an instance of VcpuSchedParams initialized with defaults. +func NewVcpuSchedParams() (*VcpuSchedParams, error) { + var ( + x VcpuSchedParams + xc C.libxl_vcpu_sched_params + ) + + C.libxl_vcpu_sched_params_init(&xc) + defer C.libxl_vcpu_sched_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VcpuSchedParams) fromC(xc *C.libxl_vcpu_sched_params) error { + x.Sched = Scheduler(xc.sched) + x.Vcpus = nil + if n := int(xc.num_vcpus); n > 0 { + cVcpus := (*[1 << 28]C.libxl_sched_params)(unsafe.Pointer(xc.vcpus))[:n:n] + x.Vcpus = make([]SchedParams, n) + for i, v := range cVcpus { + if err := x.Vcpus[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + } + } + + return nil +} + +func (x *VcpuSchedParams) toC(xc *C.libxl_vcpu_sched_params) (err error) { + defer func() { + if err != nil { + C.libxl_vcpu_sched_params_dispose(xc) + } + }() + + xc.sched = C.libxl_scheduler(x.Sched) + if numVcpus := len(x.Vcpus); numVcpus > 0 { + xc.vcpus = (*C.libxl_sched_params)(C.malloc(C.ulong(numVcpus) * C.sizeof_libxl_sched_params)) + xc.num_vcpus = C.int(numVcpus) + cVcpus := (*[1 << 28]C.libxl_sched_params)(unsafe.Pointer(xc.vcpus))[:numVcpus:numVcpus] + for i, v := range x.Vcpus { + if err := v.toC(&cVcpus[i]); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + } + } + + return nil +} + +// NewDomainSchedParams returns an instance of DomainSchedParams initialized with defaults. +func NewDomainSchedParams() (*DomainSchedParams, error) { + var ( + x DomainSchedParams + xc C.libxl_domain_sched_params + ) + + C.libxl_domain_sched_params_init(&xc) + defer C.libxl_domain_sched_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainSchedParams) fromC(xc *C.libxl_domain_sched_params) error { + x.Sched = Scheduler(xc.sched) + x.Weight = int(xc.weight) + x.Cap = int(xc.cap) + x.Period = int(xc.period) + x.Budget = int(xc.budget) + x.Extratime = int(xc.extratime) + x.Slice = int(xc.slice) + x.Latency = int(xc.latency) + + return nil +} + +func (x *DomainSchedParams) toC(xc *C.libxl_domain_sched_params) (err error) { + defer func() { + if err != nil { + C.libxl_domain_sched_params_dispose(xc) + } + }() + + xc.sched = C.libxl_scheduler(x.Sched) + xc.weight = C.int(x.Weight) + xc.cap = C.int(x.Cap) + xc.period = C.int(x.Period) + xc.budget = C.int(x.Budget) + xc.extratime = C.int(x.Extratime) + xc.slice = C.int(x.Slice) + xc.latency = C.int(x.Latency) + + return nil +} + +// NewVnodeInfo returns an instance of VnodeInfo initialized with defaults. +func NewVnodeInfo() (*VnodeInfo, error) { + var ( + x VnodeInfo + xc C.libxl_vnode_info + ) + + C.libxl_vnode_info_init(&xc) + defer C.libxl_vnode_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VnodeInfo) fromC(xc *C.libxl_vnode_info) error { + x.Memkb = uint64(xc.memkb) + x.Distances = nil + if n := int(xc.num_distances); n > 0 { + cDistances := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.distances))[:n:n] + x.Distances = make([]uint32, n) + for i, v := range cDistances { + x.Distances[i] = uint32(v) + } + } + x.Pnode = uint32(xc.pnode) + if err := x.Vcpus.fromC(&xc.vcpus); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + + return nil +} + +func (x *VnodeInfo) toC(xc *C.libxl_vnode_info) (err error) { + defer func() { + if err != nil { + C.libxl_vnode_info_dispose(xc) + } + }() + + xc.memkb = C.uint64_t(x.Memkb) + if numDistances := len(x.Distances); numDistances > 0 { + xc.distances = (*C.uint32_t)(C.malloc(C.size_t(numDistances * numDistances))) + xc.num_distances = C.int(numDistances) + cDistances := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.distances))[:numDistances:numDistances] + for i, v := range x.Distances { + cDistances[i] = C.uint32_t(v) + } + } + xc.pnode = C.uint32_t(x.Pnode) + if err := x.Vcpus.toC(&xc.vcpus); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + + return nil +} + +// NewRdmReserve returns an instance of RdmReserve initialized with defaults. +func NewRdmReserve() (*RdmReserve, error) { + var ( + x RdmReserve + xc C.libxl_rdm_reserve + ) + + C.libxl_rdm_reserve_init(&xc) + defer C.libxl_rdm_reserve_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *RdmReserve) fromC(xc *C.libxl_rdm_reserve) error { + x.Strategy = RdmReserveStrategy(xc.strategy) + x.Policy = RdmReservePolicy(xc.policy) + + return nil +} + +func (x *RdmReserve) toC(xc *C.libxl_rdm_reserve) (err error) { + defer func() { + if err != nil { + C.libxl_rdm_reserve_dispose(xc) + } + }() + + xc.strategy = C.libxl_rdm_reserve_strategy(x.Strategy) + xc.policy = C.libxl_rdm_reserve_policy(x.Policy) + + return nil +} + +// NewDomainBuildInfo returns an instance of DomainBuildInfo initialized with defaults. +func NewDomainBuildInfo(dtype DomainType) (*DomainBuildInfo, error) { + var ( + x DomainBuildInfo + xc C.libxl_domain_build_info + ) + + C.libxl_domain_build_info_init(&xc) + C.libxl_domain_build_info_init_type(&xc, C.libxl_domain_type(dtype)) + defer C.libxl_domain_build_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainBuildInfo) fromC(xc *C.libxl_domain_build_info) error { + x.MaxVcpus = int(xc.max_vcpus) + if err := x.AvailVcpus.fromC(&xc.avail_vcpus); err != nil { + return fmt.Errorf("converting field AvailVcpus: %v", err) + } + if err := x.Cpumap.fromC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + if err := x.Nodemap.fromC(&xc.nodemap); err != nil { + return fmt.Errorf("converting field Nodemap: %v", err) + } + x.VcpuHardAffinity = nil + if n := int(xc.num_vcpu_hard_affinity); n > 0 { + cVcpuHardAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_hard_affinity))[:n:n] + x.VcpuHardAffinity = make([]Bitmap, n) + for i, v := range cVcpuHardAffinity { + if err := x.VcpuHardAffinity[i].fromC(&v); err != nil { + return fmt.Errorf("converting field VcpuHardAffinity: %v", err) + } + } + } + x.VcpuSoftAffinity = nil + if n := int(xc.num_vcpu_soft_affinity); n > 0 { + cVcpuSoftAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_soft_affinity))[:n:n] + x.VcpuSoftAffinity = make([]Bitmap, n) + for i, v := range cVcpuSoftAffinity { + if err := x.VcpuSoftAffinity[i].fromC(&v); err != nil { + return fmt.Errorf("converting field VcpuSoftAffinity: %v", err) + } + } + } + if err := x.NumaPlacement.fromC(&xc.numa_placement); err != nil { + return fmt.Errorf("converting field NumaPlacement: %v", err) + } + x.TscMode = TscMode(xc.tsc_mode) + x.MaxMemkb = uint64(xc.max_memkb) + x.TargetMemkb = uint64(xc.target_memkb) + x.VideoMemkb = uint64(xc.video_memkb) + x.ShadowMemkb = uint64(xc.shadow_memkb) + x.IommuMemkb = uint64(xc.iommu_memkb) + x.RtcTimeoffset = uint32(xc.rtc_timeoffset) + x.ExecSsidref = uint32(xc.exec_ssidref) + x.ExecSsidLabel = C.GoString(xc.exec_ssid_label) + if err := x.Localtime.fromC(&xc.localtime); err != nil { + return fmt.Errorf("converting field Localtime: %v", err) + } + if err := x.DisableMigrate.fromC(&xc.disable_migrate); err != nil { + return fmt.Errorf("converting field DisableMigrate: %v", err) + } + if err := x.Cpuid.fromC(&xc.cpuid); err != nil { + return fmt.Errorf("converting field Cpuid: %v", err) + } + x.BlkdevStart = C.GoString(xc.blkdev_start) + x.VnumaNodes = nil + if n := int(xc.num_vnuma_nodes); n > 0 { + cVnumaNodes := (*[1 << 28]C.libxl_vnode_info)(unsafe.Pointer(xc.vnuma_nodes))[:n:n] + x.VnumaNodes = make([]VnodeInfo, n) + for i, v := range cVnumaNodes { + if err := x.VnumaNodes[i].fromC(&v); err != nil { + return fmt.Errorf("converting field VnumaNodes: %v", err) + } + } + } + x.MaxGrantFrames = uint32(xc.max_grant_frames) + x.MaxMaptrackFrames = uint32(xc.max_maptrack_frames) + x.DeviceModelVersion = DeviceModelVersion(xc.device_model_version) + if err := x.DeviceModelStubdomain.fromC(&xc.device_model_stubdomain); err != nil { + return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) + } + x.DeviceModel = C.GoString(xc.device_model) + x.DeviceModelSsidref = uint32(xc.device_model_ssidref) + x.DeviceModelSsidLabel = C.GoString(xc.device_model_ssid_label) + x.DeviceModelUser = C.GoString(xc.device_model_user) + if err := x.Extra.fromC(&xc.extra); err != nil { + return fmt.Errorf("converting field Extra: %v", err) + } + if err := x.ExtraPv.fromC(&xc.extra_pv); err != nil { + return fmt.Errorf("converting field ExtraPv: %v", err) + } + if err := x.ExtraHvm.fromC(&xc.extra_hvm); err != nil { + return fmt.Errorf("converting field ExtraHvm: %v", err) + } + if err := x.SchedParams.fromC(&xc.sched_params); err != nil { + return fmt.Errorf("converting field SchedParams: %v", err) + } + x.Ioports = nil + if n := int(xc.num_ioports); n > 0 { + cIoports := (*[1 << 28]C.libxl_ioport_range)(unsafe.Pointer(xc.ioports))[:n:n] + x.Ioports = make([]IoportRange, n) + for i, v := range cIoports { + if err := x.Ioports[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Ioports: %v", err) + } + } + } + x.Irqs = nil + if n := int(xc.num_irqs); n > 0 { + cIrqs := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.irqs))[:n:n] + x.Irqs = make([]uint32, n) + for i, v := range cIrqs { + x.Irqs[i] = uint32(v) + } + } + x.Iomem = nil + if n := int(xc.num_iomem); n > 0 { + cIomem := (*[1 << 28]C.libxl_iomem_range)(unsafe.Pointer(xc.iomem))[:n:n] + x.Iomem = make([]IomemRange, n) + for i, v := range cIomem { + if err := x.Iomem[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Iomem: %v", err) + } + } + } + if err := x.ClaimMode.fromC(&xc.claim_mode); err != nil { + return fmt.Errorf("converting field ClaimMode: %v", err) + } + x.EventChannels = uint32(xc.event_channels) + x.Kernel = C.GoString(xc.kernel) + x.Cmdline = C.GoString(xc.cmdline) + x.Ramdisk = C.GoString(xc.ramdisk) + x.DeviceTree = C.GoString(xc.device_tree) + if err := x.Acpi.fromC(&xc.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + x.Bootloader = C.GoString(xc.bootloader) + if err := x.BootloaderArgs.fromC(&xc.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + x.TimerMode = TimerMode(xc.timer_mode) + if err := x.NestedHvm.fromC(&xc.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := x.Apic.fromC(&xc.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := x.DmRestrict.fromC(&xc.dm_restrict); err != nil { + return fmt.Errorf("converting field DmRestrict: %v", err) + } + x.Tee = TeeType(xc.tee) + x.Type = DomainType(xc._type) + switch x.Type { + case DomainTypeHvm: + var typeHvm DomainBuildInfoTypeUnionHvm + if err := typeHvm.fromC(xc); err != nil { + return fmt.Errorf("converting field typeHvm: %v", err) + } + x.TypeUnion = typeHvm + case DomainTypePv: + var typePv DomainBuildInfoTypeUnionPv + if err := typePv.fromC(xc); err != nil { + return fmt.Errorf("converting field typePv: %v", err) + } + x.TypeUnion = typePv + case DomainTypePvh: + var typePvh DomainBuildInfoTypeUnionPvh + if err := typePvh.fromC(xc); err != nil { + return fmt.Errorf("converting field typePvh: %v", err) + } + x.TypeUnion = typePvh + case DomainTypeInvalid: + x.TypeUnion = nil + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + x.ArchArm.GicVersion = GicVersion(xc.arch_arm.gic_version) + x.ArchArm.Vuart = VuartType(xc.arch_arm.vuart) + x.Altp2M = Altp2MMode(xc.altp2m) + + return nil +} + +func (x *DomainBuildInfoTypeUnionHvm) fromC(xc *C.libxl_domain_build_info) error { + if DomainType(xc._type) != DomainTypeHvm { + return errors.New("expected union key DomainTypeHvm") + } + + tmp := (*C.libxl_domain_build_info_type_union_hvm)(unsafe.Pointer(&xc.u[0])) + x.Firmware = C.GoString(tmp.firmware) + x.Bios = BiosType(tmp.bios) + if err := x.Pae.fromC(&tmp.pae); err != nil { + return fmt.Errorf("converting field Pae: %v", err) + } + if err := x.Apic.fromC(&tmp.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := x.Acpi.fromC(&tmp.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + if err := x.AcpiS3.fromC(&tmp.acpi_s3); err != nil { + return fmt.Errorf("converting field AcpiS3: %v", err) + } + if err := x.AcpiS4.fromC(&tmp.acpi_s4); err != nil { + return fmt.Errorf("converting field AcpiS4: %v", err) + } + if err := x.AcpiLaptopSlate.fromC(&tmp.acpi_laptop_slate); err != nil { + return fmt.Errorf("converting field AcpiLaptopSlate: %v", err) + } + if err := x.Nx.fromC(&tmp.nx); err != nil { + return fmt.Errorf("converting field Nx: %v", err) + } + if err := x.Viridian.fromC(&tmp.viridian); err != nil { + return fmt.Errorf("converting field Viridian: %v", err) + } + if err := x.ViridianEnable.fromC(&tmp.viridian_enable); err != nil { + return fmt.Errorf("converting field ViridianEnable: %v", err) + } + if err := x.ViridianDisable.fromC(&tmp.viridian_disable); err != nil { + return fmt.Errorf("converting field ViridianDisable: %v", err) + } + x.Timeoffset = C.GoString(tmp.timeoffset) + if err := x.Hpet.fromC(&tmp.hpet); err != nil { + return fmt.Errorf("converting field Hpet: %v", err) + } + if err := x.VptAlign.fromC(&tmp.vpt_align); err != nil { + return fmt.Errorf("converting field VptAlign: %v", err) + } + x.MmioHoleMemkb = uint64(tmp.mmio_hole_memkb) + x.TimerMode = TimerMode(tmp.timer_mode) + if err := x.NestedHvm.fromC(&tmp.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := x.Altp2M.fromC(&tmp.altp2m); err != nil { + return fmt.Errorf("converting field Altp2M: %v", err) + } + x.SystemFirmware = C.GoString(tmp.system_firmware) + x.SmbiosFirmware = C.GoString(tmp.smbios_firmware) + x.AcpiFirmware = C.GoString(tmp.acpi_firmware) + x.Hdtype = Hdtype(tmp.hdtype) + if err := x.Nographic.fromC(&tmp.nographic); err != nil { + return fmt.Errorf("converting field Nographic: %v", err) + } + if err := x.Vga.fromC(&tmp.vga); err != nil { + return fmt.Errorf("converting field Vga: %v", err) + } + if err := x.Vnc.fromC(&tmp.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + x.Keymap = C.GoString(tmp.keymap) + if err := x.Sdl.fromC(&tmp.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + if err := x.Spice.fromC(&tmp.spice); err != nil { + return fmt.Errorf("converting field Spice: %v", err) + } + if err := x.GfxPassthru.fromC(&tmp.gfx_passthru); err != nil { + return fmt.Errorf("converting field GfxPassthru: %v", err) + } + x.GfxPassthruKind = GfxPassthruKind(tmp.gfx_passthru_kind) + x.Serial = C.GoString(tmp.serial) + x.Boot = C.GoString(tmp.boot) + if err := x.Usb.fromC(&tmp.usb); err != nil { + return fmt.Errorf("converting field Usb: %v", err) + } + x.Usbversion = int(tmp.usbversion) + x.Usbdevice = C.GoString(tmp.usbdevice) + if err := x.VkbDevice.fromC(&tmp.vkb_device); err != nil { + return fmt.Errorf("converting field VkbDevice: %v", err) + } + x.Soundhw = C.GoString(tmp.soundhw) + if err := x.XenPlatformPci.fromC(&tmp.xen_platform_pci); err != nil { + return fmt.Errorf("converting field XenPlatformPci: %v", err) + } + if err := x.UsbdeviceList.fromC(&tmp.usbdevice_list); err != nil { + return fmt.Errorf("converting field UsbdeviceList: %v", err) + } + x.VendorDevice = VendorDevice(tmp.vendor_device) + if err := x.MsVmGenid.fromC(&tmp.ms_vm_genid); err != nil { + return fmt.Errorf("converting field MsVmGenid: %v", err) + } + if err := x.SerialList.fromC(&tmp.serial_list); err != nil { + return fmt.Errorf("converting field SerialList: %v", err) + } + if err := x.Rdm.fromC(&tmp.rdm); err != nil { + return fmt.Errorf("converting field Rdm: %v", err) + } + x.RdmMemBoundaryMemkb = uint64(tmp.rdm_mem_boundary_memkb) + x.McaCaps = uint64(tmp.mca_caps) + return nil +} + +func (x *DomainBuildInfoTypeUnionPv) fromC(xc *C.libxl_domain_build_info) error { + if DomainType(xc._type) != DomainTypePv { + return errors.New("expected union key DomainTypePv") + } + + tmp := (*C.libxl_domain_build_info_type_union_pv)(unsafe.Pointer(&xc.u[0])) + x.Kernel = C.GoString(tmp.kernel) + x.SlackMemkb = uint64(tmp.slack_memkb) + x.Bootloader = C.GoString(tmp.bootloader) + if err := x.BootloaderArgs.fromC(&tmp.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + x.Cmdline = C.GoString(tmp.cmdline) + x.Ramdisk = C.GoString(tmp.ramdisk) + x.Features = C.GoString(tmp.features) + if err := x.E820Host.fromC(&tmp.e820_host); err != nil { + return fmt.Errorf("converting field E820Host: %v", err) + } + return nil +} + +func (x *DomainBuildInfoTypeUnionPvh) fromC(xc *C.libxl_domain_build_info) error { + if DomainType(xc._type) != DomainTypePvh { + return errors.New("expected union key DomainTypePvh") + } + + tmp := (*C.libxl_domain_build_info_type_union_pvh)(unsafe.Pointer(&xc.u[0])) + if err := x.Pvshim.fromC(&tmp.pvshim); err != nil { + return fmt.Errorf("converting field Pvshim: %v", err) + } + x.PvshimPath = C.GoString(tmp.pvshim_path) + x.PvshimCmdline = C.GoString(tmp.pvshim_cmdline) + x.PvshimExtra = C.GoString(tmp.pvshim_extra) + return nil +} + +func (x *DomainBuildInfo) toC(xc *C.libxl_domain_build_info) (err error) { + defer func() { + if err != nil { + C.libxl_domain_build_info_dispose(xc) + } + }() + + xc.max_vcpus = C.int(x.MaxVcpus) + if err := x.AvailVcpus.toC(&xc.avail_vcpus); err != nil { + return fmt.Errorf("converting field AvailVcpus: %v", err) + } + if err := x.Cpumap.toC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + if err := x.Nodemap.toC(&xc.nodemap); err != nil { + return fmt.Errorf("converting field Nodemap: %v", err) + } + if numVcpuHardAffinity := len(x.VcpuHardAffinity); numVcpuHardAffinity > 0 { + xc.vcpu_hard_affinity = (*C.libxl_bitmap)(C.malloc(C.ulong(numVcpuHardAffinity) * C.sizeof_libxl_bitmap)) + xc.num_vcpu_hard_affinity = C.int(numVcpuHardAffinity) + cVcpuHardAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_hard_affinity))[:numVcpuHardAffinity:numVcpuHardAffinity] + for i, v := range x.VcpuHardAffinity { + if err := v.toC(&cVcpuHardAffinity[i]); err != nil { + return fmt.Errorf("converting field VcpuHardAffinity: %v", err) + } + } + } + if numVcpuSoftAffinity := len(x.VcpuSoftAffinity); numVcpuSoftAffinity > 0 { + xc.vcpu_soft_affinity = (*C.libxl_bitmap)(C.malloc(C.ulong(numVcpuSoftAffinity) * C.sizeof_libxl_bitmap)) + xc.num_vcpu_soft_affinity = C.int(numVcpuSoftAffinity) + cVcpuSoftAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_soft_affinity))[:numVcpuSoftAffinity:numVcpuSoftAffinity] + for i, v := range x.VcpuSoftAffinity { + if err := v.toC(&cVcpuSoftAffinity[i]); err != nil { + return fmt.Errorf("converting field VcpuSoftAffinity: %v", err) + } + } + } + if err := x.NumaPlacement.toC(&xc.numa_placement); err != nil { + return fmt.Errorf("converting field NumaPlacement: %v", err) + } + xc.tsc_mode = C.libxl_tsc_mode(x.TscMode) + xc.max_memkb = C.uint64_t(x.MaxMemkb) + xc.target_memkb = C.uint64_t(x.TargetMemkb) + xc.video_memkb = C.uint64_t(x.VideoMemkb) + xc.shadow_memkb = C.uint64_t(x.ShadowMemkb) + xc.iommu_memkb = C.uint64_t(x.IommuMemkb) + xc.rtc_timeoffset = C.uint32_t(x.RtcTimeoffset) + xc.exec_ssidref = C.uint32_t(x.ExecSsidref) + if x.ExecSsidLabel != "" { + xc.exec_ssid_label = C.CString(x.ExecSsidLabel) + } + if err := x.Localtime.toC(&xc.localtime); err != nil { + return fmt.Errorf("converting field Localtime: %v", err) + } + if err := x.DisableMigrate.toC(&xc.disable_migrate); err != nil { + return fmt.Errorf("converting field DisableMigrate: %v", err) + } + if err := x.Cpuid.toC(&xc.cpuid); err != nil { + return fmt.Errorf("converting field Cpuid: %v", err) + } + if x.BlkdevStart != "" { + xc.blkdev_start = C.CString(x.BlkdevStart) + } + if numVnumaNodes := len(x.VnumaNodes); numVnumaNodes > 0 { + xc.vnuma_nodes = (*C.libxl_vnode_info)(C.malloc(C.ulong(numVnumaNodes) * C.sizeof_libxl_vnode_info)) + xc.num_vnuma_nodes = C.int(numVnumaNodes) + cVnumaNodes := (*[1 << 28]C.libxl_vnode_info)(unsafe.Pointer(xc.vnuma_nodes))[:numVnumaNodes:numVnumaNodes] + for i, v := range x.VnumaNodes { + if err := v.toC(&cVnumaNodes[i]); err != nil { + return fmt.Errorf("converting field VnumaNodes: %v", err) + } + } + } + xc.max_grant_frames = C.uint32_t(x.MaxGrantFrames) + xc.max_maptrack_frames = C.uint32_t(x.MaxMaptrackFrames) + xc.device_model_version = C.libxl_device_model_version(x.DeviceModelVersion) + if err := x.DeviceModelStubdomain.toC(&xc.device_model_stubdomain); err != nil { + return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) + } + if x.DeviceModel != "" { + xc.device_model = C.CString(x.DeviceModel) + } + xc.device_model_ssidref = C.uint32_t(x.DeviceModelSsidref) + if x.DeviceModelSsidLabel != "" { + xc.device_model_ssid_label = C.CString(x.DeviceModelSsidLabel) + } + if x.DeviceModelUser != "" { + xc.device_model_user = C.CString(x.DeviceModelUser) + } + if err := x.Extra.toC(&xc.extra); err != nil { + return fmt.Errorf("converting field Extra: %v", err) + } + if err := x.ExtraPv.toC(&xc.extra_pv); err != nil { + return fmt.Errorf("converting field ExtraPv: %v", err) + } + if err := x.ExtraHvm.toC(&xc.extra_hvm); err != nil { + return fmt.Errorf("converting field ExtraHvm: %v", err) + } + if err := x.SchedParams.toC(&xc.sched_params); err != nil { + return fmt.Errorf("converting field SchedParams: %v", err) + } + if numIoports := len(x.Ioports); numIoports > 0 { + xc.ioports = (*C.libxl_ioport_range)(C.malloc(C.ulong(numIoports) * C.sizeof_libxl_ioport_range)) + xc.num_ioports = C.int(numIoports) + cIoports := (*[1 << 28]C.libxl_ioport_range)(unsafe.Pointer(xc.ioports))[:numIoports:numIoports] + for i, v := range x.Ioports { + if err := v.toC(&cIoports[i]); err != nil { + return fmt.Errorf("converting field Ioports: %v", err) + } + } + } + if numIrqs := len(x.Irqs); numIrqs > 0 { + xc.irqs = (*C.uint32_t)(C.malloc(C.size_t(numIrqs * numIrqs))) + xc.num_irqs = C.int(numIrqs) + cIrqs := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.irqs))[:numIrqs:numIrqs] + for i, v := range x.Irqs { + cIrqs[i] = C.uint32_t(v) + } + } + if numIomem := len(x.Iomem); numIomem > 0 { + xc.iomem = (*C.libxl_iomem_range)(C.malloc(C.ulong(numIomem) * C.sizeof_libxl_iomem_range)) + xc.num_iomem = C.int(numIomem) + cIomem := (*[1 << 28]C.libxl_iomem_range)(unsafe.Pointer(xc.iomem))[:numIomem:numIomem] + for i, v := range x.Iomem { + if err := v.toC(&cIomem[i]); err != nil { + return fmt.Errorf("converting field Iomem: %v", err) + } + } + } + if err := x.ClaimMode.toC(&xc.claim_mode); err != nil { + return fmt.Errorf("converting field ClaimMode: %v", err) + } + xc.event_channels = C.uint32_t(x.EventChannels) + if x.Kernel != "" { + xc.kernel = C.CString(x.Kernel) + } + if x.Cmdline != "" { + xc.cmdline = C.CString(x.Cmdline) + } + if x.Ramdisk != "" { + xc.ramdisk = C.CString(x.Ramdisk) + } + if x.DeviceTree != "" { + xc.device_tree = C.CString(x.DeviceTree) + } + if err := x.Acpi.toC(&xc.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + if x.Bootloader != "" { + xc.bootloader = C.CString(x.Bootloader) + } + if err := x.BootloaderArgs.toC(&xc.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + xc.timer_mode = C.libxl_timer_mode(x.TimerMode) + if err := x.NestedHvm.toC(&xc.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := x.Apic.toC(&xc.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := x.DmRestrict.toC(&xc.dm_restrict); err != nil { + return fmt.Errorf("converting field DmRestrict: %v", err) + } + xc.tee = C.libxl_tee_type(x.Tee) + xc._type = C.libxl_domain_type(x.Type) + switch x.Type { + case DomainTypeHvm: + tmp, ok := x.TypeUnion.(DomainBuildInfoTypeUnionHvm) + if !ok { + return errors.New("wrong type for union key type") + } + var hvm C.libxl_domain_build_info_type_union_hvm + if tmp.Firmware != "" { + hvm.firmware = C.CString(tmp.Firmware) + } + hvm.bios = C.libxl_bios_type(tmp.Bios) + if err := tmp.Pae.toC(&hvm.pae); err != nil { + return fmt.Errorf("converting field Pae: %v", err) + } + if err := tmp.Apic.toC(&hvm.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := tmp.Acpi.toC(&hvm.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + if err := tmp.AcpiS3.toC(&hvm.acpi_s3); err != nil { + return fmt.Errorf("converting field AcpiS3: %v", err) + } + if err := tmp.AcpiS4.toC(&hvm.acpi_s4); err != nil { + return fmt.Errorf("converting field AcpiS4: %v", err) + } + if err := tmp.AcpiLaptopSlate.toC(&hvm.acpi_laptop_slate); err != nil { + return fmt.Errorf("converting field AcpiLaptopSlate: %v", err) + } + if err := tmp.Nx.toC(&hvm.nx); err != nil { + return fmt.Errorf("converting field Nx: %v", err) + } + if err := tmp.Viridian.toC(&hvm.viridian); err != nil { + return fmt.Errorf("converting field Viridian: %v", err) + } + if err := tmp.ViridianEnable.toC(&hvm.viridian_enable); err != nil { + return fmt.Errorf("converting field ViridianEnable: %v", err) + } + if err := tmp.ViridianDisable.toC(&hvm.viridian_disable); err != nil { + return fmt.Errorf("converting field ViridianDisable: %v", err) + } + if tmp.Timeoffset != "" { + hvm.timeoffset = C.CString(tmp.Timeoffset) + } + if err := tmp.Hpet.toC(&hvm.hpet); err != nil { + return fmt.Errorf("converting field Hpet: %v", err) + } + if err := tmp.VptAlign.toC(&hvm.vpt_align); err != nil { + return fmt.Errorf("converting field VptAlign: %v", err) + } + hvm.mmio_hole_memkb = C.uint64_t(tmp.MmioHoleMemkb) + hvm.timer_mode = C.libxl_timer_mode(tmp.TimerMode) + if err := tmp.NestedHvm.toC(&hvm.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := tmp.Altp2M.toC(&hvm.altp2m); err != nil { + return fmt.Errorf("converting field Altp2M: %v", err) + } + if tmp.SystemFirmware != "" { + hvm.system_firmware = C.CString(tmp.SystemFirmware) + } + if tmp.SmbiosFirmware != "" { + hvm.smbios_firmware = C.CString(tmp.SmbiosFirmware) + } + if tmp.AcpiFirmware != "" { + hvm.acpi_firmware = C.CString(tmp.AcpiFirmware) + } + hvm.hdtype = C.libxl_hdtype(tmp.Hdtype) + if err := tmp.Nographic.toC(&hvm.nographic); err != nil { + return fmt.Errorf("converting field Nographic: %v", err) + } + if err := tmp.Vga.toC(&hvm.vga); err != nil { + return fmt.Errorf("converting field Vga: %v", err) + } + if err := tmp.Vnc.toC(&hvm.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + if tmp.Keymap != "" { + hvm.keymap = C.CString(tmp.Keymap) + } + if err := tmp.Sdl.toC(&hvm.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + if err := tmp.Spice.toC(&hvm.spice); err != nil { + return fmt.Errorf("converting field Spice: %v", err) + } + if err := tmp.GfxPassthru.toC(&hvm.gfx_passthru); err != nil { + return fmt.Errorf("converting field GfxPassthru: %v", err) + } + hvm.gfx_passthru_kind = C.libxl_gfx_passthru_kind(tmp.GfxPassthruKind) + if tmp.Serial != "" { + hvm.serial = C.CString(tmp.Serial) + } + if tmp.Boot != "" { + hvm.boot = C.CString(tmp.Boot) + } + if err := tmp.Usb.toC(&hvm.usb); err != nil { + return fmt.Errorf("converting field Usb: %v", err) + } + hvm.usbversion = C.int(tmp.Usbversion) + if tmp.Usbdevice != "" { + hvm.usbdevice = C.CString(tmp.Usbdevice) + } + if err := tmp.VkbDevice.toC(&hvm.vkb_device); err != nil { + return fmt.Errorf("converting field VkbDevice: %v", err) + } + if tmp.Soundhw != "" { + hvm.soundhw = C.CString(tmp.Soundhw) + } + if err := tmp.XenPlatformPci.toC(&hvm.xen_platform_pci); err != nil { + return fmt.Errorf("converting field XenPlatformPci: %v", err) + } + if err := tmp.UsbdeviceList.toC(&hvm.usbdevice_list); err != nil { + return fmt.Errorf("converting field UsbdeviceList: %v", err) + } + hvm.vendor_device = C.libxl_vendor_device(tmp.VendorDevice) + if err := tmp.MsVmGenid.toC(&hvm.ms_vm_genid); err != nil { + return fmt.Errorf("converting field MsVmGenid: %v", err) + } + if err := tmp.SerialList.toC(&hvm.serial_list); err != nil { + return fmt.Errorf("converting field SerialList: %v", err) + } + if err := tmp.Rdm.toC(&hvm.rdm); err != nil { + return fmt.Errorf("converting field Rdm: %v", err) + } + hvm.rdm_mem_boundary_memkb = C.uint64_t(tmp.RdmMemBoundaryMemkb) + hvm.mca_caps = C.uint64_t(tmp.McaCaps) + hvmBytes := C.GoBytes(unsafe.Pointer(&hvm), C.sizeof_libxl_domain_build_info_type_union_hvm) + copy(xc.u[:], hvmBytes) + case DomainTypePv: + tmp, ok := x.TypeUnion.(DomainBuildInfoTypeUnionPv) + if !ok { + return errors.New("wrong type for union key type") + } + var pv C.libxl_domain_build_info_type_union_pv + if tmp.Kernel != "" { + pv.kernel = C.CString(tmp.Kernel) + } + pv.slack_memkb = C.uint64_t(tmp.SlackMemkb) + if tmp.Bootloader != "" { + pv.bootloader = C.CString(tmp.Bootloader) + } + if err := tmp.BootloaderArgs.toC(&pv.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + if tmp.Cmdline != "" { + pv.cmdline = C.CString(tmp.Cmdline) + } + if tmp.Ramdisk != "" { + pv.ramdisk = C.CString(tmp.Ramdisk) + } + if tmp.Features != "" { + pv.features = C.CString(tmp.Features) + } + if err := tmp.E820Host.toC(&pv.e820_host); err != nil { + return fmt.Errorf("converting field E820Host: %v", err) + } + pvBytes := C.GoBytes(unsafe.Pointer(&pv), C.sizeof_libxl_domain_build_info_type_union_pv) + copy(xc.u[:], pvBytes) + case DomainTypePvh: + tmp, ok := x.TypeUnion.(DomainBuildInfoTypeUnionPvh) + if !ok { + return errors.New("wrong type for union key type") + } + var pvh C.libxl_domain_build_info_type_union_pvh + if err := tmp.Pvshim.toC(&pvh.pvshim); err != nil { + return fmt.Errorf("converting field Pvshim: %v", err) + } + if tmp.PvshimPath != "" { + pvh.pvshim_path = C.CString(tmp.PvshimPath) + } + if tmp.PvshimCmdline != "" { + pvh.pvshim_cmdline = C.CString(tmp.PvshimCmdline) + } + if tmp.PvshimExtra != "" { + pvh.pvshim_extra = C.CString(tmp.PvshimExtra) + } + pvhBytes := C.GoBytes(unsafe.Pointer(&pvh), C.sizeof_libxl_domain_build_info_type_union_pvh) + copy(xc.u[:], pvhBytes) + case DomainTypeInvalid: + break + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + xc.arch_arm.gic_version = C.libxl_gic_version(x.ArchArm.GicVersion) + xc.arch_arm.vuart = C.libxl_vuart_type(x.ArchArm.Vuart) + xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) + + return nil +} + +// NewDeviceVfb returns an instance of DeviceVfb initialized with defaults. +func NewDeviceVfb() (*DeviceVfb, error) { + var ( + x DeviceVfb + xc C.libxl_device_vfb + ) + + C.libxl_device_vfb_init(&xc) + defer C.libxl_device_vfb_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVfb) fromC(xc *C.libxl_device_vfb) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + if err := x.Vnc.fromC(&xc.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + if err := x.Sdl.fromC(&xc.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + x.Keymap = C.GoString(xc.keymap) + + return nil +} + +func (x *DeviceVfb) toC(xc *C.libxl_device_vfb) (err error) { + defer func() { + if err != nil { + C.libxl_device_vfb_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + if err := x.Vnc.toC(&xc.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + if err := x.Sdl.toC(&xc.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + if x.Keymap != "" { + xc.keymap = C.CString(x.Keymap) + } + + return nil +} + +// NewDeviceVkb returns an instance of DeviceVkb initialized with defaults. +func NewDeviceVkb() (*DeviceVkb, error) { + var ( + x DeviceVkb + xc C.libxl_device_vkb + ) + + C.libxl_device_vkb_init(&xc) + defer C.libxl_device_vkb_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVkb) fromC(xc *C.libxl_device_vkb) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.BackendType = VkbBackend(xc.backend_type) + x.UniqueId = C.GoString(xc.unique_id) + x.FeatureDisableKeyboard = bool(xc.feature_disable_keyboard) + x.FeatureDisablePointer = bool(xc.feature_disable_pointer) + x.FeatureAbsPointer = bool(xc.feature_abs_pointer) + x.FeatureRawPointer = bool(xc.feature_raw_pointer) + x.FeatureMultiTouch = bool(xc.feature_multi_touch) + x.Width = uint32(xc.width) + x.Height = uint32(xc.height) + x.MultiTouchWidth = uint32(xc.multi_touch_width) + x.MultiTouchHeight = uint32(xc.multi_touch_height) + x.MultiTouchNumContacts = uint32(xc.multi_touch_num_contacts) + + return nil +} + +func (x *DeviceVkb) toC(xc *C.libxl_device_vkb) (err error) { + defer func() { + if err != nil { + C.libxl_device_vkb_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + xc.backend_type = C.libxl_vkb_backend(x.BackendType) + if x.UniqueId != "" { + xc.unique_id = C.CString(x.UniqueId) + } + xc.feature_disable_keyboard = C.bool(x.FeatureDisableKeyboard) + xc.feature_disable_pointer = C.bool(x.FeatureDisablePointer) + xc.feature_abs_pointer = C.bool(x.FeatureAbsPointer) + xc.feature_raw_pointer = C.bool(x.FeatureRawPointer) + xc.feature_multi_touch = C.bool(x.FeatureMultiTouch) + xc.width = C.uint32_t(x.Width) + xc.height = C.uint32_t(x.Height) + xc.multi_touch_width = C.uint32_t(x.MultiTouchWidth) + xc.multi_touch_height = C.uint32_t(x.MultiTouchHeight) + xc.multi_touch_num_contacts = C.uint32_t(x.MultiTouchNumContacts) + + return nil +} + +// NewDeviceDisk returns an instance of DeviceDisk initialized with defaults. +func NewDeviceDisk() (*DeviceDisk, error) { + var ( + x DeviceDisk + xc C.libxl_device_disk + ) + + C.libxl_device_disk_init(&xc) + defer C.libxl_device_disk_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceDisk) fromC(xc *C.libxl_device_disk) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.PdevPath = C.GoString(xc.pdev_path) + x.Vdev = C.GoString(xc.vdev) + x.Backend = DiskBackend(xc.backend) + x.Format = DiskFormat(xc.format) + x.Script = C.GoString(xc.script) + x.Removable = int(xc.removable) + x.Readwrite = int(xc.readwrite) + x.IsCdrom = int(xc.is_cdrom) + x.DirectIoSafe = bool(xc.direct_io_safe) + if err := x.DiscardEnable.fromC(&xc.discard_enable); err != nil { + return fmt.Errorf("converting field DiscardEnable: %v", err) + } + if err := x.ColoEnable.fromC(&xc.colo_enable); err != nil { + return fmt.Errorf("converting field ColoEnable: %v", err) + } + if err := x.ColoRestoreEnable.fromC(&xc.colo_restore_enable); err != nil { + return fmt.Errorf("converting field ColoRestoreEnable: %v", err) + } + x.ColoHost = C.GoString(xc.colo_host) + x.ColoPort = int(xc.colo_port) + x.ColoExport = C.GoString(xc.colo_export) + x.ActiveDisk = C.GoString(xc.active_disk) + x.HiddenDisk = C.GoString(xc.hidden_disk) + + return nil +} + +func (x *DeviceDisk) toC(xc *C.libxl_device_disk) (err error) { + defer func() { + if err != nil { + C.libxl_device_disk_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + if x.PdevPath != "" { + xc.pdev_path = C.CString(x.PdevPath) + } + if x.Vdev != "" { + xc.vdev = C.CString(x.Vdev) + } + xc.backend = C.libxl_disk_backend(x.Backend) + xc.format = C.libxl_disk_format(x.Format) + if x.Script != "" { + xc.script = C.CString(x.Script) + } + xc.removable = C.int(x.Removable) + xc.readwrite = C.int(x.Readwrite) + xc.is_cdrom = C.int(x.IsCdrom) + xc.direct_io_safe = C.bool(x.DirectIoSafe) + if err := x.DiscardEnable.toC(&xc.discard_enable); err != nil { + return fmt.Errorf("converting field DiscardEnable: %v", err) + } + if err := x.ColoEnable.toC(&xc.colo_enable); err != nil { + return fmt.Errorf("converting field ColoEnable: %v", err) + } + if err := x.ColoRestoreEnable.toC(&xc.colo_restore_enable); err != nil { + return fmt.Errorf("converting field ColoRestoreEnable: %v", err) + } + if x.ColoHost != "" { + xc.colo_host = C.CString(x.ColoHost) + } + xc.colo_port = C.int(x.ColoPort) + if x.ColoExport != "" { + xc.colo_export = C.CString(x.ColoExport) + } + if x.ActiveDisk != "" { + xc.active_disk = C.CString(x.ActiveDisk) + } + if x.HiddenDisk != "" { + xc.hidden_disk = C.CString(x.HiddenDisk) + } + + return nil +} + +// NewDeviceNic returns an instance of DeviceNic initialized with defaults. +func NewDeviceNic() (*DeviceNic, error) { + var ( + x DeviceNic + xc C.libxl_device_nic + ) + + C.libxl_device_nic_init(&xc) + defer C.libxl_device_nic_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceNic) fromC(xc *C.libxl_device_nic) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.Mtu = int(xc.mtu) + x.Model = C.GoString(xc.model) + if err := x.Mac.fromC(&xc.mac); err != nil { + return fmt.Errorf("converting field Mac: %v", err) + } + x.Ip = C.GoString(xc.ip) + x.Bridge = C.GoString(xc.bridge) + x.Ifname = C.GoString(xc.ifname) + x.Script = C.GoString(xc.script) + x.Nictype = NicType(xc.nictype) + x.RateBytesPerInterval = uint64(xc.rate_bytes_per_interval) + x.RateIntervalUsecs = uint32(xc.rate_interval_usecs) + x.Gatewaydev = C.GoString(xc.gatewaydev) + x.ColoftForwarddev = C.GoString(xc.coloft_forwarddev) + x.ColoSockMirrorId = C.GoString(xc.colo_sock_mirror_id) + x.ColoSockMirrorIp = C.GoString(xc.colo_sock_mirror_ip) + x.ColoSockMirrorPort = C.GoString(xc.colo_sock_mirror_port) + x.ColoSockComparePriInId = C.GoString(xc.colo_sock_compare_pri_in_id) + x.ColoSockComparePriInIp = C.GoString(xc.colo_sock_compare_pri_in_ip) + x.ColoSockComparePriInPort = C.GoString(xc.colo_sock_compare_pri_in_port) + x.ColoSockCompareSecInId = C.GoString(xc.colo_sock_compare_sec_in_id) + x.ColoSockCompareSecInIp = C.GoString(xc.colo_sock_compare_sec_in_ip) + x.ColoSockCompareSecInPort = C.GoString(xc.colo_sock_compare_sec_in_port) + x.ColoSockCompareNotifyId = C.GoString(xc.colo_sock_compare_notify_id) + x.ColoSockCompareNotifyIp = C.GoString(xc.colo_sock_compare_notify_ip) + x.ColoSockCompareNotifyPort = C.GoString(xc.colo_sock_compare_notify_port) + x.ColoSockRedirector0Id = C.GoString(xc.colo_sock_redirector0_id) + x.ColoSockRedirector0Ip = C.GoString(xc.colo_sock_redirector0_ip) + x.ColoSockRedirector0Port = C.GoString(xc.colo_sock_redirector0_port) + x.ColoSockRedirector1Id = C.GoString(xc.colo_sock_redirector1_id) + x.ColoSockRedirector1Ip = C.GoString(xc.colo_sock_redirector1_ip) + x.ColoSockRedirector1Port = C.GoString(xc.colo_sock_redirector1_port) + x.ColoSockRedirector2Id = C.GoString(xc.colo_sock_redirector2_id) + x.ColoSockRedirector2Ip = C.GoString(xc.colo_sock_redirector2_ip) + x.ColoSockRedirector2Port = C.GoString(xc.colo_sock_redirector2_port) + x.ColoFilterMirrorQueue = C.GoString(xc.colo_filter_mirror_queue) + x.ColoFilterMirrorOutdev = C.GoString(xc.colo_filter_mirror_outdev) + x.ColoFilterRedirector0Queue = C.GoString(xc.colo_filter_redirector0_queue) + x.ColoFilterRedirector0Indev = C.GoString(xc.colo_filter_redirector0_indev) + x.ColoFilterRedirector0Outdev = C.GoString(xc.colo_filter_redirector0_outdev) + x.ColoFilterRedirector1Queue = C.GoString(xc.colo_filter_redirector1_queue) + x.ColoFilterRedirector1Indev = C.GoString(xc.colo_filter_redirector1_indev) + x.ColoFilterRedirector1Outdev = C.GoString(xc.colo_filter_redirector1_outdev) + x.ColoComparePriIn = C.GoString(xc.colo_compare_pri_in) + x.ColoCompareSecIn = C.GoString(xc.colo_compare_sec_in) + x.ColoCompareOut = C.GoString(xc.colo_compare_out) + x.ColoCompareNotifyDev = C.GoString(xc.colo_compare_notify_dev) + x.ColoSockSecRedirector0Id = C.GoString(xc.colo_sock_sec_redirector0_id) + x.ColoSockSecRedirector0Ip = C.GoString(xc.colo_sock_sec_redirector0_ip) + x.ColoSockSecRedirector0Port = C.GoString(xc.colo_sock_sec_redirector0_port) + x.ColoSockSecRedirector1Id = C.GoString(xc.colo_sock_sec_redirector1_id) + x.ColoSockSecRedirector1Ip = C.GoString(xc.colo_sock_sec_redirector1_ip) + x.ColoSockSecRedirector1Port = C.GoString(xc.colo_sock_sec_redirector1_port) + x.ColoFilterSecRedirector0Queue = C.GoString(xc.colo_filter_sec_redirector0_queue) + x.ColoFilterSecRedirector0Indev = C.GoString(xc.colo_filter_sec_redirector0_indev) + x.ColoFilterSecRedirector0Outdev = C.GoString(xc.colo_filter_sec_redirector0_outdev) + x.ColoFilterSecRedirector1Queue = C.GoString(xc.colo_filter_sec_redirector1_queue) + x.ColoFilterSecRedirector1Indev = C.GoString(xc.colo_filter_sec_redirector1_indev) + x.ColoFilterSecRedirector1Outdev = C.GoString(xc.colo_filter_sec_redirector1_outdev) + x.ColoFilterSecRewriter0Queue = C.GoString(xc.colo_filter_sec_rewriter0_queue) + x.ColoCheckpointHost = C.GoString(xc.colo_checkpoint_host) + x.ColoCheckpointPort = C.GoString(xc.colo_checkpoint_port) + + return nil +} + +func (x *DeviceNic) toC(xc *C.libxl_device_nic) (err error) { + defer func() { + if err != nil { + C.libxl_device_nic_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + xc.mtu = C.int(x.Mtu) + if x.Model != "" { + xc.model = C.CString(x.Model) + } + if err := x.Mac.toC(&xc.mac); err != nil { + return fmt.Errorf("converting field Mac: %v", err) + } + if x.Ip != "" { + xc.ip = C.CString(x.Ip) + } + if x.Bridge != "" { + xc.bridge = C.CString(x.Bridge) + } + if x.Ifname != "" { + xc.ifname = C.CString(x.Ifname) + } + if x.Script != "" { + xc.script = C.CString(x.Script) + } + xc.nictype = C.libxl_nic_type(x.Nictype) + xc.rate_bytes_per_interval = C.uint64_t(x.RateBytesPerInterval) + xc.rate_interval_usecs = C.uint32_t(x.RateIntervalUsecs) + if x.Gatewaydev != "" { + xc.gatewaydev = C.CString(x.Gatewaydev) + } + if x.ColoftForwarddev != "" { + xc.coloft_forwarddev = C.CString(x.ColoftForwarddev) + } + if x.ColoSockMirrorId != "" { + xc.colo_sock_mirror_id = C.CString(x.ColoSockMirrorId) + } + if x.ColoSockMirrorIp != "" { + xc.colo_sock_mirror_ip = C.CString(x.ColoSockMirrorIp) + } + if x.ColoSockMirrorPort != "" { + xc.colo_sock_mirror_port = C.CString(x.ColoSockMirrorPort) + } + if x.ColoSockComparePriInId != "" { + xc.colo_sock_compare_pri_in_id = C.CString(x.ColoSockComparePriInId) + } + if x.ColoSockComparePriInIp != "" { + xc.colo_sock_compare_pri_in_ip = C.CString(x.ColoSockComparePriInIp) + } + if x.ColoSockComparePriInPort != "" { + xc.colo_sock_compare_pri_in_port = C.CString(x.ColoSockComparePriInPort) + } + if x.ColoSockCompareSecInId != "" { + xc.colo_sock_compare_sec_in_id = C.CString(x.ColoSockCompareSecInId) + } + if x.ColoSockCompareSecInIp != "" { + xc.colo_sock_compare_sec_in_ip = C.CString(x.ColoSockCompareSecInIp) + } + if x.ColoSockCompareSecInPort != "" { + xc.colo_sock_compare_sec_in_port = C.CString(x.ColoSockCompareSecInPort) + } + if x.ColoSockCompareNotifyId != "" { + xc.colo_sock_compare_notify_id = C.CString(x.ColoSockCompareNotifyId) + } + if x.ColoSockCompareNotifyIp != "" { + xc.colo_sock_compare_notify_ip = C.CString(x.ColoSockCompareNotifyIp) + } + if x.ColoSockCompareNotifyPort != "" { + xc.colo_sock_compare_notify_port = C.CString(x.ColoSockCompareNotifyPort) + } + if x.ColoSockRedirector0Id != "" { + xc.colo_sock_redirector0_id = C.CString(x.ColoSockRedirector0Id) + } + if x.ColoSockRedirector0Ip != "" { + xc.colo_sock_redirector0_ip = C.CString(x.ColoSockRedirector0Ip) + } + if x.ColoSockRedirector0Port != "" { + xc.colo_sock_redirector0_port = C.CString(x.ColoSockRedirector0Port) + } + if x.ColoSockRedirector1Id != "" { + xc.colo_sock_redirector1_id = C.CString(x.ColoSockRedirector1Id) + } + if x.ColoSockRedirector1Ip != "" { + xc.colo_sock_redirector1_ip = C.CString(x.ColoSockRedirector1Ip) + } + if x.ColoSockRedirector1Port != "" { + xc.colo_sock_redirector1_port = C.CString(x.ColoSockRedirector1Port) + } + if x.ColoSockRedirector2Id != "" { + xc.colo_sock_redirector2_id = C.CString(x.ColoSockRedirector2Id) + } + if x.ColoSockRedirector2Ip != "" { + xc.colo_sock_redirector2_ip = C.CString(x.ColoSockRedirector2Ip) + } + if x.ColoSockRedirector2Port != "" { + xc.colo_sock_redirector2_port = C.CString(x.ColoSockRedirector2Port) + } + if x.ColoFilterMirrorQueue != "" { + xc.colo_filter_mirror_queue = C.CString(x.ColoFilterMirrorQueue) + } + if x.ColoFilterMirrorOutdev != "" { + xc.colo_filter_mirror_outdev = C.CString(x.ColoFilterMirrorOutdev) + } + if x.ColoFilterRedirector0Queue != "" { + xc.colo_filter_redirector0_queue = C.CString(x.ColoFilterRedirector0Queue) + } + if x.ColoFilterRedirector0Indev != "" { + xc.colo_filter_redirector0_indev = C.CString(x.ColoFilterRedirector0Indev) + } + if x.ColoFilterRedirector0Outdev != "" { + xc.colo_filter_redirector0_outdev = C.CString(x.ColoFilterRedirector0Outdev) + } + if x.ColoFilterRedirector1Queue != "" { + xc.colo_filter_redirector1_queue = C.CString(x.ColoFilterRedirector1Queue) + } + if x.ColoFilterRedirector1Indev != "" { + xc.colo_filter_redirector1_indev = C.CString(x.ColoFilterRedirector1Indev) + } + if x.ColoFilterRedirector1Outdev != "" { + xc.colo_filter_redirector1_outdev = C.CString(x.ColoFilterRedirector1Outdev) + } + if x.ColoComparePriIn != "" { + xc.colo_compare_pri_in = C.CString(x.ColoComparePriIn) + } + if x.ColoCompareSecIn != "" { + xc.colo_compare_sec_in = C.CString(x.ColoCompareSecIn) + } + if x.ColoCompareOut != "" { + xc.colo_compare_out = C.CString(x.ColoCompareOut) + } + if x.ColoCompareNotifyDev != "" { + xc.colo_compare_notify_dev = C.CString(x.ColoCompareNotifyDev) + } + if x.ColoSockSecRedirector0Id != "" { + xc.colo_sock_sec_redirector0_id = C.CString(x.ColoSockSecRedirector0Id) + } + if x.ColoSockSecRedirector0Ip != "" { + xc.colo_sock_sec_redirector0_ip = C.CString(x.ColoSockSecRedirector0Ip) + } + if x.ColoSockSecRedirector0Port != "" { + xc.colo_sock_sec_redirector0_port = C.CString(x.ColoSockSecRedirector0Port) + } + if x.ColoSockSecRedirector1Id != "" { + xc.colo_sock_sec_redirector1_id = C.CString(x.ColoSockSecRedirector1Id) + } + if x.ColoSockSecRedirector1Ip != "" { + xc.colo_sock_sec_redirector1_ip = C.CString(x.ColoSockSecRedirector1Ip) + } + if x.ColoSockSecRedirector1Port != "" { + xc.colo_sock_sec_redirector1_port = C.CString(x.ColoSockSecRedirector1Port) + } + if x.ColoFilterSecRedirector0Queue != "" { + xc.colo_filter_sec_redirector0_queue = C.CString(x.ColoFilterSecRedirector0Queue) + } + if x.ColoFilterSecRedirector0Indev != "" { + xc.colo_filter_sec_redirector0_indev = C.CString(x.ColoFilterSecRedirector0Indev) + } + if x.ColoFilterSecRedirector0Outdev != "" { + xc.colo_filter_sec_redirector0_outdev = C.CString(x.ColoFilterSecRedirector0Outdev) + } + if x.ColoFilterSecRedirector1Queue != "" { + xc.colo_filter_sec_redirector1_queue = C.CString(x.ColoFilterSecRedirector1Queue) + } + if x.ColoFilterSecRedirector1Indev != "" { + xc.colo_filter_sec_redirector1_indev = C.CString(x.ColoFilterSecRedirector1Indev) + } + if x.ColoFilterSecRedirector1Outdev != "" { + xc.colo_filter_sec_redirector1_outdev = C.CString(x.ColoFilterSecRedirector1Outdev) + } + if x.ColoFilterSecRewriter0Queue != "" { + xc.colo_filter_sec_rewriter0_queue = C.CString(x.ColoFilterSecRewriter0Queue) + } + if x.ColoCheckpointHost != "" { + xc.colo_checkpoint_host = C.CString(x.ColoCheckpointHost) + } + if x.ColoCheckpointPort != "" { + xc.colo_checkpoint_port = C.CString(x.ColoCheckpointPort) + } + + return nil +} + +// NewDevicePci returns an instance of DevicePci initialized with defaults. +func NewDevicePci() (*DevicePci, error) { + var ( + x DevicePci + xc C.libxl_device_pci + ) + + C.libxl_device_pci_init(&xc) + defer C.libxl_device_pci_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DevicePci) fromC(xc *C.libxl_device_pci) error { + x.Func = byte(xc._func) + x.Dev = byte(xc.dev) + x.Bus = byte(xc.bus) + x.Domain = int(xc.domain) + x.Vdevfn = uint32(xc.vdevfn) + x.VfuncMask = uint32(xc.vfunc_mask) + x.Msitranslate = bool(xc.msitranslate) + x.PowerMgmt = bool(xc.power_mgmt) + x.Permissive = bool(xc.permissive) + x.Seize = bool(xc.seize) + x.RdmPolicy = RdmReservePolicy(xc.rdm_policy) + + return nil +} + +func (x *DevicePci) toC(xc *C.libxl_device_pci) (err error) { + defer func() { + if err != nil { + C.libxl_device_pci_dispose(xc) + } + }() + + xc._func = C.uint8_t(x.Func) + xc.dev = C.uint8_t(x.Dev) + xc.bus = C.uint8_t(x.Bus) + xc.domain = C.int(x.Domain) + xc.vdevfn = C.uint32_t(x.Vdevfn) + xc.vfunc_mask = C.uint32_t(x.VfuncMask) + xc.msitranslate = C.bool(x.Msitranslate) + xc.power_mgmt = C.bool(x.PowerMgmt) + xc.permissive = C.bool(x.Permissive) + xc.seize = C.bool(x.Seize) + xc.rdm_policy = C.libxl_rdm_reserve_policy(x.RdmPolicy) + + return nil +} + +// NewDeviceRdm returns an instance of DeviceRdm initialized with defaults. +func NewDeviceRdm() (*DeviceRdm, error) { + var ( + x DeviceRdm + xc C.libxl_device_rdm + ) + + C.libxl_device_rdm_init(&xc) + defer C.libxl_device_rdm_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceRdm) fromC(xc *C.libxl_device_rdm) error { + x.Start = uint64(xc.start) + x.Size = uint64(xc.size) + x.Policy = RdmReservePolicy(xc.policy) + + return nil +} + +func (x *DeviceRdm) toC(xc *C.libxl_device_rdm) (err error) { + defer func() { + if err != nil { + C.libxl_device_rdm_dispose(xc) + } + }() + + xc.start = C.uint64_t(x.Start) + xc.size = C.uint64_t(x.Size) + xc.policy = C.libxl_rdm_reserve_policy(x.Policy) + + return nil +} + +// NewDeviceUsbctrl returns an instance of DeviceUsbctrl initialized with defaults. +func NewDeviceUsbctrl() (*DeviceUsbctrl, error) { + var ( + x DeviceUsbctrl + xc C.libxl_device_usbctrl + ) + + C.libxl_device_usbctrl_init(&xc) + defer C.libxl_device_usbctrl_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceUsbctrl) fromC(xc *C.libxl_device_usbctrl) error { + x.Type = UsbctrlType(xc._type) + x.Devid = Devid(xc.devid) + x.Version = int(xc.version) + x.Ports = int(xc.ports) + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + + return nil +} + +func (x *DeviceUsbctrl) toC(xc *C.libxl_device_usbctrl) (err error) { + defer func() { + if err != nil { + C.libxl_device_usbctrl_dispose(xc) + } + }() + + xc._type = C.libxl_usbctrl_type(x.Type) + xc.devid = C.libxl_devid(x.Devid) + xc.version = C.int(x.Version) + xc.ports = C.int(x.Ports) + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + + return nil +} + +// NewDeviceUsbdev returns an instance of DeviceUsbdev initialized with defaults. +func NewDeviceUsbdev(utype UsbdevType) (*DeviceUsbdev, error) { + var ( + x DeviceUsbdev + xc C.libxl_device_usbdev + ) + + C.libxl_device_usbdev_init(&xc) + C.libxl_device_usbdev_init_type(&xc, C.libxl_usbdev_type(utype)) + defer C.libxl_device_usbdev_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceUsbdev) fromC(xc *C.libxl_device_usbdev) error { + x.Ctrl = Devid(xc.ctrl) + x.Port = int(xc.port) + x.Type = UsbdevType(xc._type) + switch x.Type { + case UsbdevTypeHostdev: + var typeHostdev DeviceUsbdevTypeUnionHostdev + if err := typeHostdev.fromC(xc); err != nil { + return fmt.Errorf("converting field typeHostdev: %v", err) + } + x.TypeUnion = typeHostdev + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + + return nil +} + +func (x *DeviceUsbdevTypeUnionHostdev) fromC(xc *C.libxl_device_usbdev) error { + if UsbdevType(xc._type) != UsbdevTypeHostdev { + return errors.New("expected union key UsbdevTypeHostdev") + } + + tmp := (*C.libxl_device_usbdev_type_union_hostdev)(unsafe.Pointer(&xc.u[0])) + x.Hostbus = byte(tmp.hostbus) + x.Hostaddr = byte(tmp.hostaddr) + return nil +} + +func (x *DeviceUsbdev) toC(xc *C.libxl_device_usbdev) (err error) { + defer func() { + if err != nil { + C.libxl_device_usbdev_dispose(xc) + } + }() + + xc.ctrl = C.libxl_devid(x.Ctrl) + xc.port = C.int(x.Port) + xc._type = C.libxl_usbdev_type(x.Type) + switch x.Type { + case UsbdevTypeHostdev: + tmp, ok := x.TypeUnion.(DeviceUsbdevTypeUnionHostdev) + if !ok { + return errors.New("wrong type for union key type") + } + var hostdev C.libxl_device_usbdev_type_union_hostdev + hostdev.hostbus = C.uint8_t(tmp.Hostbus) + hostdev.hostaddr = C.uint8_t(tmp.Hostaddr) + hostdevBytes := C.GoBytes(unsafe.Pointer(&hostdev), C.sizeof_libxl_device_usbdev_type_union_hostdev) + copy(xc.u[:], hostdevBytes) + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + + return nil +} + +// NewDeviceDtdev returns an instance of DeviceDtdev initialized with defaults. +func NewDeviceDtdev() (*DeviceDtdev, error) { + var ( + x DeviceDtdev + xc C.libxl_device_dtdev + ) + + C.libxl_device_dtdev_init(&xc) + defer C.libxl_device_dtdev_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceDtdev) fromC(xc *C.libxl_device_dtdev) error { + x.Path = C.GoString(xc.path) + + return nil +} + +func (x *DeviceDtdev) toC(xc *C.libxl_device_dtdev) (err error) { + defer func() { + if err != nil { + C.libxl_device_dtdev_dispose(xc) + } + }() + + if x.Path != "" { + xc.path = C.CString(x.Path) + } + + return nil +} + +// NewDeviceVtpm returns an instance of DeviceVtpm initialized with defaults. +func NewDeviceVtpm() (*DeviceVtpm, error) { + var ( + x DeviceVtpm + xc C.libxl_device_vtpm + ) + + C.libxl_device_vtpm_init(&xc) + defer C.libxl_device_vtpm_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVtpm) fromC(xc *C.libxl_device_vtpm) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + + return nil +} + +func (x *DeviceVtpm) toC(xc *C.libxl_device_vtpm) (err error) { + defer func() { + if err != nil { + C.libxl_device_vtpm_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + + return nil +} + +// NewDeviceP9 returns an instance of DeviceP9 initialized with defaults. +func NewDeviceP9() (*DeviceP9, error) { + var ( + x DeviceP9 + xc C.libxl_device_p9 + ) + + C.libxl_device_p9_init(&xc) + defer C.libxl_device_p9_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceP9) fromC(xc *C.libxl_device_p9) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Tag = C.GoString(xc.tag) + x.Path = C.GoString(xc.path) + x.SecurityModel = C.GoString(xc.security_model) + x.Devid = Devid(xc.devid) + + return nil +} + +func (x *DeviceP9) toC(xc *C.libxl_device_p9) (err error) { + defer func() { + if err != nil { + C.libxl_device_p9_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + if x.Tag != "" { + xc.tag = C.CString(x.Tag) + } + if x.Path != "" { + xc.path = C.CString(x.Path) + } + if x.SecurityModel != "" { + xc.security_model = C.CString(x.SecurityModel) + } + xc.devid = C.libxl_devid(x.Devid) + + return nil +} + +// NewDevicePvcallsif returns an instance of DevicePvcallsif initialized with defaults. +func NewDevicePvcallsif() (*DevicePvcallsif, error) { + var ( + x DevicePvcallsif + xc C.libxl_device_pvcallsif + ) + + C.libxl_device_pvcallsif_init(&xc) + defer C.libxl_device_pvcallsif_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DevicePvcallsif) fromC(xc *C.libxl_device_pvcallsif) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + + return nil +} + +func (x *DevicePvcallsif) toC(xc *C.libxl_device_pvcallsif) (err error) { + defer func() { + if err != nil { + C.libxl_device_pvcallsif_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + + return nil +} + +// NewDeviceChannel returns an instance of DeviceChannel initialized with defaults. +func NewDeviceChannel(connection ChannelConnection) (*DeviceChannel, error) { + var ( + x DeviceChannel + xc C.libxl_device_channel + ) + + C.libxl_device_channel_init(&xc) + C.libxl_device_channel_init_connection(&xc, C.libxl_channel_connection(connection)) + defer C.libxl_device_channel_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceChannel) fromC(xc *C.libxl_device_channel) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.Name = C.GoString(xc.name) + x.Connection = ChannelConnection(xc.connection) + switch x.Connection { + case ChannelConnectionUnknown: + x.ConnectionUnion = nil + case ChannelConnectionPty: + x.ConnectionUnion = nil + case ChannelConnectionSocket: + var connectionSocket DeviceChannelConnectionUnionSocket + if err := connectionSocket.fromC(xc); err != nil { + return fmt.Errorf("converting field connectionSocket: %v", err) + } + x.ConnectionUnion = connectionSocket + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +func (x *DeviceChannelConnectionUnionSocket) fromC(xc *C.libxl_device_channel) error { + if ChannelConnection(xc.connection) != ChannelConnectionSocket { + return errors.New("expected union key ChannelConnectionSocket") + } + + tmp := (*C.libxl_device_channel_connection_union_socket)(unsafe.Pointer(&xc.u[0])) + x.Path = C.GoString(tmp.path) + return nil +} + +func (x *DeviceChannel) toC(xc *C.libxl_device_channel) (err error) { + defer func() { + if err != nil { + C.libxl_device_channel_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + if x.Name != "" { + xc.name = C.CString(x.Name) + } + xc.connection = C.libxl_channel_connection(x.Connection) + switch x.Connection { + case ChannelConnectionUnknown: + break + case ChannelConnectionPty: + break + case ChannelConnectionSocket: + tmp, ok := x.ConnectionUnion.(DeviceChannelConnectionUnionSocket) + if !ok { + return errors.New("wrong type for union key connection") + } + var socket C.libxl_device_channel_connection_union_socket + if tmp.Path != "" { + socket.path = C.CString(tmp.Path) + } + socketBytes := C.GoBytes(unsafe.Pointer(&socket), C.sizeof_libxl_device_channel_connection_union_socket) + copy(xc.u[:], socketBytes) + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +// NewConnectorParam returns an instance of ConnectorParam initialized with defaults. +func NewConnectorParam() (*ConnectorParam, error) { + var ( + x ConnectorParam + xc C.libxl_connector_param + ) + + C.libxl_connector_param_init(&xc) + defer C.libxl_connector_param_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *ConnectorParam) fromC(xc *C.libxl_connector_param) error { + x.UniqueId = C.GoString(xc.unique_id) + x.Width = uint32(xc.width) + x.Height = uint32(xc.height) + + return nil +} + +func (x *ConnectorParam) toC(xc *C.libxl_connector_param) (err error) { + defer func() { + if err != nil { + C.libxl_connector_param_dispose(xc) + } + }() + + if x.UniqueId != "" { + xc.unique_id = C.CString(x.UniqueId) + } + xc.width = C.uint32_t(x.Width) + xc.height = C.uint32_t(x.Height) + + return nil +} + +// NewDeviceVdispl returns an instance of DeviceVdispl initialized with defaults. +func NewDeviceVdispl() (*DeviceVdispl, error) { + var ( + x DeviceVdispl + xc C.libxl_device_vdispl + ) + + C.libxl_device_vdispl_init(&xc) + defer C.libxl_device_vdispl_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVdispl) fromC(xc *C.libxl_device_vdispl) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.BeAlloc = bool(xc.be_alloc) + x.Connectors = nil + if n := int(xc.num_connectors); n > 0 { + cConnectors := (*[1 << 28]C.libxl_connector_param)(unsafe.Pointer(xc.connectors))[:n:n] + x.Connectors = make([]ConnectorParam, n) + for i, v := range cConnectors { + if err := x.Connectors[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Connectors: %v", err) + } + } + } + + return nil +} + +func (x *DeviceVdispl) toC(xc *C.libxl_device_vdispl) (err error) { + defer func() { + if err != nil { + C.libxl_device_vdispl_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + xc.be_alloc = C.bool(x.BeAlloc) + if numConnectors := len(x.Connectors); numConnectors > 0 { + xc.connectors = (*C.libxl_connector_param)(C.malloc(C.ulong(numConnectors) * C.sizeof_libxl_connector_param)) + xc.num_connectors = C.int(numConnectors) + cConnectors := (*[1 << 28]C.libxl_connector_param)(unsafe.Pointer(xc.connectors))[:numConnectors:numConnectors] + for i, v := range x.Connectors { + if err := v.toC(&cConnectors[i]); err != nil { + return fmt.Errorf("converting field Connectors: %v", err) + } + } + } + + return nil +} + +// NewVsndParams returns an instance of VsndParams initialized with defaults. +func NewVsndParams() (*VsndParams, error) { + var ( + x VsndParams + xc C.libxl_vsnd_params + ) + + C.libxl_vsnd_params_init(&xc) + defer C.libxl_vsnd_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VsndParams) fromC(xc *C.libxl_vsnd_params) error { + x.SampleRates = nil + if n := int(xc.num_sample_rates); n > 0 { + cSampleRates := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.sample_rates))[:n:n] + x.SampleRates = make([]uint32, n) + for i, v := range cSampleRates { + x.SampleRates[i] = uint32(v) + } + } + x.SampleFormats = nil + if n := int(xc.num_sample_formats); n > 0 { + cSampleFormats := (*[1 << 28]C.libxl_vsnd_pcm_format)(unsafe.Pointer(xc.sample_formats))[:n:n] + x.SampleFormats = make([]VsndPcmFormat, n) + for i, v := range cSampleFormats { + x.SampleFormats[i] = VsndPcmFormat(v) + } + } + x.ChannelsMin = uint32(xc.channels_min) + x.ChannelsMax = uint32(xc.channels_max) + x.BufferSize = uint32(xc.buffer_size) + + return nil +} + +func (x *VsndParams) toC(xc *C.libxl_vsnd_params) (err error) { + defer func() { + if err != nil { + C.libxl_vsnd_params_dispose(xc) + } + }() + + if numSampleRates := len(x.SampleRates); numSampleRates > 0 { + xc.sample_rates = (*C.uint32_t)(C.malloc(C.size_t(numSampleRates * numSampleRates))) + xc.num_sample_rates = C.int(numSampleRates) + cSampleRates := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.sample_rates))[:numSampleRates:numSampleRates] + for i, v := range x.SampleRates { + cSampleRates[i] = C.uint32_t(v) + } + } + if numSampleFormats := len(x.SampleFormats); numSampleFormats > 0 { + xc.sample_formats = (*C.libxl_vsnd_pcm_format)(C.malloc(C.size_t(numSampleFormats * numSampleFormats))) + xc.num_sample_formats = C.int(numSampleFormats) + cSampleFormats := (*[1 << 28]C.libxl_vsnd_pcm_format)(unsafe.Pointer(xc.sample_formats))[:numSampleFormats:numSampleFormats] + for i, v := range x.SampleFormats { + cSampleFormats[i] = C.libxl_vsnd_pcm_format(v) + } + } + xc.channels_min = C.uint32_t(x.ChannelsMin) + xc.channels_max = C.uint32_t(x.ChannelsMax) + xc.buffer_size = C.uint32_t(x.BufferSize) + + return nil +} From xen-changelog-bounces@lists.xenproject.org Wed May 13 12:44:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 12:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqkM-000139-4N; Wed, 13 May 2020 12:44:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqkL-000131-74 for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:25 +0000 X-Inumbo-ID: 79afa390-9517-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 79afa390-9517-11ea-9887-bc764e2007e4; Wed, 13 May 2020 12:44:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WLjSyEYnu91kISVg6ZLDb7K2MuQaC9eLW44DGy5KC+M=; b=Kcgsq7hTglOJnemzGplN6ZJWAx SKQIwSSLTSyRFCV6Z79YaKDlXqYrxAAqM6tAarmLpv1qrEAvn9i6KFPPmrKT4bELt6eKWqFFtYOiw bZgi6q/MOs0upCU0tebfCCV6StHZorJ7DafZgTXdh3WhQtCq8yLcOS+oEeT7Dugj2mhA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYqkK-0006PD-JC for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYqkK-0000wS-Hz for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 12:44:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang/xenlight: init xenlight go module Message-Id: Date: Wed, 13 May 2020 12:44:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9d83ad86834300927b636fa02b29d84854399ed8 Author: Nick Rosbrook AuthorDate: Tue May 12 20:58:06 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 13:41:57 2020 +0100 golang/xenlight: init xenlight go module Initialize the xenlight Go module using the xenbits git-http URL, xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight. Also simplify the build Make target by using `go build` instead of `go install`, and do not set GOPATH here because it is now unnecessary. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- tools/golang/xenlight/Makefile | 2 +- tools/golang/xenlight/go.mod | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 753132306a..37ed1358c4 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -33,7 +33,7 @@ $(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go types.gen.go helpers. # so that it can find the actual library. .PHONY: build build: package - CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_XENLIGHT) -L$(XEN_LIBXENTOOLLOG)" GOPATH=$(XEN_GOPATH) $(GO) install -x $(XEN_GOCODE_URL)/xenlight + CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_XENLIGHT) -L$(XEN_LIBXENTOOLLOG)" $(GO) build -x .PHONY: install install: build diff --git a/tools/golang/xenlight/go.mod b/tools/golang/xenlight/go.mod new file mode 100644 index 0000000000..926474d929 --- /dev/null +++ b/tools/golang/xenlight/go.mod @@ -0,0 +1 @@ +module xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 15:55:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 15:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYtiz-0002Ai-AJ; Wed, 13 May 2020 15:55:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYtiy-0002Ad-5y for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 15:55:12 +0000 X-Inumbo-ID: 1c8d5a7a-9532-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1c8d5a7a-9532-11ea-b07b-bc764e2007e4; Wed, 13 May 2020 15:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ux0tQQzRjBNnxQ4tK42VxaN47hvGpThaFvGKSx182Cc=; b=bigInnn09OAqD3LomJjaezTpeR jmILMbEt4ieU2FKKwh5/dJMQy2zLSK3qsbItCJL7rUmJORQwaiBiy296UrNSFem31XcAY6omI0hnO +/K5LBtqB2xFp8tW+yHg4htHxOxlty50U2FYnFdLvSOj83zpZxQqXtKyyz16jliwMNRg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYtiq-00025b-Od for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYtiq-0007sy-NV for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 15:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang/xenlight: add necessary module/package documentation Message-Id: Date: Wed, 13 May 2020 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 61be48dc029294275348443f78a5e600ef28274f Author: Nick Rosbrook AuthorDate: Wed May 13 10:18:19 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 16:06:21 2020 +0100 golang/xenlight: add necessary module/package documentation Add a README and package comment giving a brief overview of the package. These also help pkg.go.dev generate better documentation. Also, add a copy of the LGPL (the same license used by libxl) to tools/golang/xenlight. This is required for the package to be shown on pkg.go.dev and added to the default module proxy, proxy.golang.org. Finally, add an entry for the xenlight package to SUPPORT.md. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- SUPPORT.md | 6 + tools/golang/xenlight/LICENSE | 502 ++++++++++++++++++++++++++++++++++++++ tools/golang/xenlight/README.md | 28 +++ tools/golang/xenlight/xenlight.go | 2 + 4 files changed, 538 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index 7270c9b021..e3a366fd56 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -147,6 +147,12 @@ Output of information in machine-parseable JSON format Status: Supported +### xenlight Go package + +Go (golang) bindings for libxl + + Status: Experimental + ## Toolstack/3rd party ### libvirt driver for xl diff --git a/tools/golang/xenlight/LICENSE b/tools/golang/xenlight/LICENSE new file mode 100644 index 0000000000..4362b49151 --- /dev/null +++ b/tools/golang/xenlight/LICENSE @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/tools/golang/xenlight/README.md b/tools/golang/xenlight/README.md new file mode 100644 index 0000000000..a423a5600a --- /dev/null +++ b/tools/golang/xenlight/README.md @@ -0,0 +1,28 @@ +# xenlight + +## About + +The xenlight package provides Go bindings to Xen's libxl C library via cgo. +The package is currently in an unstable "experimental" state. This means +the package is ready for initial use and evaluation, but is not yet fully +functional. Namely, only a subset of libxl's API is implemented, and +breaking changes may occur in future package versions. + +Much of the package is generated using the libxl IDL. Changes to the +generated code can be made by modifying `tools/golang/xenlight/gengotypes.py` +in the xen.git tree. + +## Getting Started + +```go +import ( + "xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight" +) +``` + +The module is not yet tagged independently of xen.git; if you don’t specify +the version, you’ll get the most recent development version, which is +probably not what you want. A better option would be to specify a Xen +release tag; for instance: + + go get xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight@RELEASE-4.14.0. diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenlight.go index 742e5e11f1..b9189dec5c 100644 --- a/tools/golang/xenlight/xenlight.go +++ b/tools/golang/xenlight/xenlight.go @@ -14,6 +14,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; If not, see . */ + +// Package xenlight provides bindings to Xen's libxl C library. package xenlight /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 19:44:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 19:44:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIW-0005Mv-4C; Wed, 13 May 2020 19:44:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIU-0005Mo-C2 for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:06 +0000 X-Inumbo-ID: 1a2989c9-9552-11ea-a400-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1a2989c9-9552-11ea-a400-12813bfff9fa; Wed, 13 May 2020 19:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Z2dtqr4t30tAsafyLo0cJMAzt0wtKpmBwI4ImKqfdIo=; b=JOwLahswsDY9lfsgR4jpnGH0ML xQgWaZ25n/+dkC3BqE5wohYNa7K/bOgZuY4HaBGpPT0k79SbLbGSr2iYbGPn0Vx5x79kmptn27kNN SLNlYZD9VpvT21pR61SOHWD+nywO1xjRd/Soks6AI1RLl55UWgf9i6hjCQ1ZBHdhDyc8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIS-0007LW-L7 for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYxIS-0008Vj-J8 for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxc: Reduce feature handling complexity in xc_cpuid_apply_policy() Message-Id: Date: Wed, 13 May 2020 19:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d8a6a8b36d864e1e56d3c63b30892cbb4e55d65c Author: Andrew Cooper AuthorDate: Mon Mar 2 14:36:03 2020 +0000 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 tools/libxc: Reduce feature handling complexity in xc_cpuid_apply_policy() xc_cpuid_apply_policy() is gaining extra parameters to untangle CPUID complexity in Xen. While an improvement in general, it does have the unfortunate side effect of duplicating some settings across multiple parameters. Rearrange the logic to only consider 'pae' if no explicit featureset is provided. This reduces the complexity for callers who have already provided a pae setting in the featureset. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 7 +++++++ tools/libxc/xc_cpuid_x86.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 0a6ff93229..45ff7db1e8 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1798,6 +1798,13 @@ int xc_cpuid_set(xc_interface *xch, const unsigned int *input, const char **config, char **config_transformed); + +/* + * Make adjustments to the CPUID settings for a domain. + * + * Either pass a full new @featureset (and @nr_features), or adjust individual + * features (@pae). + */ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, const uint32_t *featureset, diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 5ced6d18b9..f045b03223 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -532,6 +532,11 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, cpuid_featureset_to_policy(feat, p); } + else + { + if ( di.hvm ) + p->basic.pae = pae; + } if ( !di.hvm ) { @@ -615,8 +620,6 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, break; } - p->basic.pae = pae; - /* * These settings are necessary to cause earlier HVM_PARAM_NESTEDHVM / * XEN_DOMCTL_disable_migrate settings to be reflected correctly in -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 19:44:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 19:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIe-0005NT-5s; Wed, 13 May 2020 19:44:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxId-0005NM-IT for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:15 +0000 X-Inumbo-ID: 20361516-9552-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 20361516-9552-11ea-ae69-bc764e2007e4; Wed, 13 May 2020 19:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RJ9+0nR0Cwfn7GXuHZvedn91c+r2ZbYW8d99KZHDR70=; b=ewZkPLjiMlz0R7d/l9m8GOddzG btW23pDiFeQmEHHsUHcJXZAJ2ludBKBz6+KpPc92ere9NMu8A9+BxsWeoRUaBIvRc/TUH9QOU9xIi gZzFcGHkHOh45gh+cTLlYoHuurK39VNhTdLdzjK64xXxzLA2MNedS4/aQ7iiujZalqTc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIc-0007LZ-OJ for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYxIc-0008WQ-Mr for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] stubdom: Use matching quotes in error message Message-Id: Date: Wed, 13 May 2020 19:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f3b0d25e343562dee29729cfaf32f8c79f8b6502 Author: Andrew Cooper AuthorDate: Wed May 13 13:07:53 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 stubdom: Use matching quotes in error message This prevents syntax highlighting from believing the rest of the file is a string. Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- stubdom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 8cf7131c6a..12aa211ac3 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -16,7 +16,7 @@ CFLAGS += -O1 -fno-omit-frame-pointer ifeq (,$(findstring clean,$(MAKECMDGOALS))) ifeq ($(wildcard $(MINI_OS)/Config.mk),) - $(error Please run `make mini-os-dir' in top-level directory) + $(error Please run 'make mini-os-dir' in top-level directory) endif include $(XEN_ROOT)/Config.mk endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 19:44:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 19:44:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIo-0005Ob-7T; Wed, 13 May 2020 19:44:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIn-0005OU-Dl for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:25 +0000 X-Inumbo-ID: 2636348c-9552-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2636348c-9552-11ea-b07b-bc764e2007e4; Wed, 13 May 2020 19:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Dt9haeQTeOYDSbBZ0qf4w0Pyw/+CVu+CcRmb5pEOHsA=; b=Gp1TT9FRMYZ0BB9NEA67Wrj/Tu 1I8HrOwd7jnm98NMczRLzHHSrukKAlw9j8ok1VpR5GzpCE1Q7P5fPSSrS3cN00dkaZtwERoEeB/B7 5r7XbNVFsxsv5ukZx4qM7qtslRf8JMW0mjssz73O05SAOSgW5dJt0dKIf/sNEzQ5CrD8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIm-0007Ll-RB for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYxIm-00005i-Q2 for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/guest: Fix assembler warnings with newer binutils Message-Id: Date: Wed, 13 May 2020 19:44:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9f74a7b66b0b03fe563779bb2c133051f1595ece Author: Andrew Cooper AuthorDate: Tue May 12 17:21:33 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/guest: Fix assembler warnings with newer binutils GAS of at least version 2.34 complains: hypercall_page.S: Assembler messages: hypercall_page.S:24: Warning: symbol 'HYPERCALL_set_trap_table' already has its type set ... hypercall_page.S:71: Warning: symbol 'HYPERCALL_arch_7' already has its type set which is because the whole page is declared as STT_OBJECT already. Rearrange .set with respect to .type in DECLARE_HYPERCALL() so STT_FUNC is already in place. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/guest/xen/hypercall_page.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S index 6485e9150e..9958d02cfd 100644 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ b/xen/arch/x86/guest/xen/hypercall_page.S @@ -17,9 +17,9 @@ GLOBAL(hypercall_page) */ #define DECLARE_HYPERCALL(name) \ .globl HYPERCALL_ ## name; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32; \ .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32 + .size HYPERCALL_ ## name, 32; \ + .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 DECLARE_HYPERCALL(set_trap_table) DECLARE_HYPERCALL(mmu_update) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 19:44:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 19:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIy-0005Pd-96; Wed, 13 May 2020 19:44:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIx-0005PV-Hx for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:35 +0000 X-Inumbo-ID: 2c3b025e-9552-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2c3b025e-9552-11ea-ae69-bc764e2007e4; Wed, 13 May 2020 19:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nOPrb4cuhRW7jyofkWXGjym6rppRXyWDJgjuPg8cUOw=; b=qeEAE6nBVuZMnUq2aFV9UKOskK sAFkxNqCYZCUgv12QDB9vjOshFLSukGzJ39jftjGpD+iFSSiKQVhYQZTws2u/EX7iXvSCcQDFRPRR li76KAEaknjTF7i8LnDQEf/19UTTFoSWLorl2+yur+JPvkl7y4/5UjPfMnqbugGWKISg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxIw-0007M0-UE for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYxIw-00006K-Sz for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/build32: Discard all orphaned sections Message-Id: Date: Wed, 13 May 2020 19:44:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 24f94fca23ad7c45806a1428331e1d602dfd8604 Author: Andrew Cooper AuthorDate: Tue May 12 19:18:37 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/build32: Discard all orphaned sections Linkers may put orphaned sections ahead of .text, which breaks the calling requirements. A concrete example is Ubuntu's GCC-9 default of enabling -fcf-protection which causes us to try and execute .note.gnu.properties during Xen's boot. Put .got.plt in its own section as it specifically needs preserving from the linkers point of view, and discard everything else. This will hopefully be more robust to other unexpected toolchain properties. Fixes boot from an Ubuntu build of Xen. Reported-by: Jason Andryuk Signed-off-by: Andrew Cooper Tested-by: Jason Andryuk Acked-by: Jan Beulich --- xen/arch/x86/boot/build32.lds | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/boot/build32.lds b/xen/arch/x86/boot/build32.lds index da35aee910..97454b40ff 100644 --- a/xen/arch/x86/boot/build32.lds +++ b/xen/arch/x86/boot/build32.lds @@ -31,7 +31,7 @@ SECTIONS *(.bss.*) } - /DISCARD/ : { + .got.plt : { /* * PIC/PIE executable contains .got.plt section even if it is not linked * with dynamic libraries. In such case it is just placeholder for @@ -47,6 +47,14 @@ SECTIONS * * Please check build32.mk for more details. */ - /* *(.got.plt) */ + *(.got.plt) + } + + /DISCARD/ : { + /* + * Discard everything else, to prevent linkers from putting + * orphaned sections ahead of .text, which needs to be first. + */ + *(*) } } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 19:44:46 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 19:44:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxJ8-0005RW-Ao; Wed, 13 May 2020 19:44:46 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxJ7-0005Qi-K2 for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:45 +0000 X-Inumbo-ID: 323a5998-9552-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 323a5998-9552-11ea-ae69-bc764e2007e4; Wed, 13 May 2020 19:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CK82S+UWpKVGthwg5q6duRi11xWiTSiaFnJR2iWzDAQ=; b=WooKEHgfofGWvl1jBl83EIOdqv wreZ51bpBF6tc+hfGZ4dOkZOl1BBOd6PvY1xatGLsHXK2vFf6H5NHZwTsAtoDGMbMwaLv5oBKhySt tjyXIddmwohGF/yaBnT/K+bojCCrjooV+kT0M+Ti3MAXeU7xAV0WghJpyM4VxKXnkizQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxJ7-0007MF-0q for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYxJ6-000070-Vt for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/build: move -fno-asynchronous-unwind-tables into EMBEDDED_EXTRA_CFLAGS Message-Id: Date: Wed, 13 May 2020 19:44:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1a47731115c2c8eb510e135fa48ed51ad2e94a26 Author: Andrew Cooper AuthorDate: Wed May 13 13:06:28 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/build: move -fno-asynchronous-unwind-tables into EMBEDDED_EXTRA_CFLAGS Users of EMBEDDED_EXTRA_CFLAGS already use -fno-asynchronous-unwind-tables, or ought to. This shrinks the size of the rombios 32bit stubs in guest memory. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- Config.mk | 2 +- tools/tests/x86_emulator/testcase.mk | 2 +- xen/arch/x86/arch.mk | 2 +- xen/arch/x86/boot/build32.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 3621162ae4..b0f16680f3 100644 --- a/Config.mk +++ b/Config.mk @@ -204,7 +204,7 @@ APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all -EMBEDDED_EXTRA_CFLAGS += -fno-exceptions +EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on diff --git a/tools/tests/x86_emulator/testcase.mk b/tools/tests/x86_emulator/testcase.mk index a565d15524..dafeb6caf7 100644 --- a/tools/tests/x86_emulator/testcase.mk +++ b/tools/tests/x86_emulator/testcase.mk @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) -CFLAGS += -fno-builtin -fno-asynchronous-unwind-tables -g0 $($(TESTCASE)-cflags) +CFLAGS += -fno-builtin -g0 $($(TESTCASE)-cflags) .PHONY: all all: $(TESTCASE).bin diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 2a51553edb..62b7c97007 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -56,7 +56,7 @@ $(call as-option-add,CFLAGS,CC,\ $(call as-option-add,CFLAGS,CC,\ ".L1: .L2: .nops (.L2 - .L1)$$(comma)9",-DHAVE_AS_NOPS_DIRECTIVE) -CFLAGS += -mno-red-zone -fpic -fno-asynchronous-unwind-tables +CFLAGS += -mno-red-zone -fpic # Xen doesn't use SSE interally. If the compiler supports it, also skip the # SSE setup for variadic function calls. diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index 48c7407c00..5851ebff5f 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -4,7 +4,7 @@ include $(XEN_ROOT)/Config.mk $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) -CFLAGS += -Werror -fno-asynchronous-unwind-tables -fno-builtin -g0 -msoft-float +CFLAGS += -Werror -fno-builtin -g0 -msoft-float CFLAGS += -I$(XEN_ROOT)/xen/include CFLAGS := $(filter-out -flto,$(CFLAGS)) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 13 19:44:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 13 May 2020 19:44:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxJI-0005Sa-CW; Wed, 13 May 2020 19:44:56 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxJI-0005SU-0a for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:56 +0000 X-Inumbo-ID: 383f2a1c-9552-11ea-a400-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 383f2a1c-9552-11ea-a400-12813bfff9fa; Wed, 13 May 2020 19:44:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vs5euCJQBTwHNsyBcoGqM8w+OEBW8XH37E7BEzfKzKM=; b=lKqvhd8FIdfl/+aPvPWTKABG/X dTYCBudBK5bGFeYbYohDg5Pog+YRem9MYfmcwMb1Ygn2TXBNoorPI7hz7x4QYcsT8kl8g15JPeR9X CUKhaBaSiTO04rX/fcM1P4RiQ6iBuMETz2wT7yzt5mn5edP9eKStNi+TeIWX88jnbasE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jYxJH-0007N2-45 for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jYxJH-00007h-2m for xen-changelog@lists.xenproject.org; Wed, 13 May 2020 19:44:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/build: Unilaterally disable -fcf-protection Message-Id: Date: Wed, 13 May 2020 19:44:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3a218961b16f1f4feb1147f56338faf1ac8f5703 Author: Andrew Cooper AuthorDate: Tue May 12 19:18:43 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/build: Unilaterally disable -fcf-protection Xen doesn't support CET-IBT yet. At a minimum, logic is required to enable it for supervisor use, but the livepatch functionality needs to learn not to overwrite ENDBR64 instructions. Furthermore, Ubuntu enables -fcf-protection by default, along with a buggy version of GCC-9 which objects to it in combination with -mindirect-branch=thunk-extern (Fixed in GCC 10, 9.4). Various objects (Xen boot path, Rombios 32 stubs) require .text to be at the beginning of the object. These paths explode when .note.gnu.properties gets put ahead of .text and we end up executing the notes data. Disable -fcf-protection for all embedded objects. Reported-by: Jason Andryuk Signed-off-by: Andrew Cooper Reviewed-by: Jason Andryuk Reviewed-by: Jan Beulich --- Config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Config.mk b/Config.mk index b0f16680f3..7d556aed30 100644 --- a/Config.mk +++ b/Config.mk @@ -205,6 +205,7 @@ APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables +EMBEDDED_EXTRA_CFLAGS += -fcf-protection=none XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 14 03:55:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 03:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xe-00064F-6c; Thu, 14 May 2020 03:55:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xd-000648-0u for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:05 +0000 X-Inumbo-ID: b0799d34-9596-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b0799d34-9596-11ea-b9cf-bc764e2007e4; Thu, 14 May 2020 03:55:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6Acxwz3Y3sd+QoAdM7F6UGhW9BzLJyDWmVOaYuDKsn0=; b=dVJZgiW27AHUMXmgIg6LS7AW9Q 2CKamnAYKzZyl6u7DK0vBT3W7utSkk7RMRK4aZDf/2IETFUhsZDJUoeJs6S21UJvCPzrZfijob4ao XvdpP/Egflr2Kj7wG201H8f4PEBnFc2vKskhW5n4c4MjmP871OJ12dujN2N0HwS5Do90=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xa-0002rQ-H0 for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZ4xa-0007bC-FM for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] docs/designs: re-work the xenstore migration document... Message-Id: Date: Thu, 14 May 2020 03:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 13dd372834a4398e01ded09d23549a037877c11d Author: Paul Durrant AuthorDate: Tue Apr 28 16:06:24 2020 +0100 Commit: Julien Grall CommitDate: Wed May 13 13:26:06 2020 +0100 docs/designs: re-work the xenstore migration document... ... to specify a separate migration stream that will also be suitable for live update. The original scope of the document was to support non-cooperative migration of guests [1] but, since then, live update of xenstored has been brought into scope. Thus it makes more sense to define a separate image format for serializing xenstore state that is suitable for both purposes. The document has been limited to specifying a new image format. The mechanism for acquiring the image for live update or migration is not covered as that is more appropriately dealt with by a patch to docs/misc/xenstore.txt. It is also expected that, when the first implementation of live update or migration making use of this specification is committed, that the document is moved from docs/designs into docs/specs. NOTE: It will only be necessary to save and restore state for active xenstore connections, but the documentation for 'RESUME' in xenstore.txt implies otherwise. That command is unused so this patch deletes it from the specification. [1] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/designs/non-cooperative-migration.md Signed-off-by: Paul Durrant Reviewed-by: Juergen Gross Acked-by: Julien Grall --- docs/designs/xenstore-migration.md | 469 ++++++++++++++++++++++++------------- docs/misc/xenstore.txt | 17 -- 2 files changed, 307 insertions(+), 179 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index 6ab351e8fe..34a2afd17e 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -3,254 +3,399 @@ ## Background The design for *Non-Cooperative Migration of Guests*[1] explains that extra -save records are required in the migrations stream to allow a guest running -PV drivers to be migrated without its co-operation. Moreover the save -records must include details of registered xenstore watches as well as -content; information that cannot currently be recovered from `xenstored`, -and hence some extension to the xenstore protocol[2] will also be required. - -The *libxenlight Domain Image Format* specification[3] already defines a -record type `EMULATOR_XENSTORE_DATA` but this is not suitable for -transferring xenstore data pertaining to the domain directly as it is -specified such that keys are relative to the path -`/local/domain/$dm_domid/device-model/$domid`. Thus it is necessary to -define at least one new save record type. +save records are required in the migrations stream to allow a guest running PV +drivers to be migrated without its co-operation. Moreover the save records must +include details of registered xenstore watches as well as content; information +that cannot currently be recovered from `xenstored`, and hence some extension +to the xenstored implementations will also be required. + +As a similar set of data is needed for transferring xenstore data from one +instance to another when live updating xenstored this document proposes an +image format for a 'migration stream' suitable for both purposes. ## Proposal -### New Save Record +The image format consists of a _header_ followed by 1 or more _records_. Each +record consists of a type and length field, followed by any data mandated by +the record type. At minimum there will be a single record of type `END` +(defined below). -A new mandatory record type should be defined within the libxenlight Domain -Image Format: +### Header -`0x00000007: DOMAIN_XENSTORE_DATA` +The header identifies the stream as a `xenstore` stream, including the version +of the specification that it complies with. -An arbitrary number of these records may be present in the migration -stream and may appear in any order. The format of each record should be as -follows: +All fields in this header must be in _big-endian_ byte order, regardless of +the setting of the endianness bit. ``` 0 1 2 3 4 5 6 7 octet +-------+-------+-------+-------+-------+-------+-------+-------+ -| type | record specific data | -+-------------------------------+ | -... -+---------------------------------------------------------------+ +| ident | ++-------------------------------+-------------------------------| +| version | flags | ++-------------------------------+-------------------------------+ ``` -where type is one of the following values +| Field | Description | +|-----------|---------------------------------------------------| +| `ident` | 0x78656e73746f7265 ('xenstore' in ASCII) | +| | | +| `version` | 0x00000001 (the version of the specification) | +| | | +| `flags` | 0 (LSB): Endianness: 0 = little, 1 = big | +| | | +| | 1-31: Reserved (must be zero) | -| Field | Description | -|--------|--------------------------------------------------| -| `type` | 0x00000000: invalid | -| | 0x00000001: NODE_DATA | -| | 0x00000002: WATCH_DATA | -| | 0x00000003: TRANSACTION_DATA | -| | 0x00000004 - 0xFFFFFFFF: reserved for future use | +### Records +Records immediately follow the header and have the following format: -and data is one of the record data formats described in the following -sections. + +``` + 0 1 2 3 4 5 6 7 octet ++-------+-------+-------+-------+-------+-------+-------+-------+ +| type | len | ++-------------------------------+-------------------------------+ +| body +... +| | padding (0 to 7 octets) | ++-------+-------------------------------------------------------+ +``` + +NOTE: padding octets here and in all subsequent format specifications must be + written as zero and should be ignored when the stream is read. -NOTE: The record data does not contain an overall length because the -libxenlight record header specifies the length. +| Field | Description | +|--------|------------------------------------------------------| +| `type` | 0x00000000: END | +| | 0x00000001: GLOBAL_DATA | +| | 0x00000002: CONNECTION_DATA | +| | 0x00000003: WATCH_DATA | +| | 0x00000004: TRANSACTION_DATA | +| | 0x00000005: NODE_DATA | +| | 0x00000006 - 0xFFFFFFFF: reserved for future use | +| | | +| `len` | The length (in octets) of `body` | +| | | +| `body` | The type-specific record data | +Some records will depend on other records in the migration stream. Records +upon which other records depend must always appear earlier in the stream. -**NODE_DATA** +The various formats of the type-specific data are described in the following +sections: +\pagebreak -Each NODE_DATA record specifies a single node in xenstore and is formatted -as follows: +### END +The end record marks the end of the image, and is the final record +in the stream. ``` - 0 1 2 3 octet -+-------+-------+-------+-------+ -| NODE_DATA | -+-------------------------------+ -| path length | -+-------------------------------+ -| path data | -... -| pad (0 to 3 octets) | -+-------------------------------+ -| perm count (N) | -+-------------------------------+ -| perm0 | -+-------------------------------+ -... -+-------------------------------+ -| permN | -+-------------------------------+ -| value length | -+-------------------------------+ -| value data | -... -| pad (0 to 3 octets) | -+-------------------------------+ + 0 1 2 3 4 5 6 7 octet ++-------+-------+-------+-------+-------+-------+-------+-------+ ``` -where perm0..N are formatted as follows: +The end record contains no fields; its body length is 0. + +\pagebreak + +### GLOBAL_DATA + +This record is only relevant for live update. It contains details of global +xenstored state that needs to be restored. ``` - 0 1 2 3 octet + 0 1 2 3 octet +-------+-------+-------+-------+ -| perm | pad | domid | +| rw-socket-fd | ++-------------------------------+ +| ro-socket-fd | +-------------------------------+ ``` -path length and value length are specified in octets (excluding the NUL -terminator of the path). perm should be one of the ASCII values `w`, `r`, -`b` or `n` as described in [2]. All pad values should be 0. -All paths should be absolute (i.e. start with `/`) and as described in -[2]. +| Field | Description | +|----------------|----------------------------------------------| +| `rw-socket-fd` | The file descriptor of the socket accepting | +| | read-write connections | +| | | +| `ro-socket-fd` | The file descriptor of the socket accepting | +| | read-only connections | + +xenstored will resume in the original process context. Hence `rw-socket-fd` and +`ro-socket-fd` simply specify the file descriptors of the sockets. Sockets +are not always used, however, and so -1 will be used to denote an unused +socket. -**WATCH_DATA** +\pagebreak +### CONNECTION_DATA -Each WATCH_DATA record specifies a registered watch and is formatted as -follows: +For live update the image format will contain a `CONNECTION_DATA` record for +each connection to xenstore. For migration it will only contain a record for +the domain being migrated. ``` - 0 1 2 3 octet -+-------+-------+-------+-------+ -| WATCH_DATA | -+-------------------------------+ -| wpath length | -+-------------------------------+ -| wpath data | -... -| pad (0 to 3 octets) | -+-------------------------------+ + 0 1 2 3 4 5 6 7 octet ++-------+-------+-------+-------+-------+-------+-------+-------+ +| conn-id | conn-type | conn-spec ... ++-------------------------------+-------------------------------+ +| data-len | data +-------------------------------+ -| token length | -+-------------------------------+ -| token data | ... -| pad (0 to 3 octets) | -+-------------------------------+ ``` -wpath length and token length are specified in octets (excluding the NUL -terminator). The wpath should be as described for the `WATCH` operation in -[2]. The token is an arbitrary string of octets not containing any NUL -values. +| Field | Description | +|-------------|-------------------------------------------------| +| `conn-id` | A non-zero number used to identify this | +| | connection in subsequent connection-specific | +| | records | +| | | +| `conn-type` | 0x0000: shared ring | +| | 0x0001: socket | +| | 0x0002 - 0xFFFF: reserved for future use | +| | | +| `conn-spec` | See below | +| | | +| `data-len` | The length (in octets) of any pending data not | +| | yet written to the connection | +| | | +| `data` | Pending data (may be empty) | -**TRANSACTION_DATA** +The format of `conn-spec` is dependent upon `conn-type`. +\pagebreak -Each TRANSACTION_DATA record specifies an open transaction and is formatted -as follows: +For `shared ring` connections it is as follows: ``` - 0 1 2 3 octet -+-------+-------+-------+-------+ -| TRANSACTION_DATA | -+-------------------------------+ -| tx_id | -+-------------------------------+ + 0 1 2 3 4 5 6 7 octet + +-------+-------+ + | flags | ++---------------+---------------+---------------+---------------+ +| domid | tdomid | evtchn | ++-------------------------------+-------------------------------+ ``` -where tx_id is the non-zero identifier values of an open transaction. +| Field | Description | +|-----------|---------------------------------------------------| +| `domid` | The domain-id that owns the shared page | +| | | +| `tdomid` | The domain-id that `domid` acts on behalf of if | +| | it has been subject to an SET_TARGET | +| | operation [2] or DOMID_INVALID [3] otherwise | +| | | +| `flags` | Must be zero | +| | | +| `evtchn` | The port number of the interdomain channel used | +| | by `domid` to communicate with xenstored | +| | | -### Protocol Extension +Since the ABI guarantees that entry 1 in `domid`'s grant table will always +contain the GFN of the shared page. -Before xenstore state is migrated it is necessary to wait for any pending -reads, writes, watch registrations etc. to complete, and also to make sure -that xenstored does not start processing any new requests (so that new -requests remain pending on the shared ring for subsequent processing on the -new host). Hence the following operation is needed: +For `socket` connections it is as follows: -``` -QUIESCE | -Complete processing of any request issued by the specified domain, and -do not process any further requests from the shared ring. +``` + +-------+-------+ + | flags | ++---------------+---------------+---------------+---------------+ +| socket-fd | pad | ++-------------------------------+-------------------------------+ ``` -The `WATCH` operation does not allow specification of a ``; it is -assumed that the watch pertains to the domain that owns the shared ring -over which the operation is passed. Hence, for the tool-stack to be able -to register a watch on behalf of a domain a new operation is needed: -``` -ADD_DOMAIN_WATCHES ||+ +| Field | Description | +|-------------|-------------------------------------------------| +| `flags` | A bit-wise OR of: | +| | 0001: read-only | +| | | +| `socket-fd` | The file descriptor of the connected socket | -Adds watches on behalf of the specified domain. +This type of connection is only relevant for live update, where the xenstored +resumes in the original process context. Hence `socket-fd` simply specify +the file descriptor of the socket connection. - is a NUL separated tuple of |. The semantics of this -operation are identical to the domain issuing WATCH || for -each . -``` +\pagebreak + +### WATCH_DATA + +The image format will contain a `WATCH_DATA` record for each watch registered +by a connection for which there is `CONNECTION_DATA` record previously present. -The watch information for a domain also needs to be extracted from the -sending xenstored so the following operation is also needed: ``` -GET_DOMAIN_WATCHES | ||* + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++---------------+---------------+ +| wpath-len | token-len | ++---------------+---------------+ +| wpath +... +| token +... +``` + + +| Field | Description | +|-------------|-------------------------------------------------| +| `conn-id` | The connection that issued the `WATCH` | +| | operation [2] | +| | | +| `wpath-len` | The length (in octets) of `wpath` including the | +| | NUL terminator | +| | | +| `token-len` | The length (in octets) of `token` including the | +| | NUL terminator | +| | | +| `wpath` | The watch path, as specified in the `WATCH` | +| | operation | +| | | +| `token` | The watch identifier token, as specified in the | +| | `WATCH` operation | + +\pagebreak -Gets the list of watches that are currently registered for the domain. +### TRANSACTION_DATA - is a NUL separated tuple of |. The sub-list returned -will start at items into the the overall list of watches and may -be truncated (at a boundary) such that the returned data fits -within XENSTORE_PAYLOAD_MAX. +The image format will contain a `TRANSACTION_DATA` record for each transaction +that is pending on a connection for which there is `CONNECTION_DATA` record +previously present. -If is beyond the end of the overall list then the returned sub- -list will be empty. If the value of changes then it indicates -that the overall watch list has changed and thus it may be necessary -to re-issue the operation for previous values of . + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++-------------------------------+ +| tx-id | ++-------------------------------+ ``` -To deal with transactions that were pending when the domain is migrated -it is necessary to start transactions with the same tx_id on behalf of the -domain in the receiving xenstored. -NOTE: For safety each such transaction should result in an `EAGAIN` when -the `TRANSACTION_END` operation is performed, as modifications made under -the tx_id will not be part of the migration stream. +| Field | Description | +|----------------|----------------------------------------------| +| `conn-id` | The connection that issued the | +| | `TRANSACTION_START` operation [2] | +| | | +| `tx-id` | The transaction id passed back to the domain | +| | by the `TRANSACTION_START` operation | -The `TRANSACTION_START` operation does not allow specification of a -``; it is assumed that the transaction pertains to the domain that -owns the shared ring over which the operation is passed. Neither does it -allow a `` to be specified; it is always chosen by xenstored. -Hence, for the tool-stack to be able to open a transaction on behalf of a -domain a new operation is needed: +\pagebreak +### NODE_DATA + +For live update the image format will contain a `NODE_DATA` record for each +node in xenstore. For migration it will only contain a record for the nodes +relating to the domain being migrated. The `NODE_DATA` may be related to +a _committed_ node (globally visible in xenstored) or a _pending_ node (created +or modified by a transaction for which there is also a `TRANSACTION_DATA` +record previously present). + + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| conn-id | ++-------------------------------+ +| tx-id | ++---------------+---------------+ +| path-len | value-len | ++---------------+---------------+ +| access | perm-count | ++---------------+---------------+ +| perm1 | ++-------------------------------+ +... ++-------------------------------+ +| permN | ++---------------+---------------+ +| path +... +| value +... ``` -START_DOMAIN_TRANSACTION || -Starts a transaction on behalf of a domain. -The semantics of this are similar to the domain issuing -TRANSACTION_START and receiving the specified as the response. -The main difference is that the transaction will be immediately marked as -'conflicting' such that when the domain issues TRANSACTION_END T|, it will -result in EAGAIN. +| Field | Description | +|--------------|------------------------------------------------| +| `conn-id` | If this value is non-zero then this record | +| | related to a pending transaction | +| | | +| `tx-id` | This value should be ignored if `conn-id` is | +| | zero. Otherwise it specifies the id of the | +| | pending transaction | +| | | +| `path-len` | The length (in octets) of `path` including the | +| | NUL terminator | +| | | +| `value-len` | The length (in octets) of `value` (which will | +| | be zero for a deleted node) | +| | | +| `access` | This value should be ignored if this record | +| | does not relate to a pending transaction, | +| | otherwise it specifies the accesses made to | +| | the node and hence is a bitwise OR of: | +| | | +| | 0x0001: read | +| | 0x0002: written | +| | | +| | The value will be zero for a deleted node | +| | | +| `perm-count` | The number (N) of node permission specifiers | +| | (which will be 0 for a node deleted in a | +| | pending transaction) | +| | | +| `perm1..N` | A list of zero or more node permission | +| | specifiers (see below) | +| | | +| `path` | The absolute path of the node | +| | | +| `value` | The node value (which may be empty or contain | +| | NUL octets) | + + +A node permission specifier has the following format: + + +``` + 0 1 2 3 octet ++-------+-------+-------+-------+ +| perm | pad | domid | ++-------+-------+---------------+ ``` -It may also be desirable to state in the protocol specification that -the `INTRODUCE` operation should not clear the `` specified such that -a `RELEASE` operation followed by an `INTRODUCE` operation form an -idempotent pair. The current implementation of *C xentored* does this -(in the `domain_conn_reset()` function) but this could be dropped as this -behaviour is not currently specified and the page will always be zeroed -for a newly created domain. +| Field | Description | +|---------|-----------------------------------------------------| +| `perm` | One of the ASCII values `w`, `r`, `b` or `n` as | +| | specified for the `SET_PERMS` operation [2] | +| | | +| `domid` | The domain-id to which the permission relates | +Note that perm1 defines the domain owning the code. See [4] for more +explanation of node permissions. * * * [1] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/designs/non-cooperative-migration.md + [2] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/misc/xenstore.txt -[3] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=docs/specs/libxl-migration-stream.pandoc + +[3] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=xen/include/public/xen.h;hb=HEAD#l612 + +[4] https://wiki.xen.org/wiki/XenBus \ No newline at end of file diff --git a/docs/misc/xenstore.txt b/docs/misc/xenstore.txt index 04ce0ba607..cb8009cb68 100644 --- a/docs/misc/xenstore.txt +++ b/docs/misc/xenstore.txt @@ -289,23 +289,6 @@ IS_DOMAIN_INTRODUCED | T| or F| ie, if INTRODUCE for the domain has not yet been followed by domain destruction or explicit RELEASE. -RESUME | - - Arranges that @releaseDomain events will once more be - generated when the domain becomes shut down. This might have - to be used if a domain were to be shut down (generating one - @releaseDomain) and then subsequently restarted, since the - state-sensitive algorithm in xenstored will not otherwise send - further watch event notifications if the domain were to be - shut down again. - - It is not clear whether this is possible since one would - normally expect a domain not to be restarted after being shut - down without being destroyed in the meantime. There are - currently no users of this request in xen-unstable. - - xenstored prevents the use of RESUME other than by dom0. - SET_TARGET || Notifies xenstored that domain is targeting domain . This grants domain full access to paths -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 14 03:55:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 03:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xn-00065K-9z; Thu, 14 May 2020 03:55:15 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xm-00065E-Dn for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:14 +0000 X-Inumbo-ID: b6751c4a-9596-11ea-a444-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b6751c4a-9596-11ea-a444-12813bfff9fa; Thu, 14 May 2020 03:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pPRSdSyZdfV/tDB0NSlsUtzZJxG8oU+jld9DOHr0YVk=; b=p17QrSLWip720MMkrzSLhMCgNK 8xhyEgBa7rgr4Axhvo6c/iagFPCxWNw7qid0GEOL3HynHbeELq0K+vuWRyTvq7ItxR7NQ5dnLvezY FW1kDZCAkpdc8dO0b13FUw7a68rZ75g8RpOvQC9CkBM5DbsHVhqfzSR59jvQY+F0Y8Ws=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xk-0002sA-KX for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZ4xk-0007bo-J4 for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang/xenlight: add NameToDomid and DomidToName util functions Message-Id: Date: Thu, 14 May 2020 03:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7a060a393d9a9cdfdb15dc6616559a06942a8459 Author: Nick Rosbrook AuthorDate: Tue May 12 20:55:50 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 13:41:56 2020 +0100 golang/xenlight: add NameToDomid and DomidToName util functions Many exported functions in xenlight require a domid as an argument. Make it easier for package users to use these functions by adding wrappers for the libxl utility functions libxl_name_to_domid and libxl_domid_to_name. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- tools/golang/xenlight/xenlight.go | 40 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenlight.go index 6b4f492550..742e5e11f1 100644 --- a/tools/golang/xenlight/xenlight.go +++ b/tools/golang/xenlight/xenlight.go @@ -21,13 +21,15 @@ package xenlight #cgo LDFLAGS: -lxenlight -lyajl -lxentoollog #include #include +#include + +#define INVALID_DOMID_TYPED ((uint32_t) INVALID_DOMID) static const libxl_childproc_hooks childproc_hooks = { .chldowner = libxl_sigchld_owner_mainloop }; void xenlight_set_chldproc(libxl_ctx *ctx) { libxl_childproc_setmode(ctx, &childproc_hooks, NULL); } - */ import "C" @@ -75,6 +77,10 @@ var libxlErrors = map[Error]string{ ErrorFeatureRemoved: "Feature removed", } +const ( + DomidInvalid Domid = Domid(C.INVALID_DOMID_TYPED) +) + func (e Error) Error() string { if s, ok := libxlErrors[e]; ok { return s @@ -190,6 +196,38 @@ func (ctx *Context) Close() error { type Domid uint32 +// NameToDomid returns the Domid for a domain, given its name, if it exists. +// +// NameToDomid does not guarantee that the domid associated with name at +// the time NameToDomid is called is the same as the domid associated with +// name at the time NameToDomid returns. +func (Ctx *Context) NameToDomid(name string) (Domid, error) { + var domid C.uint32_t + + cname := C.CString(name) + defer C.free(unsafe.Pointer(cname)) + + if ret := C.libxl_name_to_domid(Ctx.ctx, cname, &domid); ret != 0 { + return DomidInvalid, Error(ret) + } + + return Domid(domid), nil +} + +// DomidToName returns the name for a domain, given its domid. If there +// is no domain with the given domid, DomidToName will return the empty +// string. +// +// DomidToName does not guarantee that the name (if any) associated with domid +// at the time DomidToName is called is the same as the name (if any) associated +// with domid at the time DomidToName returns. +func (Ctx *Context) DomidToName(domid Domid) string { + cname := C.libxl_domid_to_name(Ctx.ctx, C.uint32_t(domid)) + defer C.free(unsafe.Pointer(cname)) + + return C.GoString(cname) +} + // Devid is a device ID. type Devid int -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 14 03:55:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 03:55:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4y0-00066d-C0; Thu, 14 May 2020 03:55:28 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xz-00066Y-Ml for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:27 +0000 X-Inumbo-ID: bc7b7f80-9596-11ea-a444-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bc7b7f80-9596-11ea-a444-12813bfff9fa; Thu, 14 May 2020 03:55:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xW/TcmmlD7gzB4fWVv0/t795l2yzLHwCzlCI7cnjF0s=; b=uR1sjiDqbXWj61pE2w/0t5YUDj sCR2oCCE3GQYGwESaufgdBD3W/gwYA+zo2qBfyzzXHlSrpmG6z7tgXfZGQvwsNEu3Y14S3ScOpTok pbifd1mUJjDNd0MU6o6z7PPoJqBmN0HGOdMUD+TrkdobMLdswcGCO9PjEnaBRm24A+vI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4xu-0002sP-Ns for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZ4xu-0007cO-MY for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang/xenlight: re-track generated go code Message-Id: Date: Thu, 14 May 2020 03:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ab2b8799e90cb9f3306cf2cf8e5336992240e8a3 Author: Nick Rosbrook AuthorDate: Tue May 12 20:58:05 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 13:41:57 2020 +0100 golang/xenlight: re-track generated go code Commit df669de074c395a3b2eeb975fddd3da4c148da13 un-tracked the generated Go code, but it was decided that we actually keep the generated code in-tree. Undo the changes to ignore the generated code, and re-generate it. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- .gitignore | 3 - .hgignore | 2 - tools/golang/xenlight/Makefile | 1 - tools/golang/xenlight/helpers.gen.go | 4728 ++++++++++++++++++++++++++++++++++ tools/golang/xenlight/types.gen.go | 1226 +++++++++ 5 files changed, 5954 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9c8a31f896..bfa53723b3 100644 --- a/.gitignore +++ b/.gitignore @@ -406,9 +406,6 @@ tools/xenstore/xenstore-watch tools/xl/_paths.h tools/xl/xl -tools/golang/src -tools/golang/*/*.gen.go - docs/txt/misc/*.txt docs/txt/man/*.txt docs/figs/*.png diff --git a/.hgignore b/.hgignore index 2ec52982e1..2d41670632 100644 --- a/.hgignore +++ b/.hgignore @@ -282,8 +282,6 @@ ^tools/ocaml/test/xtl$ ^tools/ocaml/test/send_debug_keys$ ^tools/ocaml/test/list_domains$ -^tools/golang/src$ -^tools/golang/.*/.*\.gen\.go$ ^tools/autom4te\.cache$ ^tools/config\.h$ ^tools/config\.log$ diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 144c133ced..753132306a 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -49,7 +49,6 @@ install: build clean: $(RM) -r $(XEN_GOPATH)$(GOXL_PKG_DIR) $(RM) $(XEN_GOPATH)/pkg/*/$(XEN_GOCODE_URL)/xenlight.a - $(RM) *.gen.go .PHONY: distclean distclean: clean diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go new file mode 100644 index 0000000000..109e9515a2 --- /dev/null +++ b/tools/golang/xenlight/helpers.gen.go @@ -0,0 +1,4728 @@ +// DO NOT EDIT. +// +// This file is generated by: +// gengotypes.py ../../libxl/libxl_types.idl +// +package xenlight + +import ( + "errors" + "fmt" + "unsafe" +) + +/* +#cgo LDFLAGS: -lxenlight +#include +#include + +typedef typeof(((struct libxl_channelinfo *)NULL)->u.pty)libxl_channelinfo_connection_union_pty; +typedef typeof(((struct libxl_domain_build_info *)NULL)->u.hvm)libxl_domain_build_info_type_union_hvm; +typedef typeof(((struct libxl_domain_build_info *)NULL)->u.pv)libxl_domain_build_info_type_union_pv; +typedef typeof(((struct libxl_domain_build_info *)NULL)->u.pvh)libxl_domain_build_info_type_union_pvh; +typedef typeof(((struct libxl_device_usbdev *)NULL)->u.hostdev)libxl_device_usbdev_type_union_hostdev; +typedef typeof(((struct libxl_device_channel *)NULL)->u.socket)libxl_device_channel_connection_union_socket; +typedef typeof(((struct libxl_event *)NULL)->u.domain_shutdown)libxl_event_type_union_domain_shutdown; +typedef typeof(((struct libxl_event *)NULL)->u.disk_eject)libxl_event_type_union_disk_eject; +typedef typeof(((struct libxl_event *)NULL)->u.operation_complete)libxl_event_type_union_operation_complete; +typedef typeof(((struct libxl_psr_hw_info *)NULL)->u.cat)libxl_psr_hw_info_type_union_cat; +typedef typeof(((struct libxl_psr_hw_info *)NULL)->u.mba)libxl_psr_hw_info_type_union_mba; +*/ +import "C" + +// NewIoportRange returns an instance of IoportRange initialized with defaults. +func NewIoportRange() (*IoportRange, error) { + var ( + x IoportRange + xc C.libxl_ioport_range + ) + + C.libxl_ioport_range_init(&xc) + defer C.libxl_ioport_range_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *IoportRange) fromC(xc *C.libxl_ioport_range) error { + x.First = uint32(xc.first) + x.Number = uint32(xc.number) + + return nil +} + +func (x *IoportRange) toC(xc *C.libxl_ioport_range) (err error) { + defer func() { + if err != nil { + C.libxl_ioport_range_dispose(xc) + } + }() + + xc.first = C.uint32_t(x.First) + xc.number = C.uint32_t(x.Number) + + return nil +} + +// NewIomemRange returns an instance of IomemRange initialized with defaults. +func NewIomemRange() (*IomemRange, error) { + var ( + x IomemRange + xc C.libxl_iomem_range + ) + + C.libxl_iomem_range_init(&xc) + defer C.libxl_iomem_range_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *IomemRange) fromC(xc *C.libxl_iomem_range) error { + x.Start = uint64(xc.start) + x.Number = uint64(xc.number) + x.Gfn = uint64(xc.gfn) + + return nil +} + +func (x *IomemRange) toC(xc *C.libxl_iomem_range) (err error) { + defer func() { + if err != nil { + C.libxl_iomem_range_dispose(xc) + } + }() + + xc.start = C.uint64_t(x.Start) + xc.number = C.uint64_t(x.Number) + xc.gfn = C.uint64_t(x.Gfn) + + return nil +} + +// NewVgaInterfaceInfo returns an instance of VgaInterfaceInfo initialized with defaults. +func NewVgaInterfaceInfo() (*VgaInterfaceInfo, error) { + var ( + x VgaInterfaceInfo + xc C.libxl_vga_interface_info + ) + + C.libxl_vga_interface_info_init(&xc) + defer C.libxl_vga_interface_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VgaInterfaceInfo) fromC(xc *C.libxl_vga_interface_info) error { + x.Kind = VgaInterfaceType(xc.kind) + + return nil +} + +func (x *VgaInterfaceInfo) toC(xc *C.libxl_vga_interface_info) (err error) { + defer func() { + if err != nil { + C.libxl_vga_interface_info_dispose(xc) + } + }() + + xc.kind = C.libxl_vga_interface_type(x.Kind) + + return nil +} + +// NewVncInfo returns an instance of VncInfo initialized with defaults. +func NewVncInfo() (*VncInfo, error) { + var ( + x VncInfo + xc C.libxl_vnc_info + ) + + C.libxl_vnc_info_init(&xc) + defer C.libxl_vnc_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VncInfo) fromC(xc *C.libxl_vnc_info) error { + if err := x.Enable.fromC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + x.Listen = C.GoString(xc.listen) + x.Passwd = C.GoString(xc.passwd) + x.Display = int(xc.display) + if err := x.Findunused.fromC(&xc.findunused); err != nil { + return fmt.Errorf("converting field Findunused: %v", err) + } + + return nil +} + +func (x *VncInfo) toC(xc *C.libxl_vnc_info) (err error) { + defer func() { + if err != nil { + C.libxl_vnc_info_dispose(xc) + } + }() + + if err := x.Enable.toC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + if x.Listen != "" { + xc.listen = C.CString(x.Listen) + } + if x.Passwd != "" { + xc.passwd = C.CString(x.Passwd) + } + xc.display = C.int(x.Display) + if err := x.Findunused.toC(&xc.findunused); err != nil { + return fmt.Errorf("converting field Findunused: %v", err) + } + + return nil +} + +// NewSpiceInfo returns an instance of SpiceInfo initialized with defaults. +func NewSpiceInfo() (*SpiceInfo, error) { + var ( + x SpiceInfo + xc C.libxl_spice_info + ) + + C.libxl_spice_info_init(&xc) + defer C.libxl_spice_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *SpiceInfo) fromC(xc *C.libxl_spice_info) error { + if err := x.Enable.fromC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + x.Port = int(xc.port) + x.TlsPort = int(xc.tls_port) + x.Host = C.GoString(xc.host) + if err := x.DisableTicketing.fromC(&xc.disable_ticketing); err != nil { + return fmt.Errorf("converting field DisableTicketing: %v", err) + } + x.Passwd = C.GoString(xc.passwd) + if err := x.AgentMouse.fromC(&xc.agent_mouse); err != nil { + return fmt.Errorf("converting field AgentMouse: %v", err) + } + if err := x.Vdagent.fromC(&xc.vdagent); err != nil { + return fmt.Errorf("converting field Vdagent: %v", err) + } + if err := x.ClipboardSharing.fromC(&xc.clipboard_sharing); err != nil { + return fmt.Errorf("converting field ClipboardSharing: %v", err) + } + x.Usbredirection = int(xc.usbredirection) + x.ImageCompression = C.GoString(xc.image_compression) + x.StreamingVideo = C.GoString(xc.streaming_video) + + return nil +} + +func (x *SpiceInfo) toC(xc *C.libxl_spice_info) (err error) { + defer func() { + if err != nil { + C.libxl_spice_info_dispose(xc) + } + }() + + if err := x.Enable.toC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + xc.port = C.int(x.Port) + xc.tls_port = C.int(x.TlsPort) + if x.Host != "" { + xc.host = C.CString(x.Host) + } + if err := x.DisableTicketing.toC(&xc.disable_ticketing); err != nil { + return fmt.Errorf("converting field DisableTicketing: %v", err) + } + if x.Passwd != "" { + xc.passwd = C.CString(x.Passwd) + } + if err := x.AgentMouse.toC(&xc.agent_mouse); err != nil { + return fmt.Errorf("converting field AgentMouse: %v", err) + } + if err := x.Vdagent.toC(&xc.vdagent); err != nil { + return fmt.Errorf("converting field Vdagent: %v", err) + } + if err := x.ClipboardSharing.toC(&xc.clipboard_sharing); err != nil { + return fmt.Errorf("converting field ClipboardSharing: %v", err) + } + xc.usbredirection = C.int(x.Usbredirection) + if x.ImageCompression != "" { + xc.image_compression = C.CString(x.ImageCompression) + } + if x.StreamingVideo != "" { + xc.streaming_video = C.CString(x.StreamingVideo) + } + + return nil +} + +// NewSdlInfo returns an instance of SdlInfo initialized with defaults. +func NewSdlInfo() (*SdlInfo, error) { + var ( + x SdlInfo + xc C.libxl_sdl_info + ) + + C.libxl_sdl_info_init(&xc) + defer C.libxl_sdl_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *SdlInfo) fromC(xc *C.libxl_sdl_info) error { + if err := x.Enable.fromC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + if err := x.Opengl.fromC(&xc.opengl); err != nil { + return fmt.Errorf("converting field Opengl: %v", err) + } + x.Display = C.GoString(xc.display) + x.Xauthority = C.GoString(xc.xauthority) + + return nil +} + +func (x *SdlInfo) toC(xc *C.libxl_sdl_info) (err error) { + defer func() { + if err != nil { + C.libxl_sdl_info_dispose(xc) + } + }() + + if err := x.Enable.toC(&xc.enable); err != nil { + return fmt.Errorf("converting field Enable: %v", err) + } + if err := x.Opengl.toC(&xc.opengl); err != nil { + return fmt.Errorf("converting field Opengl: %v", err) + } + if x.Display != "" { + xc.display = C.CString(x.Display) + } + if x.Xauthority != "" { + xc.xauthority = C.CString(x.Xauthority) + } + + return nil +} + +// NewDominfo returns an instance of Dominfo initialized with defaults. +func NewDominfo() (*Dominfo, error) { + var ( + x Dominfo + xc C.libxl_dominfo + ) + + C.libxl_dominfo_init(&xc) + defer C.libxl_dominfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Dominfo) fromC(xc *C.libxl_dominfo) error { + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + x.Domid = Domid(xc.domid) + x.Ssidref = uint32(xc.ssidref) + x.SsidLabel = C.GoString(xc.ssid_label) + x.Running = bool(xc.running) + x.Blocked = bool(xc.blocked) + x.Paused = bool(xc.paused) + x.Shutdown = bool(xc.shutdown) + x.Dying = bool(xc.dying) + x.NeverStop = bool(xc.never_stop) + x.ShutdownReason = ShutdownReason(xc.shutdown_reason) + x.OutstandingMemkb = uint64(xc.outstanding_memkb) + x.CurrentMemkb = uint64(xc.current_memkb) + x.SharedMemkb = uint64(xc.shared_memkb) + x.PagedMemkb = uint64(xc.paged_memkb) + x.MaxMemkb = uint64(xc.max_memkb) + x.CpuTime = uint64(xc.cpu_time) + x.VcpuMaxId = uint32(xc.vcpu_max_id) + x.VcpuOnline = uint32(xc.vcpu_online) + x.Cpupool = uint32(xc.cpupool) + x.DomainType = DomainType(xc.domain_type) + + return nil +} + +func (x *Dominfo) toC(xc *C.libxl_dominfo) (err error) { + defer func() { + if err != nil { + C.libxl_dominfo_dispose(xc) + } + }() + + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + xc.domid = C.libxl_domid(x.Domid) + xc.ssidref = C.uint32_t(x.Ssidref) + if x.SsidLabel != "" { + xc.ssid_label = C.CString(x.SsidLabel) + } + xc.running = C.bool(x.Running) + xc.blocked = C.bool(x.Blocked) + xc.paused = C.bool(x.Paused) + xc.shutdown = C.bool(x.Shutdown) + xc.dying = C.bool(x.Dying) + xc.never_stop = C.bool(x.NeverStop) + xc.shutdown_reason = C.libxl_shutdown_reason(x.ShutdownReason) + xc.outstanding_memkb = C.uint64_t(x.OutstandingMemkb) + xc.current_memkb = C.uint64_t(x.CurrentMemkb) + xc.shared_memkb = C.uint64_t(x.SharedMemkb) + xc.paged_memkb = C.uint64_t(x.PagedMemkb) + xc.max_memkb = C.uint64_t(x.MaxMemkb) + xc.cpu_time = C.uint64_t(x.CpuTime) + xc.vcpu_max_id = C.uint32_t(x.VcpuMaxId) + xc.vcpu_online = C.uint32_t(x.VcpuOnline) + xc.cpupool = C.uint32_t(x.Cpupool) + xc.domain_type = C.libxl_domain_type(x.DomainType) + + return nil +} + +// NewCpupoolinfo returns an instance of Cpupoolinfo initialized with defaults. +func NewCpupoolinfo() (*Cpupoolinfo, error) { + var ( + x Cpupoolinfo + xc C.libxl_cpupoolinfo + ) + + C.libxl_cpupoolinfo_init(&xc) + defer C.libxl_cpupoolinfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Cpupoolinfo) fromC(xc *C.libxl_cpupoolinfo) error { + x.Poolid = uint32(xc.poolid) + x.PoolName = C.GoString(xc.pool_name) + x.Sched = Scheduler(xc.sched) + x.NDom = uint32(xc.n_dom) + if err := x.Cpumap.fromC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + + return nil +} + +func (x *Cpupoolinfo) toC(xc *C.libxl_cpupoolinfo) (err error) { + defer func() { + if err != nil { + C.libxl_cpupoolinfo_dispose(xc) + } + }() + + xc.poolid = C.uint32_t(x.Poolid) + if x.PoolName != "" { + xc.pool_name = C.CString(x.PoolName) + } + xc.sched = C.libxl_scheduler(x.Sched) + xc.n_dom = C.uint32_t(x.NDom) + if err := x.Cpumap.toC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + + return nil +} + +// NewChannelinfo returns an instance of Channelinfo initialized with defaults. +func NewChannelinfo(connection ChannelConnection) (*Channelinfo, error) { + var ( + x Channelinfo + xc C.libxl_channelinfo + ) + + C.libxl_channelinfo_init(&xc) + C.libxl_channelinfo_init_connection(&xc, C.libxl_channel_connection(connection)) + defer C.libxl_channelinfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Channelinfo) fromC(xc *C.libxl_channelinfo) error { + x.Backend = C.GoString(xc.backend) + x.BackendId = uint32(xc.backend_id) + x.Frontend = C.GoString(xc.frontend) + x.FrontendId = uint32(xc.frontend_id) + x.Devid = Devid(xc.devid) + x.State = int(xc.state) + x.Evtch = int(xc.evtch) + x.Rref = int(xc.rref) + x.Connection = ChannelConnection(xc.connection) + switch x.Connection { + case ChannelConnectionUnknown: + x.ConnectionUnion = nil + case ChannelConnectionPty: + var connectionPty ChannelinfoConnectionUnionPty + if err := connectionPty.fromC(xc); err != nil { + return fmt.Errorf("converting field connectionPty: %v", err) + } + x.ConnectionUnion = connectionPty + case ChannelConnectionSocket: + x.ConnectionUnion = nil + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +func (x *ChannelinfoConnectionUnionPty) fromC(xc *C.libxl_channelinfo) error { + if ChannelConnection(xc.connection) != ChannelConnectionPty { + return errors.New("expected union key ChannelConnectionPty") + } + + tmp := (*C.libxl_channelinfo_connection_union_pty)(unsafe.Pointer(&xc.u[0])) + x.Path = C.GoString(tmp.path) + return nil +} + +func (x *Channelinfo) toC(xc *C.libxl_channelinfo) (err error) { + defer func() { + if err != nil { + C.libxl_channelinfo_dispose(xc) + } + }() + + if x.Backend != "" { + xc.backend = C.CString(x.Backend) + } + xc.backend_id = C.uint32_t(x.BackendId) + if x.Frontend != "" { + xc.frontend = C.CString(x.Frontend) + } + xc.frontend_id = C.uint32_t(x.FrontendId) + xc.devid = C.libxl_devid(x.Devid) + xc.state = C.int(x.State) + xc.evtch = C.int(x.Evtch) + xc.rref = C.int(x.Rref) + xc.connection = C.libxl_channel_connection(x.Connection) + switch x.Connection { + case ChannelConnectionUnknown: + break + case ChannelConnectionPty: + tmp, ok := x.ConnectionUnion.(ChannelinfoConnectionUnionPty) + if !ok { + return errors.New("wrong type for union key connection") + } + var pty C.libxl_channelinfo_connection_union_pty + if tmp.Path != "" { + pty.path = C.CString(tmp.Path) + } + ptyBytes := C.GoBytes(unsafe.Pointer(&pty), C.sizeof_libxl_channelinfo_connection_union_pty) + copy(xc.u[:], ptyBytes) + case ChannelConnectionSocket: + break + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +// NewVminfo returns an instance of Vminfo initialized with defaults. +func NewVminfo() (*Vminfo, error) { + var ( + x Vminfo + xc C.libxl_vminfo + ) + + C.libxl_vminfo_init(&xc) + defer C.libxl_vminfo_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *Vminfo) fromC(xc *C.libxl_vminfo) error { + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + x.Domid = Domid(xc.domid) + + return nil +} + +func (x *Vminfo) toC(xc *C.libxl_vminfo) (err error) { + defer func() { + if err != nil { + C.libxl_vminfo_dispose(xc) + } + }() + + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + xc.domid = C.libxl_domid(x.Domid) + + return nil +} + +// NewVersionInfo returns an instance of VersionInfo initialized with defaults. +func NewVersionInfo() (*VersionInfo, error) { + var ( + x VersionInfo + xc C.libxl_version_info + ) + + C.libxl_version_info_init(&xc) + defer C.libxl_version_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VersionInfo) fromC(xc *C.libxl_version_info) error { + x.XenVersionMajor = int(xc.xen_version_major) + x.XenVersionMinor = int(xc.xen_version_minor) + x.XenVersionExtra = C.GoString(xc.xen_version_extra) + x.Compiler = C.GoString(xc.compiler) + x.CompileBy = C.GoString(xc.compile_by) + x.CompileDomain = C.GoString(xc.compile_domain) + x.CompileDate = C.GoString(xc.compile_date) + x.Capabilities = C.GoString(xc.capabilities) + x.Changeset = C.GoString(xc.changeset) + x.VirtStart = uint64(xc.virt_start) + x.Pagesize = int(xc.pagesize) + x.Commandline = C.GoString(xc.commandline) + x.BuildId = C.GoString(xc.build_id) + + return nil +} + +func (x *VersionInfo) toC(xc *C.libxl_version_info) (err error) { + defer func() { + if err != nil { + C.libxl_version_info_dispose(xc) + } + }() + + xc.xen_version_major = C.int(x.XenVersionMajor) + xc.xen_version_minor = C.int(x.XenVersionMinor) + if x.XenVersionExtra != "" { + xc.xen_version_extra = C.CString(x.XenVersionExtra) + } + if x.Compiler != "" { + xc.compiler = C.CString(x.Compiler) + } + if x.CompileBy != "" { + xc.compile_by = C.CString(x.CompileBy) + } + if x.CompileDomain != "" { + xc.compile_domain = C.CString(x.CompileDomain) + } + if x.CompileDate != "" { + xc.compile_date = C.CString(x.CompileDate) + } + if x.Capabilities != "" { + xc.capabilities = C.CString(x.Capabilities) + } + if x.Changeset != "" { + xc.changeset = C.CString(x.Changeset) + } + xc.virt_start = C.uint64_t(x.VirtStart) + xc.pagesize = C.int(x.Pagesize) + if x.Commandline != "" { + xc.commandline = C.CString(x.Commandline) + } + if x.BuildId != "" { + xc.build_id = C.CString(x.BuildId) + } + + return nil +} + +// NewDomainCreateInfo returns an instance of DomainCreateInfo initialized with defaults. +func NewDomainCreateInfo() (*DomainCreateInfo, error) { + var ( + x DomainCreateInfo + xc C.libxl_domain_create_info + ) + + C.libxl_domain_create_info_init(&xc) + defer C.libxl_domain_create_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainCreateInfo) fromC(xc *C.libxl_domain_create_info) error { + x.Type = DomainType(xc._type) + if err := x.Hap.fromC(&xc.hap); err != nil { + return fmt.Errorf("converting field Hap: %v", err) + } + if err := x.Oos.fromC(&xc.oos); err != nil { + return fmt.Errorf("converting field Oos: %v", err) + } + x.Ssidref = uint32(xc.ssidref) + x.SsidLabel = C.GoString(xc.ssid_label) + x.Name = C.GoString(xc.name) + x.Domid = Domid(xc.domid) + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + if err := x.Xsdata.fromC(&xc.xsdata); err != nil { + return fmt.Errorf("converting field Xsdata: %v", err) + } + if err := x.Platformdata.fromC(&xc.platformdata); err != nil { + return fmt.Errorf("converting field Platformdata: %v", err) + } + x.Poolid = uint32(xc.poolid) + x.PoolName = C.GoString(xc.pool_name) + if err := x.RunHotplugScripts.fromC(&xc.run_hotplug_scripts); err != nil { + return fmt.Errorf("converting field RunHotplugScripts: %v", err) + } + if err := x.DriverDomain.fromC(&xc.driver_domain); err != nil { + return fmt.Errorf("converting field DriverDomain: %v", err) + } + x.Passthrough = Passthrough(xc.passthrough) + if err := x.XendSuspendEvtchnCompat.fromC(&xc.xend_suspend_evtchn_compat); err != nil { + return fmt.Errorf("converting field XendSuspendEvtchnCompat: %v", err) + } + + return nil +} + +func (x *DomainCreateInfo) toC(xc *C.libxl_domain_create_info) (err error) { + defer func() { + if err != nil { + C.libxl_domain_create_info_dispose(xc) + } + }() + + xc._type = C.libxl_domain_type(x.Type) + if err := x.Hap.toC(&xc.hap); err != nil { + return fmt.Errorf("converting field Hap: %v", err) + } + if err := x.Oos.toC(&xc.oos); err != nil { + return fmt.Errorf("converting field Oos: %v", err) + } + xc.ssidref = C.uint32_t(x.Ssidref) + if x.SsidLabel != "" { + xc.ssid_label = C.CString(x.SsidLabel) + } + if x.Name != "" { + xc.name = C.CString(x.Name) + } + xc.domid = C.libxl_domid(x.Domid) + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + if err := x.Xsdata.toC(&xc.xsdata); err != nil { + return fmt.Errorf("converting field Xsdata: %v", err) + } + if err := x.Platformdata.toC(&xc.platformdata); err != nil { + return fmt.Errorf("converting field Platformdata: %v", err) + } + xc.poolid = C.uint32_t(x.Poolid) + if x.PoolName != "" { + xc.pool_name = C.CString(x.PoolName) + } + if err := x.RunHotplugScripts.toC(&xc.run_hotplug_scripts); err != nil { + return fmt.Errorf("converting field RunHotplugScripts: %v", err) + } + if err := x.DriverDomain.toC(&xc.driver_domain); err != nil { + return fmt.Errorf("converting field DriverDomain: %v", err) + } + xc.passthrough = C.libxl_passthrough(x.Passthrough) + if err := x.XendSuspendEvtchnCompat.toC(&xc.xend_suspend_evtchn_compat); err != nil { + return fmt.Errorf("converting field XendSuspendEvtchnCompat: %v", err) + } + + return nil +} + +// NewDomainRestoreParams returns an instance of DomainRestoreParams initialized with defaults. +func NewDomainRestoreParams() (*DomainRestoreParams, error) { + var ( + x DomainRestoreParams + xc C.libxl_domain_restore_params + ) + + C.libxl_domain_restore_params_init(&xc) + defer C.libxl_domain_restore_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainRestoreParams) fromC(xc *C.libxl_domain_restore_params) error { + x.CheckpointedStream = int(xc.checkpointed_stream) + x.StreamVersion = uint32(xc.stream_version) + x.ColoProxyScript = C.GoString(xc.colo_proxy_script) + if err := x.UserspaceColoProxy.fromC(&xc.userspace_colo_proxy); err != nil { + return fmt.Errorf("converting field UserspaceColoProxy: %v", err) + } + + return nil +} + +func (x *DomainRestoreParams) toC(xc *C.libxl_domain_restore_params) (err error) { + defer func() { + if err != nil { + C.libxl_domain_restore_params_dispose(xc) + } + }() + + xc.checkpointed_stream = C.int(x.CheckpointedStream) + xc.stream_version = C.uint32_t(x.StreamVersion) + if x.ColoProxyScript != "" { + xc.colo_proxy_script = C.CString(x.ColoProxyScript) + } + if err := x.UserspaceColoProxy.toC(&xc.userspace_colo_proxy); err != nil { + return fmt.Errorf("converting field UserspaceColoProxy: %v", err) + } + + return nil +} + +// NewSchedParams returns an instance of SchedParams initialized with defaults. +func NewSchedParams() (*SchedParams, error) { + var ( + x SchedParams + xc C.libxl_sched_params + ) + + C.libxl_sched_params_init(&xc) + defer C.libxl_sched_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *SchedParams) fromC(xc *C.libxl_sched_params) error { + x.Vcpuid = int(xc.vcpuid) + x.Weight = int(xc.weight) + x.Cap = int(xc.cap) + x.Period = int(xc.period) + x.Extratime = int(xc.extratime) + x.Budget = int(xc.budget) + + return nil +} + +func (x *SchedParams) toC(xc *C.libxl_sched_params) (err error) { + defer func() { + if err != nil { + C.libxl_sched_params_dispose(xc) + } + }() + + xc.vcpuid = C.int(x.Vcpuid) + xc.weight = C.int(x.Weight) + xc.cap = C.int(x.Cap) + xc.period = C.int(x.Period) + xc.extratime = C.int(x.Extratime) + xc.budget = C.int(x.Budget) + + return nil +} + +// NewVcpuSchedParams returns an instance of VcpuSchedParams initialized with defaults. +func NewVcpuSchedParams() (*VcpuSchedParams, error) { + var ( + x VcpuSchedParams + xc C.libxl_vcpu_sched_params + ) + + C.libxl_vcpu_sched_params_init(&xc) + defer C.libxl_vcpu_sched_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VcpuSchedParams) fromC(xc *C.libxl_vcpu_sched_params) error { + x.Sched = Scheduler(xc.sched) + x.Vcpus = nil + if n := int(xc.num_vcpus); n > 0 { + cVcpus := (*[1 << 28]C.libxl_sched_params)(unsafe.Pointer(xc.vcpus))[:n:n] + x.Vcpus = make([]SchedParams, n) + for i, v := range cVcpus { + if err := x.Vcpus[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + } + } + + return nil +} + +func (x *VcpuSchedParams) toC(xc *C.libxl_vcpu_sched_params) (err error) { + defer func() { + if err != nil { + C.libxl_vcpu_sched_params_dispose(xc) + } + }() + + xc.sched = C.libxl_scheduler(x.Sched) + if numVcpus := len(x.Vcpus); numVcpus > 0 { + xc.vcpus = (*C.libxl_sched_params)(C.malloc(C.ulong(numVcpus) * C.sizeof_libxl_sched_params)) + xc.num_vcpus = C.int(numVcpus) + cVcpus := (*[1 << 28]C.libxl_sched_params)(unsafe.Pointer(xc.vcpus))[:numVcpus:numVcpus] + for i, v := range x.Vcpus { + if err := v.toC(&cVcpus[i]); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + } + } + + return nil +} + +// NewDomainSchedParams returns an instance of DomainSchedParams initialized with defaults. +func NewDomainSchedParams() (*DomainSchedParams, error) { + var ( + x DomainSchedParams + xc C.libxl_domain_sched_params + ) + + C.libxl_domain_sched_params_init(&xc) + defer C.libxl_domain_sched_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainSchedParams) fromC(xc *C.libxl_domain_sched_params) error { + x.Sched = Scheduler(xc.sched) + x.Weight = int(xc.weight) + x.Cap = int(xc.cap) + x.Period = int(xc.period) + x.Budget = int(xc.budget) + x.Extratime = int(xc.extratime) + x.Slice = int(xc.slice) + x.Latency = int(xc.latency) + + return nil +} + +func (x *DomainSchedParams) toC(xc *C.libxl_domain_sched_params) (err error) { + defer func() { + if err != nil { + C.libxl_domain_sched_params_dispose(xc) + } + }() + + xc.sched = C.libxl_scheduler(x.Sched) + xc.weight = C.int(x.Weight) + xc.cap = C.int(x.Cap) + xc.period = C.int(x.Period) + xc.budget = C.int(x.Budget) + xc.extratime = C.int(x.Extratime) + xc.slice = C.int(x.Slice) + xc.latency = C.int(x.Latency) + + return nil +} + +// NewVnodeInfo returns an instance of VnodeInfo initialized with defaults. +func NewVnodeInfo() (*VnodeInfo, error) { + var ( + x VnodeInfo + xc C.libxl_vnode_info + ) + + C.libxl_vnode_info_init(&xc) + defer C.libxl_vnode_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VnodeInfo) fromC(xc *C.libxl_vnode_info) error { + x.Memkb = uint64(xc.memkb) + x.Distances = nil + if n := int(xc.num_distances); n > 0 { + cDistances := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.distances))[:n:n] + x.Distances = make([]uint32, n) + for i, v := range cDistances { + x.Distances[i] = uint32(v) + } + } + x.Pnode = uint32(xc.pnode) + if err := x.Vcpus.fromC(&xc.vcpus); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + + return nil +} + +func (x *VnodeInfo) toC(xc *C.libxl_vnode_info) (err error) { + defer func() { + if err != nil { + C.libxl_vnode_info_dispose(xc) + } + }() + + xc.memkb = C.uint64_t(x.Memkb) + if numDistances := len(x.Distances); numDistances > 0 { + xc.distances = (*C.uint32_t)(C.malloc(C.size_t(numDistances * numDistances))) + xc.num_distances = C.int(numDistances) + cDistances := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.distances))[:numDistances:numDistances] + for i, v := range x.Distances { + cDistances[i] = C.uint32_t(v) + } + } + xc.pnode = C.uint32_t(x.Pnode) + if err := x.Vcpus.toC(&xc.vcpus); err != nil { + return fmt.Errorf("converting field Vcpus: %v", err) + } + + return nil +} + +// NewRdmReserve returns an instance of RdmReserve initialized with defaults. +func NewRdmReserve() (*RdmReserve, error) { + var ( + x RdmReserve + xc C.libxl_rdm_reserve + ) + + C.libxl_rdm_reserve_init(&xc) + defer C.libxl_rdm_reserve_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *RdmReserve) fromC(xc *C.libxl_rdm_reserve) error { + x.Strategy = RdmReserveStrategy(xc.strategy) + x.Policy = RdmReservePolicy(xc.policy) + + return nil +} + +func (x *RdmReserve) toC(xc *C.libxl_rdm_reserve) (err error) { + defer func() { + if err != nil { + C.libxl_rdm_reserve_dispose(xc) + } + }() + + xc.strategy = C.libxl_rdm_reserve_strategy(x.Strategy) + xc.policy = C.libxl_rdm_reserve_policy(x.Policy) + + return nil +} + +// NewDomainBuildInfo returns an instance of DomainBuildInfo initialized with defaults. +func NewDomainBuildInfo(dtype DomainType) (*DomainBuildInfo, error) { + var ( + x DomainBuildInfo + xc C.libxl_domain_build_info + ) + + C.libxl_domain_build_info_init(&xc) + C.libxl_domain_build_info_init_type(&xc, C.libxl_domain_type(dtype)) + defer C.libxl_domain_build_info_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DomainBuildInfo) fromC(xc *C.libxl_domain_build_info) error { + x.MaxVcpus = int(xc.max_vcpus) + if err := x.AvailVcpus.fromC(&xc.avail_vcpus); err != nil { + return fmt.Errorf("converting field AvailVcpus: %v", err) + } + if err := x.Cpumap.fromC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + if err := x.Nodemap.fromC(&xc.nodemap); err != nil { + return fmt.Errorf("converting field Nodemap: %v", err) + } + x.VcpuHardAffinity = nil + if n := int(xc.num_vcpu_hard_affinity); n > 0 { + cVcpuHardAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_hard_affinity))[:n:n] + x.VcpuHardAffinity = make([]Bitmap, n) + for i, v := range cVcpuHardAffinity { + if err := x.VcpuHardAffinity[i].fromC(&v); err != nil { + return fmt.Errorf("converting field VcpuHardAffinity: %v", err) + } + } + } + x.VcpuSoftAffinity = nil + if n := int(xc.num_vcpu_soft_affinity); n > 0 { + cVcpuSoftAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_soft_affinity))[:n:n] + x.VcpuSoftAffinity = make([]Bitmap, n) + for i, v := range cVcpuSoftAffinity { + if err := x.VcpuSoftAffinity[i].fromC(&v); err != nil { + return fmt.Errorf("converting field VcpuSoftAffinity: %v", err) + } + } + } + if err := x.NumaPlacement.fromC(&xc.numa_placement); err != nil { + return fmt.Errorf("converting field NumaPlacement: %v", err) + } + x.TscMode = TscMode(xc.tsc_mode) + x.MaxMemkb = uint64(xc.max_memkb) + x.TargetMemkb = uint64(xc.target_memkb) + x.VideoMemkb = uint64(xc.video_memkb) + x.ShadowMemkb = uint64(xc.shadow_memkb) + x.IommuMemkb = uint64(xc.iommu_memkb) + x.RtcTimeoffset = uint32(xc.rtc_timeoffset) + x.ExecSsidref = uint32(xc.exec_ssidref) + x.ExecSsidLabel = C.GoString(xc.exec_ssid_label) + if err := x.Localtime.fromC(&xc.localtime); err != nil { + return fmt.Errorf("converting field Localtime: %v", err) + } + if err := x.DisableMigrate.fromC(&xc.disable_migrate); err != nil { + return fmt.Errorf("converting field DisableMigrate: %v", err) + } + if err := x.Cpuid.fromC(&xc.cpuid); err != nil { + return fmt.Errorf("converting field Cpuid: %v", err) + } + x.BlkdevStart = C.GoString(xc.blkdev_start) + x.VnumaNodes = nil + if n := int(xc.num_vnuma_nodes); n > 0 { + cVnumaNodes := (*[1 << 28]C.libxl_vnode_info)(unsafe.Pointer(xc.vnuma_nodes))[:n:n] + x.VnumaNodes = make([]VnodeInfo, n) + for i, v := range cVnumaNodes { + if err := x.VnumaNodes[i].fromC(&v); err != nil { + return fmt.Errorf("converting field VnumaNodes: %v", err) + } + } + } + x.MaxGrantFrames = uint32(xc.max_grant_frames) + x.MaxMaptrackFrames = uint32(xc.max_maptrack_frames) + x.DeviceModelVersion = DeviceModelVersion(xc.device_model_version) + if err := x.DeviceModelStubdomain.fromC(&xc.device_model_stubdomain); err != nil { + return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) + } + x.DeviceModel = C.GoString(xc.device_model) + x.DeviceModelSsidref = uint32(xc.device_model_ssidref) + x.DeviceModelSsidLabel = C.GoString(xc.device_model_ssid_label) + x.DeviceModelUser = C.GoString(xc.device_model_user) + if err := x.Extra.fromC(&xc.extra); err != nil { + return fmt.Errorf("converting field Extra: %v", err) + } + if err := x.ExtraPv.fromC(&xc.extra_pv); err != nil { + return fmt.Errorf("converting field ExtraPv: %v", err) + } + if err := x.ExtraHvm.fromC(&xc.extra_hvm); err != nil { + return fmt.Errorf("converting field ExtraHvm: %v", err) + } + if err := x.SchedParams.fromC(&xc.sched_params); err != nil { + return fmt.Errorf("converting field SchedParams: %v", err) + } + x.Ioports = nil + if n := int(xc.num_ioports); n > 0 { + cIoports := (*[1 << 28]C.libxl_ioport_range)(unsafe.Pointer(xc.ioports))[:n:n] + x.Ioports = make([]IoportRange, n) + for i, v := range cIoports { + if err := x.Ioports[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Ioports: %v", err) + } + } + } + x.Irqs = nil + if n := int(xc.num_irqs); n > 0 { + cIrqs := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.irqs))[:n:n] + x.Irqs = make([]uint32, n) + for i, v := range cIrqs { + x.Irqs[i] = uint32(v) + } + } + x.Iomem = nil + if n := int(xc.num_iomem); n > 0 { + cIomem := (*[1 << 28]C.libxl_iomem_range)(unsafe.Pointer(xc.iomem))[:n:n] + x.Iomem = make([]IomemRange, n) + for i, v := range cIomem { + if err := x.Iomem[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Iomem: %v", err) + } + } + } + if err := x.ClaimMode.fromC(&xc.claim_mode); err != nil { + return fmt.Errorf("converting field ClaimMode: %v", err) + } + x.EventChannels = uint32(xc.event_channels) + x.Kernel = C.GoString(xc.kernel) + x.Cmdline = C.GoString(xc.cmdline) + x.Ramdisk = C.GoString(xc.ramdisk) + x.DeviceTree = C.GoString(xc.device_tree) + if err := x.Acpi.fromC(&xc.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + x.Bootloader = C.GoString(xc.bootloader) + if err := x.BootloaderArgs.fromC(&xc.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + x.TimerMode = TimerMode(xc.timer_mode) + if err := x.NestedHvm.fromC(&xc.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := x.Apic.fromC(&xc.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := x.DmRestrict.fromC(&xc.dm_restrict); err != nil { + return fmt.Errorf("converting field DmRestrict: %v", err) + } + x.Tee = TeeType(xc.tee) + x.Type = DomainType(xc._type) + switch x.Type { + case DomainTypeHvm: + var typeHvm DomainBuildInfoTypeUnionHvm + if err := typeHvm.fromC(xc); err != nil { + return fmt.Errorf("converting field typeHvm: %v", err) + } + x.TypeUnion = typeHvm + case DomainTypePv: + var typePv DomainBuildInfoTypeUnionPv + if err := typePv.fromC(xc); err != nil { + return fmt.Errorf("converting field typePv: %v", err) + } + x.TypeUnion = typePv + case DomainTypePvh: + var typePvh DomainBuildInfoTypeUnionPvh + if err := typePvh.fromC(xc); err != nil { + return fmt.Errorf("converting field typePvh: %v", err) + } + x.TypeUnion = typePvh + case DomainTypeInvalid: + x.TypeUnion = nil + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + x.ArchArm.GicVersion = GicVersion(xc.arch_arm.gic_version) + x.ArchArm.Vuart = VuartType(xc.arch_arm.vuart) + x.Altp2M = Altp2MMode(xc.altp2m) + + return nil +} + +func (x *DomainBuildInfoTypeUnionHvm) fromC(xc *C.libxl_domain_build_info) error { + if DomainType(xc._type) != DomainTypeHvm { + return errors.New("expected union key DomainTypeHvm") + } + + tmp := (*C.libxl_domain_build_info_type_union_hvm)(unsafe.Pointer(&xc.u[0])) + x.Firmware = C.GoString(tmp.firmware) + x.Bios = BiosType(tmp.bios) + if err := x.Pae.fromC(&tmp.pae); err != nil { + return fmt.Errorf("converting field Pae: %v", err) + } + if err := x.Apic.fromC(&tmp.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := x.Acpi.fromC(&tmp.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + if err := x.AcpiS3.fromC(&tmp.acpi_s3); err != nil { + return fmt.Errorf("converting field AcpiS3: %v", err) + } + if err := x.AcpiS4.fromC(&tmp.acpi_s4); err != nil { + return fmt.Errorf("converting field AcpiS4: %v", err) + } + if err := x.AcpiLaptopSlate.fromC(&tmp.acpi_laptop_slate); err != nil { + return fmt.Errorf("converting field AcpiLaptopSlate: %v", err) + } + if err := x.Nx.fromC(&tmp.nx); err != nil { + return fmt.Errorf("converting field Nx: %v", err) + } + if err := x.Viridian.fromC(&tmp.viridian); err != nil { + return fmt.Errorf("converting field Viridian: %v", err) + } + if err := x.ViridianEnable.fromC(&tmp.viridian_enable); err != nil { + return fmt.Errorf("converting field ViridianEnable: %v", err) + } + if err := x.ViridianDisable.fromC(&tmp.viridian_disable); err != nil { + return fmt.Errorf("converting field ViridianDisable: %v", err) + } + x.Timeoffset = C.GoString(tmp.timeoffset) + if err := x.Hpet.fromC(&tmp.hpet); err != nil { + return fmt.Errorf("converting field Hpet: %v", err) + } + if err := x.VptAlign.fromC(&tmp.vpt_align); err != nil { + return fmt.Errorf("converting field VptAlign: %v", err) + } + x.MmioHoleMemkb = uint64(tmp.mmio_hole_memkb) + x.TimerMode = TimerMode(tmp.timer_mode) + if err := x.NestedHvm.fromC(&tmp.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := x.Altp2M.fromC(&tmp.altp2m); err != nil { + return fmt.Errorf("converting field Altp2M: %v", err) + } + x.SystemFirmware = C.GoString(tmp.system_firmware) + x.SmbiosFirmware = C.GoString(tmp.smbios_firmware) + x.AcpiFirmware = C.GoString(tmp.acpi_firmware) + x.Hdtype = Hdtype(tmp.hdtype) + if err := x.Nographic.fromC(&tmp.nographic); err != nil { + return fmt.Errorf("converting field Nographic: %v", err) + } + if err := x.Vga.fromC(&tmp.vga); err != nil { + return fmt.Errorf("converting field Vga: %v", err) + } + if err := x.Vnc.fromC(&tmp.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + x.Keymap = C.GoString(tmp.keymap) + if err := x.Sdl.fromC(&tmp.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + if err := x.Spice.fromC(&tmp.spice); err != nil { + return fmt.Errorf("converting field Spice: %v", err) + } + if err := x.GfxPassthru.fromC(&tmp.gfx_passthru); err != nil { + return fmt.Errorf("converting field GfxPassthru: %v", err) + } + x.GfxPassthruKind = GfxPassthruKind(tmp.gfx_passthru_kind) + x.Serial = C.GoString(tmp.serial) + x.Boot = C.GoString(tmp.boot) + if err := x.Usb.fromC(&tmp.usb); err != nil { + return fmt.Errorf("converting field Usb: %v", err) + } + x.Usbversion = int(tmp.usbversion) + x.Usbdevice = C.GoString(tmp.usbdevice) + if err := x.VkbDevice.fromC(&tmp.vkb_device); err != nil { + return fmt.Errorf("converting field VkbDevice: %v", err) + } + x.Soundhw = C.GoString(tmp.soundhw) + if err := x.XenPlatformPci.fromC(&tmp.xen_platform_pci); err != nil { + return fmt.Errorf("converting field XenPlatformPci: %v", err) + } + if err := x.UsbdeviceList.fromC(&tmp.usbdevice_list); err != nil { + return fmt.Errorf("converting field UsbdeviceList: %v", err) + } + x.VendorDevice = VendorDevice(tmp.vendor_device) + if err := x.MsVmGenid.fromC(&tmp.ms_vm_genid); err != nil { + return fmt.Errorf("converting field MsVmGenid: %v", err) + } + if err := x.SerialList.fromC(&tmp.serial_list); err != nil { + return fmt.Errorf("converting field SerialList: %v", err) + } + if err := x.Rdm.fromC(&tmp.rdm); err != nil { + return fmt.Errorf("converting field Rdm: %v", err) + } + x.RdmMemBoundaryMemkb = uint64(tmp.rdm_mem_boundary_memkb) + x.McaCaps = uint64(tmp.mca_caps) + return nil +} + +func (x *DomainBuildInfoTypeUnionPv) fromC(xc *C.libxl_domain_build_info) error { + if DomainType(xc._type) != DomainTypePv { + return errors.New("expected union key DomainTypePv") + } + + tmp := (*C.libxl_domain_build_info_type_union_pv)(unsafe.Pointer(&xc.u[0])) + x.Kernel = C.GoString(tmp.kernel) + x.SlackMemkb = uint64(tmp.slack_memkb) + x.Bootloader = C.GoString(tmp.bootloader) + if err := x.BootloaderArgs.fromC(&tmp.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + x.Cmdline = C.GoString(tmp.cmdline) + x.Ramdisk = C.GoString(tmp.ramdisk) + x.Features = C.GoString(tmp.features) + if err := x.E820Host.fromC(&tmp.e820_host); err != nil { + return fmt.Errorf("converting field E820Host: %v", err) + } + return nil +} + +func (x *DomainBuildInfoTypeUnionPvh) fromC(xc *C.libxl_domain_build_info) error { + if DomainType(xc._type) != DomainTypePvh { + return errors.New("expected union key DomainTypePvh") + } + + tmp := (*C.libxl_domain_build_info_type_union_pvh)(unsafe.Pointer(&xc.u[0])) + if err := x.Pvshim.fromC(&tmp.pvshim); err != nil { + return fmt.Errorf("converting field Pvshim: %v", err) + } + x.PvshimPath = C.GoString(tmp.pvshim_path) + x.PvshimCmdline = C.GoString(tmp.pvshim_cmdline) + x.PvshimExtra = C.GoString(tmp.pvshim_extra) + return nil +} + +func (x *DomainBuildInfo) toC(xc *C.libxl_domain_build_info) (err error) { + defer func() { + if err != nil { + C.libxl_domain_build_info_dispose(xc) + } + }() + + xc.max_vcpus = C.int(x.MaxVcpus) + if err := x.AvailVcpus.toC(&xc.avail_vcpus); err != nil { + return fmt.Errorf("converting field AvailVcpus: %v", err) + } + if err := x.Cpumap.toC(&xc.cpumap); err != nil { + return fmt.Errorf("converting field Cpumap: %v", err) + } + if err := x.Nodemap.toC(&xc.nodemap); err != nil { + return fmt.Errorf("converting field Nodemap: %v", err) + } + if numVcpuHardAffinity := len(x.VcpuHardAffinity); numVcpuHardAffinity > 0 { + xc.vcpu_hard_affinity = (*C.libxl_bitmap)(C.malloc(C.ulong(numVcpuHardAffinity) * C.sizeof_libxl_bitmap)) + xc.num_vcpu_hard_affinity = C.int(numVcpuHardAffinity) + cVcpuHardAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_hard_affinity))[:numVcpuHardAffinity:numVcpuHardAffinity] + for i, v := range x.VcpuHardAffinity { + if err := v.toC(&cVcpuHardAffinity[i]); err != nil { + return fmt.Errorf("converting field VcpuHardAffinity: %v", err) + } + } + } + if numVcpuSoftAffinity := len(x.VcpuSoftAffinity); numVcpuSoftAffinity > 0 { + xc.vcpu_soft_affinity = (*C.libxl_bitmap)(C.malloc(C.ulong(numVcpuSoftAffinity) * C.sizeof_libxl_bitmap)) + xc.num_vcpu_soft_affinity = C.int(numVcpuSoftAffinity) + cVcpuSoftAffinity := (*[1 << 28]C.libxl_bitmap)(unsafe.Pointer(xc.vcpu_soft_affinity))[:numVcpuSoftAffinity:numVcpuSoftAffinity] + for i, v := range x.VcpuSoftAffinity { + if err := v.toC(&cVcpuSoftAffinity[i]); err != nil { + return fmt.Errorf("converting field VcpuSoftAffinity: %v", err) + } + } + } + if err := x.NumaPlacement.toC(&xc.numa_placement); err != nil { + return fmt.Errorf("converting field NumaPlacement: %v", err) + } + xc.tsc_mode = C.libxl_tsc_mode(x.TscMode) + xc.max_memkb = C.uint64_t(x.MaxMemkb) + xc.target_memkb = C.uint64_t(x.TargetMemkb) + xc.video_memkb = C.uint64_t(x.VideoMemkb) + xc.shadow_memkb = C.uint64_t(x.ShadowMemkb) + xc.iommu_memkb = C.uint64_t(x.IommuMemkb) + xc.rtc_timeoffset = C.uint32_t(x.RtcTimeoffset) + xc.exec_ssidref = C.uint32_t(x.ExecSsidref) + if x.ExecSsidLabel != "" { + xc.exec_ssid_label = C.CString(x.ExecSsidLabel) + } + if err := x.Localtime.toC(&xc.localtime); err != nil { + return fmt.Errorf("converting field Localtime: %v", err) + } + if err := x.DisableMigrate.toC(&xc.disable_migrate); err != nil { + return fmt.Errorf("converting field DisableMigrate: %v", err) + } + if err := x.Cpuid.toC(&xc.cpuid); err != nil { + return fmt.Errorf("converting field Cpuid: %v", err) + } + if x.BlkdevStart != "" { + xc.blkdev_start = C.CString(x.BlkdevStart) + } + if numVnumaNodes := len(x.VnumaNodes); numVnumaNodes > 0 { + xc.vnuma_nodes = (*C.libxl_vnode_info)(C.malloc(C.ulong(numVnumaNodes) * C.sizeof_libxl_vnode_info)) + xc.num_vnuma_nodes = C.int(numVnumaNodes) + cVnumaNodes := (*[1 << 28]C.libxl_vnode_info)(unsafe.Pointer(xc.vnuma_nodes))[:numVnumaNodes:numVnumaNodes] + for i, v := range x.VnumaNodes { + if err := v.toC(&cVnumaNodes[i]); err != nil { + return fmt.Errorf("converting field VnumaNodes: %v", err) + } + } + } + xc.max_grant_frames = C.uint32_t(x.MaxGrantFrames) + xc.max_maptrack_frames = C.uint32_t(x.MaxMaptrackFrames) + xc.device_model_version = C.libxl_device_model_version(x.DeviceModelVersion) + if err := x.DeviceModelStubdomain.toC(&xc.device_model_stubdomain); err != nil { + return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) + } + if x.DeviceModel != "" { + xc.device_model = C.CString(x.DeviceModel) + } + xc.device_model_ssidref = C.uint32_t(x.DeviceModelSsidref) + if x.DeviceModelSsidLabel != "" { + xc.device_model_ssid_label = C.CString(x.DeviceModelSsidLabel) + } + if x.DeviceModelUser != "" { + xc.device_model_user = C.CString(x.DeviceModelUser) + } + if err := x.Extra.toC(&xc.extra); err != nil { + return fmt.Errorf("converting field Extra: %v", err) + } + if err := x.ExtraPv.toC(&xc.extra_pv); err != nil { + return fmt.Errorf("converting field ExtraPv: %v", err) + } + if err := x.ExtraHvm.toC(&xc.extra_hvm); err != nil { + return fmt.Errorf("converting field ExtraHvm: %v", err) + } + if err := x.SchedParams.toC(&xc.sched_params); err != nil { + return fmt.Errorf("converting field SchedParams: %v", err) + } + if numIoports := len(x.Ioports); numIoports > 0 { + xc.ioports = (*C.libxl_ioport_range)(C.malloc(C.ulong(numIoports) * C.sizeof_libxl_ioport_range)) + xc.num_ioports = C.int(numIoports) + cIoports := (*[1 << 28]C.libxl_ioport_range)(unsafe.Pointer(xc.ioports))[:numIoports:numIoports] + for i, v := range x.Ioports { + if err := v.toC(&cIoports[i]); err != nil { + return fmt.Errorf("converting field Ioports: %v", err) + } + } + } + if numIrqs := len(x.Irqs); numIrqs > 0 { + xc.irqs = (*C.uint32_t)(C.malloc(C.size_t(numIrqs * numIrqs))) + xc.num_irqs = C.int(numIrqs) + cIrqs := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.irqs))[:numIrqs:numIrqs] + for i, v := range x.Irqs { + cIrqs[i] = C.uint32_t(v) + } + } + if numIomem := len(x.Iomem); numIomem > 0 { + xc.iomem = (*C.libxl_iomem_range)(C.malloc(C.ulong(numIomem) * C.sizeof_libxl_iomem_range)) + xc.num_iomem = C.int(numIomem) + cIomem := (*[1 << 28]C.libxl_iomem_range)(unsafe.Pointer(xc.iomem))[:numIomem:numIomem] + for i, v := range x.Iomem { + if err := v.toC(&cIomem[i]); err != nil { + return fmt.Errorf("converting field Iomem: %v", err) + } + } + } + if err := x.ClaimMode.toC(&xc.claim_mode); err != nil { + return fmt.Errorf("converting field ClaimMode: %v", err) + } + xc.event_channels = C.uint32_t(x.EventChannels) + if x.Kernel != "" { + xc.kernel = C.CString(x.Kernel) + } + if x.Cmdline != "" { + xc.cmdline = C.CString(x.Cmdline) + } + if x.Ramdisk != "" { + xc.ramdisk = C.CString(x.Ramdisk) + } + if x.DeviceTree != "" { + xc.device_tree = C.CString(x.DeviceTree) + } + if err := x.Acpi.toC(&xc.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + if x.Bootloader != "" { + xc.bootloader = C.CString(x.Bootloader) + } + if err := x.BootloaderArgs.toC(&xc.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + xc.timer_mode = C.libxl_timer_mode(x.TimerMode) + if err := x.NestedHvm.toC(&xc.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := x.Apic.toC(&xc.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := x.DmRestrict.toC(&xc.dm_restrict); err != nil { + return fmt.Errorf("converting field DmRestrict: %v", err) + } + xc.tee = C.libxl_tee_type(x.Tee) + xc._type = C.libxl_domain_type(x.Type) + switch x.Type { + case DomainTypeHvm: + tmp, ok := x.TypeUnion.(DomainBuildInfoTypeUnionHvm) + if !ok { + return errors.New("wrong type for union key type") + } + var hvm C.libxl_domain_build_info_type_union_hvm + if tmp.Firmware != "" { + hvm.firmware = C.CString(tmp.Firmware) + } + hvm.bios = C.libxl_bios_type(tmp.Bios) + if err := tmp.Pae.toC(&hvm.pae); err != nil { + return fmt.Errorf("converting field Pae: %v", err) + } + if err := tmp.Apic.toC(&hvm.apic); err != nil { + return fmt.Errorf("converting field Apic: %v", err) + } + if err := tmp.Acpi.toC(&hvm.acpi); err != nil { + return fmt.Errorf("converting field Acpi: %v", err) + } + if err := tmp.AcpiS3.toC(&hvm.acpi_s3); err != nil { + return fmt.Errorf("converting field AcpiS3: %v", err) + } + if err := tmp.AcpiS4.toC(&hvm.acpi_s4); err != nil { + return fmt.Errorf("converting field AcpiS4: %v", err) + } + if err := tmp.AcpiLaptopSlate.toC(&hvm.acpi_laptop_slate); err != nil { + return fmt.Errorf("converting field AcpiLaptopSlate: %v", err) + } + if err := tmp.Nx.toC(&hvm.nx); err != nil { + return fmt.Errorf("converting field Nx: %v", err) + } + if err := tmp.Viridian.toC(&hvm.viridian); err != nil { + return fmt.Errorf("converting field Viridian: %v", err) + } + if err := tmp.ViridianEnable.toC(&hvm.viridian_enable); err != nil { + return fmt.Errorf("converting field ViridianEnable: %v", err) + } + if err := tmp.ViridianDisable.toC(&hvm.viridian_disable); err != nil { + return fmt.Errorf("converting field ViridianDisable: %v", err) + } + if tmp.Timeoffset != "" { + hvm.timeoffset = C.CString(tmp.Timeoffset) + } + if err := tmp.Hpet.toC(&hvm.hpet); err != nil { + return fmt.Errorf("converting field Hpet: %v", err) + } + if err := tmp.VptAlign.toC(&hvm.vpt_align); err != nil { + return fmt.Errorf("converting field VptAlign: %v", err) + } + hvm.mmio_hole_memkb = C.uint64_t(tmp.MmioHoleMemkb) + hvm.timer_mode = C.libxl_timer_mode(tmp.TimerMode) + if err := tmp.NestedHvm.toC(&hvm.nested_hvm); err != nil { + return fmt.Errorf("converting field NestedHvm: %v", err) + } + if err := tmp.Altp2M.toC(&hvm.altp2m); err != nil { + return fmt.Errorf("converting field Altp2M: %v", err) + } + if tmp.SystemFirmware != "" { + hvm.system_firmware = C.CString(tmp.SystemFirmware) + } + if tmp.SmbiosFirmware != "" { + hvm.smbios_firmware = C.CString(tmp.SmbiosFirmware) + } + if tmp.AcpiFirmware != "" { + hvm.acpi_firmware = C.CString(tmp.AcpiFirmware) + } + hvm.hdtype = C.libxl_hdtype(tmp.Hdtype) + if err := tmp.Nographic.toC(&hvm.nographic); err != nil { + return fmt.Errorf("converting field Nographic: %v", err) + } + if err := tmp.Vga.toC(&hvm.vga); err != nil { + return fmt.Errorf("converting field Vga: %v", err) + } + if err := tmp.Vnc.toC(&hvm.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + if tmp.Keymap != "" { + hvm.keymap = C.CString(tmp.Keymap) + } + if err := tmp.Sdl.toC(&hvm.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + if err := tmp.Spice.toC(&hvm.spice); err != nil { + return fmt.Errorf("converting field Spice: %v", err) + } + if err := tmp.GfxPassthru.toC(&hvm.gfx_passthru); err != nil { + return fmt.Errorf("converting field GfxPassthru: %v", err) + } + hvm.gfx_passthru_kind = C.libxl_gfx_passthru_kind(tmp.GfxPassthruKind) + if tmp.Serial != "" { + hvm.serial = C.CString(tmp.Serial) + } + if tmp.Boot != "" { + hvm.boot = C.CString(tmp.Boot) + } + if err := tmp.Usb.toC(&hvm.usb); err != nil { + return fmt.Errorf("converting field Usb: %v", err) + } + hvm.usbversion = C.int(tmp.Usbversion) + if tmp.Usbdevice != "" { + hvm.usbdevice = C.CString(tmp.Usbdevice) + } + if err := tmp.VkbDevice.toC(&hvm.vkb_device); err != nil { + return fmt.Errorf("converting field VkbDevice: %v", err) + } + if tmp.Soundhw != "" { + hvm.soundhw = C.CString(tmp.Soundhw) + } + if err := tmp.XenPlatformPci.toC(&hvm.xen_platform_pci); err != nil { + return fmt.Errorf("converting field XenPlatformPci: %v", err) + } + if err := tmp.UsbdeviceList.toC(&hvm.usbdevice_list); err != nil { + return fmt.Errorf("converting field UsbdeviceList: %v", err) + } + hvm.vendor_device = C.libxl_vendor_device(tmp.VendorDevice) + if err := tmp.MsVmGenid.toC(&hvm.ms_vm_genid); err != nil { + return fmt.Errorf("converting field MsVmGenid: %v", err) + } + if err := tmp.SerialList.toC(&hvm.serial_list); err != nil { + return fmt.Errorf("converting field SerialList: %v", err) + } + if err := tmp.Rdm.toC(&hvm.rdm); err != nil { + return fmt.Errorf("converting field Rdm: %v", err) + } + hvm.rdm_mem_boundary_memkb = C.uint64_t(tmp.RdmMemBoundaryMemkb) + hvm.mca_caps = C.uint64_t(tmp.McaCaps) + hvmBytes := C.GoBytes(unsafe.Pointer(&hvm), C.sizeof_libxl_domain_build_info_type_union_hvm) + copy(xc.u[:], hvmBytes) + case DomainTypePv: + tmp, ok := x.TypeUnion.(DomainBuildInfoTypeUnionPv) + if !ok { + return errors.New("wrong type for union key type") + } + var pv C.libxl_domain_build_info_type_union_pv + if tmp.Kernel != "" { + pv.kernel = C.CString(tmp.Kernel) + } + pv.slack_memkb = C.uint64_t(tmp.SlackMemkb) + if tmp.Bootloader != "" { + pv.bootloader = C.CString(tmp.Bootloader) + } + if err := tmp.BootloaderArgs.toC(&pv.bootloader_args); err != nil { + return fmt.Errorf("converting field BootloaderArgs: %v", err) + } + if tmp.Cmdline != "" { + pv.cmdline = C.CString(tmp.Cmdline) + } + if tmp.Ramdisk != "" { + pv.ramdisk = C.CString(tmp.Ramdisk) + } + if tmp.Features != "" { + pv.features = C.CString(tmp.Features) + } + if err := tmp.E820Host.toC(&pv.e820_host); err != nil { + return fmt.Errorf("converting field E820Host: %v", err) + } + pvBytes := C.GoBytes(unsafe.Pointer(&pv), C.sizeof_libxl_domain_build_info_type_union_pv) + copy(xc.u[:], pvBytes) + case DomainTypePvh: + tmp, ok := x.TypeUnion.(DomainBuildInfoTypeUnionPvh) + if !ok { + return errors.New("wrong type for union key type") + } + var pvh C.libxl_domain_build_info_type_union_pvh + if err := tmp.Pvshim.toC(&pvh.pvshim); err != nil { + return fmt.Errorf("converting field Pvshim: %v", err) + } + if tmp.PvshimPath != "" { + pvh.pvshim_path = C.CString(tmp.PvshimPath) + } + if tmp.PvshimCmdline != "" { + pvh.pvshim_cmdline = C.CString(tmp.PvshimCmdline) + } + if tmp.PvshimExtra != "" { + pvh.pvshim_extra = C.CString(tmp.PvshimExtra) + } + pvhBytes := C.GoBytes(unsafe.Pointer(&pvh), C.sizeof_libxl_domain_build_info_type_union_pvh) + copy(xc.u[:], pvhBytes) + case DomainTypeInvalid: + break + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + xc.arch_arm.gic_version = C.libxl_gic_version(x.ArchArm.GicVersion) + xc.arch_arm.vuart = C.libxl_vuart_type(x.ArchArm.Vuart) + xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) + + return nil +} + +// NewDeviceVfb returns an instance of DeviceVfb initialized with defaults. +func NewDeviceVfb() (*DeviceVfb, error) { + var ( + x DeviceVfb + xc C.libxl_device_vfb + ) + + C.libxl_device_vfb_init(&xc) + defer C.libxl_device_vfb_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVfb) fromC(xc *C.libxl_device_vfb) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + if err := x.Vnc.fromC(&xc.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + if err := x.Sdl.fromC(&xc.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + x.Keymap = C.GoString(xc.keymap) + + return nil +} + +func (x *DeviceVfb) toC(xc *C.libxl_device_vfb) (err error) { + defer func() { + if err != nil { + C.libxl_device_vfb_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + if err := x.Vnc.toC(&xc.vnc); err != nil { + return fmt.Errorf("converting field Vnc: %v", err) + } + if err := x.Sdl.toC(&xc.sdl); err != nil { + return fmt.Errorf("converting field Sdl: %v", err) + } + if x.Keymap != "" { + xc.keymap = C.CString(x.Keymap) + } + + return nil +} + +// NewDeviceVkb returns an instance of DeviceVkb initialized with defaults. +func NewDeviceVkb() (*DeviceVkb, error) { + var ( + x DeviceVkb + xc C.libxl_device_vkb + ) + + C.libxl_device_vkb_init(&xc) + defer C.libxl_device_vkb_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVkb) fromC(xc *C.libxl_device_vkb) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.BackendType = VkbBackend(xc.backend_type) + x.UniqueId = C.GoString(xc.unique_id) + x.FeatureDisableKeyboard = bool(xc.feature_disable_keyboard) + x.FeatureDisablePointer = bool(xc.feature_disable_pointer) + x.FeatureAbsPointer = bool(xc.feature_abs_pointer) + x.FeatureRawPointer = bool(xc.feature_raw_pointer) + x.FeatureMultiTouch = bool(xc.feature_multi_touch) + x.Width = uint32(xc.width) + x.Height = uint32(xc.height) + x.MultiTouchWidth = uint32(xc.multi_touch_width) + x.MultiTouchHeight = uint32(xc.multi_touch_height) + x.MultiTouchNumContacts = uint32(xc.multi_touch_num_contacts) + + return nil +} + +func (x *DeviceVkb) toC(xc *C.libxl_device_vkb) (err error) { + defer func() { + if err != nil { + C.libxl_device_vkb_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + xc.backend_type = C.libxl_vkb_backend(x.BackendType) + if x.UniqueId != "" { + xc.unique_id = C.CString(x.UniqueId) + } + xc.feature_disable_keyboard = C.bool(x.FeatureDisableKeyboard) + xc.feature_disable_pointer = C.bool(x.FeatureDisablePointer) + xc.feature_abs_pointer = C.bool(x.FeatureAbsPointer) + xc.feature_raw_pointer = C.bool(x.FeatureRawPointer) + xc.feature_multi_touch = C.bool(x.FeatureMultiTouch) + xc.width = C.uint32_t(x.Width) + xc.height = C.uint32_t(x.Height) + xc.multi_touch_width = C.uint32_t(x.MultiTouchWidth) + xc.multi_touch_height = C.uint32_t(x.MultiTouchHeight) + xc.multi_touch_num_contacts = C.uint32_t(x.MultiTouchNumContacts) + + return nil +} + +// NewDeviceDisk returns an instance of DeviceDisk initialized with defaults. +func NewDeviceDisk() (*DeviceDisk, error) { + var ( + x DeviceDisk + xc C.libxl_device_disk + ) + + C.libxl_device_disk_init(&xc) + defer C.libxl_device_disk_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceDisk) fromC(xc *C.libxl_device_disk) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.PdevPath = C.GoString(xc.pdev_path) + x.Vdev = C.GoString(xc.vdev) + x.Backend = DiskBackend(xc.backend) + x.Format = DiskFormat(xc.format) + x.Script = C.GoString(xc.script) + x.Removable = int(xc.removable) + x.Readwrite = int(xc.readwrite) + x.IsCdrom = int(xc.is_cdrom) + x.DirectIoSafe = bool(xc.direct_io_safe) + if err := x.DiscardEnable.fromC(&xc.discard_enable); err != nil { + return fmt.Errorf("converting field DiscardEnable: %v", err) + } + if err := x.ColoEnable.fromC(&xc.colo_enable); err != nil { + return fmt.Errorf("converting field ColoEnable: %v", err) + } + if err := x.ColoRestoreEnable.fromC(&xc.colo_restore_enable); err != nil { + return fmt.Errorf("converting field ColoRestoreEnable: %v", err) + } + x.ColoHost = C.GoString(xc.colo_host) + x.ColoPort = int(xc.colo_port) + x.ColoExport = C.GoString(xc.colo_export) + x.ActiveDisk = C.GoString(xc.active_disk) + x.HiddenDisk = C.GoString(xc.hidden_disk) + + return nil +} + +func (x *DeviceDisk) toC(xc *C.libxl_device_disk) (err error) { + defer func() { + if err != nil { + C.libxl_device_disk_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + if x.PdevPath != "" { + xc.pdev_path = C.CString(x.PdevPath) + } + if x.Vdev != "" { + xc.vdev = C.CString(x.Vdev) + } + xc.backend = C.libxl_disk_backend(x.Backend) + xc.format = C.libxl_disk_format(x.Format) + if x.Script != "" { + xc.script = C.CString(x.Script) + } + xc.removable = C.int(x.Removable) + xc.readwrite = C.int(x.Readwrite) + xc.is_cdrom = C.int(x.IsCdrom) + xc.direct_io_safe = C.bool(x.DirectIoSafe) + if err := x.DiscardEnable.toC(&xc.discard_enable); err != nil { + return fmt.Errorf("converting field DiscardEnable: %v", err) + } + if err := x.ColoEnable.toC(&xc.colo_enable); err != nil { + return fmt.Errorf("converting field ColoEnable: %v", err) + } + if err := x.ColoRestoreEnable.toC(&xc.colo_restore_enable); err != nil { + return fmt.Errorf("converting field ColoRestoreEnable: %v", err) + } + if x.ColoHost != "" { + xc.colo_host = C.CString(x.ColoHost) + } + xc.colo_port = C.int(x.ColoPort) + if x.ColoExport != "" { + xc.colo_export = C.CString(x.ColoExport) + } + if x.ActiveDisk != "" { + xc.active_disk = C.CString(x.ActiveDisk) + } + if x.HiddenDisk != "" { + xc.hidden_disk = C.CString(x.HiddenDisk) + } + + return nil +} + +// NewDeviceNic returns an instance of DeviceNic initialized with defaults. +func NewDeviceNic() (*DeviceNic, error) { + var ( + x DeviceNic + xc C.libxl_device_nic + ) + + C.libxl_device_nic_init(&xc) + defer C.libxl_device_nic_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceNic) fromC(xc *C.libxl_device_nic) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.Mtu = int(xc.mtu) + x.Model = C.GoString(xc.model) + if err := x.Mac.fromC(&xc.mac); err != nil { + return fmt.Errorf("converting field Mac: %v", err) + } + x.Ip = C.GoString(xc.ip) + x.Bridge = C.GoString(xc.bridge) + x.Ifname = C.GoString(xc.ifname) + x.Script = C.GoString(xc.script) + x.Nictype = NicType(xc.nictype) + x.RateBytesPerInterval = uint64(xc.rate_bytes_per_interval) + x.RateIntervalUsecs = uint32(xc.rate_interval_usecs) + x.Gatewaydev = C.GoString(xc.gatewaydev) + x.ColoftForwarddev = C.GoString(xc.coloft_forwarddev) + x.ColoSockMirrorId = C.GoString(xc.colo_sock_mirror_id) + x.ColoSockMirrorIp = C.GoString(xc.colo_sock_mirror_ip) + x.ColoSockMirrorPort = C.GoString(xc.colo_sock_mirror_port) + x.ColoSockComparePriInId = C.GoString(xc.colo_sock_compare_pri_in_id) + x.ColoSockComparePriInIp = C.GoString(xc.colo_sock_compare_pri_in_ip) + x.ColoSockComparePriInPort = C.GoString(xc.colo_sock_compare_pri_in_port) + x.ColoSockCompareSecInId = C.GoString(xc.colo_sock_compare_sec_in_id) + x.ColoSockCompareSecInIp = C.GoString(xc.colo_sock_compare_sec_in_ip) + x.ColoSockCompareSecInPort = C.GoString(xc.colo_sock_compare_sec_in_port) + x.ColoSockCompareNotifyId = C.GoString(xc.colo_sock_compare_notify_id) + x.ColoSockCompareNotifyIp = C.GoString(xc.colo_sock_compare_notify_ip) + x.ColoSockCompareNotifyPort = C.GoString(xc.colo_sock_compare_notify_port) + x.ColoSockRedirector0Id = C.GoString(xc.colo_sock_redirector0_id) + x.ColoSockRedirector0Ip = C.GoString(xc.colo_sock_redirector0_ip) + x.ColoSockRedirector0Port = C.GoString(xc.colo_sock_redirector0_port) + x.ColoSockRedirector1Id = C.GoString(xc.colo_sock_redirector1_id) + x.ColoSockRedirector1Ip = C.GoString(xc.colo_sock_redirector1_ip) + x.ColoSockRedirector1Port = C.GoString(xc.colo_sock_redirector1_port) + x.ColoSockRedirector2Id = C.GoString(xc.colo_sock_redirector2_id) + x.ColoSockRedirector2Ip = C.GoString(xc.colo_sock_redirector2_ip) + x.ColoSockRedirector2Port = C.GoString(xc.colo_sock_redirector2_port) + x.ColoFilterMirrorQueue = C.GoString(xc.colo_filter_mirror_queue) + x.ColoFilterMirrorOutdev = C.GoString(xc.colo_filter_mirror_outdev) + x.ColoFilterRedirector0Queue = C.GoString(xc.colo_filter_redirector0_queue) + x.ColoFilterRedirector0Indev = C.GoString(xc.colo_filter_redirector0_indev) + x.ColoFilterRedirector0Outdev = C.GoString(xc.colo_filter_redirector0_outdev) + x.ColoFilterRedirector1Queue = C.GoString(xc.colo_filter_redirector1_queue) + x.ColoFilterRedirector1Indev = C.GoString(xc.colo_filter_redirector1_indev) + x.ColoFilterRedirector1Outdev = C.GoString(xc.colo_filter_redirector1_outdev) + x.ColoComparePriIn = C.GoString(xc.colo_compare_pri_in) + x.ColoCompareSecIn = C.GoString(xc.colo_compare_sec_in) + x.ColoCompareOut = C.GoString(xc.colo_compare_out) + x.ColoCompareNotifyDev = C.GoString(xc.colo_compare_notify_dev) + x.ColoSockSecRedirector0Id = C.GoString(xc.colo_sock_sec_redirector0_id) + x.ColoSockSecRedirector0Ip = C.GoString(xc.colo_sock_sec_redirector0_ip) + x.ColoSockSecRedirector0Port = C.GoString(xc.colo_sock_sec_redirector0_port) + x.ColoSockSecRedirector1Id = C.GoString(xc.colo_sock_sec_redirector1_id) + x.ColoSockSecRedirector1Ip = C.GoString(xc.colo_sock_sec_redirector1_ip) + x.ColoSockSecRedirector1Port = C.GoString(xc.colo_sock_sec_redirector1_port) + x.ColoFilterSecRedirector0Queue = C.GoString(xc.colo_filter_sec_redirector0_queue) + x.ColoFilterSecRedirector0Indev = C.GoString(xc.colo_filter_sec_redirector0_indev) + x.ColoFilterSecRedirector0Outdev = C.GoString(xc.colo_filter_sec_redirector0_outdev) + x.ColoFilterSecRedirector1Queue = C.GoString(xc.colo_filter_sec_redirector1_queue) + x.ColoFilterSecRedirector1Indev = C.GoString(xc.colo_filter_sec_redirector1_indev) + x.ColoFilterSecRedirector1Outdev = C.GoString(xc.colo_filter_sec_redirector1_outdev) + x.ColoFilterSecRewriter0Queue = C.GoString(xc.colo_filter_sec_rewriter0_queue) + x.ColoCheckpointHost = C.GoString(xc.colo_checkpoint_host) + x.ColoCheckpointPort = C.GoString(xc.colo_checkpoint_port) + + return nil +} + +func (x *DeviceNic) toC(xc *C.libxl_device_nic) (err error) { + defer func() { + if err != nil { + C.libxl_device_nic_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + xc.mtu = C.int(x.Mtu) + if x.Model != "" { + xc.model = C.CString(x.Model) + } + if err := x.Mac.toC(&xc.mac); err != nil { + return fmt.Errorf("converting field Mac: %v", err) + } + if x.Ip != "" { + xc.ip = C.CString(x.Ip) + } + if x.Bridge != "" { + xc.bridge = C.CString(x.Bridge) + } + if x.Ifname != "" { + xc.ifname = C.CString(x.Ifname) + } + if x.Script != "" { + xc.script = C.CString(x.Script) + } + xc.nictype = C.libxl_nic_type(x.Nictype) + xc.rate_bytes_per_interval = C.uint64_t(x.RateBytesPerInterval) + xc.rate_interval_usecs = C.uint32_t(x.RateIntervalUsecs) + if x.Gatewaydev != "" { + xc.gatewaydev = C.CString(x.Gatewaydev) + } + if x.ColoftForwarddev != "" { + xc.coloft_forwarddev = C.CString(x.ColoftForwarddev) + } + if x.ColoSockMirrorId != "" { + xc.colo_sock_mirror_id = C.CString(x.ColoSockMirrorId) + } + if x.ColoSockMirrorIp != "" { + xc.colo_sock_mirror_ip = C.CString(x.ColoSockMirrorIp) + } + if x.ColoSockMirrorPort != "" { + xc.colo_sock_mirror_port = C.CString(x.ColoSockMirrorPort) + } + if x.ColoSockComparePriInId != "" { + xc.colo_sock_compare_pri_in_id = C.CString(x.ColoSockComparePriInId) + } + if x.ColoSockComparePriInIp != "" { + xc.colo_sock_compare_pri_in_ip = C.CString(x.ColoSockComparePriInIp) + } + if x.ColoSockComparePriInPort != "" { + xc.colo_sock_compare_pri_in_port = C.CString(x.ColoSockComparePriInPort) + } + if x.ColoSockCompareSecInId != "" { + xc.colo_sock_compare_sec_in_id = C.CString(x.ColoSockCompareSecInId) + } + if x.ColoSockCompareSecInIp != "" { + xc.colo_sock_compare_sec_in_ip = C.CString(x.ColoSockCompareSecInIp) + } + if x.ColoSockCompareSecInPort != "" { + xc.colo_sock_compare_sec_in_port = C.CString(x.ColoSockCompareSecInPort) + } + if x.ColoSockCompareNotifyId != "" { + xc.colo_sock_compare_notify_id = C.CString(x.ColoSockCompareNotifyId) + } + if x.ColoSockCompareNotifyIp != "" { + xc.colo_sock_compare_notify_ip = C.CString(x.ColoSockCompareNotifyIp) + } + if x.ColoSockCompareNotifyPort != "" { + xc.colo_sock_compare_notify_port = C.CString(x.ColoSockCompareNotifyPort) + } + if x.ColoSockRedirector0Id != "" { + xc.colo_sock_redirector0_id = C.CString(x.ColoSockRedirector0Id) + } + if x.ColoSockRedirector0Ip != "" { + xc.colo_sock_redirector0_ip = C.CString(x.ColoSockRedirector0Ip) + } + if x.ColoSockRedirector0Port != "" { + xc.colo_sock_redirector0_port = C.CString(x.ColoSockRedirector0Port) + } + if x.ColoSockRedirector1Id != "" { + xc.colo_sock_redirector1_id = C.CString(x.ColoSockRedirector1Id) + } + if x.ColoSockRedirector1Ip != "" { + xc.colo_sock_redirector1_ip = C.CString(x.ColoSockRedirector1Ip) + } + if x.ColoSockRedirector1Port != "" { + xc.colo_sock_redirector1_port = C.CString(x.ColoSockRedirector1Port) + } + if x.ColoSockRedirector2Id != "" { + xc.colo_sock_redirector2_id = C.CString(x.ColoSockRedirector2Id) + } + if x.ColoSockRedirector2Ip != "" { + xc.colo_sock_redirector2_ip = C.CString(x.ColoSockRedirector2Ip) + } + if x.ColoSockRedirector2Port != "" { + xc.colo_sock_redirector2_port = C.CString(x.ColoSockRedirector2Port) + } + if x.ColoFilterMirrorQueue != "" { + xc.colo_filter_mirror_queue = C.CString(x.ColoFilterMirrorQueue) + } + if x.ColoFilterMirrorOutdev != "" { + xc.colo_filter_mirror_outdev = C.CString(x.ColoFilterMirrorOutdev) + } + if x.ColoFilterRedirector0Queue != "" { + xc.colo_filter_redirector0_queue = C.CString(x.ColoFilterRedirector0Queue) + } + if x.ColoFilterRedirector0Indev != "" { + xc.colo_filter_redirector0_indev = C.CString(x.ColoFilterRedirector0Indev) + } + if x.ColoFilterRedirector0Outdev != "" { + xc.colo_filter_redirector0_outdev = C.CString(x.ColoFilterRedirector0Outdev) + } + if x.ColoFilterRedirector1Queue != "" { + xc.colo_filter_redirector1_queue = C.CString(x.ColoFilterRedirector1Queue) + } + if x.ColoFilterRedirector1Indev != "" { + xc.colo_filter_redirector1_indev = C.CString(x.ColoFilterRedirector1Indev) + } + if x.ColoFilterRedirector1Outdev != "" { + xc.colo_filter_redirector1_outdev = C.CString(x.ColoFilterRedirector1Outdev) + } + if x.ColoComparePriIn != "" { + xc.colo_compare_pri_in = C.CString(x.ColoComparePriIn) + } + if x.ColoCompareSecIn != "" { + xc.colo_compare_sec_in = C.CString(x.ColoCompareSecIn) + } + if x.ColoCompareOut != "" { + xc.colo_compare_out = C.CString(x.ColoCompareOut) + } + if x.ColoCompareNotifyDev != "" { + xc.colo_compare_notify_dev = C.CString(x.ColoCompareNotifyDev) + } + if x.ColoSockSecRedirector0Id != "" { + xc.colo_sock_sec_redirector0_id = C.CString(x.ColoSockSecRedirector0Id) + } + if x.ColoSockSecRedirector0Ip != "" { + xc.colo_sock_sec_redirector0_ip = C.CString(x.ColoSockSecRedirector0Ip) + } + if x.ColoSockSecRedirector0Port != "" { + xc.colo_sock_sec_redirector0_port = C.CString(x.ColoSockSecRedirector0Port) + } + if x.ColoSockSecRedirector1Id != "" { + xc.colo_sock_sec_redirector1_id = C.CString(x.ColoSockSecRedirector1Id) + } + if x.ColoSockSecRedirector1Ip != "" { + xc.colo_sock_sec_redirector1_ip = C.CString(x.ColoSockSecRedirector1Ip) + } + if x.ColoSockSecRedirector1Port != "" { + xc.colo_sock_sec_redirector1_port = C.CString(x.ColoSockSecRedirector1Port) + } + if x.ColoFilterSecRedirector0Queue != "" { + xc.colo_filter_sec_redirector0_queue = C.CString(x.ColoFilterSecRedirector0Queue) + } + if x.ColoFilterSecRedirector0Indev != "" { + xc.colo_filter_sec_redirector0_indev = C.CString(x.ColoFilterSecRedirector0Indev) + } + if x.ColoFilterSecRedirector0Outdev != "" { + xc.colo_filter_sec_redirector0_outdev = C.CString(x.ColoFilterSecRedirector0Outdev) + } + if x.ColoFilterSecRedirector1Queue != "" { + xc.colo_filter_sec_redirector1_queue = C.CString(x.ColoFilterSecRedirector1Queue) + } + if x.ColoFilterSecRedirector1Indev != "" { + xc.colo_filter_sec_redirector1_indev = C.CString(x.ColoFilterSecRedirector1Indev) + } + if x.ColoFilterSecRedirector1Outdev != "" { + xc.colo_filter_sec_redirector1_outdev = C.CString(x.ColoFilterSecRedirector1Outdev) + } + if x.ColoFilterSecRewriter0Queue != "" { + xc.colo_filter_sec_rewriter0_queue = C.CString(x.ColoFilterSecRewriter0Queue) + } + if x.ColoCheckpointHost != "" { + xc.colo_checkpoint_host = C.CString(x.ColoCheckpointHost) + } + if x.ColoCheckpointPort != "" { + xc.colo_checkpoint_port = C.CString(x.ColoCheckpointPort) + } + + return nil +} + +// NewDevicePci returns an instance of DevicePci initialized with defaults. +func NewDevicePci() (*DevicePci, error) { + var ( + x DevicePci + xc C.libxl_device_pci + ) + + C.libxl_device_pci_init(&xc) + defer C.libxl_device_pci_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DevicePci) fromC(xc *C.libxl_device_pci) error { + x.Func = byte(xc._func) + x.Dev = byte(xc.dev) + x.Bus = byte(xc.bus) + x.Domain = int(xc.domain) + x.Vdevfn = uint32(xc.vdevfn) + x.VfuncMask = uint32(xc.vfunc_mask) + x.Msitranslate = bool(xc.msitranslate) + x.PowerMgmt = bool(xc.power_mgmt) + x.Permissive = bool(xc.permissive) + x.Seize = bool(xc.seize) + x.RdmPolicy = RdmReservePolicy(xc.rdm_policy) + + return nil +} + +func (x *DevicePci) toC(xc *C.libxl_device_pci) (err error) { + defer func() { + if err != nil { + C.libxl_device_pci_dispose(xc) + } + }() + + xc._func = C.uint8_t(x.Func) + xc.dev = C.uint8_t(x.Dev) + xc.bus = C.uint8_t(x.Bus) + xc.domain = C.int(x.Domain) + xc.vdevfn = C.uint32_t(x.Vdevfn) + xc.vfunc_mask = C.uint32_t(x.VfuncMask) + xc.msitranslate = C.bool(x.Msitranslate) + xc.power_mgmt = C.bool(x.PowerMgmt) + xc.permissive = C.bool(x.Permissive) + xc.seize = C.bool(x.Seize) + xc.rdm_policy = C.libxl_rdm_reserve_policy(x.RdmPolicy) + + return nil +} + +// NewDeviceRdm returns an instance of DeviceRdm initialized with defaults. +func NewDeviceRdm() (*DeviceRdm, error) { + var ( + x DeviceRdm + xc C.libxl_device_rdm + ) + + C.libxl_device_rdm_init(&xc) + defer C.libxl_device_rdm_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceRdm) fromC(xc *C.libxl_device_rdm) error { + x.Start = uint64(xc.start) + x.Size = uint64(xc.size) + x.Policy = RdmReservePolicy(xc.policy) + + return nil +} + +func (x *DeviceRdm) toC(xc *C.libxl_device_rdm) (err error) { + defer func() { + if err != nil { + C.libxl_device_rdm_dispose(xc) + } + }() + + xc.start = C.uint64_t(x.Start) + xc.size = C.uint64_t(x.Size) + xc.policy = C.libxl_rdm_reserve_policy(x.Policy) + + return nil +} + +// NewDeviceUsbctrl returns an instance of DeviceUsbctrl initialized with defaults. +func NewDeviceUsbctrl() (*DeviceUsbctrl, error) { + var ( + x DeviceUsbctrl + xc C.libxl_device_usbctrl + ) + + C.libxl_device_usbctrl_init(&xc) + defer C.libxl_device_usbctrl_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceUsbctrl) fromC(xc *C.libxl_device_usbctrl) error { + x.Type = UsbctrlType(xc._type) + x.Devid = Devid(xc.devid) + x.Version = int(xc.version) + x.Ports = int(xc.ports) + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + + return nil +} + +func (x *DeviceUsbctrl) toC(xc *C.libxl_device_usbctrl) (err error) { + defer func() { + if err != nil { + C.libxl_device_usbctrl_dispose(xc) + } + }() + + xc._type = C.libxl_usbctrl_type(x.Type) + xc.devid = C.libxl_devid(x.Devid) + xc.version = C.int(x.Version) + xc.ports = C.int(x.Ports) + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + + return nil +} + +// NewDeviceUsbdev returns an instance of DeviceUsbdev initialized with defaults. +func NewDeviceUsbdev(utype UsbdevType) (*DeviceUsbdev, error) { + var ( + x DeviceUsbdev + xc C.libxl_device_usbdev + ) + + C.libxl_device_usbdev_init(&xc) + C.libxl_device_usbdev_init_type(&xc, C.libxl_usbdev_type(utype)) + defer C.libxl_device_usbdev_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceUsbdev) fromC(xc *C.libxl_device_usbdev) error { + x.Ctrl = Devid(xc.ctrl) + x.Port = int(xc.port) + x.Type = UsbdevType(xc._type) + switch x.Type { + case UsbdevTypeHostdev: + var typeHostdev DeviceUsbdevTypeUnionHostdev + if err := typeHostdev.fromC(xc); err != nil { + return fmt.Errorf("converting field typeHostdev: %v", err) + } + x.TypeUnion = typeHostdev + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + + return nil +} + +func (x *DeviceUsbdevTypeUnionHostdev) fromC(xc *C.libxl_device_usbdev) error { + if UsbdevType(xc._type) != UsbdevTypeHostdev { + return errors.New("expected union key UsbdevTypeHostdev") + } + + tmp := (*C.libxl_device_usbdev_type_union_hostdev)(unsafe.Pointer(&xc.u[0])) + x.Hostbus = byte(tmp.hostbus) + x.Hostaddr = byte(tmp.hostaddr) + return nil +} + +func (x *DeviceUsbdev) toC(xc *C.libxl_device_usbdev) (err error) { + defer func() { + if err != nil { + C.libxl_device_usbdev_dispose(xc) + } + }() + + xc.ctrl = C.libxl_devid(x.Ctrl) + xc.port = C.int(x.Port) + xc._type = C.libxl_usbdev_type(x.Type) + switch x.Type { + case UsbdevTypeHostdev: + tmp, ok := x.TypeUnion.(DeviceUsbdevTypeUnionHostdev) + if !ok { + return errors.New("wrong type for union key type") + } + var hostdev C.libxl_device_usbdev_type_union_hostdev + hostdev.hostbus = C.uint8_t(tmp.Hostbus) + hostdev.hostaddr = C.uint8_t(tmp.Hostaddr) + hostdevBytes := C.GoBytes(unsafe.Pointer(&hostdev), C.sizeof_libxl_device_usbdev_type_union_hostdev) + copy(xc.u[:], hostdevBytes) + default: + return fmt.Errorf("invalid union key '%v'", x.Type) + } + + return nil +} + +// NewDeviceDtdev returns an instance of DeviceDtdev initialized with defaults. +func NewDeviceDtdev() (*DeviceDtdev, error) { + var ( + x DeviceDtdev + xc C.libxl_device_dtdev + ) + + C.libxl_device_dtdev_init(&xc) + defer C.libxl_device_dtdev_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceDtdev) fromC(xc *C.libxl_device_dtdev) error { + x.Path = C.GoString(xc.path) + + return nil +} + +func (x *DeviceDtdev) toC(xc *C.libxl_device_dtdev) (err error) { + defer func() { + if err != nil { + C.libxl_device_dtdev_dispose(xc) + } + }() + + if x.Path != "" { + xc.path = C.CString(x.Path) + } + + return nil +} + +// NewDeviceVtpm returns an instance of DeviceVtpm initialized with defaults. +func NewDeviceVtpm() (*DeviceVtpm, error) { + var ( + x DeviceVtpm + xc C.libxl_device_vtpm + ) + + C.libxl_device_vtpm_init(&xc) + defer C.libxl_device_vtpm_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVtpm) fromC(xc *C.libxl_device_vtpm) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + if err := x.Uuid.fromC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + + return nil +} + +func (x *DeviceVtpm) toC(xc *C.libxl_device_vtpm) (err error) { + defer func() { + if err != nil { + C.libxl_device_vtpm_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + if err := x.Uuid.toC(&xc.uuid); err != nil { + return fmt.Errorf("converting field Uuid: %v", err) + } + + return nil +} + +// NewDeviceP9 returns an instance of DeviceP9 initialized with defaults. +func NewDeviceP9() (*DeviceP9, error) { + var ( + x DeviceP9 + xc C.libxl_device_p9 + ) + + C.libxl_device_p9_init(&xc) + defer C.libxl_device_p9_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceP9) fromC(xc *C.libxl_device_p9) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Tag = C.GoString(xc.tag) + x.Path = C.GoString(xc.path) + x.SecurityModel = C.GoString(xc.security_model) + x.Devid = Devid(xc.devid) + + return nil +} + +func (x *DeviceP9) toC(xc *C.libxl_device_p9) (err error) { + defer func() { + if err != nil { + C.libxl_device_p9_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + if x.Tag != "" { + xc.tag = C.CString(x.Tag) + } + if x.Path != "" { + xc.path = C.CString(x.Path) + } + if x.SecurityModel != "" { + xc.security_model = C.CString(x.SecurityModel) + } + xc.devid = C.libxl_devid(x.Devid) + + return nil +} + +// NewDevicePvcallsif returns an instance of DevicePvcallsif initialized with defaults. +func NewDevicePvcallsif() (*DevicePvcallsif, error) { + var ( + x DevicePvcallsif + xc C.libxl_device_pvcallsif + ) + + C.libxl_device_pvcallsif_init(&xc) + defer C.libxl_device_pvcallsif_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DevicePvcallsif) fromC(xc *C.libxl_device_pvcallsif) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + + return nil +} + +func (x *DevicePvcallsif) toC(xc *C.libxl_device_pvcallsif) (err error) { + defer func() { + if err != nil { + C.libxl_device_pvcallsif_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + + return nil +} + +// NewDeviceChannel returns an instance of DeviceChannel initialized with defaults. +func NewDeviceChannel(connection ChannelConnection) (*DeviceChannel, error) { + var ( + x DeviceChannel + xc C.libxl_device_channel + ) + + C.libxl_device_channel_init(&xc) + C.libxl_device_channel_init_connection(&xc, C.libxl_channel_connection(connection)) + defer C.libxl_device_channel_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceChannel) fromC(xc *C.libxl_device_channel) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.Name = C.GoString(xc.name) + x.Connection = ChannelConnection(xc.connection) + switch x.Connection { + case ChannelConnectionUnknown: + x.ConnectionUnion = nil + case ChannelConnectionPty: + x.ConnectionUnion = nil + case ChannelConnectionSocket: + var connectionSocket DeviceChannelConnectionUnionSocket + if err := connectionSocket.fromC(xc); err != nil { + return fmt.Errorf("converting field connectionSocket: %v", err) + } + x.ConnectionUnion = connectionSocket + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +func (x *DeviceChannelConnectionUnionSocket) fromC(xc *C.libxl_device_channel) error { + if ChannelConnection(xc.connection) != ChannelConnectionSocket { + return errors.New("expected union key ChannelConnectionSocket") + } + + tmp := (*C.libxl_device_channel_connection_union_socket)(unsafe.Pointer(&xc.u[0])) + x.Path = C.GoString(tmp.path) + return nil +} + +func (x *DeviceChannel) toC(xc *C.libxl_device_channel) (err error) { + defer func() { + if err != nil { + C.libxl_device_channel_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + if x.Name != "" { + xc.name = C.CString(x.Name) + } + xc.connection = C.libxl_channel_connection(x.Connection) + switch x.Connection { + case ChannelConnectionUnknown: + break + case ChannelConnectionPty: + break + case ChannelConnectionSocket: + tmp, ok := x.ConnectionUnion.(DeviceChannelConnectionUnionSocket) + if !ok { + return errors.New("wrong type for union key connection") + } + var socket C.libxl_device_channel_connection_union_socket + if tmp.Path != "" { + socket.path = C.CString(tmp.Path) + } + socketBytes := C.GoBytes(unsafe.Pointer(&socket), C.sizeof_libxl_device_channel_connection_union_socket) + copy(xc.u[:], socketBytes) + default: + return fmt.Errorf("invalid union key '%v'", x.Connection) + } + + return nil +} + +// NewConnectorParam returns an instance of ConnectorParam initialized with defaults. +func NewConnectorParam() (*ConnectorParam, error) { + var ( + x ConnectorParam + xc C.libxl_connector_param + ) + + C.libxl_connector_param_init(&xc) + defer C.libxl_connector_param_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *ConnectorParam) fromC(xc *C.libxl_connector_param) error { + x.UniqueId = C.GoString(xc.unique_id) + x.Width = uint32(xc.width) + x.Height = uint32(xc.height) + + return nil +} + +func (x *ConnectorParam) toC(xc *C.libxl_connector_param) (err error) { + defer func() { + if err != nil { + C.libxl_connector_param_dispose(xc) + } + }() + + if x.UniqueId != "" { + xc.unique_id = C.CString(x.UniqueId) + } + xc.width = C.uint32_t(x.Width) + xc.height = C.uint32_t(x.Height) + + return nil +} + +// NewDeviceVdispl returns an instance of DeviceVdispl initialized with defaults. +func NewDeviceVdispl() (*DeviceVdispl, error) { + var ( + x DeviceVdispl + xc C.libxl_device_vdispl + ) + + C.libxl_device_vdispl_init(&xc) + defer C.libxl_device_vdispl_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *DeviceVdispl) fromC(xc *C.libxl_device_vdispl) error { + x.BackendDomid = Domid(xc.backend_domid) + x.BackendDomname = C.GoString(xc.backend_domname) + x.Devid = Devid(xc.devid) + x.BeAlloc = bool(xc.be_alloc) + x.Connectors = nil + if n := int(xc.num_connectors); n > 0 { + cConnectors := (*[1 << 28]C.libxl_connector_param)(unsafe.Pointer(xc.connectors))[:n:n] + x.Connectors = make([]ConnectorParam, n) + for i, v := range cConnectors { + if err := x.Connectors[i].fromC(&v); err != nil { + return fmt.Errorf("converting field Connectors: %v", err) + } + } + } + + return nil +} + +func (x *DeviceVdispl) toC(xc *C.libxl_device_vdispl) (err error) { + defer func() { + if err != nil { + C.libxl_device_vdispl_dispose(xc) + } + }() + + xc.backend_domid = C.libxl_domid(x.BackendDomid) + if x.BackendDomname != "" { + xc.backend_domname = C.CString(x.BackendDomname) + } + xc.devid = C.libxl_devid(x.Devid) + xc.be_alloc = C.bool(x.BeAlloc) + if numConnectors := len(x.Connectors); numConnectors > 0 { + xc.connectors = (*C.libxl_connector_param)(C.malloc(C.ulong(numConnectors) * C.sizeof_libxl_connector_param)) + xc.num_connectors = C.int(numConnectors) + cConnectors := (*[1 << 28]C.libxl_connector_param)(unsafe.Pointer(xc.connectors))[:numConnectors:numConnectors] + for i, v := range x.Connectors { + if err := v.toC(&cConnectors[i]); err != nil { + return fmt.Errorf("converting field Connectors: %v", err) + } + } + } + + return nil +} + +// NewVsndParams returns an instance of VsndParams initialized with defaults. +func NewVsndParams() (*VsndParams, error) { + var ( + x VsndParams + xc C.libxl_vsnd_params + ) + + C.libxl_vsnd_params_init(&xc) + defer C.libxl_vsnd_params_dispose(&xc) + + if err := x.fromC(&xc); err != nil { + return nil, err + } + + return &x, nil +} + +func (x *VsndParams) fromC(xc *C.libxl_vsnd_params) error { + x.SampleRates = nil + if n := int(xc.num_sample_rates); n > 0 { + cSampleRates := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.sample_rates))[:n:n] + x.SampleRates = make([]uint32, n) + for i, v := range cSampleRates { + x.SampleRates[i] = uint32(v) + } + } + x.SampleFormats = nil + if n := int(xc.num_sample_formats); n > 0 { + cSampleFormats := (*[1 << 28]C.libxl_vsnd_pcm_format)(unsafe.Pointer(xc.sample_formats))[:n:n] + x.SampleFormats = make([]VsndPcmFormat, n) + for i, v := range cSampleFormats { + x.SampleFormats[i] = VsndPcmFormat(v) + } + } + x.ChannelsMin = uint32(xc.channels_min) + x.ChannelsMax = uint32(xc.channels_max) + x.BufferSize = uint32(xc.buffer_size) + + return nil +} + +func (x *VsndParams) toC(xc *C.libxl_vsnd_params) (err error) { + defer func() { + if err != nil { + C.libxl_vsnd_params_dispose(xc) + } + }() + + if numSampleRates := len(x.SampleRates); numSampleRates > 0 { + xc.sample_rates = (*C.uint32_t)(C.malloc(C.size_t(numSampleRates * numSampleRates))) + xc.num_sample_rates = C.int(numSampleRates) + cSampleRates := (*[1 << 28]C.uint32_t)(unsafe.Pointer(xc.sample_rates))[:numSampleRates:numSampleRates] + for i, v := range x.SampleRates { + cSampleRates[i] = C.uint32_t(v) + } + } + if numSampleFormats := len(x.SampleFormats); numSampleFormats > 0 { + xc.sample_formats = (*C.libxl_vsnd_pcm_format)(C.malloc(C.size_t(numSampleFormats * numSampleFormats))) + xc.num_sample_formats = C.int(numSampleFormats) + cSampleFormats := (*[1 << 28]C.libxl_vsnd_pcm_format)(unsafe.Pointer(xc.sample_formats))[:numSampleFormats:numSampleFormats] + for i, v := range x.SampleFormats { + cSampleFormats[i] = C.libxl_vsnd_pcm_format(v) + } + } + xc.channels_min = C.uint32_t(x.ChannelsMin) + xc.channels_max = C.uint32_t(x.ChannelsMax) + xc.buffer_size = C.uint32_t(x.BufferSize) + + return nil +} From xen-changelog-bounces@lists.xenproject.org Thu May 14 03:55:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 03:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4y6-00067c-G7; Thu, 14 May 2020 03:55:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4y5-00067V-Ed for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:33 +0000 X-Inumbo-ID: c2817b0a-9596-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c2817b0a-9596-11ea-ae69-bc764e2007e4; Thu, 14 May 2020 03:55:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WlCtkwy8lzNMSttjFNDKaFUapyxOeI6hEkaeTyOgp3M=; b=jl92+/yTsi+vk5ckrSBtX08MSc t7vxN9B+59Qa5kUiPfQrfIkMSMyW0jZzoc0hhBpBT0BJmGAg4eshcK5RUtxx/YgFiCqGnl3w+gpTt mHy1wBwQdgonwayefxxdVWDAxrhhigQq7GM5huDghdOMOvtNBb7ycMro4EGaw3XUEs4o=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ4y4-0002sY-R3 for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZ4y4-0007cy-Pt for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 03:55:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang/xenlight: init xenlight go module Message-Id: Date: Thu, 14 May 2020 03:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9d83ad86834300927b636fa02b29d84854399ed8 Author: Nick Rosbrook AuthorDate: Tue May 12 20:58:06 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 13:41:57 2020 +0100 golang/xenlight: init xenlight go module Initialize the xenlight Go module using the xenbits git-http URL, xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight. Also simplify the build Make target by using `go build` instead of `go install`, and do not set GOPATH here because it is now unnecessary. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- tools/golang/xenlight/Makefile | 2 +- tools/golang/xenlight/go.mod | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 753132306a..37ed1358c4 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -33,7 +33,7 @@ $(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go types.gen.go helpers. # so that it can find the actual library. .PHONY: build build: package - CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_XENLIGHT) -L$(XEN_LIBXENTOOLLOG)" GOPATH=$(XEN_GOPATH) $(GO) install -x $(XEN_GOCODE_URL)/xenlight + CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_XENLIGHT) -L$(XEN_LIBXENTOOLLOG)" $(GO) build -x .PHONY: install install: build diff --git a/tools/golang/xenlight/go.mod b/tools/golang/xenlight/go.mod new file mode 100644 index 0000000000..926474d929 --- /dev/null +++ b/tools/golang/xenlight/go.mod @@ -0,0 +1 @@ +module xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 14 06:00:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 06:00:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ6ue-0000qe-Ev; Thu, 14 May 2020 06:00:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ6ud-0000qZ-3D for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 06:00:07 +0000 X-Inumbo-ID: 2849d21e-95a8-11ea-a44e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2849d21e-95a8-11ea-a44e-12813bfff9fa; Thu, 14 May 2020 06:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Jbre8zE7/Z8rjIj42tf/qINWT0fdbtLlRD5Jr/F0weY=; b=06Lsa6GYjIQ+DCwtmI+2E3uyqM Fp7FJB5lRiRV2nZvC8aLGLu4S9c0vCviLhsNRI+tdyD2hPm3lBrSa01dobq+Cuf+YbWu9a43A5t8F /QS9WN9Rrxhp44lm7PPtFc4knvg9ztinZmgdSEfWDrxscEkWA22S2ZmqMYawx38DRQ3s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ6ua-0006S8-Vv for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 06:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZ6ua-0007L1-Ua for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 06:00:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/PVH: PHYSDEVOP_pci_mmcfg_reserved should not blindly register a region Message-Id: Date: Thu, 14 May 2020 06:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b539eeffc737d859dd1814c2e529e0ed0feba7a7 Author: Jan Beulich AuthorDate: Thu May 14 07:53:55 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 07:53:55 2020 +0200 x86/PVH: PHYSDEVOP_pci_mmcfg_reserved should not blindly register a region The op has a "is reserved" flag, and hence registration shouldn't happen unilaterally. Fixes: eb3dd90e4089 ("x86/physdev: enable PHYSDEVOP_pci_mmcfg_reserved for PVH Dom0") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/physdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 3a3c15890b..23465bcd00 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -556,7 +556,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = pci_mmcfg_reserved(info.address, info.segment, info.start_bus, info.end_bus, info.flags); - if ( !ret && has_vpci(currd) ) + if ( !ret && has_vpci(currd) && (info.flags & XEN_PCI_MMCFG_RESERVED) ) { /* * For HVM (PVH) domains try to add the newly found MMCFG to the -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 14 08:44:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 08:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ9TL-0007Rk-6n; Thu, 14 May 2020 08:44:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ9TK-0007Rc-Cv for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 08:44:06 +0000 X-Inumbo-ID: 10fc26fe-95bf-11ea-a462-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 10fc26fe-95bf-11ea-a462-12813bfff9fa; Thu, 14 May 2020 08:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5eEHQg1ES5ciCxFfylCioE6EIid1XPUDXifGb2xQE2U=; b=tC+vOB8+PyeAsq8g3fbDlrO695 IQPv8/T3AfNZYXITDCfcZ0GLiFIpLd6mf3langZrlxXyWU5KYIAb3T3LcdxdjqLdgOHHwh5En7g+k S1mS06jO20h3L6wHT8C+tkxZDVsyf3DxjTyeYoApxvGLAJM8RXwa7p4pnmj7k73rMmF0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ9TI-0001vk-Bi for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 08:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZ9TI-0001PW-Ac for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 08:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/xenstore: don't store domU's mfn of ring page in xenstored Message-Id: Date: Thu, 14 May 2020 08:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 122b52230aa5b79d65e18b8b77094027faa2f8e2 Author: Juergen Gross AuthorDate: Thu Apr 30 07:38:42 2020 +0200 Commit: Julien Grall CommitDate: Thu May 14 09:35:30 2020 +0100 tools/xenstore: don't store domU's mfn of ring page in xenstored The XS_INTRODUCE command has two parameters: the mfn (or better: gfn) of the domain's xenstore ring page and the event channel of the domain for communicating with Xenstore. The gfn is not really needed. It is stored in the per-domain struct in xenstored and in case of another XS_INTRODUCE for the domain it is tested to match the original value. If it doesn't match the command is aborted via EINVAL, otherwise the event channel to the domain is recreated. As XS_INTRODUCE is limited to dom0 and there is no real downside of recreating the event channel just omit the test for the gfn to match and don't return EINVAL for multiple XS_INTRODUCE calls. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_domain.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 5858185211..06359503f0 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -55,10 +55,6 @@ struct domain repeated domain introductions. */ evtchn_port_t remote_port; - /* The mfn associated with the event channel, used only to validate - repeated domain introductions. */ - unsigned long mfn; - /* Domain path in store. */ char *path; @@ -363,13 +359,12 @@ static void domain_conn_reset(struct domain *domain) domain->interface->rsp_cons = domain->interface->rsp_prod = 0; } -/* domid, mfn, evtchn, path */ +/* domid, gfn, evtchn, path */ int do_introduce(struct connection *conn, struct buffered_data *in) { struct domain *domain; char *vec[3]; unsigned int domid; - unsigned long mfn; evtchn_port_t port; int rc; struct xenstore_domain_interface *interface; @@ -381,7 +376,7 @@ int do_introduce(struct connection *conn, struct buffered_data *in) return EACCES; domid = atoi(vec[0]); - mfn = atol(vec[1]); + /* Ignore the gfn, we don't need it. */ port = atoi(vec[2]); /* Sanity check args. */ @@ -402,21 +397,19 @@ int do_introduce(struct connection *conn, struct buffered_data *in) return rc; } domain->interface = interface; - domain->mfn = mfn; /* Now domain belongs to its connection. */ talloc_steal(domain->conn, domain); fire_watches(NULL, in, "@introduceDomain", false); - } else if ((domain->mfn == mfn) && (domain->conn != conn)) { + } else { /* Use XS_INTRODUCE for recreating the xenbus event-channel. */ if (domain->port) xenevtchn_unbind(xce_handle, domain->port); rc = xenevtchn_bind_interdomain(xce_handle, domid, port); domain->port = (rc == -1) ? 0 : rc; domain->remote_port = port; - } else - return EINVAL; + } domain_conn_reset(domain); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 14 08:44:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 08:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ9TU-0007SQ-8K; Thu, 14 May 2020 08:44:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ9TT-0007SK-EC for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 08:44:15 +0000 X-Inumbo-ID: 1700ea30-95bf-11ea-a462-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1700ea30-95bf-11ea-a462-12813bfff9fa; Thu, 14 May 2020 08:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3JhnnRxuLgASPzNnRNJGpGqQXKoiHLMRNzBb2sZIynU=; b=BmwTiajzPLgE3QQGzebvlgKM2A QYu3CPhZ5Yf0xOZYPMXBZa+P8fYefGGzIBQRmqa29jpvRuhThd9O/8sDhFhcskQlVV5TtDEGR2BHh 44L7rQYXAfrfJhnBbs3wlhV1a69uB677kuw+jPaEEKYjDKKSivcmELeFI14zJ+awsA7E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZ9TS-0001wH-Fb for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 08:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZ9TS-0001QH-Dh for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 08:44:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/Kconfig: define EXPERT a bool rather than a string Message-Id: Date: Thu, 14 May 2020 08:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f8644fe441abfd8de8b1f237229cfbe600a58701 Author: Julien Grall AuthorDate: Thu Apr 30 15:25:47 2020 +0100 Commit: Julien Grall CommitDate: Thu May 14 09:35:30 2020 +0100 xen/Kconfig: define EXPERT a bool rather than a string Since commit f80fe2b34f08 "xen: Update Kconfig to Linux v5.4" EXPERT can only have two values (enabled or disabled). So switch from a string to a bool. Take the opportunity to replace all "EXPERT = y" to "EXPERT" and use squash the lines bool and prompt together in modified place. Signed-off-by: Julien Grall Acked-by: Dario Faggioli Acked-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/Kconfig | 3 +-- xen/Kconfig.debug | 2 +- xen/arch/arm/Kconfig | 12 +++++------- xen/arch/x86/Kconfig | 6 +++--- xen/common/Kconfig | 14 +++++++------- xen/common/sched/Kconfig | 2 +- xen/drivers/passthrough/Kconfig | 2 +- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 073042f467..120b5f4129 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -35,8 +35,7 @@ config DEFCONFIG_LIST default ARCH_DEFCONFIG config EXPERT - string - default y if "$(XEN_CONFIG_EXPERT)" = "y" + def_bool y if "$(XEN_CONFIG_EXPERT)" = "y" config LTO bool "Link Time Optimisation" diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index ee6ee33b69..fad3050d4f 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -11,7 +11,7 @@ config DEBUG You probably want to say 'N' here. -if DEBUG || EXPERT = "y" +if DEBUG || EXPERT config CRASH_DEBUG bool "Crash Debugging Support" diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index d51f66072e..2777388265 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -32,8 +32,7 @@ menu "Architecture Features" source "arch/Kconfig" config ACPI - bool - prompt "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT = "y" + bool "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT depends on ARM_64 ---help--- @@ -50,8 +49,7 @@ config GICV3 If unsure, say Y config HAS_ITS - bool - prompt "GICv3 ITS MSI controller support" if EXPERT = "y" + bool "GICv3 ITS MSI controller support" if EXPERT depends on GICV3 && !NEW_VGIC config HVM @@ -81,7 +79,7 @@ config SBSA_VUART_CONSOLE SBSA Generic UART implements a subset of ARM PL011 UART. config ARM_SSBD - bool "Speculative Store Bypass Disable" if EXPERT = "y" + bool "Speculative Store Bypass Disable" if EXPERT depends on HAS_ALTERNATIVE default y help @@ -91,7 +89,7 @@ config ARM_SSBD If unsure, say Y. config HARDEN_BRANCH_PREDICTOR - bool "Harden the branch predictor against aliasing attacks" if EXPERT = "y" + bool "Harden the branch predictor against aliasing attacks" if EXPERT default y help Speculation attacks against some high-performance processors rely on @@ -108,7 +106,7 @@ config HARDEN_BRANCH_PREDICTOR If unsure, say Y. config TEE - bool "Enable TEE mediators support" if EXPERT = "y" + bool "Enable TEE mediators support" if EXPERT default n help This option enables generic TEE mediators support. It allows guests diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 96432f1f69..b565f6831d 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -128,7 +128,7 @@ config BIGMEM If unsure, say N. config HVM_FEP - bool "HVM Forced Emulation Prefix support" if EXPERT = "y" + bool "HVM Forced Emulation Prefix support" if EXPERT default DEBUG depends on HVM ---help--- @@ -148,7 +148,7 @@ config HVM_FEP config TBOOT def_bool y - prompt "Xen tboot support" if EXPERT = "y" + prompt "Xen tboot support" if EXPERT select CRYPTO ---help--- Allows support for Trusted Boot using the Intel(R) Trusted Execution @@ -233,7 +233,7 @@ config HYPERV_GUEST endif config MEM_SHARING - bool "Xen memory sharing support" if EXPERT = "y" + bool "Xen memory sharing support" if EXPERT depends on HVM endmenu diff --git a/xen/common/Kconfig b/xen/common/Kconfig index a6914fcae9..fe9b41f721 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -12,7 +12,7 @@ config CORE_PARKING bool config GRANT_TABLE - bool "Grant table support" if EXPERT = "y" + bool "Grant table support" if EXPERT default y ---help--- Grant table provides a generic mechanism to memory sharing @@ -128,7 +128,7 @@ config KEXEC If unsure, say Y. config EFI_SET_VIRTUAL_ADDRESS_MAP - bool "EFI: call SetVirtualAddressMap()" if EXPERT = "y" + bool "EFI: call SetVirtualAddressMap()" if EXPERT ---help--- Call EFI SetVirtualAddressMap() runtime service to setup memory map for further runtime services. According to UEFI spec, it isn't strictly @@ -139,7 +139,7 @@ config EFI_SET_VIRTUAL_ADDRESS_MAP config XENOPROF def_bool y - prompt "Xen Oprofile Support" if EXPERT = "y" + prompt "Xen Oprofile Support" if EXPERT depends on X86 ---help--- Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual @@ -176,7 +176,7 @@ config XSM_FLASK config XSM_FLASK_AVC_STATS def_bool y - prompt "Maintain statistics on the FLASK access vector cache" if EXPERT = "y" + prompt "Maintain statistics on the FLASK access vector cache" if EXPERT depends on XSM_FLASK ---help--- Maintain counters on the access vector cache that can be viewed using @@ -249,7 +249,7 @@ config LATE_HWDOM If unsure, say N. config ARGO - bool "Argo: hypervisor-mediated interdomain communication" if EXPERT = "y" + bool "Argo: hypervisor-mediated interdomain communication" if EXPERT ---help--- Enables a hypercall for domains to ask the hypervisor to perform data transfer of messages between domains. @@ -321,7 +321,7 @@ config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS build becoming overly verbose. config CMDLINE - string "Built-in hypervisor command string" if EXPERT = "y" + string "Built-in hypervisor command string" if EXPERT default "" ---help--- Enter arguments here that should be compiled into the hypervisor @@ -354,7 +354,7 @@ config DOM0_MEM Leave empty if you are not sure what to specify. config TRACEBUFFER - bool "Enable tracing infrastructure" if EXPERT = "y" + bool "Enable tracing infrastructure" if EXPERT default y ---help--- Enable tracing infrastructure and pre-defined tracepoints within Xen. diff --git a/xen/common/sched/Kconfig b/xen/common/sched/Kconfig index 883ac87cab..61231aacaa 100644 --- a/xen/common/sched/Kconfig +++ b/xen/common/sched/Kconfig @@ -1,5 +1,5 @@ menu "Schedulers" - visible if EXPERT = "y" + visible if EXPERT config SCHED_CREDIT bool "Credit scheduler support" diff --git a/xen/drivers/passthrough/Kconfig b/xen/drivers/passthrough/Kconfig index e7e62ccd63..73f4ad89ec 100644 --- a/xen/drivers/passthrough/Kconfig +++ b/xen/drivers/passthrough/Kconfig @@ -14,7 +14,7 @@ config ARM_SMMU ARM SMMU architecture. config IPMMU_VMSA - bool "Renesas IPMMU-VMSA found in R-Car Gen3 SoCs" if EXPERT = "y" + bool "Renesas IPMMU-VMSA found in R-Car Gen3 SoCs" if EXPERT depends on ARM_64 ---help--- Support for implementations of the Renesas IPMMU-VMSA found -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 14 09:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 09:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZA46-0003W5-OB; Thu, 14 May 2020 09:22:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZA45-0003W0-Jj for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 09:22:05 +0000 X-Inumbo-ID: 6016daf4-95c4-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6016daf4-95c4-11ea-b07b-bc764e2007e4; Thu, 14 May 2020 09:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=R51Wl6CPG0vI94WQct4OWd/EPXsKMR1QNQ6lwCGtjbs=; b=Cos584apwx4N7r+7BHJCBbDtLl yf+E1Sojso1w1ZNUeRM9C36uamcQY1XstV5WOqPBRKLX/UZ4jzxvbo/TfX0+n4vFtTYZSdzhWrK+g plX49OuTAcMgtVzlnG8F3L8/ZCgRTCklyeXysUif1aAC+VawO+QGalbBu04xyCP6Zb9Q=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZA44-0002nE-I4 for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 09:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZA44-0003ng-Gf for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 09:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: Allow EXPERT mode to be selected from the menuconfig directly Message-Id: Date: Thu, 14 May 2020 09:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d155e4aef35cd9c03f6db7030a956f83f33a1e99 Author: Julien Grall AuthorDate: Thu Apr 30 15:25:48 2020 +0100 Commit: Julien Grall CommitDate: Thu May 14 10:20:04 2020 +0100 xen: Allow EXPERT mode to be selected from the menuconfig directly EXPERT mode is currently used to gate any options that are in technical preview or not security supported. At the moment, this is selected by adding XEN_CONFIG_EXPERT=y on the make command line, or to the (currently undocumented) top-level .config file. This makes the option very unintuitive to use: If the user forgets to add the option when (re)building or when using menuconfig, then xen/.config will be silently rewritten, leading to behavior which is very difficult to diagnose. Adding XEN_CONFIG_EXPERT=y to the top-level .config is not obvious behavior, particularly as the file is undocumented. A lot of the options behind EXPERT would benefit from being more accessible so users can experiment with them and voice any concerns before they are fully supported. To make this option more discoverable and consistent to use, make it possible to select it from the menuconfig. This doesn't change the fact a Xen with EXPERT mode selected will not be security supported. Signed-off-by: Julien Grall Signed-off-by: George Dunlap Acked-by: Ian Jackson --- xen/Kconfig | 10 +++++++++- xen/Makefile | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 120b5f4129..34c318bfa2 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -35,7 +35,15 @@ config DEFCONFIG_LIST default ARCH_DEFCONFIG config EXPERT - def_bool y if "$(XEN_CONFIG_EXPERT)" = "y" + bool "Configure standard Xen features (expert users)" + help + This option allows certain base Xen options and settings + to be disabled or tweaked. This is for specialized environments + which can tolerate a "non-standard" Xen. + Only use this if you really know what you are doing. + Xen binaries built with this option enabled are not security + supported. + default n config LTO bool "Link Time Optimisation" diff --git a/xen/Makefile b/xen/Makefile index 2b1dacb497..286f374b54 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -11,7 +11,6 @@ export XEN_DOMAIN ?= $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) | export XEN_BUILD_DATE ?= $(shell LC_ALL=C date) export XEN_BUILD_TIME ?= $(shell LC_ALL=C date +%T) export XEN_BUILD_HOST ?= $(shell hostname) -export XEN_CONFIG_EXPERT ?= n # Best effort attempt to find a python interpreter, defaulting to Python 3 if # available. Fall back to just `python` if `which` is nowhere to be found. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 14 12:22:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 12:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZCsL-0005DL-5O; Thu, 14 May 2020 12:22:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZCsJ-0005DD-P7 for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 12:22:07 +0000 X-Inumbo-ID: 857a0fe6-95dd-11ea-a481-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 857a0fe6-95dd-11ea-a481-12813bfff9fa; Thu, 14 May 2020 12:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fYE1GE35n5OqST/iFUDB1kfKH2hPQxRZFAKhVi8ed3Q=; b=m4MY1uSBB/E1y3SsnQUzTapGI2 kA2I4LRKcKQsrs4GwBRvQ/d77/9v3gfpIRnXzu5ECLJ1Ourjd7zc+KLtk1qJEljneQ3nZZKsjDZMa juk1aiCnIeut+w0C3qR1ZomSWoVSfUeYaPXFe77EJq9vzNH0BeU/BS6iQJqZrUSPOxFQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZCsG-0006fy-Mp for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 12:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZCsG-0006tD-LU for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 12:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.13] update Xen version to 4.13.1 Message-Id: Date: Thu, 14 May 2020 12:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6278553325a9f76d37811923221b21db3882e017 Author: Jan Beulich AuthorDate: Thu May 14 14:19:32 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 14:19:32 2020 +0200 update Xen version to 4.13.1 --- Config.mk | 6 +++--- xen/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index c47e8339a3..c70957d730 100644 --- a/Config.mk +++ b/Config.mk @@ -275,15 +275,15 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 20d2e5a125e34fc8501026613a71549b2a1a3e54 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.13.0 -MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.13.0 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.13.1 +MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.13.1 SEABIOS_UPSTREAM_REVISION ?= rel-1.12.1 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.13.0 +QEMU_TRADITIONAL_REVISION ?= xen-4.13.1 # Wed Oct 10 18:52:54 2018 +0000 # xen/pt: allow QEMU to request MSI unmasking at bind time diff --git a/xen/Makefile b/xen/Makefile index 4575bca475..6b89ff1162 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 13 -export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.13 From xen-changelog-bounces@lists.xenproject.org Thu May 14 12:33:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 12:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZD31-000698-7c; Thu, 14 May 2020 12:33:11 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZD30-000692-Al for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 12:33:10 +0000 X-Inumbo-ID: 0edafbb4-95df-11ea-a483-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0edafbb4-95df-11ea-a483-12813bfff9fa; Thu, 14 May 2020 12:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6ndwUDUTKwmJVzyyeYjqevcXqwmv03IsPFWzU8XCI4Y=; b=FvrF7QsGZsizaLvu4RNbDF18jO m8q0f4yo3vr6d0OGEWY3E2vXykgSrYBKsd4t9ML9tY/+Shg/p5uJZ+sKDg4lnutIzFmzU+pfyAS7T 6l7YZu1khdlso5U6jzXjNCWVZ7PvMCk9P8lredDrw7Ni7wxPWaF3m6+p1qh1PgyW4DpM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZD2u-0006t9-NM for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 12:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZD2u-0007VJ-Lw for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 12:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging-4.12] update Xen version to 4.12.3 Message-Id: Date: Thu, 14 May 2020 12:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 09b61126b4d1e9d372fd2e24b702be10a358da9d Author: Jan Beulich AuthorDate: Thu May 14 14:21:48 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 14:21:48 2020 +0200 update Xen version to 4.12.3 --- Config.mk | 6 +++--- xen/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 661e61b1ee..0298482ca6 100644 --- a/Config.mk +++ b/Config.mk @@ -275,15 +275,15 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= ef529e6ab7c31290a33045bb1f1837447cc0eb56 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.12.2 -MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.12.2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.12.3 +MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.12.3 SEABIOS_UPSTREAM_REVISION ?= rel-1.12.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.12.2 +QEMU_TRADITIONAL_REVISION ?= xen-4.12.3 # Wed Oct 10 18:52:54 2018 +0000 # xen/pt: allow QEMU to request MSI unmasking at bind time diff --git a/xen/Makefile b/xen/Makefile index 8ac4feb2f6..baa61cd27b 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 12 -export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#staging-4.12 From xen-changelog-bounces@lists.xenproject.org Thu May 14 13:11:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 14 May 2020 13:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZDdi-0001Hk-M3; Thu, 14 May 2020 13:11:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZDdh-0001Hf-I3 for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 13:11:05 +0000 X-Inumbo-ID: 5cd27fff-95e4-11ea-a488-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5cd27fff-95e4-11ea-a488-12813bfff9fa; Thu, 14 May 2020 13:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YI1K9uysZzm7TiKI7uA/7ccVM8PtQFG8QzGtI4jYZg8=; b=fV7aRLdGPZBK8sPKLgDSC3nX9N t7EoByWE690+ybbKcdoI/fqf3qwuof4027kEHBuciOGtbQfOs6MtuiP0m+lNFj3e8LLYDXHVLed3f LaHLN5hofHAOAF83d/oIxOUxOxrMu9WBdq0HLUe33/vVAJp2dCwRxJPFZrMyz+k7/uE0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZDdg-0007f1-A1 for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 13:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZDdg-0001kS-8e for xen-changelog@lists.xenproject.org; Thu, 14 May 2020 13:11:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/APIC: restrict certain messages to BSP Message-Id: Date: Thu, 14 May 2020 13:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5115b437eef595ce77f05bfc02626e31e263e965 Author: Jan Beulich AuthorDate: Thu May 14 15:04:32 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 15:04:32 2020 +0200 x86/APIC: restrict certain messages to BSP All CPUs get an equal setting of EOI broadcast suppression; no need to log one message per CPU, even if it's only in verbose APIC mode. Only the BSP is eligible to possibly get ExtINT enabled; no need to log that it gets disabled on all APs, even if - again - it's only in verbose APIC mode. Take the opportunity and introduce a "bsp" parameter to the function, to stop using smp_processor_id() to tell BSP from APs. No functional change from this. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/apic.c | 19 ++++++++++--------- xen/arch/x86/smpboot.c | 4 ++-- xen/include/asm-x86/apic.h | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 71f4efb2fe..60627fd6e6 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -499,7 +499,7 @@ static void resume_x2apic(void) __enable_x2apic(); } -void setup_local_APIC(void) +void setup_local_APIC(bool bsp) { unsigned long oldvalue, value, maxlvt; int i, j; @@ -598,8 +598,8 @@ void setup_local_APIC(void) if ( directed_eoi_enabled ) { value |= APIC_SPIV_DIRECTED_EOI; - apic_printk(APIC_VERBOSE, "Suppress EOI broadcast on CPU#%d\n", - smp_processor_id()); + if ( bsp ) + apic_printk(APIC_VERBOSE, "Suppressing EOI broadcast\n"); } apic_write(APIC_SPIV, value); @@ -615,21 +615,22 @@ void setup_local_APIC(void) * TODO: set up through-local-APIC from through-I/O-APIC? --macro */ value = apic_read(APIC_LVT0) & APIC_LVT_MASKED; - if (!smp_processor_id() && (pic_mode || !value)) { + if (bsp && (pic_mode || !value)) { value = APIC_DM_EXTINT; apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n", smp_processor_id()); } else { value = APIC_DM_EXTINT | APIC_LVT_MASKED; - apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n", - smp_processor_id()); + if (bsp) + apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n", + smp_processor_id()); } apic_write(APIC_LVT0, value); /* * only the BP should see the LINT1 NMI signal, obviously. */ - if (!smp_processor_id()) + if (bsp) value = APIC_DM_NMI; else value = APIC_DM_NMI | APIC_LVT_MASKED; @@ -663,7 +664,7 @@ void setup_local_APIC(void) printk("Leaving ESR disabled.\n"); } - if (nmi_watchdog == NMI_LOCAL_APIC && smp_processor_id()) + if (nmi_watchdog == NMI_LOCAL_APIC && !bsp) setup_apic_nmi_watchdog(); apic_pm_activate(); } @@ -1474,7 +1475,7 @@ int __init APIC_init_uniprocessor (void) physids_clear(phys_cpu_present_map); physid_set(boot_cpu_physical_apicid, phys_cpu_present_map); - setup_local_APIC(); + setup_local_APIC(true); if (nmi_watchdog == NMI_LOCAL_APIC) check_nmi_watchdog(); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index f999323bc4..170ab24e66 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -192,7 +192,7 @@ static void smp_callin(void) */ Dprintk("CALLIN, before setup_local_APIC().\n"); x2apic_ap_setup(); - setup_local_APIC(); + setup_local_APIC(false); /* Save our processor parameters. */ if ( !smp_store_cpu_info(cpu) ) @@ -1183,7 +1183,7 @@ void __init smp_prepare_cpus(void) verify_local_APIC(); connect_bsp_APIC(); - setup_local_APIC(); + setup_local_APIC(true); if ( !skip_ioapic_setup && nr_ioapics ) setup_IO_APIC(); diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index 4759279eb2..8ddb896ee9 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -169,7 +169,7 @@ extern int verify_local_APIC (void); extern void cache_APIC_registers (void); extern void sync_Arb_IDs (void); extern void init_bsp_APIC (void); -extern void setup_local_APIC (void); +extern void setup_local_APIC(bool bsp); extern void init_apic_mappings (void); extern void smp_local_timer_interrupt (struct cpu_user_regs *regs); extern void setup_boot_APIC_clock (void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 00:00:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 00:00:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZNll-0005R6-FG; Fri, 15 May 2020 00:00:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZNlk-00058g-3b for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 00:00:04 +0000 X-Inumbo-ID: 062232b6-963f-11ea-a4f7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 062232b6-963f-11ea-a4f7-12813bfff9fa; Fri, 15 May 2020 00:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BD8cwj5uWljK52tpL6MbFKMgMLv2bFBz11zJhIA2TlY=; b=0oJ5bkH+oAdMCXvRWPHrmxIacz z/jSwr7gI2vW32JBZ4JSY7qEGohf/fwFK6VLr7TSAL5BX/vuMwe9Czw2KEtja/0KSMQyAoWcEPict 3fK5f5ZCF+jvx+9NhEFs0ivEkGXtPO5wRbpB8EfNN+h5EjSG7yv1HTULXlNKWfx0jBMM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZNlh-000551-NF for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 00:00:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZNlh-0005tb-LT for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 00:00:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.13] update Xen version to 4.13.1 Message-Id: Date: Fri, 15 May 2020 00:00:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6278553325a9f76d37811923221b21db3882e017 Author: Jan Beulich AuthorDate: Thu May 14 14:19:32 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 14:19:32 2020 +0200 update Xen version to 4.13.1 --- Config.mk | 6 +++--- xen/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index c47e8339a3..c70957d730 100644 --- a/Config.mk +++ b/Config.mk @@ -275,15 +275,15 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 20d2e5a125e34fc8501026613a71549b2a1a3e54 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.13.0 -MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.13.0 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.13.1 +MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.13.1 SEABIOS_UPSTREAM_REVISION ?= rel-1.12.1 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.13.0 +QEMU_TRADITIONAL_REVISION ?= xen-4.13.1 # Wed Oct 10 18:52:54 2018 +0000 # xen/pt: allow QEMU to request MSI unmasking at bind time diff --git a/xen/Makefile b/xen/Makefile index 4575bca475..6b89ff1162 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 13 -export XEN_EXTRAVERSION ?= .1-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .1$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.13 From xen-changelog-bounces@lists.xenproject.org Fri May 15 02:11:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 02:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZPoW-0001al-5z; Fri, 15 May 2020 02:11:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZPoV-0001ag-3F for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 02:11:03 +0000 X-Inumbo-ID: 531c0008-9651-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 531c0008-9651-11ea-ae69-bc764e2007e4; Fri, 15 May 2020 02:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NF56zsAp3b9MKkbI6Il7aJ9d+T16yrOIaeCzAodIh+A=; b=N5rE6cQwvoTL6fSUQa6oLAK4Yb WszkgGhtb+58PSkh0b5q9TMqR0mOXcAF0a8U+mZhAlH1brVswKBKXUHRJ7ydCw0xqvSuVhLH/X56F y55r3EYEWJ7Bh2KxmdGG8tei7AzGORg51QXWOCEbQQTAYF8gddXeJgywqvDPZfDGmAM8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZPoT-0001gG-OY for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 02:11:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZPoT-0007us-Mq for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 02:11:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen stable-4.12] update Xen version to 4.12.3 Message-Id: Date: Fri, 15 May 2020 02:11:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 09b61126b4d1e9d372fd2e24b702be10a358da9d Author: Jan Beulich AuthorDate: Thu May 14 14:21:48 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 14:21:48 2020 +0200 update Xen version to 4.12.3 --- Config.mk | 6 +++--- xen/Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 661e61b1ee..0298482ca6 100644 --- a/Config.mk +++ b/Config.mk @@ -275,15 +275,15 @@ SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= ef529e6ab7c31290a33045bb1f1837447cc0eb56 -QEMU_UPSTREAM_REVISION ?= qemu-xen-4.12.2 -MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.12.2 +QEMU_UPSTREAM_REVISION ?= qemu-xen-4.12.3 +MINIOS_UPSTREAM_REVISION ?= xen-RELEASE-4.12.3 SEABIOS_UPSTREAM_REVISION ?= rel-1.12.0 ETHERBOOT_NICS ?= rtl8139 8086100e -QEMU_TRADITIONAL_REVISION ?= xen-4.12.2 +QEMU_TRADITIONAL_REVISION ?= xen-4.12.3 # Wed Oct 10 18:52:54 2018 +0000 # xen/pt: allow QEMU to request MSI unmasking at bind time diff --git a/xen/Makefile b/xen/Makefile index 8ac4feb2f6..baa61cd27b 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -2,7 +2,7 @@ # All other places this is stored (eg. compile.h) should be autogenerated. export XEN_VERSION = 4 export XEN_SUBVERSION = 12 -export XEN_EXTRAVERSION ?= .3-pre$(XEN_VENDORVERSION) +export XEN_EXTRAVERSION ?= .3$(XEN_VENDORVERSION) export XEN_FULLVERSION = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION) -include xen-version -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.12 From xen-changelog-bounces@lists.xenproject.org Fri May 15 13:22:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 13:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZaHv-0005yW-Ab; Fri, 15 May 2020 13:22:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZaHt-0005yR-IF for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 13:22:05 +0000 X-Inumbo-ID: 115ae4d2-96af-11ea-a56b-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 115ae4d2-96af-11ea-a56b-12813bfff9fa; Fri, 15 May 2020 13:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=v9v9Uqu68KmOVjM8Gc4+WBy0N90bOblqr51rsQ9BEQU=; b=JkzsRG3kB000eJ8ZI5KoBRwBeV 5kxmGc5stP0ReyJ37Pq0FcV9Zyj0Qu/zZQ9qsW4eh3dN5QB0v9gxl6MmV7g711wB/eFETVJxZIIBb yl15/zD3PvJTOKvK3BIS8UuPHQ593RzaM5/+zkX2h855A0WXEUlCdh0wX+C9qpp4ZjBU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZaHs-0008Bu-74 for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 13:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZaHs-0005mv-5p for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 13:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/gen-cpuid: Distinguish default vs max in feature annotations Message-Id: Date: Fri, 15 May 2020 13:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 58202ebc5a7fbf8f03875c2b5218d3deed6debe8 Author: Andrew Cooper AuthorDate: Tue Feb 25 15:33:31 2020 +0000 Commit: Andrew Cooper CommitDate: Fri May 15 14:21:20 2020 +0100 x86/gen-cpuid: Distinguish default vs max in feature annotations Allow lowercase a/s/h to be used to annotate a non-default feature. However, until the toolstack migration logic is fixed, it is not safe to activate yet. Tolerate the annotations, but ignore them for now. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/public/arch-x86/cpufeatureset.h | 2 ++ xen/tools/gen-cpuid.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index e2749245f3..0ffab6c57b 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -87,6 +87,8 @@ enum { * 'A' = All guests. * 'S' = All HVM guests (not PV guests). * 'H' = HVM HAP guests (not PV or HVM Shadow guests). + * Upper case => Available by default + * Lower case => Can be opted-in to, but not available by default. */ /* Intel-defined CPU features, CPUID level 0x00000001.edx, word 0 */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index af5610a5e6..4ec73340de 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -23,6 +23,7 @@ class State(object): self.raw = { '!': set(), 'A': set(), 'S': set(), 'H': set(), + 'a': set(), 's': set(), 'h': set(), } # State calculated @@ -133,9 +134,13 @@ def crunch_numbers(state): state.hvm_shadow_def = state.pv_def | state.raw['S'] state.hvm_hap_def = state.hvm_shadow_def | state.raw['H'] + # TODO: Ignore def/max split until the toolstack migration logic is fixed state.pv_max = state.pv_def state.hvm_shadow_max = state.hvm_shadow_def state.hvm_hap_max = state.hvm_hap_def + # state.pv_max = state.raw['A'] | state.raw['a'] + # state.hvm_shadow_max = state.pv_max | state.raw['S'] | state.raw['s'] + # state.hvm_hap_max = state.hvm_shadow_max | state.raw['H'] | state.raw['h'] # # Feature dependency information. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 14:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 14:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbDy-0003YR-Q7; Fri, 15 May 2020 14:22:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbDx-0003YM-L6 for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:05 +0000 X-Inumbo-ID: 735c992a-96b7-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 735c992a-96b7-11ea-9887-bc764e2007e4; Fri, 15 May 2020 14:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q/et4MQLoG1Fq1hLEdz608phm/4cR+LmjFX+Th+Ou9w=; b=ha/Q+Za57V6SWEjEF+hR04KVqJ abcvoX7gamkiN5DXMepUFk5v5uEO5lxY+2xpi4M4rEZ3mXIMA8mIzjkBmarxbuTqlQ5FLTL1gpfZZ bKe36dFy66KUTEoVyhJUY0FXNeKzqFaFELu/99NfMCSHo0P2k6LEm6xlj0J7PzuCDbkw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbDw-00016O-JT for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZbDw-0001f3-IC for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem-paging: fold p2m_mem_paging_prep()'s main if()-s Message-Id: Date: Fri, 15 May 2020 14:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c2612852288c410846e41a7a882317e8bc55b9ff Author: Jan Beulich AuthorDate: Fri May 15 15:57:56 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 15:57:56 2020 +0200 x86/mem-paging: fold p2m_mem_paging_prep()'s main if()-s The condition of the second can be true only if the condition of the first was met; the second half of the condition of the second then also is redundant with an earlier check. Combine them, drop a pointless local variable, and take the liberty to drop the affected gdprintk() altogether, as we don't normally log anything on -EFAULT paths. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 4c1507d3a4..92c5ca6d37 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1808,6 +1808,8 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) /* Allocate a page if the gfn does not have one yet */ if ( !mfn_valid(mfn) ) { + void *guest_map; + /* If the user did not provide a buffer, we disallow */ ret = -EINVAL; if ( unlikely(user_ptr == NULL) ) @@ -1819,22 +1821,12 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) goto out; mfn = page_to_mfn(page); page_extant = 0; - } - - /* If we were given a buffer, now is the time to use it */ - if ( !page_extant && user_ptr ) - { - void *guest_map; - int rc; - ASSERT( mfn_valid(mfn) ); guest_map = map_domain_page(mfn); - rc = copy_from_user(guest_map, user_ptr, PAGE_SIZE); + ret = copy_from_user(guest_map, user_ptr, PAGE_SIZE); unmap_domain_page(guest_map); - if ( rc ) + if ( ret ) { - gdprintk(XENLOG_ERR, "Failed to load paging-in gfn %lx domain %u " - "bytes left %d\n", gfn_l, d->domain_id, rc); ret = -EFAULT; put_page(page); /* Don't leak pages */ goto out; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 14:22:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 14:22:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbE8-0003ZH-Rd; Fri, 15 May 2020 14:22:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbE7-0003Z9-CS for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:15 +0000 X-Inumbo-ID: 7964d6d4-96b7-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7964d6d4-96b7-11ea-9887-bc764e2007e4; Fri, 15 May 2020 14:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4cglPffiDzGBNdScrDj7W/RYD5YMU6aTADpyBQpY6eE=; b=7GJSYvSNinfWKZi5ZHHmN2EZN0 56btqftk1dger1rtzHBUuDsObLKpVW8cbl+JKSG4b/nfvTVAuNCz0z1ECewa7hIhpHB4L2INpHOGO k4pUl0wA0UVehSGdOCPlpCOpN8Q4F0iACBhwPsU7wQcmbnEEWAFDCyDTPIcnGBo7i7n0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbE6-00016U-Ml for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZbE6-0001fb-LR for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem-paging: correct p2m_mem_paging_prep()'s error handling Message-Id: Date: Fri, 15 May 2020 14:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ecb913be4aaae0e01d6a65e8e1c1ac78816b8809 Author: Jan Beulich AuthorDate: Fri May 15 16:01:06 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:01:06 2020 +0200 x86/mem-paging: correct p2m_mem_paging_prep()'s error handling Communicating errors from p2m_set_entry() to the caller is not enough: Neither the M2P nor the stats updates should occur in such a case. Instead the allocated page needs to be freed again; for cleanliness reasons also properly take into account _PGC_allocated there. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm/p2m.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 92c5ca6d37..60a061216a 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1781,7 +1781,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) */ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) { - struct page_info *page; + struct page_info *page = NULL; p2m_type_t p2mt; p2m_access_t a; gfn_t gfn = _gfn(gfn_l); @@ -1816,9 +1816,19 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) goto out; /* Get a free page */ ret = -ENOMEM; - page = alloc_domheap_page(p2m->domain, 0); + page = alloc_domheap_page(d, 0); if ( unlikely(page == NULL) ) goto out; + if ( unlikely(!get_page(page, d)) ) + { + /* + * The domain can't possibly know about this page yet, so failure + * here is a clear indication of something fishy going on. + */ + domain_crash(d); + page = NULL; + goto out; + } mfn = page_to_mfn(page); page_extant = 0; @@ -1828,7 +1838,6 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) if ( ret ) { ret = -EFAULT; - put_page(page); /* Don't leak pages */ goto out; } } @@ -1839,13 +1848,24 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, paging_mode_log_dirty(d) ? p2m_ram_logdirty : p2m_ram_rw, a); - set_gpfn_from_mfn(mfn_x(mfn), gfn_l); + if ( !ret ) + { + set_gpfn_from_mfn(mfn_x(mfn), gfn_l); - if ( !page_extant ) - atomic_dec(&d->paged_pages); + if ( !page_extant ) + atomic_dec(&d->paged_pages); + } out: gfn_unlock(p2m, gfn, 0); + + if ( page ) + { + if ( ret ) + put_page_alloc_ref(page); + put_page(page); + } + return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 14:22:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 14:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEJ-0003ad-TJ; Fri, 15 May 2020 14:22:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEI-0003aQ-Bv for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:26 +0000 X-Inumbo-ID: 7e702338-96b7-11ea-a576-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7e702338-96b7-11ea-a576-12813bfff9fa; Fri, 15 May 2020 14:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4kaSRuug2QI8OGsTJe1AA3RUvC+woLqVMKjM91MyUE0=; b=e1SLieBEz9oDLQS3CpxJKBQG/D Q89+9p528I8NmzgzL/z6NsiM1QQpMIrZFbxDyqcbDZGINbgjfOjj9vSZLc2jyi9wH+6go/FveDosG DY9ugOUMW/VDCLtZhrnRgMxHGaYER2gbAGJ/kxiusLu7cNMUxiFlBMtwF/+/fHradPPo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEG-00016j-QC for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZbEG-0001gG-P0 for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem-paging: add minimal lock order enforcement to p2m_mem_paging_prep() Message-Id: Date: Fri, 15 May 2020 14:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 142daae09f4ecafb505d21ea9a2203a3392ecc3b Author: Jan Beulich AuthorDate: Fri May 15 16:02:39 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:02:39 2020 +0200 x86/mem-paging: add minimal lock order enforcement to p2m_mem_paging_prep() While full checking is impossible (as the lock is being acquired/ released down the call tree), perform at least a lock level check. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm/p2m.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 60a061216a..9b7b0bf103 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1816,6 +1816,7 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) goto out; /* Get a free page */ ret = -ENOMEM; + page_alloc_mm_pre_lock(d); page = alloc_domheap_page(d, 0); if ( unlikely(page == NULL) ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 14:22:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 14:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbES-0003bp-Ur; Fri, 15 May 2020 14:22:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbER-0003be-IY for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:35 +0000 X-Inumbo-ID: 856a6b88-96b7-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 856a6b88-96b7-11ea-ae69-bc764e2007e4; Fri, 15 May 2020 14:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HvipzO8ljUL270BN0UDbcrOr3JSgFSartBArM0eDd68=; b=Jmqh9snnU5B3xH4VELDgYuAFeq o2cvneLq/CCbOaw9t2M3gLk9GoHuml51tJXsHBA20MizLvpm7SS2gGTFFzb8RcQgTYFCqjRoRJeKf +3tZ3nrBRV9oJpu8hndhNVIqLr5NjLidrRLvg0RAa3k9en8SqS5pIfr7Bs7y7Dm5Ntt0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEQ-000171-Ss for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZbEQ-0001gv-Rz for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] sched: allow rcu work to happen when syncing cpus in core scheduling Message-Id: Date: Fri, 15 May 2020 14:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4e9c57c4edbabab1b66f965db0203100097944ff Author: Juergen Gross AuthorDate: Fri May 15 16:04:00 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:04:00 2020 +0200 sched: allow rcu work to happen when syncing cpus in core scheduling With RCU barriers moved from tasklets to normal RCU processing cpu offlining in core scheduling might deadlock due to cpu synchronization required by RCU processing and core scheduling concurrently. Fix that by bailing out from core scheduling synchronization in case of pending RCU work. Additionally the RCU softirq is now required to be of higher priority than the scheduling softirqs in order to do RCU processing before entering the scheduler again, as bailing out from the core scheduling synchronization requires to raise another softirq SCHED_SLAVE, which would bypass RCU processing again. Reported-by: Sergey Dyasli Tested-by: Sergey Dyasli Signed-off-by: Juergen Gross Acked-by: Dario Faggioli --- xen/common/sched/core.c | 13 ++++++++++--- xen/include/xen/softirq.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index d94b95285f..5df66cbf9b 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -2457,13 +2457,20 @@ static struct sched_unit *sched_wait_rendezvous_in(struct sched_unit *prev, v = unit2vcpu_cpu(prev, cpu); } /* - * Coming from idle might need to do tasklet work. + * Check for any work to be done which might need cpu synchronization. + * This is either pending RCU work, or tasklet work when coming from + * idle. It is mandatory that RCU softirqs are of higher priority + * than scheduling ones as otherwise a deadlock might occur. * In order to avoid deadlocks we can't do that here, but have to - * continue the idle loop. + * schedule the previous vcpu again, which will lead to the desired + * processing to be done. * Undo the rendezvous_in_cnt decrement and schedule another call of * sched_slave(). */ - if ( is_idle_unit(prev) && sched_tasklet_check_cpu(cpu) ) + BUILD_BUG_ON(RCU_SOFTIRQ > SCHED_SLAVE_SOFTIRQ || + RCU_SOFTIRQ > SCHEDULE_SOFTIRQ); + if ( rcu_pending(cpu) || + (is_idle_unit(prev) && sched_tasklet_check_cpu(cpu)) ) { struct vcpu *vprev = current; diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index b4724f5c8b..1f6c4783da 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -4,10 +4,10 @@ /* Low-latency softirqs come first in the following list. */ enum { TIMER_SOFTIRQ = 0, + RCU_SOFTIRQ, SCHED_SLAVE_SOFTIRQ, SCHEDULE_SOFTIRQ, NEW_TLBFLUSH_CLOCK_PERIOD_SOFTIRQ, - RCU_SOFTIRQ, TASKLET_SOFTIRQ, NR_COMMON_SOFTIRQS }; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 14:22:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 14:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEd-0003cs-0N; Fri, 15 May 2020 14:22:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEb-0003cj-TK for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:45 +0000 X-Inumbo-ID: 8b706672-96b7-11ea-a576-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8b706672-96b7-11ea-a576-12813bfff9fa; Fri, 15 May 2020 14:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=K2J4rQsBwj/5poTGLI4L0XMvef8lskERSCDY0TohmgQ=; b=QRBckgr7CHXUq36dyEOu/XFSKN N63GAV+80Ho0hjhao+lIWLhMPOrDEXMPuVLtFouyRFu0JkkNVVNF47GyxP53xnZmUUwmmPDfOJogR k+ijtPGtHoPNiUll9XXB7C1BKrKNuqroxEKPcqU0O525tK8F2ZLM+I7t+hxBLhClOvWA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEb-00017K-08 for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZbEa-0001iD-VQ for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: support SERIALIZE Message-Id: Date: Fri, 15 May 2020 14:22:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cca6bf0730ec206afe7ca0536e38ed52ef2dc818 Author: Jan Beulich AuthorDate: Fri May 15 16:09:22 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:09:22 2020 +0200 x86emul: support SERIALIZE ... enabling its use by all guest kinds at the same time. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/libxl/libxl_cpuid.c | 1 + tools/misc/xen-cpuid.c | 1 + tools/tests/x86_emulator/x86-emulate.h | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 13 +++++++++++++ xen/include/asm-x86/cpufeature.h | 1 + xen/include/public/arch-x86/cpufeatureset.h | 1 + 6 files changed, 18 insertions(+) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 00262a3f8f..3ed4a074a4 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -214,6 +214,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-4vnniw",0x00000007, 0, CPUID_REG_EDX, 2, 1}, {"avx512-4fmaps",0x00000007, 0, CPUID_REG_EDX, 3, 1}, {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, + {"serialize", 0x00000007, 0, CPUID_REG_EDX, 14, 1}, {"cet-ibt", 0x00000007, 0, CPUID_REG_EDX, 20, 1}, {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index ff36d8cee1..6557a65d55 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -161,6 +161,7 @@ static const char *const str_7d0[32] = [10] = "md-clear", /* 12 */ [13] = "tsx-force-abort", + [14] = "serialize", [18] = "pconfig", [20] = "cet-ibt", diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 510850200a..dfb0a19394 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -156,6 +156,7 @@ static inline bool xcr0_mask(uint64_t mask) #define cpu_has_avx512_vpopcntdq (cp.feat.avx512_vpopcntdq && xcr0_mask(0xe6)) #define cpu_has_avx512_4vnniw (cp.feat.avx512_4vnniw && xcr0_mask(0xe6)) #define cpu_has_avx512_4fmaps (cp.feat.avx512_4fmaps && xcr0_mask(0xe6)) +#define cpu_has_serialize cp.feat.serialize #define cpu_has_avx512_bf16 (cp.feat.avx512_bf16 && xcr0_mask(0xe6)) #define cpu_has_xgetbv1 (cpu_has_xsave && cp.xstate.xgetbv1) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 7503da980f..4f5856251c 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1916,6 +1916,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) #define vcpu_has_avx512_4vnniw() (ctxt->cpuid->feat.avx512_4vnniw) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) +#define vcpu_has_serialize() (ctxt->cpuid->feat.serialize) #define vcpu_has_avx512_bf16() (ctxt->cpuid->feat.avx512_bf16) #define vcpu_must_have(feat) \ @@ -5639,6 +5640,18 @@ x86_emulate( goto done; break; + case 0xe8: + switch ( vex.pfx ) + { + case vex_none: /* serialize */ + host_and_vcpu_must_have(serialize); + asm volatile ( ".byte 0x0f, 0x01, 0xe8" ); + break; + default: + goto unimplemented_insn; + } + break; + case 0xf8: /* swapgs */ generate_exception_if(!mode_64bit(), EXC_UD); generate_exception_if(!mode_ring0(), EXC_GP, 0); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 859970570b..cadef4e824 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -126,6 +126,7 @@ #define cpu_has_avx512_4vnniw boot_cpu_has(X86_FEATURE_AVX512_4VNNIW) #define cpu_has_avx512_4fmaps boot_cpu_has(X86_FEATURE_AVX512_4FMAPS) #define cpu_has_tsx_force_abort boot_cpu_has(X86_FEATURE_TSX_FORCE_ABORT) +#define cpu_has_serialize boot_cpu_has(X86_FEATURE_SERIALIZE) /* CPUID level 0x00000007:1.eax */ #define cpu_has_avx512_bf16 boot_cpu_has(X86_FEATURE_AVX512_BF16) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 0ffab6c57b..cba7b0da3d 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -257,6 +257,7 @@ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions * XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffers */ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ +XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*a SERIALIZE insn */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 14:22:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 14:22:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEn-0003ea-36; Fri, 15 May 2020 14:22:57 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEm-0003eQ-0w for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:56 +0000 X-Inumbo-ID: 917976b2-96b7-11ea-a576-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 917976b2-96b7-11ea-a576-12813bfff9fa; Fri, 15 May 2020 14:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YGtj1QUyB01hUcLfogLnLdKjgqi00/3UizHR3F930Sk=; b=KFxPiM+b+nR0xun7MZHw1vBCOb 53yb6+i1CSDaGKH/vPcRfkjDNl9CdiJ81U+5fT7ntDsWYnW2aMh51JL3X+Hk2Gb1kHHjvXRs09QcT kC0TTgyELzNKU2jo/KCq/bie8k4wNDwxcOOX1Njd2QKjDmCC3xa8ILn0bY+k6oXikONY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEl-00017V-4o for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZbEl-0001j1-2w for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:22:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: support X{SUS,RES}LDTRK Message-Id: Date: Fri, 15 May 2020 14:22:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a6d1b558471fa12db7037a9d055258adf4e7b6e2 Author: Jan Beulich AuthorDate: Fri May 15 16:13:03 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:13:03 2020 +0200 x86emul: support X{SUS,RES}LDTRK There's nothing to be done by the emulator, as we unconditionally abort any XBEGIN. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/libxl/libxl_cpuid.c | 1 + tools/misc/xen-cpuid.c | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 23 +++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + xen/tools/gen-cpuid.py | 3 +++ 5 files changed, 29 insertions(+) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 3ed4a074a4..c31dd1f304 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -208,6 +208,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-vnni", 0x00000007, 0, CPUID_REG_ECX, 11, 1}, {"avx512-bitalg",0x00000007, 0, CPUID_REG_ECX, 12, 1}, {"avx512-vpopcntdq",0x00000007,0,CPUID_REG_ECX, 14, 1}, + {"tsxldtrk", 0x00000007, 0, CPUID_REG_ECX, 16, 1}, {"rdpid", 0x00000007, 0, CPUID_REG_ECX, 22, 1}, {"cldemote", 0x00000007, 0, CPUID_REG_ECX, 25, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 6557a65d55..8578077545 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -128,6 +128,7 @@ static const char *const str_7c0[32] = [10] = "vpclmulqdq", [11] = "avx512_vnni", [12] = "avx512_bitalg", [14] = "avx512_vpopcntdq", + [16] = "tsxldtrk", [22] = "rdpid", /* 24 */ [25] = "cldemote", diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 4f5856251c..fa24b1d725 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1913,6 +1913,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_vnni() (ctxt->cpuid->feat.avx512_vnni) #define vcpu_has_avx512_bitalg() (ctxt->cpuid->feat.avx512_bitalg) #define vcpu_has_avx512_vpopcntdq() (ctxt->cpuid->feat.avx512_vpopcntdq) +#define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) #define vcpu_has_avx512_4vnniw() (ctxt->cpuid->feat.avx512_4vnniw) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) @@ -5647,6 +5648,28 @@ x86_emulate( host_and_vcpu_must_have(serialize); asm volatile ( ".byte 0x0f, 0x01, 0xe8" ); break; + case vex_f2: /* xsusldtrk */ + vcpu_must_have(tsxldtrk); + /* + * We're never in a transactional region when coming here + * - nothing else to do. + */ + break; + default: + goto unimplemented_insn; + } + break; + + case 0xe9: + switch ( vex.pfx ) + { + case vex_f2: /* xresldtrk */ + vcpu_must_have(tsxldtrk); + /* + * We're never in a transactional region when coming here + * - nothing else to do. + */ + break; default: goto unimplemented_insn; } diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index cba7b0da3d..c24eae948d 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -238,6 +238,7 @@ XEN_CPUFEATURE(VPCLMULQDQ, 6*32+10) /*A Vector Carry-less Multiplication Ins XEN_CPUFEATURE(AVX512_VNNI, 6*32+11) /*A Vector Neural Network Instrs */ XEN_CPUFEATURE(AVX512_BITALG, 6*32+12) /*A Support for VPOPCNT[B,W] and VPSHUFBITQMB */ XEN_CPUFEATURE(AVX512_VPOPCNTDQ, 6*32+14) /*A POPCNT for vectors of DW/QW */ +XEN_CPUFEATURE(TSXLDTRK, 6*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(RDPID, 6*32+22) /*A RDPID instruction */ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 4ec73340de..037954cfb8 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -289,6 +289,9 @@ def crunch_numbers(state): # as dependent features simplifies Xen's logic, and prevents the guest # from seeing implausible configurations. IBRSB: [STIBP, SSBD], + + # In principle the TSXLDTRK insns could also be considered independent. + RTM: [TSXLDTRK], } deep_features = tuple(sorted(deps.keys())) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 14:23:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 14:23:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEy-0003fl-4m; Fri, 15 May 2020 14:23:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEw-0003fV-AE for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:23:06 +0000 X-Inumbo-ID: 977eb04a-96b7-11ea-a576-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 977eb04a-96b7-11ea-a576-12813bfff9fa; Fri, 15 May 2020 14:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sEn+6iE2fKGCg1RMGynqjXL12ONj+DTztyV0sJ/Wtog=; b=3CWlOZ5RJiaQSqhrgE8miCAATE TOriBsz3bxRJ/YnU5Ia7jJ+itbZ8zhskm4uvSg6fseTgQfc2N73LGON/nJV+8B5eOD1wgixYW9OfM nX6ftAlNyulslifuzLrPiyXEWmKs9W4Gf0PxO1SNHYdPyccFi5YMKJvahWKV7xcr9KWM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZbEv-00018R-88 for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:23:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZbEv-0001k0-6s for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 14:23:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: retrieve and log CPU frequency information Message-Id: Date: Fri, 15 May 2020 14:23:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f6b6517cd5dbd7b2cdb3cfc4cda9751d1db19a1a Author: Jan Beulich AuthorDate: Fri May 15 16:16:29 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:16:29 2020 +0200 x86: retrieve and log CPU frequency information While from just a single Skylake system it is already clear that we can't base any of our logic on CPUID leaf 15 [1] (leaf 16 is documented to be used for display purposes only anyway), logging this information may still give us some reference in case of problems as well as for future work. Additionally on the AMD side it is unclear whether the deviation between reported and measured frequencies is because of us not doing well, or because of nominal and actual frequencies being quite far apart. The chosen variable naming in amd_log_freq() has pointed out a naming problem in rdmsr_safe(), which is being taken care of at the same time. Symmetrically wrmsr_safe(), being an inline function, also gets an unnecessary underscore dropped from one of its local variables. [1] With a core crystal clock of 24MHz and a ratio of 216/2, the reported frequency nevertheless is 2600MHz, rather than the to be expected (and calibrated by both us and Linux) 2592MHz. Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/amd.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/hygon.c | 2 + xen/arch/x86/cpu/intel.c | 74 +++++++++++++++++++++++++++++++++ xen/include/asm-x86/msr.h | 16 +++---- 5 files changed, 188 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index f95a8e0fd3..05cbcbad73 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -532,6 +532,107 @@ static void amd_get_topology(struct cpuinfo_x86 *c) : c->cpu_core_id); } +void amd_log_freq(const struct cpuinfo_x86 *c) +{ + unsigned int idx = 0, h; + uint64_t hi, lo, val; + + if (c->x86 < 0x10 || c->x86 > 0x19 || + (c != &boot_cpu_data && + (!opt_cpu_info || (c->apicid & (c->x86_num_siblings - 1))))) + return; + + if (c->x86 < 0x17) { + unsigned int node = 0; + uint64_t nbcfg; + + /* + * Make an attempt at determining the node ID, but assume + * symmetric setup (using node 0) if this fails. + */ + if (c->extended_cpuid_level >= 0x8000001e && + cpu_has(c, X86_FEATURE_TOPOEXT)) { + node = cpuid_ecx(0x8000001e) & 0xff; + if (node > 7) + node = 0; + } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) { + rdmsrl(0xC001100C, val); + node = val & 7; + } + + /* + * Enable (and use) Extended Config Space accesses, as we + * can't be certain that MCFG is available here during boot. + */ + rdmsrl(MSR_AMD64_NB_CFG, nbcfg); + wrmsrl(MSR_AMD64_NB_CFG, + nbcfg | (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)); +#define PCI_ECS_ADDRESS(sbdf, reg) \ + (0x80000000 | ((sbdf).bdf << 8) | ((reg) & 0xfc) | (((reg) & 0xf00) << 16)) + + for ( ; ; ) { + pci_sbdf_t sbdf = PCI_SBDF(0, 0, 0x18 | node, 4); + + switch (pci_conf_read32(sbdf, PCI_VENDOR_ID)) { + case 0x00000000: + case 0xffffffff: + /* No device at this SBDF. */ + if (!node) + break; + node = 0; + continue; + + default: + /* + * Core Performance Boost Control, family + * dependent up to 3 bits starting at bit 2. + * + * Note that boost states operate at a frequency + * above the base one, and thus need to be + * accounted for in order to correctly fetch the + * nominal frequency of the processor. + */ + switch (c->x86) { + case 0x10: idx = 1; break; + case 0x12: idx = 7; break; + case 0x14: idx = 7; break; + case 0x15: idx = 7; break; + case 0x16: idx = 7; break; + } + idx &= pci_conf_read(PCI_ECS_ADDRESS(sbdf, + 0x15c), + 0, 4) >> 2; + break; + } + break; + } + +#undef PCI_ECS_ADDRESS + wrmsrl(MSR_AMD64_NB_CFG, nbcfg); + } + + lo = 0; /* gcc may not recognize the loop having at least 5 iterations */ + for (h = c->x86 == 0x10 ? 5 : 8; h--; ) + if (!rdmsr_safe(0xC0010064 + h, lo) && (lo >> 63)) + break; + if (!(lo >> 63)) + return; + +#define FREQ(v) (c->x86 < 0x17 ? ((((v) & 0x3f) + 0x10) * 100) >> (((v) >> 6) & 7) \ + : (((v) & 0xff) * 25 * 8) / (((v) >> 8) & 0x3f)) + if (idx && idx < h && + !rdmsr_safe(0xC0010064 + idx, val) && (val >> 63) && + !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) + printk("CPU%u: %lu (%lu..%lu) MHz\n", + smp_processor_id(), FREQ(val), FREQ(lo), FREQ(hi)); + else if (h && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) + printk("CPU%u: %lu..%lu MHz\n", + smp_processor_id(), FREQ(lo), FREQ(hi)); + else + printk("CPU%u: %lu MHz\n", smp_processor_id(), FREQ(lo)); +#undef FREQ +} + void early_init_amd(struct cpuinfo_x86 *c) { if (c == &boot_cpu_data) @@ -803,6 +904,8 @@ static void init_amd(struct cpuinfo_x86 *c) disable_c1_ramping(); check_syscfg_dram_mod_en(); + + amd_log_freq(c); } const struct cpu_dev amd_cpu_dev = { diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index c2f4d9a06a..1992596d1b 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -19,3 +19,4 @@ extern void detect_ht(struct cpuinfo_x86 *c); extern bool detect_extended_topology(struct cpuinfo_x86 *c); void early_init_amd(struct cpuinfo_x86 *c); +void amd_log_freq(const struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 9ab7aa8622..46293f1f36 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -99,6 +99,8 @@ static void init_hygon(struct cpuinfo_x86 *c) value |= (1 << 27); /* Enable read-only APERF/MPERF bit */ wrmsrl(MSR_K7_HWCR, value); } + + amd_log_freq(c); } const struct cpu_dev hygon_cpu_dev = { diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 7966f4aa8a..b77c1a78ed 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -344,6 +344,76 @@ static int num_cpu_cores(struct cpuinfo_x86 *c) return 1; } +static void intel_log_freq(const struct cpuinfo_x86 *c) +{ + unsigned int eax, ebx, ecx, edx; + uint64_t msrval; + uint8_t max_ratio; + + if ( c->cpuid_level >= 0x15 ) + { + cpuid(0x15, &eax, &ebx, &ecx, &edx); + if ( ecx && ebx && eax ) + { + unsigned long long val = ecx; + + val *= ebx; + do_div(val, eax); + printk("CPU%u: TSC: %uMHz * %u / %u = %LuMHz\n", + smp_processor_id(), ecx, ebx, eax, val); + } + else if ( ecx | eax | ebx ) + { + printk("CPU%u: TSC:", smp_processor_id()); + if ( ecx ) + printk(" core: %uMHz", ecx); + if ( ebx && eax ) + printk(" ratio: %u / %u", ebx, eax); + printk("\n"); + } + } + + if ( c->cpuid_level >= 0x16 ) + { + cpuid(0x16, &eax, &ebx, &ecx, &edx); + if ( ecx | eax | ebx ) + { + printk("CPU%u:", smp_processor_id()); + if ( ecx ) + printk(" bus: %uMHz", ecx); + if ( eax ) + printk(" base: %uMHz", eax); + if ( ebx ) + printk(" max: %uMHz", ebx); + printk("\n"); + } + } + + if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + return; + max_ratio = msrval >> 8; + + if ( max_ratio ) + { + unsigned int factor = 10000; + uint8_t min_ratio = msrval >> 40; + + if ( c->x86 == 6 ) + switch ( c->x86_model ) + { + case 0x1a: case 0x1e: case 0x1f: case 0x2e: /* Nehalem */ + case 0x25: case 0x2c: case 0x2f: /* Westmere */ + factor = 13333; + break; + } + + printk("CPU%u: ", smp_processor_id()); + if ( min_ratio ) + printk("%u..", (factor * min_ratio + 50) / 100); + printk("%u MHz\n", (factor * max_ratio + 50) / 100); + } +} + static void init_intel(struct cpuinfo_x86 *c) { /* Detect the extended topology information if available */ @@ -378,6 +448,10 @@ static void init_intel(struct cpuinfo_x86 *c) ( c->cpuid_level >= 0x00000006 ) && ( cpuid_eax(0x00000006) & (1u<<2) ) ) __set_bit(X86_FEATURE_ARAT, c->x86_capability); + + if ((opt_cpu_info && !(c->apicid & (c->x86_num_siblings - 1))) || + c == &boot_cpu_data ) + intel_log_freq(c); } const struct cpu_dev intel_cpu_dev = { diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 41397e19cf..5c44c79600 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -40,8 +40,8 @@ static inline void wrmsrl(unsigned int msr, __u64 val) /* rdmsr with exception handling */ #define rdmsr_safe(msr,val) ({\ - int _rc; \ - uint32_t lo, hi; \ + int rc_; \ + uint32_t lo_, hi_; \ __asm__ __volatile__( \ "1: rdmsr\n2:\n" \ ".section .fixup,\"ax\"\n" \ @@ -49,15 +49,15 @@ static inline void wrmsrl(unsigned int msr, __u64 val) " movl %5,%2\n; jmp 2b\n" \ ".previous\n" \ _ASM_EXTABLE(1b, 3b) \ - : "=a" (lo), "=d" (hi), "=&r" (_rc) \ + : "=a" (lo_), "=d" (hi_), "=&r" (rc_) \ : "c" (msr), "2" (0), "i" (-EFAULT)); \ - val = lo | ((uint64_t)hi << 32); \ - _rc; }) + val = lo_ | ((uint64_t)hi_ << 32); \ + rc_; }) /* wrmsr with exception handling */ static inline int wrmsr_safe(unsigned int msr, uint64_t val) { - int _rc; + int rc; uint32_t lo, hi; lo = (uint32_t)val; hi = (uint32_t)(val >> 32); @@ -68,9 +68,9 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) "3: movl %5,%0\n; jmp 2b\n" ".previous\n" _ASM_EXTABLE(1b, 3b) - : "=&r" (_rc) + : "=&r" (rc) : "c" (msr), "a" (lo), "d" (hi), "0" (0), "i" (-EFAULT)); - return _rc; + return rc; } static inline uint64_t msr_fold(const struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 15:55:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 15:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZcfz-00047X-JN; Fri, 15 May 2020 15:55:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZcfy-00047R-BO for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 15:55:06 +0000 X-Inumbo-ID: 71654682-96c4-11ea-a58c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 71654682-96c4-11ea-a58c-12813bfff9fa; Fri, 15 May 2020 15:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TZmSj9qrVuqae6Ne1ypdIMNyD6WtBJipAI/JkGery1Y=; b=vHVBUA0iAcpiroY4I+vNkTOUYT 8KiYYKLCNQ0NUJeW4fs3lpeVrHI9hpU425C74XAGzxhsu5E9OVYgM6GtXFmOb0yiQSQ3gpSUSyQoU TMFV/7AHVYfHOciVdLDF4G1eLLtI72GjGJJnMkartNqCFUQYAC9R/gIxvU/qivV0s0+0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZcfw-00032J-Oc for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZcfw-0007nj-N1 for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 15:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/build: fixup path to merge_config.sh Message-Id: Date: Fri, 15 May 2020 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 90b1701905dd0cbb7efe525b1bf92007fe818b60 Author: Stewart Hildebrand AuthorDate: Tue May 12 13:52:05 2020 -0400 Commit: Andrew Cooper CommitDate: Fri May 15 16:51:26 2020 +0100 xen/build: fixup path to merge_config.sh This resolves the following observed error: /bin/sh: /path/to/xen/xen/../xen/scripts/kconfig/merge_config.sh: No such file or directory Signed-off-by: Stewart Hildebrand Reviewed-by: Anthony PERARD --- xen/tools/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile index ef2f2336c4..fd37f4386a 100644 --- a/xen/tools/kconfig/Makefile +++ b/xen/tools/kconfig/Makefile @@ -93,7 +93,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.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)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles) $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig PHONY += kvmconfig -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 19:33:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 19:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZg4x-0000DI-Ni; Fri, 15 May 2020 19:33:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZg4v-0000DD-RX for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 19:33:05 +0000 X-Inumbo-ID: e5b595c8-96e2-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e5b595c8-96e2-11ea-b9cf-bc764e2007e4; Fri, 15 May 2020 19:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aOlg8aLiDxmPpHUlxP3B5TZNBQjjlc+38nAxLXC6WEU=; b=OYX3Kp3971Zo6pXPy3iXcHYScU mJ55BqEfnCiVEQ5X90d7vguA6XwpuG/6+rlXNyHubpgZEdWvq+kJkZgZJ3uAjmJNLsp5Dl6xtxB5J 3sXK+RxrKMHTvXQOq+mfZfB74IzWSy1ht6dgxoQ0W5nL2nawG17LBdY8Ioygc+cpOLJI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZg4u-00088s-On for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 19:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZg4u-0007Lk-NT for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 19:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] domain_page: handle NULL within unmap_domain_page() itself Message-Id: Date: Fri, 15 May 2020 19:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 84c2b2a81ab8aa0a14f50660ed7a214beae5a20f Author: Hongyan Xia AuthorDate: Wed May 13 16:43:33 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 15 19:35:09 2020 +0100 domain_page: handle NULL within unmap_domain_page() itself The macro version UNMAP_DOMAIN_PAGE() does both NULL checking and variable clearing. Move NULL checking into the function itself so that the semantics is consistent with other similar constructs like XFREE(). This also eases the use unmap_domain_page() in error handling paths, where we only care about NULL checking but not about variable clearing. Signed-off-by: Hongyan Xia Reviewed-by: Wei Liu Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/mm.c | 3 +++ xen/arch/x86/domain_page.c | 2 +- xen/include/xen/domain_page.h | 7 ++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 727107eefa..1b14f49345 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -498,6 +498,9 @@ void unmap_domain_page(const void *va) lpae_t *map = this_cpu(xen_dommap); int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; + if ( !va ) + return; + local_irq_save(flags); ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index dd32712d2f..b03728e18e 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -181,7 +181,7 @@ void unmap_domain_page(const void *ptr) unsigned long va = (unsigned long)ptr, mfn, flags; struct vcpu_maphash_entry *hashent; - if ( va >= DIRECTMAP_VIRT_START ) + if ( !va || va >= DIRECTMAP_VIRT_START ) return; ASSERT(va >= MAPCACHE_VIRT_START && va < MAPCACHE_VIRT_END); diff --git a/xen/include/xen/domain_page.h b/xen/include/xen/domain_page.h index ab2be7b719..a182d33b67 100644 --- a/xen/include/xen/domain_page.h +++ b/xen/include/xen/domain_page.h @@ -73,11 +73,8 @@ static inline void unmap_domain_page_global(const void *va) {}; #endif /* !CONFIG_DOMAIN_PAGE */ #define UNMAP_DOMAIN_PAGE(p) do { \ - if ( p ) \ - { \ - unmap_domain_page(p); \ - (p) = NULL; \ - } \ + unmap_domain_page(p); \ + (p) = NULL; \ } while ( false ) #endif /* __XEN_DOMAIN_PAGE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 15 19:33:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 15 May 2020 19:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZg56-0000E1-PE; Fri, 15 May 2020 19:33:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZg55-0000Dq-HL for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 19:33:15 +0000 X-Inumbo-ID: ebb7aa24-96e2-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ebb7aa24-96e2-11ea-b07b-bc764e2007e4; Fri, 15 May 2020 19:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZK6a0KEYyXlmulBDUl1LTnx+DIHCYmvGjmVC0n+265o=; b=dLGGyz0Yx3bzI2hV1n/uKtz16Q 7EWe4GqEFCjd1+9O7qqJteKhhkhMQlWsVp3Z9zWucu0gDJXBiEzCy6aWjCKf9sF0MdWa3S0p3uxre AsStQJNCbEUAKjoBetU/diHL6rc2F2IZo4ZzbyBGZ/2KfBfxPMDFKsi95Iq5F6WT+L3w=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZg54-00089P-SC for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 19:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZg54-0007MQ-Qb for xen-changelog@lists.xenproject.org; Fri, 15 May 2020 19:33:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/build: use the correct kconfig makefile Message-Id: Date: Fri, 15 May 2020 19:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 57880053dd24012e9f59c23b630fefe07e15dc49 Author: Stewart Hildebrand AuthorDate: Fri May 15 14:25:09 2020 -0400 Commit: Andrew Cooper CommitDate: Fri May 15 19:35:09 2020 +0100 xen/build: use the correct kconfig makefile This resolves the following observed error during config merge: /bin/sh /path/to/xen/xen/../xen/tools/kconfig/merge_config.sh -m .config /path/to/xen/xen/../xen/arch/arm/configs/custom.config Using .config as base Merging /path/to/xen/xen/../xen/arch/arm/configs/custom.config # # merged configuration written to .config (needs make) # make -f /path/to/xen/xen/../xen/Makefile olddefconfig make[2]: Entering directory '/path/to/xen/xen' make[2]: *** No rule to make target 'olddefconfig'. Stop. make[2]: Leaving directory '/path/to/xen/xen' tools/kconfig/Makefile:95: recipe for target 'custom.config' failed The build was invoked by first doing a defconfig (which succeeded): $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig Followed by the config fragment merge command (which failed before this patch) $ cat > xen/arch/arm/configs/custom.config < Reviewed-by: Anthony PERARD --- xen/tools/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile index fd37f4386a..f39521a0ed 100644 --- a/xen/tools/kconfig/Makefile +++ b/xen/tools/kconfig/Makefile @@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.config: $(obj)/conf $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) $(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles) - $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig + $(Q)$(MAKE) -f $(srctree)/tools/kconfig/Makefile.kconfig olddefconfig PHONY += kvmconfig kvmconfig: kvm_guest.config -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:33:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNf-0002u6-I5; Sat, 16 May 2020 06:33:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNe-0002u1-Mv for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:06 +0000 X-Inumbo-ID: 1805fea8-973f-11ea-a61d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1805fea8-973f-11ea-a61d-12813bfff9fa; Sat, 16 May 2020 06:33:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hFc3sPmXxOqOu+3Wok+GBUaKtg/t+ZWtEaVRh/xmMvE=; b=J6Jl37geTJnfSipWxgmhqVFiI6 P4QdIOZfsWZxTeYYg/4bfM6jNgaOkiTMuYz1KkbTAF9R031BH7tawIynCZs7zFKodcZ/KrManFfam cjstlkb/YsgSd+UJ556AgTBTvz91w+yIYsu+mxr5S6e60Zz2pkYSg6bIOlJJ4kA5uoTE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNa-0007eQ-Rc for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqNa-0004pP-PP for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang/xenlight: add necessary module/package documentation Message-Id: Date: Sat, 16 May 2020 06:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 61be48dc029294275348443f78a5e600ef28274f Author: Nick Rosbrook AuthorDate: Wed May 13 10:18:19 2020 -0400 Commit: George Dunlap CommitDate: Wed May 13 16:06:21 2020 +0100 golang/xenlight: add necessary module/package documentation Add a README and package comment giving a brief overview of the package. These also help pkg.go.dev generate better documentation. Also, add a copy of the LGPL (the same license used by libxl) to tools/golang/xenlight. This is required for the package to be shown on pkg.go.dev and added to the default module proxy, proxy.golang.org. Finally, add an entry for the xenlight package to SUPPORT.md. Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- SUPPORT.md | 6 + tools/golang/xenlight/LICENSE | 502 ++++++++++++++++++++++++++++++++++++++ tools/golang/xenlight/README.md | 28 +++ tools/golang/xenlight/xenlight.go | 2 + 4 files changed, 538 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index 7270c9b021..e3a366fd56 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -147,6 +147,12 @@ Output of information in machine-parseable JSON format Status: Supported +### xenlight Go package + +Go (golang) bindings for libxl + + Status: Experimental + ## Toolstack/3rd party ### libvirt driver for xl diff --git a/tools/golang/xenlight/LICENSE b/tools/golang/xenlight/LICENSE new file mode 100644 index 0000000000..4362b49151 --- /dev/null +++ b/tools/golang/xenlight/LICENSE @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/tools/golang/xenlight/README.md b/tools/golang/xenlight/README.md new file mode 100644 index 0000000000..a423a5600a --- /dev/null +++ b/tools/golang/xenlight/README.md @@ -0,0 +1,28 @@ +# xenlight + +## About + +The xenlight package provides Go bindings to Xen's libxl C library via cgo. +The package is currently in an unstable "experimental" state. This means +the package is ready for initial use and evaluation, but is not yet fully +functional. Namely, only a subset of libxl's API is implemented, and +breaking changes may occur in future package versions. + +Much of the package is generated using the libxl IDL. Changes to the +generated code can be made by modifying `tools/golang/xenlight/gengotypes.py` +in the xen.git tree. + +## Getting Started + +```go +import ( + "xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight" +) +``` + +The module is not yet tagged independently of xen.git; if you don’t specify +the version, you’ll get the most recent development version, which is +probably not what you want. A better option would be to specify a Xen +release tag; for instance: + + go get xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight@RELEASE-4.14.0. diff --git a/tools/golang/xenlight/xenlight.go b/tools/golang/xenlight/xenlight.go index 742e5e11f1..b9189dec5c 100644 --- a/tools/golang/xenlight/xenlight.go +++ b/tools/golang/xenlight/xenlight.go @@ -14,6 +14,8 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; If not, see . */ + +// Package xenlight provides bindings to Xen's libxl C library. package xenlight /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:33:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNm-0002uh-LF; Sat, 16 May 2020 06:33:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNl-0002uc-KM for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:13 +0000 X-Inumbo-ID: 1e095bf6-973f-11ea-a61d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1e095bf6-973f-11ea-a61d-12813bfff9fa; Sat, 16 May 2020 06:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=p4bL3OHxjOWI+xP8ixa3L2f1ampS5cWUcks0RjYieok=; b=1j0/4SeQI5ZMKXuaoDJzUkjhUD /K9ri5zpbcRJU/eghKqKOrHckTfZ4E2+e4GCpyjwx8IC6jHWCbOydtRlGaEdBQvAOjx4cSxZn3yaG rkFOHui+5wxXIWHkdRFUKXcLzHN0F6h3X1f55b0/yhKK9hkaD41aC8+EybB5VkS8YpoI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNk-0007eT-V6 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqNk-0004pz-Ti for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/libxc: Reduce feature handling complexity in xc_cpuid_apply_policy() Message-Id: Date: Sat, 16 May 2020 06:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d8a6a8b36d864e1e56d3c63b30892cbb4e55d65c Author: Andrew Cooper AuthorDate: Mon Mar 2 14:36:03 2020 +0000 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 tools/libxc: Reduce feature handling complexity in xc_cpuid_apply_policy() xc_cpuid_apply_policy() is gaining extra parameters to untangle CPUID complexity in Xen. While an improvement in general, it does have the unfortunate side effect of duplicating some settings across multiple parameters. Rearrange the logic to only consider 'pae' if no explicit featureset is provided. This reduces the complexity for callers who have already provided a pae setting in the featureset. Signed-off-by: Andrew Cooper Reviewed-by: Paul Durrant Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 7 +++++++ tools/libxc/xc_cpuid_x86.c | 7 +++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 0a6ff93229..45ff7db1e8 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1798,6 +1798,13 @@ int xc_cpuid_set(xc_interface *xch, const unsigned int *input, const char **config, char **config_transformed); + +/* + * Make adjustments to the CPUID settings for a domain. + * + * Either pass a full new @featureset (and @nr_features), or adjust individual + * features (@pae). + */ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, const uint32_t *featureset, diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 5ced6d18b9..f045b03223 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -532,6 +532,11 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, cpuid_featureset_to_policy(feat, p); } + else + { + if ( di.hvm ) + p->basic.pae = pae; + } if ( !di.hvm ) { @@ -615,8 +620,6 @@ int xc_cpuid_apply_policy(xc_interface *xch, uint32_t domid, break; } - p->basic.pae = pae; - /* * These settings are necessary to cause earlier HVM_PARAM_NESTEDHVM / * XEN_DOMCTL_disable_migrate settings to be reflected correctly in -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:33:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:33:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNw-0002wD-Ms; Sat, 16 May 2020 06:33:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNw-0002w5-5c for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:24 +0000 X-Inumbo-ID: 24082852-973f-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 24082852-973f-11ea-b9cf-bc764e2007e4; Sat, 16 May 2020 06:33:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=07OQhGVB/el8bm+KD6k9/ezpPEKBX//8PzI8ZLdVQiU=; b=PLwxzu6rg5+HN04ner5r5wqpiv 42mJYhx8L3nz48qpBeKyQhIkxMRUP0a9wPlUqa4K397Kp0iAQZmyMeipwMi1ompujcNpTgW5YYs6/ az37L4iAEOqM3kicNoqCHTWzyAmTzc2RTWwWRTQi7s3NC+X3geKd32S4qy701T0892hw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqNv-0007ef-1u for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqNv-0004ql-0d for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] stubdom: Use matching quotes in error message Message-Id: Date: Sat, 16 May 2020 06:33:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f3b0d25e343562dee29729cfaf32f8c79f8b6502 Author: Andrew Cooper AuthorDate: Wed May 13 13:07:53 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 stubdom: Use matching quotes in error message This prevents syntax highlighting from believing the rest of the file is a string. Signed-off-by: Andrew Cooper Acked-by: Julien Grall --- stubdom/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 8cf7131c6a..12aa211ac3 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -16,7 +16,7 @@ CFLAGS += -O1 -fno-omit-frame-pointer ifeq (,$(findstring clean,$(MAKECMDGOALS))) ifeq ($(wildcard $(MINI_OS)/Config.mk),) - $(error Please run `make mini-os-dir' in top-level directory) + $(error Please run 'make mini-os-dir' in top-level directory) endif include $(XEN_ROOT)/Config.mk endif -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:33:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:33:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqO6-0002xR-OR; Sat, 16 May 2020 06:33:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqO5-0002xJ-Pp for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:33 +0000 X-Inumbo-ID: 2a0c3702-973f-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2a0c3702-973f-11ea-b07b-bc764e2007e4; Sat, 16 May 2020 06:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PYRo4xREnBX/v70MMfWcs6z+XPdZlYWeALJfozeOEL8=; b=o2qn8seLsg7src+shqNkSVaTrn YA3yDXSCA0krOea6gviajuvQHNj1F+yinod1Z/9RmTP5Ee+QMLFZMcDR9f9/l3w9tT7gIbe4oJpUD 95ErcfJ4W0iDUc0AOtHJ+jS7dt4/DEIK1Yxjc054EcIy5o1UWX2fZvcRX3W72LyUq8CI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqO5-0007fL-51 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqO5-0004rL-3r for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/guest: Fix assembler warnings with newer binutils Message-Id: Date: Sat, 16 May 2020 06:33:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9f74a7b66b0b03fe563779bb2c133051f1595ece Author: Andrew Cooper AuthorDate: Tue May 12 17:21:33 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/guest: Fix assembler warnings with newer binutils GAS of at least version 2.34 complains: hypercall_page.S: Assembler messages: hypercall_page.S:24: Warning: symbol 'HYPERCALL_set_trap_table' already has its type set ... hypercall_page.S:71: Warning: symbol 'HYPERCALL_arch_7' already has its type set which is because the whole page is declared as STT_OBJECT already. Rearrange .set with respect to .type in DECLARE_HYPERCALL() so STT_FUNC is already in place. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/guest/xen/hypercall_page.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/guest/xen/hypercall_page.S b/xen/arch/x86/guest/xen/hypercall_page.S index 6485e9150e..9958d02cfd 100644 --- a/xen/arch/x86/guest/xen/hypercall_page.S +++ b/xen/arch/x86/guest/xen/hypercall_page.S @@ -17,9 +17,9 @@ GLOBAL(hypercall_page) */ #define DECLARE_HYPERCALL(name) \ .globl HYPERCALL_ ## name; \ - .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32; \ .type HYPERCALL_ ## name, STT_FUNC; \ - .size HYPERCALL_ ## name, 32 + .size HYPERCALL_ ## name, 32; \ + .set HYPERCALL_ ## name, hypercall_page + __HYPERVISOR_ ## name * 32 DECLARE_HYPERCALL(set_trap_table) DECLARE_HYPERCALL(mmu_update) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:33:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:33:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOH-0002ym-QQ; Sat, 16 May 2020 06:33:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOH-0002yc-4L for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:45 +0000 X-Inumbo-ID: 300bb4a2-973f-11ea-a61d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 300bb4a2-973f-11ea-a61d-12813bfff9fa; Sat, 16 May 2020 06:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EslrjEcpKp+41K8P1/thowm6klnXhnCxacmaVx4SoeM=; b=eEkyfJ+GrsEZUzQs9YQ/SKbT8J 3np9eoPSaXXolC8WA64DpB8ah0rz7LUpzM8Jv6Jp+dhsjfQ1EPR0L+2fL5yZR3EsdKwi4TkNKBerg UqmrgF1WV5+yMAhljpQr/fYoxwZF7NegBLJqhWlssdUYtpCMrmYsOEGMEjOzTVppsrxA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOF-0007fU-82 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqOF-0004ru-6n for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/build32: Discard all orphaned sections Message-Id: Date: Sat, 16 May 2020 06:33:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 24f94fca23ad7c45806a1428331e1d602dfd8604 Author: Andrew Cooper AuthorDate: Tue May 12 19:18:37 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/build32: Discard all orphaned sections Linkers may put orphaned sections ahead of .text, which breaks the calling requirements. A concrete example is Ubuntu's GCC-9 default of enabling -fcf-protection which causes us to try and execute .note.gnu.properties during Xen's boot. Put .got.plt in its own section as it specifically needs preserving from the linkers point of view, and discard everything else. This will hopefully be more robust to other unexpected toolchain properties. Fixes boot from an Ubuntu build of Xen. Reported-by: Jason Andryuk Signed-off-by: Andrew Cooper Tested-by: Jason Andryuk Acked-by: Jan Beulich --- xen/arch/x86/boot/build32.lds | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/boot/build32.lds b/xen/arch/x86/boot/build32.lds index da35aee910..97454b40ff 100644 --- a/xen/arch/x86/boot/build32.lds +++ b/xen/arch/x86/boot/build32.lds @@ -31,7 +31,7 @@ SECTIONS *(.bss.*) } - /DISCARD/ : { + .got.plt : { /* * PIC/PIE executable contains .got.plt section even if it is not linked * with dynamic libraries. In such case it is just placeholder for @@ -47,6 +47,14 @@ SECTIONS * * Please check build32.mk for more details. */ - /* *(.got.plt) */ + *(.got.plt) + } + + /DISCARD/ : { + /* + * Discard everything else, to prevent linkers from putting + * orphaned sections ahead of .text, which needs to be first. + */ + *(*) } } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:33:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:33:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOQ-0002zu-Rx; Sat, 16 May 2020 06:33:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOP-0002zk-VN for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:53 +0000 X-Inumbo-ID: 36125bee-973f-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 36125bee-973f-11ea-b9cf-bc764e2007e4; Sat, 16 May 2020 06:33:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4Z+Hs25Ad3E5L8vURuVDpK/C2DPOdGzL6h/maEIx2Po=; b=gh+IBGSrcSB8Zzl8ymEY+FmQZ1 PxyAd3BGSZ8xejeQKSJ/WV9XV4QXqLghp1nQDBhFv6sYTfAj1LtodHHG9TYz+rUOe/SXgzyy5MOHR 7/2zCnUGmw/n5TP7ruzPNcmV+RScEki3mPZjv1OIJ6mrg7qXb87eJXfPoP6AaIkLbo7M=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOP-0007fd-B1 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqOP-0004sU-9q for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:33:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/build: move -fno-asynchronous-unwind-tables into EMBEDDED_EXTRA_CFLAGS Message-Id: Date: Sat, 16 May 2020 06:33:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1a47731115c2c8eb510e135fa48ed51ad2e94a26 Author: Andrew Cooper AuthorDate: Wed May 13 13:06:28 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/build: move -fno-asynchronous-unwind-tables into EMBEDDED_EXTRA_CFLAGS Users of EMBEDDED_EXTRA_CFLAGS already use -fno-asynchronous-unwind-tables, or ought to. This shrinks the size of the rombios 32bit stubs in guest memory. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- Config.mk | 2 +- tools/tests/x86_emulator/testcase.mk | 2 +- xen/arch/x86/arch.mk | 2 +- xen/arch/x86/boot/build32.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Config.mk b/Config.mk index 3621162ae4..b0f16680f3 100644 --- a/Config.mk +++ b/Config.mk @@ -204,7 +204,7 @@ APPEND_LDFLAGS += $(foreach i, $(APPEND_LIB), -L$(i)) APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all -EMBEDDED_EXTRA_CFLAGS += -fno-exceptions +EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on diff --git a/tools/tests/x86_emulator/testcase.mk b/tools/tests/x86_emulator/testcase.mk index a565d15524..dafeb6caf7 100644 --- a/tools/tests/x86_emulator/testcase.mk +++ b/tools/tests/x86_emulator/testcase.mk @@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) -CFLAGS += -fno-builtin -fno-asynchronous-unwind-tables -g0 $($(TESTCASE)-cflags) +CFLAGS += -fno-builtin -g0 $($(TESTCASE)-cflags) .PHONY: all all: $(TESTCASE).bin diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 2a51553edb..62b7c97007 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -56,7 +56,7 @@ $(call as-option-add,CFLAGS,CC,\ $(call as-option-add,CFLAGS,CC,\ ".L1: .L2: .nops (.L2 - .L1)$$(comma)9",-DHAVE_AS_NOPS_DIRECTIVE) -CFLAGS += -mno-red-zone -fpic -fno-asynchronous-unwind-tables +CFLAGS += -mno-red-zone -fpic # Xen doesn't use SSE interally. If the compiler supports it, also skip the # SSE setup for variadic function calls. diff --git a/xen/arch/x86/boot/build32.mk b/xen/arch/x86/boot/build32.mk index 48c7407c00..5851ebff5f 100644 --- a/xen/arch/x86/boot/build32.mk +++ b/xen/arch/x86/boot/build32.mk @@ -4,7 +4,7 @@ include $(XEN_ROOT)/Config.mk $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) -CFLAGS += -Werror -fno-asynchronous-unwind-tables -fno-builtin -g0 -msoft-float +CFLAGS += -Werror -fno-builtin -g0 -msoft-float CFLAGS += -I$(XEN_ROOT)/xen/include CFLAGS := $(filter-out -flto,$(CFLAGS)) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:34:04 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:34:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOa-000310-TY; Sat, 16 May 2020 06:34:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOa-00030t-0M for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:04 +0000 X-Inumbo-ID: 3c13a246-973f-11ea-a61d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3c13a246-973f-11ea-a61d-12813bfff9fa; Sat, 16 May 2020 06:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LJArSaDeHBnIDqa4u+i8jq+83ClzCwagtRcxdNfY/KY=; b=L4wci8L5yKRYFtZ2hZJ5rgOUGq J38nbOkle3z7M/w1sTAOMiOQfPf6+vqSrxC9Y0g8Tixq3IK4WTzDHxJl4NgWak1Vy0/a/tpdY0Axw 7hDj3LIhmLZjT+AKglScsscdRHyeD3fWGgDDmBGHO3ndB7dpdkq85UDSZ4W2354KnwIE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOZ-0007fz-Ds for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqOZ-0004tI-Cc for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/build: Unilaterally disable -fcf-protection Message-Id: Date: Sat, 16 May 2020 06:34:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3a218961b16f1f4feb1147f56338faf1ac8f5703 Author: Andrew Cooper AuthorDate: Tue May 12 19:18:43 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 13 20:33:42 2020 +0100 x86/build: Unilaterally disable -fcf-protection Xen doesn't support CET-IBT yet. At a minimum, logic is required to enable it for supervisor use, but the livepatch functionality needs to learn not to overwrite ENDBR64 instructions. Furthermore, Ubuntu enables -fcf-protection by default, along with a buggy version of GCC-9 which objects to it in combination with -mindirect-branch=thunk-extern (Fixed in GCC 10, 9.4). Various objects (Xen boot path, Rombios 32 stubs) require .text to be at the beginning of the object. These paths explode when .note.gnu.properties gets put ahead of .text and we end up executing the notes data. Disable -fcf-protection for all embedded objects. Reported-by: Jason Andryuk Signed-off-by: Andrew Cooper Reviewed-by: Jason Andryuk Reviewed-by: Jan Beulich --- Config.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/Config.mk b/Config.mk index b0f16680f3..7d556aed30 100644 --- a/Config.mk +++ b/Config.mk @@ -205,6 +205,7 @@ APPEND_CFLAGS += $(foreach i, $(APPEND_INCLUDES), -I$(i)) EMBEDDED_EXTRA_CFLAGS := -nopie -fno-stack-protector -fno-stack-protector-all EMBEDDED_EXTRA_CFLAGS += -fno-exceptions -fno-asynchronous-unwind-tables +EMBEDDED_EXTRA_CFLAGS += -fcf-protection=none XEN_EXTFILES_URL ?= http://xenbits.xen.org/xen-extfiles # All the files at that location were downloaded from elsewhere on -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:34:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:34:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOk-00031x-VF; Sat, 16 May 2020 06:34:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOk-00031q-4O for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:14 +0000 X-Inumbo-ID: 4218e0a2-973f-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4218e0a2-973f-11ea-b9cf-bc764e2007e4; Sat, 16 May 2020 06:34:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sEtfVkSSrJ2VvExhAuUkiMyF5OoxJw/f43DSNV6AoDU=; b=1gaq7PBKkbPvM2LK3mQuR6bPjt DfB5NHlhQaBPao/ry+FokNGTFTggA2Lh5kofkeh6E+/YreUYXnKaTJ1p3ySlvLBwOpT4UHBMzYwma +FaueW3O8QPOWWBIzbObq1D8oksN0h4xYmpUPzuvxB0vIvoLBEF2FoFmeKy1fgse1mNI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOj-0007g8-HH for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqOj-0004uQ-Fp for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/PVH: PHYSDEVOP_pci_mmcfg_reserved should not blindly register a region Message-Id: Date: Sat, 16 May 2020 06:34:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b539eeffc737d859dd1814c2e529e0ed0feba7a7 Author: Jan Beulich AuthorDate: Thu May 14 07:53:55 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 07:53:55 2020 +0200 x86/PVH: PHYSDEVOP_pci_mmcfg_reserved should not blindly register a region The op has a "is reserved" flag, and hence registration shouldn't happen unilaterally. Fixes: eb3dd90e4089 ("x86/physdev: enable PHYSDEVOP_pci_mmcfg_reserved for PVH Dom0") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/physdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c index 3a3c15890b..23465bcd00 100644 --- a/xen/arch/x86/physdev.c +++ b/xen/arch/x86/physdev.c @@ -556,7 +556,7 @@ ret_t do_physdev_op(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) ret = pci_mmcfg_reserved(info.address, info.segment, info.start_bus, info.end_bus, info.flags); - if ( !ret && has_vpci(currd) ) + if ( !ret && has_vpci(currd) && (info.flags & XEN_PCI_MMCFG_RESERVED) ) { /* * For HVM (PVH) domains try to add the newly found MMCFG to the -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:34:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:34:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOv-00033k-29; Sat, 16 May 2020 06:34:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOu-00033e-AA for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:24 +0000 X-Inumbo-ID: 481d524e-973f-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 481d524e-973f-11ea-ae69-bc764e2007e4; Sat, 16 May 2020 06:34:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PscfNRIDkwgS1NVUr75R85+V9I9fD04482orCL3ozWE=; b=V9ANyACU/Yezd8EM9nW6YCO5wN FdAbuQHE/VVtvvT7uwvec1ypT78Re+QB/xuP1uj3Y6s1hwHWqfCvL+pDK9Fj2wotUyIxG5U3Xj0v2 +1aI3ZtO0RDldj5zOiF1DFhdgFFEcnsob7OlDOtJUU2ZTY/I+IiwTjH6r992ulKOC/Yc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqOt-0007gI-KF for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqOt-0004vg-JF for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/xenstore: don't store domU's mfn of ring page in xenstored Message-Id: Date: Sat, 16 May 2020 06:34:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 122b52230aa5b79d65e18b8b77094027faa2f8e2 Author: Juergen Gross AuthorDate: Thu Apr 30 07:38:42 2020 +0200 Commit: Julien Grall CommitDate: Thu May 14 09:35:30 2020 +0100 tools/xenstore: don't store domU's mfn of ring page in xenstored The XS_INTRODUCE command has two parameters: the mfn (or better: gfn) of the domain's xenstore ring page and the event channel of the domain for communicating with Xenstore. The gfn is not really needed. It is stored in the per-domain struct in xenstored and in case of another XS_INTRODUCE for the domain it is tested to match the original value. If it doesn't match the command is aborted via EINVAL, otherwise the event channel to the domain is recreated. As XS_INTRODUCE is limited to dom0 and there is no real downside of recreating the event channel just omit the test for the gfn to match and don't return EINVAL for multiple XS_INTRODUCE calls. Signed-off-by: Juergen Gross Reviewed-by: Julien Grall Acked-by: Wei Liu --- tools/xenstore/xenstored_domain.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 5858185211..06359503f0 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -55,10 +55,6 @@ struct domain repeated domain introductions. */ evtchn_port_t remote_port; - /* The mfn associated with the event channel, used only to validate - repeated domain introductions. */ - unsigned long mfn; - /* Domain path in store. */ char *path; @@ -363,13 +359,12 @@ static void domain_conn_reset(struct domain *domain) domain->interface->rsp_cons = domain->interface->rsp_prod = 0; } -/* domid, mfn, evtchn, path */ +/* domid, gfn, evtchn, path */ int do_introduce(struct connection *conn, struct buffered_data *in) { struct domain *domain; char *vec[3]; unsigned int domid; - unsigned long mfn; evtchn_port_t port; int rc; struct xenstore_domain_interface *interface; @@ -381,7 +376,7 @@ int do_introduce(struct connection *conn, struct buffered_data *in) return EACCES; domid = atoi(vec[0]); - mfn = atol(vec[1]); + /* Ignore the gfn, we don't need it. */ port = atoi(vec[2]); /* Sanity check args. */ @@ -402,21 +397,19 @@ int do_introduce(struct connection *conn, struct buffered_data *in) return rc; } domain->interface = interface; - domain->mfn = mfn; /* Now domain belongs to its connection. */ talloc_steal(domain->conn, domain); fire_watches(NULL, in, "@introduceDomain", false); - } else if ((domain->mfn == mfn) && (domain->conn != conn)) { + } else { /* Use XS_INTRODUCE for recreating the xenbus event-channel. */ if (domain->port) xenevtchn_unbind(xce_handle, domain->port); rc = xenevtchn_bind_interdomain(xce_handle, domid, port); domain->port = (rc == -1) ? 0 : rc; domain->remote_port = port; - } else - return EINVAL; + } domain_conn_reset(domain); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:34:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:34:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqP6-00034f-3j; Sat, 16 May 2020 06:34:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqP5-00034Z-9f for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:35 +0000 X-Inumbo-ID: 4e200132-973f-11ea-a61d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4e200132-973f-11ea-a61d-12813bfff9fa; Sat, 16 May 2020 06:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hV1Bu9eOB+/sUFOElPgfdXJXpbEQvP5WTlNgmy3R7ek=; b=0M1UFNQd19veVaPDf6G69auEw5 nome/R7/XpYzbVusNTrLXqunKwPLsmoYZ10Tu0Sc606gOQhw3LdvdtFhWmHvVguclzUu5Asbmn9vR cYQ6igVQUSxOEYfhSZd0dNScS5IZi9PH96AdEQTnoQyoW++rGNY5jPhxwtwy6dWLlPgk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqP3-0007h5-Mu for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqP3-0004wn-Lz for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/Kconfig: define EXPERT a bool rather than a string Message-Id: Date: Sat, 16 May 2020 06:34:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f8644fe441abfd8de8b1f237229cfbe600a58701 Author: Julien Grall AuthorDate: Thu Apr 30 15:25:47 2020 +0100 Commit: Julien Grall CommitDate: Thu May 14 09:35:30 2020 +0100 xen/Kconfig: define EXPERT a bool rather than a string Since commit f80fe2b34f08 "xen: Update Kconfig to Linux v5.4" EXPERT can only have two values (enabled or disabled). So switch from a string to a bool. Take the opportunity to replace all "EXPERT = y" to "EXPERT" and use squash the lines bool and prompt together in modified place. Signed-off-by: Julien Grall Acked-by: Dario Faggioli Acked-by: Stefano Stabellini Acked-by: Jan Beulich --- xen/Kconfig | 3 +-- xen/Kconfig.debug | 2 +- xen/arch/arm/Kconfig | 12 +++++------- xen/arch/x86/Kconfig | 6 +++--- xen/common/Kconfig | 14 +++++++------- xen/common/sched/Kconfig | 2 +- xen/drivers/passthrough/Kconfig | 2 +- 7 files changed, 19 insertions(+), 22 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 073042f467..120b5f4129 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -35,8 +35,7 @@ config DEFCONFIG_LIST default ARCH_DEFCONFIG config EXPERT - string - default y if "$(XEN_CONFIG_EXPERT)" = "y" + def_bool y if "$(XEN_CONFIG_EXPERT)" = "y" config LTO bool "Link Time Optimisation" diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index ee6ee33b69..fad3050d4f 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -11,7 +11,7 @@ config DEBUG You probably want to say 'N' here. -if DEBUG || EXPERT = "y" +if DEBUG || EXPERT config CRASH_DEBUG bool "Crash Debugging Support" diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index d51f66072e..2777388265 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -32,8 +32,7 @@ menu "Architecture Features" source "arch/Kconfig" config ACPI - bool - prompt "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT = "y" + bool "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT depends on ARM_64 ---help--- @@ -50,8 +49,7 @@ config GICV3 If unsure, say Y config HAS_ITS - bool - prompt "GICv3 ITS MSI controller support" if EXPERT = "y" + bool "GICv3 ITS MSI controller support" if EXPERT depends on GICV3 && !NEW_VGIC config HVM @@ -81,7 +79,7 @@ config SBSA_VUART_CONSOLE SBSA Generic UART implements a subset of ARM PL011 UART. config ARM_SSBD - bool "Speculative Store Bypass Disable" if EXPERT = "y" + bool "Speculative Store Bypass Disable" if EXPERT depends on HAS_ALTERNATIVE default y help @@ -91,7 +89,7 @@ config ARM_SSBD If unsure, say Y. config HARDEN_BRANCH_PREDICTOR - bool "Harden the branch predictor against aliasing attacks" if EXPERT = "y" + bool "Harden the branch predictor against aliasing attacks" if EXPERT default y help Speculation attacks against some high-performance processors rely on @@ -108,7 +106,7 @@ config HARDEN_BRANCH_PREDICTOR If unsure, say Y. config TEE - bool "Enable TEE mediators support" if EXPERT = "y" + bool "Enable TEE mediators support" if EXPERT default n help This option enables generic TEE mediators support. It allows guests diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 96432f1f69..b565f6831d 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -128,7 +128,7 @@ config BIGMEM If unsure, say N. config HVM_FEP - bool "HVM Forced Emulation Prefix support" if EXPERT = "y" + bool "HVM Forced Emulation Prefix support" if EXPERT default DEBUG depends on HVM ---help--- @@ -148,7 +148,7 @@ config HVM_FEP config TBOOT def_bool y - prompt "Xen tboot support" if EXPERT = "y" + prompt "Xen tboot support" if EXPERT select CRYPTO ---help--- Allows support for Trusted Boot using the Intel(R) Trusted Execution @@ -233,7 +233,7 @@ config HYPERV_GUEST endif config MEM_SHARING - bool "Xen memory sharing support" if EXPERT = "y" + bool "Xen memory sharing support" if EXPERT depends on HVM endmenu diff --git a/xen/common/Kconfig b/xen/common/Kconfig index a6914fcae9..fe9b41f721 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -12,7 +12,7 @@ config CORE_PARKING bool config GRANT_TABLE - bool "Grant table support" if EXPERT = "y" + bool "Grant table support" if EXPERT default y ---help--- Grant table provides a generic mechanism to memory sharing @@ -128,7 +128,7 @@ config KEXEC If unsure, say Y. config EFI_SET_VIRTUAL_ADDRESS_MAP - bool "EFI: call SetVirtualAddressMap()" if EXPERT = "y" + bool "EFI: call SetVirtualAddressMap()" if EXPERT ---help--- Call EFI SetVirtualAddressMap() runtime service to setup memory map for further runtime services. According to UEFI spec, it isn't strictly @@ -139,7 +139,7 @@ config EFI_SET_VIRTUAL_ADDRESS_MAP config XENOPROF def_bool y - prompt "Xen Oprofile Support" if EXPERT = "y" + prompt "Xen Oprofile Support" if EXPERT depends on X86 ---help--- Xen OProfile (Xenoprof) is a system-wide profiler for Xen virtual @@ -176,7 +176,7 @@ config XSM_FLASK config XSM_FLASK_AVC_STATS def_bool y - prompt "Maintain statistics on the FLASK access vector cache" if EXPERT = "y" + prompt "Maintain statistics on the FLASK access vector cache" if EXPERT depends on XSM_FLASK ---help--- Maintain counters on the access vector cache that can be viewed using @@ -249,7 +249,7 @@ config LATE_HWDOM If unsure, say N. config ARGO - bool "Argo: hypervisor-mediated interdomain communication" if EXPERT = "y" + bool "Argo: hypervisor-mediated interdomain communication" if EXPERT ---help--- Enables a hypercall for domains to ask the hypervisor to perform data transfer of messages between domains. @@ -321,7 +321,7 @@ config SUPPRESS_DUPLICATE_SYMBOL_WARNINGS build becoming overly verbose. config CMDLINE - string "Built-in hypervisor command string" if EXPERT = "y" + string "Built-in hypervisor command string" if EXPERT default "" ---help--- Enter arguments here that should be compiled into the hypervisor @@ -354,7 +354,7 @@ config DOM0_MEM Leave empty if you are not sure what to specify. config TRACEBUFFER - bool "Enable tracing infrastructure" if EXPERT = "y" + bool "Enable tracing infrastructure" if EXPERT default y ---help--- Enable tracing infrastructure and pre-defined tracepoints within Xen. diff --git a/xen/common/sched/Kconfig b/xen/common/sched/Kconfig index 883ac87cab..61231aacaa 100644 --- a/xen/common/sched/Kconfig +++ b/xen/common/sched/Kconfig @@ -1,5 +1,5 @@ menu "Schedulers" - visible if EXPERT = "y" + visible if EXPERT config SCHED_CREDIT bool "Credit scheduler support" diff --git a/xen/drivers/passthrough/Kconfig b/xen/drivers/passthrough/Kconfig index e7e62ccd63..73f4ad89ec 100644 --- a/xen/drivers/passthrough/Kconfig +++ b/xen/drivers/passthrough/Kconfig @@ -14,7 +14,7 @@ config ARM_SMMU ARM SMMU architecture. config IPMMU_VMSA - bool "Renesas IPMMU-VMSA found in R-Car Gen3 SoCs" if EXPERT = "y" + bool "Renesas IPMMU-VMSA found in R-Car Gen3 SoCs" if EXPERT depends on ARM_64 ---help--- Support for implementations of the Renesas IPMMU-VMSA found -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:34:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:34:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqPF-00035U-5U; Sat, 16 May 2020 06:34:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqPE-00035O-D1 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:44 +0000 X-Inumbo-ID: 5421cf2a-973f-11ea-a61d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5421cf2a-973f-11ea-a61d-12813bfff9fa; Sat, 16 May 2020 06:34:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LtpqoBTYf9S8LiMsfKsKVO4u68qApH9cAwGVxdLDQo8=; b=lucr+DX73q+uloTYVyLMsV/f7X qpSuV2rbYLoebYw9RR97tjAX/2334YEMnhXvrQavROids9hbK3lui2jAG/Gb7c9zaeF3XooFbtcmM jhNiYqjT8GrHZKxeUhY/ZeAARt2wTUnGoyCsFbTew8O4KtVwJC04xsQNmXyjbeDPDj9c=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqPD-0007hN-PT for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqPD-0004xe-Oc for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen: Allow EXPERT mode to be selected from the menuconfig directly Message-Id: Date: Sat, 16 May 2020 06:34:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d155e4aef35cd9c03f6db7030a956f83f33a1e99 Author: Julien Grall AuthorDate: Thu Apr 30 15:25:48 2020 +0100 Commit: Julien Grall CommitDate: Thu May 14 10:20:04 2020 +0100 xen: Allow EXPERT mode to be selected from the menuconfig directly EXPERT mode is currently used to gate any options that are in technical preview or not security supported. At the moment, this is selected by adding XEN_CONFIG_EXPERT=y on the make command line, or to the (currently undocumented) top-level .config file. This makes the option very unintuitive to use: If the user forgets to add the option when (re)building or when using menuconfig, then xen/.config will be silently rewritten, leading to behavior which is very difficult to diagnose. Adding XEN_CONFIG_EXPERT=y to the top-level .config is not obvious behavior, particularly as the file is undocumented. A lot of the options behind EXPERT would benefit from being more accessible so users can experiment with them and voice any concerns before they are fully supported. To make this option more discoverable and consistent to use, make it possible to select it from the menuconfig. This doesn't change the fact a Xen with EXPERT mode selected will not be security supported. Signed-off-by: Julien Grall Signed-off-by: George Dunlap Acked-by: Ian Jackson --- xen/Kconfig | 10 +++++++++- xen/Makefile | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/xen/Kconfig b/xen/Kconfig index 120b5f4129..34c318bfa2 100644 --- a/xen/Kconfig +++ b/xen/Kconfig @@ -35,7 +35,15 @@ config DEFCONFIG_LIST default ARCH_DEFCONFIG config EXPERT - def_bool y if "$(XEN_CONFIG_EXPERT)" = "y" + bool "Configure standard Xen features (expert users)" + help + This option allows certain base Xen options and settings + to be disabled or tweaked. This is for specialized environments + which can tolerate a "non-standard" Xen. + Only use this if you really know what you are doing. + Xen binaries built with this option enabled are not security + supported. + default n config LTO bool "Link Time Optimisation" diff --git a/xen/Makefile b/xen/Makefile index 2b1dacb497..286f374b54 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -11,7 +11,6 @@ export XEN_DOMAIN ?= $(shell ([ -x /bin/dnsdomainname ] && /bin/dnsdomainname) | export XEN_BUILD_DATE ?= $(shell LC_ALL=C date) export XEN_BUILD_TIME ?= $(shell LC_ALL=C date +%T) export XEN_BUILD_HOST ?= $(shell hostname) -export XEN_CONFIG_EXPERT ?= n # Best effort attempt to find a python interpreter, defaulting to Python 3 if # available. Fall back to just `python` if `which` is nowhere to be found. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 06:34:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 06:34:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqPQ-00036P-7P; Sat, 16 May 2020 06:34:56 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqPO-00036H-QO for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:54 +0000 X-Inumbo-ID: 5a277294-973f-11ea-a61d-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5a277294-973f-11ea-a61d-12813bfff9fa; Sat, 16 May 2020 06:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mXcFG7JvTiskVko39fVa8aaBySh6JirlZJ1nvDJBJD0=; b=Q/h7JH4juzFN1fMI/irnfejoxE CYpAKEKKiMycJNvqBmTw+hDWiPMTUNyi2Tgj0SGzjCN9jJtqxiiYiNL7xgSatJuVtGsHwNAidPrSB P2SmPqEvbc5Vm8O4GrSAoGRQXszlQyLVtHa6CVOM4Hka4CvHdxRIT+5/OXnD4hw82zs0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZqPN-0007hW-Si for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZqPN-0004yn-RU for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 06:34:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/APIC: restrict certain messages to BSP Message-Id: Date: Sat, 16 May 2020 06:34:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5115b437eef595ce77f05bfc02626e31e263e965 Author: Jan Beulich AuthorDate: Thu May 14 15:04:32 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 14 15:04:32 2020 +0200 x86/APIC: restrict certain messages to BSP All CPUs get an equal setting of EOI broadcast suppression; no need to log one message per CPU, even if it's only in verbose APIC mode. Only the BSP is eligible to possibly get ExtINT enabled; no need to log that it gets disabled on all APs, even if - again - it's only in verbose APIC mode. Take the opportunity and introduce a "bsp" parameter to the function, to stop using smp_processor_id() to tell BSP from APs. No functional change from this. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/apic.c | 19 ++++++++++--------- xen/arch/x86/smpboot.c | 4 ++-- xen/include/asm-x86/apic.h | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 71f4efb2fe..60627fd6e6 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -499,7 +499,7 @@ static void resume_x2apic(void) __enable_x2apic(); } -void setup_local_APIC(void) +void setup_local_APIC(bool bsp) { unsigned long oldvalue, value, maxlvt; int i, j; @@ -598,8 +598,8 @@ void setup_local_APIC(void) if ( directed_eoi_enabled ) { value |= APIC_SPIV_DIRECTED_EOI; - apic_printk(APIC_VERBOSE, "Suppress EOI broadcast on CPU#%d\n", - smp_processor_id()); + if ( bsp ) + apic_printk(APIC_VERBOSE, "Suppressing EOI broadcast\n"); } apic_write(APIC_SPIV, value); @@ -615,21 +615,22 @@ void setup_local_APIC(void) * TODO: set up through-local-APIC from through-I/O-APIC? --macro */ value = apic_read(APIC_LVT0) & APIC_LVT_MASKED; - if (!smp_processor_id() && (pic_mode || !value)) { + if (bsp && (pic_mode || !value)) { value = APIC_DM_EXTINT; apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n", smp_processor_id()); } else { value = APIC_DM_EXTINT | APIC_LVT_MASKED; - apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n", - smp_processor_id()); + if (bsp) + apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n", + smp_processor_id()); } apic_write(APIC_LVT0, value); /* * only the BP should see the LINT1 NMI signal, obviously. */ - if (!smp_processor_id()) + if (bsp) value = APIC_DM_NMI; else value = APIC_DM_NMI | APIC_LVT_MASKED; @@ -663,7 +664,7 @@ void setup_local_APIC(void) printk("Leaving ESR disabled.\n"); } - if (nmi_watchdog == NMI_LOCAL_APIC && smp_processor_id()) + if (nmi_watchdog == NMI_LOCAL_APIC && !bsp) setup_apic_nmi_watchdog(); apic_pm_activate(); } @@ -1474,7 +1475,7 @@ int __init APIC_init_uniprocessor (void) physids_clear(phys_cpu_present_map); physid_set(boot_cpu_physical_apicid, phys_cpu_present_map); - setup_local_APIC(); + setup_local_APIC(true); if (nmi_watchdog == NMI_LOCAL_APIC) check_nmi_watchdog(); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index f999323bc4..170ab24e66 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -192,7 +192,7 @@ static void smp_callin(void) */ Dprintk("CALLIN, before setup_local_APIC().\n"); x2apic_ap_setup(); - setup_local_APIC(); + setup_local_APIC(false); /* Save our processor parameters. */ if ( !smp_store_cpu_info(cpu) ) @@ -1183,7 +1183,7 @@ void __init smp_prepare_cpus(void) verify_local_APIC(); connect_bsp_APIC(); - setup_local_APIC(); + setup_local_APIC(true); if ( !skip_ioapic_setup && nr_ioapics ) setup_IO_APIC(); diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h index 4759279eb2..8ddb896ee9 100644 --- a/xen/include/asm-x86/apic.h +++ b/xen/include/asm-x86/apic.h @@ -169,7 +169,7 @@ extern int verify_local_APIC (void); extern void cache_APIC_registers (void); extern void sync_Arb_IDs (void); extern void init_bsp_APIC (void); -extern void setup_local_APIC (void); +extern void setup_local_APIC(bool bsp); extern void init_apic_mappings (void); extern void smp_local_timer_interrupt (struct cpu_user_regs *regs); extern void setup_boot_APIC_clock (void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 11:55:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 11:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZvPH-0007Gi-78; Sat, 16 May 2020 11:55:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZvPF-0007GY-Dw for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 11:55:05 +0000 X-Inumbo-ID: 1449f206-976c-11ea-a648-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1449f206-976c-11ea-a648-12813bfff9fa; Sat, 16 May 2020 11:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=isfseSk+C2Bz9aOv/DU/2lalEtcIvSckpk9xtguGtIQ=; b=rf8CRL6gO7jx8eeIt2IVlZN4o7 /sb9x716phz726x8UAXotgXWe1vxQCQLtF+6o/VTHkj31mgiDBEVp6EWhUVAt1ihclYqrp1+xhjdJ plqXjUpLGzyDQjuTL/8RwZDqVz+l/8W8ruWeBYcLS0INsES+VjWyv8LTj9J3IVppTZJM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZvPD-0006JG-Va for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 11:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZvPD-0005Xa-TZ for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 11:55:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] changelog: add relevant changes during 4.14 development window Message-Id: Date: Sat, 16 May 2020 11:55:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 22970c0e0c9e4ffd51816c1cc7e4aa19800d3d09 Author: Roger Pau Monne AuthorDate: Mon May 11 12:31:45 2020 +0200 Commit: Wei Liu CommitDate: Sat May 16 12:50:51 2020 +0100 changelog: add relevant changes during 4.14 development window Add entries for the relevant changes I've been working on during the 4.14 development time frame. Mostly performance improvements related to pvshim scalability issues when running with high number of vCPUs. Signed-off-by: Roger Pau Monné Acked-by: Paul Durrant --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b11e9bc4e3..554eeb6a12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added - This file and MAINTAINERS entry. + - Use x2APIC mode whenever available, regardless of interrupt remapping + support. + - Performance improvements to guest assisted TLB flushes, either when using + the Xen hypercall interface or the viridian one. + - Assorted pvshim performance and scalability improvements plus some bug + fixes. ## [4.13.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.13.0) - 2019-12-17 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 16 13:22:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 13:22:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZwlS-00071X-4i; Sat, 16 May 2020 13:22:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZwlR-00071S-Ei for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 13:22:05 +0000 X-Inumbo-ID: 3bfc9478-9778-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3bfc9478-9778-11ea-b07b-bc764e2007e4; Sat, 16 May 2020 13:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BfcwiaJKt6wDlX8ywFUlPZ9SwDZPGGbzQaZhu8svI3g=; b=hbtIAaFPe2cyQu/9ffyzvPa9Rd tTqdmeg+9qcgeh9kPW1V5bHGzKq3Uf7NC3QZmuc/kbPy+ZJl+f3z1v7p5h8Pk7Vkcu0X0cK53wLNX UXtAoINTEm10rGNmw4fpNTkrTD2uqY1B9CvGz1dNtZXiQLj59uNh8xlVyIL28VAIazXk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZwlQ-00086i-Hn for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 13:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZwlQ-0002LS-GO for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 13:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/sched: don't call sync_vcpu_execstate() in sched_unit_migrate_finish() Message-Id: Date: Sat, 16 May 2020 13:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b492c65da5ec5ed07974db22e998243be475a664 Author: Juergen Gross AuthorDate: Thu May 14 17:36:13 2020 +0200 Commit: Andrew Cooper CommitDate: Sat May 16 14:15:46 2020 +0100 xen/sched: don't call sync_vcpu_execstate() in sched_unit_migrate_finish() With support of core scheduling sched_unit_migrate_finish() gained a call of sync_vcpu_execstate() as it was believed to be called as a result of vcpu migration in any case. In case of migrating a vcpu away from a physical cpu for a short period of time but without ever being scheduled on the selected new cpu, this might not be true so drop the call and let the lazy state syncing do its job. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Dario Faggioli --- xen/common/sched/core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 5df66cbf9b..cb49a8bc02 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -1078,12 +1078,7 @@ static void sched_unit_migrate_finish(struct sched_unit *unit) sched_spin_unlock_double(old_lock, new_lock, flags); if ( old_cpu != new_cpu ) - { - /* Vcpus are moved to other pcpus, commit their states to memory. */ - for_each_sched_unit_vcpu ( unit, v ) - sync_vcpu_execstate(v); sched_move_irqs(unit); - } /* Wake on new CPU. */ for_each_sched_unit_vcpu ( unit, v ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 16 13:22:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 13:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZwlc-000724-6N; Sat, 16 May 2020 13:22:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZwlb-00071v-E3 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 13:22:15 +0000 X-Inumbo-ID: 4201e95e-9778-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4201e95e-9778-11ea-b07b-bc764e2007e4; Sat, 16 May 2020 13:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NRm12i1Y3xOLDgTW+Hi+TEvg8ft7M4A6ebZWZNIKw9Q=; b=zfeLYXQ9CCyQgalpsUG5Jy4/ox 9BNGkQvEUOhOY9ZnAogW7Wo6zfRcKnR1RJf36HyfD5m4apRHS4oPJ9D2/sSwoIIXzoDPulH085H6W 8LRgobsp02JAPgu6EthMHt67McQkW83M5DNe9J27yplLTXliNaT5rlrDsdQbtjLXqfNA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZwla-00086l-LJ for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 13:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZwla-0002Lz-Jn for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 13:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/sched: fix latent races accessing vcpu->dirty_cpu Message-Id: Date: Sat, 16 May 2020 13:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 99266e31832fb4a4da5c9b8163328be350d1261d Author: Juergen Gross AuthorDate: Thu May 14 17:36:14 2020 +0200 Commit: Andrew Cooper CommitDate: Sat May 16 14:15:46 2020 +0100 xen/sched: fix latent races accessing vcpu->dirty_cpu The dirty_cpu field of struct vcpu denotes which cpu still holds data of a vcpu. All accesses to this field should be atomic in case the vcpu could just be running, as it is accessed without any lock held in most cases. Especially sync_local_execstate() and context_switch() for the same vcpu running concurrently have a risk for failing. There are some instances where accesses are not atomically done, and even worse where multiple accesses are done when a single one would be mandated. Correct that in order to avoid potential problems. Add some assertions to verify dirty_cpu is handled properly. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 16 +++++++++++----- xen/common/keyhandler.c | 2 +- xen/include/xen/sched.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index a4428190d5..2e5717b983 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -183,7 +183,7 @@ void startup_cpu_idle_loop(void) ASSERT(is_idle_vcpu(v)); cpumask_set_cpu(v->processor, v->domain->dirty_cpumask); - v->dirty_cpu = v->processor; + write_atomic(&v->dirty_cpu, v->processor); reset_stack_and_jump(idle_loop); } @@ -1769,6 +1769,7 @@ static void __context_switch(void) if ( !is_idle_domain(pd) ) { + ASSERT(read_atomic(&p->dirty_cpu) == cpu); memcpy(&p->arch.user_regs, stack_regs, CTXT_SWITCH_STACK_BYTES); vcpu_save_fpu(p); pd->arch.ctxt_switch->from(p); @@ -1832,7 +1833,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { unsigned int cpu = smp_processor_id(); const struct domain *prevd = prev->domain, *nextd = next->domain; - unsigned int dirty_cpu = next->dirty_cpu; + unsigned int dirty_cpu = read_atomic(&next->dirty_cpu); ASSERT(prev != next); ASSERT(local_irq_is_enabled()); @@ -1844,6 +1845,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { /* Remote CPU calls __sync_local_execstate() from flush IPI handler. */ flush_mask(cpumask_of(dirty_cpu), FLUSH_VCPU_STATE); + ASSERT(!vcpu_cpu_dirty(next)); } _update_runstate_area(prev); @@ -1956,13 +1958,17 @@ void sync_local_execstate(void) void sync_vcpu_execstate(struct vcpu *v) { - if ( v->dirty_cpu == smp_processor_id() ) + unsigned int dirty_cpu = read_atomic(&v->dirty_cpu); + + if ( dirty_cpu == smp_processor_id() ) sync_local_execstate(); - else if ( vcpu_cpu_dirty(v) ) + else if ( is_vcpu_dirty_cpu(dirty_cpu) ) { /* Remote CPU calls __sync_local_execstate() from flush IPI handler. */ - flush_mask(cpumask_of(v->dirty_cpu), FLUSH_VCPU_STATE); + flush_mask(cpumask_of(dirty_cpu), FLUSH_VCPU_STATE); } + ASSERT(!is_vcpu_dirty_cpu(dirty_cpu) || + read_atomic(&v->dirty_cpu) != dirty_cpu); } static int relinquish_memory( diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 87bd145374..68364e987d 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -316,7 +316,7 @@ static void dump_domains(unsigned char key) vcpu_info(v, evtchn_upcall_pending), !vcpu_event_delivery_is_enabled(v)); if ( vcpu_cpu_dirty(v) ) - printk("dirty_cpu=%u", v->dirty_cpu); + printk("dirty_cpu=%u", read_atomic(&v->dirty_cpu)); printk("\n"); printk(" pause_count=%d pause_flags=%lx\n", atomic_read(&v->pause_count), v->pause_flags); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 6101761d25..ac53519d7f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -844,7 +844,7 @@ static inline bool is_vcpu_dirty_cpu(unsigned int cpu) static inline bool vcpu_cpu_dirty(const struct vcpu *v) { - return is_vcpu_dirty_cpu(v->dirty_cpu); + return is_vcpu_dirty_cpu(read_atomic(&v->dirty_cpu)); } void vcpu_block(void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 16 16:33:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 16:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZzkI-0008Oa-UY; Sat, 16 May 2020 16:33:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZzkH-0008OV-9I for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 16:33:05 +0000 X-Inumbo-ID: eaa89412-9792-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id eaa89412-9792-11ea-b07b-bc764e2007e4; Sat, 16 May 2020 16:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=79lOlhwQKm18OrJdb7SrI0q2kqyebrBSFbAqumzhAZ4=; b=oU5FAVGTf1DMH8F7j6/Aht9MA2 jSYn6rb6WBmSOsNnrJWKdpDT1DU1sfX2BEEEJXLUrYJb3nCZiSO8yhxKnPWqzoBhAvr3wSEo3V+Ac XUDPXLNa+34oaSZYFEjBT5ySMdqib1BmvYrHEQXJkZqdeO87KQdBMjevX4+H5D7M9Gxk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jZzkG-00046k-GU for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 16:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jZzkG-0004sL-F1 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 16:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] CHANGELOG: add hypervisor framework and Hyper-V support Message-Id: Date: Sat, 16 May 2020 16:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 664e1bc12f8658da124a4eff7a8f16da073bd47f Author: Wei Liu AuthorDate: Sat May 16 12:54:38 2020 +0100 Commit: Wei Liu CommitDate: Sat May 16 17:31:32 2020 +0100 CHANGELOG: add hypervisor framework and Hyper-V support Signed-off-by: Wei Liu Acked-by: Paul Durrant --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 554eeb6a12..ccb5055c87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) the Xen hypercall interface or the viridian one. - Assorted pvshim performance and scalability improvements plus some bug fixes. + - Hypervisor framework to ease porting Xen to run on hypervisors. + - Initial support to run on Hyper-V. ## [4.13.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.13.0) - 2019-12-17 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:11:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:11:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39F-00031a-R1; Sat, 16 May 2020 20:11:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39E-00031V-GU for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:04 +0000 X-Inumbo-ID: 5ddad7a6-97b1-11ea-a700-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5ddad7a6-97b1-11ea-a700-12813bfff9fa; Sat, 16 May 2020 20:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/qK4BzI84n6dhXhr36qUDhp2F4miWEjn2oEv7du/RVM=; b=o7vfkthX6lgsrSvBf+iR1xA5K1 D8eXpPtAzeZ7x9OjdDmA7gv5YU7AIc6IaDCDgzgEgNkpRBkgm6XzXYqp5jeCFSbbkcqMwAq267xOy ygixPhVqSQOzOfOKtSdnvgM5sd2JGmvxU6eVG34otpIzhlJrtMjogBjwXdzbCOk2E1Nw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39C-0000CK-Mq for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja39C-0001JY-Lb for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/gen-cpuid: Distinguish default vs max in feature annotations Message-Id: Date: Sat, 16 May 2020 20:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 58202ebc5a7fbf8f03875c2b5218d3deed6debe8 Author: Andrew Cooper AuthorDate: Tue Feb 25 15:33:31 2020 +0000 Commit: Andrew Cooper CommitDate: Fri May 15 14:21:20 2020 +0100 x86/gen-cpuid: Distinguish default vs max in feature annotations Allow lowercase a/s/h to be used to annotate a non-default feature. However, until the toolstack migration logic is fixed, it is not safe to activate yet. Tolerate the annotations, but ignore them for now. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/public/arch-x86/cpufeatureset.h | 2 ++ xen/tools/gen-cpuid.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index e2749245f3..0ffab6c57b 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -87,6 +87,8 @@ enum { * 'A' = All guests. * 'S' = All HVM guests (not PV guests). * 'H' = HVM HAP guests (not PV or HVM Shadow guests). + * Upper case => Available by default + * Lower case => Can be opted-in to, but not available by default. */ /* Intel-defined CPU features, CPUID level 0x00000001.edx, word 0 */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index af5610a5e6..4ec73340de 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -23,6 +23,7 @@ class State(object): self.raw = { '!': set(), 'A': set(), 'S': set(), 'H': set(), + 'a': set(), 's': set(), 'h': set(), } # State calculated @@ -133,9 +134,13 @@ def crunch_numbers(state): state.hvm_shadow_def = state.pv_def | state.raw['S'] state.hvm_hap_def = state.hvm_shadow_def | state.raw['H'] + # TODO: Ignore def/max split until the toolstack migration logic is fixed state.pv_max = state.pv_def state.hvm_shadow_max = state.hvm_shadow_def state.hvm_hap_max = state.hvm_hap_def + # state.pv_max = state.raw['A'] | state.raw['a'] + # state.hvm_shadow_max = state.pv_max | state.raw['S'] | state.raw['s'] + # state.hvm_hap_max = state.hvm_shadow_max | state.raw['H'] | state.raw['h'] # # Feature dependency information. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:11:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39P-00032F-Sh; Sat, 16 May 2020 20:11:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39O-000327-60 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:14 +0000 X-Inumbo-ID: 63de6fb4-97b1-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 63de6fb4-97b1-11ea-ae69-bc764e2007e4; Sat, 16 May 2020 20:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DGvqbAsDJewg46HnXfH2bzrgsNNXf05sf0Jf98Lm6CE=; b=eoqNUdZlzPEMdY90CbB/0IRdZO MiZJ2Dif95HdLLysK0l4ONjsw4wT1N+OIfiKcb/bZ0e6f/WhEy0p6q2J75ErSRJWZF9RbVXPhybdB XOLB2qJmvycHZYO8nbO6p7ubcXQZxeP/skzEIDwp3qLjrfgN1KCkoN3f7Oc892lzO3Ds=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39M-0000CQ-Po for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja39M-0001LB-Ob for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem-paging: fold p2m_mem_paging_prep()'s main if()-s Message-Id: Date: Sat, 16 May 2020 20:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c2612852288c410846e41a7a882317e8bc55b9ff Author: Jan Beulich AuthorDate: Fri May 15 15:57:56 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 15:57:56 2020 +0200 x86/mem-paging: fold p2m_mem_paging_prep()'s main if()-s The condition of the second can be true only if the condition of the first was met; the second half of the condition of the second then also is redundant with an earlier check. Combine them, drop a pointless local variable, and take the liberty to drop the affected gdprintk() altogether, as we don't normally log anything on -EFAULT paths. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/mm/p2m.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 4c1507d3a4..92c5ca6d37 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1808,6 +1808,8 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) /* Allocate a page if the gfn does not have one yet */ if ( !mfn_valid(mfn) ) { + void *guest_map; + /* If the user did not provide a buffer, we disallow */ ret = -EINVAL; if ( unlikely(user_ptr == NULL) ) @@ -1819,22 +1821,12 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) goto out; mfn = page_to_mfn(page); page_extant = 0; - } - - /* If we were given a buffer, now is the time to use it */ - if ( !page_extant && user_ptr ) - { - void *guest_map; - int rc; - ASSERT( mfn_valid(mfn) ); guest_map = map_domain_page(mfn); - rc = copy_from_user(guest_map, user_ptr, PAGE_SIZE); + ret = copy_from_user(guest_map, user_ptr, PAGE_SIZE); unmap_domain_page(guest_map); - if ( rc ) + if ( ret ) { - gdprintk(XENLOG_ERR, "Failed to load paging-in gfn %lx domain %u " - "bytes left %d\n", gfn_l, d->domain_id, rc); ret = -EFAULT; put_page(page); /* Don't leak pages */ goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:11:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:11:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39Y-00033J-UK; Sat, 16 May 2020 20:11:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39X-000337-Ih for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:23 +0000 X-Inumbo-ID: 69e8a884-97b1-11ea-a700-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 69e8a884-97b1-11ea-a700-12813bfff9fa; Sat, 16 May 2020 20:11:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZkQ/53KPCyalPXrCOWgNLGyigYE5QUJUJB/o5zmnm2U=; b=apX65fA+h3NiSjlMJq1ksFm+I1 475LDei+EmTz1+G5Gkwl0Qk2hDPGAO4O72edU9WxEibwX97ejrsLEhSCCoSArbuXrjk7wHv9UQnmq TREYrhl9aLdHOX92Lv7PB+MOoy1BzrYnCJnWzu0F64NEh6fqL5wFXmhUYTdvuBugR/9U=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39W-0000Cc-Sn for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja39W-0001M4-RZ for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem-paging: correct p2m_mem_paging_prep()'s error handling Message-Id: Date: Sat, 16 May 2020 20:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ecb913be4aaae0e01d6a65e8e1c1ac78816b8809 Author: Jan Beulich AuthorDate: Fri May 15 16:01:06 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:01:06 2020 +0200 x86/mem-paging: correct p2m_mem_paging_prep()'s error handling Communicating errors from p2m_set_entry() to the caller is not enough: Neither the M2P nor the stats updates should occur in such a case. Instead the allocated page needs to be freed again; for cleanliness reasons also properly take into account _PGC_allocated there. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm/p2m.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 92c5ca6d37..60a061216a 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1781,7 +1781,7 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) */ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) { - struct page_info *page; + struct page_info *page = NULL; p2m_type_t p2mt; p2m_access_t a; gfn_t gfn = _gfn(gfn_l); @@ -1816,9 +1816,19 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) goto out; /* Get a free page */ ret = -ENOMEM; - page = alloc_domheap_page(p2m->domain, 0); + page = alloc_domheap_page(d, 0); if ( unlikely(page == NULL) ) goto out; + if ( unlikely(!get_page(page, d)) ) + { + /* + * The domain can't possibly know about this page yet, so failure + * here is a clear indication of something fishy going on. + */ + domain_crash(d); + page = NULL; + goto out; + } mfn = page_to_mfn(page); page_extant = 0; @@ -1828,7 +1838,6 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) if ( ret ) { ret = -EFAULT; - put_page(page); /* Don't leak pages */ goto out; } } @@ -1839,13 +1848,24 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, paging_mode_log_dirty(d) ? p2m_ram_logdirty : p2m_ram_rw, a); - set_gpfn_from_mfn(mfn_x(mfn), gfn_l); + if ( !ret ) + { + set_gpfn_from_mfn(mfn_x(mfn), gfn_l); - if ( !page_extant ) - atomic_dec(&d->paged_pages); + if ( !page_extant ) + atomic_dec(&d->paged_pages); + } out: gfn_unlock(p2m, gfn, 0); + + if ( page ) + { + if ( ret ) + put_page_alloc_ref(page); + put_page(page); + } + return ret; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:11:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39i-00034Z-0n; Sat, 16 May 2020 20:11:34 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39h-00034T-Kd for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:33 +0000 X-Inumbo-ID: 6fe6063c-97b1-11ea-a700-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6fe6063c-97b1-11ea-a700-12813bfff9fa; Sat, 16 May 2020 20:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LxjgaVa5AOvG0tXfE4KIrTBiGN9ObesndqeSaMv7SmI=; b=eWIDEFMmKSnPNV/KeRjPcopb7l hGCVZps3b8hlWnQqcmtoGJFC7jgxXcRQmsLSiNwa0fTluuZElxwppqTQZG4uvpTKmN7uZ+AqaGT/q 4ctoKfDfOykk0kust/swyLIbx7YpG38wWHLbkSze96AV+E2U8bfRNijwOUDZgWXD0jW8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39g-0000Cs-Vi for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja39g-0001Md-Ug for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem-paging: add minimal lock order enforcement to p2m_mem_paging_prep() Message-Id: Date: Sat, 16 May 2020 20:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 142daae09f4ecafb505d21ea9a2203a3392ecc3b Author: Jan Beulich AuthorDate: Fri May 15 16:02:39 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:02:39 2020 +0200 x86/mem-paging: add minimal lock order enforcement to p2m_mem_paging_prep() While full checking is impossible (as the lock is being acquired/ released down the call tree), perform at least a lock level check. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm/p2m.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 60a061216a..9b7b0bf103 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1816,6 +1816,7 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) goto out; /* Get a free page */ ret = -ENOMEM; + page_alloc_mm_pre_lock(d); page = alloc_domheap_page(d, 0); if ( unlikely(page == NULL) ) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:11:44 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:11:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39s-00035w-2Q; Sat, 16 May 2020 20:11:44 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39r-00035p-NC for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:43 +0000 X-Inumbo-ID: 75e93de2-97b1-11ea-a700-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 75e93de2-97b1-11ea-a700-12813bfff9fa; Sat, 16 May 2020 20:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3YVTL1YWhp8DwjONTN6xoEXZFdRpww2VKWr08tmLa88=; b=gNadlFbYSu6sal9UbqZE7QcuvS dMDogHQ+K8E6XNRCI4bH8lQNPFQWQ7olXtb9QO67Dh2SZDh/BsMTBd3l+OMM6WBMkZX9d+ww0XgSA i31ifjrWqflkQwp1/PE/x6jk8xhlxMggdtClG2h2yRCaUOzMu7g2KOJi+Sa6ENzfJ4RA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja39r-0000Eh-2b for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja39r-0001NK-1O for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] sched: allow rcu work to happen when syncing cpus in core scheduling Message-Id: Date: Sat, 16 May 2020 20:11:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4e9c57c4edbabab1b66f965db0203100097944ff Author: Juergen Gross AuthorDate: Fri May 15 16:04:00 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:04:00 2020 +0200 sched: allow rcu work to happen when syncing cpus in core scheduling With RCU barriers moved from tasklets to normal RCU processing cpu offlining in core scheduling might deadlock due to cpu synchronization required by RCU processing and core scheduling concurrently. Fix that by bailing out from core scheduling synchronization in case of pending RCU work. Additionally the RCU softirq is now required to be of higher priority than the scheduling softirqs in order to do RCU processing before entering the scheduler again, as bailing out from the core scheduling synchronization requires to raise another softirq SCHED_SLAVE, which would bypass RCU processing again. Reported-by: Sergey Dyasli Tested-by: Sergey Dyasli Signed-off-by: Juergen Gross Acked-by: Dario Faggioli --- xen/common/sched/core.c | 13 ++++++++++--- xen/include/xen/softirq.h | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index d94b95285f..5df66cbf9b 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -2457,13 +2457,20 @@ static struct sched_unit *sched_wait_rendezvous_in(struct sched_unit *prev, v = unit2vcpu_cpu(prev, cpu); } /* - * Coming from idle might need to do tasklet work. + * Check for any work to be done which might need cpu synchronization. + * This is either pending RCU work, or tasklet work when coming from + * idle. It is mandatory that RCU softirqs are of higher priority + * than scheduling ones as otherwise a deadlock might occur. * In order to avoid deadlocks we can't do that here, but have to - * continue the idle loop. + * schedule the previous vcpu again, which will lead to the desired + * processing to be done. * Undo the rendezvous_in_cnt decrement and schedule another call of * sched_slave(). */ - if ( is_idle_unit(prev) && sched_tasklet_check_cpu(cpu) ) + BUILD_BUG_ON(RCU_SOFTIRQ > SCHED_SLAVE_SOFTIRQ || + RCU_SOFTIRQ > SCHEDULE_SOFTIRQ); + if ( rcu_pending(cpu) || + (is_idle_unit(prev) && sched_tasklet_check_cpu(cpu)) ) { struct vcpu *vprev = current; diff --git a/xen/include/xen/softirq.h b/xen/include/xen/softirq.h index b4724f5c8b..1f6c4783da 100644 --- a/xen/include/xen/softirq.h +++ b/xen/include/xen/softirq.h @@ -4,10 +4,10 @@ /* Low-latency softirqs come first in the following list. */ enum { TIMER_SOFTIRQ = 0, + RCU_SOFTIRQ, SCHED_SLAVE_SOFTIRQ, SCHEDULE_SOFTIRQ, NEW_TLBFLUSH_CLOCK_PERIOD_SOFTIRQ, - RCU_SOFTIRQ, TASKLET_SOFTIRQ, NR_COMMON_SOFTIRQS }; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:11:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:11:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3A2-00036m-47; Sat, 16 May 2020 20:11:54 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3A1-00036g-Se for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:53 +0000 X-Inumbo-ID: 7bed57d2-97b1-11ea-a700-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7bed57d2-97b1-11ea-a700-12813bfff9fa; Sat, 16 May 2020 20:11:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=VXkLsDXrydpo7qy7Qx+0pZK8UGksSeD9cruyloHLjBk=; b=SnNr+tNRZ2Q1fBBzBgfHg33Nf3 Ox+D4s6gHQqLiykOYNbZW8Y2N31m5p5zjReA6rgytKdwB1T7qtQkdb3huaKWeY6AWUkOL+OKBi0XG SO/WrsZTd+Cndm4jjz7+pF+rY7KTZc/RasNG9nxLnMkAjaMIPtQ6Q/wjnxF9okmJUADo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3A1-0000FH-5w for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja3A1-0001Nu-4s for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:11:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86emul: support SERIALIZE Message-Id: Date: Sat, 16 May 2020 20:11:53 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cca6bf0730ec206afe7ca0536e38ed52ef2dc818 Author: Jan Beulich AuthorDate: Fri May 15 16:09:22 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:09:22 2020 +0200 x86emul: support SERIALIZE ... enabling its use by all guest kinds at the same time. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/libxl/libxl_cpuid.c | 1 + tools/misc/xen-cpuid.c | 1 + tools/tests/x86_emulator/x86-emulate.h | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 13 +++++++++++++ xen/include/asm-x86/cpufeature.h | 1 + xen/include/public/arch-x86/cpufeatureset.h | 1 + 6 files changed, 18 insertions(+) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 00262a3f8f..3ed4a074a4 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -214,6 +214,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-4vnniw",0x00000007, 0, CPUID_REG_EDX, 2, 1}, {"avx512-4fmaps",0x00000007, 0, CPUID_REG_EDX, 3, 1}, {"md-clear", 0x00000007, 0, CPUID_REG_EDX, 10, 1}, + {"serialize", 0x00000007, 0, CPUID_REG_EDX, 14, 1}, {"cet-ibt", 0x00000007, 0, CPUID_REG_EDX, 20, 1}, {"ibrsb", 0x00000007, 0, CPUID_REG_EDX, 26, 1}, {"stibp", 0x00000007, 0, CPUID_REG_EDX, 27, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index ff36d8cee1..6557a65d55 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -161,6 +161,7 @@ static const char *const str_7d0[32] = [10] = "md-clear", /* 12 */ [13] = "tsx-force-abort", + [14] = "serialize", [18] = "pconfig", [20] = "cet-ibt", diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 510850200a..dfb0a19394 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -156,6 +156,7 @@ static inline bool xcr0_mask(uint64_t mask) #define cpu_has_avx512_vpopcntdq (cp.feat.avx512_vpopcntdq && xcr0_mask(0xe6)) #define cpu_has_avx512_4vnniw (cp.feat.avx512_4vnniw && xcr0_mask(0xe6)) #define cpu_has_avx512_4fmaps (cp.feat.avx512_4fmaps && xcr0_mask(0xe6)) +#define cpu_has_serialize cp.feat.serialize #define cpu_has_avx512_bf16 (cp.feat.avx512_bf16 && xcr0_mask(0xe6)) #define cpu_has_xgetbv1 (cpu_has_xsave && cp.xstate.xgetbv1) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 7503da980f..4f5856251c 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1916,6 +1916,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) #define vcpu_has_avx512_4vnniw() (ctxt->cpuid->feat.avx512_4vnniw) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) +#define vcpu_has_serialize() (ctxt->cpuid->feat.serialize) #define vcpu_has_avx512_bf16() (ctxt->cpuid->feat.avx512_bf16) #define vcpu_must_have(feat) \ @@ -5639,6 +5640,18 @@ x86_emulate( goto done; break; + case 0xe8: + switch ( vex.pfx ) + { + case vex_none: /* serialize */ + host_and_vcpu_must_have(serialize); + asm volatile ( ".byte 0x0f, 0x01, 0xe8" ); + break; + default: + goto unimplemented_insn; + } + break; + case 0xf8: /* swapgs */ generate_exception_if(!mode_64bit(), EXC_UD); generate_exception_if(!mode_ring0(), EXC_GP, 0); diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 859970570b..cadef4e824 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -126,6 +126,7 @@ #define cpu_has_avx512_4vnniw boot_cpu_has(X86_FEATURE_AVX512_4VNNIW) #define cpu_has_avx512_4fmaps boot_cpu_has(X86_FEATURE_AVX512_4FMAPS) #define cpu_has_tsx_force_abort boot_cpu_has(X86_FEATURE_TSX_FORCE_ABORT) +#define cpu_has_serialize boot_cpu_has(X86_FEATURE_SERIALIZE) /* CPUID level 0x00000007:1.eax */ #define cpu_has_avx512_bf16 boot_cpu_has(X86_FEATURE_AVX512_BF16) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 0ffab6c57b..cba7b0da3d 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -257,6 +257,7 @@ XEN_CPUFEATURE(AVX512_4VNNIW, 9*32+ 2) /*A AVX512 Neural Network Instructions * XEN_CPUFEATURE(AVX512_4FMAPS, 9*32+ 3) /*A AVX512 Multiply Accumulation Single Precision */ XEN_CPUFEATURE(MD_CLEAR, 9*32+10) /*A VERW clears microarchitectural buffers */ XEN_CPUFEATURE(TSX_FORCE_ABORT, 9*32+13) /* MSR_TSX_FORCE_ABORT.RTM_ABORT */ +XEN_CPUFEATURE(SERIALIZE, 9*32+14) /*a SERIALIZE insn */ XEN_CPUFEATURE(CET_IBT, 9*32+20) /* CET - Indirect Branch Tracking */ XEN_CPUFEATURE(IBRSB, 9*32+26) /*A IBRS and IBPB support (used by Intel) */ XEN_CPUFEATURE(STIBP, 9*32+27) /*A STIBP */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:12:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:12:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AD-00037c-65; Sat, 16 May 2020 20:12:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AC-00037U-1S for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:04 +0000 X-Inumbo-ID: 81f46292-97b1-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 81f46292-97b1-11ea-b9cf-bc764e2007e4; Sat, 16 May 2020 20:12:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=W1FpA5iXE4Jgcu6BkdK+9GKEcNfjqaOsBGOdJ8/amXc=; b=fzyhZLgiRPTLNzVg8f8FKM1lnq qF5TKbFShtPf3udJUvN+3r2R/0fIsfN3QcN3BlJcMBCz3p7LDt4Zg5A7HzmWoFg1jeCX+JSOpufg+ W7sUT/NgbXz/lmfGgUwCiBQhWMTiWEkZ1PjsewrAb8epI8VkREs/MczkI5E4qGMNkT/A=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AB-0000Fd-9W for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja3AB-0001Oh-8M for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86emul: support X{SUS,RES}LDTRK Message-Id: Date: Sat, 16 May 2020 20:12:03 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a6d1b558471fa12db7037a9d055258adf4e7b6e2 Author: Jan Beulich AuthorDate: Fri May 15 16:13:03 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:13:03 2020 +0200 x86emul: support X{SUS,RES}LDTRK There's nothing to be done by the emulator, as we unconditionally abort any XBEGIN. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/libxl/libxl_cpuid.c | 1 + tools/misc/xen-cpuid.c | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 23 +++++++++++++++++++++++ xen/include/public/arch-x86/cpufeatureset.h | 1 + xen/tools/gen-cpuid.py | 3 +++ 5 files changed, 29 insertions(+) diff --git a/tools/libxl/libxl_cpuid.c b/tools/libxl/libxl_cpuid.c index 3ed4a074a4..c31dd1f304 100644 --- a/tools/libxl/libxl_cpuid.c +++ b/tools/libxl/libxl_cpuid.c @@ -208,6 +208,7 @@ int libxl_cpuid_parse_config(libxl_cpuid_policy_list *cpuid, const char* str) {"avx512-vnni", 0x00000007, 0, CPUID_REG_ECX, 11, 1}, {"avx512-bitalg",0x00000007, 0, CPUID_REG_ECX, 12, 1}, {"avx512-vpopcntdq",0x00000007,0,CPUID_REG_ECX, 14, 1}, + {"tsxldtrk", 0x00000007, 0, CPUID_REG_ECX, 16, 1}, {"rdpid", 0x00000007, 0, CPUID_REG_ECX, 22, 1}, {"cldemote", 0x00000007, 0, CPUID_REG_ECX, 25, 1}, diff --git a/tools/misc/xen-cpuid.c b/tools/misc/xen-cpuid.c index 6557a65d55..8578077545 100644 --- a/tools/misc/xen-cpuid.c +++ b/tools/misc/xen-cpuid.c @@ -128,6 +128,7 @@ static const char *const str_7c0[32] = [10] = "vpclmulqdq", [11] = "avx512_vnni", [12] = "avx512_bitalg", [14] = "avx512_vpopcntdq", + [16] = "tsxldtrk", [22] = "rdpid", /* 24 */ [25] = "cldemote", diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 4f5856251c..fa24b1d725 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -1913,6 +1913,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_vnni() (ctxt->cpuid->feat.avx512_vnni) #define vcpu_has_avx512_bitalg() (ctxt->cpuid->feat.avx512_bitalg) #define vcpu_has_avx512_vpopcntdq() (ctxt->cpuid->feat.avx512_vpopcntdq) +#define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) #define vcpu_has_avx512_4vnniw() (ctxt->cpuid->feat.avx512_4vnniw) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) @@ -5647,6 +5648,28 @@ x86_emulate( host_and_vcpu_must_have(serialize); asm volatile ( ".byte 0x0f, 0x01, 0xe8" ); break; + case vex_f2: /* xsusldtrk */ + vcpu_must_have(tsxldtrk); + /* + * We're never in a transactional region when coming here + * - nothing else to do. + */ + break; + default: + goto unimplemented_insn; + } + break; + + case 0xe9: + switch ( vex.pfx ) + { + case vex_f2: /* xresldtrk */ + vcpu_must_have(tsxldtrk); + /* + * We're never in a transactional region when coming here + * - nothing else to do. + */ + break; default: goto unimplemented_insn; } diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index cba7b0da3d..c24eae948d 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -238,6 +238,7 @@ XEN_CPUFEATURE(VPCLMULQDQ, 6*32+10) /*A Vector Carry-less Multiplication Ins XEN_CPUFEATURE(AVX512_VNNI, 6*32+11) /*A Vector Neural Network Instrs */ XEN_CPUFEATURE(AVX512_BITALG, 6*32+12) /*A Support for VPOPCNT[B,W] and VPSHUFBITQMB */ XEN_CPUFEATURE(AVX512_VPOPCNTDQ, 6*32+14) /*A POPCNT for vectors of DW/QW */ +XEN_CPUFEATURE(TSXLDTRK, 6*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(RDPID, 6*32+22) /*A RDPID instruction */ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py index 4ec73340de..037954cfb8 100755 --- a/xen/tools/gen-cpuid.py +++ b/xen/tools/gen-cpuid.py @@ -289,6 +289,9 @@ def crunch_numbers(state): # as dependent features simplifies Xen's logic, and prevents the guest # from seeing implausible configurations. IBRSB: [STIBP, SSBD], + + # In principle the TSXLDTRK insns could also be considered independent. + RTM: [TSXLDTRK], } deep_features = tuple(sorted(deps.keys())) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:12:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:12:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AN-00038c-7s; Sat, 16 May 2020 20:12:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AM-00038S-EG for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:14 +0000 X-Inumbo-ID: 87f6fcc2-97b1-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 87f6fcc2-97b1-11ea-9887-bc764e2007e4; Sat, 16 May 2020 20:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=76dw11zDZzW6NDDkLazGQYlQ9nbmV0tVgJ3ltGaEqcU=; b=UB0j4EE82/NSJAs0lzaRo91o4h P5yvRXbC0XjNCt8brzcQfG4TxFunVu48T81PV6wlZQ8punLbq9XKhsCUlea5VuUF6T5V9S4dZbnLe Fl9I/un14zYd8/V2HSiw+DzaMBMAk14nVsT8GqE9RPyi+ldkxqWtmbMSqkL98DzX0C2g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AL-0000Fm-CK for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja3AL-0001PG-BP for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: retrieve and log CPU frequency information Message-Id: Date: Sat, 16 May 2020 20:12:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f6b6517cd5dbd7b2cdb3cfc4cda9751d1db19a1a Author: Jan Beulich AuthorDate: Fri May 15 16:16:29 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 15 16:16:29 2020 +0200 x86: retrieve and log CPU frequency information While from just a single Skylake system it is already clear that we can't base any of our logic on CPUID leaf 15 [1] (leaf 16 is documented to be used for display purposes only anyway), logging this information may still give us some reference in case of problems as well as for future work. Additionally on the AMD side it is unclear whether the deviation between reported and measured frequencies is because of us not doing well, or because of nominal and actual frequencies being quite far apart. The chosen variable naming in amd_log_freq() has pointed out a naming problem in rdmsr_safe(), which is being taken care of at the same time. Symmetrically wrmsr_safe(), being an inline function, also gets an unnecessary underscore dropped from one of its local variables. [1] With a core crystal clock of 24MHz and a ratio of 216/2, the reported frequency nevertheless is 2600MHz, rather than the to be expected (and calibrated by both us and Linux) 2592MHz. Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/amd.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ xen/arch/x86/cpu/cpu.h | 1 + xen/arch/x86/cpu/hygon.c | 2 + xen/arch/x86/cpu/intel.c | 74 +++++++++++++++++++++++++++++++++ xen/include/asm-x86/msr.h | 16 +++---- 5 files changed, 188 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index f95a8e0fd3..05cbcbad73 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -532,6 +532,107 @@ static void amd_get_topology(struct cpuinfo_x86 *c) : c->cpu_core_id); } +void amd_log_freq(const struct cpuinfo_x86 *c) +{ + unsigned int idx = 0, h; + uint64_t hi, lo, val; + + if (c->x86 < 0x10 || c->x86 > 0x19 || + (c != &boot_cpu_data && + (!opt_cpu_info || (c->apicid & (c->x86_num_siblings - 1))))) + return; + + if (c->x86 < 0x17) { + unsigned int node = 0; + uint64_t nbcfg; + + /* + * Make an attempt at determining the node ID, but assume + * symmetric setup (using node 0) if this fails. + */ + if (c->extended_cpuid_level >= 0x8000001e && + cpu_has(c, X86_FEATURE_TOPOEXT)) { + node = cpuid_ecx(0x8000001e) & 0xff; + if (node > 7) + node = 0; + } else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) { + rdmsrl(0xC001100C, val); + node = val & 7; + } + + /* + * Enable (and use) Extended Config Space accesses, as we + * can't be certain that MCFG is available here during boot. + */ + rdmsrl(MSR_AMD64_NB_CFG, nbcfg); + wrmsrl(MSR_AMD64_NB_CFG, + nbcfg | (1ULL << AMD64_NB_CFG_CF8_EXT_ENABLE_BIT)); +#define PCI_ECS_ADDRESS(sbdf, reg) \ + (0x80000000 | ((sbdf).bdf << 8) | ((reg) & 0xfc) | (((reg) & 0xf00) << 16)) + + for ( ; ; ) { + pci_sbdf_t sbdf = PCI_SBDF(0, 0, 0x18 | node, 4); + + switch (pci_conf_read32(sbdf, PCI_VENDOR_ID)) { + case 0x00000000: + case 0xffffffff: + /* No device at this SBDF. */ + if (!node) + break; + node = 0; + continue; + + default: + /* + * Core Performance Boost Control, family + * dependent up to 3 bits starting at bit 2. + * + * Note that boost states operate at a frequency + * above the base one, and thus need to be + * accounted for in order to correctly fetch the + * nominal frequency of the processor. + */ + switch (c->x86) { + case 0x10: idx = 1; break; + case 0x12: idx = 7; break; + case 0x14: idx = 7; break; + case 0x15: idx = 7; break; + case 0x16: idx = 7; break; + } + idx &= pci_conf_read(PCI_ECS_ADDRESS(sbdf, + 0x15c), + 0, 4) >> 2; + break; + } + break; + } + +#undef PCI_ECS_ADDRESS + wrmsrl(MSR_AMD64_NB_CFG, nbcfg); + } + + lo = 0; /* gcc may not recognize the loop having at least 5 iterations */ + for (h = c->x86 == 0x10 ? 5 : 8; h--; ) + if (!rdmsr_safe(0xC0010064 + h, lo) && (lo >> 63)) + break; + if (!(lo >> 63)) + return; + +#define FREQ(v) (c->x86 < 0x17 ? ((((v) & 0x3f) + 0x10) * 100) >> (((v) >> 6) & 7) \ + : (((v) & 0xff) * 25 * 8) / (((v) >> 8) & 0x3f)) + if (idx && idx < h && + !rdmsr_safe(0xC0010064 + idx, val) && (val >> 63) && + !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) + printk("CPU%u: %lu (%lu..%lu) MHz\n", + smp_processor_id(), FREQ(val), FREQ(lo), FREQ(hi)); + else if (h && !rdmsr_safe(0xC0010064, hi) && (hi >> 63)) + printk("CPU%u: %lu..%lu MHz\n", + smp_processor_id(), FREQ(lo), FREQ(hi)); + else + printk("CPU%u: %lu MHz\n", smp_processor_id(), FREQ(lo)); +#undef FREQ +} + void early_init_amd(struct cpuinfo_x86 *c) { if (c == &boot_cpu_data) @@ -803,6 +904,8 @@ static void init_amd(struct cpuinfo_x86 *c) disable_c1_ramping(); check_syscfg_dram_mod_en(); + + amd_log_freq(c); } const struct cpu_dev amd_cpu_dev = { diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index c2f4d9a06a..1992596d1b 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -19,3 +19,4 @@ extern void detect_ht(struct cpuinfo_x86 *c); extern bool detect_extended_topology(struct cpuinfo_x86 *c); void early_init_amd(struct cpuinfo_x86 *c); +void amd_log_freq(const struct cpuinfo_x86 *c); diff --git a/xen/arch/x86/cpu/hygon.c b/xen/arch/x86/cpu/hygon.c index 9ab7aa8622..46293f1f36 100644 --- a/xen/arch/x86/cpu/hygon.c +++ b/xen/arch/x86/cpu/hygon.c @@ -99,6 +99,8 @@ static void init_hygon(struct cpuinfo_x86 *c) value |= (1 << 27); /* Enable read-only APERF/MPERF bit */ wrmsrl(MSR_K7_HWCR, value); } + + amd_log_freq(c); } const struct cpu_dev hygon_cpu_dev = { diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 7966f4aa8a..b77c1a78ed 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -344,6 +344,76 @@ static int num_cpu_cores(struct cpuinfo_x86 *c) return 1; } +static void intel_log_freq(const struct cpuinfo_x86 *c) +{ + unsigned int eax, ebx, ecx, edx; + uint64_t msrval; + uint8_t max_ratio; + + if ( c->cpuid_level >= 0x15 ) + { + cpuid(0x15, &eax, &ebx, &ecx, &edx); + if ( ecx && ebx && eax ) + { + unsigned long long val = ecx; + + val *= ebx; + do_div(val, eax); + printk("CPU%u: TSC: %uMHz * %u / %u = %LuMHz\n", + smp_processor_id(), ecx, ebx, eax, val); + } + else if ( ecx | eax | ebx ) + { + printk("CPU%u: TSC:", smp_processor_id()); + if ( ecx ) + printk(" core: %uMHz", ecx); + if ( ebx && eax ) + printk(" ratio: %u / %u", ebx, eax); + printk("\n"); + } + } + + if ( c->cpuid_level >= 0x16 ) + { + cpuid(0x16, &eax, &ebx, &ecx, &edx); + if ( ecx | eax | ebx ) + { + printk("CPU%u:", smp_processor_id()); + if ( ecx ) + printk(" bus: %uMHz", ecx); + if ( eax ) + printk(" base: %uMHz", eax); + if ( ebx ) + printk(" max: %uMHz", ebx); + printk("\n"); + } + } + + if ( rdmsr_safe(MSR_INTEL_PLATFORM_INFO, msrval) ) + return; + max_ratio = msrval >> 8; + + if ( max_ratio ) + { + unsigned int factor = 10000; + uint8_t min_ratio = msrval >> 40; + + if ( c->x86 == 6 ) + switch ( c->x86_model ) + { + case 0x1a: case 0x1e: case 0x1f: case 0x2e: /* Nehalem */ + case 0x25: case 0x2c: case 0x2f: /* Westmere */ + factor = 13333; + break; + } + + printk("CPU%u: ", smp_processor_id()); + if ( min_ratio ) + printk("%u..", (factor * min_ratio + 50) / 100); + printk("%u MHz\n", (factor * max_ratio + 50) / 100); + } +} + static void init_intel(struct cpuinfo_x86 *c) { /* Detect the extended topology information if available */ @@ -378,6 +448,10 @@ static void init_intel(struct cpuinfo_x86 *c) ( c->cpuid_level >= 0x00000006 ) && ( cpuid_eax(0x00000006) & (1u<<2) ) ) __set_bit(X86_FEATURE_ARAT, c->x86_capability); + + if ((opt_cpu_info && !(c->apicid & (c->x86_num_siblings - 1))) || + c == &boot_cpu_data ) + intel_log_freq(c); } const struct cpu_dev intel_cpu_dev = { diff --git a/xen/include/asm-x86/msr.h b/xen/include/asm-x86/msr.h index 41397e19cf..5c44c79600 100644 --- a/xen/include/asm-x86/msr.h +++ b/xen/include/asm-x86/msr.h @@ -40,8 +40,8 @@ static inline void wrmsrl(unsigned int msr, __u64 val) /* rdmsr with exception handling */ #define rdmsr_safe(msr,val) ({\ - int _rc; \ - uint32_t lo, hi; \ + int rc_; \ + uint32_t lo_, hi_; \ __asm__ __volatile__( \ "1: rdmsr\n2:\n" \ ".section .fixup,\"ax\"\n" \ @@ -49,15 +49,15 @@ static inline void wrmsrl(unsigned int msr, __u64 val) " movl %5,%2\n; jmp 2b\n" \ ".previous\n" \ _ASM_EXTABLE(1b, 3b) \ - : "=a" (lo), "=d" (hi), "=&r" (_rc) \ + : "=a" (lo_), "=d" (hi_), "=&r" (rc_) \ : "c" (msr), "2" (0), "i" (-EFAULT)); \ - val = lo | ((uint64_t)hi << 32); \ - _rc; }) + val = lo_ | ((uint64_t)hi_ << 32); \ + rc_; }) /* wrmsr with exception handling */ static inline int wrmsr_safe(unsigned int msr, uint64_t val) { - int _rc; + int rc; uint32_t lo, hi; lo = (uint32_t)val; hi = (uint32_t)(val >> 32); @@ -68,9 +68,9 @@ static inline int wrmsr_safe(unsigned int msr, uint64_t val) "3: movl %5,%0\n; jmp 2b\n" ".previous\n" _ASM_EXTABLE(1b, 3b) - : "=&r" (_rc) + : "=&r" (rc) : "c" (msr), "a" (lo), "d" (hi), "0" (0), "i" (-EFAULT)); - return _rc; + return rc; } static inline uint64_t msr_fold(const struct cpu_user_regs *regs) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:12:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:12:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AX-00039w-Az; Sat, 16 May 2020 20:12:25 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AW-00039j-3K for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:24 +0000 X-Inumbo-ID: 8e02c506-97b1-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8e02c506-97b1-11ea-b07b-bc764e2007e4; Sat, 16 May 2020 20:12:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=JzwlL7rhDwTiuvKKbk6Vk0VHo5y3gB6elQwnJnjHinA=; b=KdqUwLqagMm02v1gMobFpU84C0 CkSKYkcXeDK7cx4gVwquQt49QauZvMOfh4i2cVXIPUveUCqbF+RKWuEOg/AYgZn1sfYB11X+CYdok sArofJWwRRQRn+i8M04w482uRdDN7+1een7afN5nmcoTmWv5te8IuLJ+2wSCrZ6uf5x4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3AV-0000Fv-FJ for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja3AV-0001Pw-ED for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/build: fixup path to merge_config.sh Message-Id: Date: Sat, 16 May 2020 20:12:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 90b1701905dd0cbb7efe525b1bf92007fe818b60 Author: Stewart Hildebrand AuthorDate: Tue May 12 13:52:05 2020 -0400 Commit: Andrew Cooper CommitDate: Fri May 15 16:51:26 2020 +0100 xen/build: fixup path to merge_config.sh This resolves the following observed error: /bin/sh: /path/to/xen/xen/../xen/scripts/kconfig/merge_config.sh: No such file or directory Signed-off-by: Stewart Hildebrand Reviewed-by: Anthony PERARD --- xen/tools/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile index ef2f2336c4..fd37f4386a 100644 --- a/xen/tools/kconfig/Makefile +++ b/xen/tools/kconfig/Makefile @@ -93,7 +93,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.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)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles) $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig PHONY += kvmconfig -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:12:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:12:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3Ai-0003BY-Cc; Sat, 16 May 2020 20:12:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3Ag-0003BM-VQ for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:35 +0000 X-Inumbo-ID: 93ff146e-97b1-11ea-a700-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 93ff146e-97b1-11ea-a700-12813bfff9fa; Sat, 16 May 2020 20:12:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jXRsucFhldwLrYRlxiLvEpxv7HpCXYo7uvmlsZ20mbw=; b=Ovo1OYEv5csLz5x0z6X6vVh+jL uU92x0M6P4jNCVR3E8ms/mVJYEh4jynMjO7lHNdtkpQtuCOoz8FfY6CKC3EPo1Y4oJ7GI5zq5cfVm YFaeDqZwr9+GtUaPTldP4mpEgAf9RO3KmedMiwltySl2hzPETUmnbd1hddtDoyeoG+XI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3Af-0000G5-I6 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja3Af-0001Qa-H4 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] domain_page: handle NULL within unmap_domain_page() itself Message-Id: Date: Sat, 16 May 2020 20:12:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 84c2b2a81ab8aa0a14f50660ed7a214beae5a20f Author: Hongyan Xia AuthorDate: Wed May 13 16:43:33 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 15 19:35:09 2020 +0100 domain_page: handle NULL within unmap_domain_page() itself The macro version UNMAP_DOMAIN_PAGE() does both NULL checking and variable clearing. Move NULL checking into the function itself so that the semantics is consistent with other similar constructs like XFREE(). This also eases the use unmap_domain_page() in error handling paths, where we only care about NULL checking but not about variable clearing. Signed-off-by: Hongyan Xia Reviewed-by: Wei Liu Acked-by: Jan Beulich Acked-by: Julien Grall --- xen/arch/arm/mm.c | 3 +++ xen/arch/x86/domain_page.c | 2 +- xen/include/xen/domain_page.h | 7 ++----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 727107eefa..1b14f49345 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -498,6 +498,9 @@ void unmap_domain_page(const void *va) lpae_t *map = this_cpu(xen_dommap); int slot = ((unsigned long) va - DOMHEAP_VIRT_START) >> SECOND_SHIFT; + if ( !va ) + return; + local_irq_save(flags); ASSERT(slot >= 0 && slot < DOMHEAP_ENTRIES); diff --git a/xen/arch/x86/domain_page.c b/xen/arch/x86/domain_page.c index dd32712d2f..b03728e18e 100644 --- a/xen/arch/x86/domain_page.c +++ b/xen/arch/x86/domain_page.c @@ -181,7 +181,7 @@ void unmap_domain_page(const void *ptr) unsigned long va = (unsigned long)ptr, mfn, flags; struct vcpu_maphash_entry *hashent; - if ( va >= DIRECTMAP_VIRT_START ) + if ( !va || va >= DIRECTMAP_VIRT_START ) return; ASSERT(va >= MAPCACHE_VIRT_START && va < MAPCACHE_VIRT_END); diff --git a/xen/include/xen/domain_page.h b/xen/include/xen/domain_page.h index ab2be7b719..a182d33b67 100644 --- a/xen/include/xen/domain_page.h +++ b/xen/include/xen/domain_page.h @@ -73,11 +73,8 @@ static inline void unmap_domain_page_global(const void *va) {}; #endif /* !CONFIG_DOMAIN_PAGE */ #define UNMAP_DOMAIN_PAGE(p) do { \ - if ( p ) \ - { \ - unmap_domain_page(p); \ - (p) = NULL; \ - } \ + unmap_domain_page(p); \ + (p) = NULL; \ } while ( false ) #endif /* __XEN_DOMAIN_PAGE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 16 20:12:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 16 May 2020 20:12:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3Ar-0003D8-E6; Sat, 16 May 2020 20:12:45 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3Aq-0003Cz-9d for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:44 +0000 X-Inumbo-ID: 9a033502-97b1-11ea-a700-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9a033502-97b1-11ea-a700-12813bfff9fa; Sat, 16 May 2020 20:12:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=05A33eZmaEbaz4zsa3MDJoig8YmRb4f47BusueXQpa8=; b=55faGEB/dj2buIgsHHPeJWGOMP atah/XMzAswhjELMFhB7soSJ0eO32F15wblIKNzBBd2fKPxZOU9Lbk2qYy1pwnr0sWz740PA1ly3Z mxuzAqp8yQAviFKdOUIe5/xxQzpDCddWUa+TWbM2dg3pvRCWPvjbnHLGGEV+9yv2Flw4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ja3Ap-0000GJ-L6 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1ja3Ap-0001R8-K0 for xen-changelog@lists.xenproject.org; Sat, 16 May 2020 20:12:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/build: use the correct kconfig makefile Message-Id: Date: Sat, 16 May 2020 20:12:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 57880053dd24012e9f59c23b630fefe07e15dc49 Author: Stewart Hildebrand AuthorDate: Fri May 15 14:25:09 2020 -0400 Commit: Andrew Cooper CommitDate: Fri May 15 19:35:09 2020 +0100 xen/build: use the correct kconfig makefile This resolves the following observed error during config merge: /bin/sh /path/to/xen/xen/../xen/tools/kconfig/merge_config.sh -m .config /path/to/xen/xen/../xen/arch/arm/configs/custom.config Using .config as base Merging /path/to/xen/xen/../xen/arch/arm/configs/custom.config # # merged configuration written to .config (needs make) # make -f /path/to/xen/xen/../xen/Makefile olddefconfig make[2]: Entering directory '/path/to/xen/xen' make[2]: *** No rule to make target 'olddefconfig'. Stop. make[2]: Leaving directory '/path/to/xen/xen' tools/kconfig/Makefile:95: recipe for target 'custom.config' failed The build was invoked by first doing a defconfig (which succeeded): $ make -C xen XEN_TARGET_ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- defconfig Followed by the config fragment merge command (which failed before this patch) $ cat > xen/arch/arm/configs/custom.config < Reviewed-by: Anthony PERARD --- xen/tools/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/tools/kconfig/Makefile b/xen/tools/kconfig/Makefile index fd37f4386a..f39521a0ed 100644 --- a/xen/tools/kconfig/Makefile +++ b/xen/tools/kconfig/Makefile @@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.config: $(obj)/conf $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) $(Q)$(CONFIG_SHELL) $(srctree)/tools/kconfig/merge_config.sh -m .config $(configfiles) - $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig + $(Q)$(MAKE) -f $(srctree)/tools/kconfig/Makefile.kconfig olddefconfig PHONY += kvmconfig kvmconfig: kvm_guest.config -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 17 08:33:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 May 2020 08:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjI-0005Uk-O6; Sun, 17 May 2020 08:33:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjH-0005Ud-0q for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:03 +0000 X-Inumbo-ID: 0585f49c-9819-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0585f49c-9819-11ea-9887-bc764e2007e4; Sun, 17 May 2020 08:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ePkFukxqawveKe4inFm0yYSW9A8CpRIA9aSr6nk+aJg=; b=K9vNOrXsXBNaxv0fGEFkOy6i7x OeDgqy6h8sfSXLfrL3QEObA+DMxlUrj7MImaTqUdr7FE//yYOSkrXiKGURy6aWmYneEw4mXXHM60q 78xF7Y7KmshrqaXOns3QBEOBxxdUq4VcsWHoYJ2yBjwZBfYWzH3ixQLvOD7p8kKJceFM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjG-0002DN-46 for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaEjG-0005Ua-2r for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] changelog: add relevant changes during 4.14 development window Message-Id: Date: Sun, 17 May 2020 08:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 22970c0e0c9e4ffd51816c1cc7e4aa19800d3d09 Author: Roger Pau Monne AuthorDate: Mon May 11 12:31:45 2020 +0200 Commit: Wei Liu CommitDate: Sat May 16 12:50:51 2020 +0100 changelog: add relevant changes during 4.14 development window Add entries for the relevant changes I've been working on during the 4.14 development time frame. Mostly performance improvements related to pvshim scalability issues when running with high number of vCPUs. Signed-off-by: Roger Pau Monné Acked-by: Paul Durrant --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b11e9bc4e3..554eeb6a12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Added - This file and MAINTAINERS entry. + - Use x2APIC mode whenever available, regardless of interrupt remapping + support. + - Performance improvements to guest assisted TLB flushes, either when using + the Xen hypercall interface or the viridian one. + - Assorted pvshim performance and scalability improvements plus some bug + fixes. ## [4.13.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.13.0) - 2019-12-17 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 17 08:33:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 May 2020 08:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjR-0005VR-PZ; Sun, 17 May 2020 08:33:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjQ-0005VK-Q8 for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:12 +0000 X-Inumbo-ID: 0b838aa8-9819-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0b838aa8-9819-11ea-ae69-bc764e2007e4; Sun, 17 May 2020 08:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zADTh580Z7iLWYgS4IUKzfVBQIyAcWNKrsCnQw/Cu7Q=; b=hxLE6kzI7V9Tf1lCusV7hX9PmT o+ZDE7tQ9qvzwPpJnik7z4PRa7G1oeV0eXtV7SkCnz3TxS9ov4NeiJp2uHdep8iCQKet4Nnbeotrs a7iLlrBZztXpHxytu1sqCsYWh6Eu/LpUrlT/KPTj1ppGumeMazTN7/E+ArTFG/kQpJgo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjQ-0002E7-7B for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaEjQ-0005VD-6C for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/sched: don't call sync_vcpu_execstate() in sched_unit_migrate_finish() Message-Id: Date: Sun, 17 May 2020 08:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b492c65da5ec5ed07974db22e998243be475a664 Author: Juergen Gross AuthorDate: Thu May 14 17:36:13 2020 +0200 Commit: Andrew Cooper CommitDate: Sat May 16 14:15:46 2020 +0100 xen/sched: don't call sync_vcpu_execstate() in sched_unit_migrate_finish() With support of core scheduling sched_unit_migrate_finish() gained a call of sync_vcpu_execstate() as it was believed to be called as a result of vcpu migration in any case. In case of migrating a vcpu away from a physical cpu for a short period of time but without ever being scheduled on the selected new cpu, this might not be true so drop the call and let the lazy state syncing do its job. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Dario Faggioli --- xen/common/sched/core.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xen/common/sched/core.c b/xen/common/sched/core.c index 5df66cbf9b..cb49a8bc02 100644 --- a/xen/common/sched/core.c +++ b/xen/common/sched/core.c @@ -1078,12 +1078,7 @@ static void sched_unit_migrate_finish(struct sched_unit *unit) sched_spin_unlock_double(old_lock, new_lock, flags); if ( old_cpu != new_cpu ) - { - /* Vcpus are moved to other pcpus, commit their states to memory. */ - for_each_sched_unit_vcpu ( unit, v ) - sync_vcpu_execstate(v); sched_move_irqs(unit); - } /* Wake on new CPU. */ for_each_sched_unit_vcpu ( unit, v ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 17 08:33:23 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 May 2020 08:33:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjb-0005We-R9; Sun, 17 May 2020 08:33:23 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEjb-0005WW-E3 for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:23 +0000 X-Inumbo-ID: 11884b78-9819-11ea-a766-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 11884b78-9819-11ea-a766-12813bfff9fa; Sun, 17 May 2020 08:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YkxkbhjlIs7PNloilcGjmUvKFMbWB2JZznyjlJI4wuQ=; b=q2643CsLK0SRFtTw2+5B5WoG7F MX4u+GQPRivFvxA5PF7+yE+u5b0/Kh9PlWjFHuYiNmG1bncClxfIB7A5+mTroKRB4z48tWRmfcP98 0q0jha5FPKlMn/MjvjtFXQnSKgfAeuN8bqoHyu83eZRa5rMfX+Vu/wy1M0luszSF286U=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaEja-0002EO-B1 for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaEja-0005W4-9G for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 08:33:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/sched: fix latent races accessing vcpu->dirty_cpu Message-Id: Date: Sun, 17 May 2020 08:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 99266e31832fb4a4da5c9b8163328be350d1261d Author: Juergen Gross AuthorDate: Thu May 14 17:36:14 2020 +0200 Commit: Andrew Cooper CommitDate: Sat May 16 14:15:46 2020 +0100 xen/sched: fix latent races accessing vcpu->dirty_cpu The dirty_cpu field of struct vcpu denotes which cpu still holds data of a vcpu. All accesses to this field should be atomic in case the vcpu could just be running, as it is accessed without any lock held in most cases. Especially sync_local_execstate() and context_switch() for the same vcpu running concurrently have a risk for failing. There are some instances where accesses are not atomically done, and even worse where multiple accesses are done when a single one would be mandated. Correct that in order to avoid potential problems. Add some assertions to verify dirty_cpu is handled properly. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 16 +++++++++++----- xen/common/keyhandler.c | 2 +- xen/include/xen/sched.h | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index a4428190d5..2e5717b983 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -183,7 +183,7 @@ void startup_cpu_idle_loop(void) ASSERT(is_idle_vcpu(v)); cpumask_set_cpu(v->processor, v->domain->dirty_cpumask); - v->dirty_cpu = v->processor; + write_atomic(&v->dirty_cpu, v->processor); reset_stack_and_jump(idle_loop); } @@ -1769,6 +1769,7 @@ static void __context_switch(void) if ( !is_idle_domain(pd) ) { + ASSERT(read_atomic(&p->dirty_cpu) == cpu); memcpy(&p->arch.user_regs, stack_regs, CTXT_SWITCH_STACK_BYTES); vcpu_save_fpu(p); pd->arch.ctxt_switch->from(p); @@ -1832,7 +1833,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { unsigned int cpu = smp_processor_id(); const struct domain *prevd = prev->domain, *nextd = next->domain; - unsigned int dirty_cpu = next->dirty_cpu; + unsigned int dirty_cpu = read_atomic(&next->dirty_cpu); ASSERT(prev != next); ASSERT(local_irq_is_enabled()); @@ -1844,6 +1845,7 @@ void context_switch(struct vcpu *prev, struct vcpu *next) { /* Remote CPU calls __sync_local_execstate() from flush IPI handler. */ flush_mask(cpumask_of(dirty_cpu), FLUSH_VCPU_STATE); + ASSERT(!vcpu_cpu_dirty(next)); } _update_runstate_area(prev); @@ -1956,13 +1958,17 @@ void sync_local_execstate(void) void sync_vcpu_execstate(struct vcpu *v) { - if ( v->dirty_cpu == smp_processor_id() ) + unsigned int dirty_cpu = read_atomic(&v->dirty_cpu); + + if ( dirty_cpu == smp_processor_id() ) sync_local_execstate(); - else if ( vcpu_cpu_dirty(v) ) + else if ( is_vcpu_dirty_cpu(dirty_cpu) ) { /* Remote CPU calls __sync_local_execstate() from flush IPI handler. */ - flush_mask(cpumask_of(v->dirty_cpu), FLUSH_VCPU_STATE); + flush_mask(cpumask_of(dirty_cpu), FLUSH_VCPU_STATE); } + ASSERT(!is_vcpu_dirty_cpu(dirty_cpu) || + read_atomic(&v->dirty_cpu) != dirty_cpu); } static int relinquish_memory( diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 87bd145374..68364e987d 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -316,7 +316,7 @@ static void dump_domains(unsigned char key) vcpu_info(v, evtchn_upcall_pending), !vcpu_event_delivery_is_enabled(v)); if ( vcpu_cpu_dirty(v) ) - printk("dirty_cpu=%u", v->dirty_cpu); + printk("dirty_cpu=%u", read_atomic(&v->dirty_cpu)); printk("\n"); printk(" pause_count=%d pause_flags=%lx\n", atomic_read(&v->pause_count), v->pause_flags); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 6101761d25..ac53519d7f 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -844,7 +844,7 @@ static inline bool is_vcpu_dirty_cpu(unsigned int cpu) static inline bool vcpu_cpu_dirty(const struct vcpu *v) { - return is_vcpu_dirty_cpu(v->dirty_cpu); + return is_vcpu_dirty_cpu(read_atomic(&v->dirty_cpu)); } void vcpu_block(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 17 17:44:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 17 May 2020 17:44:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaNKW-0003mK-1p; Sun, 17 May 2020 17:44:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaNKU-0003mF-Tp for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 17:44:02 +0000 X-Inumbo-ID: feaef996-9865-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id feaef996-9865-11ea-b07b-bc764e2007e4; Sun, 17 May 2020 17:44:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0wQuReBL0gMJBAL5GCfn1EDlsmNrY96p8ZtyAaemd1I=; b=54PQqvfCbYQVhC0bQzimoaggYJ KvGQUx4aEg4if1qMOUqYbtAvHw+6NhDABALKi+9aRkAYzDc2NfOq86WFn0kyyjzJKm6lWoXadoMcY 2XakT3yr4AR9PZLdIiSkktJBIVzoSNq7k8kSIhn+hmLcmdF8IgnmIrqA8GzmlsiLOVhM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaNKT-0005ZB-Ts for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 17:44:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaNKT-00030L-SW for xen-changelog@lists.xenproject.org; Sun, 17 May 2020 17:44:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] CHANGELOG: add hypervisor framework and Hyper-V support Message-Id: Date: Sun, 17 May 2020 17:44:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 664e1bc12f8658da124a4eff7a8f16da073bd47f Author: Wei Liu AuthorDate: Sat May 16 12:54:38 2020 +0100 Commit: Wei Liu CommitDate: Sat May 16 17:31:32 2020 +0100 CHANGELOG: add hypervisor framework and Hyper-V support Signed-off-by: Wei Liu Acked-by: Paul Durrant --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 554eeb6a12..ccb5055c87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) the Xen hypercall interface or the viridian one. - Assorted pvshim performance and scalability improvements plus some bug fixes. + - Hypervisor framework to ease porting Xen to run on hypervisors. + - Initial support to run on Hyper-V. ## [4.13.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.13.0) - 2019-12-17 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 18 10:33:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 10:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jad4z-0000Oh-Qy; Mon, 18 May 2020 10:33:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jad4z-0000Oc-2Y for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 10:33:05 +0000 X-Inumbo-ID: f39f7d86-98f2-11ea-a84b-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f39f7d86-98f2-11ea-a84b-12813bfff9fa; Mon, 18 May 2020 10:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WQNmbjBwQPqzy579+8VP/OX0tTve8riEjUI1Y4Ql2xM=; b=e+XbkmxfoAOgVAclQT+0YMaSd5 mDdpHQJMEgnss0DMFSCSJrHRh0bncf/s7OSusPDdyviZpUlaarpyU1LirgUWVZCtDxG0H4jjcaKJB GUdsPYrns5DEBHtd+0THWndbqBMv+9YKtsjSPc1GCDZ9Y46k8gM0OTIt4/iEYicmuZFg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jad4w-0005EP-EI for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 10:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jad4w-0005kL-D4 for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 10:33:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [mini-os master] console: add newline at EOF Message-Id: Date: Mon, 18 May 2020 10:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f57858b7e8ef8dd48394dd08cec2bef3c9fb92f5 Author: Jan Beulich AuthorDate: Mon May 18 09:09:14 2020 +0200 Commit: Wei Liu CommitDate: Sun May 17 23:34:04 2020 +0100 console: add newline at EOF Some gcc versions get pretty unhappy without. Signed-off-by: Jan Beulich Reviewed-by: Samuel Thibault --- console/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/console.c b/console/console.c index c6f6010..9ddae9d 100644 --- a/console/console.c +++ b/console/console.c @@ -174,4 +174,4 @@ void resume_console(void) { xencons_ring_resume(xen_console); console_initialised = 1; -} \ No newline at end of file +} -- generated by git-patchbot for /home/xen/git/mini-os.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 18 14:33:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 14:33:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jagpG-0006kI-8p; Mon, 18 May 2020 14:33:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jagpG-0006kD-2J for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 14:33:06 +0000 X-Inumbo-ID: 7c29148e-9914-11ea-a86b-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7c29148e-9914-11ea-a86b-12813bfff9fa; Mon, 18 May 2020 14:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mZSM6xxdsOyA/bNTqxob1WgaPS9WPMO/94k8MsOTHF0=; b=q9eTdXRzLUg6ZK7mJNrCWBkNiM LiwCtaYcksJEiO2l+NFwDxr8uI7snreNMlt4qpN7UZWYdw70z+sNkLfST/QGKXbrJZ5k7SosLZ//C CU1/omeZFHfk5MsnFpiOX7B+Ve1XLY/Qt42/GdkXhyv0EjjGCPwmzG1Y/fraGfxLsUE8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jagpE-0001vY-Sg for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 14:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jagpE-00032C-R4 for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 14:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/hvm: Fix memory leaks in hvm_copy_context_and_params() Message-Id: Date: Mon, 18 May 2020 14:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3d6e92e309987c9e33177c9ccd155e58dbd5d0db Author: Andrew Cooper AuthorDate: Sat May 16 13:10:07 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 18 15:22:53 2020 +0100 x86/hvm: Fix memory leaks in hvm_copy_context_and_params() Any error from hvm_save() or hvm_set_param() leaks the c.data allocation. Spotted by Coverity. Fixes: 353744830 "x86/hvm: introduce hvm_copy_context_and_params" Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 814b7020d8..0a3797ef6e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5318,7 +5318,7 @@ int hvm_copy_context_and_params(struct domain *dst, struct domain *src) return -ENOMEM; if ( (rc = hvm_save(src, &c)) ) - return rc; + goto out; for ( i = 0; i < HVM_NR_PARAMS; i++ ) { @@ -5328,11 +5328,13 @@ int hvm_copy_context_and_params(struct domain *dst, struct domain *src) continue; if ( (rc = hvm_set_param(dst, i, value)) ) - return rc; + goto out; } c.cur = 0; rc = hvm_load(dst, &c); + + out: vfree(c.data); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 18 14:33:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 14:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jagpQ-0006kn-AL; Mon, 18 May 2020 14:33:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jagpP-0006ki-Nw for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 14:33:15 +0000 X-Inumbo-ID: 822d6f60-9914-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 822d6f60-9914-11ea-b9cf-bc764e2007e4; Mon, 18 May 2020 14:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TOHBQZ7gGlOJCPmICLXmgJ9psGNLqfjaIL2XCD+4JFE=; b=EG44AH+vRY1jQiByz9Qr7gCDab 8gUbw6ECVivR7cnzOHf/9xTZBFHp47xtYJJamj6+QjMNmdCha9Xn8RtOOUozBZQuw7x3C2OLzAMJT 7gk4w1QFdYZzptYN86zwQJC/bcAfyNI59KNAMh9yrY/fHkW0bhX6hgnJbS3CiIF7cFqg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jagpP-0001ve-0H for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 14:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jagpO-000335-VR for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 14:33:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/hvm: Fix shifting in stdvga_mem_read() Message-Id: Date: Mon, 18 May 2020 14:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 97fb0253e6c2f2221bfd0895b7ffe3a99330d847 Author: Andrew Cooper AuthorDate: Sat May 16 19:50:45 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 18 15:22:53 2020 +0100 x86/hvm: Fix shifting in stdvga_mem_read() stdvga_mem_read() has a return type of uint8_t, which promotes to int rather than unsigned int. Shifting by 24 may hit the sign bit. Spotted by Coverity. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/stdvga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index bd398dbb1b..e2675139e7 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -322,7 +322,7 @@ static int stdvga_mem_read(const struct hvm_io_handler *handler, data = stdvga_mem_readb(addr); data |= stdvga_mem_readb(addr + 1) << 8; data |= stdvga_mem_readb(addr + 2) << 16; - data |= stdvga_mem_readb(addr + 3) << 24; + data |= (uint32_t)stdvga_mem_readb(addr + 3) << 24; break; case 8: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 18 15:22:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 15:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahai-0003dY-GM; Mon, 18 May 2020 15:22:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahah-0003dN-Bb for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:07 +0000 X-Inumbo-ID: 54ab46d2-991b-11ea-a872-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 54ab46d2-991b-11ea-a872-12813bfff9fa; Mon, 18 May 2020 15:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=X2kCbvTQPa5G001PK4Ogyc+tPYu1k2ZFfWzovvkLRbg=; b=BAc32hA93lKK/55fo68iNe5rku mLRlywF8c7kYjQ/bof6Nkwd6/PTNc2DOf3SDMuSC40/pzAyt1pJRnzVf48gUTU9c5FtBA8T+7DGqZ N9mqFBkO6T/rofQGxYlFt67FaDyZPDkXEDKkfgjH0TIje9QmFTZDBoD5kobLnEAaGQ08=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahaf-0002zm-3P for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jahaf-0006V6-25 for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mm: no-one passes a NULL domain to init_xen_l4_slots() Message-Id: Date: Mon, 18 May 2020 15:22:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5dc999d711a75e1a83d4b21da203d3c3197ec0e0 Author: Jan Beulich AuthorDate: Mon May 18 17:13:38 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:13:38 2020 +0200 x86/mm: no-one passes a NULL domain to init_xen_l4_slots() Drop the NULL checks - they've been introduced by commit 8d7b633ada ("x86/mm: Consolidate all Xen L4 slot writing into init_xen_l4_slots()") without giving a reason; I'm told this was done in anticipation of the function potentially getting called with a NULL argument down the road. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index f2d8190b5e..dba0903c8f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1652,7 +1652,7 @@ static int promote_l3_table(struct page_info *page) * This function must write all ROOT_PAGETABLE_PV_XEN_SLOTS, to clobber any * values a guest may have left there from promote_l4_table(). * - * l4t and l4mfn are mandatory, but l4mfn doesn't need to be the mfn under + * l4t, l4mfn, and d are mandatory, but l4mfn doesn't need to be the mfn under * *l4t. All other parameters are optional and will either fill or zero the * appropriate slots. Pagetables not shared with guests will gain the * extended directmap. @@ -1664,7 +1664,7 @@ void init_xen_l4_slots(l4_pgentry_t *l4t, mfn_t l4mfn, * PV vcpus need a shortened directmap. HVM and Idle vcpus get the full * directmap. */ - bool short_directmap = d && !paging_mode_external(d); + bool short_directmap = !paging_mode_external(d); /* Slot 256: RO M2P (if applicable). */ l4t[l4_table_offset(RO_MPT_VIRT_START)] = @@ -1685,10 +1685,9 @@ void init_xen_l4_slots(l4_pgentry_t *l4t, mfn_t l4mfn, mfn_eq(sl4mfn, INVALID_MFN) ? l4e_empty() : l4e_from_mfn(sl4mfn, __PAGE_HYPERVISOR_RW); - /* Slot 260: Per-domain mappings (if applicable). */ + /* Slot 260: Per-domain mappings. */ l4t[l4_table_offset(PERDOMAIN_VIRT_START)] = - d ? l4e_from_page(d->arch.perdomain_l3_pg, __PAGE_HYPERVISOR_RW) - : l4e_empty(); + l4e_from_page(d->arch.perdomain_l3_pg, __PAGE_HYPERVISOR_RW); /* Slot 261-: text/data/bss, RW M2P, vmap, frametable, directmap. */ #ifndef NDEBUG -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 18 15:22:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 15:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahar-0003eY-Hy; Mon, 18 May 2020 15:22:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahaq-0003eO-5l for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:16 +0000 X-Inumbo-ID: 5ab0e4ec-991b-11ea-a872-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5ab0e4ec-991b-11ea-a872-12813bfff9fa; Mon, 18 May 2020 15:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vC3DGATicE6ewrLF+wPdp4ubzacddW6ySY7Byecfgio=; b=fueFpdyxPBLLFJWFx05L+s2f8h PNgotDAbhoJEoWv+h/uOZpEG77RSOaT5QXAIbO0rNF6x2Sdy0eOUB4hnfCpj8P2Ta/S5psLg4HgPh PniP6XiDa+GUHCcBnGzGS9LOK/a077Bk6D36sjaZhWqJ96XPb2tglYaRBEyw+ZxrtcnE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahap-0002zv-6u for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jahap-0006Vf-5X for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem-paging: use guest handle for XENMEM_paging_op_prep Message-Id: Date: Mon, 18 May 2020 15:22:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9f40699c956c10419a91db0ff8d0c985dd3b2800 Author: Jan Beulich AuthorDate: Mon May 18 17:15:46 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:15:46 2020 +0200 x86/mem-paging: use guest handle for XENMEM_paging_op_prep While it should have been this way from the beginning, not doing so will become an actual problem with PVH Dom0. The interface change is binary compatible, but requires tools side producers to be re-built. Drop the bogus/unnecessary page alignment restriction on the input buffer at the same time. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Wei Liu --- tools/libxc/xc_mem_paging.c | 41 ++++++++++++++++++++++------------------- xen/arch/x86/mm/p2m.c | 15 ++++++--------- xen/include/asm-x86/p2m.h | 3 ++- xen/include/public/memory.h | 8 ++++---- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/tools/libxc/xc_mem_paging.c b/tools/libxc/xc_mem_paging.c index a067706e5c..738f63ac20 100644 --- a/tools/libxc/xc_mem_paging.c +++ b/tools/libxc/xc_mem_paging.c @@ -26,15 +26,33 @@ static int xc_mem_paging_memop(xc_interface *xch, uint32_t domain_id, unsigned int op, uint64_t gfn, void *buffer) { xen_mem_paging_op_t mpo; + DECLARE_HYPERCALL_BOUNCE(buffer, XC_PAGE_SIZE, + XC_HYPERCALL_BUFFER_BOUNCE_IN); + int rc; memset(&mpo, 0, sizeof(mpo)); mpo.op = op; mpo.domain = domain_id; mpo.gfn = gfn; - mpo.buffer = (unsigned long) buffer; - return do_memory_op(xch, XENMEM_paging_op, &mpo, sizeof(mpo)); + if ( buffer ) + { + if ( xc_hypercall_bounce_pre(xch, buffer) ) + { + PERROR("Could not bounce memory for XENMEM_paging_op %u", op); + return -1; + } + + set_xen_guest_handle(mpo.buffer, buffer); + } + + rc = do_memory_op(xch, XENMEM_paging_op, &mpo, sizeof(mpo)); + + if ( buffer ) + xc_hypercall_bounce_post(xch, buffer); + + return rc; } int xc_mem_paging_enable(xc_interface *xch, uint32_t domain_id, @@ -92,28 +110,13 @@ int xc_mem_paging_prep(xc_interface *xch, uint32_t domain_id, uint64_t gfn) int xc_mem_paging_load(xc_interface *xch, uint32_t domain_id, uint64_t gfn, void *buffer) { - int rc, old_errno; - errno = EINVAL; if ( !buffer ) return -1; - if ( ((unsigned long) buffer) & (XC_PAGE_SIZE - 1) ) - return -1; - - if ( mlock(buffer, XC_PAGE_SIZE) ) - return -1; - - rc = xc_mem_paging_memop(xch, domain_id, - XENMEM_paging_op_prep, - gfn, buffer); - - old_errno = errno; - munlock(buffer, XC_PAGE_SIZE); - errno = old_errno; - - return rc; + return xc_mem_paging_memop(xch, domain_id, XENMEM_paging_op_prep, + gfn, buffer); } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 9b7b0bf103..59b0b05ed5 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1779,7 +1779,8 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) * mfn if populate was called for gfn which was nominated but not evicted. In * this case only the p2mt needs to be forwarded. */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) +int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, + XEN_GUEST_HANDLE_64(const_uint8) buffer) { struct page_info *page = NULL; p2m_type_t p2mt; @@ -1788,13 +1789,9 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int ret, page_extant = 1; - const void *user_ptr = (const void *) buffer; - if ( user_ptr ) - /* Sanity check the buffer and bail out early if trouble */ - if ( (buffer & (PAGE_SIZE - 1)) || - (!access_ok(user_ptr, PAGE_SIZE)) ) - return -EINVAL; + if ( !guest_handle_okay(buffer, PAGE_SIZE) ) + return -EINVAL; gfn_lock(p2m, gfn, 0); @@ -1812,7 +1809,7 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) /* If the user did not provide a buffer, we disallow */ ret = -EINVAL; - if ( unlikely(user_ptr == NULL) ) + if ( unlikely(guest_handle_is_null(buffer)) ) goto out; /* Get a free page */ ret = -ENOMEM; @@ -1834,7 +1831,7 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) page_extant = 0; guest_map = map_domain_page(mfn); - ret = copy_from_user(guest_map, user_ptr, PAGE_SIZE); + ret = copy_from_guest(guest_map, buffer, PAGE_SIZE); unmap_domain_page(guest_map); if ( ret ) { diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index ace3573ae8..baebc8b6ef 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -741,7 +741,8 @@ void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, /* Start populating a paged out frame */ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn); /* Prepare the p2m for paging a frame in */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, uint64_t buffer); +int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, + XEN_GUEST_HANDLE_64(const_uint8) buffer); /* Resume normal operation (in case a domain was paused) */ struct vm_event_st; void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp); diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index e56800357d..dbd35305df 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -396,10 +396,10 @@ struct xen_mem_paging_op { uint8_t op; /* XENMEM_paging_op_* */ domid_t domain; - /* PAGING_PREP IN: buffer to immediately fill page in */ - uint64_aligned_t buffer; - /* Other OPs */ - uint64_aligned_t gfn; /* IN: gfn of page being operated on */ + /* IN: (XENMEM_paging_op_prep) buffer to immediately fill page from */ + XEN_GUEST_HANDLE_64(const_uint8) buffer; + /* IN: gfn of page being operated on */ + uint64_aligned_t gfn; }; typedef struct xen_mem_paging_op xen_mem_paging_op_t; DEFINE_XEN_GUEST_HANDLE(xen_mem_paging_op_t); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 18 15:22:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 15:22:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahb2-0003fv-Jx; Mon, 18 May 2020 15:22:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahb1-0003fm-MK for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:27 +0000 X-Inumbo-ID: 60b349ac-991b-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 60b349ac-991b-11ea-b9cf-bc764e2007e4; Mon, 18 May 2020 15:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=e6brQQZJwZdTFAMZtxTVZ5gLGun2DSnnIjkDmXSfDR0=; b=ywcmL+OtbpDFmCAIqnPRQLcT6l yANdyqxMHavAW6UGB6Q6Prw/wkWjeFyv1nSp6OiB9TJYItVwUBudcm2hn7+xAwPiGP7BVL3n58BhL ttm721IWCO/uOp5xIOafrrhsEIt+N4jM7OFHfYyMtriMSxtYS+Swr7NxAAtpUV/MebpQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahaz-000306-AF for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jahaz-0006WF-8r for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem-paging: move code to its dedicated source file Message-Id: Date: Mon, 18 May 2020 15:22:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 02a2b19c8e2532998e262727d32c574267ac6b48 Author: Jan Beulich AuthorDate: Mon May 18 17:16:55 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:16:55 2020 +0200 x86/mem-paging: move code to its dedicated source file Do a little bit of style adjustment along the way, and drop the "p2m_mem_paging_" prefixes from the now static functions. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_paging.c | 417 ++++++++++++++++++++++++++++++++++++++++++- xen/arch/x86/mm/p2m.c | 409 ------------------------------------------ xen/include/asm-x86/p2m.h | 7 - 3 files changed, 414 insertions(+), 419 deletions(-) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index 54a94fa3a0..84b05cd461 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -25,6 +25,417 @@ #include #include +#include "mm-locks.h" + +/* + * p2m_mem_paging_drop_page - Tell pager to drop its reference to a paged page + * @d: guest domain + * @gfn: guest page to drop + * + * p2m_mem_paging_drop_page() will notify the pager that a paged-out gfn was + * released by the guest. The pager is supposed to drop its reference of the + * gfn. + */ +void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, + p2m_type_t p2mt) +{ + vm_event_request_t req = { + .reason = VM_EVENT_REASON_MEM_PAGING, + .u.mem_paging.gfn = gfn + }; + + /* + * We allow no ring in this unique case, because it won't affect + * correctness of the guest execution at this point. If this is the only + * page that happens to be paged-out, we'll be okay.. but it's likely the + * guest will crash shortly anyways. + */ + int rc = vm_event_claim_slot(d, d->vm_event_paging); + + if ( rc < 0 ) + return; + + /* Send release notification to pager */ + req.u.mem_paging.flags = MEM_PAGING_DROP_PAGE; + + /* Update stats unless the page hasn't yet been evicted */ + if ( p2mt != p2m_ram_paging_out ) + atomic_dec(&d->paged_pages); + else + /* Evict will fail now, tag this request for pager */ + req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; + + vm_event_put_request(d, d->vm_event_paging, &req); +} + +/* + * p2m_mem_paging_populate - Tell pager to populate a paged page + * @d: guest domain + * @gfn: guest page in paging state + * + * p2m_mem_paging_populate() will notify the pager that a page in any of the + * paging states needs to be written back into the guest. + * This function needs to be called whenever gfn_to_mfn() returns any of the p2m + * paging types because the gfn may not be backed by a mfn. + * + * The gfn can be in any of the paging states, but the pager needs only be + * notified when the gfn is in the paging-out path (paging_out or paged). This + * function may be called more than once from several vcpus. If the vcpu belongs + * to the guest, the vcpu must be stopped and the pager notified that the vcpu + * was stopped. The pager needs to handle several requests for the same gfn. + * + * If the gfn is not in the paging-out path and the vcpu does not belong to the + * guest, nothing needs to be done and the function assumes that a request was + * already sent to the pager. In this case the caller has to try again until the + * gfn is fully paged in again. + */ +void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) +{ + struct vcpu *v = current; + vm_event_request_t req = { + .reason = VM_EVENT_REASON_MEM_PAGING, + .u.mem_paging.gfn = gfn_l + }; + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int rc = vm_event_claim_slot(d, d->vm_event_paging); + + /* We're paging. There should be a ring. */ + if ( rc == -EOPNOTSUPP ) + { + gdprintk(XENLOG_ERR, "Dom%d paging gfn %lx yet no ring in place\n", + d->domain_id, gfn_l); + /* Prevent the vcpu from faulting repeatedly on the same gfn */ + if ( v->domain == d ) + vcpu_pause_nosync(v); + domain_crash(d); + return; + } + else if ( rc < 0 ) + return; + + /* Fix p2m mapping */ + gfn_lock(p2m, gfn, 0); + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + /* Allow only nominated or evicted pages to enter page-in path */ + if ( p2mt == p2m_ram_paging_out || p2mt == p2m_ram_paged ) + { + /* Evict will fail now, tag this request for pager */ + if ( p2mt == p2m_ram_paging_out ) + req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; + + rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_in, a); + } + gfn_unlock(p2m, gfn, 0); + if ( rc < 0 ) + goto out_cancel; + + /* Pause domain if request came from guest and gfn has paging type */ + if ( p2m_is_paging(p2mt) && v->domain == d ) + { + vm_event_vcpu_pause(v); + req.flags |= VM_EVENT_FLAG_VCPU_PAUSED; + } + /* No need to inform pager if the gfn is not in the page-out path */ + else if ( p2mt != p2m_ram_paging_out && p2mt != p2m_ram_paged ) + { + /* gfn is already on its way back and vcpu is not paused */ + out_cancel: + vm_event_cancel_slot(d, d->vm_event_paging); + return; + } + + /* Send request to pager */ + req.u.mem_paging.p2mt = p2mt; + req.vcpu_id = v->vcpu_id; + + vm_event_put_request(d, d->vm_event_paging, &req); +} + +/* + * p2m_mem_paging_resume - Resume guest gfn + * @d: guest domain + * @rsp: vm_event response received + * + * p2m_mem_paging_resume() will forward the p2mt of a gfn to ram_rw. It is + * called by the pager. + * + * The gfn was previously either evicted and populated, or nominated and + * populated. If the page was evicted the p2mt will be p2m_ram_paging_in. If + * the page was just nominated the p2mt will be p2m_ram_paging_in_start because + * the pager did not call prepare(). + * + * If the gfn was dropped the vcpu needs to be unpaused. + */ +void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) +{ + struct p2m_domain *p2m = p2m_get_hostp2m(d); + p2m_type_t p2mt; + p2m_access_t a; + mfn_t mfn; + + /* Fix p2m entry if the page was not dropped */ + if ( !(rsp->u.mem_paging.flags & MEM_PAGING_DROP_PAGE) ) + { + gfn_t gfn = _gfn(rsp->u.mem_access.gfn); + + gfn_lock(p2m, gfn, 0); + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + /* + * Allow only pages which were prepared properly, or pages which + * were nominated but not evicted. + */ + if ( mfn_valid(mfn) && (p2mt == p2m_ram_paging_in) ) + { + int rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + paging_mode_log_dirty(d) ? p2m_ram_logdirty + : p2m_ram_rw, a); + + if ( !rc ) + set_gpfn_from_mfn(mfn_x(mfn), gfn_x(gfn)); + } + gfn_unlock(p2m, gfn, 0); + } +} + +/* + * nominate - Mark a guest page as to-be-paged-out + * @d: guest domain + * @gfn: guest page to nominate + * + * Returns 0 for success or negative errno values if gfn is not pageable. + * + * nominate() is called by the pager and checks if a guest page can be paged + * out. If the following conditions are met the p2mt will be changed: + * - the gfn is backed by a mfn + * - the p2mt of the gfn is pageable + * - the mfn is not used for IO + * - the mfn has exactly one user and has no special meaning + * + * Once the p2mt is changed the page is readonly for the guest. On success the + * pager can write the page contents to disk and later evict the page. + */ +static int nominate(struct domain *d, unsigned long gfn_l) +{ + struct page_info *page; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + int ret = -EBUSY; + + gfn_lock(p2m, gfn, 0); + + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + + /* Check if mfn is valid */ + if ( !mfn_valid(mfn) ) + goto out; + + /* Check p2m type */ + if ( !p2m_is_pageable(p2mt) ) + goto out; + + /* Check for io memory page */ + if ( is_iomem_page(mfn) ) + goto out; + + /* Check page count and type */ + page = mfn_to_page(mfn); + if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != + (1 | PGC_allocated) ) + goto out; + + if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) + goto out; + + /* Fix p2m entry */ + ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_out, a); + + out: + gfn_unlock(p2m, gfn, 0); + return ret; +} + +/* + * evict - Mark a guest page as paged-out + * @d: guest domain + * @gfn: guest page to evict + * + * Returns 0 for success or negative errno values if eviction is not possible. + * + * evict() is called by the pager and will free a guest page and release it + * back to Xen. If the following conditions are met the page can be freed: + * - the gfn is backed by a mfn + * - the gfn was nominated + * - the mfn has still exactly one user and has no special meaning + * + * After successful nomination some other process could have mapped the page. In + * this case eviction can not be done. If the gfn was populated before the pager + * could evict it, eviction can not be done either. In this case the gfn is + * still backed by a mfn. + */ +static int evict(struct domain *d, unsigned long gfn_l) +{ + struct page_info *page; + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int ret = -EBUSY; + + gfn_lock(p2m, gfn, 0); + + /* Get mfn */ + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + if ( unlikely(!mfn_valid(mfn)) ) + goto out; + + /* Allow only nominated pages */ + if ( p2mt != p2m_ram_paging_out ) + goto out; + + /* Get the page so it doesn't get modified under Xen's feet */ + page = mfn_to_page(mfn); + if ( unlikely(!get_page(page, d)) ) + goto out; + + /* Check page count and type once more */ + if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != + (2 | PGC_allocated) ) + goto out_put; + + if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) + goto out_put; + + /* Decrement guest domain's ref count of the page */ + put_page_alloc_ref(page); + + /* Remove mapping from p2m table */ + ret = p2m_set_entry(p2m, gfn, INVALID_MFN, PAGE_ORDER_4K, + p2m_ram_paged, a); + + /* Clear content before returning the page to Xen */ + scrub_one_page(page); + + /* Track number of paged gfns */ + atomic_inc(&d->paged_pages); + + out_put: + /* Put the page back so it gets freed */ + put_page(page); + + out: + gfn_unlock(p2m, gfn, 0); + return ret; +} + +/* + * prepare - Allocate a new page for the guest + * @d: guest domain + * @gfn: guest page in paging state + * + * prepare() will allocate a new page for the guest if the gfn is not backed + * by a mfn. It is called by the pager. + * It is required that the gfn was already populated. The gfn may already have a + * mfn if populate was called for gfn which was nominated but not evicted. In + * this case only the p2mt needs to be forwarded. + */ +static int prepare(struct domain *d, unsigned long gfn_l, + XEN_GUEST_HANDLE_64(const_uint8) buffer) +{ + struct page_info *page = NULL; + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int ret, page_extant = 1; + + if ( !guest_handle_okay(buffer, PAGE_SIZE) ) + return -EINVAL; + + gfn_lock(p2m, gfn, 0); + + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + + ret = -ENOENT; + /* Allow missing pages */ + if ( (p2mt != p2m_ram_paging_in) && (p2mt != p2m_ram_paged) ) + goto out; + + /* Allocate a page if the gfn does not have one yet */ + if ( !mfn_valid(mfn) ) + { + void *guest_map; + + /* If the user did not provide a buffer, we disallow */ + ret = -EINVAL; + if ( unlikely(guest_handle_is_null(buffer)) ) + goto out; + /* Get a free page */ + ret = -ENOMEM; + page_alloc_mm_pre_lock(d); + page = alloc_domheap_page(d, 0); + if ( unlikely(page == NULL) ) + goto out; + if ( unlikely(!get_page(page, d)) ) + { + /* + * The domain can't possibly know about this page yet, so failure + * here is a clear indication of something fishy going on. + */ + domain_crash(d); + page = NULL; + goto out; + } + mfn = page_to_mfn(page); + page_extant = 0; + + guest_map = map_domain_page(mfn); + ret = copy_from_guest(guest_map, buffer, PAGE_SIZE); + unmap_domain_page(guest_map); + if ( ret ) + { + ret = -EFAULT; + goto out; + } + } + + /* + * Make the page already guest-accessible. If the pager still has a + * pending resume operation, it will be idempotent p2m entry-wise, but + * will unpause the vcpu. + */ + ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + paging_mode_log_dirty(d) ? p2m_ram_logdirty + : p2m_ram_rw, a); + if ( !ret ) + { + set_gpfn_from_mfn(mfn_x(mfn), gfn_l); + + if ( !page_extant ) + atomic_dec(&d->paged_pages); + } + + out: + gfn_unlock(p2m, gfn, 0); + + if ( page ) + { + if ( ret ) + put_page_alloc_ref(page); + put_page(page); + } + + return ret; +} + int mem_paging_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_paging_op_t) arg) { int rc; @@ -50,15 +461,15 @@ int mem_paging_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_paging_op_t) arg) switch( mpo.op ) { case XENMEM_paging_op_nominate: - rc = p2m_mem_paging_nominate(d, mpo.gfn); + rc = nominate(d, mpo.gfn); break; case XENMEM_paging_op_evict: - rc = p2m_mem_paging_evict(d, mpo.gfn); + rc = evict(d, mpo.gfn); break; case XENMEM_paging_op_prep: - rc = p2m_mem_paging_prep(d, mpo.gfn, mpo.buffer); + rc = prepare(d, mpo.gfn, mpo.buffer); if ( !rc ) copyback = 1; break; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 59b0b05ed5..cc624281e0 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -23,7 +23,6 @@ * along with this program; If not, see . */ -#include /* copy_from_guest() */ #include #include #include @@ -1506,414 +1505,6 @@ int set_shared_p2m_entry(struct domain *d, unsigned long gfn_l, mfn_t mfn) return rc; } -/** - * p2m_mem_paging_nominate - Mark a guest page as to-be-paged-out - * @d: guest domain - * @gfn: guest page to nominate - * - * Returns 0 for success or negative errno values if gfn is not pageable. - * - * p2m_mem_paging_nominate() is called by the pager and checks if a guest page - * can be paged out. If the following conditions are met the p2mt will be - * changed: - * - the gfn is backed by a mfn - * - the p2mt of the gfn is pageable - * - the mfn is not used for IO - * - the mfn has exactly one user and has no special meaning - * - * Once the p2mt is changed the page is readonly for the guest. On success the - * pager can write the page contents to disk and later evict the page. - */ -int p2m_mem_paging_nominate(struct domain *d, unsigned long gfn_l) -{ - struct page_info *page; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - int ret = -EBUSY; - - gfn_lock(p2m, gfn, 0); - - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - - /* Check if mfn is valid */ - if ( !mfn_valid(mfn) ) - goto out; - - /* Check p2m type */ - if ( !p2m_is_pageable(p2mt) ) - goto out; - - /* Check for io memory page */ - if ( is_iomem_page(mfn) ) - goto out; - - /* Check page count and type */ - page = mfn_to_page(mfn); - if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != - (1 | PGC_allocated) ) - goto out; - - if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) - goto out; - - /* Fix p2m entry */ - ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_out, a); - - out: - gfn_unlock(p2m, gfn, 0); - return ret; -} - -/** - * p2m_mem_paging_evict - Mark a guest page as paged-out - * @d: guest domain - * @gfn: guest page to evict - * - * Returns 0 for success or negative errno values if eviction is not possible. - * - * p2m_mem_paging_evict() is called by the pager and will free a guest page and - * release it back to Xen. If the following conditions are met the page can be - * freed: - * - the gfn is backed by a mfn - * - the gfn was nominated - * - the mfn has still exactly one user and has no special meaning - * - * After successful nomination some other process could have mapped the page. In - * this case eviction can not be done. If the gfn was populated before the pager - * could evict it, eviction can not be done either. In this case the gfn is - * still backed by a mfn. - */ -int p2m_mem_paging_evict(struct domain *d, unsigned long gfn_l) -{ - struct page_info *page; - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - int ret = -EBUSY; - - gfn_lock(p2m, gfn, 0); - - /* Get mfn */ - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - if ( unlikely(!mfn_valid(mfn)) ) - goto out; - - /* Allow only nominated pages */ - if ( p2mt != p2m_ram_paging_out ) - goto out; - - /* Get the page so it doesn't get modified under Xen's feet */ - page = mfn_to_page(mfn); - if ( unlikely(!get_page(page, d)) ) - goto out; - - /* Check page count and type once more */ - if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != - (2 | PGC_allocated) ) - goto out_put; - - if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) - goto out_put; - - /* Decrement guest domain's ref count of the page */ - put_page_alloc_ref(page); - - /* Remove mapping from p2m table */ - ret = p2m_set_entry(p2m, gfn, INVALID_MFN, PAGE_ORDER_4K, - p2m_ram_paged, a); - - /* Clear content before returning the page to Xen */ - scrub_one_page(page); - - /* Track number of paged gfns */ - atomic_inc(&d->paged_pages); - - out_put: - /* Put the page back so it gets freed */ - put_page(page); - - out: - gfn_unlock(p2m, gfn, 0); - return ret; -} - -/** - * p2m_mem_paging_drop_page - Tell pager to drop its reference to a paged page - * @d: guest domain - * @gfn: guest page to drop - * - * p2m_mem_paging_drop_page() will notify the pager that a paged-out gfn was - * released by the guest. The pager is supposed to drop its reference of the - * gfn. - */ -void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, - p2m_type_t p2mt) -{ - vm_event_request_t req = { - .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn - }; - - /* We allow no ring in this unique case, because it won't affect - * correctness of the guest execution at this point. If this is the only - * page that happens to be paged-out, we'll be okay.. but it's likely the - * guest will crash shortly anyways. */ - int rc = vm_event_claim_slot(d, d->vm_event_paging); - if ( rc < 0 ) - return; - - /* Send release notification to pager */ - req.u.mem_paging.flags = MEM_PAGING_DROP_PAGE; - - /* Update stats unless the page hasn't yet been evicted */ - if ( p2mt != p2m_ram_paging_out ) - atomic_dec(&d->paged_pages); - else - /* Evict will fail now, tag this request for pager */ - req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; - - vm_event_put_request(d, d->vm_event_paging, &req); -} - -/** - * p2m_mem_paging_populate - Tell pager to populate a paged page - * @d: guest domain - * @gfn: guest page in paging state - * - * p2m_mem_paging_populate() will notify the pager that a page in any of the - * paging states needs to be written back into the guest. - * This function needs to be called whenever gfn_to_mfn() returns any of the p2m - * paging types because the gfn may not be backed by a mfn. - * - * The gfn can be in any of the paging states, but the pager needs only be - * notified when the gfn is in the paging-out path (paging_out or paged). This - * function may be called more than once from several vcpus. If the vcpu belongs - * to the guest, the vcpu must be stopped and the pager notified that the vcpu - * was stopped. The pager needs to handle several requests for the same gfn. - * - * If the gfn is not in the paging-out path and the vcpu does not belong to the - * guest, nothing needs to be done and the function assumes that a request was - * already sent to the pager. In this case the caller has to try again until the - * gfn is fully paged in again. - */ -void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) -{ - struct vcpu *v = current; - vm_event_request_t req = { - .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn_l - }; - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - - /* We're paging. There should be a ring */ - int rc = vm_event_claim_slot(d, d->vm_event_paging); - - if ( rc == -EOPNOTSUPP ) - { - gdprintk(XENLOG_ERR, "Domain %hu paging gfn %lx yet no ring " - "in place\n", d->domain_id, gfn_l); - /* Prevent the vcpu from faulting repeatedly on the same gfn */ - if ( v->domain == d ) - vcpu_pause_nosync(v); - domain_crash(d); - return; - } - else if ( rc < 0 ) - return; - - /* Fix p2m mapping */ - gfn_lock(p2m, gfn, 0); - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - /* Allow only nominated or evicted pages to enter page-in path */ - if ( p2mt == p2m_ram_paging_out || p2mt == p2m_ram_paged ) - { - /* Evict will fail now, tag this request for pager */ - if ( p2mt == p2m_ram_paging_out ) - req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; - - rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_in, a); - } - gfn_unlock(p2m, gfn, 0); - if ( rc < 0 ) - goto out_cancel; - - /* Pause domain if request came from guest and gfn has paging type */ - if ( p2m_is_paging(p2mt) && v->domain == d ) - { - vm_event_vcpu_pause(v); - req.flags |= VM_EVENT_FLAG_VCPU_PAUSED; - } - /* No need to inform pager if the gfn is not in the page-out path */ - else if ( p2mt != p2m_ram_paging_out && p2mt != p2m_ram_paged ) - { - /* gfn is already on its way back and vcpu is not paused */ - out_cancel: - vm_event_cancel_slot(d, d->vm_event_paging); - return; - } - - /* Send request to pager */ - req.u.mem_paging.p2mt = p2mt; - req.vcpu_id = v->vcpu_id; - - vm_event_put_request(d, d->vm_event_paging, &req); -} - -/** - * p2m_mem_paging_prep - Allocate a new page for the guest - * @d: guest domain - * @gfn: guest page in paging state - * - * p2m_mem_paging_prep() will allocate a new page for the guest if the gfn is - * not backed by a mfn. It is called by the pager. - * It is required that the gfn was already populated. The gfn may already have a - * mfn if populate was called for gfn which was nominated but not evicted. In - * this case only the p2mt needs to be forwarded. - */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, - XEN_GUEST_HANDLE_64(const_uint8) buffer) -{ - struct page_info *page = NULL; - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - int ret, page_extant = 1; - - if ( !guest_handle_okay(buffer, PAGE_SIZE) ) - return -EINVAL; - - gfn_lock(p2m, gfn, 0); - - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - - ret = -ENOENT; - /* Allow missing pages */ - if ( (p2mt != p2m_ram_paging_in) && (p2mt != p2m_ram_paged) ) - goto out; - - /* Allocate a page if the gfn does not have one yet */ - if ( !mfn_valid(mfn) ) - { - void *guest_map; - - /* If the user did not provide a buffer, we disallow */ - ret = -EINVAL; - if ( unlikely(guest_handle_is_null(buffer)) ) - goto out; - /* Get a free page */ - ret = -ENOMEM; - page_alloc_mm_pre_lock(d); - page = alloc_domheap_page(d, 0); - if ( unlikely(page == NULL) ) - goto out; - if ( unlikely(!get_page(page, d)) ) - { - /* - * The domain can't possibly know about this page yet, so failure - * here is a clear indication of something fishy going on. - */ - domain_crash(d); - page = NULL; - goto out; - } - mfn = page_to_mfn(page); - page_extant = 0; - - guest_map = map_domain_page(mfn); - ret = copy_from_guest(guest_map, buffer, PAGE_SIZE); - unmap_domain_page(guest_map); - if ( ret ) - { - ret = -EFAULT; - goto out; - } - } - - /* Make the page already guest-accessible. If the pager still has a - * pending resume operation, it will be idempotent p2m entry-wise, - * but will unpause the vcpu */ - ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, - paging_mode_log_dirty(d) ? p2m_ram_logdirty - : p2m_ram_rw, a); - if ( !ret ) - { - set_gpfn_from_mfn(mfn_x(mfn), gfn_l); - - if ( !page_extant ) - atomic_dec(&d->paged_pages); - } - - out: - gfn_unlock(p2m, gfn, 0); - - if ( page ) - { - if ( ret ) - put_page_alloc_ref(page); - put_page(page); - } - - return ret; -} - -/** - * p2m_mem_paging_resume - Resume guest gfn - * @d: guest domain - * @rsp: vm_event response received - * - * p2m_mem_paging_resume() will forward the p2mt of a gfn to ram_rw. It is - * called by the pager. - * - * The gfn was previously either evicted and populated, or nominated and - * populated. If the page was evicted the p2mt will be p2m_ram_paging_in. If - * the page was just nominated the p2mt will be p2m_ram_paging_in_start because - * the pager did not call p2m_mem_paging_prep(). - * - * If the gfn was dropped the vcpu needs to be unpaused. - */ - -void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) -{ - struct p2m_domain *p2m = p2m_get_hostp2m(d); - p2m_type_t p2mt; - p2m_access_t a; - mfn_t mfn; - - /* Fix p2m entry if the page was not dropped */ - if ( !(rsp->u.mem_paging.flags & MEM_PAGING_DROP_PAGE) ) - { - gfn_t gfn = _gfn(rsp->u.mem_access.gfn); - - gfn_lock(p2m, gfn, 0); - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - /* - * Allow only pages which were prepared properly, or pages which - * were nominated but not evicted. - */ - if ( mfn_valid(mfn) && (p2mt == p2m_ram_paging_in) ) - { - int rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, - paging_mode_log_dirty(d) ? p2m_ram_logdirty : - p2m_ram_rw, a); - - if ( !rc ) - set_gpfn_from_mfn(mfn_x(mfn), gfn_x(gfn)); - } - gfn_unlock(p2m, gfn, 0); - } -} - #ifdef CONFIG_HVM static struct p2m_domain * p2m_getlru_nestedp2m(struct domain *d, struct p2m_domain *p2m) diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index baebc8b6ef..bf691ff568 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -731,18 +731,11 @@ static inline void p2m_pod_init(struct p2m_domain *p2m) {} /* Modify p2m table for shared gfn */ int set_shared_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); -/* Check if a nominated gfn is valid to be paged out */ -int p2m_mem_paging_nominate(struct domain *d, unsigned long gfn); -/* Evict a frame */ -int p2m_mem_paging_evict(struct domain *d, unsigned long gfn); /* Tell xenpaging to drop a paged out frame */ void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, p2m_type_t p2mt); /* Start populating a paged out frame */ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn); -/* Prepare the p2m for paging a frame in */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, - XEN_GUEST_HANDLE_64(const_uint8) buffer); /* Resume normal operation (in case a domain was paused) */ struct vm_event_st; void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 18 15:22:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 15:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahbB-0003hG-NI; Mon, 18 May 2020 15:22:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahbA-0003h9-Mo for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:36 +0000 X-Inumbo-ID: 66bd564e-991b-11ea-a872-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 66bd564e-991b-11ea-a872-12813bfff9fa; Mon, 18 May 2020 15:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jXEltCsf3WtkYjQeyndqsWJFUaEbE3YvawjxicRL02k=; b=GSzgSdhBSdSg6U21tvcjAzb7Nz iI2EMx1GQ7Lb5r8XSvdq0LiyV0y3XjlGpfMPh2mKphhgZY3DMDWOfVuFTK2oaOa3+x4Qve+2c1mxf roFIygAkb/k9hN8Zoyc0jUZsIbDh8LHvPUKTGDTCjwzWNyjdt9HyoXnuwpUnuEhF+H3g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahb9-00030J-EF for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jahb9-0006Wr-DA for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem-paging: consistently use gfn_t Message-Id: Date: Mon, 18 May 2020 15:22:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4c73a2a939a51dee47db77b31208157dbc29fe98 Author: Jan Beulich AuthorDate: Mon May 18 17:17:51 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:17:51 2020 +0200 x86/mem-paging: consistently use gfn_t Where gprintk()s get touched anyway to switch to PRI_gfn, also switch to %pd for the domain logged. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/dm.c | 2 +- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/arch/x86/mm.c | 7 ++++--- xen/arch/x86/mm/hap/guest_walk.c | 4 ++-- xen/arch/x86/mm/mem_paging.c | 31 +++++++++++++------------------ xen/arch/x86/mm/p2m.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/common/memory.c | 4 ++-- xen/include/asm-x86/p2m.h | 5 ++--- 9 files changed, 28 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index 96c5042b75..e3f845165d 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -278,7 +278,7 @@ static int set_mem_type(struct domain *d, if ( p2m_is_paging(t) ) { put_gfn(d, pfn); - p2m_mem_paging_populate(d, pfn); + p2m_mem_paging_populate(d, _gfn(pfn)); return -EAGAIN; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0a3797ef6e..09ee299bc7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1988,7 +1988,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * locks in such circumstance. */ if ( paged ) - p2m_mem_paging_populate(currd, gfn); + p2m_mem_paging_populate(currd, _gfn(gfn)); if ( sharing_enomem ) { @@ -3222,7 +3222,7 @@ enum hvm_translation_result hvm_translate_get_page( if ( p2m_is_paging(p2mt) ) { put_page(page); - p2m_mem_paging_populate(v->domain, gfn_x(gfn)); + p2m_mem_paging_populate(v->domain, gfn); return HVMTRANS_gfn_paged_out; } if ( p2m_is_shared(p2mt) ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index dba0903c8f..e42044eb74 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2118,16 +2118,17 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, paging_mode_translate(pg_dom) ) { p2m_type_t p2mt; + gfn_t gfn = _gfn(l1e_get_pfn(nl1e)); p2m_query_t q = l1e_get_flags(nl1e) & _PAGE_RW ? P2M_ALLOC | P2M_UNSHARE : P2M_ALLOC; - page = get_page_from_gfn(pg_dom, l1e_get_pfn(nl1e), &p2mt, q); + page = get_page_from_gfn(pg_dom, gfn_x(gfn), &p2mt, q); if ( p2m_is_paged(p2mt) ) { if ( page ) put_page(page); - p2m_mem_paging_populate(pg_dom, l1e_get_pfn(nl1e)); + p2m_mem_paging_populate(pg_dom, gfn); return -ENOENT; } @@ -3949,7 +3950,7 @@ long do_mmu_update( put_page(page); if ( p2m_is_paged(p2mt) ) { - p2m_mem_paging_populate(pt_owner, gmfn); + p2m_mem_paging_populate(pt_owner, _gfn(gmfn)); rc = -ENOENT; } else diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c index 6001cf3330..f59ebc84a2 100644 --- a/xen/arch/x86/mm/hap/guest_walk.c +++ b/xen/arch/x86/mm/hap/guest_walk.c @@ -68,7 +68,7 @@ unsigned long hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)( *pfec = PFEC_page_paged; if ( top_page ) put_page(top_page); - p2m_mem_paging_populate(p2m->domain, cr3 >> PAGE_SHIFT); + p2m_mem_paging_populate(p2m->domain, gaddr_to_gfn(cr3)); return gfn_x(INVALID_GFN); } if ( p2m_is_shared(p2mt) ) @@ -110,7 +110,7 @@ unsigned long hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)( { ASSERT(p2m_is_hostp2m(p2m)); *pfec = PFEC_page_paged; - p2m_mem_paging_populate(p2m->domain, gfn_x(gfn)); + p2m_mem_paging_populate(p2m->domain, gfn); return gfn_x(INVALID_GFN); } if ( p2m_is_shared(p2mt) ) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index 84b05cd461..6aa1bffa65 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -36,12 +36,11 @@ * released by the guest. The pager is supposed to drop its reference of the * gfn. */ -void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, - p2m_type_t p2mt) +void p2m_mem_paging_drop_page(struct domain *d, gfn_t gfn, p2m_type_t p2mt) { vm_event_request_t req = { .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn + .u.mem_paging.gfn = gfn_x(gfn) }; /* @@ -89,16 +88,15 @@ void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, * already sent to the pager. In this case the caller has to try again until the * gfn is fully paged in again. */ -void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) +void p2m_mem_paging_populate(struct domain *d, gfn_t gfn) { struct vcpu *v = current; vm_event_request_t req = { .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn_l + .u.mem_paging.gfn = gfn_x(gfn) }; p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int rc = vm_event_claim_slot(d, d->vm_event_paging); @@ -106,8 +104,8 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) /* We're paging. There should be a ring. */ if ( rc == -EOPNOTSUPP ) { - gdprintk(XENLOG_ERR, "Dom%d paging gfn %lx yet no ring in place\n", - d->domain_id, gfn_l); + gdprintk(XENLOG_ERR, "%pd paging gfn %"PRI_gfn" yet no ring in place\n", + d, gfn_x(gfn)); /* Prevent the vcpu from faulting repeatedly on the same gfn */ if ( v->domain == d ) vcpu_pause_nosync(v); @@ -218,13 +216,12 @@ void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) * Once the p2mt is changed the page is readonly for the guest. On success the * pager can write the page contents to disk and later evict the page. */ -static int nominate(struct domain *d, unsigned long gfn_l) +static int nominate(struct domain *d, gfn_t gfn) { struct page_info *page; struct p2m_domain *p2m = p2m_get_hostp2m(d); p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; int ret = -EBUSY; @@ -279,12 +276,11 @@ static int nominate(struct domain *d, unsigned long gfn_l) * could evict it, eviction can not be done either. In this case the gfn is * still backed by a mfn. */ -static int evict(struct domain *d, unsigned long gfn_l) +static int evict(struct domain *d, gfn_t gfn) { struct page_info *page; p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int ret = -EBUSY; @@ -346,13 +342,12 @@ static int evict(struct domain *d, unsigned long gfn_l) * mfn if populate was called for gfn which was nominated but not evicted. In * this case only the p2mt needs to be forwarded. */ -static int prepare(struct domain *d, unsigned long gfn_l, +static int prepare(struct domain *d, gfn_t gfn, XEN_GUEST_HANDLE_64(const_uint8) buffer) { struct page_info *page = NULL; p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int ret, page_extant = 1; @@ -417,7 +412,7 @@ static int prepare(struct domain *d, unsigned long gfn_l, : p2m_ram_rw, a); if ( !ret ) { - set_gpfn_from_mfn(mfn_x(mfn), gfn_l); + set_gpfn_from_mfn(mfn_x(mfn), gfn_x(gfn)); if ( !page_extant ) atomic_dec(&d->paged_pages); @@ -461,15 +456,15 @@ int mem_paging_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_paging_op_t) arg) switch( mpo.op ) { case XENMEM_paging_op_nominate: - rc = nominate(d, mpo.gfn); + rc = nominate(d, _gfn(mpo.gfn)); break; case XENMEM_paging_op_evict: - rc = evict(d, mpo.gfn); + rc = evict(d, _gfn(mpo.gfn)); break; case XENMEM_paging_op_prep: - rc = prepare(d, mpo.gfn, mpo.buffer); + rc = prepare(d, _gfn(mpo.gfn), mpo.buffer); if ( !rc ) copyback = 1; break; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index cc624281e0..17f320b624 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1835,7 +1835,7 @@ void *map_domain_gfn(struct p2m_domain *p2m, gfn_t gfn, mfn_t *mfn, ASSERT(p2m_is_hostp2m(p2m)); if ( page ) put_page(page); - p2m_mem_paging_populate(p2m->domain, gfn_x(gfn)); + p2m_mem_paging_populate(p2m->domain, gfn); *pfec = PFEC_page_paged; return NULL; } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 73c6218660..1f6f1dde76 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -848,7 +848,7 @@ int guest_wrmsr_xen(struct vcpu *v, uint32_t idx, uint64_t val) if ( p2m_is_paging(t) ) { - p2m_mem_paging_populate(d, gmfn); + p2m_mem_paging_populate(d, _gfn(gmfn)); return X86EMUL_RETRY; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 6e4b85674d..714077c1e5 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -322,7 +322,7 @@ int guest_remove_page(struct domain *d, unsigned long gmfn) put_gfn(d, gmfn); - p2m_mem_paging_drop_page(d, gmfn, p2mt); + p2m_mem_paging_drop_page(d, _gfn(gmfn), p2mt); return 0; } @@ -1667,7 +1667,7 @@ int check_get_page_from_gfn(struct domain *d, gfn_t gfn, bool readonly, if ( page ) put_page(page); - p2m_mem_paging_populate(d, gfn_x(gfn)); + p2m_mem_paging_populate(d, gfn); return -EAGAIN; } #endif diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index bf691ff568..8abae345e8 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -732,10 +732,9 @@ static inline void p2m_pod_init(struct p2m_domain *p2m) {} int set_shared_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); /* Tell xenpaging to drop a paged out frame */ -void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, - p2m_type_t p2mt); +void p2m_mem_paging_drop_page(struct domain *d, gfn_t gfn, p2m_type_t p2mt); /* Start populating a paged out frame */ -void p2m_mem_paging_populate(struct domain *d, unsigned long gfn); +void p2m_mem_paging_populate(struct domain *d, gfn_t gfn); /* Resume normal operation (in case a domain was paused) */ struct vm_event_st; void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 18 15:22:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 15:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahbL-0003iw-Os; Mon, 18 May 2020 15:22:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahbK-0003il-6N for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:46 +0000 X-Inumbo-ID: 6cc16422-991b-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6cc16422-991b-11ea-b9cf-bc764e2007e4; Mon, 18 May 2020 15:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mOs4XrpARFuD4jb/5pZQ9ETBgSgpn5IAHTeyjq70Gtw=; b=OQo2IyNDbNj9ddDG6H6qz8eUL3 UFUqoqbhVDu1FJ4wh5+2NwGHqd5VvJUhXaVBbDkauCYVLAgsghf5pRh3EnPMogooCB2mVQTe5/4rD 7jRRQTo5MWfSfys7HB2s6kk9HaaAZze+TrN1NpRzNXJ0BwxADp+KcD/rCt5o4S8D0His=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jahbJ-00030d-HS for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jahbJ-0006XV-GM for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:22:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: determine MXCSR mask in all cases Message-Id: Date: Mon, 18 May 2020 15:22:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2b532519d64e653a6bbfd9eefed6040a09c8876d Author: Jan Beulich AuthorDate: Mon May 18 17:18:56 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:18:56 2020 +0200 x86: determine MXCSR mask in all cases For its use(s) by the emulator to be correct in all cases, the filling of the variable needs to be independent of XSAVE availability. As there's no suitable function in i387.c to put the logic in, keep it in xstate_init(), arrange for the function to be called unconditionally, and pull the logic ahead of all return paths there. Fixes: 9a4496a35b20 ("x86emul: support {,V}{LD,ST}MXCSR") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 3 +-- xen/arch/x86/xstate.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 63f3893c7a..3e0d9cbe98 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -488,8 +488,7 @@ void identify_cpu(struct cpuinfo_x86 *c) /* Now the feature flags better reflect actual CPU features! */ - if ( cpu_has_xsave ) - xstate_init(c); + xstate_init(c); #ifdef NOISY_CAPS printk(KERN_DEBUG "CPU: After all inits, caps:"); diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 078419a171..3794d9a5a5 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -588,6 +588,18 @@ void xstate_init(struct cpuinfo_x86 *c) u32 eax, ebx, ecx, edx; u64 feature_mask; + if ( bsp ) + { + static typeof(current->arch.xsave_area->fpu_sse) __initdata ctxt; + + asm ( "fxsave %0" : "=m" (ctxt) ); + if ( ctxt.mxcsr_mask ) + mxcsr_mask = ctxt.mxcsr_mask; + } + + if ( !cpu_has_xsave ) + return; + if ( (bsp && !use_xsave) || boot_cpu_data.cpuid_level < XSTATE_CPUID ) { @@ -611,8 +623,6 @@ void xstate_init(struct cpuinfo_x86 *c) if ( bsp ) { - static typeof(current->arch.xsave_area->fpu_sse) __initdata ctxt; - xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. @@ -621,10 +631,6 @@ void xstate_init(struct cpuinfo_x86 *c) xsave_cntxt_size = _xstate_ctxt_size(feature_mask); printk("xstate: size: %#x and states: %#"PRIx64"\n", xsave_cntxt_size, xfeature_mask); - - asm ( "fxsave %0" : "=m" (ctxt) ); - if ( ctxt.mxcsr_mask ) - mxcsr_mask = ctxt.mxcsr_mask; } else { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 18 15:55:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 18 May 2020 15:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jai6c-0006l8-PG; Mon, 18 May 2020 15:55:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jai6b-0006l3-Fl for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:55:05 +0000 X-Inumbo-ID: f07f4a1e-991f-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f07f4a1e-991f-11ea-b9cf-bc764e2007e4; Mon, 18 May 2020 15:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ECCRs4DD/aCqEv8rASmP9Sk0EszDK44SVhD+Er/XpMI=; b=D554nUHUxxiq9CJF91ywmC/MX/ 52TPzJlR8o0Q9UiFIRU4Y4+TAhBQX63jmyPzrbjn5Emorb9pN/RII8BZXSHuZOQ7ezRYBJgfJXCof PZ9UzAjY2hDQhzP/ZbSCxfX+dHlssfVks+p1EkD5Z6HyO8wdDaZ6iGQL27sa6Ud9wkfw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jai6a-0003gC-Ha for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jai6a-0000QN-G2 for xen-changelog@lists.xenproject.org; Mon, 18 May 2020 15:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools: use HOSTCC/CPP to compile rombios code and helper Message-Id: Date: Mon, 18 May 2020 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 475ffdbbf5778329319ef6f7bd6315c163163440 Author: Olaf Hering AuthorDate: Mon May 18 16:44:00 2020 +0200 Commit: Andrew Cooper CommitDate: Mon May 18 16:49:56 2020 +0100 tools: use HOSTCC/CPP to compile rombios code and helper Use also HOSTCFLAGS for biossums while touching the code. Spotted by inspecting build logfile. Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/firmware/rombios/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile index 78237fd736..02abdb3038 100644 --- a/tools/firmware/rombios/Makefile +++ b/tools/firmware/rombios/Makefile @@ -19,7 +19,7 @@ clean: subdirs-clean distclean: clean BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c - gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c + $(CPP) -DBX_SMP_PROCESSORS=1 -P $< > _rombios_.c bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s as86 _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt @@ -29,6 +29,6 @@ BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c rm -f _rombios_.s biossums: biossums.c - gcc -o biossums biossums.c + $(HOSTCC) $(HOSTCFLAGS) -o biossums biossums.c -include $(DEPS_INCLUDE) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 09:44:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 09:44:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynF-0003XH-9R; Tue, 19 May 2020 09:44:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynD-0003X4-JU for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:11 +0000 X-Inumbo-ID: 4732d1e2-99b5-11ea-a8eb-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4732d1e2-99b5-11ea-a8eb-12813bfff9fa; Tue, 19 May 2020 09:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zGlNizjXS97wXPtaaxsejh7LyWrpzVgTJiUj0/hecvY=; b=zKElv0snlCG9XVyfR2qHFb3wHV /VxpDOy/N+IKY5JiOdOrhDosibPXQ/qSj60RUyjQIEfDlm5JE7I8yUdZfUd6qzREHwNaveID90wpN lv5bkfQqgUyIgn4bnGNFphz5UWEfAOzgSERQXUdPaJvfyMl2axX75ORjlv/LRht/oDao=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jayn7-0004pa-0F for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jayn6-0007bv-V2 for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] Document ioemu MiniOS stubdomain protocol Message-Id: Date: Tue, 19 May 2020 09:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c7c145470168c67ba45911370bd6902917e59da5 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:45 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 Document ioemu MiniOS stubdomain protocol Add documentation based on reverse-engineered toolstack-ioemu stubdomain protocol. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/misc/stubdom.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt index 882a18cab4..64c77d9b64 100644 --- a/docs/misc/stubdom.txt +++ b/docs/misc/stubdom.txt @@ -23,6 +23,59 @@ and https://wiki.xen.org/wiki/Device_Model_Stub_Domains for more information on device model stub domains +Toolstack to MiniOS ioemu stubdomain protocol +--------------------------------------------- + +This section describe communication protocol between toolstack and +qemu-traditional running in MiniOS stubdomain. The protocol include +expectations of both qemu and stubdomain itself. + +Setup (done by toolstack, expected by stubdomain): + - Block devices for target domain are connected as PV disks to stubdomain, + according to configuration order, starting with xvda + - Network devices for target domain are connected as PV nics to stubdomain, + according to configuration order, starting with 0 + - if graphics output is expected, VFB and VKB devices are set for stubdomain + (its backend is responsible for exposing them using appropriate protocol + like VNC or Spice) + - other target domain's devices are not connected at this point to stubdomain + (may be hot-plugged later) + - QEMU command line (space separated arguments) is stored in + /vm//image/dmargs xenstore path + - target domain id is stored in /local/domain//target xenstore path +?? - bios type is stored in /local/domain//hvmloader/bios + - stubdomain's console 0 is connected to qemu log file + - stubdomain's console 1 is connected to qemu save file (for saving state) + - stubdomain's console 2 is connected to qemu save file (for restoring state) + - next consoles are connected according to target guest's serial console configuration + +Startup: +1. PV stubdomain is started with ioemu-stubdom.gz kernel and no initrd +2. stubdomain initialize relevant devices +3. stubdomain signal readiness by writing "running" to /local/domain//device-model//state xenstore path +4. now stubdomain is considered running + +Runtime control (hotplug etc): +Toolstack can issue command through xenstore. The sequence is (from toolstack POV): +1. Write parameter to /local/domain//device-model//parameter. +2. Write command to /local/domain//device-model//command. +3. Wait for command result in /local/domain//device-model//state (command specific value). +4. Write "running" back to /local/domain//device-model//state. + +Defined commands: + - "pci-ins" - PCI hot plug, results: + - "pci-inserted" - success + - "pci-insert-failed" - failure + - "pci-rem" - PCI hot remove, results: + - "pci-removed" - success + - ?? + - "save" - save domain state to console 1, results: + - "paused" - success + - "continue" - resume domain execution, after loading state from console 2 (require -loadvm command argument), results: + - "running" - success + + + PV-GRUB ======= -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 09:44:19 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 09:44:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynK-0003Yp-Ax; Tue, 19 May 2020 09:44:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynI-0003YQ-JZ for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:16 +0000 X-Inumbo-ID: 4d33e14e-99b5-11ea-a8eb-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4d33e14e-99b5-11ea-a8eb-12813bfff9fa; Tue, 19 May 2020 09:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=I5DIEqp8MEfeq8vRGF5TcXRt8yAjyJW2+Wv7wgZaycI=; b=rp2OoG8/Yj3X/VyOQL5Qr6gkUr mFtCx2j1Nq1ApgZhv1mGqV7gHYT2AXAruQ8N9r+IWT0k7ay3e+u1X+AiKldNlUigTwp962rJPQQih YwehcymwICEEq230z+gWiPvwacbOPi8hnE4gPGhJwgDkiG2pu9j6w1kO/Y0VAO31yLRI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynH-0004pm-3J for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaynH-0007cZ-21 for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] Document ioemu Linux stubdomain protocol Message-Id: Date: Tue, 19 May 2020 09:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cd7181308e196cba5375202262d1e27d9f0ac49c Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:46 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 Document ioemu Linux stubdomain protocol Add documentation for upcoming Linux stubdomain for qemu-upstream. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/misc/stubdom.txt | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt index 64c77d9b64..c717a95d17 100644 --- a/docs/misc/stubdom.txt +++ b/docs/misc/stubdom.txt @@ -75,6 +75,58 @@ Defined commands: - "running" - success +Toolstack to Linux ioemu stubdomain protocol +-------------------------------------------- + +This section describe communication protocol between toolstack and +qemu-upstream running in Linux stubdomain. The protocol include +expectations of both stubdomain, and qemu. + +Setup (done by toolstack, expected by stubdomain): + - Block devices for target domain are connected as PV disks to stubdomain, + according to configuration order, starting with xvda + - Network devices for target domain are connected as PV nics to stubdomain, + according to configuration order, starting with 0 + - [not implemented] if graphics output is expected, VFB and VKB devices are set for stubdomain + (its backend is responsible for exposing them using appropriate protocol + like VNC or Spice) + - other target domain's devices are not connected at this point to stubdomain + (may be hot-plugged later) + - QEMU command line is stored in + /vm//image/dm-argv xenstore dir, each argument as separate key + in form /vm//image/dm-argv/NNN, where NNN is 0-padded argument + number + - target domain id is stored in /local/domain//target xenstore path +?? - bios type is stored in /local/domain//hvmloader/bios + - stubdomain's console 0 is connected to qemu log file + - stubdomain's console 1 is connected to qemu save file (for saving state) + - stubdomain's console 2 is connected to qemu save file (for restoring state) + - next consoles are connected according to target guest's serial console configuration + +Environment exposed by stubdomain to qemu (needed to construct appropriate qemu command line and later interact with qmp): + - target domain's disks are available as /dev/xvd[a-z] + - console 2 (incoming domain state) must be connected to an FD and the command + line argument $STUBDOM_RESTORE_INCOMING_ARG must be replaced with fd:$FD to + form "-incoming fd:$FD" + - console 1 (saving domain state) is added over QMP to qemu as "fdset-id 1" (done by stubdomain, toolstack doesn't need to care about it) + - nics are connected to relevant stubdomain PV vifs when available (qemu -netdev should specify ifname= explicitly) + +Startup: +1. toolstack starts PV stubdomain with stubdom-linux-kernel kernel and stubdom-linux-initrd initrd +2. stubdomain initialize relevant devices +3. stubdomain starts qemu with requested command line, plus few stubdomain specific ones - including local qmp access options +4. stubdomain starts vchan server on /local/domain//device-model//qmp-vchan, exposing qmp socket to the toolstack +5. qemu signal readiness by writing "running" to /local/domain//device-model//state xenstore path +6. now device model is considered running + +QEMU can be controlled using QMP over vchan at /local/domain//device-model//qmp-vchan. Only one simultaneous connection is supported and toolstack needs to ensure that. + +Limitations: + - PCI passthrough require permissive mode + - only one nic is supported + - at most 26 emulated disks are supported (more are still available as PV disks) + - graphics output (VNC/SDL/Spice) not supported + PV-GRUB ======= -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 09:44:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 09:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynT-0003b4-Db; Tue, 19 May 2020 09:44:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynR-0003ah-QW for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:25 +0000 X-Inumbo-ID: 53390ce0-99b5-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 53390ce0-99b5-11ea-ae69-bc764e2007e4; Tue, 19 May 2020 09:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=pYm6gDW+lD5/uJO9S88MstOxMgolZRnzzNBOX5LNl7E=; b=EWmwEmBWGeqqm9pEGvSlh/R2TP V8fAXdkIFbSGezKHkeObhNrgndG5pfiX8FNxbfizKZuRCMIPU2kkN9c6XzmUn2S4Md5z+ubI+o8q4 q9VQ2jFC2QRStgWAaCNVM+PpivpOb4qtT/FBWQwkf4rUhq9Dmpn258TRctpGtgn4+APw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynR-0004pz-6a for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaynR-0007dL-5G for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: fix qemu-trad cmdline for no sdl/vnc case Message-Id: Date: Tue, 19 May 2020 09:44:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 11b7f8725d5f992a384a6ca55a08e5e908c06d85 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:47 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 libxl: fix qemu-trad cmdline for no sdl/vnc case When qemu is running in stubdomain, any attempt to initialize vnc/sdl there will crash it (on failed attempt to load a keymap from a file). If vfb is present, all those cases are skipped. But since b053f0c4c9e533f3d97837cf897eb920b8355ed3 "libxl: do not start dom0 qemu for stubdomain when not needed" it is possible to create a stubdomain without vfb and contrary to the comment -vnc none do trigger VNC initialization code (just skips exposing it externally). Change the implicit SDL avoiding method to -nographics option, used when none of SDL or VNC is enabled. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Acked-by: Ian Jackson Acked-by: Wei Liu Signed-off-by: Jason Andryuk --- tools/libxl/libxl_dm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f4007bbe50..b91e63db6f 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -734,14 +734,15 @@ static int libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } else + } else if (!sdl) { /* * VNC is not enabled by default by qemu-xen-traditional, - * however passing -vnc none causes SDL to not be - * (unexpectedly) enabled by default. This is overridden by - * explicitly passing -sdl below as required. + * however skipping -vnc causes SDL to be + * (unexpectedly) enabled by default. If undesired, disable graphics at + * all. */ - flexarray_append_pair(dm_args, "-vnc", "none"); + flexarray_append(dm_args, "-nographic"); + } if (sdl) { flexarray_append(dm_args, "-sdl"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 09:44:38 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 09:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jayne-0003eq-F8; Tue, 19 May 2020 09:44:38 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaync-0003ea-On for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:36 +0000 X-Inumbo-ID: 593ecd82-99b5-11ea-a8eb-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 593ecd82-99b5-11ea-a8eb-12813bfff9fa; Tue, 19 May 2020 09:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mcDHPygpf1Hnmq1OvaNwuxLEKkeAPWS6UAzj1UpwQeo=; b=VSs+Y6bkmBCrPzwD/hagwgpDXQ NK/AJGnwM/FHgzjMiRTwbqC3CoCiL67WkXvmJkbBUujbrbWqVTk8QIOVTF7C4YGbJi+P+nTfKyphD wV9yMKnO33M5rAVMcOCrvJE1RYvsxsN+HwFJeH9kp7UOCKoSFZN5nEnhL4Oc6/1f45WQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynb-0004qw-9s for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaynb-0007dz-8f for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: Allow running qemu-xen in stubdomain Message-Id: Date: Tue, 19 May 2020 09:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 46587a30d4cb7702a8c2074c98d687b6f9602e6c Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:48 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 libxl: Allow running qemu-xen in stubdomain Do not prohibit anymore using stubdomain with qemu-xen. To help distingushing MiniOS and Linux stubdomain, add helper inline functions libxl__stubdomain_is_linux() and libxl__stubdomain_is_linux_running(). Those should be used where really the difference is about MiniOS/Linux, not qemu-xen/qemu-xen-traditional. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 9 --------- tools/libxl/libxl_internal.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5a043df15f..433947abab 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -171,15 +171,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } } - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && - b_info->device_model_version != - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - libxl_defbool_val(b_info->device_model_stubdomain)) { - LOG(ERROR, - "device model stubdomains require \"qemu-xen-traditional\""); - return ERROR_INVAL; - } - if (!b_info->max_vcpus) b_info->max_vcpus = 1; if (!b_info->avail_vcpus.size) { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e5effd2ad1..d1ebdec8d2 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2324,6 +2324,23 @@ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); /* Return the system-wide default device model */ _hidden libxl_device_model_version libxl__default_device_model(libxl__gc *gc); +static inline +bool libxl__stubdomain_is_linux_running(libxl__gc *gc, uint32_t domid) +{ + /* same logic as in libxl__stubdomain_is_linux */ + return libxl__device_model_version_running(gc, domid) + == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; +} + +static inline +bool libxl__stubdomain_is_linux(libxl_domain_build_info *b_info) +{ + /* right now qemu-tranditional implies MiniOS stubdomain and qemu-xen + * implies Linux stubdomain */ + return libxl_defbool_val(b_info->device_model_stubdomain) && + b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; +} + #define DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, fmt, _a...) \ libxl__sprintf(gc, "/local/domain/%u/device-model/%u" fmt, dm_domid, \ domid, ##_a) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 09:44:48 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 09:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jayno-0003gK-Gf; Tue, 19 May 2020 09:44:48 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynm-0003g1-RB for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:46 +0000 X-Inumbo-ID: 5f47dc96-99b5-11ea-a8eb-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5f47dc96-99b5-11ea-a8eb-12813bfff9fa; Tue, 19 May 2020 09:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4aadqprGW3Dooi44M/MejqVmt4EEE+l391WnrKIE88k=; b=0K6BDhZSdevRoS5GBYndxBp5nb Iu4jBmwL0kgIWh3T4W7QotOrb1IaTa86Ymf5RA66cC4AzyjbM9iTP/+Ff08kf8Dmop5oPMinCphQW i0ur3rcUtEZ8vGGC811ZASpIa9KD85gLundlfPVpgDBEyxNDbTq2uwG5+mjujEaBG4go=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jaynl-0004r7-Dq for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jaynl-0007eZ-CC for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 09:44:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: Handle Linux stubdomain specific QEMU options. Message-Id: Date: Tue, 19 May 2020 09:44:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7efd9f3d45480c12328e4419547a98022f7af43a Author: Eric Shelton AuthorDate: Mon May 18 21:54:49 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 libxl: Handle Linux stubdomain specific QEMU options. This patch creates an appropriate command line for the QEMU instance running in a Linux-based stubdomain. NOTE: a number of items are not currently implemented for Linux-based stubdomains, such as: - save/restore - QMP socket - graphics output (e.g., VNC) Signed-off-by: Eric Shelton Simon: * fix disk path * fix cdrom path and "format" Signed-off-by: Simon Gaiser [drop Qubes-specific parts] Signed-off-by: Marek Marczykowski-Górecki Allow setting stubdomain_ramdisk independently from stubdomain_kernel Add a qemu- prefix for qemu-stubdom-linux-{kernel,rootfs} since stubdom doesn't convey device-model. Use qemu- since this code is qemu specific. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 45 ++++++++++ tools/libxl/libxl_dm.c | 193 +++++++++++++++++++++++++++++-------------- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_mem.c | 6 +- tools/libxl/libxl_types.idl | 3 + 5 files changed, 186 insertions(+), 62 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 433947abab..8614a2c241 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -171,6 +171,40 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } } + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && + libxl_defbool_val(b_info->device_model_stubdomain)) { + if (!b_info->stubdomain_kernel) { + switch (b_info->device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + b_info->stubdomain_kernel = + libxl__abs_path(NOGC, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + b_info->stubdomain_kernel = + libxl__abs_path(NOGC, + "qemu-stubdom-linux-kernel", + libxl__xenfirmwaredir_path()); + break; + default: + abort(); + } + } + if (!b_info->stubdomain_ramdisk) { + switch (b_info->device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + b_info->stubdomain_ramdisk = + libxl__abs_path(NOGC, + "qemu-stubdom-linux-rootfs", + libxl__xenfirmwaredir_path()); + break; + default: + abort(); + } + } + } + if (!b_info->max_vcpus) b_info->max_vcpus = 1; if (!b_info->avail_vcpus.size) { @@ -206,6 +240,17 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->target_memkb == LIBXL_MEMKB_DEFAULT) b_info->target_memkb = b_info->max_memkb; + if (b_info->stubdomain_memkb == LIBXL_MEMKB_DEFAULT) { + if (libxl_defbool_val(b_info->device_model_stubdomain)) { + if (libxl__stubdomain_is_linux(b_info)) + b_info->stubdomain_memkb = LIBXL_LINUX_STUBDOM_MEM * 1024; + else + b_info->stubdomain_memkb = 28 * 1024; // MiniOS + } else { + b_info->stubdomain_memkb = 0; // no stubdomain + } + } + libxl_defbool_setdefault(&b_info->claim_mode, false); libxl_defbool_setdefault(&b_info->localtime, false); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b91e63db6f..dc1717bc12 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1188,6 +1188,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, int i, connection, devid; uint64_t ram_size; const char *path, *chardev; + bool is_stubdom = libxl_defbool_val(b_info->device_model_stubdomain); dm_args = flexarray_make(gc, 16, 1); dm_envs = flexarray_make(gc, 16, 1); @@ -1197,39 +1198,42 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_vappend(dm_args, dm, "-xen-domid", GCSPRINTF("%d", guest_domid), NULL); + flexarray_append(dm_args, "-no-shutdown"); - flexarray_append(dm_args, "-chardev"); - if (state->dm_monitor_fd >= 0) { - flexarray_append(dm_args, - GCSPRINTF("socket,id=libxl-cmd,fd=%d,server,nowait", - state->dm_monitor_fd)); + /* There is currently no way to access the QMP socket in the stubdom */ + if (!is_stubdom) { + flexarray_append(dm_args, "-chardev"); + if (state->dm_monitor_fd >= 0) { + flexarray_append(dm_args, + GCSPRINTF("socket,id=libxl-cmd,fd=%d,server,nowait", + state->dm_monitor_fd)); - /* - * Start QEMU with its "CPU" paused, it will not start any emulation - * until the QMP command "cont" is used. This also prevent QEMU from - * writing "running" to the "state" xenstore node so we only use this - * flag when we have the QMP based startup notification. - * */ - flexarray_append(dm_args, "-S"); - } else { - flexarray_append(dm_args, - GCSPRINTF("socket,id=libxl-cmd," - "path=%s,server,nowait", - libxl__qemu_qmp_path(gc, guest_domid))); - } + /* + * Start QEMU with its "CPU" paused, it will not start any emulation + * until the QMP command "cont" is used. This also prevent QEMU from + * writing "running" to the "state" xenstore node so we only use this + * flag when we have the QMP based startup notification. + * */ + flexarray_append(dm_args, "-S"); + } else { + flexarray_append(dm_args, + GCSPRINTF("socket,id=libxl-cmd," + "path=%s,server,nowait", + libxl__qemu_qmp_path(gc, guest_domid))); + } - flexarray_append(dm_args, "-no-shutdown"); - flexarray_append(dm_args, "-mon"); - flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); + flexarray_append(dm_args, "-mon"); + flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); - flexarray_append(dm_args, "-chardev"); - flexarray_append(dm_args, - GCSPRINTF("socket,id=libxenstat-cmd," - "path=%s/qmp-libxenstat-%d,server,nowait", - libxl__run_dir_path(), guest_domid)); + flexarray_append(dm_args, "-chardev"); + flexarray_append(dm_args, + GCSPRINTF("socket,id=libxenstat-cmd," + "path=%s/qmp-libxenstat-%d,server,nowait", + libxl__run_dir_path(), guest_domid)); - flexarray_append(dm_args, "-mon"); - flexarray_append(dm_args, "chardev=libxenstat-cmd,mode=control"); + flexarray_append(dm_args, "-mon"); + flexarray_append(dm_args, "chardev=libxenstat-cmd,mode=control"); + } for (i = 0; i < guest_config->num_channels; i++) { connection = guest_config->channels[i].connection; @@ -1273,7 +1277,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_vappend(dm_args, "-name", c_info->name, NULL); } - if (vnc) { + if (vnc && !is_stubdom) { char *vncarg = NULL; flexarray_append(dm_args, "-vnc"); @@ -1312,11 +1316,12 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } else + } else if (!is_stubdom) { /* * Ensure that by default no vnc server is created. */ flexarray_append_pair(dm_args, "-vnc", "none"); + } /* * Ensure that by default no display backend is created. Further @@ -1324,7 +1329,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, */ flexarray_append_pair(dm_args, "-display", "none"); - if (sdl) { + if (sdl && !is_stubdom) { flexarray_append(dm_args, "-sdl"); if (sdl->display) flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); @@ -1366,18 +1371,34 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, { LOGD(ERROR, guest_domid, "Both serial and serial_list set"); return ERROR_INVAL; - } - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, - "-serial", b_info->u.hvm.serial, NULL); - } else if (b_info->u.hvm.serial_list) { - char **p; - for (p = b_info->u.hvm.serial_list; - *p; - p++) { - flexarray_vappend(dm_args, - "-serial", - *p, NULL); + } else { + if (b_info->u.hvm.serial) { + if (is_stubdom) { + /* see spawn_stub_launch_dm() for connecting STUBDOM_CONSOLE_SERIAL */ + flexarray_vappend(dm_args, + "-serial", + GCSPRINTF("/dev/hvc%d", STUBDOM_CONSOLE_SERIAL), + NULL); + } else { + flexarray_vappend(dm_args, + "-serial", b_info->u.hvm.serial, NULL); + } + } else if (b_info->u.hvm.serial_list) { + char **p; + /* see spawn_stub_launch_dm() for connecting STUBDOM_CONSOLE_SERIAL */ + for (p = b_info->u.hvm.serial_list, i = 0; + *p; + p++, i++) { + if (is_stubdom) + flexarray_vappend(dm_args, + "-serial", + GCSPRINTF("/dev/hvc%d", STUBDOM_CONSOLE_SERIAL + i), + NULL); + else + flexarray_vappend(dm_args, + "-serial", + *p, NULL); + } } } } @@ -1386,7 +1407,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-nographic"); } - if (libxl_defbool_val(b_info->u.hvm.spice.enable)) { + if (libxl_defbool_val(b_info->u.hvm.spice.enable) && !is_stubdom) { const libxl_spice_info *spice = &b_info->u.hvm.spice; char *spiceoptions = dm_spice_options(gc, spice); if (!spiceoptions) @@ -1813,7 +1834,9 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, * If qemu isn't doing the interpreting, the parameter is * always raw */ - if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK) + if (libxl_defbool_val(b_info->device_model_stubdomain)) + format = "host_device"; + else if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK) format = libxl__qemu_disk_format_string(disks[i].format); else format = libxl__qemu_disk_format_string(LIBXL_DISK_FORMAT_RAW); @@ -1824,6 +1847,16 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, disks[i].vdev); continue; } + } else if (libxl_defbool_val(b_info->device_model_stubdomain)) { + if (disk > 'z' - 'a') { + LOGD(WARN, guest_domid, + "Emulation of only first %d disks is supported with qemu-xen in stubdomain.\n" + "Disk %d will be available via PV drivers but not as an emulated disk.", + 'z' - 'a', + disk); + continue; + } + target_path = GCSPRINTF("/dev/xvd%c", 'a' + disk); } else { if (format == NULL) { LOGD(WARN, guest_domid, @@ -1964,7 +1997,7 @@ static int libxl__build_device_model_args(libxl__gc *gc, char ***args, char ***envs, const libxl__domain_build_state *state, int *dm_state_fd) -/* dm_state_fd may be NULL iff caller knows we are using old stubdom +/* dm_state_fd may be NULL iff caller knows we are using stubdom * and therefore will be passing a filename rather than a fd. */ { switch (guest_config->b_info.device_model_version) { @@ -1974,8 +2007,10 @@ static int libxl__build_device_model_args(libxl__gc *gc, args, envs, state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - assert(dm_state_fd != NULL); - assert(*dm_state_fd < 0); + if (!libxl_defbool_val(guest_config->b_info.device_model_stubdomain)) { + assert(dm_state_fd != NULL); + assert(*dm_state_fd < 0); + } return libxl__build_device_model_args_new(gc, dm, guest_domid, guest_config, args, envs, @@ -2080,6 +2115,16 @@ retry_transaction: return 0; } +static int libxl__store_libxl_entry(libxl__gc *gc, uint32_t domid, + const char *name, const char *value) +{ + char *path = NULL; + + path = libxl__xs_libxl_path(gc, domid); + path = libxl__sprintf(gc, "%s/%s", path, name); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", value); +} + static void dmss_init(libxl__dm_spawn_state *dmss) { libxl__ev_qmp_init(&dmss->qmp); @@ -2138,10 +2183,14 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dmss_init(&sdss->pvqemu); libxl__xswait_init(&sdss->xswait); - if (guest_config->b_info.device_model_version != - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { - ret = ERROR_INVAL; - goto out; + assert(libxl_defbool_val(guest_config->b_info.device_model_stubdomain)); + + if (libxl__stubdomain_is_linux(&guest_config->b_info)) { + if (d_state->saved_state) { + LOG(ERROR, "Save/Restore not supported yet with Linux Stubdom."); + ret = -1; + goto out; + } } sdss->pvqemu.guest_domid = INVALID_DOMID; @@ -2163,8 +2212,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dm_config->b_info.shadow_memkb = 0; dm_config->b_info.max_vcpus = 1; - dm_config->b_info.max_memkb = 28 * 1024 + - guest_config->b_info.video_memkb; + dm_config->b_info.max_memkb = guest_config->b_info.stubdomain_memkb; + dm_config->b_info.max_memkb += guest_config->b_info.video_memkb; dm_config->b_info.target_memkb = dm_config->b_info.max_memkb; dm_config->b_info.max_grant_frames = guest_config->b_info.max_grant_frames; @@ -2203,10 +2252,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dm_config->num_vkbs = 1; } - stubdom_state->pv_kernel.path - = libxl__abs_path(gc, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); - stubdom_state->pv_cmdline = GCSPRINTF(" -d %d", guest_domid); - stubdom_state->pv_ramdisk.path = ""; + stubdom_state->pv_kernel.path = guest_config->b_info.stubdomain_kernel; + stubdom_state->pv_ramdisk.path = guest_config->b_info.stubdomain_ramdisk; /* fixme: this function can leak the stubdom if it fails */ ret = libxl__domain_make(gc, dm_config, stubdom_state, @@ -2226,6 +2273,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) goto out; } + libxl__store_libxl_entry(gc, guest_domid, "dm-version", + libxl_device_model_version_to_string(dm_config->b_info.device_model_version)); libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/image/device-model-domid", @@ -2235,6 +2284,15 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) GCSPRINTF("%s/target", libxl__xs_get_dompath(gc, dm_domid)), "%d", guest_domid); + if (guest_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + /* qemu-xen is used as a dm in the stubdomain, so we set the bios + * accroding to this */ + libxl__xs_printf(gc, XBT_NULL, + libxl__sprintf(gc, "%s/hvmloader/bios", + libxl__xs_get_dompath(gc, guest_domid)), + "%s", + libxl_bios_type_to_string(guest_config->b_info.u.hvm.bios)); + } ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { LOGED(ERROR, guest_domid, "setting target domain %d -> %d", @@ -2314,8 +2372,13 @@ static void spawn_stub_launch_dm(libxl__egc *egc, if (ret) goto out; } - if (guest_config->b_info.u.hvm.serial) + if (guest_config->b_info.u.hvm.serial) { num_console++; + } else if (guest_config->b_info.u.hvm.serial_list) { + char **serial = guest_config->b_info.u.hvm.serial_list; + while (*(serial++)) + num_console++; + } console = libxl__calloc(gc, num_console, sizeof(libxl__device_console)); @@ -2349,8 +2412,18 @@ static void spawn_stub_launch_dm(libxl__egc *egc, console[i].output = GCSPRINTF("pipe:%s", d_state->saved_state); break; + case STUBDOM_CONSOLE_SERIAL: + if (guest_config->b_info.u.hvm.serial) { + console[i].output = guest_config->b_info.u.hvm.serial; + break; + } + /* fall-through */ default: - console[i].output = "pty"; + /* Serial_list is set, as otherwise num_consoles would be + * smaller and consoles 0-2 are handled above. */ + assert(guest_config->b_info.u.hvm.serial_list); + console[i].output = guest_config->b_info.u.hvm.serial_list[ + i-STUBDOM_CONSOLE_SERIAL]; break; } } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d1ebdec8d2..f2f76439ec 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -119,6 +119,7 @@ #define STUBDOM_CONSOLE_RESTORE 2 #define STUBDOM_CONSOLE_SERIAL 3 #define STUBDOM_SPECIAL_CONSOLES 3 +#define LIBXL_LINUX_STUBDOM_MEM 128 #define TAP_DEVICE_SUFFIX "-emu" #define DOMID_XS_PATH "domid" #define PVSHIM_BASENAME "xen-shim" diff --git a/tools/libxl/libxl_mem.c b/tools/libxl/libxl_mem.c index bc7b95aa74..e52a9624ea 100644 --- a/tools/libxl/libxl_mem.c +++ b/tools/libxl/libxl_mem.c @@ -459,8 +459,10 @@ int libxl__domain_need_memory_calculate(libxl__gc *gc, case LIBXL_DOMAIN_TYPE_PVH: case LIBXL_DOMAIN_TYPE_HVM: *need_memkb += LIBXL_HVM_EXTRA_MEMORY; - if (libxl_defbool_val(b_info->device_model_stubdomain)) - *need_memkb += 32 * 1024; + if (libxl_defbool_val(b_info->device_model_stubdomain)) { + *need_memkb += b_info->stubdomain_memkb; + *need_memkb += b_info->video_memkb; + } break; case LIBXL_DOMAIN_TYPE_PV: *need_memkb += LIBXL_PV_EXTRA_MEMORY; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index f7c473be74..9d3f05f399 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -518,6 +518,9 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", libxl_defbool), + ("stubdomain_memkb", MemKB), + ("stubdomain_kernel", string), + ("stubdomain_ramdisk", string), # if you set device_model you must set device_model_version too ("device_model", string), ("device_model_ssidref", uint32), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 10:44:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 10:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jazjD-0000hd-Av; Tue, 19 May 2020 10:44:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jazjC-0000hW-5w for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 10:44:06 +0000 X-Inumbo-ID: a8fc9464-99bd-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a8fc9464-99bd-11ea-9887-bc764e2007e4; Tue, 19 May 2020 10:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bRIdTfIWXNzmDHKBCeHBjxO0KKSH8eYpJuv2fb+Px0A=; b=0DF9jHgIJ90uFItLiIMhpKRF/+ bJ/gmvuhvWGmqXs/DvtIRyLCgXm/bgUeOt5aJaDOLZ8YYWjUun5S8HOIp029DNkrk4QWiqfAoC6nV Q3Hly0MUGUWI+DC4aPvFByzfXbySmD5NVI2jZZC4EDdfsoTZZX/Cc5i22ERZU8Av7eVY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jazjB-00069I-0m for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 10:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jazjA-00034e-Vd for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 10:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/python: Fix install-wrap Message-Id: Date: Tue, 19 May 2020 10:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 78f81c6870dea1fe3a583b5e07eeb1cbb01461f0 Author: Anthony PERARD AuthorDate: Wed Mar 11 17:59:32 2020 +0000 Commit: Wei Liu CommitDate: Tue May 19 11:40:50 2020 +0100 tools/python: Fix install-wrap This allows to use install-wrap when the source scripts is in a subdirectory. Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- tools/python/install-wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/python/install-wrap b/tools/python/install-wrap index 00e2014016..fef24e0170 100755 --- a/tools/python/install-wrap +++ b/tools/python/install-wrap @@ -44,7 +44,7 @@ shift destf="$dest" for srcf in ${srcs}; do if test -d "$dest"; then - destf="$dest/${srcf%%*/}" + destf="$dest/${srcf##*/}" fi org="$(sed -n '2q; /^#! *\/usr\/bin\/env python *$/p' $srcf)" if test "x$org" = x; then -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 10:44:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 10:44:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jazjM-0000io-CN; Tue, 19 May 2020 10:44:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jazjL-0000i2-Oj for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 10:44:15 +0000 X-Inumbo-ID: aefdc0ea-99bd-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id aefdc0ea-99bd-11ea-9887-bc764e2007e4; Tue, 19 May 2020 10:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Xu0GN4V/yBPnLoUFGBxwFxkE9xGGTWkH3dEYK9ieHDo=; b=cr7l+ej5buvQNGWn3XRBFvK+EG q0LS6ZIInwYXoXfZaHCKyWsNb15rV3sry/g1pgGacZVlonLl4OJasaXe4F7lICiIgJ/RQVpgarUaI JxpZLfy+8Boq+VyLMpbebPalXhCx0EAnNDw18DnttFVmNVskZy2v4t5p9vqakYJQR/VQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jazjL-00069Q-3z for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 10:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jazjL-00035F-2f for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 10:44:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools: Use INSTALL_PYTHON_PROG Message-Id: Date: Tue, 19 May 2020 10:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 271ade5a621005f86ec928280dc6ac85f2c4c95a Author: Anthony PERARD AuthorDate: Wed Mar 11 17:59:33 2020 +0000 Commit: Wei Liu CommitDate: Tue May 19 11:40:53 2020 +0100 tools: Use INSTALL_PYTHON_PROG Whenever python scripts are install, have the shebang be modified to use whatever PYTHON_PATH is. This is useful for system where python isn't available, or where the package build tools prevent unversioned shebang. INSTALL_PYTHON_PROG only looks for "#!/usr/bin/env python". Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- tools/misc/xencov_split | 2 +- tools/python/Makefile | 4 ++-- tools/xenmon/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/misc/xencov_split b/tools/misc/xencov_split index 1f20518b86..5771f6cfc2 100755 --- a/tools/misc/xencov_split +++ b/tools/misc/xencov_split @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys, os, os.path as path, struct, errno from optparse import OptionParser diff --git a/tools/python/Makefile b/tools/python/Makefile index e99f78a537..8d22c03676 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -20,8 +20,8 @@ install: setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ --root="$(DESTDIR)" --force - $(INSTALL_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index e1712304d0..3e150b0659 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -32,7 +32,7 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon + $(INSTALL_PYTHON_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon .PHONY: uninstall uninstall: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:55:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4aA-0003mV-Rr; Tue, 19 May 2020 15:55:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4a9-0003mQ-HC for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:05 +0000 X-Inumbo-ID: 1aeabcd8-99e9-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1aeabcd8-99e9-11ea-9887-bc764e2007e4; Tue, 19 May 2020 15:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LuwIW8rln26YCyQMRVlc3i3eM8JPKCvtyjdDTnF3zas=; b=DIbCjB2uko6oDwb6mHzTsMORAV pq3+v19q0lOa0WA17VZSi3CPMx3xnJrCzZQCVlxEVEsR6isBL3fMV6tbwfLffsLsZ0iZu6uh3gSoJ F+wENKQjzKNlyKdjLAh8Oh10LKIs3fOgIdq0vExWFi0MI3Esc61aR1sGA4gwWkMBdtOw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4a8-0004MO-Gl for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4a8-0006YU-FU for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: Use libxl__xs_* in libxl__write_stub_dmargs Message-Id: Date: Tue, 19 May 2020 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6d721be59d1b57088ab6ae92bcf79d0ac91fad18 Author: Jason Andryuk AuthorDate: Mon May 18 21:54:50 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:05 2020 +0100 libxl: Use libxl__xs_* in libxl__write_stub_dmargs Re-work libxl__write_stub_dmargs to use libxl_xs_* functions in a loop. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 53 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index dc1717bc12..8e57cd8c1f 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2070,21 +2070,18 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, int dm_domid, int guest_domid, char **args) { - libxl_ctx *ctx = libxl__gc_owner(gc); int i; - char *vm_path; - char *dmargs, *path; + char *dmargs; int dmargs_size; struct xs_permissions roperm[2]; - xs_transaction_t t; + xs_transaction_t t = XBT_NULL; + int rc; roperm[0].id = 0; roperm[0].perms = XS_PERM_NONE; roperm[1].id = dm_domid; roperm[1].perms = XS_PERM_READ; - vm_path = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("/local/domain/%d/vm", guest_domid)); - i = 0; dmargs_size = 0; while (args[i] != NULL) { @@ -2102,17 +2099,43 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, } i++; } - path = GCSPRINTF("%s/image/dmargs", vm_path); -retry_transaction: - t = xs_transaction_start(ctx->xsh); - xs_write(ctx->xsh, t, path, dmargs, strlen(dmargs)); - xs_set_permissions(ctx->xsh, t, path, roperm, ARRAY_SIZE(roperm)); - xs_set_permissions(ctx->xsh, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), roperm, ARRAY_SIZE(roperm)); - if (!xs_transaction_end(ctx->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + for (;;) { + const char *vm_path; + char *path; + + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_read_mandatory(gc, t, + GCSPRINTF("/local/domain/%d/vm", + guest_domid), + &vm_path); + if (rc) goto out; + + path = GCSPRINTF("%s/image/dmargs", vm_path); + + rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + + rc = libxl__xs_write_checked(gc, t, path, dmargs); + if (rc) goto out; + + rc = libxl__xs_mknod(gc, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), + roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + return 0; + + out: + libxl__xs_transaction_abort(gc, &t); + + return rc; } static int libxl__store_libxl_entry(libxl__gc *gc, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4aK-0003n7-TP; Tue, 19 May 2020 15:55:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4aJ-0003my-Bf for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:15 +0000 X-Inumbo-ID: 20edb680-99e9-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 20edb680-99e9-11ea-b07b-bc764e2007e4; Tue, 19 May 2020 15:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mGRXNGptjCI+toeJkbf+U28L37lbIc5iT7e8mekrpbY=; b=XDaqE8AYmCXwmUaYSV53mPeapz ZV79ua4HjwdlRlXk2ZAvMaq6BpZQNUA8I71k6OnyekbMZGwDnSk3h/tK0eCZfFROzlwAjC6qmKNn5 teCt58W3gHfw1ipiBeQamMv97OG8a1VgO9FGouE3B2j1G4o7bdBunEkgTNJ5BZVhuySk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4aI-0004MU-KO for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4aI-0006ZE-Ik for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: write qemu arguments into separate xenstore keys Message-Id: Date: Tue, 19 May 2020 15:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dabc571b7292c3cdd51734b709a663eaa45345a1 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:51 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:08 2020 +0100 libxl: write qemu arguments into separate xenstore keys This allows using arguments with spaces, like -append, without nominating any special "separator" character. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Write arguments in dm-argv directory instead of overloading mini-os's dmargs string. Make libxl__write_stub_dmargs vary behaviour based on the is_linux_stubdom flag. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 77 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8e57cd8c1f..23b13f84d2 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2068,13 +2068,11 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, static int libxl__write_stub_dmargs(libxl__gc *gc, int dm_domid, int guest_domid, - char **args) + char **args, bool is_linux_stubdom) { - int i; - char *dmargs; - int dmargs_size; struct xs_permissions roperm[2]; xs_transaction_t t = XBT_NULL; + char *dmargs; int rc; roperm[0].id = 0; @@ -2082,22 +2080,27 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, roperm[1].id = dm_domid; roperm[1].perms = XS_PERM_READ; - i = 0; - dmargs_size = 0; - while (args[i] != NULL) { - dmargs_size = dmargs_size + strlen(args[i]) + 1; - i++; - } - dmargs_size++; - dmargs = (char *) libxl__malloc(gc, dmargs_size); - i = 1; - dmargs[0] = '\0'; - while (args[i] != NULL) { - if (strcmp(args[i], "-sdl") && strcmp(args[i], "-M") && strcmp(args[i], "xenfv")) { - strcat(dmargs, " "); - strcat(dmargs, args[i]); + if (!is_linux_stubdom) { + int dmargs_size = 0; + int i = 0; + + while (args[i] != NULL) { + dmargs_size = dmargs_size + strlen(args[i]) + 1; + i++; + } + + dmargs_size++; + dmargs = (char *) libxl__malloc(gc, dmargs_size); + + i = 1; + dmargs[0] = '\0'; + while (args[i] != NULL) { + if (strcmp(args[i], "-sdl") && strcmp(args[i], "-M") && strcmp(args[i], "xenfv")) { + strcat(dmargs, " "); + strcat(dmargs, args[i]); + } + i++; } - i++; } for (;;) { @@ -2113,17 +2116,33 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, &vm_path); if (rc) goto out; - path = GCSPRINTF("%s/image/dmargs", vm_path); + if (is_linux_stubdom) { + int i; - rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); - if (rc) goto out; + path = GCSPRINTF("%s/image/dm-argv", vm_path); - rc = libxl__xs_write_checked(gc, t, path, dmargs); - if (rc) goto out; + rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; - rc = libxl__xs_mknod(gc, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), - roperm, ARRAY_SIZE(roperm)); - if (rc) goto out; + for (i=1; args[i] != NULL; i++) { + rc = libxl__xs_write_checked(gc, t, + GCSPRINTF("%s/%03d", path, i), + args[i]); + if (rc) goto out; + } + } else { + path = GCSPRINTF("%s/image/dmargs", vm_path); + + rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + + rc = libxl__xs_write_checked(gc, t, path, dmargs); + if (rc) goto out; + + rc = libxl__xs_mknod(gc, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), + roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + } rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; @@ -2298,7 +2317,9 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) libxl__store_libxl_entry(gc, guest_domid, "dm-version", libxl_device_model_version_to_string(dm_config->b_info.device_model_version)); - libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); + + libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args, + libxl__stubdomain_is_linux(&guest_config->b_info)); libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/image/device-model-domid", libxl__xs_get_dompath(gc, guest_domid)), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4aU-0003oy-V1; Tue, 19 May 2020 15:55:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4aU-0003oo-3o for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:26 +0000 X-Inumbo-ID: 26f2cafc-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 26f2cafc-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bztJIQ1Vn4eHhG8nkywwppjsxugPVYU0oAyRxnmSC+o=; b=LiPg0LPYMlaS0W5C9+K/UfWbIe Ez2J8FvCjQaM315XW3XIkaN4YmJaJarJ8JdI/UzJxpdLE6Jh6zuEYkfq5nphcfNwFINgc73fiPU9h QJDDcGLKIe0110GlfVyxLEVRupY1asmVmDoOWxHg33zKx5oR8hS5+5/NfX8OmpLbR0j8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4aS-0004Md-Ng for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4aS-0006a3-MQ for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xl: add stubdomain related options to xl config parser Message-Id: Date: Tue, 19 May 2020 15:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f76a0fa109ab48ec6e910bce3b45804ef6f0915d Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:52 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 xl: add stubdomain related options to xl config parser Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/man/xl.cfg.5.pod.in | 27 +++++++++++++++++++++++---- tools/xl/xl_parse.c | 7 +++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 0e9e58a41a..c9bc181a95 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2733,10 +2733,29 @@ model which they were installed with. =item B -Override the path to the binary to be used as the device-model. The -binary provided here MUST be consistent with the -B which you have specified. You should not -normally need to specify this option. +Override the path to the binary to be used as the device-model running in +toolstack domain. The binary provided here MUST be consistent with the +B which you have specified. You should not normally need +to specify this option. + +=item B + +Override the path to the kernel image used as device-model stubdomain. +The binary provided here MUST be consistent with the +B which you have specified. +In case of B it is expected to be MiniOS-based stubdomain +image, in case of B it is expected to be Linux-based stubdomain +kernel. + +=item B + +Override the path to the ramdisk image used as device-model stubdomain. +The binary provided here is to be used by a kernel pointed by B. +It is known to be used only by Linux-based stubdomain kernel. + +=item B + +Start the stubdomain with MBYTES megabytes of RAM. Default is 128. =item B diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 4450d59f16..61b4ef7b7e 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2525,6 +2525,13 @@ skip_usbdev: xlu_cfg_replace_string(config, "device_model_user", &b_info->device_model_user, 0); + xlu_cfg_replace_string (config, "stubdomain_kernel", + &b_info->stubdomain_kernel, 0); + xlu_cfg_replace_string (config, "stubdomain_ramdisk", + &b_info->stubdomain_ramdisk, 0); + if (!xlu_cfg_get_long (config, "stubdomain_memory", &l, 0)) + b_info->stubdomain_memkb = l * 1024; + #define parse_extra_args(type) \ e = xlu_cfg_get_list_as_string_list(config, "device_model_args"#type, \ &b_info->extra##type, 0); \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:55:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:55:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4af-0003q9-0K; Tue, 19 May 2020 15:55:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4ae-0003q2-0Q for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:36 +0000 X-Inumbo-ID: 2cf3d25c-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2cf3d25c-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=to745fRUUuxs7FeMUv9O7ptuWRmKV0T2BvZHAC/Fvsg=; b=0kQIiaagePH5G8O5bvFB2z2a7+ RWbQVYADaXXPALiaGXcByS3J42Hpwtbg1n36MoIcpecH9JA3kofpma4NqYqy1tDkTcIy2/okObktJ xVi+XPfHI24oXRNGnMLFR78od0+/tAdzazLuuQIBImJBtKFbpXBB7L1cQiVlaHYL+j4o=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4ac-0004Mm-QT for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4ac-0006aZ-PT for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libvchan: notify server when client is connected Message-Id: Date: Tue, 19 May 2020 15:55:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dae844977e1e10dc859ec21612f1811ca5d5f128 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:53 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 tools/libvchan: notify server when client is connected Let the server know when the client is connected. Otherwise server will notice only when client send some data. This change does not break existing clients, as libvchan user should handle spurious notifications anyway (for example acknowledge of remote side reading the data). Cc: Daniel De Graaf Signed-off-by: Marek Marczykowski-Górecki Replace spaces with tabs to match the file's whitespace. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libvchan/init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index 180833dc2f..ad4b64fbe3 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -447,6 +447,9 @@ struct libxenvchan *libxenvchan_client_init(struct xentoollog_logger *logger, ctrl->ring->cli_live = 1; ctrl->ring->srv_notify = VCHAN_NOTIFY_WRITE; + /* wake up the server */ + xenevtchn_notify(ctrl->event, ctrl->event_port); + out: if (xs) xs_daemon_close(xs); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:55:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4ap-0003rI-1y; Tue, 19 May 2020 15:55:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4an-0003r8-Nw for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:45 +0000 X-Inumbo-ID: 32fa5446-99e9-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 32fa5446-99e9-11ea-9887-bc764e2007e4; Tue, 19 May 2020 15:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=c3FVkiR2DJqXi/vtjBUzzC69t6lnU3OV1T3S03W8X58=; b=UCckRpt5dQBUcvKoKjjAbSbQDc kL6iDB+XoWN3mns2Zw7zkvb/Eso/LDFxmsbmFPiHtx0qpLI3E0hBOaOI8KBjez9mHPjQwS70+Szag QxkXZzZEQ2siQgyu6JhxTkDkEOOuU5ta1Y/lKMAww+dFi9BxlgKjNmMhfrMGX9+W4kks=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4am-0004NP-Ty for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4am-0006bM-SY for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: add save/restore support for qemu-xen in stubdomain Message-Id: Date: Tue, 19 May 2020 15:55:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 449901fc966613c1829d92570df237d4d904cdf5 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:54 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: add save/restore support for qemu-xen in stubdomain Rely on a wrapper script in stubdomain to attach relevant consoles to qemu. The save console (1) must be attached to fdset/1. When performing a restore, $STUBDOM_RESTORE_INCOMING_ARG must be replaced on the qemu command line by "fd:$FD", where $FD is an open file descriptor number to the restore console (2). Signed-off-by: Marek Marczykowski-Górecki Address TODO in dm_state_save_to_fdset: Only remove savefile for non-stubdom. Use $STUBDOM_RESTORE_INCOMING_ARG instead of fd:3 and update commit message. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 25 +++++++++++++------------ tools/libxl/libxl_qmp.c | 27 +++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 23b13f84d2..62d0d46c98 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1745,10 +1745,19 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, } if (state->saved_state) { - /* This file descriptor is meant to be used by QEMU */ - *dm_state_fd = open(state->saved_state, O_RDONLY); - flexarray_append(dm_args, "-incoming"); - flexarray_append(dm_args, GCSPRINTF("fd:%d",*dm_state_fd)); + if (is_stubdom) { + /* Linux stubdomain must replace $STUBDOM_RESTORE_INCOMING_ARG + * with the approriate fd:$num argument for the + * STUBDOM_CONSOLE_RESTORE console 2. + */ + flexarray_append(dm_args, "-incoming"); + flexarray_append(dm_args, "$STUBDOM_RESTORE_INCOMING_ARG"); + } else { + /* This file descriptor is meant to be used by QEMU */ + *dm_state_fd = open(state->saved_state, O_RDONLY); + flexarray_append(dm_args, "-incoming"); + flexarray_append(dm_args, GCSPRINTF("fd:%d",*dm_state_fd)); + } } for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) flexarray_append(dm_args, b_info->extra[i]); @@ -2227,14 +2236,6 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) assert(libxl_defbool_val(guest_config->b_info.device_model_stubdomain)); - if (libxl__stubdomain_is_linux(&guest_config->b_info)) { - if (d_state->saved_state) { - LOG(ERROR, "Save/Restore not supported yet with Linux Stubdom."); - ret = -1; - goto out; - } - } - sdss->pvqemu.guest_domid = INVALID_DOMID; libxl_domain_create_info_init(&dm_config->c_info); diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index efaba91086..c394000ea9 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -962,6 +962,7 @@ static void dm_stopped(libxl__egc *egc, libxl__ev_qmp *ev, const libxl__json_object *response, int rc); static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, const libxl__json_object *response, int rc); +static void dm_state_save_to_fdset(libxl__egc *egc, libxl__ev_qmp *ev, int fdset); static void dm_state_saved(libxl__egc *egc, libxl__ev_qmp *ev, const libxl__json_object *response, int rc); @@ -994,10 +995,17 @@ static void dm_stopped(libxl__egc *egc, libxl__ev_qmp *ev, EGC_GC; libxl__domain_suspend_state *dsps = CONTAINER_OF(ev, *dsps, qmp); const char *const filename = dsps->dm_savefile; + uint32_t dm_domid = libxl_get_stubdom_id(CTX, dsps->domid); if (rc) goto error; + if (dm_domid) { + /* see Linux stubdom interface in docs/stubdom.txt */ + dm_state_save_to_fdset(egc, ev, 1); + return; + } + ev->payload_fd = open(filename, O_WRONLY | O_CREAT, 0600); if (ev->payload_fd < 0) { LOGED(ERROR, ev->domid, @@ -1028,7 +1036,6 @@ static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, EGC_GC; int fdset; const libxl__json_object *o; - libxl__json_object *args = NULL; libxl__domain_suspend_state *dsps = CONTAINER_OF(ev, *dsps, qmp); close(ev->payload_fd); @@ -1043,6 +1050,21 @@ static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, goto error; } fdset = libxl__json_object_get_integer(o); + dm_state_save_to_fdset(egc, ev, fdset); + return; + +error: + assert(rc); + libxl__remove_file(gc, dsps->dm_savefile); + dsps->callback_device_model_done(egc, dsps, rc); +} + +static void dm_state_save_to_fdset(libxl__egc *egc, libxl__ev_qmp *ev, int fdset) +{ + EGC_GC; + int rc; + libxl__json_object *args = NULL; + libxl__domain_suspend_state *dsps = CONTAINER_OF(ev, *dsps, qmp); ev->callback = dm_state_saved; @@ -1060,7 +1082,8 @@ static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, error: assert(rc); - libxl__remove_file(gc, dsps->dm_savefile); + if (!libxl_get_stubdom_id(CTX, dsps->domid)) + libxl__remove_file(gc, dsps->dm_savefile); dsps->callback_device_model_done(egc, dsps, rc); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:55:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:55:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4az-0003sW-4r; Tue, 19 May 2020 15:55:57 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4ay-0003sL-3s for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:56 +0000 X-Inumbo-ID: 38fcc9a0-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 38fcc9a0-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:55:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oXr9YKesJ/QY9OCv3jySqgsY4N9nP4ySStp8jqA57GM=; b=AiaBtY+pmAXzjoUP1Rfd4Vc8Rw 6tWgY1Tqm44EksGhzTadPvB1Q5LWub9C+woleR8GRjvUECbtBVog9IfiB1c7ugWOm3x9/Chgf5qmt z+u1G56IC1l2Ip1pntxrJ+t4Szmgk/6SaQ2L0e8pImp4kmM2g71+bd4UqQWxuoVzjGWo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4ax-0004Nb-0Z for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4aw-0006c3-Vj for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:55:54 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools: add missing libxenvchan cflags Message-Id: Date: Tue, 19 May 2020 15:55:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7f6bce6386824a6c69ea852cfa40673b0350f4d1 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:55 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 tools: add missing libxenvchan cflags libxenvchan.h include xenevtchn.h and xengnttab.h, so applications built with it needs applicable -I in CFLAGS too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/Rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 5b8cf748ad..59c72e7a88 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -157,7 +157,7 @@ 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) +CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) SHDEPS_libxenvchan = $(SHLIB_libxentoollog) $(SHLIB_libxenstore) $(SHLIB_libxenevtchn) $(SHLIB_libxengnttab) LDLIBS_libxenvchan = $(SHDEPS_libxenvchan) $(XEN_LIBVCHAN)/libxenvchan$(libextension) SHLIB_libxenvchan = $(SHDEPS_libxenvchan) -Wl,-rpath-link=$(XEN_LIBVCHAN) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:56:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:56:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bA-0003tj-6X; Tue, 19 May 2020 15:56:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4b8-0003tY-FY for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:06 +0000 X-Inumbo-ID: 3f01e7e0-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3f01e7e0-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:56:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+lDQIe3a97s0343wDGHxfxFQRZkU4ZxZbBWLrlaalAY=; b=YkhrG+512qXF5UO6bciG8v4UAC 3ZqzcSUGDkgFCL5bBXmjDSkSQyRLn895QWGqCTJ93stnRdIedXKELHJIXkDogqk1bKBDYrZLWe2Wz UECgGrHlZBQzZS1I/5vdxgDrTA+yYppSHkr6u7yemUAGlfH/xab7lN6cWYpRGWZW9748=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4b7-0004Nx-3Z for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4b7-0006ck-2M for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools: add simple vchan-socket-proxy Message-Id: Date: Tue, 19 May 2020 15:56:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 14fe3ace50c3853670370d8b8ff93b066420a5e0 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:56 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 tools: add simple vchan-socket-proxy Add a simple proxy for tunneling socket connection over vchan. This is based on existing vchan-node* applications, but extended with socket support. vchan-socket-proxy serves both as a client and as a server, depending on parameters. It can be used to transparently communicate with an application in another domian that normally expose UNIX socket interface. Specifically, it's written to communicate with qemu running within stubdom. Server mode listens for vchan connections and when one is opened, connects to a pointed UNIX socket. Client mode listens on UNIX socket and when someone connects, opens a vchan connection. Only a single connection at a time is supported. Additionally, socket can be provided as a number - in which case it's interpreted as already open FD (in case of UNIX listening socket - listen() needs to be already called). Or "-" meaning stdin/stdout - in which case it is reduced to vchan-node2 functionality. Example usage: 1. (in dom0) vchan-socket-proxy --mode=client /local/domain//data/vchan/1234 /run/qemu.(DOMID) 2. (in DOMID) vchan-socket-proxy --mode=server 0 /local/domain//data/vchan/1234 /run/qemu.(DOMID) This will listen on /run/qemu.(DOMID) in dom0 and whenever connection is made, it will connect to DOMID, where server process will connect to /run/qemu.(DOMID) there. When client disconnects, vchan connection is terminated and server vchan-socket-proxy process also disconnects from qemu. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- .gitignore | 1 + tools/libvchan/Makefile | 8 +- tools/libvchan/vchan-socket-proxy.c | 478 ++++++++++++++++++++++++++++++++++++ 3 files changed, 486 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bfa53723b3..7418ce9829 100644 --- a/.gitignore +++ b/.gitignore @@ -369,6 +369,7 @@ tools/misc/xenwatchdogd tools/misc/xen-hvmcrash tools/misc/xen-lowmemd tools/libvchan/vchan-node[12] +tools/libvchan/vchan-socket-proxy tools/ocaml/*/.ocamldep.make tools/ocaml/*/*.cm[ixao] tools/ocaml/*/*.cmxa diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile index 7892750c3e..913bcc8884 100644 --- a/tools/libvchan/Makefile +++ b/tools/libvchan/Makefile @@ -13,6 +13,7 @@ LIBVCHAN_PIC_OBJS = $(patsubst %.o,%.opic,$(LIBVCHAN_OBJS)) LIBVCHAN_LIBS = $(LDLIBS_libxenstore) $(LDLIBS_libxengnttab) $(LDLIBS_libxenevtchn) $(LIBVCHAN_OBJS) $(LIBVCHAN_PIC_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) $(NODE_OBJS) $(NODE2_OBJS): CFLAGS += $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) +vchan-socket-proxy.o: CFLAGS += $(CFLAGS_libxenstore) $(CFLAGS_libxenctrl) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) MAJOR = 4.14 MINOR = 0 @@ -39,7 +40,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL = $(CFLAGS_xeninclude) .PHONY: all -all: libxenvchan.so vchan-node1 vchan-node2 libxenvchan.a $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) +all: libxenvchan.so vchan-node1 vchan-node2 vchan-socket-proxy libxenvchan.a $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxenvchan.so: libxenvchan.so.$(MAJOR) ln -sf $< $@ @@ -59,13 +60,18 @@ vchan-node1: $(NODE_OBJS) libxenvchan.so vchan-node2: $(NODE2_OBJS) libxenvchan.so $(CC) $(LDFLAGS) -o $@ $(NODE2_OBJS) $(LDLIBS_libxenvchan) $(APPEND_LDFLAGS) +vchan-socket-proxy: vchan-socket-proxy.o libxenvchan.so + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenvchan) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenvchan.so.$(MAJOR) ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenvchan.so + $(INSTALL_PROG) vchan-socket-proxy $(DESTDIR)$(bindir) $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir) $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(libdir) $(INSTALL_DATA) xenvchan.pc $(DESTDIR)$(PKG_INSTALLDIR) diff --git a/tools/libvchan/vchan-socket-proxy.c b/tools/libvchan/vchan-socket-proxy.c new file mode 100644 index 0000000000..13700c5d67 --- /dev/null +++ b/tools/libvchan/vchan-socket-proxy.c @@ -0,0 +1,478 @@ +/** + * @file + * @section AUTHORS + * + * Copyright (C) 2010 Rafal Wojtczuk + * + * Authors: + * Rafal Wojtczuk + * Daniel De Graaf + * Marek Marczykowski-Górecki + * + * @section LICENSE + * + * This program 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; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; If not, see . + * + * @section DESCRIPTION + * + * This is a vchan to unix socket proxy. Vchan server is set, and on client + * connection, local socket connection is established. Communication is bidirectional. + * One client is served at a time, clients needs to coordinate this themselves. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +static void usage(char** argv) +{ + fprintf(stderr, "usage:\n" + "\t%s [options] domainid nodepath [socket-path|file-no|-]\n" + "\n" + "options:\n" + "\t-m, --mode=client|server - vchan connection mode (client by default)\n" + "\t-s, --state-path=path - xenstore path where write \"running\" to \n" + "\t at startup\n" + "\t-v, --verbose - verbose logging\n" + "\n" + "client: client of a vchan connection, fourth parameter can be:\n" + "\tsocket-path: listen on a UNIX socket at this path and connect to vchan\n" + "\t whenever new connection is accepted;\n" + "\t handle multiple _subsequent_ connections, until terminated\n" + "\n" + "\tfile-no: except open FD of a socket in listen mode;\n" + "\t otherwise similar to socket-path\n" + "\n" + "\t-: open vchan connection immediately and pass the data\n" + "\t from stdin/stdout; terminate when vchan connection\n" + "\t is closed\n" + "\n" + "server: server of a vchan connection, fourth parameter can be:\n" + "\tsocket-path: connect to this UNIX socket when new vchan connection\n" + "\t is accepted;\n" + "\t handle multiple _subsequent_ connections, until terminated\n" + "\n" + "\tfile-no: pass data to/from this FD; terminate when vchan connection\n" + "\t is closed\n" + "\n" + "\t-: pass data to/from stdin/stdout; terminate when vchan\n" + "\t connection is closed\n", + argv[0]); + exit(1); +} + +#define BUFSIZE 8192 +char inbuf[BUFSIZE]; +char outbuf[BUFSIZE]; +int insiz = 0; +int outsiz = 0; +int verbose = 0; + +static void vchan_wr(struct libxenvchan *ctrl) { + int ret; + + if (!insiz) + return; + ret = libxenvchan_write(ctrl, inbuf, insiz); + if (ret < 0) { + fprintf(stderr, "vchan write failed\n"); + exit(1); + } + if (verbose) + fprintf(stderr, "wrote %d bytes to vchan\n", ret); + if (ret > 0) { + insiz -= ret; + memmove(inbuf, inbuf + ret, insiz); + } +} + +static void socket_wr(int output_fd) { + int ret; + + if (!outsiz) + return; + ret = write(output_fd, outbuf, outsiz); + if (ret < 0 && errno != EAGAIN) + exit(1); + if (ret > 0) { + outsiz -= ret; + memmove(outbuf, outbuf + ret, outsiz); + } +} + +static int set_nonblocking(int fd, int nonblocking) { + int flags = fcntl(fd, F_GETFL); + if (flags == -1) + return -1; + + if (nonblocking) + flags |= O_NONBLOCK; + else + flags &= ~O_NONBLOCK; + + if (fcntl(fd, F_SETFL, flags) == -1) + return -1; + + return 0; +} + +static int connect_socket(const char *path_or_fd) { + int fd; + char *endptr; + struct sockaddr_un addr; + + fd = strtoll(path_or_fd, &endptr, 0); + if (*endptr == '\0') { + set_nonblocking(fd, 1); + return fd; + } + + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd == -1) + return -1; + + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path_or_fd, sizeof(addr.sun_path)); + if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == -1) { + close(fd); + return -1; + } + + set_nonblocking(fd, 1); + + return fd; +} + +static int listen_socket(const char *path_or_fd) { + int fd; + char *endptr; + struct sockaddr_un addr; + + fd = strtoll(path_or_fd, &endptr, 0); + if (*endptr == '\0') { + return fd; + } + + /* if not a number, assume a socket path */ + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd == -1) + return -1; + + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path_or_fd, sizeof(addr.sun_path)); + if (bind(fd, (const struct sockaddr *)&addr, sizeof(addr)) == -1) { + close(fd); + return -1; + } + if (listen(fd, 5) != 0) { + close(fd); + return -1; + } + + return fd; +} + +static struct libxenvchan *connect_vchan(int domid, const char *path) { + struct libxenvchan *ctrl = NULL; + struct xs_handle *xs = NULL; + xc_interface *xc = NULL; + xc_dominfo_t dominfo; + char **watch_ret; + unsigned int watch_num; + int ret; + + xs = xs_open(XS_OPEN_READONLY); + if (!xs) { + perror("xs_open"); + goto out; + } + xc = xc_interface_open(NULL, NULL, XC_OPENFLAG_NON_REENTRANT); + if (!xc) { + perror("xc_interface_open"); + goto out; + } + /* wait for vchan server to create *path* */ + xs_watch(xs, path, "path"); + xs_watch(xs, "@releaseDomain", "release"); + while ((watch_ret = xs_read_watch(xs, &watch_num))) { + /* don't care about exact which fired the watch */ + free(watch_ret); + ctrl = libxenvchan_client_init(NULL, domid, path); + if (ctrl) + break; + + ret = xc_domain_getinfo(xc, domid, 1, &dominfo); + /* break the loop if domain is definitely not there anymore, but + * continue if it is or the call failed (like EPERM) */ + if (ret == -1 && errno == ESRCH) + break; + if (ret == 1 && (dominfo.domid != (uint32_t)domid || dominfo.dying)) + break; + } + +out: + if (xc) + xc_interface_close(xc); + if (xs) + xs_close(xs); + return ctrl; +} + + +static void discard_buffers(struct libxenvchan *ctrl) { + /* discard local buffers */ + insiz = 0; + outsiz = 0; + + /* discard remaining incoming data */ + while (libxenvchan_data_ready(ctrl)) { + if (libxenvchan_read(ctrl, inbuf, BUFSIZE) == -1) { + perror("vchan read"); + exit(1); + } + } +} + +int data_loop(struct libxenvchan *ctrl, int input_fd, int output_fd) +{ + int ret; + int libxenvchan_fd; + int max_fd; + + libxenvchan_fd = libxenvchan_fd_for_select(ctrl); + for (;;) { + fd_set rfds; + fd_set wfds; + FD_ZERO(&rfds); + FD_ZERO(&wfds); + + max_fd = -1; + if (input_fd != -1 && insiz != BUFSIZE) { + FD_SET(input_fd, &rfds); + if (input_fd > max_fd) + max_fd = input_fd; + } + if (output_fd != -1 && outsiz) { + FD_SET(output_fd, &wfds); + if (output_fd > max_fd) + max_fd = output_fd; + } + FD_SET(libxenvchan_fd, &rfds); + if (libxenvchan_fd > max_fd) + max_fd = libxenvchan_fd; + ret = select(max_fd + 1, &rfds, &wfds, NULL, NULL); + if (ret < 0) { + perror("select"); + exit(1); + } + if (FD_ISSET(libxenvchan_fd, &rfds)) { + libxenvchan_wait(ctrl); + if (!libxenvchan_is_open(ctrl)) { + if (verbose) + fprintf(stderr, "vchan client disconnected\n"); + while (outsiz) + socket_wr(output_fd); + close(output_fd); + close(input_fd); + discard_buffers(ctrl); + break; + } + vchan_wr(ctrl); + } + + if (FD_ISSET(input_fd, &rfds)) { + ret = read(input_fd, inbuf + insiz, BUFSIZE - insiz); + if (ret < 0 && errno != EAGAIN) + exit(1); + if (verbose) + fprintf(stderr, "from-unix: %.*s\n", ret, inbuf + insiz); + if (ret == 0) { + /* EOF on socket, write everything in the buffer and close the + * input_fd socket */ + while (insiz) { + vchan_wr(ctrl); + libxenvchan_wait(ctrl); + } + close(input_fd); + input_fd = -1; + /* TODO: maybe signal the vchan client somehow? */ + break; + } + if (ret) + insiz += ret; + vchan_wr(ctrl); + } + if (FD_ISSET(output_fd, &wfds)) + socket_wr(output_fd); + while (libxenvchan_data_ready(ctrl) && outsiz < BUFSIZE) { + ret = libxenvchan_read(ctrl, outbuf + outsiz, BUFSIZE - outsiz); + if (ret < 0) + exit(1); + if (verbose) + fprintf(stderr, "from-vchan: %.*s\n", ret, outbuf + outsiz); + outsiz += ret; + socket_wr(output_fd); + } + } + return 0; +} + +/** + Simple libxenvchan application, both client and server. + Both sides may write and read, both from the libxenvchan and from + stdin/stdout (just like netcat). +*/ + +static struct option options[] = { + { "mode", required_argument, NULL, 'm' }, + { "verbose", no_argument, NULL, 'v' }, + { "state-path", required_argument, NULL, 's' }, + { } +}; + +int main(int argc, char **argv) +{ + int is_server = 0; + int socket_fd = -1; + int input_fd, output_fd; + struct libxenvchan *ctrl = NULL; + const char *socket_path; + int domid; + const char *vchan_path; + const char *state_path = NULL; + int opt; + + while ((opt = getopt_long(argc, argv, "m:vs:", options, NULL)) != -1) { + switch (opt) { + case 'm': + if (strcmp(optarg, "server") == 0) + is_server = 1; + else if (strcmp(optarg, "client") == 0) + is_server = 0; + else { + fprintf(stderr, "invalid argument for --mode: %s\n", optarg); + usage(argv); + return 1; + } + break; + case 'v': + verbose = 1; + break; + case 's': + state_path = optarg; + break; + case '?': + usage(argv); + } + } + + if (argc-optind != 3) + usage(argv); + + domid = atoi(argv[optind]); + vchan_path = argv[optind+1]; + socket_path = argv[optind+2]; + + if (is_server) { + ctrl = libxenvchan_server_init(NULL, domid, vchan_path, 0, 0); + if (!ctrl) { + perror("libxenvchan_server_init"); + exit(1); + } + } else { + if (strcmp(socket_path, "-") == 0) { + input_fd = 0; + output_fd = 1; + } else { + socket_fd = listen_socket(socket_path); + if (socket_fd == -1) { + perror("listen socket"); + return 1; + } + } + } + + if (state_path) { + struct xs_handle *xs; + + xs = xs_open(0); + if (!xs) { + perror("xs_open"); + return 1; + } + if (!xs_write(xs, XBT_NULL, state_path, "running", strlen("running"))) { + perror("xs_write"); + return 1; + } + xs_close(xs); + } + + for (;;) { + if (is_server) { + /* wait for vchan connection */ + while (libxenvchan_is_open(ctrl) != 1) + libxenvchan_wait(ctrl); + /* vchan client connected, setup local FD if needed */ + if (strcmp(socket_path, "-") == 0) { + input_fd = 0; + output_fd = 1; + } else { + input_fd = output_fd = connect_socket(socket_path); + } + if (input_fd == -1) { + perror("connect socket"); + return 1; + } + if (data_loop(ctrl, input_fd, output_fd) != 0) + break; + /* keep it running only when get UNIX socket path */ + if (socket_path[0] != '/') + break; + } else { + /* wait for local socket connection */ + if (strcmp(socket_path, "-") != 0) + input_fd = output_fd = accept(socket_fd, NULL, NULL); + if (input_fd == -1) { + perror("accept"); + return 1; + } + set_nonblocking(input_fd, 1); + set_nonblocking(output_fd, 1); + ctrl = connect_vchan(domid, vchan_path); + if (!ctrl) { + perror("vchan client init"); + return 1; + } + if (data_loop(ctrl, input_fd, output_fd) != 0) + break; + /* don't reconnect if output was stdout */ + if (strcmp(socket_path, "-") == 0) + break; + + libxenvchan_close(ctrl); + ctrl = NULL; + } + } + return 0; +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:56:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:56:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bJ-0003ug-8B; Tue, 19 May 2020 15:56:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bI-0003uV-1Q for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:16 +0000 X-Inumbo-ID: 4507e310-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4507e310-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:56:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2p2M7VztcFoB0GBbKRUUsCuJOjthsE40TwqsDpTXG0E=; b=c9ct/Qww50vtbG7cZ+pFlAeK7Q MQZStD9f++A5UDSWJ6T5Dxd3O7CHbVmtJQspdu+AhPaAVZtiS1WfXCdiLLdjFn5GNlq83zLyx9201 YcN+k34kt7gzApxp0rOsO2NwJykrfHiNVASJCSYLInQY28RDgMpC/qbJYmDePKgSUaZ4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bH-0004O7-76 for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4bH-0006f5-5q for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: Refactor kill_device_model to libxl__kill_xs_path Message-Id: Date: Tue, 19 May 2020 15:56:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 379ab27086be37fbb8d23c4e001e33e05dc18b2e Author: Jason Andryuk AuthorDate: Mon May 18 21:54:57 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: Refactor kill_device_model to libxl__kill_xs_path Move kill_device_model to libxl__kill_xs_path so we have a helper to kill a process from a pid stored in xenstore. We'll be using it to kill vchan-qmp-proxy. libxl__kill_xs_path takes a "what" string for use in printing error messages. kill_device_model is retained in libxl_dm.c to provide the string. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_aoutils.c | 32 ++++++++++++++++++++++++++++++++ tools/libxl/libxl_dm.c | 27 +-------------------------- tools/libxl/libxl_internal.h | 3 +++ 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 1be858c93c..c4c095a5ba 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -626,6 +626,38 @@ void libxl__kill(libxl__gc *gc, pid_t pid, int sig, const char *what) what, (unsigned long)pid, sig); } +/* Generic function to signal (HUP) a pid stored in xenstore */ +int libxl__kill_xs_path(libxl__gc *gc, const char *xs_path_pid, + const char *what) +{ + const char *xs_pid; + int ret, pid; + + ret = libxl__xs_read_checked(gc, XBT_NULL, xs_path_pid, &xs_pid); + if (ret || !xs_pid) { + LOG(ERROR, "unable to find %s pid in %s", what, xs_path_pid); + ret = ret ? : ERROR_FAIL; + goto out; + } + pid = atoi(xs_pid); + + ret = kill(pid, SIGHUP); + if (ret < 0 && errno == ESRCH) { + LOG(ERROR, "%s already exited", what); + ret = 0; + } else if (ret == 0) { + LOG(DEBUG, "%s signaled", what); + ret = 0; + } else { + LOGE(ERROR, "failed to kill %s [%d]", what, pid); + ret = ERROR_FAIL; + goto out; + } + +out: + return ret; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 62d0d46c98..6829b4bdb5 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -3225,32 +3225,7 @@ out: /* Generic function to signal a Qemu instance to exit */ static int kill_device_model(libxl__gc *gc, const char *xs_path_pid) { - const char *xs_pid; - int ret, pid; - - ret = libxl__xs_read_checked(gc, XBT_NULL, xs_path_pid, &xs_pid); - if (ret || !xs_pid) { - LOG(ERROR, "unable to find device model pid in %s", xs_path_pid); - ret = ret ? : ERROR_FAIL; - goto out; - } - pid = atoi(xs_pid); - - ret = kill(pid, SIGHUP); - if (ret < 0 && errno == ESRCH) { - LOG(ERROR, "Device Model already exited"); - ret = 0; - } else if (ret == 0) { - LOG(DEBUG, "Device Model signaled"); - ret = 0; - } else { - LOGE(ERROR, "failed to kill Device Model [%d]", pid); - ret = ERROR_FAIL; - goto out; - } - -out: - return ret; + return libxl__kill_xs_path(gc, xs_path_pid, "Device Model"); } /* Helper to destroy a Qdisk backend */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f2f76439ec..c939557b2e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2711,6 +2711,9 @@ int libxl__async_exec_start(libxl__async_exec_state *aes); bool libxl__async_exec_inuse(const libxl__async_exec_state *aes); _hidden void libxl__kill(libxl__gc *gc, pid_t pid, int sig, const char *what); +/* kill SIGHUP a pid stored in xenstore */ +_hidden int libxl__kill_xs_path(libxl__gc *gc, const char *xs_path_pid, + const char *what); /*----- device addition/removal -----*/ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:56:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:56:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bU-0003wp-BH; Tue, 19 May 2020 15:56:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bT-0003wf-53 for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:27 +0000 X-Inumbo-ID: 4b12f3ee-99e9-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4b12f3ee-99e9-11ea-b07b-bc764e2007e4; Tue, 19 May 2020 15:56:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WHDuq6AOHRT6Mp5a+sbB79FSL8ws3OSZM6d7bJmRZZY=; b=lSJcrMUD3tyn63MLU5qr+qa7oq pErcUkLITdUFSGK5VEED8TJwfAEhzOYodPqFx9vNqN4TVCjt1toeoa75yjw0lECWDKiHulxioXvJU G/KNUKGIn4iiiezAvj2/Ll1d7Cqf6eC+P1cZB5Kn8gznSQXidG1E4r32kuWAyvgb9GJU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bR-0004OK-Bc for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4bR-0006g4-AX for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: use vchan for QMP access with Linux stubdomain Message-Id: Date: Tue, 19 May 2020 15:56:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 83c845033dc8bb3a35ae245effb7832b6823174a Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:58 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: use vchan for QMP access with Linux stubdomain Access to QMP of QEMU in Linux stubdomain is possible over vchan connection. Handle the actual vchan connection in a separate process (vchan-socket-proxy). This simplified integration with QMP (already quite complex), but also allows preliminary filtering of (potentially malicious) QMP input. Since only one client can be connected to vchan server at the same time and it is not enforced by the libxenvchan itself, additional client-side locking is needed. It is implicitly implemented by vchan-socket-proxy, as it handle only one connection at a time. Note that qemu supports only one simultaneous client on a control socket anyway (but in UNIX socket case, it enforce it server-side), so it doesn't add any extra limitation. libxl qmp client code already has locking to handle concurrent access attempts to the same qemu qmp interface. Signed-off-by: Marek Marczykowski-Górecki Squash in changes of regenerated autotools files. Kill the vchan-socket-proxy so we don't leak the daemonized processes. libxl__stubdomain_is_linux_running() works against the guest_domid, but the xenstore path is beneath the stubdomain. This leads to the use of libxl_is_stubdom in addition to libxl__stubdomain_is_linux_running() so that the stubdomain calls kill for the qmp-proxy. Also call libxl__qmp_cleanup() to remove the unix sockets used by vchan-socket-proxy. vchan-socket-proxy only creates qmp-libxl-$domid, and libxl__qmp_cleanup removes that as well as qmp-libxenstat-$domid. However, it tolerates ENOENT, and a stray qmp-libxenstat-$domid should not exist. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- configure | 14 +--- docs/configure | 14 +--- stubdom/configure | 14 +--- tools/config.h.in | 3 + tools/configure | 46 +++++++----- tools/configure.ac | 9 +++ tools/libxl/libxl_dm.c | 163 ++++++++++++++++++++++++++++++++++++++++--- tools/libxl/libxl_domain.c | 10 +++ tools/libxl/libxl_internal.h | 1 + 9 files changed, 209 insertions(+), 65 deletions(-) diff --git a/configure b/configure index 9da3970cef..8af54e8a5a 100755 --- a/configure +++ b/configure @@ -644,7 +644,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -723,7 +722,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -976,15 +974,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1122,7 +1111,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1275,7 +1264,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/docs/configure b/docs/configure index 9e3ed60462..93e9dcf404 100755 --- a/docs/configure +++ b/docs/configure @@ -634,7 +634,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -711,7 +710,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -964,15 +962,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1110,7 +1099,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1263,7 +1252,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/stubdom/configure b/stubdom/configure index da03da535a..f7604a37f7 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -661,7 +661,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -751,7 +750,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1004,15 +1002,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1150,7 +1139,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1303,7 +1292,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/tools/config.h.in b/tools/config.h.in index 5a5944ebe1..5abf6092de 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -123,6 +123,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* QMP proxy path */ +#undef STUBDOM_QMP_PROXY_PATH + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/tools/configure b/tools/configure index 36596389b8..35036dc1db 100755 --- a/tools/configure +++ b/tools/configure @@ -772,7 +772,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -814,6 +813,7 @@ with_linux_backend_modules enable_qemu_traditional enable_rombios with_system_qemu +with_stubdom_qmp_proxy with_system_seabios with_system_ovmf enable_ipxe @@ -899,7 +899,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1152,15 +1151,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1298,7 +1288,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1451,7 +1441,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1535,6 +1524,9 @@ Optional Packages: Use system supplied qemu PATH or qemu (taken from $PATH) as qemu-xen device model instead of building and installing our own version + --stubdom-qmp-proxy[=PATH] + Use supplied binary PATH as a QMP proxy into + stubdomain --with-system-seabios[=PATH] Use system supplied seabios PATH instead of building and installing our own version @@ -3382,7 +3374,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3428,7 +3420,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3452,7 +3444,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3497,7 +3489,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3521,7 +3513,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -4548,6 +4540,24 @@ _ACEOF +# Check whether --with-stubdom-qmp-proxy was given. +if test "${with_stubdom_qmp_proxy+set}" = set; then : + withval=$with_stubdom_qmp_proxy; + stubdom_qmp_proxy="$withval" + +else + + stubdom_qmp_proxy="$bindir/vchan-socket-proxy" + +fi + + +cat >>confdefs.h <<_ACEOF +#define STUBDOM_QMP_PROXY_PATH "$stubdom_qmp_proxy" +_ACEOF + + + # Check whether --with-system-seabios was given. if test "${with_system_seabios+set}" = set; then : withval=$with_system_seabios; diff --git a/tools/configure.ac b/tools/configure.ac index b6f8882be4..a9af0a21c6 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -194,6 +194,15 @@ AC_SUBST(qemu_xen) AC_SUBST(qemu_xen_path) AC_SUBST(qemu_xen_systemd) +AC_ARG_WITH([stubdom-qmp-proxy], + AC_HELP_STRING([--stubdom-qmp-proxy@<:@=PATH@:>@], + [Use supplied binary PATH as a QMP proxy into stubdomain]),[ + stubdom_qmp_proxy="$withval" +],[ + stubdom_qmp_proxy="$bindir/vchan-socket-proxy" +]) +AC_DEFINE_UNQUOTED([STUBDOM_QMP_PROXY_PATH], ["$stubdom_qmp_proxy"], [QMP proxy path]) + AC_ARG_WITH([system-seabios], AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], [Use system supplied seabios PATH instead of building and installing diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 6829b4bdb5..6a26634ef9 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1200,7 +1200,11 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, GCSPRINTF("%d", guest_domid), NULL); flexarray_append(dm_args, "-no-shutdown"); - /* There is currently no way to access the QMP socket in the stubdom */ + /* + * QMP access to qemu running in stubdomain is done over vchan. The + * stubdomain init script adds the appropriate monitor options for + * vchan-socket-proxy. + */ if (!is_stubdom) { flexarray_append(dm_args, "-chardev"); if (state->dm_monitor_fd >= 0) { @@ -2205,6 +2209,23 @@ static void stubdom_pvqemu_unpaused(libxl__egc *egc, static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, int rc, const char *p); +static void spawn_qmp_proxy(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss); + +static void qmp_proxy_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata); + +static void qmp_proxy_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn, + int rc); + +static void qmp_proxy_detached(libxl__egc *egc, + libxl__spawn_state *spawn); + +static void qmp_proxy_spawn_outcome(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss, + int rc); + char *libxl__stub_dm_name(libxl__gc *gc, const char *guest_name) { return GCSPRINTF("%s-dm", guest_name); @@ -2486,24 +2507,150 @@ static void spawn_stub_launch_dm(libxl__egc *egc, goto out; } + sdss->qmp_proxy_spawn.ao = ao; + if (libxl__stubdomain_is_linux(&guest_config->b_info)) { + spawn_qmp_proxy(egc, sdss); + } else { + qmp_proxy_spawn_outcome(egc, sdss, 0); + } + + return; + +out: + assert(ret); + qmp_proxy_spawn_outcome(egc, sdss, ret); +} + +static void spawn_qmp_proxy(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss) +{ + STATE_AO_GC(sdss->qmp_proxy_spawn.ao); + const uint32_t guest_domid = sdss->dm.guest_domid; + const uint32_t dm_domid = sdss->pvqemu.guest_domid; + const char *dom_path = libxl__xs_get_dompath(gc, dm_domid); + char **args; + int nr = 0; + int rc, logfile_w, null; + + if (access(STUBDOM_QMP_PROXY_PATH, X_OK) < 0) { + LOGED(ERROR, guest_domid, "qmp proxy %s is not executable", STUBDOM_QMP_PROXY_PATH); + rc = ERROR_FAIL; + goto out; + } + + sdss->qmp_proxy_spawn.what = GCSPRINTF("domain %d device model qmp proxy", guest_domid); + sdss->qmp_proxy_spawn.pidpath = GCSPRINTF("%s/image/qmp-proxy-pid", dom_path); + sdss->qmp_proxy_spawn.xspath = DEVICE_MODEL_XS_PATH(gc, LIBXL_TOOLSTACK_DOMID, + dm_domid, "/qmp-proxy-state"); + sdss->qmp_proxy_spawn.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; + sdss->qmp_proxy_spawn.midproc_cb = libxl__spawn_record_pid; + sdss->qmp_proxy_spawn.confirm_cb = qmp_proxy_confirm; + sdss->qmp_proxy_spawn.failure_cb = qmp_proxy_startup_failed; + sdss->qmp_proxy_spawn.detached_cb = qmp_proxy_detached; + + const int arraysize = 6; + GCNEW_ARRAY(args, arraysize); + args[nr++] = STUBDOM_QMP_PROXY_PATH; + args[nr++] = GCSPRINTF("--state-path=%s", sdss->qmp_proxy_spawn.xspath); + args[nr++] = GCSPRINTF("%u", dm_domid); + args[nr++] = GCSPRINTF("%s/device-model/%u/qmp-vchan", dom_path, guest_domid); + args[nr++] = (char*)libxl__qemu_qmp_path(gc, guest_domid); + args[nr++] = NULL; + assert(nr == arraysize); + + logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qmp-proxy-%s", + sdss->dm_config.c_info.name)); + if (logfile_w < 0) { + rc = logfile_w; + goto out; + } + null = open("/dev/null", O_RDWR); + if (null < 0) { + LOGED(ERROR, guest_domid, "unable to open /dev/null"); + rc = ERROR_FAIL; + goto out_close; + } + + rc = libxl__spawn_spawn(egc, &sdss->qmp_proxy_spawn); + if (rc < 0) + goto out_close; + if (!rc) { /* inner child */ + setsid(); + libxl__exec(gc, null, null, logfile_w, STUBDOM_QMP_PROXY_PATH, args, NULL); + /* unreachable */ + } + + rc = 0; + +out_close: + if (logfile_w >= 0) + close(logfile_w); + if (null >= 0) + close(null); +out: + if (rc) + qmp_proxy_spawn_outcome(egc, sdss, rc); +} + +static void qmp_proxy_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata) +{ + STATE_AO_GC(spawn->ao); + + if (!xsdata) + return; + + if (strcmp(xsdata, "running")) + return; + + libxl__spawn_initiate_detach(gc, spawn); +} + +static void qmp_proxy_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn, + int rc) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(spawn, *sdss, qmp_proxy_spawn); + qmp_proxy_spawn_outcome(egc, sdss, rc); +} + +static void qmp_proxy_detached(libxl__egc *egc, + libxl__spawn_state *spawn) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(spawn, *sdss, qmp_proxy_spawn); + qmp_proxy_spawn_outcome(egc, sdss, 0); +} + +static void qmp_proxy_spawn_outcome(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss, + int rc) +{ + STATE_AO_GC(sdss->qmp_proxy_spawn.ao); + int need_pvqemu = libxl__need_xenpv_qemu(gc, &sdss->dm_config); + + if (rc) goto out; + + if (need_pvqemu < 0) { + rc = need_pvqemu; + goto out; + } + sdss->pvqemu.spawn.ao = ao; - sdss->pvqemu.guest_domid = dm_domid; sdss->pvqemu.guest_config = &sdss->dm_config; sdss->pvqemu.build_state = &sdss->dm_state; sdss->pvqemu.callback = spawn_stubdom_pvqemu_cb; - - if (!need_qemu) { + if (need_pvqemu) { + libxl__spawn_local_dm(egc, &sdss->pvqemu); + } else { /* If dom0 qemu not needed, do not launch it */ spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, 0); - } else { - libxl__spawn_local_dm(egc, &sdss->pvqemu); } return; out: - assert(ret); - spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); + assert(rc); + spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, rc); } static void spawn_stubdom_pvqemu_cb(libxl__egc *egc, diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c index fef2cd4e13..c08af308fa 100644 --- a/tools/libxl/libxl_domain.c +++ b/tools/libxl/libxl_domain.c @@ -1260,10 +1260,20 @@ static void dm_destroy_cb(libxl__egc *egc, libxl__destroy_domid_state *dis = CONTAINER_OF(ddms, *dis, ddms); STATE_AO_GC(dis->ao); uint32_t domid = dis->domid; + uint32_t target_domid; if (rc < 0) LOGD(ERROR, domid, "libxl__destroy_device_model failed"); + if (libxl_is_stubdom(CTX, domid, &target_domid) && + libxl__stubdomain_is_linux_running(gc, target_domid)) { + char *path = GCSPRINTF("/local/domain/%d/image/qmp-proxy-pid", domid); + + libxl__kill_xs_path(gc, path, "QMP Proxy"); + /* qmp-proxy for stubdom registers target_domid's QMP sockets. */ + libxl__qmp_cleanup(gc, target_domid); + } + dis->drs.ao = ao; dis->drs.domid = domid; dis->drs.callback = devices_destroy_cb; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c939557b2e..41b51b07cd 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4166,6 +4166,7 @@ typedef struct { libxl__destroy_domid_state dis; libxl__multidev multidev; libxl__xswait_state xswait; + libxl__spawn_state qmp_proxy_spawn; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:56:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:56:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bd-0003xe-DG; Tue, 19 May 2020 15:56:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bc-0003xT-3J for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:36 +0000 X-Inumbo-ID: 5070075b-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5070075b-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=njz1lcmtFnXHEF8L77P678HijXWC+QiBUxSKIrisAa4=; b=YGpDiyKmKEC14mJ7t+R2gv/Kc8 X6In37hYpQ63B2tx5qdjPgehAEeqk8n78aOn2Hr584hMjOYOwfXZK2H8z+r102T93edWl7duZYjWU BOry+/EWoSa0fQPsge7HiZ9SCxaSns6ZHPmmAdQEgjRIEztY4O3DJwskFNJoVlkhNJBc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bb-0004Q5-EY for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4bb-0006gp-Dg for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: require qemu in dom0 for multiple stubdomain consoles Message-Id: Date: Tue, 19 May 2020 15:56:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ab9ce23f5af8f77078d63b11ff8bd7280e0e6b50 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:59 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: require qemu in dom0 for multiple stubdomain consoles Device model stubdomains (both Mini-OS + qemu-trad and linux + qemu-xen) are always started with at least 3 consoles: log, save, and restore. Until xenconsoled learns how to handle multiple consoles, this is needed for save/restore support. For Mini-OS stubdoms, this is a bug. In practice, it works in most cases because there is something else that triggers qemu in dom0 too: vfb/vkb added if vnc/sdl/spice is enabled. Additionally, Linux-based stubdomain waits for all the backends to initialize during boot. Lack of some console backends results in stubdomain startup timeout. This is a temporary patch until xenconsoled will be improved. Signed-off-by: Marek Marczykowski-Górecki [Updated commit message with Marek's explanation from mailing list.] Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 6a26634ef9..8801e9364e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2494,7 +2494,11 @@ static void spawn_stub_launch_dm(libxl__egc *egc, } } - need_qemu = libxl__need_xenpv_qemu(gc, dm_config); + /* + * Until xenconsoled learns how to handle multiple consoles, require qemu + * in dom0 to serve consoles for a stubdomain - it require at least 3 of them. + */ + need_qemu = 1 || libxl__need_xenpv_qemu(gc, &sdss->dm_config); for (i = 0; i < num_console; i++) { libxl__device device; @@ -2626,7 +2630,11 @@ static void qmp_proxy_spawn_outcome(libxl__egc *egc, int rc) { STATE_AO_GC(sdss->qmp_proxy_spawn.ao); - int need_pvqemu = libxl__need_xenpv_qemu(gc, &sdss->dm_config); + /* + * Until xenconsoled learns how to handle multiple consoles, require qemu + * in dom0 to serve consoles for a stubdomain - it require at least 3 of them. + */ + int need_pvqemu = 1 || libxl__need_xenpv_qemu(gc, &sdss->dm_config); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:56:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:56:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bn-0003z9-GI; Tue, 19 May 2020 15:56:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bm-0003yy-3b for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:46 +0000 X-Inumbo-ID: 571977da-99e9-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 571977da-99e9-11ea-9887-bc764e2007e4; Tue, 19 May 2020 15:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1h64ojTr08JwHcBbkDkdd14BR1vdLQy8ZGXEGAA3Bfw=; b=jI8Omd2yoxd0gjlWalnVlzMjok Z/9OXXgzBF8HVvC7uf8LGJw/VrCsZ3B0mm49c7xu8e9pZVXHBni+BYs/WBNGP2eh4Kex+FEd8fjoD 1SWoBqtig6c7Vz3+QcrwRoXweIP+MHebvr3XHrnaljeyfJsj5TqwderJRn067BpoIRyQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bl-0004R4-HQ for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4bl-0006ht-Gc for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: ignore emulated IDE disks beyond the first 4 Message-Id: Date: Tue, 19 May 2020 15:56:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fa9d82825a8ddee1894528576f383efddcdc3691 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:55:00 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: ignore emulated IDE disks beyond the first 4 Qemu supports only 4 emulated IDE disks, when given more (or with higher indexes), it will fail to start. Since the disks can still be accessible using PV interface, just ignore emulated path and log a warning, instead of rejecting the configuration altogether. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8801e9364e..86694f669d 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1894,6 +1894,13 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, } if (disks[i].is_cdrom) { + if (disk > 4) { + LOGD(WARN, guest_domid, "Emulated CDROM can be only one of the first 4 disks.\n" + "Disk %s will be available via PV drivers but not as an " + "emulated disk.", + disks[i].vdev); + continue; + } drive = libxl__sprintf(gc, "if=ide,index=%d,readonly=on,media=cdrom,id=ide-%i", disk, dev_number); @@ -1971,6 +1978,10 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, &disks[i], colo_mode); } else { + LOGD(WARN, guest_domid, "Only 4 emulated IDE disks are supported.\n" + "Disk %s will be available via PV drivers but not as an " + "emulated disk.", + disks[i].vdev); continue; /* Do not emulate this disk */ } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:56:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:56:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bx-00040H-Hr; Tue, 19 May 2020 15:56:57 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bw-000405-8I for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:56 +0000 X-Inumbo-ID: 5d1fe31c-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5d1fe31c-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fwFEbddQ4OaDL1nMky1hcIHbYAPLJNiuk2f4OU0bKOk=; b=vysvDWzYhsOIjSTUMTAeiuuXKh mqn0/SOhPSk7s1RwwrhxLiAXpP7FVqiVl8hXTTmN/yOOfE3Mp2sPN3T/qh2JqlfURdJNCSV8oD5rG fCB12rtbBMaGkSSk8PuJGOO2KOXMsNJY36yZZFPOaUO5Nk+1KtrTXi4atRHbzcoKX8nQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4bv-0004RD-Kl for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4bv-0006j4-Jg for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:56:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: consider also qemu in stubdomain in libxl__dm_active check Message-Id: Date: Tue, 19 May 2020 15:56:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cfc47cd4e24f3bfbe9b69f3196d1dd31f7423c31 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:55:01 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: consider also qemu in stubdomain in libxl__dm_active check Since qemu-xen can now run in stubdomain too, handle this case when checking it's state too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 86694f669d..454a2815ed 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -3734,12 +3734,18 @@ out: int libxl__dm_active(libxl__gc *gc, uint32_t domid) { - char *pid, *path; + char *pid, *dm_domid, *path; path = GCSPRINTF("/local/domain/%d/image/device-model-pid", domid); pid = libxl__xs_read(gc, XBT_NULL, path); - return pid != NULL; + if (pid) + return true; + + path = GCSPRINTF("/local/domain/%d/image/device-model-domid", domid); + dm_domid = libxl__xs_read(gc, XBT_NULL, path); + + return dm_domid != NULL; } int libxl__dm_check_start(libxl__gc *gc, libxl_domain_config *d_config, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:57:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:57:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4c7-00041E-JR; Tue, 19 May 2020 15:57:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4c6-000417-Ke for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:57:06 +0000 X-Inumbo-ID: 635a12a2-99e9-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 635a12a2-99e9-11ea-ae69-bc764e2007e4; Tue, 19 May 2020 15:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xVhaXNf1MwMRwtxJFpB8nN1O6+nYkjABEvx4pRkd0LE=; b=DHjrTRFSaYMdl05qxVGfRyCvz6 jNB42Xn6yLGGM+YvOHpig1Jexk9fxHaA0f+ZixA8/8ttgTCtxn/WOFe8+MZ8COO8BWM1LAIOfgHcR quGksICYP84sJwSqhb7oERE4Wr5BDaQLGc3ULaSjtkCburiDpSXFVAtFRWFnU7tmCxWg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4c6-0004Rf-30 for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:57:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4c5-0006k6-Vy for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:57:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] docs: Add device-model-domid to xenstore-paths Message-Id: Date: Tue, 19 May 2020 15:57:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b6af49af6093a9a0e0e0b4d39ab06da106f4bdf7 Author: Jason Andryuk AuthorDate: Mon May 18 21:55:02 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 docs: Add device-model-domid to xenstore-paths Document device-model-domid for when using a device model stubdomain. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/misc/xenstore-paths.pandoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index a152f5ea68..766e8008dc 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -148,6 +148,11 @@ The domain's own ID. The process ID of the device model associated with this domain, if it has one. +#### ~/image/device-model-domid = INTEGER [INTERNAL] + +The domain ID of the device model stubdomain associated with this domain, +if it has one. + #### ~/cpu/[0-9]+/availability = ("online"|"offline") [PV] One node for each virtual CPU up to the guest's configured -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 19 15:57:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 19 May 2020 15:57:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4cH-00042G-Kx; Tue, 19 May 2020 15:57:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4cG-00042B-Rj for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:57:16 +0000 X-Inumbo-ID: 696b91e8-99e9-11ea-a943-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 696b91e8-99e9-11ea-a943-12813bfff9fa; Tue, 19 May 2020 15:57:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RIrmB4fteNTPPODRyrt0OFAfWgocgE28Znq8xqR0QbI=; b=EnulXoNdeBU41ubRe/+lDewfQP bfoJr6rqLcZ7A8ZXl2yfpdg7yyn8xARMhmebrBF/J5lS4aycnTEuw6+79q021+kWLPkkHeX2BW6j5 hREtIOeoExVcxGRzPDYaMfxRPtr3Pa0tucnorrnkbMjRrPPAToDtveeW655Zy7JHvI2M=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jb4cG-0004Rr-8p for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:57:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jb4cG-0006kp-7L for xen-changelog@lists.xenproject.org; Tue, 19 May 2020 15:57:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: Check stubdomain kernel & ramdisk presence Message-Id: Date: Tue, 19 May 2020 15:57:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e235fa2794c95365519eac714d6ea82f8e64752e Author: Jason Andryuk AuthorDate: Mon May 18 21:55:03 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: Check stubdomain kernel & ramdisk presence Just out of context is the following comment for libxl__domain_make: /* fixme: this function can leak the stubdom if it fails */ When the stubdomain kernel or ramdisk is not present, the domid and stubdomain name will indeed be leaked. Avoid the leak by checking the file presence and erroring out when absent. It doesn't fix all cases, but it avoids a big one when using a linux device model stubdomain. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 454a2815ed..f2dc5696b9 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2327,6 +2327,22 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dm_config->num_vkbs = 1; } + if (guest_config->b_info.stubdomain_kernel && + access(guest_config->b_info.stubdomain_kernel, R_OK) != 0) { + LOGED(ERROR, guest_domid, "could not access stubdomain kernel %s", + guest_config->b_info.stubdomain_kernel); + ret = ERROR_INVAL; + goto out; + } + + if (guest_config->b_info.stubdomain_ramdisk && + access(guest_config->b_info.stubdomain_ramdisk, R_OK) != 0) { + LOGED(ERROR, guest_domid, "could not access stubdomain ramdisk %s", + guest_config->b_info.stubdomain_ramdisk); + ret = ERROR_INVAL; + goto out; + } + stubdom_state->pv_kernel.path = guest_config->b_info.stubdomain_kernel; stubdom_state->pv_ramdisk.path = guest_config->b_info.stubdomain_ramdisk; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 20 10:55:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 10:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNP-0005cR-Iv; Wed, 20 May 2020 10:55:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNN-0005cL-OI for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:05 +0000 X-Inumbo-ID: 5c5999ce-9a88-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5c5999ce-9a88-11ea-b07b-bc764e2007e4; Wed, 20 May 2020 10:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=qLNzh8zlrEmbrz4wZETTKNuf52VyZaKPTjV38/QlQA4=; b=qX9gb3Rd7p2vI6bXDDWCnBCunZ y+cnZJ4R1uraSyxZKJvSBVt3r1ku80MB+XNrg3dCVv55A6BBzc2tziBkR5XaGc5x/9Z3isBYObMp1 A45i8UJtm3zEf96gGFTe7Y/saWOb3fan7XsQtHrgzOW+cPdBUgKbJSPUs8FGKDKJcP+Q=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNM-0007LZ-Ah for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbMNM-0007t2-9B for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/setup: lift dom0 creation out into create_dom0() function Message-Id: Date: Wed, 20 May 2020 10:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f546619ce1c5d4de694597c28358cd8e23eea231 Author: David Woodhouse AuthorDate: Wed May 20 12:47:48 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 20 12:47:48 2020 +0200 x86/setup: lift dom0 creation out into create_dom0() function The creation of dom0 can be relatively self-contained. Shift it into a separate function and simplify __start_xen() a little bit. This is a cleanup in its own right, but will be even more desireable when live update provides an alternative path through __start_xen() that doesn't involve creating a new dom0 at all. Move the calculation of the 'initrd' parameter for create_dom0() down past the cosmetic printk about NX support, because in the fullness of time the whole initrd and create_dom0() part will be under the same "not live update" conditional. And in the meantime it's just neater. Also drop the explicit check for initrd to be module #0 since that would be the dom0 kernel and the corresponding bit is always clear in module_map. Signed-off-by: David Woodhouse Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 173 ++++++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 79 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 9e9576344c..2dec7a3fc6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -681,6 +681,92 @@ static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int li return n; } +static struct domain *__init create_dom0(const module_t *image, + unsigned long headroom, + module_t *initrd, const char *kextra, + const char *loader) +{ + struct xen_domctl_createdomain dom0_cfg = { + .flags = IS_ENABLED(CONFIG_TBOOT) ? XEN_DOMCTL_CDF_s3_integrity : 0, + .max_evtchn_port = -1, + .max_grant_frames = -1, + .max_maptrack_frames = -1, + .max_vcpus = dom0_max_vcpus(), + }; + struct domain *d; + char *cmdline; + + if ( opt_dom0_pvh ) + { + dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm | + ((hvm_hap_supported() && !opt_dom0_shadow) ? + XEN_DOMCTL_CDF_hap : 0)); + + dom0_cfg.arch.emulation_flags |= + XEN_X86_EMU_LAPIC | XEN_X86_EMU_IOAPIC | XEN_X86_EMU_VPCI; + } + + if ( iommu_enabled ) + dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; + + /* Create initial domain 0. */ + d = domain_create(get_initial_domain_id(), &dom0_cfg, !pv_shim); + if ( IS_ERR(d) || (alloc_dom0_vcpu0(d) == NULL) ) + panic("Error creating domain 0\n"); + + /* Grab the DOM0 command line. */ + cmdline = image->string ? __va(image->string) : NULL; + if ( cmdline || kextra ) + { + static char __initdata dom0_cmdline[MAX_GUEST_CMDLINE]; + + cmdline = cmdline_cook(cmdline, loader); + safe_strcpy(dom0_cmdline, cmdline); + + if ( kextra ) + /* kextra always includes exactly one leading space. */ + safe_strcat(dom0_cmdline, kextra); + + /* Append any extra parameters. */ + if ( skip_ioapic_setup && !strstr(dom0_cmdline, "noapic") ) + safe_strcat(dom0_cmdline, " noapic"); + if ( (strlen(acpi_param) == 0) && acpi_disabled ) + { + printk("ACPI is disabled, notifying Domain 0 (acpi=off)\n"); + safe_strcpy(acpi_param, "off"); + } + if ( (strlen(acpi_param) != 0) && !strstr(dom0_cmdline, "acpi=") ) + { + safe_strcat(dom0_cmdline, " acpi="); + safe_strcat(dom0_cmdline, acpi_param); + } + + cmdline = dom0_cmdline; + } + + /* + * Temporarily clear SMAP in CR4 to allow user-accesses in construct_dom0(). + * This saves a large number of corner cases interactions with + * copy_from_user(). + */ + if ( cpu_has_smap ) + { + cr4_pv32_mask &= ~X86_CR4_SMAP; + write_cr4(read_cr4() & ~X86_CR4_SMAP); + } + + if ( construct_dom0(d, image, headroom, initrd, cmdline) != 0 ) + panic("Could not construct domain 0\n"); + + if ( cpu_has_smap ) + { + write_cr4(read_cr4() | X86_CR4_SMAP); + cr4_pv32_mask |= X86_CR4_SMAP; + } + + return d; +} + /* How much of the directmap is prebuilt at compile time. */ #define PREBUILT_MAP_LIMIT (1 << L2_PAGETABLE_SHIFT) @@ -700,12 +786,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) .parity = 'n', .stop_bits = 1 }; - struct xen_domctl_createdomain dom0_cfg = { - .flags = IS_ENABLED(CONFIG_TBOOT) ? XEN_DOMCTL_CDF_s3_integrity : 0, - .max_evtchn_port = -1, - .max_grant_frames = -1, - .max_maptrack_frames = -1, - }; const char *hypervisor_name; /* Critical region without IDT or TSS. Any fault is deadly! */ @@ -1742,58 +1822,13 @@ void __init noreturn __start_xen(unsigned long mbi_p) init_guest_cpuid(); init_guest_msr_policy(); - if ( opt_dom0_pvh ) - { - dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm | - ((hvm_hap_supported() && !opt_dom0_shadow) ? - XEN_DOMCTL_CDF_hap : 0)); - - dom0_cfg.arch.emulation_flags |= - XEN_X86_EMU_LAPIC | XEN_X86_EMU_IOAPIC | XEN_X86_EMU_VPCI; - } - dom0_cfg.max_vcpus = dom0_max_vcpus(); - - if ( iommu_enabled ) - dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; - - /* Create initial domain 0. */ - dom0 = domain_create(get_initial_domain_id(), &dom0_cfg, !pv_shim); - if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) == NULL) ) - panic("Error creating domain 0\n"); - - /* Grab the DOM0 command line. */ - cmdline = (char *)(mod[0].string ? __va(mod[0].string) : NULL); - if ( (cmdline != NULL) || (kextra != NULL) ) - { - static char __initdata dom0_cmdline[MAX_GUEST_CMDLINE]; - - cmdline = cmdline_cook(cmdline, loader); - safe_strcpy(dom0_cmdline, cmdline); - - if ( kextra != NULL ) - /* kextra always includes exactly one leading space. */ - safe_strcat(dom0_cmdline, kextra); - - /* Append any extra parameters. */ - if ( skip_ioapic_setup && !strstr(dom0_cmdline, "noapic") ) - safe_strcat(dom0_cmdline, " noapic"); - if ( (strlen(acpi_param) == 0) && acpi_disabled ) - { - printk("ACPI is disabled, notifying Domain 0 (acpi=off)\n"); - safe_strcpy(acpi_param, "off"); - } - if ( (strlen(acpi_param) != 0) && !strstr(dom0_cmdline, "acpi=") ) - { - safe_strcat(dom0_cmdline, " acpi="); - safe_strcat(dom0_cmdline, acpi_param); - } - - cmdline = dom0_cmdline; - } - if ( xen_cpuidle ) xen_processor_pmbits |= XEN_PROCESSOR_PM_CX; + printk("%sNX (Execute Disable) protection %sactive\n", + cpu_has_nx ? XENLOG_INFO : XENLOG_WARNING "Warning: ", + cpu_has_nx ? "" : "not "); + initrdidx = find_first_bit(module_map, mbi->mods_count); if ( bitmap_weight(module_map, mbi->mods_count) > 1 ) printk(XENLOG_WARNING @@ -1801,35 +1836,15 @@ void __init noreturn __start_xen(unsigned long mbi_p) initrdidx); /* - * Temporarily clear SMAP in CR4 to allow user-accesses in construct_dom0(). - * This saves a large number of corner cases interactions with - * copy_from_user(). - */ - if ( cpu_has_smap ) - { - cr4_pv32_mask &= ~X86_CR4_SMAP; - write_cr4(read_cr4() & ~X86_CR4_SMAP); - } - - printk("%sNX (Execute Disable) protection %sactive\n", - cpu_has_nx ? XENLOG_INFO : XENLOG_WARNING "Warning: ", - cpu_has_nx ? "" : "not "); - - /* * We're going to setup domain0 using the module(s) that we stashed safely * above our heap. The second module, if present, is an initrd ramdisk. */ - if ( construct_dom0(dom0, mod, modules_headroom, - (initrdidx > 0) && (initrdidx < mbi->mods_count) - ? mod + initrdidx : NULL, cmdline) != 0) + dom0 = create_dom0(mod, modules_headroom, + initrdidx < mbi->mods_count ? mod + initrdidx : NULL, + kextra, loader); + if ( !dom0 ) panic("Could not set up DOM0 guest OS\n"); - if ( cpu_has_smap ) - { - write_cr4(read_cr4() | X86_CR4_SMAP); - cr4_pv32_mask |= X86_CR4_SMAP; - } - heap_init_late(); init_trace_bufs(); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 20 10:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 10:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNY-0005d8-KZ; Wed, 20 May 2020 10:55:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNX-0005cz-Jd for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:15 +0000 X-Inumbo-ID: 6244b7f7-9a88-11ea-a9e6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6244b7f7-9a88-11ea-a9e6-12813bfff9fa; Wed, 20 May 2020 10:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Xc6clSWAcNKpVDtQpIrUf0+jHXwJbpNdTmDYkdVtR8Q=; b=LBoeYQdp4gWSz7++Fwy92M3iN+ cQi+WYTVz76Idquy/DCA77QLrbxK9FlIE5dfNa4hl9FK2DKsbbx7Bie8R7Y/kdNMawy2uxZun2ZQ3 X2kr7nn3LCIS2m4lVf9WMJJGdp9g6jc5IgEApSEgL3p1ezC3hAH+hHm1WGJHwdgoLOA4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNW-0007MJ-Dm for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbMNW-0007tq-CZ for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/idle: rework C6 EOI workaround Message-Id: Date: Wed, 20 May 2020 10:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5fef1fd713660406a6187ef352fbf79986abfe43 Author: Roger Pau Monné AuthorDate: Wed May 20 12:48:37 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 20 12:48:37 2020 +0200 x86/idle: rework C6 EOI workaround Change the C6 EOI workaround (errata AAJ72) to use x86_match_cpu. Also call the workaround from mwait_idle, previously it was only used by the ACPI idle driver. Finally make sure the routine is called for all states equal or greater than ACPI_STATE_C3, note that the ACPI driver doesn't currently handle them, but the errata condition shouldn't be limited by that. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 43 ++++++++++++++++++++++++++----------------- xen/arch/x86/cpu/mwait-idle.c | 3 +++ xen/include/asm-x86/cpuidle.h | 2 ++ 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index b83446e77d..82f108d301 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -548,26 +548,35 @@ void trace_exit_reason(u32 *irq_traced) } } -/* - * "AAJ72. EOI Transaction May Not be Sent if Software Enters Core C6 During - * an Interrupt Service Routine" - * - * There was an errata with some Core i7 processors that an EOI transaction - * may not be sent if software enters core C6 during an interrupt service - * routine. So we don't enter deep Cx state if there is an EOI pending. - */ -static bool errata_c6_eoi_workaround(void) +bool errata_c6_eoi_workaround(void) { - static int8_t fix_needed = -1; + static int8_t __read_mostly fix_needed = -1; if ( unlikely(fix_needed == -1) ) { - int model = boot_cpu_data.x86_model; - fix_needed = (cpu_has_apic && !directed_eoi_enabled && - (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && - (boot_cpu_data.x86 == 6) && - ((model == 0x1a) || (model == 0x1e) || (model == 0x1f) || - (model == 0x25) || (model == 0x2c) || (model == 0x2f))); +#define INTEL_FAM6_MODEL(m) { X86_VENDOR_INTEL, 6, m, X86_FEATURE_ALWAYS } + /* + * Errata AAJ72: EOI Transaction May Not be Sent if Software Enters + * Core C6 During an Interrupt Service Routine" + * + * There was an errata with some Core i7 processors that an EOI + * transaction may not be sent if software enters core C6 during an + * interrupt service routine. So we don't enter deep Cx state if + * there is an EOI pending. + */ + static const struct x86_cpu_id eoi_errata[] = { + INTEL_FAM6_MODEL(0x1a), + INTEL_FAM6_MODEL(0x1e), + INTEL_FAM6_MODEL(0x1f), + INTEL_FAM6_MODEL(0x25), + INTEL_FAM6_MODEL(0x2c), + INTEL_FAM6_MODEL(0x2f), + { } + }; +#undef INTEL_FAM6_MODEL + + fix_needed = cpu_has_apic && !directed_eoi_enabled && + x86_match_cpu(eoi_errata); } return (fix_needed && cpu_has_pending_apic_eoi()); @@ -676,7 +685,7 @@ static void acpi_processor_idle(void) return; } - if ( (cx->type == ACPI_STATE_C3) && errata_c6_eoi_workaround() ) + if ( (cx->type >= ACPI_STATE_C3) && errata_c6_eoi_workaround() ) cx = power->safe_state; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index b81937966e..88a3e160c5 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -770,6 +770,9 @@ static void mwait_idle(void) return; } + if ((cx->type >= 3) && errata_c6_eoi_workaround()) + cx = power->safe_state; + eax = cx->address; cstate = ((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; diff --git a/xen/include/asm-x86/cpuidle.h b/xen/include/asm-x86/cpuidle.h index 5d7dffd228..51368694dc 100644 --- a/xen/include/asm-x86/cpuidle.h +++ b/xen/include/asm-x86/cpuidle.h @@ -26,4 +26,6 @@ void update_idle_stats(struct acpi_processor_power *, void update_last_cx_stat(struct acpi_processor_power *, struct acpi_processor_cx *, uint64_t); +bool errata_c6_eoi_workaround(void); + #endif /* __X86_ASM_CPUIDLE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 20 10:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 10:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNi-0005eS-Nm; Wed, 20 May 2020 10:55:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNh-0005eH-1c for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:25 +0000 X-Inumbo-ID: 6861b134-9a88-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6861b134-9a88-11ea-9887-bc764e2007e4; Wed, 20 May 2020 10:55:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=e2xsLhiaP9XQjY3qzFrbH/qx7gGzai4dKZCogMhGMTU=; b=ufe8q6SQ3qrFAND2Z8nPEQWhCt gzBcvMqSKAyVEvLlkzncJcB1UZVlHpnsPRy1n/NVFpgp3Q2N9rTTWNtlvzu6Bnbo91yKvjA8PMX03 5H5wfzs6bzdcVpq1cqPEu2bCOdasv4YGDI8bHvV6etKOEPawkH4D429pL77gNDQOOdig=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbMNg-0007MV-Gf for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbMNg-0007uJ-FV for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 10:55:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem-paging: further adjustments to p2m_mem_paging_prep()'s error handling Message-Id: Date: Wed, 20 May 2020 10:55:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cdea123f1976549ecc72644588cc5ce1491606c4 Author: Jan Beulich AuthorDate: Wed May 20 12:49:28 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 20 12:49:28 2020 +0200 x86/mem-paging: further adjustments to p2m_mem_paging_prep()'s error handling Address late comments on ecb913be4aaa ("x86/mem-paging: correct p2m_mem_paging_prep()'s error handling"): - insert a gprintk() ahead of domain_crash(), - add a comment. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/mem_paging.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index 6aa1bffa65..01281f786e 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -385,6 +385,9 @@ static int prepare(struct domain *d, gfn_t gfn, * The domain can't possibly know about this page yet, so failure * here is a clear indication of something fishy going on. */ + gprintk(XENLOG_ERR, + "%pd: fresh page for GFN %"PRI_gfn" in unexpected state\n", + d, gfn_x(gfn)); domain_crash(d); page = NULL; goto out; @@ -423,6 +426,10 @@ static int prepare(struct domain *d, gfn_t gfn, if ( page ) { + /* + * Free the page on error. Drop our temporary reference in all + * cases. + */ if ( ret ) put_page_alloc_ref(page); put_page(page); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:55:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:55:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbRzl-0005oP-V1; Wed, 20 May 2020 16:55:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbRzk-0005oD-Cn for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:04 +0000 X-Inumbo-ID: a680bcbc-9aba-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a680bcbc-9aba-11ea-b07b-bc764e2007e4; Wed, 20 May 2020 16:55:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=OBMl52Rh8zqoB+KRTnqXhpKC96pTyh38VZOVEBnF6NI=; b=FOjVvS6MnbaWdewJg13vaAfb6v vsSh7tEyHx99lzYosJlz1L2CRwspGpAHYMb926/cKw09dJWOPcu0XOLzKMph2FVoImhqA4gfUBPKX e87Zs8DKPWeFZzq0Hp5ZfCWQllc7w92qAR8jszq4+8pufxWpeI2PV4Nw86lWdnvN4g4s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbRzj-00079f-He for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbRzi-0003xE-MX for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/hvm: Fix memory leaks in hvm_copy_context_and_params() Message-Id: Date: Wed, 20 May 2020 16:55:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3d6e92e309987c9e33177c9ccd155e58dbd5d0db Author: Andrew Cooper AuthorDate: Sat May 16 13:10:07 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 18 15:22:53 2020 +0100 x86/hvm: Fix memory leaks in hvm_copy_context_and_params() Any error from hvm_save() or hvm_set_param() leaks the c.data allocation. Spotted by Coverity. Fixes: 353744830 "x86/hvm: introduce hvm_copy_context_and_params" Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/hvm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 814b7020d8..0a3797ef6e 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -5318,7 +5318,7 @@ int hvm_copy_context_and_params(struct domain *dst, struct domain *src) return -ENOMEM; if ( (rc = hvm_save(src, &c)) ) - return rc; + goto out; for ( i = 0; i < HVM_NR_PARAMS; i++ ) { @@ -5328,11 +5328,13 @@ int hvm_copy_context_and_params(struct domain *dst, struct domain *src) continue; if ( (rc = hvm_set_param(dst, i, value)) ) - return rc; + goto out; } c.cur = 0; rc = hvm_load(dst, &c); + + out: vfree(c.data); return rc; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:55:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:55:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbRzv-0005pY-0N; Wed, 20 May 2020 16:55:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbRzu-0005pR-5d for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:14 +0000 X-Inumbo-ID: ac80da84-9aba-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ac80da84-9aba-11ea-9887-bc764e2007e4; Wed, 20 May 2020 16:55:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=5EffZVDOTKyxo1mZLSKj3/7N9mQN7/GGF54rEqffjcE=; b=pi/cRznccN6ORM0lVu4MACLqYV 0v1R5FTzhJfhXcsuGkiY/42CGZ9Qg1lVeHcHXs7QqIzL0MwIy0NeaDIN3+9NQD/XLcXBemlfcXX2H XGAvlR1tB3ru8s9G+1RVk/Cou+ofiG71w+xuVg5A76QBHARN2yLDhlpGWIY0E1mCw4CI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbRzt-00079r-Kc for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbRzt-0003xs-JU for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/hvm: Fix shifting in stdvga_mem_read() Message-Id: Date: Wed, 20 May 2020 16:55:13 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 97fb0253e6c2f2221bfd0895b7ffe3a99330d847 Author: Andrew Cooper AuthorDate: Sat May 16 19:50:45 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 18 15:22:53 2020 +0100 x86/hvm: Fix shifting in stdvga_mem_read() stdvga_mem_read() has a return type of uint8_t, which promotes to int rather than unsigned int. Shifting by 24 may hit the sign bit. Spotted by Coverity. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/stdvga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c index bd398dbb1b..e2675139e7 100644 --- a/xen/arch/x86/hvm/stdvga.c +++ b/xen/arch/x86/hvm/stdvga.c @@ -322,7 +322,7 @@ static int stdvga_mem_read(const struct hvm_io_handler *handler, data = stdvga_mem_readb(addr); data |= stdvga_mem_readb(addr + 1) << 8; data |= stdvga_mem_readb(addr + 2) << 16; - data |= stdvga_mem_readb(addr + 3) << 24; + data |= (uint32_t)stdvga_mem_readb(addr + 3) << 24; break; case 8: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS06-0005rE-22; Wed, 20 May 2020 16:55:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS04-0005qt-D7 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:24 +0000 X-Inumbo-ID: b289c328-9aba-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b289c328-9aba-11ea-b07b-bc764e2007e4; Wed, 20 May 2020 16:55:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=SvT7zM7d+Kjg/r/ZxSTESt9IN/krtBmLjbdo7LMbblk=; b=Qk5T5n2dR7+zZLxAAnb1SB4a6j VJ47w3yCrloLAKPRrz/q/X/KBpc59pgD3qJzKpNqR7DNeMYb2ABfDlc89CjAFODBNGSOQWnp8REdO gMgPar83tICJzC+hmwvj6kBRomHnQMU41kKNqG82EBc3v3g/d3jb9Feb/gPe0jmCg/Do=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS03-0007Ah-O2 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS03-0003yQ-Mp for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mm: no-one passes a NULL domain to init_xen_l4_slots() Message-Id: Date: Wed, 20 May 2020 16:55:23 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5dc999d711a75e1a83d4b21da203d3c3197ec0e0 Author: Jan Beulich AuthorDate: Mon May 18 17:13:38 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:13:38 2020 +0200 x86/mm: no-one passes a NULL domain to init_xen_l4_slots() Drop the NULL checks - they've been introduced by commit 8d7b633ada ("x86/mm: Consolidate all Xen L4 slot writing into init_xen_l4_slots()") without giving a reason; I'm told this was done in anticipation of the function potentially getting called with a NULL argument down the road. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/mm.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index f2d8190b5e..dba0903c8f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -1652,7 +1652,7 @@ static int promote_l3_table(struct page_info *page) * This function must write all ROOT_PAGETABLE_PV_XEN_SLOTS, to clobber any * values a guest may have left there from promote_l4_table(). * - * l4t and l4mfn are mandatory, but l4mfn doesn't need to be the mfn under + * l4t, l4mfn, and d are mandatory, but l4mfn doesn't need to be the mfn under * *l4t. All other parameters are optional and will either fill or zero the * appropriate slots. Pagetables not shared with guests will gain the * extended directmap. @@ -1664,7 +1664,7 @@ void init_xen_l4_slots(l4_pgentry_t *l4t, mfn_t l4mfn, * PV vcpus need a shortened directmap. HVM and Idle vcpus get the full * directmap. */ - bool short_directmap = d && !paging_mode_external(d); + bool short_directmap = !paging_mode_external(d); /* Slot 256: RO M2P (if applicable). */ l4t[l4_table_offset(RO_MPT_VIRT_START)] = @@ -1685,10 +1685,9 @@ void init_xen_l4_slots(l4_pgentry_t *l4t, mfn_t l4mfn, mfn_eq(sl4mfn, INVALID_MFN) ? l4e_empty() : l4e_from_mfn(sl4mfn, __PAGE_HYPERVISOR_RW); - /* Slot 260: Per-domain mappings (if applicable). */ + /* Slot 260: Per-domain mappings. */ l4t[l4_table_offset(PERDOMAIN_VIRT_START)] = - d ? l4e_from_page(d->arch.perdomain_l3_pg, __PAGE_HYPERVISOR_RW) - : l4e_empty(); + l4e_from_page(d->arch.perdomain_l3_pg, __PAGE_HYPERVISOR_RW); /* Slot 261-: text/data/bss, RW M2P, vmap, frametable, directmap. */ #ifndef NDEBUG -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:55:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:55:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0G-0005sd-3c; Wed, 20 May 2020 16:55:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0E-0005sO-Mx for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:34 +0000 X-Inumbo-ID: b88d0316-9aba-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b88d0316-9aba-11ea-ae69-bc764e2007e4; Wed, 20 May 2020 16:55:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=iXcdSube1M+e2FXKDyRIgssHsYqVQAYgD/6l4AsHhH8=; b=07Yn85Ty9Cuvm2OnVZCsxdWsWa ZxrU8tpyI9PbGDn7d3qsNhs5TZWwxCEeIhD7mxrtaB2aKGg2Cft42g4gcXV7KAEt25eloQRPyk8Z/ rK65bcX9JJPqRTodX84w/FnixRUhSv8o5D+3aqpBLCTNDiUyXZDzakwJn9dv4A9eU67s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0D-0007Aq-RH for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS0D-0003yz-Q2 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem-paging: use guest handle for XENMEM_paging_op_prep Message-Id: Date: Wed, 20 May 2020 16:55:33 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9f40699c956c10419a91db0ff8d0c985dd3b2800 Author: Jan Beulich AuthorDate: Mon May 18 17:15:46 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:15:46 2020 +0200 x86/mem-paging: use guest handle for XENMEM_paging_op_prep While it should have been this way from the beginning, not doing so will become an actual problem with PVH Dom0. The interface change is binary compatible, but requires tools side producers to be re-built. Drop the bogus/unnecessary page alignment restriction on the input buffer at the same time. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Wei Liu --- tools/libxc/xc_mem_paging.c | 41 ++++++++++++++++++++++------------------- xen/arch/x86/mm/p2m.c | 15 ++++++--------- xen/include/asm-x86/p2m.h | 3 ++- xen/include/public/memory.h | 8 ++++---- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/tools/libxc/xc_mem_paging.c b/tools/libxc/xc_mem_paging.c index a067706e5c..738f63ac20 100644 --- a/tools/libxc/xc_mem_paging.c +++ b/tools/libxc/xc_mem_paging.c @@ -26,15 +26,33 @@ static int xc_mem_paging_memop(xc_interface *xch, uint32_t domain_id, unsigned int op, uint64_t gfn, void *buffer) { xen_mem_paging_op_t mpo; + DECLARE_HYPERCALL_BOUNCE(buffer, XC_PAGE_SIZE, + XC_HYPERCALL_BUFFER_BOUNCE_IN); + int rc; memset(&mpo, 0, sizeof(mpo)); mpo.op = op; mpo.domain = domain_id; mpo.gfn = gfn; - mpo.buffer = (unsigned long) buffer; - return do_memory_op(xch, XENMEM_paging_op, &mpo, sizeof(mpo)); + if ( buffer ) + { + if ( xc_hypercall_bounce_pre(xch, buffer) ) + { + PERROR("Could not bounce memory for XENMEM_paging_op %u", op); + return -1; + } + + set_xen_guest_handle(mpo.buffer, buffer); + } + + rc = do_memory_op(xch, XENMEM_paging_op, &mpo, sizeof(mpo)); + + if ( buffer ) + xc_hypercall_bounce_post(xch, buffer); + + return rc; } int xc_mem_paging_enable(xc_interface *xch, uint32_t domain_id, @@ -92,28 +110,13 @@ int xc_mem_paging_prep(xc_interface *xch, uint32_t domain_id, uint64_t gfn) int xc_mem_paging_load(xc_interface *xch, uint32_t domain_id, uint64_t gfn, void *buffer) { - int rc, old_errno; - errno = EINVAL; if ( !buffer ) return -1; - if ( ((unsigned long) buffer) & (XC_PAGE_SIZE - 1) ) - return -1; - - if ( mlock(buffer, XC_PAGE_SIZE) ) - return -1; - - rc = xc_mem_paging_memop(xch, domain_id, - XENMEM_paging_op_prep, - gfn, buffer); - - old_errno = errno; - munlock(buffer, XC_PAGE_SIZE); - errno = old_errno; - - return rc; + return xc_mem_paging_memop(xch, domain_id, XENMEM_paging_op_prep, + gfn, buffer); } diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 9b7b0bf103..59b0b05ed5 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1779,7 +1779,8 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) * mfn if populate was called for gfn which was nominated but not evicted. In * this case only the p2mt needs to be forwarded. */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) +int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, + XEN_GUEST_HANDLE_64(const_uint8) buffer) { struct page_info *page = NULL; p2m_type_t p2mt; @@ -1788,13 +1789,9 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int ret, page_extant = 1; - const void *user_ptr = (const void *) buffer; - if ( user_ptr ) - /* Sanity check the buffer and bail out early if trouble */ - if ( (buffer & (PAGE_SIZE - 1)) || - (!access_ok(user_ptr, PAGE_SIZE)) ) - return -EINVAL; + if ( !guest_handle_okay(buffer, PAGE_SIZE) ) + return -EINVAL; gfn_lock(p2m, gfn, 0); @@ -1812,7 +1809,7 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) /* If the user did not provide a buffer, we disallow */ ret = -EINVAL; - if ( unlikely(user_ptr == NULL) ) + if ( unlikely(guest_handle_is_null(buffer)) ) goto out; /* Get a free page */ ret = -ENOMEM; @@ -1834,7 +1831,7 @@ int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, uint64_t buffer) page_extant = 0; guest_map = map_domain_page(mfn); - ret = copy_from_user(guest_map, user_ptr, PAGE_SIZE); + ret = copy_from_guest(guest_map, buffer, PAGE_SIZE); unmap_domain_page(guest_map); if ( ret ) { diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index ace3573ae8..baebc8b6ef 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -741,7 +741,8 @@ void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, /* Start populating a paged out frame */ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn); /* Prepare the p2m for paging a frame in */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, uint64_t buffer); +int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, + XEN_GUEST_HANDLE_64(const_uint8) buffer); /* Resume normal operation (in case a domain was paused) */ struct vm_event_st; void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp); diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index e56800357d..dbd35305df 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -396,10 +396,10 @@ struct xen_mem_paging_op { uint8_t op; /* XENMEM_paging_op_* */ domid_t domain; - /* PAGING_PREP IN: buffer to immediately fill page in */ - uint64_aligned_t buffer; - /* Other OPs */ - uint64_aligned_t gfn; /* IN: gfn of page being operated on */ + /* IN: (XENMEM_paging_op_prep) buffer to immediately fill page from */ + XEN_GUEST_HANDLE_64(const_uint8) buffer; + /* IN: gfn of page being operated on */ + uint64_aligned_t gfn; }; typedef struct xen_mem_paging_op xen_mem_paging_op_t; DEFINE_XEN_GUEST_HANDLE(xen_mem_paging_op_t); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:55:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:55:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0R-0005ue-5D; Wed, 20 May 2020 16:55:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0Q-0005uP-7L for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:46 +0000 X-Inumbo-ID: be98a12a-9aba-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id be98a12a-9aba-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:55:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=W2xS8ZeXzNGmIYGDT6ePuV4U+azvLjmY0leUGfKs5MI=; b=KD565A9QxcCtrcjuH6/ItbMrpr x5ffbWkybT4zdhX779Aybm613pw/4WiCSbCQ6H5vl7+EB1vpwfsva8fed7f6spB/QXUl0ThWovGT9 M87jDmjAy8m/iIap9XfKoB5ubySN/VSORxggrRLxP6x4d7yLw2WFzxDQsfJcydxLhNOE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0N-0007B5-UO for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS0N-0003zW-TN for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem-paging: move code to its dedicated source file Message-Id: Date: Wed, 20 May 2020 16:55:43 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 02a2b19c8e2532998e262727d32c574267ac6b48 Author: Jan Beulich AuthorDate: Mon May 18 17:16:55 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:16:55 2020 +0200 x86/mem-paging: move code to its dedicated source file Do a little bit of style adjustment along the way, and drop the "p2m_mem_paging_" prefixes from the now static functions. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/mm/mem_paging.c | 417 ++++++++++++++++++++++++++++++++++++++++++- xen/arch/x86/mm/p2m.c | 409 ------------------------------------------ xen/include/asm-x86/p2m.h | 7 - 3 files changed, 414 insertions(+), 419 deletions(-) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index 54a94fa3a0..84b05cd461 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -25,6 +25,417 @@ #include #include +#include "mm-locks.h" + +/* + * p2m_mem_paging_drop_page - Tell pager to drop its reference to a paged page + * @d: guest domain + * @gfn: guest page to drop + * + * p2m_mem_paging_drop_page() will notify the pager that a paged-out gfn was + * released by the guest. The pager is supposed to drop its reference of the + * gfn. + */ +void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, + p2m_type_t p2mt) +{ + vm_event_request_t req = { + .reason = VM_EVENT_REASON_MEM_PAGING, + .u.mem_paging.gfn = gfn + }; + + /* + * We allow no ring in this unique case, because it won't affect + * correctness of the guest execution at this point. If this is the only + * page that happens to be paged-out, we'll be okay.. but it's likely the + * guest will crash shortly anyways. + */ + int rc = vm_event_claim_slot(d, d->vm_event_paging); + + if ( rc < 0 ) + return; + + /* Send release notification to pager */ + req.u.mem_paging.flags = MEM_PAGING_DROP_PAGE; + + /* Update stats unless the page hasn't yet been evicted */ + if ( p2mt != p2m_ram_paging_out ) + atomic_dec(&d->paged_pages); + else + /* Evict will fail now, tag this request for pager */ + req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; + + vm_event_put_request(d, d->vm_event_paging, &req); +} + +/* + * p2m_mem_paging_populate - Tell pager to populate a paged page + * @d: guest domain + * @gfn: guest page in paging state + * + * p2m_mem_paging_populate() will notify the pager that a page in any of the + * paging states needs to be written back into the guest. + * This function needs to be called whenever gfn_to_mfn() returns any of the p2m + * paging types because the gfn may not be backed by a mfn. + * + * The gfn can be in any of the paging states, but the pager needs only be + * notified when the gfn is in the paging-out path (paging_out or paged). This + * function may be called more than once from several vcpus. If the vcpu belongs + * to the guest, the vcpu must be stopped and the pager notified that the vcpu + * was stopped. The pager needs to handle several requests for the same gfn. + * + * If the gfn is not in the paging-out path and the vcpu does not belong to the + * guest, nothing needs to be done and the function assumes that a request was + * already sent to the pager. In this case the caller has to try again until the + * gfn is fully paged in again. + */ +void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) +{ + struct vcpu *v = current; + vm_event_request_t req = { + .reason = VM_EVENT_REASON_MEM_PAGING, + .u.mem_paging.gfn = gfn_l + }; + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int rc = vm_event_claim_slot(d, d->vm_event_paging); + + /* We're paging. There should be a ring. */ + if ( rc == -EOPNOTSUPP ) + { + gdprintk(XENLOG_ERR, "Dom%d paging gfn %lx yet no ring in place\n", + d->domain_id, gfn_l); + /* Prevent the vcpu from faulting repeatedly on the same gfn */ + if ( v->domain == d ) + vcpu_pause_nosync(v); + domain_crash(d); + return; + } + else if ( rc < 0 ) + return; + + /* Fix p2m mapping */ + gfn_lock(p2m, gfn, 0); + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + /* Allow only nominated or evicted pages to enter page-in path */ + if ( p2mt == p2m_ram_paging_out || p2mt == p2m_ram_paged ) + { + /* Evict will fail now, tag this request for pager */ + if ( p2mt == p2m_ram_paging_out ) + req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; + + rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_in, a); + } + gfn_unlock(p2m, gfn, 0); + if ( rc < 0 ) + goto out_cancel; + + /* Pause domain if request came from guest and gfn has paging type */ + if ( p2m_is_paging(p2mt) && v->domain == d ) + { + vm_event_vcpu_pause(v); + req.flags |= VM_EVENT_FLAG_VCPU_PAUSED; + } + /* No need to inform pager if the gfn is not in the page-out path */ + else if ( p2mt != p2m_ram_paging_out && p2mt != p2m_ram_paged ) + { + /* gfn is already on its way back and vcpu is not paused */ + out_cancel: + vm_event_cancel_slot(d, d->vm_event_paging); + return; + } + + /* Send request to pager */ + req.u.mem_paging.p2mt = p2mt; + req.vcpu_id = v->vcpu_id; + + vm_event_put_request(d, d->vm_event_paging, &req); +} + +/* + * p2m_mem_paging_resume - Resume guest gfn + * @d: guest domain + * @rsp: vm_event response received + * + * p2m_mem_paging_resume() will forward the p2mt of a gfn to ram_rw. It is + * called by the pager. + * + * The gfn was previously either evicted and populated, or nominated and + * populated. If the page was evicted the p2mt will be p2m_ram_paging_in. If + * the page was just nominated the p2mt will be p2m_ram_paging_in_start because + * the pager did not call prepare(). + * + * If the gfn was dropped the vcpu needs to be unpaused. + */ +void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) +{ + struct p2m_domain *p2m = p2m_get_hostp2m(d); + p2m_type_t p2mt; + p2m_access_t a; + mfn_t mfn; + + /* Fix p2m entry if the page was not dropped */ + if ( !(rsp->u.mem_paging.flags & MEM_PAGING_DROP_PAGE) ) + { + gfn_t gfn = _gfn(rsp->u.mem_access.gfn); + + gfn_lock(p2m, gfn, 0); + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + /* + * Allow only pages which were prepared properly, or pages which + * were nominated but not evicted. + */ + if ( mfn_valid(mfn) && (p2mt == p2m_ram_paging_in) ) + { + int rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + paging_mode_log_dirty(d) ? p2m_ram_logdirty + : p2m_ram_rw, a); + + if ( !rc ) + set_gpfn_from_mfn(mfn_x(mfn), gfn_x(gfn)); + } + gfn_unlock(p2m, gfn, 0); + } +} + +/* + * nominate - Mark a guest page as to-be-paged-out + * @d: guest domain + * @gfn: guest page to nominate + * + * Returns 0 for success or negative errno values if gfn is not pageable. + * + * nominate() is called by the pager and checks if a guest page can be paged + * out. If the following conditions are met the p2mt will be changed: + * - the gfn is backed by a mfn + * - the p2mt of the gfn is pageable + * - the mfn is not used for IO + * - the mfn has exactly one user and has no special meaning + * + * Once the p2mt is changed the page is readonly for the guest. On success the + * pager can write the page contents to disk and later evict the page. + */ +static int nominate(struct domain *d, unsigned long gfn_l) +{ + struct page_info *page; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + int ret = -EBUSY; + + gfn_lock(p2m, gfn, 0); + + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + + /* Check if mfn is valid */ + if ( !mfn_valid(mfn) ) + goto out; + + /* Check p2m type */ + if ( !p2m_is_pageable(p2mt) ) + goto out; + + /* Check for io memory page */ + if ( is_iomem_page(mfn) ) + goto out; + + /* Check page count and type */ + page = mfn_to_page(mfn); + if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != + (1 | PGC_allocated) ) + goto out; + + if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) + goto out; + + /* Fix p2m entry */ + ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_out, a); + + out: + gfn_unlock(p2m, gfn, 0); + return ret; +} + +/* + * evict - Mark a guest page as paged-out + * @d: guest domain + * @gfn: guest page to evict + * + * Returns 0 for success or negative errno values if eviction is not possible. + * + * evict() is called by the pager and will free a guest page and release it + * back to Xen. If the following conditions are met the page can be freed: + * - the gfn is backed by a mfn + * - the gfn was nominated + * - the mfn has still exactly one user and has no special meaning + * + * After successful nomination some other process could have mapped the page. In + * this case eviction can not be done. If the gfn was populated before the pager + * could evict it, eviction can not be done either. In this case the gfn is + * still backed by a mfn. + */ +static int evict(struct domain *d, unsigned long gfn_l) +{ + struct page_info *page; + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int ret = -EBUSY; + + gfn_lock(p2m, gfn, 0); + + /* Get mfn */ + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + if ( unlikely(!mfn_valid(mfn)) ) + goto out; + + /* Allow only nominated pages */ + if ( p2mt != p2m_ram_paging_out ) + goto out; + + /* Get the page so it doesn't get modified under Xen's feet */ + page = mfn_to_page(mfn); + if ( unlikely(!get_page(page, d)) ) + goto out; + + /* Check page count and type once more */ + if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != + (2 | PGC_allocated) ) + goto out_put; + + if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) + goto out_put; + + /* Decrement guest domain's ref count of the page */ + put_page_alloc_ref(page); + + /* Remove mapping from p2m table */ + ret = p2m_set_entry(p2m, gfn, INVALID_MFN, PAGE_ORDER_4K, + p2m_ram_paged, a); + + /* Clear content before returning the page to Xen */ + scrub_one_page(page); + + /* Track number of paged gfns */ + atomic_inc(&d->paged_pages); + + out_put: + /* Put the page back so it gets freed */ + put_page(page); + + out: + gfn_unlock(p2m, gfn, 0); + return ret; +} + +/* + * prepare - Allocate a new page for the guest + * @d: guest domain + * @gfn: guest page in paging state + * + * prepare() will allocate a new page for the guest if the gfn is not backed + * by a mfn. It is called by the pager. + * It is required that the gfn was already populated. The gfn may already have a + * mfn if populate was called for gfn which was nominated but not evicted. In + * this case only the p2mt needs to be forwarded. + */ +static int prepare(struct domain *d, unsigned long gfn_l, + XEN_GUEST_HANDLE_64(const_uint8) buffer) +{ + struct page_info *page = NULL; + p2m_type_t p2mt; + p2m_access_t a; + gfn_t gfn = _gfn(gfn_l); + mfn_t mfn; + struct p2m_domain *p2m = p2m_get_hostp2m(d); + int ret, page_extant = 1; + + if ( !guest_handle_okay(buffer, PAGE_SIZE) ) + return -EINVAL; + + gfn_lock(p2m, gfn, 0); + + mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); + + ret = -ENOENT; + /* Allow missing pages */ + if ( (p2mt != p2m_ram_paging_in) && (p2mt != p2m_ram_paged) ) + goto out; + + /* Allocate a page if the gfn does not have one yet */ + if ( !mfn_valid(mfn) ) + { + void *guest_map; + + /* If the user did not provide a buffer, we disallow */ + ret = -EINVAL; + if ( unlikely(guest_handle_is_null(buffer)) ) + goto out; + /* Get a free page */ + ret = -ENOMEM; + page_alloc_mm_pre_lock(d); + page = alloc_domheap_page(d, 0); + if ( unlikely(page == NULL) ) + goto out; + if ( unlikely(!get_page(page, d)) ) + { + /* + * The domain can't possibly know about this page yet, so failure + * here is a clear indication of something fishy going on. + */ + domain_crash(d); + page = NULL; + goto out; + } + mfn = page_to_mfn(page); + page_extant = 0; + + guest_map = map_domain_page(mfn); + ret = copy_from_guest(guest_map, buffer, PAGE_SIZE); + unmap_domain_page(guest_map); + if ( ret ) + { + ret = -EFAULT; + goto out; + } + } + + /* + * Make the page already guest-accessible. If the pager still has a + * pending resume operation, it will be idempotent p2m entry-wise, but + * will unpause the vcpu. + */ + ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, + paging_mode_log_dirty(d) ? p2m_ram_logdirty + : p2m_ram_rw, a); + if ( !ret ) + { + set_gpfn_from_mfn(mfn_x(mfn), gfn_l); + + if ( !page_extant ) + atomic_dec(&d->paged_pages); + } + + out: + gfn_unlock(p2m, gfn, 0); + + if ( page ) + { + if ( ret ) + put_page_alloc_ref(page); + put_page(page); + } + + return ret; +} + int mem_paging_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_paging_op_t) arg) { int rc; @@ -50,15 +461,15 @@ int mem_paging_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_paging_op_t) arg) switch( mpo.op ) { case XENMEM_paging_op_nominate: - rc = p2m_mem_paging_nominate(d, mpo.gfn); + rc = nominate(d, mpo.gfn); break; case XENMEM_paging_op_evict: - rc = p2m_mem_paging_evict(d, mpo.gfn); + rc = evict(d, mpo.gfn); break; case XENMEM_paging_op_prep: - rc = p2m_mem_paging_prep(d, mpo.gfn, mpo.buffer); + rc = prepare(d, mpo.gfn, mpo.buffer); if ( !rc ) copyback = 1; break; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 59b0b05ed5..cc624281e0 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -23,7 +23,6 @@ * along with this program; If not, see . */ -#include /* copy_from_guest() */ #include #include #include @@ -1506,414 +1505,6 @@ int set_shared_p2m_entry(struct domain *d, unsigned long gfn_l, mfn_t mfn) return rc; } -/** - * p2m_mem_paging_nominate - Mark a guest page as to-be-paged-out - * @d: guest domain - * @gfn: guest page to nominate - * - * Returns 0 for success or negative errno values if gfn is not pageable. - * - * p2m_mem_paging_nominate() is called by the pager and checks if a guest page - * can be paged out. If the following conditions are met the p2mt will be - * changed: - * - the gfn is backed by a mfn - * - the p2mt of the gfn is pageable - * - the mfn is not used for IO - * - the mfn has exactly one user and has no special meaning - * - * Once the p2mt is changed the page is readonly for the guest. On success the - * pager can write the page contents to disk and later evict the page. - */ -int p2m_mem_paging_nominate(struct domain *d, unsigned long gfn_l) -{ - struct page_info *page; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - int ret = -EBUSY; - - gfn_lock(p2m, gfn, 0); - - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - - /* Check if mfn is valid */ - if ( !mfn_valid(mfn) ) - goto out; - - /* Check p2m type */ - if ( !p2m_is_pageable(p2mt) ) - goto out; - - /* Check for io memory page */ - if ( is_iomem_page(mfn) ) - goto out; - - /* Check page count and type */ - page = mfn_to_page(mfn); - if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != - (1 | PGC_allocated) ) - goto out; - - if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) - goto out; - - /* Fix p2m entry */ - ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_out, a); - - out: - gfn_unlock(p2m, gfn, 0); - return ret; -} - -/** - * p2m_mem_paging_evict - Mark a guest page as paged-out - * @d: guest domain - * @gfn: guest page to evict - * - * Returns 0 for success or negative errno values if eviction is not possible. - * - * p2m_mem_paging_evict() is called by the pager and will free a guest page and - * release it back to Xen. If the following conditions are met the page can be - * freed: - * - the gfn is backed by a mfn - * - the gfn was nominated - * - the mfn has still exactly one user and has no special meaning - * - * After successful nomination some other process could have mapped the page. In - * this case eviction can not be done. If the gfn was populated before the pager - * could evict it, eviction can not be done either. In this case the gfn is - * still backed by a mfn. - */ -int p2m_mem_paging_evict(struct domain *d, unsigned long gfn_l) -{ - struct page_info *page; - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - int ret = -EBUSY; - - gfn_lock(p2m, gfn, 0); - - /* Get mfn */ - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - if ( unlikely(!mfn_valid(mfn)) ) - goto out; - - /* Allow only nominated pages */ - if ( p2mt != p2m_ram_paging_out ) - goto out; - - /* Get the page so it doesn't get modified under Xen's feet */ - page = mfn_to_page(mfn); - if ( unlikely(!get_page(page, d)) ) - goto out; - - /* Check page count and type once more */ - if ( (page->count_info & (PGC_count_mask | PGC_allocated)) != - (2 | PGC_allocated) ) - goto out_put; - - if ( (page->u.inuse.type_info & PGT_count_mask) != 0 ) - goto out_put; - - /* Decrement guest domain's ref count of the page */ - put_page_alloc_ref(page); - - /* Remove mapping from p2m table */ - ret = p2m_set_entry(p2m, gfn, INVALID_MFN, PAGE_ORDER_4K, - p2m_ram_paged, a); - - /* Clear content before returning the page to Xen */ - scrub_one_page(page); - - /* Track number of paged gfns */ - atomic_inc(&d->paged_pages); - - out_put: - /* Put the page back so it gets freed */ - put_page(page); - - out: - gfn_unlock(p2m, gfn, 0); - return ret; -} - -/** - * p2m_mem_paging_drop_page - Tell pager to drop its reference to a paged page - * @d: guest domain - * @gfn: guest page to drop - * - * p2m_mem_paging_drop_page() will notify the pager that a paged-out gfn was - * released by the guest. The pager is supposed to drop its reference of the - * gfn. - */ -void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, - p2m_type_t p2mt) -{ - vm_event_request_t req = { - .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn - }; - - /* We allow no ring in this unique case, because it won't affect - * correctness of the guest execution at this point. If this is the only - * page that happens to be paged-out, we'll be okay.. but it's likely the - * guest will crash shortly anyways. */ - int rc = vm_event_claim_slot(d, d->vm_event_paging); - if ( rc < 0 ) - return; - - /* Send release notification to pager */ - req.u.mem_paging.flags = MEM_PAGING_DROP_PAGE; - - /* Update stats unless the page hasn't yet been evicted */ - if ( p2mt != p2m_ram_paging_out ) - atomic_dec(&d->paged_pages); - else - /* Evict will fail now, tag this request for pager */ - req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; - - vm_event_put_request(d, d->vm_event_paging, &req); -} - -/** - * p2m_mem_paging_populate - Tell pager to populate a paged page - * @d: guest domain - * @gfn: guest page in paging state - * - * p2m_mem_paging_populate() will notify the pager that a page in any of the - * paging states needs to be written back into the guest. - * This function needs to be called whenever gfn_to_mfn() returns any of the p2m - * paging types because the gfn may not be backed by a mfn. - * - * The gfn can be in any of the paging states, but the pager needs only be - * notified when the gfn is in the paging-out path (paging_out or paged). This - * function may be called more than once from several vcpus. If the vcpu belongs - * to the guest, the vcpu must be stopped and the pager notified that the vcpu - * was stopped. The pager needs to handle several requests for the same gfn. - * - * If the gfn is not in the paging-out path and the vcpu does not belong to the - * guest, nothing needs to be done and the function assumes that a request was - * already sent to the pager. In this case the caller has to try again until the - * gfn is fully paged in again. - */ -void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) -{ - struct vcpu *v = current; - vm_event_request_t req = { - .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn_l - }; - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - - /* We're paging. There should be a ring */ - int rc = vm_event_claim_slot(d, d->vm_event_paging); - - if ( rc == -EOPNOTSUPP ) - { - gdprintk(XENLOG_ERR, "Domain %hu paging gfn %lx yet no ring " - "in place\n", d->domain_id, gfn_l); - /* Prevent the vcpu from faulting repeatedly on the same gfn */ - if ( v->domain == d ) - vcpu_pause_nosync(v); - domain_crash(d); - return; - } - else if ( rc < 0 ) - return; - - /* Fix p2m mapping */ - gfn_lock(p2m, gfn, 0); - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - /* Allow only nominated or evicted pages to enter page-in path */ - if ( p2mt == p2m_ram_paging_out || p2mt == p2m_ram_paged ) - { - /* Evict will fail now, tag this request for pager */ - if ( p2mt == p2m_ram_paging_out ) - req.u.mem_paging.flags |= MEM_PAGING_EVICT_FAIL; - - rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, p2m_ram_paging_in, a); - } - gfn_unlock(p2m, gfn, 0); - if ( rc < 0 ) - goto out_cancel; - - /* Pause domain if request came from guest and gfn has paging type */ - if ( p2m_is_paging(p2mt) && v->domain == d ) - { - vm_event_vcpu_pause(v); - req.flags |= VM_EVENT_FLAG_VCPU_PAUSED; - } - /* No need to inform pager if the gfn is not in the page-out path */ - else if ( p2mt != p2m_ram_paging_out && p2mt != p2m_ram_paged ) - { - /* gfn is already on its way back and vcpu is not paused */ - out_cancel: - vm_event_cancel_slot(d, d->vm_event_paging); - return; - } - - /* Send request to pager */ - req.u.mem_paging.p2mt = p2mt; - req.vcpu_id = v->vcpu_id; - - vm_event_put_request(d, d->vm_event_paging, &req); -} - -/** - * p2m_mem_paging_prep - Allocate a new page for the guest - * @d: guest domain - * @gfn: guest page in paging state - * - * p2m_mem_paging_prep() will allocate a new page for the guest if the gfn is - * not backed by a mfn. It is called by the pager. - * It is required that the gfn was already populated. The gfn may already have a - * mfn if populate was called for gfn which was nominated but not evicted. In - * this case only the p2mt needs to be forwarded. - */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn_l, - XEN_GUEST_HANDLE_64(const_uint8) buffer) -{ - struct page_info *page = NULL; - p2m_type_t p2mt; - p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); - mfn_t mfn; - struct p2m_domain *p2m = p2m_get_hostp2m(d); - int ret, page_extant = 1; - - if ( !guest_handle_okay(buffer, PAGE_SIZE) ) - return -EINVAL; - - gfn_lock(p2m, gfn, 0); - - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - - ret = -ENOENT; - /* Allow missing pages */ - if ( (p2mt != p2m_ram_paging_in) && (p2mt != p2m_ram_paged) ) - goto out; - - /* Allocate a page if the gfn does not have one yet */ - if ( !mfn_valid(mfn) ) - { - void *guest_map; - - /* If the user did not provide a buffer, we disallow */ - ret = -EINVAL; - if ( unlikely(guest_handle_is_null(buffer)) ) - goto out; - /* Get a free page */ - ret = -ENOMEM; - page_alloc_mm_pre_lock(d); - page = alloc_domheap_page(d, 0); - if ( unlikely(page == NULL) ) - goto out; - if ( unlikely(!get_page(page, d)) ) - { - /* - * The domain can't possibly know about this page yet, so failure - * here is a clear indication of something fishy going on. - */ - domain_crash(d); - page = NULL; - goto out; - } - mfn = page_to_mfn(page); - page_extant = 0; - - guest_map = map_domain_page(mfn); - ret = copy_from_guest(guest_map, buffer, PAGE_SIZE); - unmap_domain_page(guest_map); - if ( ret ) - { - ret = -EFAULT; - goto out; - } - } - - /* Make the page already guest-accessible. If the pager still has a - * pending resume operation, it will be idempotent p2m entry-wise, - * but will unpause the vcpu */ - ret = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, - paging_mode_log_dirty(d) ? p2m_ram_logdirty - : p2m_ram_rw, a); - if ( !ret ) - { - set_gpfn_from_mfn(mfn_x(mfn), gfn_l); - - if ( !page_extant ) - atomic_dec(&d->paged_pages); - } - - out: - gfn_unlock(p2m, gfn, 0); - - if ( page ) - { - if ( ret ) - put_page_alloc_ref(page); - put_page(page); - } - - return ret; -} - -/** - * p2m_mem_paging_resume - Resume guest gfn - * @d: guest domain - * @rsp: vm_event response received - * - * p2m_mem_paging_resume() will forward the p2mt of a gfn to ram_rw. It is - * called by the pager. - * - * The gfn was previously either evicted and populated, or nominated and - * populated. If the page was evicted the p2mt will be p2m_ram_paging_in. If - * the page was just nominated the p2mt will be p2m_ram_paging_in_start because - * the pager did not call p2m_mem_paging_prep(). - * - * If the gfn was dropped the vcpu needs to be unpaused. - */ - -void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) -{ - struct p2m_domain *p2m = p2m_get_hostp2m(d); - p2m_type_t p2mt; - p2m_access_t a; - mfn_t mfn; - - /* Fix p2m entry if the page was not dropped */ - if ( !(rsp->u.mem_paging.flags & MEM_PAGING_DROP_PAGE) ) - { - gfn_t gfn = _gfn(rsp->u.mem_access.gfn); - - gfn_lock(p2m, gfn, 0); - mfn = p2m->get_entry(p2m, gfn, &p2mt, &a, 0, NULL, NULL); - /* - * Allow only pages which were prepared properly, or pages which - * were nominated but not evicted. - */ - if ( mfn_valid(mfn) && (p2mt == p2m_ram_paging_in) ) - { - int rc = p2m_set_entry(p2m, gfn, mfn, PAGE_ORDER_4K, - paging_mode_log_dirty(d) ? p2m_ram_logdirty : - p2m_ram_rw, a); - - if ( !rc ) - set_gpfn_from_mfn(mfn_x(mfn), gfn_x(gfn)); - } - gfn_unlock(p2m, gfn, 0); - } -} - #ifdef CONFIG_HVM static struct p2m_domain * p2m_getlru_nestedp2m(struct domain *d, struct p2m_domain *p2m) diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index baebc8b6ef..bf691ff568 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -731,18 +731,11 @@ static inline void p2m_pod_init(struct p2m_domain *p2m) {} /* Modify p2m table for shared gfn */ int set_shared_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); -/* Check if a nominated gfn is valid to be paged out */ -int p2m_mem_paging_nominate(struct domain *d, unsigned long gfn); -/* Evict a frame */ -int p2m_mem_paging_evict(struct domain *d, unsigned long gfn); /* Tell xenpaging to drop a paged out frame */ void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, p2m_type_t p2mt); /* Start populating a paged out frame */ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn); -/* Prepare the p2m for paging a frame in */ -int p2m_mem_paging_prep(struct domain *d, unsigned long gfn, - XEN_GUEST_HANDLE_64(const_uint8) buffer); /* Resume normal operation (in case a domain was paused) */ struct vm_event_st; void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:55:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:55:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0a-0005wB-8n; Wed, 20 May 2020 16:55:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0Z-0005w1-43 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:55 +0000 X-Inumbo-ID: c4985980-9aba-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c4985980-9aba-11ea-ae69-bc764e2007e4; Wed, 20 May 2020 16:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=i2biIiXvcL3A4js3Afrbv2m8A/bQ/8AKTrvPvie3VEw=; b=zUVDa2Zt58v/LGaspYT0i8FY+S JPzRHNJOa1u2x3X/FEh5AuYMpgYu8TJpMTiiDuHce2zolsHV7606cDqCqnEV6de4iWV4aWm/fS66L 291fcaM6TW/ESFCBJko/Xx9Na7ZsBhQDqeVnFlg9yZVjqKFC95ZqIWMP/nnUiczQE8jU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0Y-0007BH-1n for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS0Y-000402-0h for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:55:54 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem-paging: consistently use gfn_t Message-Id: Date: Wed, 20 May 2020 16:55:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4c73a2a939a51dee47db77b31208157dbc29fe98 Author: Jan Beulich AuthorDate: Mon May 18 17:17:51 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:17:51 2020 +0200 x86/mem-paging: consistently use gfn_t Where gprintk()s get touched anyway to switch to PRI_gfn, also switch to %pd for the domain logged. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/dm.c | 2 +- xen/arch/x86/hvm/hvm.c | 4 ++-- xen/arch/x86/mm.c | 7 ++++--- xen/arch/x86/mm/hap/guest_walk.c | 4 ++-- xen/arch/x86/mm/mem_paging.c | 31 +++++++++++++------------------ xen/arch/x86/mm/p2m.c | 2 +- xen/arch/x86/traps.c | 2 +- xen/common/memory.c | 4 ++-- xen/include/asm-x86/p2m.h | 5 ++--- 9 files changed, 28 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index 96c5042b75..e3f845165d 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -278,7 +278,7 @@ static int set_mem_type(struct domain *d, if ( p2m_is_paging(t) ) { put_gfn(d, pfn); - p2m_mem_paging_populate(d, pfn); + p2m_mem_paging_populate(d, _gfn(pfn)); return -EAGAIN; } diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 0a3797ef6e..09ee299bc7 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1988,7 +1988,7 @@ int hvm_hap_nested_page_fault(paddr_t gpa, unsigned long gla, * locks in such circumstance. */ if ( paged ) - p2m_mem_paging_populate(currd, gfn); + p2m_mem_paging_populate(currd, _gfn(gfn)); if ( sharing_enomem ) { @@ -3222,7 +3222,7 @@ enum hvm_translation_result hvm_translate_get_page( if ( p2m_is_paging(p2mt) ) { put_page(page); - p2m_mem_paging_populate(v->domain, gfn_x(gfn)); + p2m_mem_paging_populate(v->domain, gfn); return HVMTRANS_gfn_paged_out; } if ( p2m_is_shared(p2mt) ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index dba0903c8f..e42044eb74 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -2118,16 +2118,17 @@ static int mod_l1_entry(l1_pgentry_t *pl1e, l1_pgentry_t nl1e, paging_mode_translate(pg_dom) ) { p2m_type_t p2mt; + gfn_t gfn = _gfn(l1e_get_pfn(nl1e)); p2m_query_t q = l1e_get_flags(nl1e) & _PAGE_RW ? P2M_ALLOC | P2M_UNSHARE : P2M_ALLOC; - page = get_page_from_gfn(pg_dom, l1e_get_pfn(nl1e), &p2mt, q); + page = get_page_from_gfn(pg_dom, gfn_x(gfn), &p2mt, q); if ( p2m_is_paged(p2mt) ) { if ( page ) put_page(page); - p2m_mem_paging_populate(pg_dom, l1e_get_pfn(nl1e)); + p2m_mem_paging_populate(pg_dom, gfn); return -ENOENT; } @@ -3949,7 +3950,7 @@ long do_mmu_update( put_page(page); if ( p2m_is_paged(p2mt) ) { - p2m_mem_paging_populate(pt_owner, gmfn); + p2m_mem_paging_populate(pt_owner, _gfn(gmfn)); rc = -ENOENT; } else diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c index 6001cf3330..f59ebc84a2 100644 --- a/xen/arch/x86/mm/hap/guest_walk.c +++ b/xen/arch/x86/mm/hap/guest_walk.c @@ -68,7 +68,7 @@ unsigned long hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)( *pfec = PFEC_page_paged; if ( top_page ) put_page(top_page); - p2m_mem_paging_populate(p2m->domain, cr3 >> PAGE_SHIFT); + p2m_mem_paging_populate(p2m->domain, gaddr_to_gfn(cr3)); return gfn_x(INVALID_GFN); } if ( p2m_is_shared(p2mt) ) @@ -110,7 +110,7 @@ unsigned long hap_p2m_ga_to_gfn(GUEST_PAGING_LEVELS)( { ASSERT(p2m_is_hostp2m(p2m)); *pfec = PFEC_page_paged; - p2m_mem_paging_populate(p2m->domain, gfn_x(gfn)); + p2m_mem_paging_populate(p2m->domain, gfn); return gfn_x(INVALID_GFN); } if ( p2m_is_shared(p2mt) ) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index 84b05cd461..6aa1bffa65 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -36,12 +36,11 @@ * released by the guest. The pager is supposed to drop its reference of the * gfn. */ -void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, - p2m_type_t p2mt) +void p2m_mem_paging_drop_page(struct domain *d, gfn_t gfn, p2m_type_t p2mt) { vm_event_request_t req = { .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn + .u.mem_paging.gfn = gfn_x(gfn) }; /* @@ -89,16 +88,15 @@ void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, * already sent to the pager. In this case the caller has to try again until the * gfn is fully paged in again. */ -void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) +void p2m_mem_paging_populate(struct domain *d, gfn_t gfn) { struct vcpu *v = current; vm_event_request_t req = { .reason = VM_EVENT_REASON_MEM_PAGING, - .u.mem_paging.gfn = gfn_l + .u.mem_paging.gfn = gfn_x(gfn) }; p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int rc = vm_event_claim_slot(d, d->vm_event_paging); @@ -106,8 +104,8 @@ void p2m_mem_paging_populate(struct domain *d, unsigned long gfn_l) /* We're paging. There should be a ring. */ if ( rc == -EOPNOTSUPP ) { - gdprintk(XENLOG_ERR, "Dom%d paging gfn %lx yet no ring in place\n", - d->domain_id, gfn_l); + gdprintk(XENLOG_ERR, "%pd paging gfn %"PRI_gfn" yet no ring in place\n", + d, gfn_x(gfn)); /* Prevent the vcpu from faulting repeatedly on the same gfn */ if ( v->domain == d ) vcpu_pause_nosync(v); @@ -218,13 +216,12 @@ void p2m_mem_paging_resume(struct domain *d, vm_event_response_t *rsp) * Once the p2mt is changed the page is readonly for the guest. On success the * pager can write the page contents to disk and later evict the page. */ -static int nominate(struct domain *d, unsigned long gfn_l) +static int nominate(struct domain *d, gfn_t gfn) { struct page_info *page; struct p2m_domain *p2m = p2m_get_hostp2m(d); p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; int ret = -EBUSY; @@ -279,12 +276,11 @@ static int nominate(struct domain *d, unsigned long gfn_l) * could evict it, eviction can not be done either. In this case the gfn is * still backed by a mfn. */ -static int evict(struct domain *d, unsigned long gfn_l) +static int evict(struct domain *d, gfn_t gfn) { struct page_info *page; p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int ret = -EBUSY; @@ -346,13 +342,12 @@ static int evict(struct domain *d, unsigned long gfn_l) * mfn if populate was called for gfn which was nominated but not evicted. In * this case only the p2mt needs to be forwarded. */ -static int prepare(struct domain *d, unsigned long gfn_l, +static int prepare(struct domain *d, gfn_t gfn, XEN_GUEST_HANDLE_64(const_uint8) buffer) { struct page_info *page = NULL; p2m_type_t p2mt; p2m_access_t a; - gfn_t gfn = _gfn(gfn_l); mfn_t mfn; struct p2m_domain *p2m = p2m_get_hostp2m(d); int ret, page_extant = 1; @@ -417,7 +412,7 @@ static int prepare(struct domain *d, unsigned long gfn_l, : p2m_ram_rw, a); if ( !ret ) { - set_gpfn_from_mfn(mfn_x(mfn), gfn_l); + set_gpfn_from_mfn(mfn_x(mfn), gfn_x(gfn)); if ( !page_extant ) atomic_dec(&d->paged_pages); @@ -461,15 +456,15 @@ int mem_paging_memop(XEN_GUEST_HANDLE_PARAM(xen_mem_paging_op_t) arg) switch( mpo.op ) { case XENMEM_paging_op_nominate: - rc = nominate(d, mpo.gfn); + rc = nominate(d, _gfn(mpo.gfn)); break; case XENMEM_paging_op_evict: - rc = evict(d, mpo.gfn); + rc = evict(d, _gfn(mpo.gfn)); break; case XENMEM_paging_op_prep: - rc = prepare(d, mpo.gfn, mpo.buffer); + rc = prepare(d, _gfn(mpo.gfn), mpo.buffer); if ( !rc ) copyback = 1; break; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index cc624281e0..17f320b624 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1835,7 +1835,7 @@ void *map_domain_gfn(struct p2m_domain *p2m, gfn_t gfn, mfn_t *mfn, ASSERT(p2m_is_hostp2m(p2m)); if ( page ) put_page(page); - p2m_mem_paging_populate(p2m->domain, gfn_x(gfn)); + p2m_mem_paging_populate(p2m->domain, gfn); *pfec = PFEC_page_paged; return NULL; } diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 73c6218660..1f6f1dde76 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -848,7 +848,7 @@ int guest_wrmsr_xen(struct vcpu *v, uint32_t idx, uint64_t val) if ( p2m_is_paging(t) ) { - p2m_mem_paging_populate(d, gmfn); + p2m_mem_paging_populate(d, _gfn(gmfn)); return X86EMUL_RETRY; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 6e4b85674d..714077c1e5 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -322,7 +322,7 @@ int guest_remove_page(struct domain *d, unsigned long gmfn) put_gfn(d, gmfn); - p2m_mem_paging_drop_page(d, gmfn, p2mt); + p2m_mem_paging_drop_page(d, _gfn(gmfn), p2mt); return 0; } @@ -1667,7 +1667,7 @@ int check_get_page_from_gfn(struct domain *d, gfn_t gfn, bool readonly, if ( page ) put_page(page); - p2m_mem_paging_populate(d, gfn_x(gfn)); + p2m_mem_paging_populate(d, gfn); return -EAGAIN; } #endif diff --git a/xen/include/asm-x86/p2m.h b/xen/include/asm-x86/p2m.h index bf691ff568..8abae345e8 100644 --- a/xen/include/asm-x86/p2m.h +++ b/xen/include/asm-x86/p2m.h @@ -732,10 +732,9 @@ static inline void p2m_pod_init(struct p2m_domain *p2m) {} int set_shared_p2m_entry(struct domain *d, unsigned long gfn, mfn_t mfn); /* Tell xenpaging to drop a paged out frame */ -void p2m_mem_paging_drop_page(struct domain *d, unsigned long gfn, - p2m_type_t p2mt); +void p2m_mem_paging_drop_page(struct domain *d, gfn_t gfn, p2m_type_t p2mt); /* Start populating a paged out frame */ -void p2m_mem_paging_populate(struct domain *d, unsigned long gfn); +void p2m_mem_paging_populate(struct domain *d, gfn_t gfn); /* Resume normal operation (in case a domain was paused) */ struct vm_event_st; void p2m_mem_paging_resume(struct domain *d, struct vm_event_st *rsp); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:56:06 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:56:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0k-0005xw-AP; Wed, 20 May 2020 16:56:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0i-0005xk-Q0 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:04 +0000 X-Inumbo-ID: ca9cc55a-9aba-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ca9cc55a-9aba-11ea-ae69-bc764e2007e4; Wed, 20 May 2020 16:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=f7I5L83RQCOIIVopmuurLYrLfUTAedffsgrbwB1z5Z4=; b=IzYx3ft5LT2pf1R6GSt2lSaRxH bv8SMhM1eniQmLUJxN+RijrCFxeuRXMuLalXrtxGyCfozegEqMbgVct4QrWa5u6+71bkseFvEAFFR 5lE6lbbgBon0rK/05qdcIm+kKm1IuWumdquDDORfp6FLgF9NKdA6iXT+cjsqL7HRX99g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0i-0007Bd-4p for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS0i-00040m-3o for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: determine MXCSR mask in all cases Message-Id: Date: Wed, 20 May 2020 16:56:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2b532519d64e653a6bbfd9eefed6040a09c8876d Author: Jan Beulich AuthorDate: Mon May 18 17:18:56 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 18 17:18:56 2020 +0200 x86: determine MXCSR mask in all cases For its use(s) by the emulator to be correct in all cases, the filling of the variable needs to be independent of XSAVE availability. As there's no suitable function in i387.c to put the logic in, keep it in xstate_init(), arrange for the function to be called unconditionally, and pull the logic ahead of all return paths there. Fixes: 9a4496a35b20 ("x86emul: support {,V}{LD,ST}MXCSR") Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 3 +-- xen/arch/x86/xstate.c | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 63f3893c7a..3e0d9cbe98 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -488,8 +488,7 @@ void identify_cpu(struct cpuinfo_x86 *c) /* Now the feature flags better reflect actual CPU features! */ - if ( cpu_has_xsave ) - xstate_init(c); + xstate_init(c); #ifdef NOISY_CAPS printk(KERN_DEBUG "CPU: After all inits, caps:"); diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index 078419a171..3794d9a5a5 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -588,6 +588,18 @@ void xstate_init(struct cpuinfo_x86 *c) u32 eax, ebx, ecx, edx; u64 feature_mask; + if ( bsp ) + { + static typeof(current->arch.xsave_area->fpu_sse) __initdata ctxt; + + asm ( "fxsave %0" : "=m" (ctxt) ); + if ( ctxt.mxcsr_mask ) + mxcsr_mask = ctxt.mxcsr_mask; + } + + if ( !cpu_has_xsave ) + return; + if ( (bsp && !use_xsave) || boot_cpu_data.cpuid_level < XSTATE_CPUID ) { @@ -611,8 +623,6 @@ void xstate_init(struct cpuinfo_x86 *c) if ( bsp ) { - static typeof(current->arch.xsave_area->fpu_sse) __initdata ctxt; - xfeature_mask = feature_mask; /* * xsave_cntxt_size is the max size required by enabled features. @@ -621,10 +631,6 @@ void xstate_init(struct cpuinfo_x86 *c) xsave_cntxt_size = _xstate_ctxt_size(feature_mask); printk("xstate: size: %#x and states: %#"PRIx64"\n", xsave_cntxt_size, xfeature_mask); - - asm ( "fxsave %0" : "=m" (ctxt) ); - if ( ctxt.mxcsr_mask ) - mxcsr_mask = ctxt.mxcsr_mask; } else { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:56:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:56:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0u-0005zJ-By; Wed, 20 May 2020 16:56:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0s-0005z4-Pc for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:14 +0000 X-Inumbo-ID: d0a003ae-9aba-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d0a003ae-9aba-11ea-ae69-bc764e2007e4; Wed, 20 May 2020 16:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QrW4Pn2wOHD4FwRMj+cZYHUbgOMuoqWFDfGLy5WmWVE=; b=FLYDY9lNmYmKhJa5fnvrtNVIuf D2wvYkbiDKS5QJaIxsJiJnr8eWZ+NBDY0y+Xaq0RXRkGnhZfv9qdPwAKNTTS8SwGBprG3yPWas694 YvqI2ohq5mYAZ/gt+JCwIaLAHrzwoXJjZwOrwKzGeealFz0+LXB2+g3JwsQrn0rTGZnw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS0s-0007Bs-7s for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS0s-00042a-6g for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools: use HOSTCC/CPP to compile rombios code and helper Message-Id: Date: Wed, 20 May 2020 16:56:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 475ffdbbf5778329319ef6f7bd6315c163163440 Author: Olaf Hering AuthorDate: Mon May 18 16:44:00 2020 +0200 Commit: Andrew Cooper CommitDate: Mon May 18 16:49:56 2020 +0100 tools: use HOSTCC/CPP to compile rombios code and helper Use also HOSTCFLAGS for biossums while touching the code. Spotted by inspecting build logfile. Signed-off-by: Olaf Hering Acked-by: Andrew Cooper --- tools/firmware/rombios/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/firmware/rombios/Makefile b/tools/firmware/rombios/Makefile index 78237fd736..02abdb3038 100644 --- a/tools/firmware/rombios/Makefile +++ b/tools/firmware/rombios/Makefile @@ -19,7 +19,7 @@ clean: subdirs-clean distclean: clean BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c - gcc -DBX_SMP_PROCESSORS=1 -E -P $< > _rombios_.c + $(CPP) -DBX_SMP_PROCESSORS=1 -P $< > _rombios_.c bcc -o rombios.s -C-c -D__i86__ -0 -S _rombios_.c sed -e 's/^\.text//' -e 's/^\.data//' rombios.s > _rombios_.s as86 _rombios_.s -b tmp.bin -u- -w- -g -0 -j -O -l rombios.txt @@ -29,6 +29,6 @@ BIOS-bochs-latest: rombios.c biossums 32bitgateway.c tcgbios.c rm -f _rombios_.s biossums: biossums.c - gcc -o biossums biossums.c + $(HOSTCC) $(HOSTCFLAGS) -o biossums biossums.c -include $(DEPS_INCLUDE) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:56:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:56:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS14-00060P-Df; Wed, 20 May 2020 16:56:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS12-00060D-W8 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:25 +0000 X-Inumbo-ID: d6a2e668-9aba-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d6a2e668-9aba-11ea-9887-bc764e2007e4; Wed, 20 May 2020 16:56:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=M+CoJbw+qVsJLN7BCXiy1bwCrTHIvCJZWJdC7yg7kVA=; b=sledVBume7CxNEYKmlxt8bhCp0 h0xsM726ZbV19qRtuQFZLFOuEzphaQ3+y/9rjqwFk7sR4YuRlMDoue7bkKFTFdd4D1ZGjohLWHEFa z1ksNoGi94oOm92/SytP0ktiEXowWIMOsxosMBXNJs2182HuxSIvLOaeDRKWTQ2cY1o0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS12-0007CV-Aj for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS12-000435-9W for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] Document ioemu MiniOS stubdomain protocol Message-Id: Date: Wed, 20 May 2020 16:56:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c7c145470168c67ba45911370bd6902917e59da5 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:45 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 Document ioemu MiniOS stubdomain protocol Add documentation based on reverse-engineered toolstack-ioemu stubdomain protocol. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/misc/stubdom.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt index 882a18cab4..64c77d9b64 100644 --- a/docs/misc/stubdom.txt +++ b/docs/misc/stubdom.txt @@ -23,6 +23,59 @@ and https://wiki.xen.org/wiki/Device_Model_Stub_Domains for more information on device model stub domains +Toolstack to MiniOS ioemu stubdomain protocol +--------------------------------------------- + +This section describe communication protocol between toolstack and +qemu-traditional running in MiniOS stubdomain. The protocol include +expectations of both qemu and stubdomain itself. + +Setup (done by toolstack, expected by stubdomain): + - Block devices for target domain are connected as PV disks to stubdomain, + according to configuration order, starting with xvda + - Network devices for target domain are connected as PV nics to stubdomain, + according to configuration order, starting with 0 + - if graphics output is expected, VFB and VKB devices are set for stubdomain + (its backend is responsible for exposing them using appropriate protocol + like VNC or Spice) + - other target domain's devices are not connected at this point to stubdomain + (may be hot-plugged later) + - QEMU command line (space separated arguments) is stored in + /vm//image/dmargs xenstore path + - target domain id is stored in /local/domain//target xenstore path +?? - bios type is stored in /local/domain//hvmloader/bios + - stubdomain's console 0 is connected to qemu log file + - stubdomain's console 1 is connected to qemu save file (for saving state) + - stubdomain's console 2 is connected to qemu save file (for restoring state) + - next consoles are connected according to target guest's serial console configuration + +Startup: +1. PV stubdomain is started with ioemu-stubdom.gz kernel and no initrd +2. stubdomain initialize relevant devices +3. stubdomain signal readiness by writing "running" to /local/domain//device-model//state xenstore path +4. now stubdomain is considered running + +Runtime control (hotplug etc): +Toolstack can issue command through xenstore. The sequence is (from toolstack POV): +1. Write parameter to /local/domain//device-model//parameter. +2. Write command to /local/domain//device-model//command. +3. Wait for command result in /local/domain//device-model//state (command specific value). +4. Write "running" back to /local/domain//device-model//state. + +Defined commands: + - "pci-ins" - PCI hot plug, results: + - "pci-inserted" - success + - "pci-insert-failed" - failure + - "pci-rem" - PCI hot remove, results: + - "pci-removed" - success + - ?? + - "save" - save domain state to console 1, results: + - "paused" - success + - "continue" - resume domain execution, after loading state from console 2 (require -loadvm command argument), results: + - "running" - success + + + PV-GRUB ======= -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:56:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:56:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1E-00061Y-FR; Wed, 20 May 2020 16:56:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1D-00061N-4h for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:35 +0000 X-Inumbo-ID: dca73d20-9aba-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id dca73d20-9aba-11ea-b9cf-bc764e2007e4; Wed, 20 May 2020 16:56:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Fs72LEsI3hyvzwPrUX16Sjk60pdZFYTHtW6runfiDrs=; b=bjg2hKIubzlHP2eY/4J+1/lCbL Dgb7M1Cu4uNRujmkIuKfaRQRtviGg5d1cLxOYYprM3hNJLb5Y6W8Qs718nydKGMABkJGQ3mBmrdof BrT4/niZtan5vLtDDXX0Ks/zpOQUu6DWXOAKZP7PwFCq7W/Du4+nXiTqXqszCbN21CfM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1C-0007EE-Da for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS1C-00043d-Cc for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] Document ioemu Linux stubdomain protocol Message-Id: Date: Wed, 20 May 2020 16:56:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cd7181308e196cba5375202262d1e27d9f0ac49c Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:46 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 Document ioemu Linux stubdomain protocol Add documentation for upcoming Linux stubdomain for qemu-upstream. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/misc/stubdom.txt | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/docs/misc/stubdom.txt b/docs/misc/stubdom.txt index 64c77d9b64..c717a95d17 100644 --- a/docs/misc/stubdom.txt +++ b/docs/misc/stubdom.txt @@ -75,6 +75,58 @@ Defined commands: - "running" - success +Toolstack to Linux ioemu stubdomain protocol +-------------------------------------------- + +This section describe communication protocol between toolstack and +qemu-upstream running in Linux stubdomain. The protocol include +expectations of both stubdomain, and qemu. + +Setup (done by toolstack, expected by stubdomain): + - Block devices for target domain are connected as PV disks to stubdomain, + according to configuration order, starting with xvda + - Network devices for target domain are connected as PV nics to stubdomain, + according to configuration order, starting with 0 + - [not implemented] if graphics output is expected, VFB and VKB devices are set for stubdomain + (its backend is responsible for exposing them using appropriate protocol + like VNC or Spice) + - other target domain's devices are not connected at this point to stubdomain + (may be hot-plugged later) + - QEMU command line is stored in + /vm//image/dm-argv xenstore dir, each argument as separate key + in form /vm//image/dm-argv/NNN, where NNN is 0-padded argument + number + - target domain id is stored in /local/domain//target xenstore path +?? - bios type is stored in /local/domain//hvmloader/bios + - stubdomain's console 0 is connected to qemu log file + - stubdomain's console 1 is connected to qemu save file (for saving state) + - stubdomain's console 2 is connected to qemu save file (for restoring state) + - next consoles are connected according to target guest's serial console configuration + +Environment exposed by stubdomain to qemu (needed to construct appropriate qemu command line and later interact with qmp): + - target domain's disks are available as /dev/xvd[a-z] + - console 2 (incoming domain state) must be connected to an FD and the command + line argument $STUBDOM_RESTORE_INCOMING_ARG must be replaced with fd:$FD to + form "-incoming fd:$FD" + - console 1 (saving domain state) is added over QMP to qemu as "fdset-id 1" (done by stubdomain, toolstack doesn't need to care about it) + - nics are connected to relevant stubdomain PV vifs when available (qemu -netdev should specify ifname= explicitly) + +Startup: +1. toolstack starts PV stubdomain with stubdom-linux-kernel kernel and stubdom-linux-initrd initrd +2. stubdomain initialize relevant devices +3. stubdomain starts qemu with requested command line, plus few stubdomain specific ones - including local qmp access options +4. stubdomain starts vchan server on /local/domain//device-model//qmp-vchan, exposing qmp socket to the toolstack +5. qemu signal readiness by writing "running" to /local/domain//device-model//state xenstore path +6. now device model is considered running + +QEMU can be controlled using QMP over vchan at /local/domain//device-model//qmp-vchan. Only one simultaneous connection is supported and toolstack needs to ensure that. + +Limitations: + - PCI passthrough require permissive mode + - only one nic is supported + - at most 26 emulated disks are supported (more are still available as PV disks) + - graphics output (VNC/SDL/Spice) not supported + PV-GRUB ======= -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:56:46 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:56:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1O-00062l-IO; Wed, 20 May 2020 16:56:46 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1N-00062Z-5t for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:45 +0000 X-Inumbo-ID: e2ac9896-9aba-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e2ac9896-9aba-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:56:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ptVLS59VPujFRKrAmeeI4FPoFNyJQmrT88CfbDct9x0=; b=Y6vbQoliWxlj+rLKuylMlPS5/N gc20tgLMDFHcrdrcwTzLzf5HF4qZ+P6+KN4zp5oRwoU0Kqy6KgGf1SHfPJPz+oCcGSPzHlBQDxiks Qdy/TK4Z6tSQiYv/FxT/8hYSQe/UyNplKvz0uccWAwp5rFGLOEfK36+T6SSdYtNE0axg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1M-0007Eh-Gl for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS1M-00044P-Fe for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: fix qemu-trad cmdline for no sdl/vnc case Message-Id: Date: Wed, 20 May 2020 16:56:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 11b7f8725d5f992a384a6ca55a08e5e908c06d85 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:47 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 libxl: fix qemu-trad cmdline for no sdl/vnc case When qemu is running in stubdomain, any attempt to initialize vnc/sdl there will crash it (on failed attempt to load a keymap from a file). If vfb is present, all those cases are skipped. But since b053f0c4c9e533f3d97837cf897eb920b8355ed3 "libxl: do not start dom0 qemu for stubdomain when not needed" it is possible to create a stubdomain without vfb and contrary to the comment -vnc none do trigger VNC initialization code (just skips exposing it externally). Change the implicit SDL avoiding method to -nographics option, used when none of SDL or VNC is enabled. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Acked-by: Ian Jackson Acked-by: Wei Liu Signed-off-by: Jason Andryuk --- tools/libxl/libxl_dm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index f4007bbe50..b91e63db6f 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -734,14 +734,15 @@ static int libxl__build_device_model_args_old(libxl__gc *gc, if (libxl_defbool_val(vnc->findunused)) { flexarray_append(dm_args, "-vncunused"); } - } else + } else if (!sdl) { /* * VNC is not enabled by default by qemu-xen-traditional, - * however passing -vnc none causes SDL to not be - * (unexpectedly) enabled by default. This is overridden by - * explicitly passing -sdl below as required. + * however skipping -vnc causes SDL to be + * (unexpectedly) enabled by default. If undesired, disable graphics at + * all. */ - flexarray_append_pair(dm_args, "-vnc", "none"); + flexarray_append(dm_args, "-nographic"); + } if (sdl) { flexarray_append(dm_args, "-sdl"); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:56:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:56:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1Y-00063l-Jt; Wed, 20 May 2020 16:56:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1X-00063a-9s for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:55 +0000 X-Inumbo-ID: e8b32138-9aba-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e8b32138-9aba-11ea-9887-bc764e2007e4; Wed, 20 May 2020 16:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1/kZpfbedd1mFAfH0Kt43SX15asm0uudOmX/8adf5ho=; b=e7o1FAiBajnGHO/5KSZDg5QMIa IufLMN4Wx1IK3ty/3hiBRtkIMtW6Vf4C9YxFEziUmXZt6xQNSeM+xaNQuSQUGn3hqtG0kz3nlDDSZ +RIDPTIFg3jzp6weV802VaTYK8gQyODlqSnJ4PuLMXa7RZnBwcmSG81FRCju8Y7WzVkk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1W-0007Eq-KU for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS1W-0004E1-JF for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:56:54 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: Allow running qemu-xen in stubdomain Message-Id: Date: Wed, 20 May 2020 16:56:54 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 46587a30d4cb7702a8c2074c98d687b6f9602e6c Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:48 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 libxl: Allow running qemu-xen in stubdomain Do not prohibit anymore using stubdomain with qemu-xen. To help distingushing MiniOS and Linux stubdomain, add helper inline functions libxl__stubdomain_is_linux() and libxl__stubdomain_is_linux_running(). Those should be used where really the difference is about MiniOS/Linux, not qemu-xen/qemu-xen-traditional. Signed-off-by: Marek Marczykowski-Górecki Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 9 --------- tools/libxl/libxl_internal.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5a043df15f..433947abab 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -171,15 +171,6 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } } - if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && - b_info->device_model_version != - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL && - libxl_defbool_val(b_info->device_model_stubdomain)) { - LOG(ERROR, - "device model stubdomains require \"qemu-xen-traditional\""); - return ERROR_INVAL; - } - if (!b_info->max_vcpus) b_info->max_vcpus = 1; if (!b_info->avail_vcpus.size) { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index e5effd2ad1..d1ebdec8d2 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2324,6 +2324,23 @@ _hidden int libxl__device_model_version_running(libxl__gc *gc, uint32_t domid); /* Return the system-wide default device model */ _hidden libxl_device_model_version libxl__default_device_model(libxl__gc *gc); +static inline +bool libxl__stubdomain_is_linux_running(libxl__gc *gc, uint32_t domid) +{ + /* same logic as in libxl__stubdomain_is_linux */ + return libxl__device_model_version_running(gc, domid) + == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; +} + +static inline +bool libxl__stubdomain_is_linux(libxl_domain_build_info *b_info) +{ + /* right now qemu-tranditional implies MiniOS stubdomain and qemu-xen + * implies Linux stubdomain */ + return libxl_defbool_val(b_info->device_model_stubdomain) && + b_info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN; +} + #define DEVICE_MODEL_XS_PATH(gc, dm_domid, domid, fmt, _a...) \ libxl__sprintf(gc, "/local/domain/%u/device-model/%u" fmt, dm_domid, \ domid, ##_a) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:57:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:57:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1j-00065Z-LW; Wed, 20 May 2020 16:57:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1i-00065K-7h for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:06 +0000 X-Inumbo-ID: eebace82-9aba-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id eebace82-9aba-11ea-b07b-bc764e2007e4; Wed, 20 May 2020 16:57:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=24jyCqrA/UKf6d91zJ3I97kDCZrxF19ooRX5EkeSosY=; b=xNLgN+9RBdU8WeMrHFLPGKfkmB BdU419WOzmg1YWFVVcgmibz3+LPu78D2IDlkeGgSmIg3kRWPkFl8eWeWHwCdzVBrXA6uzbH0pCXpD sjO65Ti0oaXTg5nhIveMkkyr8EPp9MtgahskdPymfC6iMtiDXcXI5S3m15ZqsBWg5YIE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1g-0007FI-O5 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS1g-0004Wl-Mv for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: Handle Linux stubdomain specific QEMU options. Message-Id: Date: Wed, 20 May 2020 16:57:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7efd9f3d45480c12328e4419547a98022f7af43a Author: Eric Shelton AuthorDate: Mon May 18 21:54:49 2020 -0400 Commit: Wei Liu CommitDate: Mon May 18 23:23:44 2020 +0100 libxl: Handle Linux stubdomain specific QEMU options. This patch creates an appropriate command line for the QEMU instance running in a Linux-based stubdomain. NOTE: a number of items are not currently implemented for Linux-based stubdomains, such as: - save/restore - QMP socket - graphics output (e.g., VNC) Signed-off-by: Eric Shelton Simon: * fix disk path * fix cdrom path and "format" Signed-off-by: Simon Gaiser [drop Qubes-specific parts] Signed-off-by: Marek Marczykowski-Górecki Allow setting stubdomain_ramdisk independently from stubdomain_kernel Add a qemu- prefix for qemu-stubdom-linux-{kernel,rootfs} since stubdom doesn't convey device-model. Use qemu- since this code is qemu specific. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 45 ++++++++++ tools/libxl/libxl_dm.c | 193 +++++++++++++++++++++++++++++-------------- tools/libxl/libxl_internal.h | 1 + tools/libxl/libxl_mem.c | 6 +- tools/libxl/libxl_types.idl | 3 + 5 files changed, 186 insertions(+), 62 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 433947abab..8614a2c241 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -171,6 +171,40 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, } } + if (b_info->type == LIBXL_DOMAIN_TYPE_HVM && + libxl_defbool_val(b_info->device_model_stubdomain)) { + if (!b_info->stubdomain_kernel) { + switch (b_info->device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + b_info->stubdomain_kernel = + libxl__abs_path(NOGC, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + b_info->stubdomain_kernel = + libxl__abs_path(NOGC, + "qemu-stubdom-linux-kernel", + libxl__xenfirmwaredir_path()); + break; + default: + abort(); + } + } + if (!b_info->stubdomain_ramdisk) { + switch (b_info->device_model_version) { + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL: + break; + case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: + b_info->stubdomain_ramdisk = + libxl__abs_path(NOGC, + "qemu-stubdom-linux-rootfs", + libxl__xenfirmwaredir_path()); + break; + default: + abort(); + } + } + } + if (!b_info->max_vcpus) b_info->max_vcpus = 1; if (!b_info->avail_vcpus.size) { @@ -206,6 +240,17 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc, if (b_info->target_memkb == LIBXL_MEMKB_DEFAULT) b_info->target_memkb = b_info->max_memkb; + if (b_info->stubdomain_memkb == LIBXL_MEMKB_DEFAULT) { + if (libxl_defbool_val(b_info->device_model_stubdomain)) { + if (libxl__stubdomain_is_linux(b_info)) + b_info->stubdomain_memkb = LIBXL_LINUX_STUBDOM_MEM * 1024; + else + b_info->stubdomain_memkb = 28 * 1024; // MiniOS + } else { + b_info->stubdomain_memkb = 0; // no stubdomain + } + } + libxl_defbool_setdefault(&b_info->claim_mode, false); libxl_defbool_setdefault(&b_info->localtime, false); diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index b91e63db6f..dc1717bc12 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1188,6 +1188,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, int i, connection, devid; uint64_t ram_size; const char *path, *chardev; + bool is_stubdom = libxl_defbool_val(b_info->device_model_stubdomain); dm_args = flexarray_make(gc, 16, 1); dm_envs = flexarray_make(gc, 16, 1); @@ -1197,39 +1198,42 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_vappend(dm_args, dm, "-xen-domid", GCSPRINTF("%d", guest_domid), NULL); + flexarray_append(dm_args, "-no-shutdown"); - flexarray_append(dm_args, "-chardev"); - if (state->dm_monitor_fd >= 0) { - flexarray_append(dm_args, - GCSPRINTF("socket,id=libxl-cmd,fd=%d,server,nowait", - state->dm_monitor_fd)); + /* There is currently no way to access the QMP socket in the stubdom */ + if (!is_stubdom) { + flexarray_append(dm_args, "-chardev"); + if (state->dm_monitor_fd >= 0) { + flexarray_append(dm_args, + GCSPRINTF("socket,id=libxl-cmd,fd=%d,server,nowait", + state->dm_monitor_fd)); - /* - * Start QEMU with its "CPU" paused, it will not start any emulation - * until the QMP command "cont" is used. This also prevent QEMU from - * writing "running" to the "state" xenstore node so we only use this - * flag when we have the QMP based startup notification. - * */ - flexarray_append(dm_args, "-S"); - } else { - flexarray_append(dm_args, - GCSPRINTF("socket,id=libxl-cmd," - "path=%s,server,nowait", - libxl__qemu_qmp_path(gc, guest_domid))); - } + /* + * Start QEMU with its "CPU" paused, it will not start any emulation + * until the QMP command "cont" is used. This also prevent QEMU from + * writing "running" to the "state" xenstore node so we only use this + * flag when we have the QMP based startup notification. + * */ + flexarray_append(dm_args, "-S"); + } else { + flexarray_append(dm_args, + GCSPRINTF("socket,id=libxl-cmd," + "path=%s,server,nowait", + libxl__qemu_qmp_path(gc, guest_domid))); + } - flexarray_append(dm_args, "-no-shutdown"); - flexarray_append(dm_args, "-mon"); - flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); + flexarray_append(dm_args, "-mon"); + flexarray_append(dm_args, "chardev=libxl-cmd,mode=control"); - flexarray_append(dm_args, "-chardev"); - flexarray_append(dm_args, - GCSPRINTF("socket,id=libxenstat-cmd," - "path=%s/qmp-libxenstat-%d,server,nowait", - libxl__run_dir_path(), guest_domid)); + flexarray_append(dm_args, "-chardev"); + flexarray_append(dm_args, + GCSPRINTF("socket,id=libxenstat-cmd," + "path=%s/qmp-libxenstat-%d,server,nowait", + libxl__run_dir_path(), guest_domid)); - flexarray_append(dm_args, "-mon"); - flexarray_append(dm_args, "chardev=libxenstat-cmd,mode=control"); + flexarray_append(dm_args, "-mon"); + flexarray_append(dm_args, "chardev=libxenstat-cmd,mode=control"); + } for (i = 0; i < guest_config->num_channels; i++) { connection = guest_config->channels[i].connection; @@ -1273,7 +1277,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_vappend(dm_args, "-name", c_info->name, NULL); } - if (vnc) { + if (vnc && !is_stubdom) { char *vncarg = NULL; flexarray_append(dm_args, "-vnc"); @@ -1312,11 +1316,12 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, } flexarray_append(dm_args, vncarg); - } else + } else if (!is_stubdom) { /* * Ensure that by default no vnc server is created. */ flexarray_append_pair(dm_args, "-vnc", "none"); + } /* * Ensure that by default no display backend is created. Further @@ -1324,7 +1329,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, */ flexarray_append_pair(dm_args, "-display", "none"); - if (sdl) { + if (sdl && !is_stubdom) { flexarray_append(dm_args, "-sdl"); if (sdl->display) flexarray_append_pair(dm_envs, "DISPLAY", sdl->display); @@ -1366,18 +1371,34 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, { LOGD(ERROR, guest_domid, "Both serial and serial_list set"); return ERROR_INVAL; - } - if (b_info->u.hvm.serial) { - flexarray_vappend(dm_args, - "-serial", b_info->u.hvm.serial, NULL); - } else if (b_info->u.hvm.serial_list) { - char **p; - for (p = b_info->u.hvm.serial_list; - *p; - p++) { - flexarray_vappend(dm_args, - "-serial", - *p, NULL); + } else { + if (b_info->u.hvm.serial) { + if (is_stubdom) { + /* see spawn_stub_launch_dm() for connecting STUBDOM_CONSOLE_SERIAL */ + flexarray_vappend(dm_args, + "-serial", + GCSPRINTF("/dev/hvc%d", STUBDOM_CONSOLE_SERIAL), + NULL); + } else { + flexarray_vappend(dm_args, + "-serial", b_info->u.hvm.serial, NULL); + } + } else if (b_info->u.hvm.serial_list) { + char **p; + /* see spawn_stub_launch_dm() for connecting STUBDOM_CONSOLE_SERIAL */ + for (p = b_info->u.hvm.serial_list, i = 0; + *p; + p++, i++) { + if (is_stubdom) + flexarray_vappend(dm_args, + "-serial", + GCSPRINTF("/dev/hvc%d", STUBDOM_CONSOLE_SERIAL + i), + NULL); + else + flexarray_vappend(dm_args, + "-serial", + *p, NULL); + } } } } @@ -1386,7 +1407,7 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, flexarray_append(dm_args, "-nographic"); } - if (libxl_defbool_val(b_info->u.hvm.spice.enable)) { + if (libxl_defbool_val(b_info->u.hvm.spice.enable) && !is_stubdom) { const libxl_spice_info *spice = &b_info->u.hvm.spice; char *spiceoptions = dm_spice_options(gc, spice); if (!spiceoptions) @@ -1813,7 +1834,9 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, * If qemu isn't doing the interpreting, the parameter is * always raw */ - if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK) + if (libxl_defbool_val(b_info->device_model_stubdomain)) + format = "host_device"; + else if (disks[i].backend == LIBXL_DISK_BACKEND_QDISK) format = libxl__qemu_disk_format_string(disks[i].format); else format = libxl__qemu_disk_format_string(LIBXL_DISK_FORMAT_RAW); @@ -1824,6 +1847,16 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, disks[i].vdev); continue; } + } else if (libxl_defbool_val(b_info->device_model_stubdomain)) { + if (disk > 'z' - 'a') { + LOGD(WARN, guest_domid, + "Emulation of only first %d disks is supported with qemu-xen in stubdomain.\n" + "Disk %d will be available via PV drivers but not as an emulated disk.", + 'z' - 'a', + disk); + continue; + } + target_path = GCSPRINTF("/dev/xvd%c", 'a' + disk); } else { if (format == NULL) { LOGD(WARN, guest_domid, @@ -1964,7 +1997,7 @@ static int libxl__build_device_model_args(libxl__gc *gc, char ***args, char ***envs, const libxl__domain_build_state *state, int *dm_state_fd) -/* dm_state_fd may be NULL iff caller knows we are using old stubdom +/* dm_state_fd may be NULL iff caller knows we are using stubdom * and therefore will be passing a filename rather than a fd. */ { switch (guest_config->b_info.device_model_version) { @@ -1974,8 +2007,10 @@ static int libxl__build_device_model_args(libxl__gc *gc, args, envs, state); case LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN: - assert(dm_state_fd != NULL); - assert(*dm_state_fd < 0); + if (!libxl_defbool_val(guest_config->b_info.device_model_stubdomain)) { + assert(dm_state_fd != NULL); + assert(*dm_state_fd < 0); + } return libxl__build_device_model_args_new(gc, dm, guest_domid, guest_config, args, envs, @@ -2080,6 +2115,16 @@ retry_transaction: return 0; } +static int libxl__store_libxl_entry(libxl__gc *gc, uint32_t domid, + const char *name, const char *value) +{ + char *path = NULL; + + path = libxl__xs_libxl_path(gc, domid); + path = libxl__sprintf(gc, "%s/%s", path, name); + return libxl__xs_printf(gc, XBT_NULL, path, "%s", value); +} + static void dmss_init(libxl__dm_spawn_state *dmss) { libxl__ev_qmp_init(&dmss->qmp); @@ -2138,10 +2183,14 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dmss_init(&sdss->pvqemu); libxl__xswait_init(&sdss->xswait); - if (guest_config->b_info.device_model_version != - LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN_TRADITIONAL) { - ret = ERROR_INVAL; - goto out; + assert(libxl_defbool_val(guest_config->b_info.device_model_stubdomain)); + + if (libxl__stubdomain_is_linux(&guest_config->b_info)) { + if (d_state->saved_state) { + LOG(ERROR, "Save/Restore not supported yet with Linux Stubdom."); + ret = -1; + goto out; + } } sdss->pvqemu.guest_domid = INVALID_DOMID; @@ -2163,8 +2212,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dm_config->b_info.shadow_memkb = 0; dm_config->b_info.max_vcpus = 1; - dm_config->b_info.max_memkb = 28 * 1024 + - guest_config->b_info.video_memkb; + dm_config->b_info.max_memkb = guest_config->b_info.stubdomain_memkb; + dm_config->b_info.max_memkb += guest_config->b_info.video_memkb; dm_config->b_info.target_memkb = dm_config->b_info.max_memkb; dm_config->b_info.max_grant_frames = guest_config->b_info.max_grant_frames; @@ -2203,10 +2252,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dm_config->num_vkbs = 1; } - stubdom_state->pv_kernel.path - = libxl__abs_path(gc, "ioemu-stubdom.gz", libxl__xenfirmwaredir_path()); - stubdom_state->pv_cmdline = GCSPRINTF(" -d %d", guest_domid); - stubdom_state->pv_ramdisk.path = ""; + stubdom_state->pv_kernel.path = guest_config->b_info.stubdomain_kernel; + stubdom_state->pv_ramdisk.path = guest_config->b_info.stubdomain_ramdisk; /* fixme: this function can leak the stubdom if it fails */ ret = libxl__domain_make(gc, dm_config, stubdom_state, @@ -2226,6 +2273,8 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) goto out; } + libxl__store_libxl_entry(gc, guest_domid, "dm-version", + libxl_device_model_version_to_string(dm_config->b_info.device_model_version)); libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/image/device-model-domid", @@ -2235,6 +2284,15 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) GCSPRINTF("%s/target", libxl__xs_get_dompath(gc, dm_domid)), "%d", guest_domid); + if (guest_config->b_info.device_model_version == LIBXL_DEVICE_MODEL_VERSION_QEMU_XEN) { + /* qemu-xen is used as a dm in the stubdomain, so we set the bios + * accroding to this */ + libxl__xs_printf(gc, XBT_NULL, + libxl__sprintf(gc, "%s/hvmloader/bios", + libxl__xs_get_dompath(gc, guest_domid)), + "%s", + libxl_bios_type_to_string(guest_config->b_info.u.hvm.bios)); + } ret = xc_domain_set_target(ctx->xch, dm_domid, guest_domid); if (ret<0) { LOGED(ERROR, guest_domid, "setting target domain %d -> %d", @@ -2314,8 +2372,13 @@ static void spawn_stub_launch_dm(libxl__egc *egc, if (ret) goto out; } - if (guest_config->b_info.u.hvm.serial) + if (guest_config->b_info.u.hvm.serial) { num_console++; + } else if (guest_config->b_info.u.hvm.serial_list) { + char **serial = guest_config->b_info.u.hvm.serial_list; + while (*(serial++)) + num_console++; + } console = libxl__calloc(gc, num_console, sizeof(libxl__device_console)); @@ -2349,8 +2412,18 @@ static void spawn_stub_launch_dm(libxl__egc *egc, console[i].output = GCSPRINTF("pipe:%s", d_state->saved_state); break; + case STUBDOM_CONSOLE_SERIAL: + if (guest_config->b_info.u.hvm.serial) { + console[i].output = guest_config->b_info.u.hvm.serial; + break; + } + /* fall-through */ default: - console[i].output = "pty"; + /* Serial_list is set, as otherwise num_consoles would be + * smaller and consoles 0-2 are handled above. */ + assert(guest_config->b_info.u.hvm.serial_list); + console[i].output = guest_config->b_info.u.hvm.serial_list[ + i-STUBDOM_CONSOLE_SERIAL]; break; } } diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index d1ebdec8d2..f2f76439ec 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -119,6 +119,7 @@ #define STUBDOM_CONSOLE_RESTORE 2 #define STUBDOM_CONSOLE_SERIAL 3 #define STUBDOM_SPECIAL_CONSOLES 3 +#define LIBXL_LINUX_STUBDOM_MEM 128 #define TAP_DEVICE_SUFFIX "-emu" #define DOMID_XS_PATH "domid" #define PVSHIM_BASENAME "xen-shim" diff --git a/tools/libxl/libxl_mem.c b/tools/libxl/libxl_mem.c index bc7b95aa74..e52a9624ea 100644 --- a/tools/libxl/libxl_mem.c +++ b/tools/libxl/libxl_mem.c @@ -459,8 +459,10 @@ int libxl__domain_need_memory_calculate(libxl__gc *gc, case LIBXL_DOMAIN_TYPE_PVH: case LIBXL_DOMAIN_TYPE_HVM: *need_memkb += LIBXL_HVM_EXTRA_MEMORY; - if (libxl_defbool_val(b_info->device_model_stubdomain)) - *need_memkb += 32 * 1024; + if (libxl_defbool_val(b_info->device_model_stubdomain)) { + *need_memkb += b_info->stubdomain_memkb; + *need_memkb += b_info->video_memkb; + } break; case LIBXL_DOMAIN_TYPE_PV: *need_memkb += LIBXL_PV_EXTRA_MEMORY; diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index f7c473be74..9d3f05f399 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -518,6 +518,9 @@ libxl_domain_build_info = Struct("domain_build_info",[ ("device_model_version", libxl_device_model_version), ("device_model_stubdomain", libxl_defbool), + ("stubdomain_memkb", MemKB), + ("stubdomain_kernel", string), + ("stubdomain_ramdisk", string), # if you set device_model you must set device_model_version too ("device_model", string), ("device_model_ssidref", uint32), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:57:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:57:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1s-00066e-OW; Wed, 20 May 2020 16:57:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1r-00066U-J8 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:15 +0000 X-Inumbo-ID: f4bebc44-9aba-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f4bebc44-9aba-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:57:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=qEFX1hcBMd1Gd9fhoeJgd2/QSy2gvx0xsE/dPTudFyI=; b=U+UqCj9izNx4dWfmXwTjUxASim 3/pcKXA+qEt2gE+0nUSTb7nxgndGDjLNBv3+VEi623+aT4Y03ahkbIonVhK91+dR4C0mTQTiUBoaZ HHEpf0m1fAcnN70EcYB1OG5F7j2hOgGoQynvADkzAyKFBadYc9d4wTZ+bMNgAN8advU8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS1q-0007FR-R2 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS1q-0004XS-Pw for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/python: Fix install-wrap Message-Id: Date: Wed, 20 May 2020 16:57:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 78f81c6870dea1fe3a583b5e07eeb1cbb01461f0 Author: Anthony PERARD AuthorDate: Wed Mar 11 17:59:32 2020 +0000 Commit: Wei Liu CommitDate: Tue May 19 11:40:50 2020 +0100 tools/python: Fix install-wrap This allows to use install-wrap when the source scripts is in a subdirectory. Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- tools/python/install-wrap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/python/install-wrap b/tools/python/install-wrap index 00e2014016..fef24e0170 100755 --- a/tools/python/install-wrap +++ b/tools/python/install-wrap @@ -44,7 +44,7 @@ shift destf="$dest" for srcf in ${srcs}; do if test -d "$dest"; then - destf="$dest/${srcf%%*/}" + destf="$dest/${srcf##*/}" fi org="$(sed -n '2q; /^#! *\/usr\/bin\/env python *$/p' $srcf)" if test "x$org" = x; then -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:57:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:57:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS22-00069B-Q7; Wed, 20 May 2020 16:57:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS21-000694-IW for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:25 +0000 X-Inumbo-ID: f9be51ab-9aba-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f9be51ab-9aba-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:57:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0v0HiB06HVfRPcIB2hazU/g+ualSgVUZfOlGCiPLshs=; b=arHZ/MDXRGK8WITlfeKIIFERw/ /oCF47avIH+Z9Sv9J6VXWsdeTqcXpvl/htyxrRTKojFkx8UuWzIbe8eyoOq2RBstYFkVNde0nHlU6 o16bDb2mjNb7tVsNG/7IIEQYrFUxELyB5uUNPZa2d6Jdz0LMc4cm7TQqfRyQJyVOW6Hs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS20-0007H6-Tg for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS20-0004YE-Si for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools: Use INSTALL_PYTHON_PROG Message-Id: Date: Wed, 20 May 2020 16:57:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 271ade5a621005f86ec928280dc6ac85f2c4c95a Author: Anthony PERARD AuthorDate: Wed Mar 11 17:59:33 2020 +0000 Commit: Wei Liu CommitDate: Tue May 19 11:40:53 2020 +0100 tools: Use INSTALL_PYTHON_PROG Whenever python scripts are install, have the shebang be modified to use whatever PYTHON_PATH is. This is useful for system where python isn't available, or where the package build tools prevent unversioned shebang. INSTALL_PYTHON_PROG only looks for "#!/usr/bin/env python". Signed-off-by: Anthony PERARD Acked-by: Wei Liu --- tools/misc/xencov_split | 2 +- tools/python/Makefile | 4 ++-- tools/xenmon/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/misc/xencov_split b/tools/misc/xencov_split index 1f20518b86..5771f6cfc2 100755 --- a/tools/misc/xencov_split +++ b/tools/misc/xencov_split @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys, os, os.path as path, struct, errno from optparse import OptionParser diff --git a/tools/python/Makefile b/tools/python/Makefile index e99f78a537..8d22c03676 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -20,8 +20,8 @@ install: setup.py install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \ --root="$(DESTDIR)" --force - $(INSTALL_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) - $(INSTALL_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN) .PHONY: uninstall uninstall: diff --git a/tools/xenmon/Makefile b/tools/xenmon/Makefile index e1712304d0..3e150b0659 100644 --- a/tools/xenmon/Makefile +++ b/tools/xenmon/Makefile @@ -32,7 +32,7 @@ install: build $(INSTALL_DIR) $(DESTDIR)$(sbindir) $(INSTALL_PROG) xenbaked $(DESTDIR)$(sbindir)/xenbaked $(INSTALL_PROG) xentrace_setmask $(DESTDIR)$(sbindir)/xentrace_setmask - $(INSTALL_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon + $(INSTALL_PYTHON_PROG) xenmon.py $(DESTDIR)$(sbindir)/xenmon .PHONY: uninstall uninstall: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:57:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:57:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2C-0006AP-Rp; Wed, 20 May 2020 16:57:36 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2B-0006AG-MF for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:35 +0000 X-Inumbo-ID: 00c88a88-9abb-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 00c88a88-9abb-11ea-9887-bc764e2007e4; Wed, 20 May 2020 16:57:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4C9EG+txNwpNySM7G5noVXw2Jmlni2gg3JXfjQZW7ZM=; b=0X/ooapTArcckB1Pc3Ro3hEV+s gypcl6GRF/qXY0lK2KNJ5Ii2VdbFewpyv1DIRm4otOpWnFgNjw1JVVSw9VRPgjrCgQMBPP4PE8MgO SaH8P1OG35a27mhhMwVqx6ukLA6uKvvftngJbXU79zK/Y9q/4Q1Pwepqfk7++muZrDzI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2B-0007HG-0N for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS2A-0004Z5-Vg for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: Use libxl__xs_* in libxl__write_stub_dmargs Message-Id: Date: Wed, 20 May 2020 16:57:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6d721be59d1b57088ab6ae92bcf79d0ac91fad18 Author: Jason Andryuk AuthorDate: Mon May 18 21:54:50 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:05 2020 +0100 libxl: Use libxl__xs_* in libxl__write_stub_dmargs Re-work libxl__write_stub_dmargs to use libxl_xs_* functions in a loop. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 53 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index dc1717bc12..8e57cd8c1f 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2070,21 +2070,18 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, int dm_domid, int guest_domid, char **args) { - libxl_ctx *ctx = libxl__gc_owner(gc); int i; - char *vm_path; - char *dmargs, *path; + char *dmargs; int dmargs_size; struct xs_permissions roperm[2]; - xs_transaction_t t; + xs_transaction_t t = XBT_NULL; + int rc; roperm[0].id = 0; roperm[0].perms = XS_PERM_NONE; roperm[1].id = dm_domid; roperm[1].perms = XS_PERM_READ; - vm_path = libxl__xs_read(gc, XBT_NULL, GCSPRINTF("/local/domain/%d/vm", guest_domid)); - i = 0; dmargs_size = 0; while (args[i] != NULL) { @@ -2102,17 +2099,43 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, } i++; } - path = GCSPRINTF("%s/image/dmargs", vm_path); -retry_transaction: - t = xs_transaction_start(ctx->xsh); - xs_write(ctx->xsh, t, path, dmargs, strlen(dmargs)); - xs_set_permissions(ctx->xsh, t, path, roperm, ARRAY_SIZE(roperm)); - xs_set_permissions(ctx->xsh, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), roperm, ARRAY_SIZE(roperm)); - if (!xs_transaction_end(ctx->xsh, t, 0)) - if (errno == EAGAIN) - goto retry_transaction; + for (;;) { + const char *vm_path; + char *path; + + rc = libxl__xs_transaction_start(gc, &t); + if (rc) goto out; + + rc = libxl__xs_read_mandatory(gc, t, + GCSPRINTF("/local/domain/%d/vm", + guest_domid), + &vm_path); + if (rc) goto out; + + path = GCSPRINTF("%s/image/dmargs", vm_path); + + rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + + rc = libxl__xs_write_checked(gc, t, path, dmargs); + if (rc) goto out; + + rc = libxl__xs_mknod(gc, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), + roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + + rc = libxl__xs_transaction_commit(gc, &t); + if (!rc) break; + if (rc<0) goto out; + } + return 0; + + out: + libxl__xs_transaction_abort(gc, &t); + + return rc; } static int libxl__store_libxl_entry(libxl__gc *gc, uint32_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:57:46 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:57:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2M-0006BU-Tu; Wed, 20 May 2020 16:57:46 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2L-0006BN-QM for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:45 +0000 X-Inumbo-ID: 06c7b8be-9abb-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 06c7b8be-9abb-11ea-9887-bc764e2007e4; Wed, 20 May 2020 16:57:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wl3qQEEcL7kk3QDw4LDdBUHqNVLMl2Ckxc+m52K6Rdo=; b=kSrP0pQmTYBSwoaywsEhBFP9tY VGubkNF8nCQUNxQGPWYUjzA8uM1abgRUIPqwOqeCNecaJTI7+AqIaWy1aZCuikoSlXzOWVPCuBjY9 nWqEyiHoV9dlk0FMT6jJeWSGPzsI+r2yDZD2ILwr7Gc6LerCvS80FlbRck4dHTUxBG3E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2L-0007HT-36 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS2L-0004Zi-2F for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: write qemu arguments into separate xenstore keys Message-Id: Date: Wed, 20 May 2020 16:57:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dabc571b7292c3cdd51734b709a663eaa45345a1 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:51 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:08 2020 +0100 libxl: write qemu arguments into separate xenstore keys This allows using arguments with spaces, like -append, without nominating any special "separator" character. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Write arguments in dm-argv directory instead of overloading mini-os's dmargs string. Make libxl__write_stub_dmargs vary behaviour based on the is_linux_stubdom flag. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 77 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 28 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8e57cd8c1f..23b13f84d2 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2068,13 +2068,11 @@ static int libxl__vfb_and_vkb_from_hvm_guest_config(libxl__gc *gc, static int libxl__write_stub_dmargs(libxl__gc *gc, int dm_domid, int guest_domid, - char **args) + char **args, bool is_linux_stubdom) { - int i; - char *dmargs; - int dmargs_size; struct xs_permissions roperm[2]; xs_transaction_t t = XBT_NULL; + char *dmargs; int rc; roperm[0].id = 0; @@ -2082,22 +2080,27 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, roperm[1].id = dm_domid; roperm[1].perms = XS_PERM_READ; - i = 0; - dmargs_size = 0; - while (args[i] != NULL) { - dmargs_size = dmargs_size + strlen(args[i]) + 1; - i++; - } - dmargs_size++; - dmargs = (char *) libxl__malloc(gc, dmargs_size); - i = 1; - dmargs[0] = '\0'; - while (args[i] != NULL) { - if (strcmp(args[i], "-sdl") && strcmp(args[i], "-M") && strcmp(args[i], "xenfv")) { - strcat(dmargs, " "); - strcat(dmargs, args[i]); + if (!is_linux_stubdom) { + int dmargs_size = 0; + int i = 0; + + while (args[i] != NULL) { + dmargs_size = dmargs_size + strlen(args[i]) + 1; + i++; + } + + dmargs_size++; + dmargs = (char *) libxl__malloc(gc, dmargs_size); + + i = 1; + dmargs[0] = '\0'; + while (args[i] != NULL) { + if (strcmp(args[i], "-sdl") && strcmp(args[i], "-M") && strcmp(args[i], "xenfv")) { + strcat(dmargs, " "); + strcat(dmargs, args[i]); + } + i++; } - i++; } for (;;) { @@ -2113,17 +2116,33 @@ static int libxl__write_stub_dmargs(libxl__gc *gc, &vm_path); if (rc) goto out; - path = GCSPRINTF("%s/image/dmargs", vm_path); + if (is_linux_stubdom) { + int i; - rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); - if (rc) goto out; + path = GCSPRINTF("%s/image/dm-argv", vm_path); - rc = libxl__xs_write_checked(gc, t, path, dmargs); - if (rc) goto out; + rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; - rc = libxl__xs_mknod(gc, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), - roperm, ARRAY_SIZE(roperm)); - if (rc) goto out; + for (i=1; args[i] != NULL; i++) { + rc = libxl__xs_write_checked(gc, t, + GCSPRINTF("%s/%03d", path, i), + args[i]); + if (rc) goto out; + } + } else { + path = GCSPRINTF("%s/image/dmargs", vm_path); + + rc = libxl__xs_mknod(gc, t, path, roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + + rc = libxl__xs_write_checked(gc, t, path, dmargs); + if (rc) goto out; + + rc = libxl__xs_mknod(gc, t, GCSPRINTF("%s/rtc/timeoffset", vm_path), + roperm, ARRAY_SIZE(roperm)); + if (rc) goto out; + } rc = libxl__xs_transaction_commit(gc, &t); if (!rc) break; @@ -2298,7 +2317,9 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) libxl__store_libxl_entry(gc, guest_domid, "dm-version", libxl_device_model_version_to_string(dm_config->b_info.device_model_version)); - libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args); + + libxl__write_stub_dmargs(gc, dm_domid, guest_domid, args, + libxl__stubdomain_is_linux(&guest_config->b_info)); libxl__xs_printf(gc, XBT_NULL, GCSPRINTF("%s/image/device-model-domid", libxl__xs_get_dompath(gc, guest_domid)), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:57:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:57:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2W-0006CX-Vc; Wed, 20 May 2020 16:57:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2V-0006CM-Qg for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:55 +0000 X-Inumbo-ID: 0cca80f2-9abb-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0cca80f2-9abb-11ea-9887-bc764e2007e4; Wed, 20 May 2020 16:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mw5aIdBm/w2gQ92qwFQqhPmtO7qV3kbmmlzCxC6Dpvc=; b=U8Ym8rP3Q74BKF9XKYeP9+pwqX rKkog+aJvcCNY+2qd3vFsP9iuH6XdxB8B70b/5gVJELLYXmiw3Nj4IOnK60yAwfJ2lveScUwi/bDE Fwabhbas8re1VDGe3vmJyTpOvLOkVFcZFY8PhjzsVw71ATXn2UkDQEujfwTLDKXka6XI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2V-0007He-67 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS2V-0004aR-59 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:57:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xl: add stubdomain related options to xl config parser Message-Id: Date: Wed, 20 May 2020 16:57:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f76a0fa109ab48ec6e910bce3b45804ef6f0915d Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:52 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 xl: add stubdomain related options to xl config parser Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/man/xl.cfg.5.pod.in | 27 +++++++++++++++++++++++---- tools/xl/xl_parse.c | 7 +++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index 0e9e58a41a..c9bc181a95 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -2733,10 +2733,29 @@ model which they were installed with. =item B -Override the path to the binary to be used as the device-model. The -binary provided here MUST be consistent with the -B which you have specified. You should not -normally need to specify this option. +Override the path to the binary to be used as the device-model running in +toolstack domain. The binary provided here MUST be consistent with the +B which you have specified. You should not normally need +to specify this option. + +=item B + +Override the path to the kernel image used as device-model stubdomain. +The binary provided here MUST be consistent with the +B which you have specified. +In case of B it is expected to be MiniOS-based stubdomain +image, in case of B it is expected to be Linux-based stubdomain +kernel. + +=item B + +Override the path to the ramdisk image used as device-model stubdomain. +The binary provided here is to be used by a kernel pointed by B. +It is known to be used only by Linux-based stubdomain kernel. + +=item B + +Start the stubdomain with MBYTES megabytes of RAM. Default is 128. =item B diff --git a/tools/xl/xl_parse.c b/tools/xl/xl_parse.c index 4450d59f16..61b4ef7b7e 100644 --- a/tools/xl/xl_parse.c +++ b/tools/xl/xl_parse.c @@ -2525,6 +2525,13 @@ skip_usbdev: xlu_cfg_replace_string(config, "device_model_user", &b_info->device_model_user, 0); + xlu_cfg_replace_string (config, "stubdomain_kernel", + &b_info->stubdomain_kernel, 0); + xlu_cfg_replace_string (config, "stubdomain_ramdisk", + &b_info->stubdomain_ramdisk, 0); + if (!xlu_cfg_get_long (config, "stubdomain_memory", &l, 0)) + b_info->stubdomain_memkb = l * 1024; + #define parse_extra_args(type) \ e = xlu_cfg_get_list_as_string_list(config, "device_model_args"#type, \ &b_info->extra##type, 0); \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:58:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:58:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2h-0006Dw-0y; Wed, 20 May 2020 16:58:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2f-0006Dm-Rx for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:05 +0000 X-Inumbo-ID: 12d07768-9abb-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 12d07768-9abb-11ea-b07b-bc764e2007e4; Wed, 20 May 2020 16:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EHzVq2oWSYVGeFoDjb48MM0qV+CbELOSNs7MopFs9v4=; b=sjTk3rU1uiemCpB6WeOtpdmRtY onsUrMfhufds0Mb5s9JBrON9g53dc2pdzPgpI6PwNGi4OltVHh1LKK1NVdtErWba0WCKy3XcTtlmk gO8NlbIC/pndFFSVNgGFXVxO4pa1j+ehRzGNx4GM82QRZjBPvycPnZV+JxIMRST6tXGQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2f-0007I0-99 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS2f-0004bB-83 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/libvchan: notify server when client is connected Message-Id: Date: Wed, 20 May 2020 16:58:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dae844977e1e10dc859ec21612f1811ca5d5f128 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:53 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 tools/libvchan: notify server when client is connected Let the server know when the client is connected. Otherwise server will notice only when client send some data. This change does not break existing clients, as libvchan user should handle spurious notifications anyway (for example acknowledge of remote side reading the data). Cc: Daniel De Graaf Signed-off-by: Marek Marczykowski-Górecki Replace spaces with tabs to match the file's whitespace. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libvchan/init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index 180833dc2f..ad4b64fbe3 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -447,6 +447,9 @@ struct libxenvchan *libxenvchan_client_init(struct xentoollog_logger *logger, ctrl->ring->cli_live = 1; ctrl->ring->srv_notify = VCHAN_NOTIFY_WRITE; + /* wake up the server */ + xenevtchn_notify(ctrl->event, ctrl->event_port); + out: if (xs) xs_daemon_close(xs); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:58:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:58:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2r-0006FJ-45; Wed, 20 May 2020 16:58:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2q-0006FD-PJ for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:16 +0000 X-Inumbo-ID: 18d35a54-9abb-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 18d35a54-9abb-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:58:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=aVtY2D8Rjf1nIMFrGlW5ODkzuF3ykeQrXrRt75tLh58=; b=QA5NFdALA/0Tx6UBw66kG5INLm +rmxaTg6/cD435Xcq3MuA5Cs7ZVfAfxyMG1zyzl5LazDGkyro3NMN7+pgE8NeQKq05c1D4WFUilOq 2KzJx8Rv9uAoqbomCIulaZ/VoD6PcWpawTGCH5qgJId8VWNlu0waGFK7JZ7k77oFLxCk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2p-0007I9-Br for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS2p-0004br-Aw for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: add save/restore support for qemu-xen in stubdomain Message-Id: Date: Wed, 20 May 2020 16:58:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 449901fc966613c1829d92570df237d4d904cdf5 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:54 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: add save/restore support for qemu-xen in stubdomain Rely on a wrapper script in stubdomain to attach relevant consoles to qemu. The save console (1) must be attached to fdset/1. When performing a restore, $STUBDOM_RESTORE_INCOMING_ARG must be replaced on the qemu command line by "fd:$FD", where $FD is an open file descriptor number to the restore console (2). Signed-off-by: Marek Marczykowski-Górecki Address TODO in dm_state_save_to_fdset: Only remove savefile for non-stubdom. Use $STUBDOM_RESTORE_INCOMING_ARG instead of fd:3 and update commit message. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 25 +++++++++++++------------ tools/libxl/libxl_qmp.c | 27 +++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 14 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 23b13f84d2..62d0d46c98 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1745,10 +1745,19 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, } if (state->saved_state) { - /* This file descriptor is meant to be used by QEMU */ - *dm_state_fd = open(state->saved_state, O_RDONLY); - flexarray_append(dm_args, "-incoming"); - flexarray_append(dm_args, GCSPRINTF("fd:%d",*dm_state_fd)); + if (is_stubdom) { + /* Linux stubdomain must replace $STUBDOM_RESTORE_INCOMING_ARG + * with the approriate fd:$num argument for the + * STUBDOM_CONSOLE_RESTORE console 2. + */ + flexarray_append(dm_args, "-incoming"); + flexarray_append(dm_args, "$STUBDOM_RESTORE_INCOMING_ARG"); + } else { + /* This file descriptor is meant to be used by QEMU */ + *dm_state_fd = open(state->saved_state, O_RDONLY); + flexarray_append(dm_args, "-incoming"); + flexarray_append(dm_args, GCSPRINTF("fd:%d",*dm_state_fd)); + } } for (i = 0; b_info->extra && b_info->extra[i] != NULL; i++) flexarray_append(dm_args, b_info->extra[i]); @@ -2227,14 +2236,6 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) assert(libxl_defbool_val(guest_config->b_info.device_model_stubdomain)); - if (libxl__stubdomain_is_linux(&guest_config->b_info)) { - if (d_state->saved_state) { - LOG(ERROR, "Save/Restore not supported yet with Linux Stubdom."); - ret = -1; - goto out; - } - } - sdss->pvqemu.guest_domid = INVALID_DOMID; libxl_domain_create_info_init(&dm_config->c_info); diff --git a/tools/libxl/libxl_qmp.c b/tools/libxl/libxl_qmp.c index efaba91086..c394000ea9 100644 --- a/tools/libxl/libxl_qmp.c +++ b/tools/libxl/libxl_qmp.c @@ -962,6 +962,7 @@ static void dm_stopped(libxl__egc *egc, libxl__ev_qmp *ev, const libxl__json_object *response, int rc); static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, const libxl__json_object *response, int rc); +static void dm_state_save_to_fdset(libxl__egc *egc, libxl__ev_qmp *ev, int fdset); static void dm_state_saved(libxl__egc *egc, libxl__ev_qmp *ev, const libxl__json_object *response, int rc); @@ -994,10 +995,17 @@ static void dm_stopped(libxl__egc *egc, libxl__ev_qmp *ev, EGC_GC; libxl__domain_suspend_state *dsps = CONTAINER_OF(ev, *dsps, qmp); const char *const filename = dsps->dm_savefile; + uint32_t dm_domid = libxl_get_stubdom_id(CTX, dsps->domid); if (rc) goto error; + if (dm_domid) { + /* see Linux stubdom interface in docs/stubdom.txt */ + dm_state_save_to_fdset(egc, ev, 1); + return; + } + ev->payload_fd = open(filename, O_WRONLY | O_CREAT, 0600); if (ev->payload_fd < 0) { LOGED(ERROR, ev->domid, @@ -1028,7 +1036,6 @@ static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, EGC_GC; int fdset; const libxl__json_object *o; - libxl__json_object *args = NULL; libxl__domain_suspend_state *dsps = CONTAINER_OF(ev, *dsps, qmp); close(ev->payload_fd); @@ -1043,6 +1050,21 @@ static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, goto error; } fdset = libxl__json_object_get_integer(o); + dm_state_save_to_fdset(egc, ev, fdset); + return; + +error: + assert(rc); + libxl__remove_file(gc, dsps->dm_savefile); + dsps->callback_device_model_done(egc, dsps, rc); +} + +static void dm_state_save_to_fdset(libxl__egc *egc, libxl__ev_qmp *ev, int fdset) +{ + EGC_GC; + int rc; + libxl__json_object *args = NULL; + libxl__domain_suspend_state *dsps = CONTAINER_OF(ev, *dsps, qmp); ev->callback = dm_state_saved; @@ -1060,7 +1082,8 @@ static void dm_state_fd_ready(libxl__egc *egc, libxl__ev_qmp *ev, error: assert(rc); - libxl__remove_file(gc, dsps->dm_savefile); + if (!libxl_get_stubdom_id(CTX, dsps->domid)) + libxl__remove_file(gc, dsps->dm_savefile); dsps->callback_device_model_done(egc, dsps, rc); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:58:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:58:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS31-0006GR-5e; Wed, 20 May 2020 16:58:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS30-0006GJ-PP for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:26 +0000 X-Inumbo-ID: 1ed5b0f0-9abb-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1ed5b0f0-9abb-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:58:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bUH/DN2NFxY2cXAG1GqSe6T0LqlrpboJ4tFKaP+OJsI=; b=Rl5+1OuC3BLhR4Sjlt/RDVLS6j uHnb/GH4oEdsz96YF70dcNb5/s0osXLEjLAEgl6fArSiXMiVrOnYbA+sR+5uZgYgNgb/+vMvS+oJK bWEl7tkYI0BYkzKIeJTY0wniFdV5BpEilEVAW+/GK+lilS1LxQNbb1IteoLdrVqyhKso=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS2z-0007Im-Eg for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS2z-0004cL-Dc for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools: add missing libxenvchan cflags Message-Id: Date: Wed, 20 May 2020 16:58:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7f6bce6386824a6c69ea852cfa40673b0350f4d1 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:55 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 tools: add missing libxenvchan cflags libxenvchan.h include xenevtchn.h and xengnttab.h, so applications built with it needs applicable -I in CFLAGS too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/Rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 5b8cf748ad..59c72e7a88 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -157,7 +157,7 @@ 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) +CFLAGS_libxenvchan = -I$(XEN_LIBVCHAN) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) SHDEPS_libxenvchan = $(SHLIB_libxentoollog) $(SHLIB_libxenstore) $(SHLIB_libxenevtchn) $(SHLIB_libxengnttab) LDLIBS_libxenvchan = $(SHDEPS_libxenvchan) $(XEN_LIBVCHAN)/libxenvchan$(libextension) SHLIB_libxenvchan = $(SHDEPS_libxenvchan) -Wl,-rpath-link=$(XEN_LIBVCHAN) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:58:38 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:58:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3C-0006HT-7I; Wed, 20 May 2020 16:58:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3B-0006HM-1R for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:37 +0000 X-Inumbo-ID: 24d8c65e-9abb-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 24d8c65e-9abb-11ea-b9cf-bc764e2007e4; Wed, 20 May 2020 16:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LFrKmoO0xNwyyxWDONk7BncZPcMmoiMnT+c37cxfRhM=; b=VDZk1IPZQn2FNXAj/3DJBC6Imj 6GdnfsSJftN5FcBz4HHOFA56Yoq0YhL1xdqZYy2JOCIBMK52LL8LVKvgA96LIOjyU6BWzISLnGfEl mSa5pW0WNd+YEJ+8+tgWhGEWX6ukLp/4ADsYXITJihI56ifbFXmoVm+D7WhO5b9o8Jf8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS39-0007Iv-HX for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS39-0004cq-Gc for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools: add simple vchan-socket-proxy Message-Id: Date: Wed, 20 May 2020 16:58:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 14fe3ace50c3853670370d8b8ff93b066420a5e0 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:56 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 tools: add simple vchan-socket-proxy Add a simple proxy for tunneling socket connection over vchan. This is based on existing vchan-node* applications, but extended with socket support. vchan-socket-proxy serves both as a client and as a server, depending on parameters. It can be used to transparently communicate with an application in another domian that normally expose UNIX socket interface. Specifically, it's written to communicate with qemu running within stubdom. Server mode listens for vchan connections and when one is opened, connects to a pointed UNIX socket. Client mode listens on UNIX socket and when someone connects, opens a vchan connection. Only a single connection at a time is supported. Additionally, socket can be provided as a number - in which case it's interpreted as already open FD (in case of UNIX listening socket - listen() needs to be already called). Or "-" meaning stdin/stdout - in which case it is reduced to vchan-node2 functionality. Example usage: 1. (in dom0) vchan-socket-proxy --mode=client /local/domain//data/vchan/1234 /run/qemu.(DOMID) 2. (in DOMID) vchan-socket-proxy --mode=server 0 /local/domain//data/vchan/1234 /run/qemu.(DOMID) This will listen on /run/qemu.(DOMID) in dom0 and whenever connection is made, it will connect to DOMID, where server process will connect to /run/qemu.(DOMID) there. When client disconnects, vchan connection is terminated and server vchan-socket-proxy process also disconnects from qemu. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- .gitignore | 1 + tools/libvchan/Makefile | 8 +- tools/libvchan/vchan-socket-proxy.c | 478 ++++++++++++++++++++++++++++++++++++ 3 files changed, 486 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index bfa53723b3..7418ce9829 100644 --- a/.gitignore +++ b/.gitignore @@ -369,6 +369,7 @@ tools/misc/xenwatchdogd tools/misc/xen-hvmcrash tools/misc/xen-lowmemd tools/libvchan/vchan-node[12] +tools/libvchan/vchan-socket-proxy tools/ocaml/*/.ocamldep.make tools/ocaml/*/*.cm[ixao] tools/ocaml/*/*.cmxa diff --git a/tools/libvchan/Makefile b/tools/libvchan/Makefile index 7892750c3e..913bcc8884 100644 --- a/tools/libvchan/Makefile +++ b/tools/libvchan/Makefile @@ -13,6 +13,7 @@ LIBVCHAN_PIC_OBJS = $(patsubst %.o,%.opic,$(LIBVCHAN_OBJS)) LIBVCHAN_LIBS = $(LDLIBS_libxenstore) $(LDLIBS_libxengnttab) $(LDLIBS_libxenevtchn) $(LIBVCHAN_OBJS) $(LIBVCHAN_PIC_OBJS): CFLAGS += $(CFLAGS_libxenstore) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) $(NODE_OBJS) $(NODE2_OBJS): CFLAGS += $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) +vchan-socket-proxy.o: CFLAGS += $(CFLAGS_libxenstore) $(CFLAGS_libxenctrl) $(CFLAGS_libxengnttab) $(CFLAGS_libxenevtchn) MAJOR = 4.14 MINOR = 0 @@ -39,7 +40,7 @@ $(PKG_CONFIG_LOCAL): PKG_CONFIG_LIBDIR = $(CURDIR) $(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL = $(CFLAGS_xeninclude) .PHONY: all -all: libxenvchan.so vchan-node1 vchan-node2 libxenvchan.a $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) +all: libxenvchan.so vchan-node1 vchan-node2 vchan-socket-proxy libxenvchan.a $(PKG_CONFIG_INST) $(PKG_CONFIG_LOCAL) libxenvchan.so: libxenvchan.so.$(MAJOR) ln -sf $< $@ @@ -59,13 +60,18 @@ vchan-node1: $(NODE_OBJS) libxenvchan.so vchan-node2: $(NODE2_OBJS) libxenvchan.so $(CC) $(LDFLAGS) -o $@ $(NODE2_OBJS) $(LDLIBS_libxenvchan) $(APPEND_LDFLAGS) +vchan-socket-proxy: vchan-socket-proxy.o libxenvchan.so + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenvchan) $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) + .PHONY: install install: all $(INSTALL_DIR) $(DESTDIR)$(libdir) $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROG) libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) ln -sf libxenvchan.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir)/libxenvchan.so.$(MAJOR) ln -sf libxenvchan.so.$(MAJOR) $(DESTDIR)$(libdir)/libxenvchan.so + $(INSTALL_PROG) vchan-socket-proxy $(DESTDIR)$(bindir) $(INSTALL_DATA) libxenvchan.h $(DESTDIR)$(includedir) $(INSTALL_DATA) libxenvchan.a $(DESTDIR)$(libdir) $(INSTALL_DATA) xenvchan.pc $(DESTDIR)$(PKG_INSTALLDIR) diff --git a/tools/libvchan/vchan-socket-proxy.c b/tools/libvchan/vchan-socket-proxy.c new file mode 100644 index 0000000000..13700c5d67 --- /dev/null +++ b/tools/libvchan/vchan-socket-proxy.c @@ -0,0 +1,478 @@ +/** + * @file + * @section AUTHORS + * + * Copyright (C) 2010 Rafal Wojtczuk + * + * Authors: + * Rafal Wojtczuk + * Daniel De Graaf + * Marek Marczykowski-Górecki + * + * @section LICENSE + * + * This program 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; either + * version 2.1 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; If not, see . + * + * @section DESCRIPTION + * + * This is a vchan to unix socket proxy. Vchan server is set, and on client + * connection, local socket connection is established. Communication is bidirectional. + * One client is served at a time, clients needs to coordinate this themselves. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +static void usage(char** argv) +{ + fprintf(stderr, "usage:\n" + "\t%s [options] domainid nodepath [socket-path|file-no|-]\n" + "\n" + "options:\n" + "\t-m, --mode=client|server - vchan connection mode (client by default)\n" + "\t-s, --state-path=path - xenstore path where write \"running\" to \n" + "\t at startup\n" + "\t-v, --verbose - verbose logging\n" + "\n" + "client: client of a vchan connection, fourth parameter can be:\n" + "\tsocket-path: listen on a UNIX socket at this path and connect to vchan\n" + "\t whenever new connection is accepted;\n" + "\t handle multiple _subsequent_ connections, until terminated\n" + "\n" + "\tfile-no: except open FD of a socket in listen mode;\n" + "\t otherwise similar to socket-path\n" + "\n" + "\t-: open vchan connection immediately and pass the data\n" + "\t from stdin/stdout; terminate when vchan connection\n" + "\t is closed\n" + "\n" + "server: server of a vchan connection, fourth parameter can be:\n" + "\tsocket-path: connect to this UNIX socket when new vchan connection\n" + "\t is accepted;\n" + "\t handle multiple _subsequent_ connections, until terminated\n" + "\n" + "\tfile-no: pass data to/from this FD; terminate when vchan connection\n" + "\t is closed\n" + "\n" + "\t-: pass data to/from stdin/stdout; terminate when vchan\n" + "\t connection is closed\n", + argv[0]); + exit(1); +} + +#define BUFSIZE 8192 +char inbuf[BUFSIZE]; +char outbuf[BUFSIZE]; +int insiz = 0; +int outsiz = 0; +int verbose = 0; + +static void vchan_wr(struct libxenvchan *ctrl) { + int ret; + + if (!insiz) + return; + ret = libxenvchan_write(ctrl, inbuf, insiz); + if (ret < 0) { + fprintf(stderr, "vchan write failed\n"); + exit(1); + } + if (verbose) + fprintf(stderr, "wrote %d bytes to vchan\n", ret); + if (ret > 0) { + insiz -= ret; + memmove(inbuf, inbuf + ret, insiz); + } +} + +static void socket_wr(int output_fd) { + int ret; + + if (!outsiz) + return; + ret = write(output_fd, outbuf, outsiz); + if (ret < 0 && errno != EAGAIN) + exit(1); + if (ret > 0) { + outsiz -= ret; + memmove(outbuf, outbuf + ret, outsiz); + } +} + +static int set_nonblocking(int fd, int nonblocking) { + int flags = fcntl(fd, F_GETFL); + if (flags == -1) + return -1; + + if (nonblocking) + flags |= O_NONBLOCK; + else + flags &= ~O_NONBLOCK; + + if (fcntl(fd, F_SETFL, flags) == -1) + return -1; + + return 0; +} + +static int connect_socket(const char *path_or_fd) { + int fd; + char *endptr; + struct sockaddr_un addr; + + fd = strtoll(path_or_fd, &endptr, 0); + if (*endptr == '\0') { + set_nonblocking(fd, 1); + return fd; + } + + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd == -1) + return -1; + + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path_or_fd, sizeof(addr.sun_path)); + if (connect(fd, (const struct sockaddr *)&addr, sizeof(addr)) == -1) { + close(fd); + return -1; + } + + set_nonblocking(fd, 1); + + return fd; +} + +static int listen_socket(const char *path_or_fd) { + int fd; + char *endptr; + struct sockaddr_un addr; + + fd = strtoll(path_or_fd, &endptr, 0); + if (*endptr == '\0') { + return fd; + } + + /* if not a number, assume a socket path */ + fd = socket(AF_UNIX, SOCK_STREAM, 0); + if (fd == -1) + return -1; + + addr.sun_family = AF_UNIX; + strncpy(addr.sun_path, path_or_fd, sizeof(addr.sun_path)); + if (bind(fd, (const struct sockaddr *)&addr, sizeof(addr)) == -1) { + close(fd); + return -1; + } + if (listen(fd, 5) != 0) { + close(fd); + return -1; + } + + return fd; +} + +static struct libxenvchan *connect_vchan(int domid, const char *path) { + struct libxenvchan *ctrl = NULL; + struct xs_handle *xs = NULL; + xc_interface *xc = NULL; + xc_dominfo_t dominfo; + char **watch_ret; + unsigned int watch_num; + int ret; + + xs = xs_open(XS_OPEN_READONLY); + if (!xs) { + perror("xs_open"); + goto out; + } + xc = xc_interface_open(NULL, NULL, XC_OPENFLAG_NON_REENTRANT); + if (!xc) { + perror("xc_interface_open"); + goto out; + } + /* wait for vchan server to create *path* */ + xs_watch(xs, path, "path"); + xs_watch(xs, "@releaseDomain", "release"); + while ((watch_ret = xs_read_watch(xs, &watch_num))) { + /* don't care about exact which fired the watch */ + free(watch_ret); + ctrl = libxenvchan_client_init(NULL, domid, path); + if (ctrl) + break; + + ret = xc_domain_getinfo(xc, domid, 1, &dominfo); + /* break the loop if domain is definitely not there anymore, but + * continue if it is or the call failed (like EPERM) */ + if (ret == -1 && errno == ESRCH) + break; + if (ret == 1 && (dominfo.domid != (uint32_t)domid || dominfo.dying)) + break; + } + +out: + if (xc) + xc_interface_close(xc); + if (xs) + xs_close(xs); + return ctrl; +} + + +static void discard_buffers(struct libxenvchan *ctrl) { + /* discard local buffers */ + insiz = 0; + outsiz = 0; + + /* discard remaining incoming data */ + while (libxenvchan_data_ready(ctrl)) { + if (libxenvchan_read(ctrl, inbuf, BUFSIZE) == -1) { + perror("vchan read"); + exit(1); + } + } +} + +int data_loop(struct libxenvchan *ctrl, int input_fd, int output_fd) +{ + int ret; + int libxenvchan_fd; + int max_fd; + + libxenvchan_fd = libxenvchan_fd_for_select(ctrl); + for (;;) { + fd_set rfds; + fd_set wfds; + FD_ZERO(&rfds); + FD_ZERO(&wfds); + + max_fd = -1; + if (input_fd != -1 && insiz != BUFSIZE) { + FD_SET(input_fd, &rfds); + if (input_fd > max_fd) + max_fd = input_fd; + } + if (output_fd != -1 && outsiz) { + FD_SET(output_fd, &wfds); + if (output_fd > max_fd) + max_fd = output_fd; + } + FD_SET(libxenvchan_fd, &rfds); + if (libxenvchan_fd > max_fd) + max_fd = libxenvchan_fd; + ret = select(max_fd + 1, &rfds, &wfds, NULL, NULL); + if (ret < 0) { + perror("select"); + exit(1); + } + if (FD_ISSET(libxenvchan_fd, &rfds)) { + libxenvchan_wait(ctrl); + if (!libxenvchan_is_open(ctrl)) { + if (verbose) + fprintf(stderr, "vchan client disconnected\n"); + while (outsiz) + socket_wr(output_fd); + close(output_fd); + close(input_fd); + discard_buffers(ctrl); + break; + } + vchan_wr(ctrl); + } + + if (FD_ISSET(input_fd, &rfds)) { + ret = read(input_fd, inbuf + insiz, BUFSIZE - insiz); + if (ret < 0 && errno != EAGAIN) + exit(1); + if (verbose) + fprintf(stderr, "from-unix: %.*s\n", ret, inbuf + insiz); + if (ret == 0) { + /* EOF on socket, write everything in the buffer and close the + * input_fd socket */ + while (insiz) { + vchan_wr(ctrl); + libxenvchan_wait(ctrl); + } + close(input_fd); + input_fd = -1; + /* TODO: maybe signal the vchan client somehow? */ + break; + } + if (ret) + insiz += ret; + vchan_wr(ctrl); + } + if (FD_ISSET(output_fd, &wfds)) + socket_wr(output_fd); + while (libxenvchan_data_ready(ctrl) && outsiz < BUFSIZE) { + ret = libxenvchan_read(ctrl, outbuf + outsiz, BUFSIZE - outsiz); + if (ret < 0) + exit(1); + if (verbose) + fprintf(stderr, "from-vchan: %.*s\n", ret, outbuf + outsiz); + outsiz += ret; + socket_wr(output_fd); + } + } + return 0; +} + +/** + Simple libxenvchan application, both client and server. + Both sides may write and read, both from the libxenvchan and from + stdin/stdout (just like netcat). +*/ + +static struct option options[] = { + { "mode", required_argument, NULL, 'm' }, + { "verbose", no_argument, NULL, 'v' }, + { "state-path", required_argument, NULL, 's' }, + { } +}; + +int main(int argc, char **argv) +{ + int is_server = 0; + int socket_fd = -1; + int input_fd, output_fd; + struct libxenvchan *ctrl = NULL; + const char *socket_path; + int domid; + const char *vchan_path; + const char *state_path = NULL; + int opt; + + while ((opt = getopt_long(argc, argv, "m:vs:", options, NULL)) != -1) { + switch (opt) { + case 'm': + if (strcmp(optarg, "server") == 0) + is_server = 1; + else if (strcmp(optarg, "client") == 0) + is_server = 0; + else { + fprintf(stderr, "invalid argument for --mode: %s\n", optarg); + usage(argv); + return 1; + } + break; + case 'v': + verbose = 1; + break; + case 's': + state_path = optarg; + break; + case '?': + usage(argv); + } + } + + if (argc-optind != 3) + usage(argv); + + domid = atoi(argv[optind]); + vchan_path = argv[optind+1]; + socket_path = argv[optind+2]; + + if (is_server) { + ctrl = libxenvchan_server_init(NULL, domid, vchan_path, 0, 0); + if (!ctrl) { + perror("libxenvchan_server_init"); + exit(1); + } + } else { + if (strcmp(socket_path, "-") == 0) { + input_fd = 0; + output_fd = 1; + } else { + socket_fd = listen_socket(socket_path); + if (socket_fd == -1) { + perror("listen socket"); + return 1; + } + } + } + + if (state_path) { + struct xs_handle *xs; + + xs = xs_open(0); + if (!xs) { + perror("xs_open"); + return 1; + } + if (!xs_write(xs, XBT_NULL, state_path, "running", strlen("running"))) { + perror("xs_write"); + return 1; + } + xs_close(xs); + } + + for (;;) { + if (is_server) { + /* wait for vchan connection */ + while (libxenvchan_is_open(ctrl) != 1) + libxenvchan_wait(ctrl); + /* vchan client connected, setup local FD if needed */ + if (strcmp(socket_path, "-") == 0) { + input_fd = 0; + output_fd = 1; + } else { + input_fd = output_fd = connect_socket(socket_path); + } + if (input_fd == -1) { + perror("connect socket"); + return 1; + } + if (data_loop(ctrl, input_fd, output_fd) != 0) + break; + /* keep it running only when get UNIX socket path */ + if (socket_path[0] != '/') + break; + } else { + /* wait for local socket connection */ + if (strcmp(socket_path, "-") != 0) + input_fd = output_fd = accept(socket_fd, NULL, NULL); + if (input_fd == -1) { + perror("accept"); + return 1; + } + set_nonblocking(input_fd, 1); + set_nonblocking(output_fd, 1); + ctrl = connect_vchan(domid, vchan_path); + if (!ctrl) { + perror("vchan client init"); + return 1; + } + if (data_loop(ctrl, input_fd, output_fd) != 0) + break; + /* don't reconnect if output was stdout */ + if (strcmp(socket_path, "-") == 0) + break; + + libxenvchan_close(ctrl); + ctrl = NULL; + } + } + return 0; +} -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:58:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:58:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3L-0006Id-AK; Wed, 20 May 2020 16:58:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3K-0006IX-DY for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:46 +0000 X-Inumbo-ID: 2aa88a75-9abb-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2aa88a75-9abb-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:58:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dJR68NsvhZX+/GiERkL3Z8lsT7XqM/CFs/xb3EPpq/g=; b=4ivJpEAvaPyHIohcvFeSGW0po+ ErqSsZB0RYfgyBs48wx5NoDR6JMDNGQxSsH/Ir5MIx7hJomQoWtxBc85Fn+H5uTxOgVExOpQx6iaK dNal9eK/ypRL/DrjtIgUb5+3HPYKspE7QBo0vbXrvFbeYfwG3l2TtQneN5KJeLgmtOUY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3J-0007J4-Ki for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS3J-0004dO-Jv for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: Refactor kill_device_model to libxl__kill_xs_path Message-Id: Date: Wed, 20 May 2020 16:58:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 379ab27086be37fbb8d23c4e001e33e05dc18b2e Author: Jason Andryuk AuthorDate: Mon May 18 21:54:57 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: Refactor kill_device_model to libxl__kill_xs_path Move kill_device_model to libxl__kill_xs_path so we have a helper to kill a process from a pid stored in xenstore. We'll be using it to kill vchan-qmp-proxy. libxl__kill_xs_path takes a "what" string for use in printing error messages. kill_device_model is retained in libxl_dm.c to provide the string. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_aoutils.c | 32 ++++++++++++++++++++++++++++++++ tools/libxl/libxl_dm.c | 27 +-------------------------- tools/libxl/libxl_internal.h | 3 +++ 3 files changed, 36 insertions(+), 26 deletions(-) diff --git a/tools/libxl/libxl_aoutils.c b/tools/libxl/libxl_aoutils.c index 1be858c93c..c4c095a5ba 100644 --- a/tools/libxl/libxl_aoutils.c +++ b/tools/libxl/libxl_aoutils.c @@ -626,6 +626,38 @@ void libxl__kill(libxl__gc *gc, pid_t pid, int sig, const char *what) what, (unsigned long)pid, sig); } +/* Generic function to signal (HUP) a pid stored in xenstore */ +int libxl__kill_xs_path(libxl__gc *gc, const char *xs_path_pid, + const char *what) +{ + const char *xs_pid; + int ret, pid; + + ret = libxl__xs_read_checked(gc, XBT_NULL, xs_path_pid, &xs_pid); + if (ret || !xs_pid) { + LOG(ERROR, "unable to find %s pid in %s", what, xs_path_pid); + ret = ret ? : ERROR_FAIL; + goto out; + } + pid = atoi(xs_pid); + + ret = kill(pid, SIGHUP); + if (ret < 0 && errno == ESRCH) { + LOG(ERROR, "%s already exited", what); + ret = 0; + } else if (ret == 0) { + LOG(DEBUG, "%s signaled", what); + ret = 0; + } else { + LOGE(ERROR, "failed to kill %s [%d]", what, pid); + ret = ERROR_FAIL; + goto out; + } + +out: + return ret; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 62d0d46c98..6829b4bdb5 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -3225,32 +3225,7 @@ out: /* Generic function to signal a Qemu instance to exit */ static int kill_device_model(libxl__gc *gc, const char *xs_path_pid) { - const char *xs_pid; - int ret, pid; - - ret = libxl__xs_read_checked(gc, XBT_NULL, xs_path_pid, &xs_pid); - if (ret || !xs_pid) { - LOG(ERROR, "unable to find device model pid in %s", xs_path_pid); - ret = ret ? : ERROR_FAIL; - goto out; - } - pid = atoi(xs_pid); - - ret = kill(pid, SIGHUP); - if (ret < 0 && errno == ESRCH) { - LOG(ERROR, "Device Model already exited"); - ret = 0; - } else if (ret == 0) { - LOG(DEBUG, "Device Model signaled"); - ret = 0; - } else { - LOGE(ERROR, "failed to kill Device Model [%d]", pid); - ret = ERROR_FAIL; - goto out; - } - -out: - return ret; + return libxl__kill_xs_path(gc, xs_path_pid, "Device Model"); } /* Helper to destroy a Qdisk backend */ diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f2f76439ec..c939557b2e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -2711,6 +2711,9 @@ int libxl__async_exec_start(libxl__async_exec_state *aes); bool libxl__async_exec_inuse(const libxl__async_exec_state *aes); _hidden void libxl__kill(libxl__gc *gc, pid_t pid, int sig, const char *what); +/* kill SIGHUP a pid stored in xenstore */ +_hidden int libxl__kill_xs_path(libxl__gc *gc, const char *xs_path_pid, + const char *what); /*----- device addition/removal -----*/ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:59:02 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:59:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3a-0006Jx-C9; Wed, 20 May 2020 16:59:02 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3Y-0006Jq-UH for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:00 +0000 X-Inumbo-ID: 30e7645a-9abb-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 30e7645a-9abb-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:58:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ASKiilh6g0sOOaDBxV7fFe8E7ekjTnbbDHBdHOORdYo=; b=CbIUnlt6h/7tYShhAXp7i4LxIc EM1vchGxQe8DpzyuptiCSAZCEjZvURRbm5nTrs+3Algf3xoXkwUF5Clnvoth/+p+cGSh+6OUGj/bc eqFwyk7c7lNAQPJAAvZCS6aVeD7O+9p0BBwNB+beko40ciM3Tji2obOO+C3XqZFLoyuc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3T-0007JD-Ot for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS3T-0004e0-Nt for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:58:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: use vchan for QMP access with Linux stubdomain Message-Id: Date: Wed, 20 May 2020 16:58:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 83c845033dc8bb3a35ae245effb7832b6823174a Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:58 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: use vchan for QMP access with Linux stubdomain Access to QMP of QEMU in Linux stubdomain is possible over vchan connection. Handle the actual vchan connection in a separate process (vchan-socket-proxy). This simplified integration with QMP (already quite complex), but also allows preliminary filtering of (potentially malicious) QMP input. Since only one client can be connected to vchan server at the same time and it is not enforced by the libxenvchan itself, additional client-side locking is needed. It is implicitly implemented by vchan-socket-proxy, as it handle only one connection at a time. Note that qemu supports only one simultaneous client on a control socket anyway (but in UNIX socket case, it enforce it server-side), so it doesn't add any extra limitation. libxl qmp client code already has locking to handle concurrent access attempts to the same qemu qmp interface. Signed-off-by: Marek Marczykowski-Górecki Squash in changes of regenerated autotools files. Kill the vchan-socket-proxy so we don't leak the daemonized processes. libxl__stubdomain_is_linux_running() works against the guest_domid, but the xenstore path is beneath the stubdomain. This leads to the use of libxl_is_stubdom in addition to libxl__stubdomain_is_linux_running() so that the stubdomain calls kill for the qmp-proxy. Also call libxl__qmp_cleanup() to remove the unix sockets used by vchan-socket-proxy. vchan-socket-proxy only creates qmp-libxl-$domid, and libxl__qmp_cleanup removes that as well as qmp-libxenstat-$domid. However, it tolerates ENOENT, and a stray qmp-libxenstat-$domid should not exist. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- configure | 14 +--- docs/configure | 14 +--- stubdom/configure | 14 +--- tools/config.h.in | 3 + tools/configure | 46 +++++++----- tools/configure.ac | 9 +++ tools/libxl/libxl_dm.c | 163 ++++++++++++++++++++++++++++++++++++++++--- tools/libxl/libxl_domain.c | 10 +++ tools/libxl/libxl_internal.h | 1 + 9 files changed, 209 insertions(+), 65 deletions(-) diff --git a/configure b/configure index 9da3970cef..8af54e8a5a 100755 --- a/configure +++ b/configure @@ -644,7 +644,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -723,7 +722,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -976,15 +974,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1122,7 +1111,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1275,7 +1264,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/docs/configure b/docs/configure index 9e3ed60462..93e9dcf404 100755 --- a/docs/configure +++ b/docs/configure @@ -634,7 +634,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -711,7 +710,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -964,15 +962,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1110,7 +1099,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1263,7 +1252,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/stubdom/configure b/stubdom/configure index da03da535a..f7604a37f7 100755 --- a/stubdom/configure +++ b/stubdom/configure @@ -661,7 +661,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -751,7 +750,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1004,15 +1002,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1150,7 +1139,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1303,7 +1292,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] diff --git a/tools/config.h.in b/tools/config.h.in index 5a5944ebe1..5abf6092de 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -123,6 +123,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* QMP proxy path */ +#undef STUBDOM_QMP_PROXY_PATH + /* Enable large inode numbers on Mac OS X 10.5. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 diff --git a/tools/configure b/tools/configure index 36596389b8..35036dc1db 100755 --- a/tools/configure +++ b/tools/configure @@ -772,7 +772,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -814,6 +813,7 @@ with_linux_backend_modules enable_qemu_traditional enable_rombios with_system_qemu +with_stubdom_qmp_proxy with_system_seabios with_system_ovmf enable_ipxe @@ -899,7 +899,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1152,15 +1151,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1298,7 +1288,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1451,7 +1441,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1535,6 +1524,9 @@ Optional Packages: Use system supplied qemu PATH or qemu (taken from $PATH) as qemu-xen device model instead of building and installing our own version + --stubdom-qmp-proxy[=PATH] + Use supplied binary PATH as a QMP proxy into + stubdomain --with-system-seabios[=PATH] Use system supplied seabios PATH instead of building and installing our own version @@ -3382,7 +3374,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3428,7 +3420,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3452,7 +3444,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3497,7 +3489,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -3521,7 +3513,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -4548,6 +4540,24 @@ _ACEOF +# Check whether --with-stubdom-qmp-proxy was given. +if test "${with_stubdom_qmp_proxy+set}" = set; then : + withval=$with_stubdom_qmp_proxy; + stubdom_qmp_proxy="$withval" + +else + + stubdom_qmp_proxy="$bindir/vchan-socket-proxy" + +fi + + +cat >>confdefs.h <<_ACEOF +#define STUBDOM_QMP_PROXY_PATH "$stubdom_qmp_proxy" +_ACEOF + + + # Check whether --with-system-seabios was given. if test "${with_system_seabios+set}" = set; then : withval=$with_system_seabios; diff --git a/tools/configure.ac b/tools/configure.ac index b6f8882be4..a9af0a21c6 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -194,6 +194,15 @@ AC_SUBST(qemu_xen) AC_SUBST(qemu_xen_path) AC_SUBST(qemu_xen_systemd) +AC_ARG_WITH([stubdom-qmp-proxy], + AC_HELP_STRING([--stubdom-qmp-proxy@<:@=PATH@:>@], + [Use supplied binary PATH as a QMP proxy into stubdomain]),[ + stubdom_qmp_proxy="$withval" +],[ + stubdom_qmp_proxy="$bindir/vchan-socket-proxy" +]) +AC_DEFINE_UNQUOTED([STUBDOM_QMP_PROXY_PATH], ["$stubdom_qmp_proxy"], [QMP proxy path]) + AC_ARG_WITH([system-seabios], AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], [Use system supplied seabios PATH instead of building and installing diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 6829b4bdb5..6a26634ef9 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1200,7 +1200,11 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, GCSPRINTF("%d", guest_domid), NULL); flexarray_append(dm_args, "-no-shutdown"); - /* There is currently no way to access the QMP socket in the stubdom */ + /* + * QMP access to qemu running in stubdomain is done over vchan. The + * stubdomain init script adds the appropriate monitor options for + * vchan-socket-proxy. + */ if (!is_stubdom) { flexarray_append(dm_args, "-chardev"); if (state->dm_monitor_fd >= 0) { @@ -2205,6 +2209,23 @@ static void stubdom_pvqemu_unpaused(libxl__egc *egc, static void stubdom_xswait_cb(libxl__egc *egc, libxl__xswait_state *xswait, int rc, const char *p); +static void spawn_qmp_proxy(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss); + +static void qmp_proxy_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata); + +static void qmp_proxy_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn, + int rc); + +static void qmp_proxy_detached(libxl__egc *egc, + libxl__spawn_state *spawn); + +static void qmp_proxy_spawn_outcome(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss, + int rc); + char *libxl__stub_dm_name(libxl__gc *gc, const char *guest_name) { return GCSPRINTF("%s-dm", guest_name); @@ -2486,24 +2507,150 @@ static void spawn_stub_launch_dm(libxl__egc *egc, goto out; } + sdss->qmp_proxy_spawn.ao = ao; + if (libxl__stubdomain_is_linux(&guest_config->b_info)) { + spawn_qmp_proxy(egc, sdss); + } else { + qmp_proxy_spawn_outcome(egc, sdss, 0); + } + + return; + +out: + assert(ret); + qmp_proxy_spawn_outcome(egc, sdss, ret); +} + +static void spawn_qmp_proxy(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss) +{ + STATE_AO_GC(sdss->qmp_proxy_spawn.ao); + const uint32_t guest_domid = sdss->dm.guest_domid; + const uint32_t dm_domid = sdss->pvqemu.guest_domid; + const char *dom_path = libxl__xs_get_dompath(gc, dm_domid); + char **args; + int nr = 0; + int rc, logfile_w, null; + + if (access(STUBDOM_QMP_PROXY_PATH, X_OK) < 0) { + LOGED(ERROR, guest_domid, "qmp proxy %s is not executable", STUBDOM_QMP_PROXY_PATH); + rc = ERROR_FAIL; + goto out; + } + + sdss->qmp_proxy_spawn.what = GCSPRINTF("domain %d device model qmp proxy", guest_domid); + sdss->qmp_proxy_spawn.pidpath = GCSPRINTF("%s/image/qmp-proxy-pid", dom_path); + sdss->qmp_proxy_spawn.xspath = DEVICE_MODEL_XS_PATH(gc, LIBXL_TOOLSTACK_DOMID, + dm_domid, "/qmp-proxy-state"); + sdss->qmp_proxy_spawn.timeout_ms = LIBXL_DEVICE_MODEL_START_TIMEOUT * 1000; + sdss->qmp_proxy_spawn.midproc_cb = libxl__spawn_record_pid; + sdss->qmp_proxy_spawn.confirm_cb = qmp_proxy_confirm; + sdss->qmp_proxy_spawn.failure_cb = qmp_proxy_startup_failed; + sdss->qmp_proxy_spawn.detached_cb = qmp_proxy_detached; + + const int arraysize = 6; + GCNEW_ARRAY(args, arraysize); + args[nr++] = STUBDOM_QMP_PROXY_PATH; + args[nr++] = GCSPRINTF("--state-path=%s", sdss->qmp_proxy_spawn.xspath); + args[nr++] = GCSPRINTF("%u", dm_domid); + args[nr++] = GCSPRINTF("%s/device-model/%u/qmp-vchan", dom_path, guest_domid); + args[nr++] = (char*)libxl__qemu_qmp_path(gc, guest_domid); + args[nr++] = NULL; + assert(nr == arraysize); + + logfile_w = libxl__create_qemu_logfile(gc, GCSPRINTF("qmp-proxy-%s", + sdss->dm_config.c_info.name)); + if (logfile_w < 0) { + rc = logfile_w; + goto out; + } + null = open("/dev/null", O_RDWR); + if (null < 0) { + LOGED(ERROR, guest_domid, "unable to open /dev/null"); + rc = ERROR_FAIL; + goto out_close; + } + + rc = libxl__spawn_spawn(egc, &sdss->qmp_proxy_spawn); + if (rc < 0) + goto out_close; + if (!rc) { /* inner child */ + setsid(); + libxl__exec(gc, null, null, logfile_w, STUBDOM_QMP_PROXY_PATH, args, NULL); + /* unreachable */ + } + + rc = 0; + +out_close: + if (logfile_w >= 0) + close(logfile_w); + if (null >= 0) + close(null); +out: + if (rc) + qmp_proxy_spawn_outcome(egc, sdss, rc); +} + +static void qmp_proxy_confirm(libxl__egc *egc, libxl__spawn_state *spawn, + const char *xsdata) +{ + STATE_AO_GC(spawn->ao); + + if (!xsdata) + return; + + if (strcmp(xsdata, "running")) + return; + + libxl__spawn_initiate_detach(gc, spawn); +} + +static void qmp_proxy_startup_failed(libxl__egc *egc, + libxl__spawn_state *spawn, + int rc) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(spawn, *sdss, qmp_proxy_spawn); + qmp_proxy_spawn_outcome(egc, sdss, rc); +} + +static void qmp_proxy_detached(libxl__egc *egc, + libxl__spawn_state *spawn) +{ + libxl__stub_dm_spawn_state *sdss = CONTAINER_OF(spawn, *sdss, qmp_proxy_spawn); + qmp_proxy_spawn_outcome(egc, sdss, 0); +} + +static void qmp_proxy_spawn_outcome(libxl__egc *egc, + libxl__stub_dm_spawn_state *sdss, + int rc) +{ + STATE_AO_GC(sdss->qmp_proxy_spawn.ao); + int need_pvqemu = libxl__need_xenpv_qemu(gc, &sdss->dm_config); + + if (rc) goto out; + + if (need_pvqemu < 0) { + rc = need_pvqemu; + goto out; + } + sdss->pvqemu.spawn.ao = ao; - sdss->pvqemu.guest_domid = dm_domid; sdss->pvqemu.guest_config = &sdss->dm_config; sdss->pvqemu.build_state = &sdss->dm_state; sdss->pvqemu.callback = spawn_stubdom_pvqemu_cb; - - if (!need_qemu) { + if (need_pvqemu) { + libxl__spawn_local_dm(egc, &sdss->pvqemu); + } else { /* If dom0 qemu not needed, do not launch it */ spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, 0); - } else { - libxl__spawn_local_dm(egc, &sdss->pvqemu); } return; out: - assert(ret); - spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, ret); + assert(rc); + spawn_stubdom_pvqemu_cb(egc, &sdss->pvqemu, rc); } static void spawn_stubdom_pvqemu_cb(libxl__egc *egc, diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c index fef2cd4e13..c08af308fa 100644 --- a/tools/libxl/libxl_domain.c +++ b/tools/libxl/libxl_domain.c @@ -1260,10 +1260,20 @@ static void dm_destroy_cb(libxl__egc *egc, libxl__destroy_domid_state *dis = CONTAINER_OF(ddms, *dis, ddms); STATE_AO_GC(dis->ao); uint32_t domid = dis->domid; + uint32_t target_domid; if (rc < 0) LOGD(ERROR, domid, "libxl__destroy_device_model failed"); + if (libxl_is_stubdom(CTX, domid, &target_domid) && + libxl__stubdomain_is_linux_running(gc, target_domid)) { + char *path = GCSPRINTF("/local/domain/%d/image/qmp-proxy-pid", domid); + + libxl__kill_xs_path(gc, path, "QMP Proxy"); + /* qmp-proxy for stubdom registers target_domid's QMP sockets. */ + libxl__qmp_cleanup(gc, target_domid); + } + dis->drs.ao = ao; dis->drs.domid = domid; dis->drs.callback = devices_destroy_cb; diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index c939557b2e..41b51b07cd 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4166,6 +4166,7 @@ typedef struct { libxl__destroy_domid_state dis; libxl__multidev multidev; libxl__xswait_state xswait; + libxl__spawn_state qmp_proxy_spawn; } libxl__stub_dm_spawn_state; _hidden void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state*); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:59:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:59:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3f-0006LU-F9; Wed, 20 May 2020 16:59:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3e-0006LL-DU for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:06 +0000 X-Inumbo-ID: 36e8d51e-9abb-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 36e8d51e-9abb-11ea-ae69-bc764e2007e4; Wed, 20 May 2020 16:59:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6vFNmak+qnaM3ZioRXD2qU33oyFcq6Y8HnklB6ydQXM=; b=pWzjfZC+V9vUBOQ6nDpoiFyF3T ow32zOwCJriwp+NyyzVmK8z0YsDSljg+dvl62wfTi2XPt7neqNQr4akJFVxbzdhFq5E7HVGwSRSi9 I5xrgOm2n0L0Zr9TJJRpSq+X+hy4dGHtzT7ORHHfB7y5dyqrpUejj4e/CCYJjC3lO9w0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3d-0007JV-RY for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS3d-0004ec-Ql for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: require qemu in dom0 for multiple stubdomain consoles Message-Id: Date: Wed, 20 May 2020 16:59:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ab9ce23f5af8f77078d63b11ff8bd7280e0e6b50 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:54:59 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: require qemu in dom0 for multiple stubdomain consoles Device model stubdomains (both Mini-OS + qemu-trad and linux + qemu-xen) are always started with at least 3 consoles: log, save, and restore. Until xenconsoled learns how to handle multiple consoles, this is needed for save/restore support. For Mini-OS stubdoms, this is a bug. In practice, it works in most cases because there is something else that triggers qemu in dom0 too: vfb/vkb added if vnc/sdl/spice is enabled. Additionally, Linux-based stubdomain waits for all the backends to initialize during boot. Lack of some console backends results in stubdomain startup timeout. This is a temporary patch until xenconsoled will be improved. Signed-off-by: Marek Marczykowski-Górecki [Updated commit message with Marek's explanation from mailing list.] Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 6a26634ef9..8801e9364e 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2494,7 +2494,11 @@ static void spawn_stub_launch_dm(libxl__egc *egc, } } - need_qemu = libxl__need_xenpv_qemu(gc, dm_config); + /* + * Until xenconsoled learns how to handle multiple consoles, require qemu + * in dom0 to serve consoles for a stubdomain - it require at least 3 of them. + */ + need_qemu = 1 || libxl__need_xenpv_qemu(gc, &sdss->dm_config); for (i = 0; i < num_console; i++) { libxl__device device; @@ -2626,7 +2630,11 @@ static void qmp_proxy_spawn_outcome(libxl__egc *egc, int rc) { STATE_AO_GC(sdss->qmp_proxy_spawn.ao); - int need_pvqemu = libxl__need_xenpv_qemu(gc, &sdss->dm_config); + /* + * Until xenconsoled learns how to handle multiple consoles, require qemu + * in dom0 to serve consoles for a stubdomain - it require at least 3 of them. + */ + int need_pvqemu = 1 || libxl__need_xenpv_qemu(gc, &sdss->dm_config); if (rc) goto out; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:59:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:59:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3p-0006Ms-Gy; Wed, 20 May 2020 16:59:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3o-0006Mk-Jp for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:16 +0000 X-Inumbo-ID: 3cee7da6-9abb-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3cee7da6-9abb-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:59:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=k1zXL3/7G3OHr4aP0T8cUTd56xkn0MS/2+Q5x6v5E9g=; b=aEvR3T66Gz0IeGeqVc89T8zw4R UHZESK2D3ghwM0tfC55gXo+D1oJIuKs6L/UgwUd2Y9B94MA+6SgI8ajBRrQiuO10viM46dpuGbK26 W+dqs7Z2F4R5U6isNeGtU0qdz470vEz2HnmoUNLLnuj7DBaibsOVT5lqD3PmE2+oR0I0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3n-0007Jg-UY for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS3n-0004fD-Ta for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: ignore emulated IDE disks beyond the first 4 Message-Id: Date: Wed, 20 May 2020 16:59:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fa9d82825a8ddee1894528576f383efddcdc3691 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:55:00 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: ignore emulated IDE disks beyond the first 4 Qemu supports only 4 emulated IDE disks, when given more (or with higher indexes), it will fail to start. Since the disks can still be accessible using PV interface, just ignore emulated path and log a warning, instead of rejecting the configuration altogether. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 8801e9364e..86694f669d 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -1894,6 +1894,13 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, } if (disks[i].is_cdrom) { + if (disk > 4) { + LOGD(WARN, guest_domid, "Emulated CDROM can be only one of the first 4 disks.\n" + "Disk %s will be available via PV drivers but not as an " + "emulated disk.", + disks[i].vdev); + continue; + } drive = libxl__sprintf(gc, "if=ide,index=%d,readonly=on,media=cdrom,id=ide-%i", disk, dev_number); @@ -1971,6 +1978,10 @@ static int libxl__build_device_model_args_new(libxl__gc *gc, &disks[i], colo_mode); } else { + LOGD(WARN, guest_domid, "Only 4 emulated IDE disks are supported.\n" + "Disk %s will be available via PV drivers but not as an " + "emulated disk.", + disks[i].vdev); continue; /* Do not emulate this disk */ } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:59:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:59:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3z-0006O2-IZ; Wed, 20 May 2020 16:59:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3y-0006Nv-Ou for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:26 +0000 X-Inumbo-ID: 42f8b2a2-9abb-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 42f8b2a2-9abb-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:59:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=VovcNhL2vlEgG+pyNTq1IBqd6FBDmchZ0OuGc9dxed8=; b=kLKX2GFJ0DQAbj40Cg9hv+Xg1Q McDbSRof93/MsXreY7llxlQWBKd8Is+JuwBe56Lv5fjubsqWdd7DqfEKM7pWKab9sLbVn/ZLgGXgk H7Vlpo6D10CAMrNDbF7N+ZHSucp0C0w1Q4Cx7Uyk04pqb3nIVBlc76axjizdBtCQT+7E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS3y-0007KV-1R for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS3y-0004fm-0J for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:26 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: consider also qemu in stubdomain in libxl__dm_active check Message-Id: Date: Wed, 20 May 2020 16:59:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cfc47cd4e24f3bfbe9b69f3196d1dd31f7423c31 Author: Marek Marczykowski-Górecki AuthorDate: Mon May 18 21:55:01 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: consider also qemu in stubdomain in libxl__dm_active check Since qemu-xen can now run in stubdomain too, handle this case when checking it's state too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Jason Andryuk Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 86694f669d..454a2815ed 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -3734,12 +3734,18 @@ out: int libxl__dm_active(libxl__gc *gc, uint32_t domid) { - char *pid, *path; + char *pid, *dm_domid, *path; path = GCSPRINTF("/local/domain/%d/image/device-model-pid", domid); pid = libxl__xs_read(gc, XBT_NULL, path); - return pid != NULL; + if (pid) + return true; + + path = GCSPRINTF("/local/domain/%d/image/device-model-domid", domid); + dm_domid = libxl__xs_read(gc, XBT_NULL, path); + + return dm_domid != NULL; } int libxl__dm_check_start(libxl__gc *gc, libxl_domain_config *d_config, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:59:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:59:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS49-0006P2-K7; Wed, 20 May 2020 16:59:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS48-0006Os-Sl for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:36 +0000 X-Inumbo-ID: 48f4fc7e-9abb-11ea-aa4e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 48f4fc7e-9abb-11ea-aa4e-12813bfff9fa; Wed, 20 May 2020 16:59:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=y3cSH2IWTbRtaPjG9NLK39BFEPRooKK4VfVG4qh3sW0=; b=kdbjW8nzuViBtLo+6jwdWkTTWQ sdHctUpYgSEty8maEveE5wWSMdDR5aL9fL4QVcXiIIhT3G73vyvw9iM5eZjxmRaNcKUMWI6eg3DbC QqE8Mj2DBolpJ/6Tq9uq3mfMJ4QCAr+sR1NY8QamjLhTcZDiuF27tTwlXx3wERE5YkAI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS48-0007Kp-45 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS48-0004gJ-3B for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:36 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] docs: Add device-model-domid to xenstore-paths Message-Id: Date: Wed, 20 May 2020 16:59:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b6af49af6093a9a0e0e0b4d39ab06da106f4bdf7 Author: Jason Andryuk AuthorDate: Mon May 18 21:55:02 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 docs: Add device-model-domid to xenstore-paths Document device-model-domid for when using a device model stubdomain. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- docs/misc/xenstore-paths.pandoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index a152f5ea68..766e8008dc 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -148,6 +148,11 @@ The domain's own ID. The process ID of the device model associated with this domain, if it has one. +#### ~/image/device-model-domid = INTEGER [INTERNAL] + +The domain ID of the device model stubdomain associated with this domain, +if it has one. + #### ~/cpu/[0-9]+/availability = ("online"|"offline") [PV] One node for each virtual CPU up to the guest's configured -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 16:59:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 16:59:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS4J-0006Q6-Li; Wed, 20 May 2020 16:59:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS4I-0006Pw-OZ for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:46 +0000 X-Inumbo-ID: 4ef8efe0-9abb-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4ef8efe0-9abb-11ea-b9cf-bc764e2007e4; Wed, 20 May 2020 16:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sX5pJc6AhW/iEYwJqwYFJ/i5s1ZnRjJTz0TFHa2k+S8=; b=1YA2hbKvZqtVKS4R/oXpnI7KdQ eYhOvaKg0yPcIIz5jm4MN9R2C0/CQa8FaFUax4AWAO7d3nIHblvUy6pOhz/2I9BMmSYUoKQ5tm6aG X8O8qYwEJ/JWoptR+oFCLo3JxY+8h7sapV9c/sKuVgA8XtgUL2+YU2CR+IDVMXbTlWV0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbS4I-0007Ky-7F for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbS4I-0004go-60 for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 16:59:46 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: Check stubdomain kernel & ramdisk presence Message-Id: Date: Wed, 20 May 2020 16:59:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e235fa2794c95365519eac714d6ea82f8e64752e Author: Jason Andryuk AuthorDate: Mon May 18 21:55:03 2020 -0400 Commit: Wei Liu CommitDate: Tue May 19 16:19:15 2020 +0100 libxl: Check stubdomain kernel & ramdisk presence Just out of context is the following comment for libxl__domain_make: /* fixme: this function can leak the stubdom if it fails */ When the stubdomain kernel or ramdisk is not present, the domid and stubdomain name will indeed be leaked. Avoid the leak by checking the file presence and erroring out when absent. It doesn't fix all cases, but it avoids a big one when using a linux device model stubdomain. Signed-off-by: Jason Andryuk Acked-by: Ian Jackson --- tools/libxl/libxl_dm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/libxl/libxl_dm.c b/tools/libxl/libxl_dm.c index 454a2815ed..f2dc5696b9 100644 --- a/tools/libxl/libxl_dm.c +++ b/tools/libxl/libxl_dm.c @@ -2327,6 +2327,22 @@ void libxl__spawn_stub_dm(libxl__egc *egc, libxl__stub_dm_spawn_state *sdss) dm_config->num_vkbs = 1; } + if (guest_config->b_info.stubdomain_kernel && + access(guest_config->b_info.stubdomain_kernel, R_OK) != 0) { + LOGED(ERROR, guest_domid, "could not access stubdomain kernel %s", + guest_config->b_info.stubdomain_kernel); + ret = ERROR_INVAL; + goto out; + } + + if (guest_config->b_info.stubdomain_ramdisk && + access(guest_config->b_info.stubdomain_ramdisk, R_OK) != 0) { + LOGED(ERROR, guest_domid, "could not access stubdomain ramdisk %s", + guest_config->b_info.stubdomain_ramdisk); + ret = ERROR_INVAL; + goto out; + } + stubdom_state->pv_kernel.path = guest_config->b_info.stubdomain_kernel; stubdom_state->pv_ramdisk.path = guest_config->b_info.stubdomain_ramdisk; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 20 18:00:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 20 May 2020 18:00:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbT0h-00044i-1P; Wed, 20 May 2020 18:00:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbT0g-00043Z-5d for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 18:00:06 +0000 X-Inumbo-ID: bbaa37c2-9ac3-11ea-aa6a-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bbaa37c2-9ac3-11ea-aa6a-12813bfff9fa; Wed, 20 May 2020 18:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=FdDmTta8DsJhQMmLxLz6qts3hGlkg8YGPme/rQCfqdU=; b=2FkI4nBROTJ7D33gNoNjH4/iAH oKK+Tw2TQ0tlL+VLKFAMSnNskTCTs7zJyAMPf06JDtj91eu/gK/sdMl99PvRaMENI7HR6Jhj17Ik0 3DMm3KDOhtTWMQZYEvlTyblRHh7tucasfZFKq4OH1PDXv1w86Y+rIFBD9sTYuybmfdjE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbT0e-0000G1-HH for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 18:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbT0e-00081k-Fm for xen-changelog@lists.xenproject.org; Wed, 20 May 2020 18:00:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/xenstore: mark variable in header as extern Message-Id: Date: Wed, 20 May 2020 18:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dacdbf7088d6a3705a9831e73991c2b14c519a65 Author: Anthony PERARD AuthorDate: Wed May 20 17:39:42 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 20 18:57:07 2020 +0100 tools/xenstore: mark variable in header as extern This patch fix "multiple definition of `xprintf'" (or xgt_handle) build error with GCC 10.1.0. These are the error reported: gcc xs_tdb_dump.o utils.o tdb.o talloc.o -o xs_tdb_dump /usr/bin/ld: utils.o:./utils.h:27: multiple definition of `xprintf'; xs_tdb_dump.o:./utils.h:27: first defined here [...] gcc xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xenstored_control.o xs_lib.o talloc.o utils.o tdb.o hashtable.o xenstored_posix.o -lsystemd -Wl,-rpath-link=... ../libxc/libxenctrl.so -lrt -o xenstored /usr/bin/ld: xenstored_watch.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_domain.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_transaction.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_control.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_posix.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here A difference that I noticed with earlier version of the build chain is that before, I had: $ nm xs_tdb_dump.o | grep xprintf 0000000000000008 C xprintf And now, it's: 0000000000000000 B xprintf With the patch apply, the symbol isn't in xs_tdb_dump.o anymore. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper Reviewed-by: Ian Jackson --- tools/xenstore/utils.h | 2 +- tools/xenstore/xenstored_core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/utils.h b/tools/xenstore/utils.h index 522c3594a2..6a1b5de9bd 100644 --- a/tools/xenstore/utils.h +++ b/tools/xenstore/utils.h @@ -24,7 +24,7 @@ static inline bool strends(const char *a, const char *b) void barf(const char *fmt, ...) __attribute__((noreturn)); void barf_perror(const char *fmt, ...) __attribute__((noreturn)); -void (*xprintf)(const char *fmt, ...); +extern void (*xprintf)(const char *fmt, ...); #define eprintf(_fmt, _args...) xprintf("[ERR] %s" _fmt, __FUNCTION__, ##_args) diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 56a279cfbb..c4c32bc88f 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -204,7 +204,7 @@ void finish_daemonize(void); /* Open a pipe for signal handling */ void init_pipe(int reopen_log_pipe[2]); -xengnttab_handle **xgt_handle; +extern xengnttab_handle **xgt_handle; int remember_string(struct hashtable *hash, const char *str); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 21 14:11:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 May 2020 14:11:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblub-0005Ek-Hv; Thu, 21 May 2020 14:11:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblua-0005Ed-FJ for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:04 +0000 X-Inumbo-ID: e696df24-9b6c-11ea-ab14-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e696df24-9b6c-11ea-ab14-12813bfff9fa; Thu, 21 May 2020 14:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BwnpSww39f4wuhMWDls4NXtafszRHCcE83bLn9Qat70=; b=BMRCIPPe9OsQYLSgbxgAox4xaf sGaRojdvBSp2S+gun0Ob6LpBGXEO5Zfo4U2bH5LL+L8vKBQjoE9oe+qexbwPYfz+eBCWBRFRIi8wY SbklKo07o4hqHcT6X09U1xvvQOit7sDavcaHc/OAsspjJMDo+eFLS+eHiwJZVLhWDZDI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbluY-0003an-Gn for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jbluY-0000rn-FO for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/setup: lift dom0 creation out into create_dom0() function Message-Id: Date: Thu, 21 May 2020 14:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f546619ce1c5d4de694597c28358cd8e23eea231 Author: David Woodhouse AuthorDate: Wed May 20 12:47:48 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 20 12:47:48 2020 +0200 x86/setup: lift dom0 creation out into create_dom0() function The creation of dom0 can be relatively self-contained. Shift it into a separate function and simplify __start_xen() a little bit. This is a cleanup in its own right, but will be even more desireable when live update provides an alternative path through __start_xen() that doesn't involve creating a new dom0 at all. Move the calculation of the 'initrd' parameter for create_dom0() down past the cosmetic printk about NX support, because in the fullness of time the whole initrd and create_dom0() part will be under the same "not live update" conditional. And in the meantime it's just neater. Also drop the explicit check for initrd to be module #0 since that would be the dom0 kernel and the corresponding bit is always clear in module_map. Signed-off-by: David Woodhouse Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 173 ++++++++++++++++++++++++++++----------------------- 1 file changed, 94 insertions(+), 79 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 9e9576344c..2dec7a3fc6 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -681,6 +681,92 @@ static unsigned int __init copy_bios_e820(struct e820entry *map, unsigned int li return n; } +static struct domain *__init create_dom0(const module_t *image, + unsigned long headroom, + module_t *initrd, const char *kextra, + const char *loader) +{ + struct xen_domctl_createdomain dom0_cfg = { + .flags = IS_ENABLED(CONFIG_TBOOT) ? XEN_DOMCTL_CDF_s3_integrity : 0, + .max_evtchn_port = -1, + .max_grant_frames = -1, + .max_maptrack_frames = -1, + .max_vcpus = dom0_max_vcpus(), + }; + struct domain *d; + char *cmdline; + + if ( opt_dom0_pvh ) + { + dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm | + ((hvm_hap_supported() && !opt_dom0_shadow) ? + XEN_DOMCTL_CDF_hap : 0)); + + dom0_cfg.arch.emulation_flags |= + XEN_X86_EMU_LAPIC | XEN_X86_EMU_IOAPIC | XEN_X86_EMU_VPCI; + } + + if ( iommu_enabled ) + dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; + + /* Create initial domain 0. */ + d = domain_create(get_initial_domain_id(), &dom0_cfg, !pv_shim); + if ( IS_ERR(d) || (alloc_dom0_vcpu0(d) == NULL) ) + panic("Error creating domain 0\n"); + + /* Grab the DOM0 command line. */ + cmdline = image->string ? __va(image->string) : NULL; + if ( cmdline || kextra ) + { + static char __initdata dom0_cmdline[MAX_GUEST_CMDLINE]; + + cmdline = cmdline_cook(cmdline, loader); + safe_strcpy(dom0_cmdline, cmdline); + + if ( kextra ) + /* kextra always includes exactly one leading space. */ + safe_strcat(dom0_cmdline, kextra); + + /* Append any extra parameters. */ + if ( skip_ioapic_setup && !strstr(dom0_cmdline, "noapic") ) + safe_strcat(dom0_cmdline, " noapic"); + if ( (strlen(acpi_param) == 0) && acpi_disabled ) + { + printk("ACPI is disabled, notifying Domain 0 (acpi=off)\n"); + safe_strcpy(acpi_param, "off"); + } + if ( (strlen(acpi_param) != 0) && !strstr(dom0_cmdline, "acpi=") ) + { + safe_strcat(dom0_cmdline, " acpi="); + safe_strcat(dom0_cmdline, acpi_param); + } + + cmdline = dom0_cmdline; + } + + /* + * Temporarily clear SMAP in CR4 to allow user-accesses in construct_dom0(). + * This saves a large number of corner cases interactions with + * copy_from_user(). + */ + if ( cpu_has_smap ) + { + cr4_pv32_mask &= ~X86_CR4_SMAP; + write_cr4(read_cr4() & ~X86_CR4_SMAP); + } + + if ( construct_dom0(d, image, headroom, initrd, cmdline) != 0 ) + panic("Could not construct domain 0\n"); + + if ( cpu_has_smap ) + { + write_cr4(read_cr4() | X86_CR4_SMAP); + cr4_pv32_mask |= X86_CR4_SMAP; + } + + return d; +} + /* How much of the directmap is prebuilt at compile time. */ #define PREBUILT_MAP_LIMIT (1 << L2_PAGETABLE_SHIFT) @@ -700,12 +786,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) .parity = 'n', .stop_bits = 1 }; - struct xen_domctl_createdomain dom0_cfg = { - .flags = IS_ENABLED(CONFIG_TBOOT) ? XEN_DOMCTL_CDF_s3_integrity : 0, - .max_evtchn_port = -1, - .max_grant_frames = -1, - .max_maptrack_frames = -1, - }; const char *hypervisor_name; /* Critical region without IDT or TSS. Any fault is deadly! */ @@ -1742,58 +1822,13 @@ void __init noreturn __start_xen(unsigned long mbi_p) init_guest_cpuid(); init_guest_msr_policy(); - if ( opt_dom0_pvh ) - { - dom0_cfg.flags |= (XEN_DOMCTL_CDF_hvm | - ((hvm_hap_supported() && !opt_dom0_shadow) ? - XEN_DOMCTL_CDF_hap : 0)); - - dom0_cfg.arch.emulation_flags |= - XEN_X86_EMU_LAPIC | XEN_X86_EMU_IOAPIC | XEN_X86_EMU_VPCI; - } - dom0_cfg.max_vcpus = dom0_max_vcpus(); - - if ( iommu_enabled ) - dom0_cfg.flags |= XEN_DOMCTL_CDF_iommu; - - /* Create initial domain 0. */ - dom0 = domain_create(get_initial_domain_id(), &dom0_cfg, !pv_shim); - if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) == NULL) ) - panic("Error creating domain 0\n"); - - /* Grab the DOM0 command line. */ - cmdline = (char *)(mod[0].string ? __va(mod[0].string) : NULL); - if ( (cmdline != NULL) || (kextra != NULL) ) - { - static char __initdata dom0_cmdline[MAX_GUEST_CMDLINE]; - - cmdline = cmdline_cook(cmdline, loader); - safe_strcpy(dom0_cmdline, cmdline); - - if ( kextra != NULL ) - /* kextra always includes exactly one leading space. */ - safe_strcat(dom0_cmdline, kextra); - - /* Append any extra parameters. */ - if ( skip_ioapic_setup && !strstr(dom0_cmdline, "noapic") ) - safe_strcat(dom0_cmdline, " noapic"); - if ( (strlen(acpi_param) == 0) && acpi_disabled ) - { - printk("ACPI is disabled, notifying Domain 0 (acpi=off)\n"); - safe_strcpy(acpi_param, "off"); - } - if ( (strlen(acpi_param) != 0) && !strstr(dom0_cmdline, "acpi=") ) - { - safe_strcat(dom0_cmdline, " acpi="); - safe_strcat(dom0_cmdline, acpi_param); - } - - cmdline = dom0_cmdline; - } - if ( xen_cpuidle ) xen_processor_pmbits |= XEN_PROCESSOR_PM_CX; + printk("%sNX (Execute Disable) protection %sactive\n", + cpu_has_nx ? XENLOG_INFO : XENLOG_WARNING "Warning: ", + cpu_has_nx ? "" : "not "); + initrdidx = find_first_bit(module_map, mbi->mods_count); if ( bitmap_weight(module_map, mbi->mods_count) > 1 ) printk(XENLOG_WARNING @@ -1801,35 +1836,15 @@ void __init noreturn __start_xen(unsigned long mbi_p) initrdidx); /* - * Temporarily clear SMAP in CR4 to allow user-accesses in construct_dom0(). - * This saves a large number of corner cases interactions with - * copy_from_user(). - */ - if ( cpu_has_smap ) - { - cr4_pv32_mask &= ~X86_CR4_SMAP; - write_cr4(read_cr4() & ~X86_CR4_SMAP); - } - - printk("%sNX (Execute Disable) protection %sactive\n", - cpu_has_nx ? XENLOG_INFO : XENLOG_WARNING "Warning: ", - cpu_has_nx ? "" : "not "); - - /* * We're going to setup domain0 using the module(s) that we stashed safely * above our heap. The second module, if present, is an initrd ramdisk. */ - if ( construct_dom0(dom0, mod, modules_headroom, - (initrdidx > 0) && (initrdidx < mbi->mods_count) - ? mod + initrdidx : NULL, cmdline) != 0) + dom0 = create_dom0(mod, modules_headroom, + initrdidx < mbi->mods_count ? mod + initrdidx : NULL, + kextra, loader); + if ( !dom0 ) panic("Could not set up DOM0 guest OS\n"); - if ( cpu_has_smap ) - { - write_cr4(read_cr4() | X86_CR4_SMAP); - cr4_pv32_mask |= X86_CR4_SMAP; - } - heap_init_late(); init_trace_bufs(); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 21 14:11:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 May 2020 14:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbluk-0005FR-JR; Thu, 21 May 2020 14:11:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbluj-0005FH-G8 for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:13 +0000 X-Inumbo-ID: ed38dbe6-9b6c-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ed38dbe6-9b6c-11ea-ae69-bc764e2007e4; Thu, 21 May 2020 14:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dfdzgTeFJOZGW1ZCd3JMjrt4hOx1hbzrEbTSvprwG+M=; b=MxECQ36L+gReXm6EhYXB3K4U0L lkHfUPM92wKpmML1OqCk0tTqLeQ+bzuQtzgj1OcsbYTWnbLLsxry2j2+Py/IjjCHO0BFF7yAggnbp HMv2mbQZhoM60PtcfFrsApTvn7lgUv9dmQ1Pv4uiVCviOotPigZqH76yG8TBTgOHO56E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblui-0003at-Jy for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jblui-0000tS-Ih for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/idle: rework C6 EOI workaround Message-Id: Date: Thu, 21 May 2020 14:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5fef1fd713660406a6187ef352fbf79986abfe43 Author: Roger Pau Monné AuthorDate: Wed May 20 12:48:37 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 20 12:48:37 2020 +0200 x86/idle: rework C6 EOI workaround Change the C6 EOI workaround (errata AAJ72) to use x86_match_cpu. Also call the workaround from mwait_idle, previously it was only used by the ACPI idle driver. Finally make sure the routine is called for all states equal or greater than ACPI_STATE_C3, note that the ACPI driver doesn't currently handle them, but the errata condition shouldn't be limited by that. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 43 ++++++++++++++++++++++++++----------------- xen/arch/x86/cpu/mwait-idle.c | 3 +++ xen/include/asm-x86/cpuidle.h | 2 ++ 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index b83446e77d..82f108d301 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -548,26 +548,35 @@ void trace_exit_reason(u32 *irq_traced) } } -/* - * "AAJ72. EOI Transaction May Not be Sent if Software Enters Core C6 During - * an Interrupt Service Routine" - * - * There was an errata with some Core i7 processors that an EOI transaction - * may not be sent if software enters core C6 during an interrupt service - * routine. So we don't enter deep Cx state if there is an EOI pending. - */ -static bool errata_c6_eoi_workaround(void) +bool errata_c6_eoi_workaround(void) { - static int8_t fix_needed = -1; + static int8_t __read_mostly fix_needed = -1; if ( unlikely(fix_needed == -1) ) { - int model = boot_cpu_data.x86_model; - fix_needed = (cpu_has_apic && !directed_eoi_enabled && - (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && - (boot_cpu_data.x86 == 6) && - ((model == 0x1a) || (model == 0x1e) || (model == 0x1f) || - (model == 0x25) || (model == 0x2c) || (model == 0x2f))); +#define INTEL_FAM6_MODEL(m) { X86_VENDOR_INTEL, 6, m, X86_FEATURE_ALWAYS } + /* + * Errata AAJ72: EOI Transaction May Not be Sent if Software Enters + * Core C6 During an Interrupt Service Routine" + * + * There was an errata with some Core i7 processors that an EOI + * transaction may not be sent if software enters core C6 during an + * interrupt service routine. So we don't enter deep Cx state if + * there is an EOI pending. + */ + static const struct x86_cpu_id eoi_errata[] = { + INTEL_FAM6_MODEL(0x1a), + INTEL_FAM6_MODEL(0x1e), + INTEL_FAM6_MODEL(0x1f), + INTEL_FAM6_MODEL(0x25), + INTEL_FAM6_MODEL(0x2c), + INTEL_FAM6_MODEL(0x2f), + { } + }; +#undef INTEL_FAM6_MODEL + + fix_needed = cpu_has_apic && !directed_eoi_enabled && + x86_match_cpu(eoi_errata); } return (fix_needed && cpu_has_pending_apic_eoi()); @@ -676,7 +685,7 @@ static void acpi_processor_idle(void) return; } - if ( (cx->type == ACPI_STATE_C3) && errata_c6_eoi_workaround() ) + if ( (cx->type >= ACPI_STATE_C3) && errata_c6_eoi_workaround() ) cx = power->safe_state; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index b81937966e..88a3e160c5 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -770,6 +770,9 @@ static void mwait_idle(void) return; } + if ((cx->type >= 3) && errata_c6_eoi_workaround()) + cx = power->safe_state; + eax = cx->address; cstate = ((eax >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; diff --git a/xen/include/asm-x86/cpuidle.h b/xen/include/asm-x86/cpuidle.h index 5d7dffd228..51368694dc 100644 --- a/xen/include/asm-x86/cpuidle.h +++ b/xen/include/asm-x86/cpuidle.h @@ -26,4 +26,6 @@ void update_idle_stats(struct acpi_processor_power *, void update_last_cx_stat(struct acpi_processor_power *, struct acpi_processor_cx *, uint64_t); +bool errata_c6_eoi_workaround(void); + #endif /* __X86_ASM_CPUIDLE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 21 14:11:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 May 2020 14:11:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jbluy-0005HO-US; Thu, 21 May 2020 14:11:28 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblux-0005HA-RA for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:27 +0000 X-Inumbo-ID: f31ed832-9b6c-11ea-ab14-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f31ed832-9b6c-11ea-ab14-12813bfff9fa; Thu, 21 May 2020 14:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=a9OIbnmtpTbsVjGsb0WPtx7UfWt+5FSOc4E2vIoM9IA=; b=zi8ZcS3+j1C/MipG/HpUKq6Owp NxAgLvnMxSTmqgY+D2qLNT/xmniiq03vjgHT2gPhHKFxaq06AA4p8C0TkWIqkrKiWs8eFwsm6fffS 7gUCLG50ezAXLsOVzC1qKqj6eV9FRM0QY54DN3gRn8w/dfAm0+hLyVf35X55+Qth4g2E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblus-0003b6-Mk for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jblus-0000u6-La for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem-paging: further adjustments to p2m_mem_paging_prep()'s error handling Message-Id: Date: Thu, 21 May 2020 14:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cdea123f1976549ecc72644588cc5ce1491606c4 Author: Jan Beulich AuthorDate: Wed May 20 12:49:28 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 20 12:49:28 2020 +0200 x86/mem-paging: further adjustments to p2m_mem_paging_prep()'s error handling Address late comments on ecb913be4aaa ("x86/mem-paging: correct p2m_mem_paging_prep()'s error handling"): - insert a gprintk() ahead of domain_crash(), - add a comment. Requested-by: Andrew Cooper Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper --- xen/arch/x86/mm/mem_paging.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xen/arch/x86/mm/mem_paging.c b/xen/arch/x86/mm/mem_paging.c index 6aa1bffa65..01281f786e 100644 --- a/xen/arch/x86/mm/mem_paging.c +++ b/xen/arch/x86/mm/mem_paging.c @@ -385,6 +385,9 @@ static int prepare(struct domain *d, gfn_t gfn, * The domain can't possibly know about this page yet, so failure * here is a clear indication of something fishy going on. */ + gprintk(XENLOG_ERR, + "%pd: fresh page for GFN %"PRI_gfn" in unexpected state\n", + d, gfn_x(gfn)); domain_crash(d); page = NULL; goto out; @@ -423,6 +426,10 @@ static int prepare(struct domain *d, gfn_t gfn, if ( page ) { + /* + * Free the page on error. Drop our temporary reference in all + * cases. + */ if ( ret ) put_page_alloc_ref(page); put_page(page); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 21 14:11:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 21 May 2020 14:11:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblv3-0005Ii-Vt; Thu, 21 May 2020 14:11:33 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblv3-0005Ib-Mi for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:33 +0000 X-Inumbo-ID: f88c597b-9b6c-11ea-ab14-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f88c597b-9b6c-11ea-ab14-12813bfff9fa; Thu, 21 May 2020 14:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xW5e01eKOZkvYfzAMWbEZ2TuF9GpeCnrzWYMc09TtrY=; b=RUi7/aO6LMyDKFoFjWWLKPGCgW O4MScNXMouBfCjj6Jzd2yg3vLalikhqCq5HjQwRlPA1ys7Xodnyg9pZ9wnrckXnZqGwaskzSVDt9t 26jy27/Ilp24SWkFNDzGSLCb0DEGElgrzXX1KY+P1PzO2qPqhDWzbU7sEVzrVJJ7EiAs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jblv2-0003bM-PL for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jblv2-0000uv-OS for xen-changelog@lists.xenproject.org; Thu, 21 May 2020 14:11:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/xenstore: mark variable in header as extern Message-Id: Date: Thu, 21 May 2020 14:11:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit dacdbf7088d6a3705a9831e73991c2b14c519a65 Author: Anthony PERARD AuthorDate: Wed May 20 17:39:42 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 20 18:57:07 2020 +0100 tools/xenstore: mark variable in header as extern This patch fix "multiple definition of `xprintf'" (or xgt_handle) build error with GCC 10.1.0. These are the error reported: gcc xs_tdb_dump.o utils.o tdb.o talloc.o -o xs_tdb_dump /usr/bin/ld: utils.o:./utils.h:27: multiple definition of `xprintf'; xs_tdb_dump.o:./utils.h:27: first defined here [...] gcc xenstored_core.o xenstored_watch.o xenstored_domain.o xenstored_transaction.o xenstored_control.o xs_lib.o talloc.o utils.o tdb.o hashtable.o xenstored_posix.o -lsystemd -Wl,-rpath-link=... ../libxc/libxenctrl.so -lrt -o xenstored /usr/bin/ld: xenstored_watch.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_domain.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_transaction.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_control.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here /usr/bin/ld: xenstored_posix.o:./xenstored_core.h:207: multiple definition of `xgt_handle'; xenstored_core.o:./xenstored_core.h:207: first defined here A difference that I noticed with earlier version of the build chain is that before, I had: $ nm xs_tdb_dump.o | grep xprintf 0000000000000008 C xprintf And now, it's: 0000000000000000 B xprintf With the patch apply, the symbol isn't in xs_tdb_dump.o anymore. Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper Reviewed-by: Ian Jackson --- tools/xenstore/utils.h | 2 +- tools/xenstore/xenstored_core.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/xenstore/utils.h b/tools/xenstore/utils.h index 522c3594a2..6a1b5de9bd 100644 --- a/tools/xenstore/utils.h +++ b/tools/xenstore/utils.h @@ -24,7 +24,7 @@ static inline bool strends(const char *a, const char *b) void barf(const char *fmt, ...) __attribute__((noreturn)); void barf_perror(const char *fmt, ...) __attribute__((noreturn)); -void (*xprintf)(const char *fmt, ...); +extern void (*xprintf)(const char *fmt, ...); #define eprintf(_fmt, _args...) xprintf("[ERR] %s" _fmt, __FUNCTION__, ##_args) diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 56a279cfbb..c4c32bc88f 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -204,7 +204,7 @@ void finish_daemonize(void); /* Open a pipe for signal handling */ void init_pipe(int reopen_log_pipe[2]); -xengnttab_handle **xgt_handle; +extern xengnttab_handle **xgt_handle; int remember_string(struct hashtable *hash, const char *str); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 22 10:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 10:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc4oY-0003HI-By; Fri, 22 May 2020 10:22:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc4oX-0003HD-01 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 10:22:05 +0000 X-Inumbo-ID: 14e3fbf4-9c16-11ea-abac-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 14e3fbf4-9c16-11ea-abac-12813bfff9fa; Fri, 22 May 2020 10:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nHfk6yEx1dAK5DHM2F6frMyuytVUn624damY+p3O5a8=; b=odmb4nCHP9DXAG732GBnyn5gaD ejAVqjt1jLhbJYDx8+9UlgEq7gWh9iwwRQnFItzawMUsS+RA89yV2TVoxSvX4UfYrwVqs7RsB39+N yzpJKKBkwvT8RsQMOelkVGRcO7o8MieSn8Kyhqnyuc/JdfSWTNaMjDSFTnmJBnDeO0+I=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc4oW-0007XX-4F for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 10:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc4oW-0001k4-2y for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 10:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang: Update generated files after libxl_types.idl change Message-Id: Date: Fri, 22 May 2020 10:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f6d102046817bb5c08876ff78a6a00f4d29ee269 Author: George Dunlap AuthorDate: Fri May 22 10:35:10 2020 +0100 Commit: George Dunlap CommitDate: Fri May 22 10:35:10 2020 +0100 golang: Update generated files after libxl_types.idl change c/s 7efd9f3d45 ("libxl: Handle Linux stubdomain specific QEMU options.") modified libl_types.idl. Run gengotypes.py again to update the geneated golang bindings. Signed-off-by: George Dunlap Acked-by: Wei Liu --- tools/golang/xenlight/helpers.gen.go | 10 ++++++++++ tools/golang/xenlight/types.gen.go | 3 +++ 2 files changed, 13 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 109e9515a2..b5bd0de830 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1163,6 +1163,9 @@ func (x *DomainBuildInfo) fromC(xc *C.libxl_domain_build_info) error { if err := x.DeviceModelStubdomain.fromC(&xc.device_model_stubdomain); err != nil { return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) } + x.StubdomainMemkb = uint64(xc.stubdomain_memkb) + x.StubdomainKernel = C.GoString(xc.stubdomain_kernel) + x.StubdomainRamdisk = C.GoString(xc.stubdomain_ramdisk) x.DeviceModel = C.GoString(xc.device_model) x.DeviceModelSsidref = uint32(xc.device_model_ssidref) x.DeviceModelSsidLabel = C.GoString(xc.device_model_ssid_label) @@ -1489,6 +1492,13 @@ func (x *DomainBuildInfo) toC(xc *C.libxl_domain_build_info) (err error) { if err := x.DeviceModelStubdomain.toC(&xc.device_model_stubdomain); err != nil { return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) } + xc.stubdomain_memkb = C.uint64_t(x.StubdomainMemkb) + if x.StubdomainKernel != "" { + xc.stubdomain_kernel = C.CString(x.StubdomainKernel) + } + if x.StubdomainRamdisk != "" { + xc.stubdomain_ramdisk = C.CString(x.StubdomainRamdisk) + } if x.DeviceModel != "" { xc.device_model = C.CString(x.DeviceModel) } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index df68fd0e88..15516ae552 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -509,6 +509,9 @@ type DomainBuildInfo struct { MaxMaptrackFrames uint32 DeviceModelVersion DeviceModelVersion DeviceModelStubdomain Defbool + StubdomainMemkb uint64 + StubdomainKernel string + StubdomainRamdisk string DeviceModel string DeviceModelSsidref uint32 DeviceModelSsidLabel string -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 12:44:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 12:44:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc71z-0000UK-UA; Fri, 22 May 2020 12:44:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc71y-0000UF-SQ for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:06 +0000 X-Inumbo-ID: eb832b22-9c29-11ea-abc4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id eb832b22-9c29-11ea-abc4-12813bfff9fa; Fri, 22 May 2020 12:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oJp4XNk3/pFQERwTrX1ayz8LL6I8Br2XtauIqxiJWMY=; b=ehTTbKrJYJYf8+a1uIBJqsOxa0 nlMWWg5ttQu7Yga29C3NDPsqcfmTl73XChH5q0KKpUZ/fIh1CS0OyzwcpF54sUyISdG8vV3MCQYu6 2tSFS9i9nNatWLiXsIERS+fZuCJlhZ1gJffXDt/xlDZDOBi7P9JYBYaQRT8eErcF5Mio=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc71w-00025R-Je for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc71w-0001LV-IC for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: correct test harness {evex} assembler capability check Message-Id: Date: Fri, 22 May 2020 12:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ba7b169c9f0922886001dc0b27dc4c28dfe15631 Author: Jan Beulich AuthorDate: Fri May 22 14:35:04 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:35:04 2020 +0200 x86emul: correct test harness {evex} assembler capability check The {evex} pseudo prefix gets rejected by gas for insns not allowing EVEX encoding. Except there's a gas bug due to which its check gets bypassed for insns without operands. Let's not rely on that bug to remain there. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 7ce882cb78..b414773810 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -112,7 +112,7 @@ $(foreach flavor,$(SIMD) $(FMA),$(eval $(call simd-check-cc,$(flavor)))) # Also explicitly check for {evex} pseudo-prefix support, which got introduced # only after AVX512F and some of its extensions. -TARGET-$(shell echo 'asm("{evex} vzeroall");' | $(CC) -x c -c -o /dev/null - || echo y) := +TARGET-$(shell echo 'asm("{evex} vmovaps %xmm0$(comma)%xmm0");' | $(CC) -x c -c -o /dev/null - || echo y) := ifeq ($(TARGET-y),) $(warning Test harness not built, use newer compiler than "$(CC)" (version $(shell $(CC) -dumpversion)) and an "{evex}" capable assembler) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 12:44:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 12:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc728-0000VS-Vj; Fri, 22 May 2020 12:44:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc727-0000VI-N8 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:15 +0000 X-Inumbo-ID: f18958b6-9c29-11ea-abc4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f18958b6-9c29-11ea-abc4-12813bfff9fa; Fri, 22 May 2020 12:44:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zvq5HklxEmJbWzDSeWP6L79eQ9lcwM+OTQG5PJS/Auk=; b=2QKECbShCyucRu8OyUq83+bFg4 i4gItNxb0Y0Q+sT700YvqtccrcaVs4FlanfvyPXzIHe3yBPlMewRgikxfDg8MHkEgWFgXggKV4FvV LZ5qVl4AibUKy/YZqqtbofj6CC5MTehbUvQsspVUonA+WNCXDcEu//hCBl34pJGhUEKs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc726-00025U-N8 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc726-0001MN-Lx for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/HVM: move NOFLUSH handling out of hvm_set_cr3() Message-Id: Date: Fri, 22 May 2020 12:44:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 18cc07b96f76bf44e9215d79e96d4b37bd3cbcac Author: Jan Beulich AuthorDate: Fri May 22 14:37:09 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:37:09 2020 +0200 x86/HVM: move NOFLUSH handling out of hvm_set_cr3() The bit is meaningful only for MOV-to-CR3 insns, not anywhere else, in particular not when loading nested guest state. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant Acked-by: Andrew Cooper --- xen/arch/x86/hvm/emulate.c | 8 +++++++- xen/arch/x86/hvm/hvm.c | 20 ++++++++++---------- xen/arch/x86/hvm/monitor.c | 3 --- xen/arch/x86/hvm/svm/nestedsvm.c | 6 +++--- xen/arch/x86/hvm/vm_event.c | 2 +- xen/arch/x86/hvm/vmx/vvmx.c | 4 ++-- xen/include/asm-x86/domain.h | 2 ++ xen/include/asm-x86/hvm/support.h | 2 +- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index e87ceaf23e..57f36b7be9 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2169,8 +2169,14 @@ static int hvmemul_write_cr( break; case 3: - rc = hvm_set_cr3(val, true); + { + bool noflush = hvm_pcid_enabled(current) && (val & X86_CR3_NOFLUSH); + + if ( noflush ) + val &= ~X86_CR3_NOFLUSH; + rc = hvm_set_cr3(val, noflush, true); break; + } case 4: rc = hvm_set_cr4(val, true); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 09ee299bc7..abd5db5599 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2132,8 +2132,14 @@ int hvm_mov_to_cr(unsigned int cr, unsigned int gpr) break; case 3: - rc = hvm_set_cr3(val, true); + { + bool noflush = hvm_pcid_enabled(curr) && (val & X86_CR3_NOFLUSH); + + if ( noflush ) + val &= ~X86_CR3_NOFLUSH; + rc = hvm_set_cr3(val, noflush, true); break; + } case 4: rc = hvm_set_cr4(val, true); @@ -2350,12 +2356,11 @@ int hvm_set_cr0(unsigned long value, bool may_defer) return X86EMUL_OKAY; } -int hvm_set_cr3(unsigned long value, bool may_defer) +int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) { struct vcpu *v = current; struct page_info *page; unsigned long old = v->arch.hvm.guest_cr[3]; - bool noflush = false; if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) @@ -2367,17 +2372,12 @@ int hvm_set_cr3(unsigned long value, bool may_defer) /* The actual write will occur in hvm_do_resume(), if permitted. */ v->arch.vm_event->write_data.do_write.cr3 = 1; v->arch.vm_event->write_data.cr3 = value; + v->arch.vm_event->write_data.cr3_noflush = noflush; return X86EMUL_OKAY; } } - if ( hvm_pcid_enabled(v) ) /* Clear the noflush bit. */ - { - noflush = value & X86_CR3_NOFLUSH; - value &= ~X86_CR3_NOFLUSH; - } - if ( hvm_paging_enabled(v) && !paging_mode_hap(v->domain) && ((value ^ v->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) { @@ -3073,7 +3073,7 @@ void hvm_task_switch( if ( task_switch_load_seg(x86_seg_ldtr, tss.ldt, new_cpl, 0) ) goto out; - rc = hvm_set_cr3(tss.cr3, true); + rc = hvm_set_cr3(tss.cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if ( rc != X86EMUL_OKAY ) diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index f5d89e71d1..8aa14137e2 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -39,9 +39,6 @@ bool hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old) struct arch_domain *ad = &curr->domain->arch; unsigned int ctrlreg_bitmask = monitor_ctrlreg_bitmask(index); - if ( index == VM_EVENT_X86_CR3 && hvm_pcid_enabled(curr) ) - value &= ~X86_CR3_NOFLUSH; /* Clear the noflush bit. */ - if ( (ad->monitor.write_ctrlreg_enabled & ctrlreg_bitmask) && (!(ad->monitor.write_ctrlreg_onchangeonly & ctrlreg_bitmask) || value != old) && diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index ffdc1d8da0..11dc9c089c 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -324,7 +324,7 @@ static int nsvm_vcpu_hostrestore(struct vcpu *v, struct cpu_user_regs *regs) v->arch.guest_table = pagetable_null(); /* hvm_set_cr3() below sets v->arch.hvm.guest_cr[3] for us. */ } - rc = hvm_set_cr3(n1vmcb->_cr3, true); + rc = hvm_set_cr3(n1vmcb->_cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if (rc != X86EMUL_OKAY) @@ -583,7 +583,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) nestedsvm_vmcb_set_nestedp2m(v, ns_vmcb, n2vmcb); /* hvm_set_cr3() below sets v->arch.hvm.guest_cr[3] for us. */ - rc = hvm_set_cr3(ns_vmcb->_cr3, true); + rc = hvm_set_cr3(ns_vmcb->_cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if (rc != X86EMUL_OKAY) @@ -597,7 +597,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) * we assume it intercepts page faults. */ /* hvm_set_cr3() below sets v->arch.hvm.guest_cr[3] for us. */ - rc = hvm_set_cr3(ns_vmcb->_cr3, true); + rc = hvm_set_cr3(ns_vmcb->_cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if (rc != X86EMUL_OKAY) diff --git a/xen/arch/x86/hvm/vm_event.c b/xen/arch/x86/hvm/vm_event.c index 07f135217e..19aac19bc3 100644 --- a/xen/arch/x86/hvm/vm_event.c +++ b/xen/arch/x86/hvm/vm_event.c @@ -111,7 +111,7 @@ void hvm_vm_event_do_resume(struct vcpu *v) if ( unlikely(w->do_write.cr3) ) { - if ( hvm_set_cr3(w->cr3, false) == X86EMUL_EXCEPTION ) + if ( hvm_set_cr3(w->cr3, w->cr3_noflush, false) == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); w->do_write.cr3 = 0; diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index e2baa0f660..7dfff6c445 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1104,7 +1104,7 @@ static void load_shadow_guest_state(struct vcpu *v) if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); - rc = hvm_set_cr3(get_vvmcs(v, GUEST_CR3), true); + rc = hvm_set_cr3(get_vvmcs(v, GUEST_CR3), false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); @@ -1318,7 +1318,7 @@ static void load_vvmcs_host_state(struct vcpu *v) if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); - rc = hvm_set_cr3(get_vvmcs(v, HOST_CR3), true); + rc = hvm_set_cr3(get_vvmcs(v, HOST_CR3), false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 5b6d909266..e8cee3d5e5 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -285,6 +285,8 @@ struct monitor_write_data { unsigned int cr4 : 1; } do_write; + bool cr3_noflush; + uint32_t msr; uint64_t value; uint64_t cr0; diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index e161907dfa..a4950e3d4b 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -136,7 +136,7 @@ void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value); */ int hvm_set_efer(uint64_t value); int hvm_set_cr0(unsigned long value, bool may_defer); -int hvm_set_cr3(unsigned long value, bool may_defer); +int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer); int hvm_set_cr4(unsigned long value, bool may_defer); int hvm_descriptor_access_intercept(uint64_t exit_info, uint64_t vmx_exit_qualification, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 12:44:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 12:44:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc72J-0000WU-1A; Fri, 22 May 2020 12:44:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc72H-0000WJ-Mj for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:25 +0000 X-Inumbo-ID: f78b1ff6-9c29-11ea-abc4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f78b1ff6-9c29-11ea-abc4-12813bfff9fa; Fri, 22 May 2020 12:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=RRSS0cvPBGyXPPMM/OMtPpZ8MtclgoP0O5LnhoHkAGY=; b=5wHg0yVqrwaYiEOlN+IfI9KCKi 3GUp3OhGkUoMORlvdUdSDIx2rwKZnm9KaFLyZYOa64tDrqwSn8DjAS4ItGwab+YOvYXMiFSAgmZkW sRs8nwFx2qJG66Q/WVbRO7ucQFkFxfiZXm3CJ7Jzj3jC1U1/Bw3Mq7d8lmJN3qxzZDxM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc72G-00025k-Q9 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc72G-0001NI-P4 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/HVM: refuse CR3 loads with reserved (upper) bits set Message-Id: Date: Fri, 22 May 2020 12:44:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 80872597e6bd82429714b00f6a3e59fe21297906 Author: Jan Beulich AuthorDate: Fri May 22 14:40:30 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:40:30 2020 +0200 x86/HVM: refuse CR3 loads with reserved (upper) bits set While bits 11 and below are, if not used for other purposes, reserved but ignored, bits beyond physical address width are supposed to raise exceptions (at least in the non-nested case; I'm not convinced the current nested SVM/VMX behavior of raising #GP(0) here is correct, but that's not the subject of this change). Introduce currd as a local variable, and replace other v->domain instances at the same time. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index abd5db5599..56a150d81a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1046,6 +1046,13 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } + if ( ctxt.cr3 >> d->arch.cpuid->extd.maxphysaddr ) + { + printk(XENLOG_G_ERR "HVM%d restore: bad CR3 %#" PRIx64 "\n", + d->domain_id, ctxt.cr3); + return -EINVAL; + } + if ( (ctxt.flags & ~XEN_X86_FPU_INITIALISED) != 0 ) { gprintk(XENLOG_ERR, "bad flags value in CPU context: %#x\n", @@ -2359,10 +2366,18 @@ int hvm_set_cr0(unsigned long value, bool may_defer) int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) { struct vcpu *v = current; + struct domain *currd = v->domain; struct page_info *page; unsigned long old = v->arch.hvm.guest_cr[3]; - if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & + if ( value >> currd->arch.cpuid->extd.maxphysaddr ) + { + HVM_DBG_LOG(DBG_LEVEL_1, + "Attempt to set reserved CR3 bit(s): %lx", value); + return X86EMUL_EXCEPTION; + } + + if ( may_defer && unlikely(currd->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { ASSERT(v->arch.vm_event); @@ -2378,13 +2393,12 @@ int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) } } - if ( hvm_paging_enabled(v) && !paging_mode_hap(v->domain) && + if ( hvm_paging_enabled(v) && !paging_mode_hap(currd) && ((value ^ v->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) { /* Shadow-mode CR3 change. Check PDBR and update refcounts. */ HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 value = %lx", value); - page = get_page_from_gfn(v->domain, value >> PAGE_SHIFT, - NULL, P2M_ALLOC); + page = get_page_from_gfn(currd, value >> PAGE_SHIFT, NULL, P2M_ALLOC); if ( !page ) goto bad_cr3; @@ -2400,7 +2414,7 @@ int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) bad_cr3: gdprintk(XENLOG_ERR, "Invalid CR3\n"); - domain_crash(v->domain); + domain_crash(currd); return X86EMUL_UNHANDLEABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 12:44:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 12:44:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc72S-0000Xp-2k; Fri, 22 May 2020 12:44:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc72R-0000Xg-KC for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:35 +0000 X-Inumbo-ID: fd8e1de0-9c29-11ea-abc4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fd8e1de0-9c29-11ea-abc4-12813bfff9fa; Fri, 22 May 2020 12:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YBJiDrkTC4XSZvczRCRno+y1sbifh29lUtp9sA2P18M=; b=338h7cBjIA008TEeK+ZPcvgHTN gGXUmVWCDRGayuDocce/nQYgCqY5z90kVn2oVfVkmxEy24mkcIsjEr2f29kMFx/x4UZtOlIUQuuAZ HZwkn9jwyR7ffnpHuLYBa5i7Dhx/AQ77Fl6g2fGrX3ba4gecBRxGrHIi3vDNFsk+n1Qs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc72Q-00026d-T4 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc72Q-0001Nw-Rz for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 12:44:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/HVM: cosmetics to hvm_set_cr3() Message-Id: Date: Fri, 22 May 2020 12:44:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1658a39b0031baf9ec44c8d51d1d1369a964a4f9 Author: Jan Beulich AuthorDate: Fri May 22 14:41:15 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:41:15 2020 +0200 x86/HVM: cosmetics to hvm_set_cr3() Eliminate the not really useful local variable "old". Reduce the scope of "page". Rename the latched "current". Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 56a150d81a..74c9f84462 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2365,10 +2365,8 @@ int hvm_set_cr0(unsigned long value, bool may_defer) int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) { - struct vcpu *v = current; - struct domain *currd = v->domain; - struct page_info *page; - unsigned long old = v->arch.hvm.guest_cr[3]; + struct vcpu *curr = current; + struct domain *currd = curr->domain; if ( value >> currd->arch.cpuid->extd.maxphysaddr ) { @@ -2380,36 +2378,38 @@ int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) if ( may_defer && unlikely(currd->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { - ASSERT(v->arch.vm_event); + ASSERT(curr->arch.vm_event); - if ( hvm_monitor_crX(CR3, value, old) ) + if ( hvm_monitor_crX(CR3, value, curr->arch.hvm.guest_cr[3]) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - v->arch.vm_event->write_data.do_write.cr3 = 1; - v->arch.vm_event->write_data.cr3 = value; - v->arch.vm_event->write_data.cr3_noflush = noflush; + curr->arch.vm_event->write_data.do_write.cr3 = 1; + curr->arch.vm_event->write_data.cr3 = value; + curr->arch.vm_event->write_data.cr3_noflush = noflush; return X86EMUL_OKAY; } } - if ( hvm_paging_enabled(v) && !paging_mode_hap(currd) && - ((value ^ v->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) + if ( hvm_paging_enabled(curr) && !paging_mode_hap(currd) && + ((value ^ curr->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) { /* Shadow-mode CR3 change. Check PDBR and update refcounts. */ + struct page_info *page; + HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 value = %lx", value); page = get_page_from_gfn(currd, value >> PAGE_SHIFT, NULL, P2M_ALLOC); if ( !page ) goto bad_cr3; - put_page(pagetable_get_page(v->arch.guest_table)); - v->arch.guest_table = pagetable_from_page(page); + put_page(pagetable_get_page(curr->arch.guest_table)); + curr->arch.guest_table = pagetable_from_page(page); HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR3 value = %lx", value); } - v->arch.hvm.guest_cr[3] = value; - paging_update_cr3(v, noflush); + curr->arch.hvm.guest_cr[3] = value; + paging_update_cr3(curr, noflush); return X86EMUL_OKAY; bad_cr3: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 14:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 14:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Yp-0003Pv-Ro; Fri, 22 May 2020 14:22:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Yo-0003Pj-EJ for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:06 +0000 X-Inumbo-ID: 9c66121c-9c37-11ea-abe7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9c66121c-9c37-11ea-abe7-12813bfff9fa; Fri, 22 May 2020 14:22:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oDQkBFZP3fwzZWNH2oKePJueRwctFV/WK0WW/3Zj2ww=; b=bDj5U8lDxXV8jlaLKlg7Mx3tQo ljvm8ccYYT+l5eIbB+IrMqZw/Pw1eT79+Cmhm9KZcLb/6ninBcrdVFxZt16WpPincMFtd+o0P6EL1 HQXPO0r9+ojRYo6dA0JR4P1YQQQNRj4WnPs/hItpJ2hqUZREf9yEtuvs5bWingcwXku8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Ym-0004Gr-Qs for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc8Ym-0007SA-PC for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/idle: prevent entering C6 with in service interrupts on Intel Message-Id: Date: Fri, 22 May 2020 14:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fc44a7014cafe28b8c53eeaf6ac2a71f5bc8b815 Author: Roger Pau Monné AuthorDate: Fri May 22 16:07:38 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:07:38 2020 +0200 x86/idle: prevent entering C6 with in service interrupts on Intel Apply a workaround for Intel errata BDX99, CLX30, SKX100, CFW125, BDF104, BDH85, BDM135, KWB131: "A Pending Fixed Interrupt May Be Dispatched Before an Interrupt of The Same Priority Completes". Apply the errata to all server and client models (big cores) from Broadwell to Cascade Lake. The workaround is grouped together with the existing fix for errata AAJ72, and the eoi from the function name is removed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 38 ++++++++++++++++++++++++++++++++++---- xen/arch/x86/cpu/mwait-idle.c | 2 +- xen/include/asm-x86/cpuidle.h | 2 +- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 82f108d301..178cb607c2 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -548,7 +548,7 @@ void trace_exit_reason(u32 *irq_traced) } } -bool errata_c6_eoi_workaround(void) +bool errata_c6_workaround(void) { static int8_t __read_mostly fix_needed = -1; @@ -573,10 +573,40 @@ bool errata_c6_eoi_workaround(void) INTEL_FAM6_MODEL(0x2f), { } }; + /* + * Errata BDX99, CLX30, SKX100, CFW125, BDF104, BDH85, BDM135, KWB131: + * A Pending Fixed Interrupt May Be Dispatched Before an Interrupt of + * The Same Priority Completes. + * + * Resuming from C6 Sleep-State, with Fixed Interrupts of the same + * priority queued (in the corresponding bits of the IRR and ISR APIC + * registers), the processor may dispatch the second interrupt (from + * the IRR bit) before the first interrupt has completed and written to + * the EOI register, causing the first interrupt to never complete. + */ + static const struct x86_cpu_id isr_errata[] = { + /* Broadwell */ + INTEL_FAM6_MODEL(0x47), + INTEL_FAM6_MODEL(0x3d), + INTEL_FAM6_MODEL(0x4f), + INTEL_FAM6_MODEL(0x56), + /* Skylake (client) */ + INTEL_FAM6_MODEL(0x5e), + INTEL_FAM6_MODEL(0x4e), + /* {Sky/Cascade}lake (server) */ + INTEL_FAM6_MODEL(0x55), + /* {Kaby/Coffee/Whiskey/Amber} Lake */ + INTEL_FAM6_MODEL(0x9e), + INTEL_FAM6_MODEL(0x8e), + /* Cannon Lake */ + INTEL_FAM6_MODEL(0x66), + { } + }; #undef INTEL_FAM6_MODEL - fix_needed = cpu_has_apic && !directed_eoi_enabled && - x86_match_cpu(eoi_errata); + fix_needed = cpu_has_apic && + ((!directed_eoi_enabled && x86_match_cpu(eoi_errata)) || + x86_match_cpu(isr_errata)); } return (fix_needed && cpu_has_pending_apic_eoi()); @@ -685,7 +715,7 @@ static void acpi_processor_idle(void) return; } - if ( (cx->type >= ACPI_STATE_C3) && errata_c6_eoi_workaround() ) + if ( (cx->type >= ACPI_STATE_C3) && errata_c6_workaround() ) cx = power->safe_state; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 88a3e160c5..52eab81bf8 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -770,7 +770,7 @@ static void mwait_idle(void) return; } - if ((cx->type >= 3) && errata_c6_eoi_workaround()) + if ((cx->type >= 3) && errata_c6_workaround()) cx = power->safe_state; eax = cx->address; diff --git a/xen/include/asm-x86/cpuidle.h b/xen/include/asm-x86/cpuidle.h index 51368694dc..0981a8fd64 100644 --- a/xen/include/asm-x86/cpuidle.h +++ b/xen/include/asm-x86/cpuidle.h @@ -26,6 +26,6 @@ void update_idle_stats(struct acpi_processor_power *, void update_last_cx_stat(struct acpi_processor_power *, struct acpi_processor_cx *, uint64_t); -bool errata_c6_eoi_workaround(void); +bool errata_c6_workaround(void); #endif /* __X86_ASM_CPUIDLE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 14:22:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 14:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Yy-0003RX-Uf; Fri, 22 May 2020 14:22:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Yx-0003RO-Or for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:15 +0000 X-Inumbo-ID: a26cbcf6-9c37-11ea-abe7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a26cbcf6-9c37-11ea-abe7-12813bfff9fa; Fri, 22 May 2020 14:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6gKkgQFDrn2GCMj2GBX8x1hEWSEpZ0CwU+c/2KDbi5g=; b=4Xf1hwy9+5wSmDtonVDEUBWw7Z KTb26gx3dQk0kA4qLZqU+RnvxeQ9r3tSCvV/V/OZ1jXsyYy8gDLML1f1RIwIGOs5TnKMNq9VD+bYT 8Mtimdtlz1HWhDAjHh4ELX4GaUECw/rbi6vSpQwgdDZ5uAJiRkbrNraZt6Cwf9LGbfKQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Yw-0004Gx-U4 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc8Yw-0007Sa-Sj for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/idle: prevent entering C3/C6 on some Intel CPUs due to errata Message-Id: Date: Fri, 22 May 2020 14:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b2d502466547e6782ccadd501b8ef1482c391f2c Author: Roger Pau Monné AuthorDate: Fri May 22 16:08:54 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:08:54 2020 +0200 x86/idle: prevent entering C3/C6 on some Intel CPUs due to errata Apply a workaround for errata BA80, AAK120, AAM108, AAO67, BD59, AAY54: Rapid Core C3/C6 Transition May Cause Unpredictable System Behavior. Limit maximum C state to C1 when SMT is enabled on the affected CPUs. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/cpu/intel.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index b77c1a78ed..69e99bb358 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -297,6 +297,41 @@ static void early_init_intel(struct cpuinfo_x86 *c) } /* + * Errata BA80, AAK120, AAM108, AAO67, BD59, AAY54: Rapid Core C3/C6 Transition + * May Cause Unpredictable System Behavior + * + * Under a complex set of internal conditions, cores rapidly performing C3/C6 + * transitions in a system with Intel Hyper-Threading Technology enabled may + * cause a machine check error (IA32_MCi_STATUS.MCACOD = 0x0106), system hang + * or unpredictable system behavior. + */ +static void probe_c3_errata(const struct cpuinfo_x86 *c) +{ +#define INTEL_FAM6_MODEL(m) { X86_VENDOR_INTEL, 6, m, X86_FEATURE_ALWAYS } + static const struct x86_cpu_id models[] = { + /* Nehalem */ + INTEL_FAM6_MODEL(0x1a), + INTEL_FAM6_MODEL(0x1e), + INTEL_FAM6_MODEL(0x1f), + INTEL_FAM6_MODEL(0x2e), + /* Westmere (note Westmere-EX is not affected) */ + INTEL_FAM6_MODEL(0x2c), + INTEL_FAM6_MODEL(0x25), + { } + }; +#undef INTEL_FAM6_MODEL + + /* Serialized by the AP bringup code. */ + if ( max_cstate > 1 && (c->apicid & (c->x86_num_siblings - 1)) && + x86_match_cpu(models) ) + { + printk(XENLOG_WARNING + "Disabling C-states C3 and C6 due to CPU errata\n"); + max_cstate = 1; + } +} + +/* * P4 Xeon errata 037 workaround. * Hardware prefetcher may cause stale data to be loaded into the cache. * @@ -323,6 +358,8 @@ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) if (cpu_has_tsx_force_abort && opt_rtm_abort) wrmsrl(MSR_TSX_FORCE_ABORT, TSX_FORCE_ABORT_RTM); + + probe_c3_errata(c); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 14:22:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 14:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Z9-0003Sr-04; Fri, 22 May 2020 14:22:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Z7-0003Sh-QC for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:25 +0000 X-Inumbo-ID: a870e58c-9c37-11ea-abe7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a870e58c-9c37-11ea-abe7-12813bfff9fa; Fri, 22 May 2020 14:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=z1D+uRaT5uPhAcZN55rV1BepRATZuQOpbv5VZkGajrE=; b=fYGCpgtnshMo43kSfXi9Zivlxf FFyc567Gla7bk0e3GRGwLnIrOQWOw7DpGpsVA6F3fe+UYg4TNpF/28WLhGHKOpkut/Pm9l07iSj4Y 7obfAId0nsnXlGb8uSYPAarDYhlUPJ7mcdLH9pKKhIO2fppqlg7uWQkUJdfurHRvLYUU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8Z7-0004H6-1A for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc8Z6-0007T4-Vs for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: relax GDT check in arch_set_info_guest() Message-Id: Date: Fri, 22 May 2020 14:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ded6e9d514902be17069b59b335c3165c601f86a Author: Jan Beulich AuthorDate: Fri May 22 16:09:54 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:09:54 2020 +0200 x86: relax GDT check in arch_set_info_guest() It is wrong for us to check frames beyond the guest specified limit (in the compat case another loop bound is already correct). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/domain.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2e5717b983..6402b09993 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -840,6 +840,7 @@ int arch_set_info_guest( #ifdef CONFIG_PV mfn_t cr3_mfn; struct page_info *cr3_page = NULL; + unsigned int nr_gdt_frames; int rc = 0; #endif @@ -957,6 +958,10 @@ int arch_set_info_guest( /* Ensure real hardware interrupts are enabled. */ v->arch.user_regs.eflags |= X86_EFLAGS_IF; + nr_gdt_frames = DIV_ROUND_UP(c(gdt_ents), 512); + if ( nr_gdt_frames > ARRAY_SIZE(v->arch.pv.gdt_frames) ) + return -EINVAL; + if ( !v->is_initialised ) { if ( !compat && !(flags & VGCF_in_kernel) && !c.nat->ctrlreg[1] ) @@ -988,9 +993,9 @@ int arch_set_info_guest( fail = compat_pfn_to_cr3(pfn) != c.cmp->ctrlreg[3]; } - for ( i = 0; i < ARRAY_SIZE(v->arch.pv.gdt_frames); ++i ) - fail |= v->arch.pv.gdt_frames[i] != c(gdt_frames[i]); fail |= v->arch.pv.gdt_ents != c(gdt_ents); + for ( i = 0; !fail && i < nr_gdt_frames; ++i ) + fail = v->arch.pv.gdt_frames[i] != c(gdt_frames[i]); fail |= v->arch.pv.ldt_base != c(ldt_base); fail |= v->arch.pv.ldt_ents != c(ldt_ents); @@ -1095,12 +1100,8 @@ int arch_set_info_guest( else { unsigned long gdt_frames[ARRAY_SIZE(v->arch.pv.gdt_frames)]; - unsigned int nr_frames = DIV_ROUND_UP(c.cmp->gdt_ents, 512); - - if ( nr_frames > ARRAY_SIZE(v->arch.pv.gdt_frames) ) - return -EINVAL; - for ( i = 0; i < nr_frames; ++i ) + for ( i = 0; i < nr_gdt_frames; ++i ) gdt_frames[i] = c.cmp->gdt_frames[i]; rc = (int)pv_set_gdt(v, gdt_frames, c.cmp->gdt_ents); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 14:22:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 14:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8ZJ-0003U8-1d; Fri, 22 May 2020 14:22:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8ZH-0003Tw-QN for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:35 +0000 X-Inumbo-ID: ae6f0c02-9c37-11ea-abe7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ae6f0c02-9c37-11ea-abe7-12813bfff9fa; Fri, 22 May 2020 14:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PAX7J89zgzSc9v633lwIxGf40SrshxMoRTgXi4TmQRk=; b=UqQ7NQ0EN6nIkugP6dpPOxmtyT eaaBP3DtMbRTj1DSIRaDZ2KHZicqUgef9qA3rheTSp4D5BcmbxLPoQBew6HVvqBQxLRbNhHWkau/6 +lKC2B8JjL0fX0EOEz3vc/VFf3i9MCCqc08cnw/Ee3ok1g5WUVisretMXej48E1jZnds=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jc8ZH-0004Hx-40 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jc8ZH-0007TV-31 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 14:22:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/PV: polish pv_set_gdt() Message-Id: Date: Fri, 22 May 2020 14:22:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 87827167bb1737e826b0a8fe0abe07c0ace36ac5 Author: Jan Beulich AuthorDate: Fri May 22 16:10:40 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:10:40 2020 +0200 x86/PV: polish pv_set_gdt() There's no need to invoke get_page_from_gfn(), and there's also no need to update the passed in frames[]. Invoke get_page_and_type() directly. Also make the function's frames[] parameter const, change its return type to int, and drop the bogus casts from two of its invocations. Finally a little bit of cosmetics. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/domain.c | 4 ++-- xen/arch/x86/pv/descriptor-tables.c | 18 ++++++------------ xen/include/asm-x86/pv/mm.h | 7 ++++--- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6402b09993..6327ba0790 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1096,7 +1096,7 @@ int arch_set_info_guest( return rc; if ( !compat ) - rc = (int)pv_set_gdt(v, c.nat->gdt_frames, c.nat->gdt_ents); + rc = pv_set_gdt(v, c.nat->gdt_frames, c.nat->gdt_ents); else { unsigned long gdt_frames[ARRAY_SIZE(v->arch.pv.gdt_frames)]; @@ -1104,7 +1104,7 @@ int arch_set_info_guest( for ( i = 0; i < nr_gdt_frames; ++i ) gdt_frames[i] = c.cmp->gdt_frames[i]; - rc = (int)pv_set_gdt(v, gdt_frames, c.cmp->gdt_ents); + rc = pv_set_gdt(v, gdt_frames, c.cmp->gdt_ents); } if ( rc != 0 ) return rc; diff --git a/xen/arch/x86/pv/descriptor-tables.c b/xen/arch/x86/pv/descriptor-tables.c index 090f901b5b..3856128993 100644 --- a/xen/arch/x86/pv/descriptor-tables.c +++ b/xen/arch/x86/pv/descriptor-tables.c @@ -81,7 +81,8 @@ void pv_destroy_gdt(struct vcpu *v) } } -long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries) +int pv_set_gdt(struct vcpu *v, const unsigned long frames[], + unsigned int entries) { struct domain *d = v->domain; l1_pgentry_t *pl1e; @@ -95,17 +96,11 @@ long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries) /* Check the pages in the new GDT. */ for ( i = 0; i < nr_frames; i++ ) { - struct page_info *page; + mfn_t mfn = _mfn(frames[i]); - page = get_page_from_gfn(d, frames[i], NULL, P2M_ALLOC); - if ( !page ) + if ( !mfn_valid(mfn) || + !get_page_and_type(mfn_to_page(mfn), d, PGT_seg_desc_page) ) goto fail; - if ( !get_page_type(page, PGT_seg_desc_page) ) - { - put_page(page); - goto fail; - } - frames[i] = mfn_x(page_to_mfn(page)); } /* Tear down the old GDT. */ @@ -124,9 +119,8 @@ long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries) fail: while ( i-- > 0 ) - { put_page_and_type(mfn_to_page(_mfn(frames[i]))); - } + return -EINVAL; } diff --git a/xen/include/asm-x86/pv/mm.h b/xen/include/asm-x86/pv/mm.h index 246b99014c..07a12d5c49 100644 --- a/xen/include/asm-x86/pv/mm.h +++ b/xen/include/asm-x86/pv/mm.h @@ -25,7 +25,8 @@ int pv_ro_page_fault(unsigned long addr, struct cpu_user_regs *regs); -long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries); +int pv_set_gdt(struct vcpu *v, const unsigned long frames[], + unsigned int entries); void pv_destroy_gdt(struct vcpu *v); bool pv_map_ldt_shadow_page(unsigned int off); @@ -43,8 +44,8 @@ static inline int pv_ro_page_fault(unsigned long addr, return 0; } -static inline long pv_set_gdt(struct vcpu *v, unsigned long *frames, - unsigned int entries) +static inline int pv_set_gdt(struct vcpu *v, const unsigned long frames[], + unsigned int entries) { ASSERT_UNREACHABLE(); return -EINVAL; } static inline void pv_destroy_gdt(struct vcpu *v) { ASSERT_UNREACHABLE(); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 19:11:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 19:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4W-0006ci-3D; Fri, 22 May 2020 19:11:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4U-0006cY-9j for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:06 +0000 X-Inumbo-ID: fc0a4666-9c5f-11ea-9887-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fc0a4666-9c5f-11ea-9887-bc764e2007e4; Fri, 22 May 2020 19:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EFHmoZ9LNGdWFLqIMEzwMorSwpfOZR7/9pb4fZz7juI=; b=X1BjQl8JG1oTmVYd3pZlbROc6E QU8I1EpNoI8Dis06RrDo5h22IyvmJ1TLHmJzHBBbwyN3LcwPqb9giPL0qcWVoQpwhKsr3OJcssMuT 79obUgiinVJ21y1WXQNWcZKhU6t1bmP+Y4ayms5wL6lxgFIAPjQvxOg081kCLUPCcyek=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4T-0002PS-5L for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcD4T-0007pS-44 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/traps: Rework #PF[Rsvd] bit handling Message-Id: Date: Fri, 22 May 2020 19:11:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9947ddbf7053bb9111d1e478986ef18764ea8aeb Author: Andrew Cooper AuthorDate: Mon May 18 16:13:33 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 22 20:04:23 2020 +0100 x86/traps: Rework #PF[Rsvd] bit handling The reserved_bit_page_fault() paths effectively turn reserved bit faults into a warning, but in the light of L1TF, the real impact is far more serious. Make #PF[Rsvd] a hard error, irrespective of mode. Any new panic() caused by this constitutes pagetable corruption, and probably an L1TF gadget needing fixing. Drop the PFEC_reserved_bit check in __page_fault_type() which has been made dead by the rearrangement in do_page_fault(). Additionally, drop the comment for do_page_fault(). It is inaccurate (bit 0 being set isn't always a protection violation) and stale (missing bits 5,6,15,31). Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 1f6f1dde76..e8a0877344 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1137,15 +1137,6 @@ void do_int3(struct cpu_user_regs *regs) pv_inject_hw_exception(TRAP_int3, X86_EVENT_NO_EC); } -static void reserved_bit_page_fault(unsigned long addr, - struct cpu_user_regs *regs) -{ - printk("%pv: reserved bit in page table (ec=%04X)\n", - current, regs->error_code); - show_page_walk(addr); - show_execution_state(regs); -} - #ifdef CONFIG_PV static int handle_ldt_mapping_fault(unsigned int offset, struct cpu_user_regs *regs) @@ -1248,10 +1239,6 @@ static enum pf_type __page_fault_type(unsigned long addr, if ( in_irq() ) return real_fault; - /* Reserved bit violations are never spurious faults. */ - if ( error_code & PFEC_reserved_bit ) - return real_fault; - required_flags = _PAGE_PRESENT; if ( error_code & PFEC_write_access ) required_flags |= _PAGE_RW; @@ -1413,14 +1400,6 @@ static int fixup_page_fault(unsigned long addr, struct cpu_user_regs *regs) return 0; } -/* - * #PF error code: - * Bit 0: Protection violation (=1) ; Page not present (=0) - * Bit 1: Write access - * Bit 2: User mode (=1) ; Supervisor mode (=0) - * Bit 3: Reserved bit violation - * Bit 4: Instruction fetch - */ void do_page_fault(struct cpu_user_regs *regs) { unsigned long addr, fixup; @@ -1439,6 +1418,21 @@ void do_page_fault(struct cpu_user_regs *regs) if ( unlikely(fixup_page_fault(addr, regs) != 0) ) return; + /* + * Xen doesn't have reserved bits set in its pagetables, nor do we permit + * PV guests to write any. Such entries would generally be vulnerable to + * the L1TF sidechannel. + * + * The shadow pagetable logic may use reserved bits as part of + * SHOPT_FAST_FAULT_PATH. Pagefaults arising from these will be resolved + * via the fixup_page_fault() path. + * + * Anything remaining is an error, constituting corruption of the + * pagetables and probably an L1TF vulnerable gadget. + */ + if ( error_code & PFEC_reserved_bit ) + goto fatal; + if ( unlikely(!guest_mode(regs)) ) { enum pf_type pf_type = spurious_page_fault(addr, regs); @@ -1457,13 +1451,12 @@ void do_page_fault(struct cpu_user_regs *regs) if ( likely((fixup = search_exception_table(regs)) != 0) ) { perfc_incr(copy_user_faults); - if ( unlikely(regs->error_code & PFEC_reserved_bit) ) - reserved_bit_page_fault(addr, regs); this_cpu(last_extable_addr) = regs->rip; regs->rip = fixup; return; } + fatal: if ( debugger_trap_fatal(TRAP_page_fault, regs) ) return; @@ -1475,9 +1468,6 @@ void do_page_fault(struct cpu_user_regs *regs) error_code, _p(addr)); } - if ( unlikely(regs->error_code & PFEC_reserved_bit) ) - reserved_bit_page_fault(addr, regs); - pv_inject_page_fault(regs->error_code, addr); } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 19:11:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 19:11:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4f-0006e3-4q; Fri, 22 May 2020 19:11:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4d-0006dl-PI for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:15 +0000 X-Inumbo-ID: 0208e0ea-9c60-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0208e0ea-9c60-11ea-b07b-bc764e2007e4; Fri, 22 May 2020 19:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EBF99oi3c7n1ahS7gS6aC+LrP2NMlxh8K2L1Q+NlPso=; b=12ozUVYu/tQqRjhd8+9hlQGg0f m3MeM3Nr62KsHSW3VDohOPpUEp+QCZHx/bdYEJ9IEctBwVQCIU1cz7MLnQuXSNYF7hY/Vq5Bmc5r9 3A7qcc4wF2TiXB8z3LX0+AIPEBhn4s08IJtyO9rCnddHQLOu4yV4xSvY7yHCjA7AFpSI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4d-0002Pb-8O for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcD4d-0007rw-79 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/idle: Extend ISR/C6 erratum workaround to Haswell Message-Id: Date: Fri, 22 May 2020 19:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b72d8870b5f68f06b083e6bfdb28f081bcb6ab3b Author: Andrew Cooper AuthorDate: Fri May 22 15:46:44 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 22 20:04:23 2020 +0100 x86/idle: Extend ISR/C6 erratum workaround to Haswell This bug was first discovered against Haswell. It is definitely affected. (The XenServer ticket for this bug was opened on 2013-05-30 which is coming up on 7 years old, and predates Broadwell). Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 178cb607c2..a2248ea11f 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -583,8 +583,16 @@ bool errata_c6_workaround(void) * registers), the processor may dispatch the second interrupt (from * the IRR bit) before the first interrupt has completed and written to * the EOI register, causing the first interrupt to never complete. + * + * Note: Haswell hasn't had errata issued, but this issue was first + * discovered on Haswell hardware, and is affected. */ static const struct x86_cpu_id isr_errata[] = { + /* Haswell */ + INTEL_FAM6_MODEL(0x3c), + INTEL_FAM6_MODEL(0x3f), + INTEL_FAM6_MODEL(0x45), + INTEL_FAM6_MODEL(0x46), /* Broadwell */ INTEL_FAM6_MODEL(0x47), INTEL_FAM6_MODEL(0x3d), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 19:11:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 19:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4p-0006gJ-6Z; Fri, 22 May 2020 19:11:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4n-0006g4-UZ for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:25 +0000 X-Inumbo-ID: 08127348-9c60-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 08127348-9c60-11ea-b07b-bc764e2007e4; Fri, 22 May 2020 19:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+1G/RwsBq6eZkLWWggAk0EYjh+75UoA1800z1PH2Edg=; b=ZVaFxPMbfl0JXv73HFufkOCdgy t5I3q4DQIF3Fxjg/qQjrpHsB0xOAIBOtVFdGW9VFqwI4BwhN2KHNFVirtUJfxgsnT7ERcAS9B0ry3 n9wwe7LGXotRsCcQCmzlMsSD/I0mzZLbUqkCHDhf16Rlnms3ukT0IFeNDvImY1gly3kI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcD4n-0002Pm-BC for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcD4n-0007sb-A6 for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 19:11:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/trace: Don't dump offline CPUs in debugtrace_dump_worker() Message-Id: Date: Fri, 22 May 2020 19:11:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit abf378e6483195b98a3f32e2c9d017e0eeeb275f Author: Andrew Cooper AuthorDate: Thu May 21 09:19:33 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 22 20:04:46 2020 +0100 xen/trace: Don't dump offline CPUs in debugtrace_dump_worker() The 'T' debugkey reliably wedges on one of my systems, which has a sparse APIC_ID layout due to a non power-of-2 number of cores per socket. The per_cpu(dt_cpu_data, cpu) calcution falls over the deliberately non-canonical poison value. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/debugtrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/debugtrace.c b/xen/common/debugtrace.c index c21ec99ee0..f3794b9453 100644 --- a/xen/common/debugtrace.c +++ b/xen/common/debugtrace.c @@ -95,7 +95,7 @@ static void debugtrace_dump_worker(void) debugtrace_dump_buffer(dt_data, "global"); - for ( cpu = 0; cpu < nr_cpu_ids; cpu++ ) + for_each_online_cpu ( cpu ) { char buf[16]; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 22 22:22:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 22 May 2020 22:22:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcG3L-0007av-F5; Fri, 22 May 2020 22:22:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcG3K-0007aq-Ne for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 22:22:06 +0000 X-Inumbo-ID: aa39c621-9c7a-11ea-ac34-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id aa39c621-9c7a-11ea-ac34-12813bfff9fa; Fri, 22 May 2020 22:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=O8mqnyjlYVXalDdZUMpHJIO/EHdvLXKgJarCi5/0qeI=; b=tnFOJd0eisxjiGrpJlTDNwtO1N e57D4hTvLxkcK3q/mByn2daGWOROP5a6StMvnmwnrtVvQfSzwh+oODV0YSVW16Rv5RtE0Iv3NxP+/ 6hmWaZ4+EE36VXrWErYXcoqpnlUynfLWm35r+Ngcp1QiCRSZSRxg5YjV4NhWTHXCnJtc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcG3I-0006NZ-Di for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 22:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcG3I-0003eT-CO for xen-changelog@lists.xenproject.org; Fri, 22 May 2020 22:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang/xenlight: add an empty line after DO NOT EDIT comment Message-Id: Date: Fri, 22 May 2020 22:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5e015d48a5ee68ba03addad2698364d8f015afec Author: Nick Rosbrook AuthorDate: Thu May 21 10:55:25 2020 -0400 Commit: George Dunlap CommitDate: Fri May 22 23:17:37 2020 +0100 golang/xenlight: add an empty line after DO NOT EDIT comment When generating documentation, pkg.go.dev and godoc.org assume a comment that immediately precedes the package declaration is a "package comment", and should be shown in the documentation. Add an empty line after the DO NOT EDIT comment in generated files to prevent these comments from appearing as "package comments." Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- tools/golang/xenlight/gengotypes.py | 1 + tools/golang/xenlight/helpers.gen.go | 1 + tools/golang/xenlight/types.gen.go | 1 + 3 files changed, 3 insertions(+) diff --git a/tools/golang/xenlight/gengotypes.py b/tools/golang/xenlight/gengotypes.py index e9ad92afa0..2b71aa1ea8 100644 --- a/tools/golang/xenlight/gengotypes.py +++ b/tools/golang/xenlight/gengotypes.py @@ -737,6 +737,7 @@ if __name__ == '__main__': // This file is generated by: // {} // + """.format(' '.join(sys.argv)) xenlight_golang_generate_types(types=types, diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index b5bd0de830..1e58ebbab2 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -3,6 +3,7 @@ // This file is generated by: // gengotypes.py ../../libxl/libxl_types.idl // + package xenlight import ( diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 15516ae552..be42f75529 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -3,6 +3,7 @@ // This file is generated by: // gengotypes.py ../../libxl/libxl_types.idl // + package xenlight type Error int -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:55:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:55:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRo3-0001qN-3W; Sat, 23 May 2020 10:55:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRo2-0001qI-1p for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:06 +0000 X-Inumbo-ID: da3faace-9ce3-11ea-acb3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id da3faace-9ce3-11ea-acb3-12813bfff9fa; Sat, 23 May 2020 10:55:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EZhTqKuLBRTiUMAmranXicLGxPihwwv5rbE+nXLtywU=; b=js1NG1Jtwjr32MbzrqRj2UfwZj coAJE6hNNzZ/cI/b8cSa+kuIw0VBab+tYRSjOZpS/gqvYAROfA5sIzj9wpd5tmDiT3FYQUl3PWGsW l7TatfoGBBSC81cPzDfGobGcNCiGyjyGDcn3W6Y+khUV7o24oOG2TrDTJhoPuQsu8ALc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRny-0008Je-1B for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRnx-0004XO-Vm for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang: Update generated files after libxl_types.idl change Message-Id: Date: Sat, 23 May 2020 10:55:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f6d102046817bb5c08876ff78a6a00f4d29ee269 Author: George Dunlap AuthorDate: Fri May 22 10:35:10 2020 +0100 Commit: George Dunlap CommitDate: Fri May 22 10:35:10 2020 +0100 golang: Update generated files after libxl_types.idl change c/s 7efd9f3d45 ("libxl: Handle Linux stubdomain specific QEMU options.") modified libl_types.idl. Run gengotypes.py again to update the geneated golang bindings. Signed-off-by: George Dunlap Acked-by: Wei Liu --- tools/golang/xenlight/helpers.gen.go | 10 ++++++++++ tools/golang/xenlight/types.gen.go | 3 +++ 2 files changed, 13 insertions(+) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 109e9515a2..b5bd0de830 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -1163,6 +1163,9 @@ func (x *DomainBuildInfo) fromC(xc *C.libxl_domain_build_info) error { if err := x.DeviceModelStubdomain.fromC(&xc.device_model_stubdomain); err != nil { return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) } + x.StubdomainMemkb = uint64(xc.stubdomain_memkb) + x.StubdomainKernel = C.GoString(xc.stubdomain_kernel) + x.StubdomainRamdisk = C.GoString(xc.stubdomain_ramdisk) x.DeviceModel = C.GoString(xc.device_model) x.DeviceModelSsidref = uint32(xc.device_model_ssidref) x.DeviceModelSsidLabel = C.GoString(xc.device_model_ssid_label) @@ -1489,6 +1492,13 @@ func (x *DomainBuildInfo) toC(xc *C.libxl_domain_build_info) (err error) { if err := x.DeviceModelStubdomain.toC(&xc.device_model_stubdomain); err != nil { return fmt.Errorf("converting field DeviceModelStubdomain: %v", err) } + xc.stubdomain_memkb = C.uint64_t(x.StubdomainMemkb) + if x.StubdomainKernel != "" { + xc.stubdomain_kernel = C.CString(x.StubdomainKernel) + } + if x.StubdomainRamdisk != "" { + xc.stubdomain_ramdisk = C.CString(x.StubdomainRamdisk) + } if x.DeviceModel != "" { xc.device_model = C.CString(x.DeviceModel) } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index df68fd0e88..15516ae552 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -509,6 +509,9 @@ type DomainBuildInfo struct { MaxMaptrackFrames uint32 DeviceModelVersion DeviceModelVersion DeviceModelStubdomain Defbool + StubdomainMemkb uint64 + StubdomainKernel string + StubdomainRamdisk string DeviceModel string DeviceModelSsidref uint32 DeviceModelSsidLabel string -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:55:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:55:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoA-0001qi-53; Sat, 23 May 2020 10:55:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRo8-0001qT-Pn for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:12 +0000 X-Inumbo-ID: e04c4fee-9ce3-11ea-acb3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e04c4fee-9ce3-11ea-acb3-12813bfff9fa; Sat, 23 May 2020 10:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wySlu89PTs5dx+0UNicgoAEx4NRSlZEUs7879kP2ncw=; b=Ap0HMMzuXm62/EN4FUujHnMwZS sDQ8OoPRuPaBlZ17gOS+89TJ/7YU0VptU8WbI8mjbbws4NZgpjRUVi/FyNFzjZo1rRNBtUIZYpnDG DWBoUf0U9jOoKVYGEqUIon3Nzl4563ASfqQ4q80VAMegfh0/KVm9dsmQKceoCJgA2fco=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRo8-0008KL-4A for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRo8-0004Y5-2n for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86emul: correct test harness {evex} assembler capability check Message-Id: Date: Sat, 23 May 2020 10:55:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ba7b169c9f0922886001dc0b27dc4c28dfe15631 Author: Jan Beulich AuthorDate: Fri May 22 14:35:04 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:35:04 2020 +0200 x86emul: correct test harness {evex} assembler capability check The {evex} pseudo prefix gets rejected by gas for insns not allowing EVEX encoding. Except there's a gas bug due to which its check gets bypassed for insns without operands. Let's not rely on that bug to remain there. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index 7ce882cb78..b414773810 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -112,7 +112,7 @@ $(foreach flavor,$(SIMD) $(FMA),$(eval $(call simd-check-cc,$(flavor)))) # Also explicitly check for {evex} pseudo-prefix support, which got introduced # only after AVX512F and some of its extensions. -TARGET-$(shell echo 'asm("{evex} vzeroall");' | $(CC) -x c -c -o /dev/null - || echo y) := +TARGET-$(shell echo 'asm("{evex} vmovaps %xmm0$(comma)%xmm0");' | $(CC) -x c -c -o /dev/null - || echo y) := ifeq ($(TARGET-y),) $(warning Test harness not built, use newer compiler than "$(CC)" (version $(shell $(CC) -dumpversion)) and an "{evex}" capable assembler) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoM-0001rq-7G; Sat, 23 May 2020 10:55:26 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoK-0001rd-Uc for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:24 +0000 X-Inumbo-ID: e6467f8c-9ce3-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e6467f8c-9ce3-11ea-b9cf-bc764e2007e4; Sat, 23 May 2020 10:55:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0RaQM56l9skS1rRlp9yQBvI8n7aQgLwR+rUi2ZWlLhE=; b=yayjRCmib1n/dgi6+FjT/w9exj ZIvmx96a8mzyfh4Ts20eimx06YUX7+NPMdhqs13auUIARbJThD9g8z/Pmo5wV50Kciag346ETUnh7 DUH12Zkbjs9vI4Utlxo1whWd0gh+v5yLnbEecHsY7F4YKAECel/z+9F1WGXTxLlTcQbY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoI-0008Ka-7d for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRoI-0004Ym-6T for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/HVM: move NOFLUSH handling out of hvm_set_cr3() Message-Id: Date: Sat, 23 May 2020 10:55:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 18cc07b96f76bf44e9215d79e96d4b37bd3cbcac Author: Jan Beulich AuthorDate: Fri May 22 14:37:09 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:37:09 2020 +0200 x86/HVM: move NOFLUSH handling out of hvm_set_cr3() The bit is meaningful only for MOV-to-CR3 insns, not anywhere else, in particular not when loading nested guest state. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant Acked-by: Andrew Cooper --- xen/arch/x86/hvm/emulate.c | 8 +++++++- xen/arch/x86/hvm/hvm.c | 20 ++++++++++---------- xen/arch/x86/hvm/monitor.c | 3 --- xen/arch/x86/hvm/svm/nestedsvm.c | 6 +++--- xen/arch/x86/hvm/vm_event.c | 2 +- xen/arch/x86/hvm/vmx/vvmx.c | 4 ++-- xen/include/asm-x86/domain.h | 2 ++ xen/include/asm-x86/hvm/support.h | 2 +- 8 files changed, 26 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index e87ceaf23e..57f36b7be9 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -2169,8 +2169,14 @@ static int hvmemul_write_cr( break; case 3: - rc = hvm_set_cr3(val, true); + { + bool noflush = hvm_pcid_enabled(current) && (val & X86_CR3_NOFLUSH); + + if ( noflush ) + val &= ~X86_CR3_NOFLUSH; + rc = hvm_set_cr3(val, noflush, true); break; + } case 4: rc = hvm_set_cr4(val, true); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 09ee299bc7..abd5db5599 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2132,8 +2132,14 @@ int hvm_mov_to_cr(unsigned int cr, unsigned int gpr) break; case 3: - rc = hvm_set_cr3(val, true); + { + bool noflush = hvm_pcid_enabled(curr) && (val & X86_CR3_NOFLUSH); + + if ( noflush ) + val &= ~X86_CR3_NOFLUSH; + rc = hvm_set_cr3(val, noflush, true); break; + } case 4: rc = hvm_set_cr4(val, true); @@ -2350,12 +2356,11 @@ int hvm_set_cr0(unsigned long value, bool may_defer) return X86EMUL_OKAY; } -int hvm_set_cr3(unsigned long value, bool may_defer) +int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) { struct vcpu *v = current; struct page_info *page; unsigned long old = v->arch.hvm.guest_cr[3]; - bool noflush = false; if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) @@ -2367,17 +2372,12 @@ int hvm_set_cr3(unsigned long value, bool may_defer) /* The actual write will occur in hvm_do_resume(), if permitted. */ v->arch.vm_event->write_data.do_write.cr3 = 1; v->arch.vm_event->write_data.cr3 = value; + v->arch.vm_event->write_data.cr3_noflush = noflush; return X86EMUL_OKAY; } } - if ( hvm_pcid_enabled(v) ) /* Clear the noflush bit. */ - { - noflush = value & X86_CR3_NOFLUSH; - value &= ~X86_CR3_NOFLUSH; - } - if ( hvm_paging_enabled(v) && !paging_mode_hap(v->domain) && ((value ^ v->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) { @@ -3073,7 +3073,7 @@ void hvm_task_switch( if ( task_switch_load_seg(x86_seg_ldtr, tss.ldt, new_cpl, 0) ) goto out; - rc = hvm_set_cr3(tss.cr3, true); + rc = hvm_set_cr3(tss.cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if ( rc != X86EMUL_OKAY ) diff --git a/xen/arch/x86/hvm/monitor.c b/xen/arch/x86/hvm/monitor.c index f5d89e71d1..8aa14137e2 100644 --- a/xen/arch/x86/hvm/monitor.c +++ b/xen/arch/x86/hvm/monitor.c @@ -39,9 +39,6 @@ bool hvm_monitor_cr(unsigned int index, unsigned long value, unsigned long old) struct arch_domain *ad = &curr->domain->arch; unsigned int ctrlreg_bitmask = monitor_ctrlreg_bitmask(index); - if ( index == VM_EVENT_X86_CR3 && hvm_pcid_enabled(curr) ) - value &= ~X86_CR3_NOFLUSH; /* Clear the noflush bit. */ - if ( (ad->monitor.write_ctrlreg_enabled & ctrlreg_bitmask) && (!(ad->monitor.write_ctrlreg_onchangeonly & ctrlreg_bitmask) || value != old) && diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c index ffdc1d8da0..11dc9c089c 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -324,7 +324,7 @@ static int nsvm_vcpu_hostrestore(struct vcpu *v, struct cpu_user_regs *regs) v->arch.guest_table = pagetable_null(); /* hvm_set_cr3() below sets v->arch.hvm.guest_cr[3] for us. */ } - rc = hvm_set_cr3(n1vmcb->_cr3, true); + rc = hvm_set_cr3(n1vmcb->_cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if (rc != X86EMUL_OKAY) @@ -583,7 +583,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) nestedsvm_vmcb_set_nestedp2m(v, ns_vmcb, n2vmcb); /* hvm_set_cr3() below sets v->arch.hvm.guest_cr[3] for us. */ - rc = hvm_set_cr3(ns_vmcb->_cr3, true); + rc = hvm_set_cr3(ns_vmcb->_cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if (rc != X86EMUL_OKAY) @@ -597,7 +597,7 @@ static int nsvm_vmcb_prepare4vmrun(struct vcpu *v, struct cpu_user_regs *regs) * we assume it intercepts page faults. */ /* hvm_set_cr3() below sets v->arch.hvm.guest_cr[3] for us. */ - rc = hvm_set_cr3(ns_vmcb->_cr3, true); + rc = hvm_set_cr3(ns_vmcb->_cr3, false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); if (rc != X86EMUL_OKAY) diff --git a/xen/arch/x86/hvm/vm_event.c b/xen/arch/x86/hvm/vm_event.c index 07f135217e..19aac19bc3 100644 --- a/xen/arch/x86/hvm/vm_event.c +++ b/xen/arch/x86/hvm/vm_event.c @@ -111,7 +111,7 @@ void hvm_vm_event_do_resume(struct vcpu *v) if ( unlikely(w->do_write.cr3) ) { - if ( hvm_set_cr3(w->cr3, false) == X86EMUL_EXCEPTION ) + if ( hvm_set_cr3(w->cr3, w->cr3_noflush, false) == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); w->do_write.cr3 = 0; diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index e2baa0f660..7dfff6c445 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1104,7 +1104,7 @@ static void load_shadow_guest_state(struct vcpu *v) if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); - rc = hvm_set_cr3(get_vvmcs(v, GUEST_CR3), true); + rc = hvm_set_cr3(get_vvmcs(v, GUEST_CR3), false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); @@ -1318,7 +1318,7 @@ static void load_vvmcs_host_state(struct vcpu *v) if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); - rc = hvm_set_cr3(get_vvmcs(v, HOST_CR3), true); + rc = hvm_set_cr3(get_vvmcs(v, HOST_CR3), false, true); if ( rc == X86EMUL_EXCEPTION ) hvm_inject_hw_exception(TRAP_gp_fault, 0); diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 5b6d909266..e8cee3d5e5 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -285,6 +285,8 @@ struct monitor_write_data { unsigned int cr4 : 1; } do_write; + bool cr3_noflush; + uint32_t msr; uint64_t value; uint64_t cr0; diff --git a/xen/include/asm-x86/hvm/support.h b/xen/include/asm-x86/hvm/support.h index e161907dfa..a4950e3d4b 100644 --- a/xen/include/asm-x86/hvm/support.h +++ b/xen/include/asm-x86/hvm/support.h @@ -136,7 +136,7 @@ void hvm_shadow_handle_cd(struct vcpu *v, unsigned long value); */ int hvm_set_efer(uint64_t value); int hvm_set_cr0(unsigned long value, bool may_defer); -int hvm_set_cr3(unsigned long value, bool may_defer); +int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer); int hvm_set_cr4(unsigned long value, bool may_defer); int hvm_descriptor_access_intercept(uint64_t exit_info, uint64_t vmx_exit_qualification, -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:55:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoU-0001st-8l; Sat, 23 May 2020 10:55:34 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoT-0001si-0P for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:33 +0000 X-Inumbo-ID: ec49b35e-9ce3-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ec49b35e-9ce3-11ea-b07b-bc764e2007e4; Sat, 23 May 2020 10:55:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=XydlE0bvG2I6b/c2e9Ae1cPGwg5JSH07+EFwAfoArxs=; b=fJW/08NULTdGRnvQSSGylxtW4n Qp+M5a8eir5+s+paFbLCB/w77h9hY9SOdDqX1HreONRsL5fHRe0EGV+Wutu+0S9tgRCRWiMidjEyF GVIebZ2c6auSRf4t49fkmv9DxwzgLCmZcBHQWTKRDE0XU/nsZ9rlA0PzIc3RxTsoCdLg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoS-0008Kj-Aq for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRoS-0004ZJ-9b for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/HVM: refuse CR3 loads with reserved (upper) bits set Message-Id: Date: Sat, 23 May 2020 10:55:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 80872597e6bd82429714b00f6a3e59fe21297906 Author: Jan Beulich AuthorDate: Fri May 22 14:40:30 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:40:30 2020 +0200 x86/HVM: refuse CR3 loads with reserved (upper) bits set While bits 11 and below are, if not used for other purposes, reserved but ignored, bits beyond physical address width are supposed to raise exceptions (at least in the non-nested case; I'm not convinced the current nested SVM/VMX behavior of raising #GP(0) here is correct, but that's not the subject of this change). Introduce currd as a local variable, and replace other v->domain instances at the same time. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index abd5db5599..56a150d81a 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -1046,6 +1046,13 @@ static int hvm_load_cpu_ctxt(struct domain *d, hvm_domain_context_t *h) return -EINVAL; } + if ( ctxt.cr3 >> d->arch.cpuid->extd.maxphysaddr ) + { + printk(XENLOG_G_ERR "HVM%d restore: bad CR3 %#" PRIx64 "\n", + d->domain_id, ctxt.cr3); + return -EINVAL; + } + if ( (ctxt.flags & ~XEN_X86_FPU_INITIALISED) != 0 ) { gprintk(XENLOG_ERR, "bad flags value in CPU context: %#x\n", @@ -2359,10 +2366,18 @@ int hvm_set_cr0(unsigned long value, bool may_defer) int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) { struct vcpu *v = current; + struct domain *currd = v->domain; struct page_info *page; unsigned long old = v->arch.hvm.guest_cr[3]; - if ( may_defer && unlikely(v->domain->arch.monitor.write_ctrlreg_enabled & + if ( value >> currd->arch.cpuid->extd.maxphysaddr ) + { + HVM_DBG_LOG(DBG_LEVEL_1, + "Attempt to set reserved CR3 bit(s): %lx", value); + return X86EMUL_EXCEPTION; + } + + if ( may_defer && unlikely(currd->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { ASSERT(v->arch.vm_event); @@ -2378,13 +2393,12 @@ int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) } } - if ( hvm_paging_enabled(v) && !paging_mode_hap(v->domain) && + if ( hvm_paging_enabled(v) && !paging_mode_hap(currd) && ((value ^ v->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) { /* Shadow-mode CR3 change. Check PDBR and update refcounts. */ HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 value = %lx", value); - page = get_page_from_gfn(v->domain, value >> PAGE_SHIFT, - NULL, P2M_ALLOC); + page = get_page_from_gfn(currd, value >> PAGE_SHIFT, NULL, P2M_ALLOC); if ( !page ) goto bad_cr3; @@ -2400,7 +2414,7 @@ int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) bad_cr3: gdprintk(XENLOG_ERR, "Invalid CR3\n"); - domain_crash(v->domain); + domain_crash(currd); return X86EMUL_UNHANDLEABLE; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:55:44 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:55:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoe-0001uW-BU; Sat, 23 May 2020 10:55:44 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRod-0001uE-4g for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:43 +0000 X-Inumbo-ID: f24d8974-9ce3-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f24d8974-9ce3-11ea-b9cf-bc764e2007e4; Sat, 23 May 2020 10:55:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jPZ6IMY5tMx/3jpmoto+YxugJuoxA6vDOQcYAwoD4WI=; b=nmSZfABnu5POz1ZMElWJksW/pb /Fyk6t9jPTvOGYxHvzsnqarczF5z66bxt83VhnU2Sz6bf5WQUMG/WCJHeKFBFL/21MhN4bb+v8BwY c/Hb3FRTRC9XHNbNYycUADXBqLronNjVA308tB9lzNd1qRrUFsVD/pPpKfJvrmBjk+AE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoc-0008Ks-Dj for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRoc-0004Zj-Ci for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/HVM: cosmetics to hvm_set_cr3() Message-Id: Date: Sat, 23 May 2020 10:55:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1658a39b0031baf9ec44c8d51d1d1369a964a4f9 Author: Jan Beulich AuthorDate: Fri May 22 14:41:15 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 14:41:15 2020 +0200 x86/HVM: cosmetics to hvm_set_cr3() Eliminate the not really useful local variable "old". Reduce the scope of "page". Rename the latched "current". Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 56a150d81a..74c9f84462 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -2365,10 +2365,8 @@ int hvm_set_cr0(unsigned long value, bool may_defer) int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) { - struct vcpu *v = current; - struct domain *currd = v->domain; - struct page_info *page; - unsigned long old = v->arch.hvm.guest_cr[3]; + struct vcpu *curr = current; + struct domain *currd = curr->domain; if ( value >> currd->arch.cpuid->extd.maxphysaddr ) { @@ -2380,36 +2378,38 @@ int hvm_set_cr3(unsigned long value, bool noflush, bool may_defer) if ( may_defer && unlikely(currd->arch.monitor.write_ctrlreg_enabled & monitor_ctrlreg_bitmask(VM_EVENT_X86_CR3)) ) { - ASSERT(v->arch.vm_event); + ASSERT(curr->arch.vm_event); - if ( hvm_monitor_crX(CR3, value, old) ) + if ( hvm_monitor_crX(CR3, value, curr->arch.hvm.guest_cr[3]) ) { /* The actual write will occur in hvm_do_resume(), if permitted. */ - v->arch.vm_event->write_data.do_write.cr3 = 1; - v->arch.vm_event->write_data.cr3 = value; - v->arch.vm_event->write_data.cr3_noflush = noflush; + curr->arch.vm_event->write_data.do_write.cr3 = 1; + curr->arch.vm_event->write_data.cr3 = value; + curr->arch.vm_event->write_data.cr3_noflush = noflush; return X86EMUL_OKAY; } } - if ( hvm_paging_enabled(v) && !paging_mode_hap(currd) && - ((value ^ v->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) + if ( hvm_paging_enabled(curr) && !paging_mode_hap(currd) && + ((value ^ curr->arch.hvm.guest_cr[3]) >> PAGE_SHIFT) ) { /* Shadow-mode CR3 change. Check PDBR and update refcounts. */ + struct page_info *page; + HVM_DBG_LOG(DBG_LEVEL_VMMU, "CR3 value = %lx", value); page = get_page_from_gfn(currd, value >> PAGE_SHIFT, NULL, P2M_ALLOC); if ( !page ) goto bad_cr3; - put_page(pagetable_get_page(v->arch.guest_table)); - v->arch.guest_table = pagetable_from_page(page); + put_page(pagetable_get_page(curr->arch.guest_table)); + curr->arch.guest_table = pagetable_from_page(page); HVM_DBG_LOG(DBG_LEVEL_VMMU, "Update CR3 value = %lx", value); } - v->arch.hvm.guest_cr[3] = value; - paging_update_cr3(v, noflush); + curr->arch.hvm.guest_cr[3] = value; + paging_update_cr3(curr, noflush); return X86EMUL_OKAY; bad_cr3: -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:55:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:55:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoo-0001w4-D1; Sat, 23 May 2020 10:55:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRon-0001vs-88 for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:53 +0000 X-Inumbo-ID: f852e422-9ce3-11ea-b07b-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f852e422-9ce3-11ea-b07b-bc764e2007e4; Sat, 23 May 2020 10:55:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xKh4bXjdyczpRU8chzf9A08HPSBMM0hZpE/Q912VH0k=; b=jOmeqkBc4tOTVHuG4o64C5CZ/U 3usfxV/bitUjwozK7e4xjgfnPJ+0Vqvs2DU28tNn6b5qMEhWOWY5VNjH/E9xj8wRHaldeDs8yjYIm qCKgBmHfDGHnpHqDmPRuvzzUm8iyTz2j0tcQnGuw+uP3kprnEpRSrfaZuBnkOnUbNTZg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRom-0008L1-Gx for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:52 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRom-0004aC-Fi for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:55:52 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/idle: prevent entering C6 with in service interrupts on Intel Message-Id: Date: Sat, 23 May 2020 10:55:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fc44a7014cafe28b8c53eeaf6ac2a71f5bc8b815 Author: Roger Pau Monné AuthorDate: Fri May 22 16:07:38 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:07:38 2020 +0200 x86/idle: prevent entering C6 with in service interrupts on Intel Apply a workaround for Intel errata BDX99, CLX30, SKX100, CFW125, BDF104, BDH85, BDM135, KWB131: "A Pending Fixed Interrupt May Be Dispatched Before an Interrupt of The Same Priority Completes". Apply the errata to all server and client models (big cores) from Broadwell to Cascade Lake. The workaround is grouped together with the existing fix for errata AAJ72, and the eoi from the function name is removed. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 38 ++++++++++++++++++++++++++++++++++---- xen/arch/x86/cpu/mwait-idle.c | 2 +- xen/include/asm-x86/cpuidle.h | 2 +- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 82f108d301..178cb607c2 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -548,7 +548,7 @@ void trace_exit_reason(u32 *irq_traced) } } -bool errata_c6_eoi_workaround(void) +bool errata_c6_workaround(void) { static int8_t __read_mostly fix_needed = -1; @@ -573,10 +573,40 @@ bool errata_c6_eoi_workaround(void) INTEL_FAM6_MODEL(0x2f), { } }; + /* + * Errata BDX99, CLX30, SKX100, CFW125, BDF104, BDH85, BDM135, KWB131: + * A Pending Fixed Interrupt May Be Dispatched Before an Interrupt of + * The Same Priority Completes. + * + * Resuming from C6 Sleep-State, with Fixed Interrupts of the same + * priority queued (in the corresponding bits of the IRR and ISR APIC + * registers), the processor may dispatch the second interrupt (from + * the IRR bit) before the first interrupt has completed and written to + * the EOI register, causing the first interrupt to never complete. + */ + static const struct x86_cpu_id isr_errata[] = { + /* Broadwell */ + INTEL_FAM6_MODEL(0x47), + INTEL_FAM6_MODEL(0x3d), + INTEL_FAM6_MODEL(0x4f), + INTEL_FAM6_MODEL(0x56), + /* Skylake (client) */ + INTEL_FAM6_MODEL(0x5e), + INTEL_FAM6_MODEL(0x4e), + /* {Sky/Cascade}lake (server) */ + INTEL_FAM6_MODEL(0x55), + /* {Kaby/Coffee/Whiskey/Amber} Lake */ + INTEL_FAM6_MODEL(0x9e), + INTEL_FAM6_MODEL(0x8e), + /* Cannon Lake */ + INTEL_FAM6_MODEL(0x66), + { } + }; #undef INTEL_FAM6_MODEL - fix_needed = cpu_has_apic && !directed_eoi_enabled && - x86_match_cpu(eoi_errata); + fix_needed = cpu_has_apic && + ((!directed_eoi_enabled && x86_match_cpu(eoi_errata)) || + x86_match_cpu(isr_errata)); } return (fix_needed && cpu_has_pending_apic_eoi()); @@ -685,7 +715,7 @@ static void acpi_processor_idle(void) return; } - if ( (cx->type >= ACPI_STATE_C3) && errata_c6_eoi_workaround() ) + if ( (cx->type >= ACPI_STATE_C3) && errata_c6_workaround() ) cx = power->safe_state; diff --git a/xen/arch/x86/cpu/mwait-idle.c b/xen/arch/x86/cpu/mwait-idle.c index 88a3e160c5..52eab81bf8 100644 --- a/xen/arch/x86/cpu/mwait-idle.c +++ b/xen/arch/x86/cpu/mwait-idle.c @@ -770,7 +770,7 @@ static void mwait_idle(void) return; } - if ((cx->type >= 3) && errata_c6_eoi_workaround()) + if ((cx->type >= 3) && errata_c6_workaround()) cx = power->safe_state; eax = cx->address; diff --git a/xen/include/asm-x86/cpuidle.h b/xen/include/asm-x86/cpuidle.h index 51368694dc..0981a8fd64 100644 --- a/xen/include/asm-x86/cpuidle.h +++ b/xen/include/asm-x86/cpuidle.h @@ -26,6 +26,6 @@ void update_idle_stats(struct acpi_processor_power *, void update_last_cx_stat(struct acpi_processor_power *, struct acpi_processor_cx *, uint64_t); -bool errata_c6_eoi_workaround(void); +bool errata_c6_workaround(void); #endif /* __X86_ASM_CPUIDLE_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:56:05 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:56:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoz-0001x6-Ec; Sat, 23 May 2020 10:56:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRoy-0001wz-AW for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:04 +0000 X-Inumbo-ID: fe5a12dc-9ce3-11ea-acb3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fe5a12dc-9ce3-11ea-acb3-12813bfff9fa; Sat, 23 May 2020 10:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=7dKBhmSp7g+nIyBhpEM5ngKrBhHJjGJjMkW3rHNUsiw=; b=nwZqCIQVJsWxwHnQ6XqXgD7q1G ho8w89mvuSvY0GQeh6++R3yOpfxClupgVUi8frn0c+FMOlKhvlOdZYFaCxAz0f2oN27rZdY0mEFUL SSNdnQrgrjmfmJ80e1YTEPMmQFM3aqO+f5x/uKG7ID4gS5cL+VdwgqNzX9dZ+pucKSiw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRow-0008LQ-Jm for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRow-0004as-Im for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/idle: prevent entering C3/C6 on some Intel CPUs due to errata Message-Id: Date: Sat, 23 May 2020 10:56:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b2d502466547e6782ccadd501b8ef1482c391f2c Author: Roger Pau Monné AuthorDate: Fri May 22 16:08:54 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:08:54 2020 +0200 x86/idle: prevent entering C3/C6 on some Intel CPUs due to errata Apply a workaround for errata BA80, AAK120, AAM108, AAO67, BD59, AAY54: Rapid Core C3/C6 Transition May Cause Unpredictable System Behavior. Limit maximum C state to C1 when SMT is enabled on the affected CPUs. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/cpu/intel.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index b77c1a78ed..69e99bb358 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -297,6 +297,41 @@ static void early_init_intel(struct cpuinfo_x86 *c) } /* + * Errata BA80, AAK120, AAM108, AAO67, BD59, AAY54: Rapid Core C3/C6 Transition + * May Cause Unpredictable System Behavior + * + * Under a complex set of internal conditions, cores rapidly performing C3/C6 + * transitions in a system with Intel Hyper-Threading Technology enabled may + * cause a machine check error (IA32_MCi_STATUS.MCACOD = 0x0106), system hang + * or unpredictable system behavior. + */ +static void probe_c3_errata(const struct cpuinfo_x86 *c) +{ +#define INTEL_FAM6_MODEL(m) { X86_VENDOR_INTEL, 6, m, X86_FEATURE_ALWAYS } + static const struct x86_cpu_id models[] = { + /* Nehalem */ + INTEL_FAM6_MODEL(0x1a), + INTEL_FAM6_MODEL(0x1e), + INTEL_FAM6_MODEL(0x1f), + INTEL_FAM6_MODEL(0x2e), + /* Westmere (note Westmere-EX is not affected) */ + INTEL_FAM6_MODEL(0x2c), + INTEL_FAM6_MODEL(0x25), + { } + }; +#undef INTEL_FAM6_MODEL + + /* Serialized by the AP bringup code. */ + if ( max_cstate > 1 && (c->apicid & (c->x86_num_siblings - 1)) && + x86_match_cpu(models) ) + { + printk(XENLOG_WARNING + "Disabling C-states C3 and C6 due to CPU errata\n"); + max_cstate = 1; + } +} + +/* * P4 Xeon errata 037 workaround. * Hardware prefetcher may cause stale data to be loaded into the cache. * @@ -323,6 +358,8 @@ static void Intel_errata_workarounds(struct cpuinfo_x86 *c) if (cpu_has_tsx_force_abort && opt_rtm_abort) wrmsrl(MSR_TSX_FORCE_ABORT, TSX_FORCE_ABORT_RTM); + + probe_c3_errata(c); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:56:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:56:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRp8-0001xy-GE; Sat, 23 May 2020 10:56:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRp7-0001xn-9H for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:13 +0000 X-Inumbo-ID: 0457c242-9ce4-11ea-acb3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0457c242-9ce4-11ea-acb3-12813bfff9fa; Sat, 23 May 2020 10:56:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/3su9FBp9eQKuxE34kQQoUpVtfTW4Hy53nb2M8Oy50g=; b=k7XwS74UA/UXXqar/rQMkzLmy5 /JPIpNz1CTTGRz38n6x3LGGzaJpxpnx0H0MXjv4sEKrtyY1jlm5akOspeIWYVWUrJBAzobijFKtmW 7p1E4WYZBwZXZ7EKyEZNZJ8ZpZTWwpDHixFl8HFUlLfePkrzqQp9rHKfz6NnYKzT253o=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRp6-0008M0-Ma for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRp6-0004ck-Ld for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: relax GDT check in arch_set_info_guest() Message-Id: Date: Sat, 23 May 2020 10:56:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ded6e9d514902be17069b59b335c3165c601f86a Author: Jan Beulich AuthorDate: Fri May 22 16:09:54 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:09:54 2020 +0200 x86: relax GDT check in arch_set_info_guest() It is wrong for us to check frames beyond the guest specified limit (in the compat case another loop bound is already correct). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/domain.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 2e5717b983..6402b09993 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -840,6 +840,7 @@ int arch_set_info_guest( #ifdef CONFIG_PV mfn_t cr3_mfn; struct page_info *cr3_page = NULL; + unsigned int nr_gdt_frames; int rc = 0; #endif @@ -957,6 +958,10 @@ int arch_set_info_guest( /* Ensure real hardware interrupts are enabled. */ v->arch.user_regs.eflags |= X86_EFLAGS_IF; + nr_gdt_frames = DIV_ROUND_UP(c(gdt_ents), 512); + if ( nr_gdt_frames > ARRAY_SIZE(v->arch.pv.gdt_frames) ) + return -EINVAL; + if ( !v->is_initialised ) { if ( !compat && !(flags & VGCF_in_kernel) && !c.nat->ctrlreg[1] ) @@ -988,9 +993,9 @@ int arch_set_info_guest( fail = compat_pfn_to_cr3(pfn) != c.cmp->ctrlreg[3]; } - for ( i = 0; i < ARRAY_SIZE(v->arch.pv.gdt_frames); ++i ) - fail |= v->arch.pv.gdt_frames[i] != c(gdt_frames[i]); fail |= v->arch.pv.gdt_ents != c(gdt_ents); + for ( i = 0; !fail && i < nr_gdt_frames; ++i ) + fail = v->arch.pv.gdt_frames[i] != c(gdt_frames[i]); fail |= v->arch.pv.ldt_base != c(ldt_base); fail |= v->arch.pv.ldt_ents != c(ldt_ents); @@ -1095,12 +1100,8 @@ int arch_set_info_guest( else { unsigned long gdt_frames[ARRAY_SIZE(v->arch.pv.gdt_frames)]; - unsigned int nr_frames = DIV_ROUND_UP(c.cmp->gdt_ents, 512); - - if ( nr_frames > ARRAY_SIZE(v->arch.pv.gdt_frames) ) - return -EINVAL; - for ( i = 0; i < nr_frames; ++i ) + for ( i = 0; i < nr_gdt_frames; ++i ) gdt_frames[i] = c.cmp->gdt_frames[i]; rc = (int)pv_set_gdt(v, gdt_frames, c.cmp->gdt_ents); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:56:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:56:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpI-0001z3-Hm; Sat, 23 May 2020 10:56:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpH-0001yt-KO for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:23 +0000 X-Inumbo-ID: 0a5c99ba-9ce4-11ea-acb3-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0a5c99ba-9ce4-11ea-acb3-12813bfff9fa; Sat, 23 May 2020 10:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WSpbZzOvcCg3vH2Fnzi+7+eqy3NS5CptT8/G7RGmMmg=; b=J3hhCUd5enz9YNLtKSCbKTgkgG guYHDNqc2YlyoRMlDxdxPftNQ3eyasGMGPi4ftiH8teQejEvqOAxKb1E9PtjOddHrQ/dbKPaOYaMw 3hRB0lpmohTW4s1TjuytR4vRP7zJanrJWZMlXYlgYX2yp5tIBmnT1p2FbFt/LvXHGMFg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpG-0008M9-P9 for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRpG-0004dD-OF for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/PV: polish pv_set_gdt() Message-Id: Date: Sat, 23 May 2020 10:56:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 87827167bb1737e826b0a8fe0abe07c0ace36ac5 Author: Jan Beulich AuthorDate: Fri May 22 16:10:40 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 22 16:10:40 2020 +0200 x86/PV: polish pv_set_gdt() There's no need to invoke get_page_from_gfn(), and there's also no need to update the passed in frames[]. Invoke get_page_and_type() directly. Also make the function's frames[] parameter const, change its return type to int, and drop the bogus casts from two of its invocations. Finally a little bit of cosmetics. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/domain.c | 4 ++-- xen/arch/x86/pv/descriptor-tables.c | 18 ++++++------------ xen/include/asm-x86/pv/mm.h | 7 ++++--- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6402b09993..6327ba0790 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1096,7 +1096,7 @@ int arch_set_info_guest( return rc; if ( !compat ) - rc = (int)pv_set_gdt(v, c.nat->gdt_frames, c.nat->gdt_ents); + rc = pv_set_gdt(v, c.nat->gdt_frames, c.nat->gdt_ents); else { unsigned long gdt_frames[ARRAY_SIZE(v->arch.pv.gdt_frames)]; @@ -1104,7 +1104,7 @@ int arch_set_info_guest( for ( i = 0; i < nr_gdt_frames; ++i ) gdt_frames[i] = c.cmp->gdt_frames[i]; - rc = (int)pv_set_gdt(v, gdt_frames, c.cmp->gdt_ents); + rc = pv_set_gdt(v, gdt_frames, c.cmp->gdt_ents); } if ( rc != 0 ) return rc; diff --git a/xen/arch/x86/pv/descriptor-tables.c b/xen/arch/x86/pv/descriptor-tables.c index 090f901b5b..3856128993 100644 --- a/xen/arch/x86/pv/descriptor-tables.c +++ b/xen/arch/x86/pv/descriptor-tables.c @@ -81,7 +81,8 @@ void pv_destroy_gdt(struct vcpu *v) } } -long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries) +int pv_set_gdt(struct vcpu *v, const unsigned long frames[], + unsigned int entries) { struct domain *d = v->domain; l1_pgentry_t *pl1e; @@ -95,17 +96,11 @@ long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries) /* Check the pages in the new GDT. */ for ( i = 0; i < nr_frames; i++ ) { - struct page_info *page; + mfn_t mfn = _mfn(frames[i]); - page = get_page_from_gfn(d, frames[i], NULL, P2M_ALLOC); - if ( !page ) + if ( !mfn_valid(mfn) || + !get_page_and_type(mfn_to_page(mfn), d, PGT_seg_desc_page) ) goto fail; - if ( !get_page_type(page, PGT_seg_desc_page) ) - { - put_page(page); - goto fail; - } - frames[i] = mfn_x(page_to_mfn(page)); } /* Tear down the old GDT. */ @@ -124,9 +119,8 @@ long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries) fail: while ( i-- > 0 ) - { put_page_and_type(mfn_to_page(_mfn(frames[i]))); - } + return -EINVAL; } diff --git a/xen/include/asm-x86/pv/mm.h b/xen/include/asm-x86/pv/mm.h index 246b99014c..07a12d5c49 100644 --- a/xen/include/asm-x86/pv/mm.h +++ b/xen/include/asm-x86/pv/mm.h @@ -25,7 +25,8 @@ int pv_ro_page_fault(unsigned long addr, struct cpu_user_regs *regs); -long pv_set_gdt(struct vcpu *v, unsigned long *frames, unsigned int entries); +int pv_set_gdt(struct vcpu *v, const unsigned long frames[], + unsigned int entries); void pv_destroy_gdt(struct vcpu *v); bool pv_map_ldt_shadow_page(unsigned int off); @@ -43,8 +44,8 @@ static inline int pv_ro_page_fault(unsigned long addr, return 0; } -static inline long pv_set_gdt(struct vcpu *v, unsigned long *frames, - unsigned int entries) +static inline int pv_set_gdt(struct vcpu *v, const unsigned long frames[], + unsigned int entries) { ASSERT_UNREACHABLE(); return -EINVAL; } static inline void pv_destroy_gdt(struct vcpu *v) { ASSERT_UNREACHABLE(); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:56:34 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:56:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpS-000203-JN; Sat, 23 May 2020 10:56:34 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpR-0001zs-J9 for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:33 +0000 X-Inumbo-ID: 1019899f-9ce4-11ea-acb4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1019899f-9ce4-11ea-acb4-12813bfff9fa; Sat, 23 May 2020 10:56:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tJLqFEVAbgSP6r+6fxch5d3o7pUJu+hslHanJ2Jqz9I=; b=vvIJ1h9gqIXqf1K6qJt37Gjwjl sBuEFSGnwcOP91AeUp76XC4iFO+Zd7DwybQPX4IKumfuOh5uqv96Cwl/fqV1BmimYkKTWwVfAiZ/Z yowlywuSIrDJJQOfIhuBzIor1Mjy1hexCCbq/VC/2nBspAm+OofzKeF9ZcTG45Eyf1Iw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpQ-0008MT-Rs for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRpQ-0004dh-Qs for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/traps: Rework #PF[Rsvd] bit handling Message-Id: Date: Sat, 23 May 2020 10:56:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9947ddbf7053bb9111d1e478986ef18764ea8aeb Author: Andrew Cooper AuthorDate: Mon May 18 16:13:33 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 22 20:04:23 2020 +0100 x86/traps: Rework #PF[Rsvd] bit handling The reserved_bit_page_fault() paths effectively turn reserved bit faults into a warning, but in the light of L1TF, the real impact is far more serious. Make #PF[Rsvd] a hard error, irrespective of mode. Any new panic() caused by this constitutes pagetable corruption, and probably an L1TF gadget needing fixing. Drop the PFEC_reserved_bit check in __page_fault_type() which has been made dead by the rearrangement in do_page_fault(). Additionally, drop the comment for do_page_fault(). It is inaccurate (bit 0 being set isn't always a protection violation) and stale (missing bits 5,6,15,31). Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 1f6f1dde76..e8a0877344 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -1137,15 +1137,6 @@ void do_int3(struct cpu_user_regs *regs) pv_inject_hw_exception(TRAP_int3, X86_EVENT_NO_EC); } -static void reserved_bit_page_fault(unsigned long addr, - struct cpu_user_regs *regs) -{ - printk("%pv: reserved bit in page table (ec=%04X)\n", - current, regs->error_code); - show_page_walk(addr); - show_execution_state(regs); -} - #ifdef CONFIG_PV static int handle_ldt_mapping_fault(unsigned int offset, struct cpu_user_regs *regs) @@ -1248,10 +1239,6 @@ static enum pf_type __page_fault_type(unsigned long addr, if ( in_irq() ) return real_fault; - /* Reserved bit violations are never spurious faults. */ - if ( error_code & PFEC_reserved_bit ) - return real_fault; - required_flags = _PAGE_PRESENT; if ( error_code & PFEC_write_access ) required_flags |= _PAGE_RW; @@ -1413,14 +1400,6 @@ static int fixup_page_fault(unsigned long addr, struct cpu_user_regs *regs) return 0; } -/* - * #PF error code: - * Bit 0: Protection violation (=1) ; Page not present (=0) - * Bit 1: Write access - * Bit 2: User mode (=1) ; Supervisor mode (=0) - * Bit 3: Reserved bit violation - * Bit 4: Instruction fetch - */ void do_page_fault(struct cpu_user_regs *regs) { unsigned long addr, fixup; @@ -1439,6 +1418,21 @@ void do_page_fault(struct cpu_user_regs *regs) if ( unlikely(fixup_page_fault(addr, regs) != 0) ) return; + /* + * Xen doesn't have reserved bits set in its pagetables, nor do we permit + * PV guests to write any. Such entries would generally be vulnerable to + * the L1TF sidechannel. + * + * The shadow pagetable logic may use reserved bits as part of + * SHOPT_FAST_FAULT_PATH. Pagefaults arising from these will be resolved + * via the fixup_page_fault() path. + * + * Anything remaining is an error, constituting corruption of the + * pagetables and probably an L1TF vulnerable gadget. + */ + if ( error_code & PFEC_reserved_bit ) + goto fatal; + if ( unlikely(!guest_mode(regs)) ) { enum pf_type pf_type = spurious_page_fault(addr, regs); @@ -1457,13 +1451,12 @@ void do_page_fault(struct cpu_user_regs *regs) if ( likely((fixup = search_exception_table(regs)) != 0) ) { perfc_incr(copy_user_faults); - if ( unlikely(regs->error_code & PFEC_reserved_bit) ) - reserved_bit_page_fault(addr, regs); this_cpu(last_extable_addr) = regs->rip; regs->rip = fixup; return; } + fatal: if ( debugger_trap_fatal(TRAP_page_fault, regs) ) return; @@ -1475,9 +1468,6 @@ void do_page_fault(struct cpu_user_regs *regs) error_code, _p(addr)); } - if ( unlikely(regs->error_code & PFEC_reserved_bit) ) - reserved_bit_page_fault(addr, regs); - pv_inject_page_fault(regs->error_code, addr); } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:56:44 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:56:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpc-000224-2j; Sat, 23 May 2020 10:56:44 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpb-00021r-HA for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:43 +0000 X-Inumbo-ID: 165f4fc8-9ce4-11ea-acb4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 165f4fc8-9ce4-11ea-acb4-12813bfff9fa; Sat, 23 May 2020 10:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CHUQhbUOdzZihWKNk5tOOtvyB7aGyMI6nYcFmvpyRKY=; b=q2/SF8AtbBdeKb0oPKwhe69w8/ Wiirj9kwW76ny7L81pxm19s9Qq1hEPoA71uy2n+WPUhhRsPvrv3XVTQiHbAui2wDuMDkJurF9Os/Q bE1QbHlP6VS5wLpkYdvU5NVsV/9Sac7gohuTnWExEU3DN3q4if4zC4an2zniu1FqC+A4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpa-0008OI-Ud for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRpa-0004eg-TW for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/idle: Extend ISR/C6 erratum workaround to Haswell Message-Id: Date: Sat, 23 May 2020 10:56:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b72d8870b5f68f06b083e6bfdb28f081bcb6ab3b Author: Andrew Cooper AuthorDate: Fri May 22 15:46:44 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 22 20:04:23 2020 +0100 x86/idle: Extend ISR/C6 erratum workaround to Haswell This bug was first discovered against Haswell. It is definitely affected. (The XenServer ticket for this bug was opened on 2013-05-30 which is coming up on 7 years old, and predates Broadwell). Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/acpi/cpu_idle.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c index 178cb607c2..a2248ea11f 100644 --- a/xen/arch/x86/acpi/cpu_idle.c +++ b/xen/arch/x86/acpi/cpu_idle.c @@ -583,8 +583,16 @@ bool errata_c6_workaround(void) * registers), the processor may dispatch the second interrupt (from * the IRR bit) before the first interrupt has completed and written to * the EOI register, causing the first interrupt to never complete. + * + * Note: Haswell hasn't had errata issued, but this issue was first + * discovered on Haswell hardware, and is affected. */ static const struct x86_cpu_id isr_errata[] = { + /* Haswell */ + INTEL_FAM6_MODEL(0x3c), + INTEL_FAM6_MODEL(0x3f), + INTEL_FAM6_MODEL(0x45), + INTEL_FAM6_MODEL(0x46), /* Broadwell */ INTEL_FAM6_MODEL(0x47), INTEL_FAM6_MODEL(0x3d), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 10:56:54 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 10:56:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpm-00024K-4N; Sat, 23 May 2020 10:56:54 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpl-000246-Hw for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:53 +0000 X-Inumbo-ID: 1c60b704-9ce4-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1c60b704-9ce4-11ea-ae69-bc764e2007e4; Sat, 23 May 2020 10:56:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=PvtRPsuq5pCrgpBKJ3TGe6ycJsyeyl1a0mqlqtU0cl8=; b=uHguZQ8+6/Dy7MCvOmwpk3D1Rw axynokhmRSQ5vx00ViEtu9gvcv1NHQEE87qfEbb7QsVdUPNzRcfliA+nBK3XkxkLc/vGKaqGNxni9 F9wwieUF7MiHlSXQJgxs11NkYrRGrdK/Ise8flldHTvrXJ7S5eNi4P/pNfshaaBBLzx0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcRpl-0008OR-0v for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:53 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcRpl-0004fD-02 for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 10:56:53 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/trace: Don't dump offline CPUs in debugtrace_dump_worker() Message-Id: Date: Sat, 23 May 2020 10:56:52 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit abf378e6483195b98a3f32e2c9d017e0eeeb275f Author: Andrew Cooper AuthorDate: Thu May 21 09:19:33 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 22 20:04:46 2020 +0100 xen/trace: Don't dump offline CPUs in debugtrace_dump_worker() The 'T' debugkey reliably wedges on one of my systems, which has a sparse APIC_ID layout due to a non power-of-2 number of cores per socket. The per_cpu(dt_cpu_data, cpu) calcution falls over the deliberately non-canonical poison value. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/common/debugtrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/debugtrace.c b/xen/common/debugtrace.c index c21ec99ee0..f3794b9453 100644 --- a/xen/common/debugtrace.c +++ b/xen/common/debugtrace.c @@ -95,7 +95,7 @@ static void debugtrace_dump_worker(void) debugtrace_dump_buffer(dt_data, "global"); - for ( cpu = 0; cpu < nr_cpu_ids; cpu++ ) + for_each_online_cpu ( cpu ) { char buf[16]; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 23 21:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 23 May 2020 21:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcbam-00029G-Rt; Sat, 23 May 2020 21:22:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcbal-00029B-BG for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 21:22:03 +0000 X-Inumbo-ID: 71a744e2-9d3b-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 71a744e2-9d3b-11ea-ae69-bc764e2007e4; Sat, 23 May 2020 21:22:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fqPQ3qzm1xM8vySLLbhpm2IgwK7ziDJbprutMh6csiQ=; b=T2LL1lyHJS/7UsCYCnIRkgmeQ4 wM9zsKXuB2iVito/bwgeacABC0d0Ptq5DJh+mH9AiE9x2xGdfDSTb0bny9eGqLwOPzenw1N8oWaFg XkKkvW/q8qsM6icB1WtpFGjI0wUmaSAeWuW3Qji2nz48x2EA/y6TWjf7ZR/D7O5m5Qbg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcbak-00050I-9A for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 21:22:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcbak-0004TA-7W for xen-changelog@lists.xenproject.org; Sat, 23 May 2020 21:22:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang/xenlight: add an empty line after DO NOT EDIT comment Message-Id: Date: Sat, 23 May 2020 21:22:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5e015d48a5ee68ba03addad2698364d8f015afec Author: Nick Rosbrook AuthorDate: Thu May 21 10:55:25 2020 -0400 Commit: George Dunlap CommitDate: Fri May 22 23:17:37 2020 +0100 golang/xenlight: add an empty line after DO NOT EDIT comment When generating documentation, pkg.go.dev and godoc.org assume a comment that immediately precedes the package declaration is a "package comment", and should be shown in the documentation. Add an empty line after the DO NOT EDIT comment in generated files to prevent these comments from appearing as "package comments." Signed-off-by: Nick Rosbrook Reviewed-by: George Dunlap --- tools/golang/xenlight/gengotypes.py | 1 + tools/golang/xenlight/helpers.gen.go | 1 + tools/golang/xenlight/types.gen.go | 1 + 3 files changed, 3 insertions(+) diff --git a/tools/golang/xenlight/gengotypes.py b/tools/golang/xenlight/gengotypes.py index e9ad92afa0..2b71aa1ea8 100644 --- a/tools/golang/xenlight/gengotypes.py +++ b/tools/golang/xenlight/gengotypes.py @@ -737,6 +737,7 @@ if __name__ == '__main__': // This file is generated by: // {} // + """.format(' '.join(sys.argv)) xenlight_golang_generate_types(types=types, diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index b5bd0de830..1e58ebbab2 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -3,6 +3,7 @@ // This file is generated by: // gengotypes.py ../../libxl/libxl_types.idl // + package xenlight import ( diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 15516ae552..be42f75529 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -3,6 +3,7 @@ // This file is generated by: // gengotypes.py ../../libxl/libxl_types.idl // + package xenlight type Error int -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sun May 24 14:11:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 May 2020 14:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLH-0005TU-Ve; Sun, 24 May 2020 14:11:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLG-0005TP-HR for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:06 +0000 X-Inumbo-ID: 6806acce-9dc8-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6806acce-9dc8-11ea-b9cf-bc764e2007e4; Sun, 24 May 2020 14:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=owdthKTrc2nXQAJPcAFMLlP4Bz+oIlgm6akKl/FEeBw=; b=ME8DSIxopxFqWIdE2gtP71UG0D Zs6mQWpbpfBLBqgCMjtURc0LfZjJc707gpvK///FsunalL9HBCN/SoPyY6GZChKa7utMihZNGtef6 BlpC2Di5nSGQXltnIKELoAmv7xmmzckdQSMpjjarQpZGmA3R4I4o9wuLkfZctzxGGBOE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLF-0003oM-4y for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcrLF-0002nY-3a for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: Allow a platform to override the DMA width Message-Id: Date: Sun, 24 May 2020 14:11:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b92223aeedc5cf1cd2882a7b769865d652cf8b06 Author: Julien Grall AuthorDate: Sat May 16 11:41:16 2020 +0100 Commit: Julien Grall CommitDate: Sun May 24 14:59:46 2020 +0100 xen/arm: Allow a platform to override the DMA width At the moment, Xen is assuming that all the devices are at least 32-bit DMA capable. However, some SoC have devices that may be able to access a much restricted range. For instance, the RPI has devices that can only access the first 1GB of RAM. The structure platform_desc is now extended to allow a platform to override the DMA width. The new is used to implement arch_get_dma_bit_size(). The prototype is now moved in asm-arm/mm.h as the function is not NUMA specific. The implementation is done in platform.c so we don't have to include platform.h everywhere. This should be fine as the function is not expected to be called in hotpath. Signed-off-by: Julien Grall Reviewed-by: Volodymyr Babchuk Tested-by: Corey Minyard Reviewed-by: Stefano Stabellini --- xen/arch/arm/platform.c | 5 +++++ xen/include/asm-arm/mm.h | 2 ++ xen/include/asm-arm/numa.h | 5 ----- xen/include/asm-arm/platform.h | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index 8eb0b6e57a..4db5bbb4c5 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -155,6 +155,11 @@ bool platform_device_is_blacklisted(const struct dt_device_node *node) return (dt_match_node(blacklist, node) != NULL); } +unsigned int arch_get_dma_bitsize(void) +{ + return ( platform && platform->dma_bitsize ) ? platform->dma_bitsize : 32; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 7df91280bc..f8ba49b118 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -366,6 +366,8 @@ int arch_acquire_resource(struct domain *d, unsigned int type, unsigned int id, return -EOPNOTSUPP; } +unsigned int arch_get_dma_bitsize(void); + #endif /* __ARCH_ARM_MM__ */ /* * Local variables: diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 490d1f31aa..31a6de4e23 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -25,11 +25,6 @@ extern mfn_t first_valid_mfn; #define node_start_pfn(nid) (mfn_x(first_valid_mfn)) #define __node_distance(a, b) (20) -static inline unsigned int arch_get_dma_bitsize(void) -{ - return 32; -} - #endif /* __ARCH_ARM_NUMA_H */ /* * Local variables: diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index ed4d30a1be..997eb25216 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -38,6 +38,8 @@ struct platform_desc { * List of devices which must not pass-through to a guest */ const struct dt_device_match *blacklist_dev; + /* Override the DMA width (32-bit by default). */ + unsigned int dma_bitsize; }; /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sun May 24 14:11:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 May 2020 14:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLS-0005Tu-0u; Sun, 24 May 2020 14:11:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLQ-0005Tk-Jt for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:16 +0000 X-Inumbo-ID: 6e0bf03e-9dc8-11ea-ade6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6e0bf03e-9dc8-11ea-ade6-12813bfff9fa; Sun, 24 May 2020 14:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=D6Xl2Pzqq0v9FtAeKATDPHFEyzLnrYpPWIas0jlmF+o=; b=wmg+yEIN5FkJh4u8TC1Vxck9uo Ubph1KoqeqnGH4i8HVz2Tydv7OBJWyZgPfVMn4QQeh3pREbgm3B8qTDQQsUshos7H8YkC/gbkaGlI is96fCUIX5yoAkMg2DJthh251GIffP5RJ4eG+IuONBTnN3OvKzZI9HqPGVb82w+dIbks=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLP-0003oV-89 for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcrLP-0002pO-6t for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: Take into account the DMA width when allocating Dom0 memory banks Message-Id: Date: Sun, 24 May 2020 14:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ca3c17c4fc0bc737865ebb2f3eaa4874889290ad Author: Julien Grall AuthorDate: Sat May 16 11:57:00 2020 +0100 Commit: Julien Grall CommitDate: Sun May 24 15:00:40 2020 +0100 xen/arm: Take into account the DMA width when allocating Dom0 memory banks At the moment, Xen is assuming that all the devices are at least 32-bit DMA capable. However, some SoCs have devices that may be able to access a much restricted range. For instance, the Raspberry PI 4 has devices that can only access the first GB of RAM. The function arch_get_dma_bit_size() will return the lowest DMA width on the platform. Use it to decide what is the limit for the low memory. Signed-off-by: Julien Grall Tested-by: Corey Minyard Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4307087536..3d7a75c318 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -211,10 +211,12 @@ fail: * the ramdisk and DTB must be placed within a certain proximity of * the kernel within RAM. * 3. For dom0 we want to place as much of the RAM as we reasonably can - * below 4GB, so that it can be used by non-LPAE enabled kernels (32-bit) - * or when a device assigned to dom0 can only do 32-bit DMA access. - * 4. For 32-bit dom0 the kernel must be located below 4GB. - * 5. We want to have a few largers banks rather than many smaller ones. + * below 4GB, so that it can be used by non-LPAE enabled kernels (32-bit). + * 4. Some devices assigned to dom0 can only do 32-bit DMA access or + * even be more restricted. We want to allocate as much of the RAM + * as we reasonably can that can be accessed from all the devices.. + * 5. For 32-bit dom0 the kernel must be located below 4GB. + * 6. We want to have a few largers banks rather than many smaller ones. * * For the first two requirements we need to make sure that the lowest * bank is sufficiently large. @@ -245,9 +247,9 @@ fail: * we give up. * * For 32-bit domain we require that the initial allocation for the - * first bank is under 4G. For 64-bit domain, the first bank is preferred - * to be allocated under 4G. Then for the subsequent allocations we - * initially allocate memory only from below 4GB. Once that runs out + * first bank is part of the low mem. For 64-bit, the first bank is preferred + * to be allocated in the low mem. Then for subsequent allocation, we + * initially allocate memory only from low mem. Once that runs out out * (as described above) we allow higher allocations and continue until * that runs out (or we have allocated sufficient dom0 memory). */ @@ -262,6 +264,7 @@ static void __init allocate_memory_11(struct domain *d, int i; bool lowmem = true; + unsigned int lowmem_bitsize = min(32U, arch_get_dma_bitsize()); unsigned int bits; /* @@ -282,7 +285,7 @@ static void __init allocate_memory_11(struct domain *d, */ while ( order >= min_low_order ) { - for ( bits = order ; bits <= (lowmem ? 32 : PADDR_BITS); bits++ ) + for ( bits = order ; bits <= lowmem_bitsize; bits++ ) { pg = alloc_domheap_pages(d, order, MEMF_bits(bits)); if ( pg != NULL ) @@ -296,24 +299,26 @@ static void __init allocate_memory_11(struct domain *d, order--; } - /* Failed to allocate bank0 under 4GB */ + /* Failed to allocate bank0 in the lowmem region. */ if ( is_32bit_domain(d) ) panic("Unable to allocate first memory bank\n"); - /* Try to allocate memory from above 4GB */ - printk(XENLOG_INFO "No bank has been allocated below 4GB.\n"); + /* Try to allocate memory from above the lowmem region */ + printk(XENLOG_INFO "No bank has been allocated below %u-bit.\n", + lowmem_bitsize); lowmem = false; got_bank0: /* - * If we failed to allocate bank0 under 4GB, continue allocating - * memory from above 4GB and fill in banks. + * If we failed to allocate bank0 in the lowmem region, + * continue allocating from above the lowmem and fill in banks. */ order = get_allocation_size(kinfo->unassigned_mem); while ( kinfo->unassigned_mem && kinfo->mem.nr_banks < NR_MEM_BANKS ) { - pg = alloc_domheap_pages(d, order, lowmem ? MEMF_bits(32) : 0); + pg = alloc_domheap_pages(d, order, + lowmem ? MEMF_bits(lowmem_bitsize) : 0); if ( !pg ) { order --; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sun May 24 14:11:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sun, 24 May 2020 14:11:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLb-0005VX-2O; Sun, 24 May 2020 14:11:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLa-0005Ul-5W for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:26 +0000 X-Inumbo-ID: 7409175b-9dc8-11ea-ade6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7409175b-9dc8-11ea-ade6-12813bfff9fa; Sun, 24 May 2020 14:11:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=D/3u32NxRf5MHyt/DFjPDDTkBMAXsOfa9ZsLih7sLF8=; b=E/BXyIXJ/iXOV0G7jbvs7gwfmM 1YH7JU+iZGf+Rwm+Bno2Axgqirhe2NgJii3eKN9PhQACYVNE6Cd7aYANIVP5lBWFu76h4AIwo7ggr 7E1bwQ88swZztJC5nDG+BjNJbo8inn3wNV+Y/YjM3ghiaJ4yMWp7Tct/Uw9qidTUA1kY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jcrLZ-0003og-B9 for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jcrLZ-0002q1-9k for xen-changelog@lists.xenproject.org; Sun, 24 May 2020 14:11:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: plat: Allocate as much as possible memory below 1GB for dom0 for RPI Message-Id: Date: Sun, 24 May 2020 14:11:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 437b0aa06a014ce174e24c0d3530b3e9ab19b18b Author: Julien Grall AuthorDate: Sat May 16 20:16:57 2020 +0100 Commit: Julien Grall CommitDate: Sun May 24 15:01:02 2020 +0100 xen/arm: plat: Allocate as much as possible memory below 1GB for dom0 for RPI The raspberry PI 4 has devices that can only DMA into the first GB of the RAM. Therefore we want allocate as much as possible memory below 1GB for dom0. Use the recently introduced dma_bitsize field to specify the DMA width supported. Signed-off-by: Julien Grall Reported-by: Corey Minyard Tested-by: Corey Minyard Reviewed-by: Stefano Stabellini --- xen/arch/arm/platforms/brcm-raspberry-pi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/platforms/brcm-raspberry-pi.c b/xen/arch/arm/platforms/brcm-raspberry-pi.c index b697fa2c6c..f5ae58a7d5 100644 --- a/xen/arch/arm/platforms/brcm-raspberry-pi.c +++ b/xen/arch/arm/platforms/brcm-raspberry-pi.c @@ -43,6 +43,7 @@ static const struct dt_device_match rpi4_blacklist_dev[] __initconst = PLATFORM_START(rpi4, "Raspberry Pi 4") .compatible = rpi4_dt_compat, .blacklist_dev = rpi4_blacklist_dev, + .dma_bitsize = 30, PLATFORM_END /* -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 25 04:00:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 May 2020 04:00:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4HU-00038s-LG; Mon, 25 May 2020 04:00:04 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4HT-0002xc-7K for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:03 +0000 X-Inumbo-ID: 35c79646-9e3c-11ea-ae7f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 35c79646-9e3c-11ea-ae7f-12813bfff9fa; Mon, 25 May 2020 04:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oflqym5sBbphketoFdaRCRDu1V7gbMVNrFmjxYEVe4Q=; b=A3O0Jpy6FU7kg3+M2aU5gULp7x 2zTW1gXcJz0nwMUetewrjpZTys8iFZNixnHX0vZ1gS6JZ/xL3ObJ4R+Xau4fXBr3m+LmR1CsH+3Jl y8I8nk/RglNC+HlD5yFeBMJssAnD4iX2OWAufyVoRmrCf25iUNjdSeeJU/LSt3uVc6Ms=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4HS-0007Lx-FK for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jd4HS-0006oD-Dr for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/arm: Allow a platform to override the DMA width Message-Id: Date: Mon, 25 May 2020 04:00:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b92223aeedc5cf1cd2882a7b769865d652cf8b06 Author: Julien Grall AuthorDate: Sat May 16 11:41:16 2020 +0100 Commit: Julien Grall CommitDate: Sun May 24 14:59:46 2020 +0100 xen/arm: Allow a platform to override the DMA width At the moment, Xen is assuming that all the devices are at least 32-bit DMA capable. However, some SoC have devices that may be able to access a much restricted range. For instance, the RPI has devices that can only access the first 1GB of RAM. The structure platform_desc is now extended to allow a platform to override the DMA width. The new is used to implement arch_get_dma_bit_size(). The prototype is now moved in asm-arm/mm.h as the function is not NUMA specific. The implementation is done in platform.c so we don't have to include platform.h everywhere. This should be fine as the function is not expected to be called in hotpath. Signed-off-by: Julien Grall Reviewed-by: Volodymyr Babchuk Tested-by: Corey Minyard Reviewed-by: Stefano Stabellini --- xen/arch/arm/platform.c | 5 +++++ xen/include/asm-arm/mm.h | 2 ++ xen/include/asm-arm/numa.h | 5 ----- xen/include/asm-arm/platform.h | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c index 8eb0b6e57a..4db5bbb4c5 100644 --- a/xen/arch/arm/platform.c +++ b/xen/arch/arm/platform.c @@ -155,6 +155,11 @@ bool platform_device_is_blacklisted(const struct dt_device_node *node) return (dt_match_node(blacklist, node) != NULL); } +unsigned int arch_get_dma_bitsize(void) +{ + return ( platform && platform->dma_bitsize ) ? platform->dma_bitsize : 32; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/mm.h b/xen/include/asm-arm/mm.h index 7df91280bc..f8ba49b118 100644 --- a/xen/include/asm-arm/mm.h +++ b/xen/include/asm-arm/mm.h @@ -366,6 +366,8 @@ int arch_acquire_resource(struct domain *d, unsigned int type, unsigned int id, return -EOPNOTSUPP; } +unsigned int arch_get_dma_bitsize(void); + #endif /* __ARCH_ARM_MM__ */ /* * Local variables: diff --git a/xen/include/asm-arm/numa.h b/xen/include/asm-arm/numa.h index 490d1f31aa..31a6de4e23 100644 --- a/xen/include/asm-arm/numa.h +++ b/xen/include/asm-arm/numa.h @@ -25,11 +25,6 @@ extern mfn_t first_valid_mfn; #define node_start_pfn(nid) (mfn_x(first_valid_mfn)) #define __node_distance(a, b) (20) -static inline unsigned int arch_get_dma_bitsize(void) -{ - return 32; -} - #endif /* __ARCH_ARM_NUMA_H */ /* * Local variables: diff --git a/xen/include/asm-arm/platform.h b/xen/include/asm-arm/platform.h index ed4d30a1be..997eb25216 100644 --- a/xen/include/asm-arm/platform.h +++ b/xen/include/asm-arm/platform.h @@ -38,6 +38,8 @@ struct platform_desc { * List of devices which must not pass-through to a guest */ const struct dt_device_match *blacklist_dev; + /* Override the DMA width (32-bit by default). */ + unsigned int dma_bitsize; }; /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 25 04:00:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 May 2020 04:00:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4He-0003PB-NF; Mon, 25 May 2020 04:00:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4Hd-0003P5-0G for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:13 +0000 X-Inumbo-ID: 3bc8faf8-9e3c-11ea-ae7f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3bc8faf8-9e3c-11ea-ae7f-12813bfff9fa; Mon, 25 May 2020 04:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Eerj0MBDrjzAyxv19CHXFyAiZF0vHKkZLOyQwCJayeQ=; b=mKCON5WdRbhP7WpYTM314w6idg ZHaKqp8w7h7Ko52fk4J5Ivm4J0g3OxLUc/beC4ZJrVuNjKl4PYhi+64AOYg5LYXtwBZLebBBoQHtn OMy1RrZIwT+XHJEZSWnRrNDJwu95KYA3fbLSHWfup3QCEo9uLpEF98MY2PYc81aUcNq4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4Hc-0007Me-IM for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jd4Hc-0006qB-H7 for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/arm: Take into account the DMA width when allocating Dom0 memory banks Message-Id: Date: Mon, 25 May 2020 04:00:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ca3c17c4fc0bc737865ebb2f3eaa4874889290ad Author: Julien Grall AuthorDate: Sat May 16 11:57:00 2020 +0100 Commit: Julien Grall CommitDate: Sun May 24 15:00:40 2020 +0100 xen/arm: Take into account the DMA width when allocating Dom0 memory banks At the moment, Xen is assuming that all the devices are at least 32-bit DMA capable. However, some SoCs have devices that may be able to access a much restricted range. For instance, the Raspberry PI 4 has devices that can only access the first GB of RAM. The function arch_get_dma_bit_size() will return the lowest DMA width on the platform. Use it to decide what is the limit for the low memory. Signed-off-by: Julien Grall Tested-by: Corey Minyard Reviewed-by: Stefano Stabellini --- xen/arch/arm/domain_build.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4307087536..3d7a75c318 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -211,10 +211,12 @@ fail: * the ramdisk and DTB must be placed within a certain proximity of * the kernel within RAM. * 3. For dom0 we want to place as much of the RAM as we reasonably can - * below 4GB, so that it can be used by non-LPAE enabled kernels (32-bit) - * or when a device assigned to dom0 can only do 32-bit DMA access. - * 4. For 32-bit dom0 the kernel must be located below 4GB. - * 5. We want to have a few largers banks rather than many smaller ones. + * below 4GB, so that it can be used by non-LPAE enabled kernels (32-bit). + * 4. Some devices assigned to dom0 can only do 32-bit DMA access or + * even be more restricted. We want to allocate as much of the RAM + * as we reasonably can that can be accessed from all the devices.. + * 5. For 32-bit dom0 the kernel must be located below 4GB. + * 6. We want to have a few largers banks rather than many smaller ones. * * For the first two requirements we need to make sure that the lowest * bank is sufficiently large. @@ -245,9 +247,9 @@ fail: * we give up. * * For 32-bit domain we require that the initial allocation for the - * first bank is under 4G. For 64-bit domain, the first bank is preferred - * to be allocated under 4G. Then for the subsequent allocations we - * initially allocate memory only from below 4GB. Once that runs out + * first bank is part of the low mem. For 64-bit, the first bank is preferred + * to be allocated in the low mem. Then for subsequent allocation, we + * initially allocate memory only from low mem. Once that runs out out * (as described above) we allow higher allocations and continue until * that runs out (or we have allocated sufficient dom0 memory). */ @@ -262,6 +264,7 @@ static void __init allocate_memory_11(struct domain *d, int i; bool lowmem = true; + unsigned int lowmem_bitsize = min(32U, arch_get_dma_bitsize()); unsigned int bits; /* @@ -282,7 +285,7 @@ static void __init allocate_memory_11(struct domain *d, */ while ( order >= min_low_order ) { - for ( bits = order ; bits <= (lowmem ? 32 : PADDR_BITS); bits++ ) + for ( bits = order ; bits <= lowmem_bitsize; bits++ ) { pg = alloc_domheap_pages(d, order, MEMF_bits(bits)); if ( pg != NULL ) @@ -296,24 +299,26 @@ static void __init allocate_memory_11(struct domain *d, order--; } - /* Failed to allocate bank0 under 4GB */ + /* Failed to allocate bank0 in the lowmem region. */ if ( is_32bit_domain(d) ) panic("Unable to allocate first memory bank\n"); - /* Try to allocate memory from above 4GB */ - printk(XENLOG_INFO "No bank has been allocated below 4GB.\n"); + /* Try to allocate memory from above the lowmem region */ + printk(XENLOG_INFO "No bank has been allocated below %u-bit.\n", + lowmem_bitsize); lowmem = false; got_bank0: /* - * If we failed to allocate bank0 under 4GB, continue allocating - * memory from above 4GB and fill in banks. + * If we failed to allocate bank0 in the lowmem region, + * continue allocating from above the lowmem and fill in banks. */ order = get_allocation_size(kinfo->unassigned_mem); while ( kinfo->unassigned_mem && kinfo->mem.nr_banks < NR_MEM_BANKS ) { - pg = alloc_domheap_pages(d, order, lowmem ? MEMF_bits(32) : 0); + pg = alloc_domheap_pages(d, order, + lowmem ? MEMF_bits(lowmem_bitsize) : 0); if ( !pg ) { order --; -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 25 04:00:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 May 2020 04:00:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4Ho-0003QV-Qh; Mon, 25 May 2020 04:00:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4Hn-0003QD-2T for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:23 +0000 X-Inumbo-ID: 41ca7c7e-9e3c-11ea-ae7f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 41ca7c7e-9e3c-11ea-ae7f-12813bfff9fa; Mon, 25 May 2020 04:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/w9zsIsD2h/5czDt+io1YHdjLgqanvw9AvajMtPnGvQ=; b=EY9oPvw1mmlRLYO3F8wgOqd1AH fpmf77IRvimiRkrJIwyxMmkQxZLfp73hIzjCSaow5DYBekSbtXsXRjPy6mFvD/P/uP0AHc3FKi5lB EfvTEpQii3DAf78fFNaciLQ5WVj4fS8MXohq3zvnVwv7v1p+tdtISnCsDnVMApzGBdvc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd4Hm-0007Mt-LJ for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jd4Hm-0006ql-K8 for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 04:00:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/arm: plat: Allocate as much as possible memory below 1GB for dom0 for RPI Message-Id: Date: Mon, 25 May 2020 04:00:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 437b0aa06a014ce174e24c0d3530b3e9ab19b18b Author: Julien Grall AuthorDate: Sat May 16 20:16:57 2020 +0100 Commit: Julien Grall CommitDate: Sun May 24 15:01:02 2020 +0100 xen/arm: plat: Allocate as much as possible memory below 1GB for dom0 for RPI The raspberry PI 4 has devices that can only DMA into the first GB of the RAM. Therefore we want allocate as much as possible memory below 1GB for dom0. Use the recently introduced dma_bitsize field to specify the DMA width supported. Signed-off-by: Julien Grall Reported-by: Corey Minyard Tested-by: Corey Minyard Reviewed-by: Stefano Stabellini --- xen/arch/arm/platforms/brcm-raspberry-pi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/arm/platforms/brcm-raspberry-pi.c b/xen/arch/arm/platforms/brcm-raspberry-pi.c index b697fa2c6c..f5ae58a7d5 100644 --- a/xen/arch/arm/platforms/brcm-raspberry-pi.c +++ b/xen/arch/arm/platforms/brcm-raspberry-pi.c @@ -43,6 +43,7 @@ static const struct dt_device_match rpi4_blacklist_dev[] __initconst = PLATFORM_START(rpi4, "Raspberry Pi 4") .compatible = rpi4_dt_compat, .blacklist_dev = rpi4_blacklist_dev, + .dma_bitsize = 30, PLATFORM_END /* -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Mon May 25 06:33:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 May 2020 06:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd6fb-0000Eo-9X; Mon, 25 May 2020 06:33:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd6fZ-0000Ee-PY for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 06:33:05 +0000 X-Inumbo-ID: 96eaf84a-9e51-11ea-ae69-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 96eaf84a-9e51-11ea-ae69-bc764e2007e4; Mon, 25 May 2020 06:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6PqV2LYshnTWMg9NxK+wFKLKFtiUO3qS+gQEq5xELBY=; b=qbjhf9zBB+rAEnP9djkLBl/GPz c6NvkHsxFJiUrDZO2+bfNWr5h+mDI/bDHcPILVd3cfHUziFlYGj8rvDlV8VTK4BYsDoId9raU6JxF t20O8T3xx9R/iH+gxymotvSShhPm1V2P9ULb5Tl67v3l9t9gDQgtmcqcvJTf3io39xk8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jd6fY-0002ZF-Sw for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 06:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.89) (envelope-from ) id 1jd6fY-0006rs-Re for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 06:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] vmx: let opt_ept_ad always reflect the current setting Message-Id: Date: Mon, 25 May 2020 06:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b4d01ede23847bed9471ca0b7071394aef693a1a Author: Juergen Gross AuthorDate: Mon May 25 08:21:55 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 25 08:21:55 2020 +0200 vmx: let opt_ept_ad always reflect the current setting In case opt_ept_ad has not been set explicitly by the user via command line or runtime parameter, it is treated as "no" on Avoton cpus. Change that handling by setting opt_ept_ad to 0 for this cpu type explicitly if no user value has been set. By putting this into the (renamed) boot time initialization of vmcs.c _vmx_cpu_up() can be made static. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 22 +++++++++++++++------- xen/arch/x86/hvm/vmx/vmx.c | 4 +--- xen/include/asm-x86/hvm/vmx/vmcs.h | 3 +-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4c23645454..221af9737a 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -315,10 +315,6 @@ static int vmx_init_vmcs_config(void) if ( !opt_ept_ad ) _vmx_ept_vpid_cap &= ~VMX_EPT_AD_BIT; - else if ( /* Work around Erratum AVR41 on Avoton processors. */ - boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x4d && - opt_ept_ad < 0 ) - _vmx_ept_vpid_cap &= ~VMX_EPT_AD_BIT; /* * Additional sanity checking before using EPT: @@ -652,7 +648,7 @@ void vmx_cpu_dead(unsigned int cpu) vmx_pi_desc_fixup(cpu); } -int _vmx_cpu_up(bool bsp) +static int _vmx_cpu_up(bool bsp) { u32 eax, edx; int rc, bios_locked, cpu = smp_processor_id(); @@ -2108,9 +2104,21 @@ static void vmcs_dump(unsigned char ch) printk("**************************************\n"); } -void __init setup_vmcs_dump(void) +int __init vmx_vmcs_init(void) { - register_keyhandler('v', vmcs_dump, "dump VT-x VMCSs", 1); + int ret; + + if ( opt_ept_ad < 0 ) + /* Work around Erratum AVR41 on Avoton processors. */ + opt_ept_ad = !(boot_cpu_data.x86 == 6 && + boot_cpu_data.x86_model == 0x4d); + + ret = _vmx_cpu_up(true); + + if ( !ret ) + register_keyhandler('v', vmcs_dump, "dump VT-x VMCSs", 1); + + return ret; } static void __init __maybe_unused build_assertions(void) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 6efa80e422..11a4dd94cf 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2482,7 +2482,7 @@ const struct hvm_function_table * __init start_vmx(void) { set_in_cr4(X86_CR4_VMXE); - if ( _vmx_cpu_up(true) ) + if ( vmx_vmcs_init() ) { printk("VMX: failed to initialise.\n"); return NULL; @@ -2553,8 +2553,6 @@ const struct hvm_function_table * __init start_vmx(void) vmx_function_table.get_guest_bndcfgs = vmx_get_guest_bndcfgs; } - setup_vmcs_dump(); - lbr_tsx_fixup_check(); bdf93_fixup_check(); diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 95c1dea7b8..906810592f 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -21,11 +21,10 @@ #include extern void vmcs_dump_vcpu(struct vcpu *v); -extern void setup_vmcs_dump(void); +extern int vmx_vmcs_init(void); extern int vmx_cpu_up_prepare(unsigned int cpu); extern void vmx_cpu_dead(unsigned int cpu); extern int vmx_cpu_up(void); -extern int _vmx_cpu_up(bool bsp); extern void vmx_cpu_down(void); struct vmcs_struct { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon May 25 15:44:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 25 May 2020 15:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdFGo-0007XS-S1; Mon, 25 May 2020 15:44:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdFGn-0007Wh-KY for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 15:44:05 +0000 X-Inumbo-ID: 9002eff4-9e9e-11ea-b9cf-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9002eff4-9e9e-11ea-b9cf-bc764e2007e4; Mon, 25 May 2020 15:44:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8t9MYtIJ4XrHYEQTONQ3wvRQzCgXa1Djci+bufpyanY=; b=k8rxfne6rLzVvoDzSkyS/+/8kh qPdcDUB34CHDukh6OP7/3IlNrY5ZUnAtpY03Mc63KLMb1c5u2vUAa8au1YfCLMNvr4Nc4gBtqwgr0 HS3JPHMWulpGj8ysVtiPpCAlpu/aHGSrXoa8xwIuCsYUGoOZo31EwAJtYSHbE/Pdl9g4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdFGm-0006B3-Hy for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 15:44:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdFGm-0005F6-Go for xen-changelog@lists.xenproject.org; Mon, 25 May 2020 15:44:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/shadow: Reposition sh_remove_write_access_from_sl1p() Message-Id: Date: Mon, 25 May 2020 15:44:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 354e8318d5a9b6f32fbd3c01d1a9f1970007010b Author: Andrew Cooper AuthorDate: Thu May 21 09:45:27 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 25 16:37:48 2020 +0100 x86/shadow: Reposition sh_remove_write_access_from_sl1p() When compiling with SHOPT_OUT_OF_SYNC disabled, the build fails with: common.c:41:12: error: ‘sh_remove_write_access_from_sl1p’ declared ‘static’ but never defined [-Werror=unused-function] static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ due to an unguarded forward declaration. It turns out there is no need to forward declare sh_remove_write_access_from_sl1p() to begin with, so move it to just ahead of its first user, which is within a larger #ifdef'd SHOPT_OUT_OF_SYNC block. Fix up for style while moving it. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 58 +++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0ac3f880e1..5fcb04ce8b 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -38,9 +38,6 @@ #include #include "private.h" -static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, - mfn_t smfn, unsigned long offset); - DEFINE_PER_CPU(uint32_t,trace_shadow_path_flags); static int sh_enable_log_dirty(struct domain *, bool log_global); @@ -252,6 +249,33 @@ static inline void _sh_resync_l1(struct vcpu *v, mfn_t gmfn, mfn_t snpmfn) SHADOW_INTERNAL_NAME(sh_resync_l1, 4)(v, gmfn, snpmfn); } +static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, + mfn_t smfn, unsigned long off) +{ + ASSERT(mfn_valid(smfn)); + ASSERT(mfn_valid(gmfn)); + + switch ( mfn_to_page(smfn)->u.sh.type ) + { + case SH_type_l1_32_shadow: + case SH_type_fl1_32_shadow: + return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, 2) + (d, gmfn, smfn, off); + + case SH_type_l1_pae_shadow: + case SH_type_fl1_pae_shadow: + return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, 3) + (d, gmfn, smfn, off); + + case SH_type_l1_64_shadow: + case SH_type_fl1_64_shadow: + return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, 4) + (d, gmfn, smfn, off); + + default: + return 0; + } +} /* * Fixup arrays: We limit the maximum number of writable mappings to @@ -2001,34 +2025,6 @@ int sh_remove_write_access(struct domain *d, mfn_t gmfn, } #endif /* CONFIG_HVM */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) -static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, - mfn_t smfn, unsigned long off) -{ - struct page_info *sp = mfn_to_page(smfn); - - ASSERT(mfn_valid(smfn)); - ASSERT(mfn_valid(gmfn)); - - if ( sp->u.sh.type == SH_type_l1_32_shadow - || sp->u.sh.type == SH_type_fl1_32_shadow ) - { - return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,2) - (d, gmfn, smfn, off); - } - else if ( sp->u.sh.type == SH_type_l1_pae_shadow - || sp->u.sh.type == SH_type_fl1_pae_shadow ) - return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,3) - (d, gmfn, smfn, off); - else if ( sp->u.sh.type == SH_type_l1_64_shadow - || sp->u.sh.type == SH_type_fl1_64_shadow ) - return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,4) - (d, gmfn, smfn, off); - - return 0; -} -#endif - /**************************************************************************/ /* Remove all mappings of a guest frame from the shadow tables. * Returns non-zero if we need to flush TLBs. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 26 11:11:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 May 2020 11:11:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdXUB-0006Ww-La; Tue, 26 May 2020 11:11:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdXUA-0006Wr-3d for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 11:11:06 +0000 X-Inumbo-ID: 978ab786-9f41-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 978ab786-9f41-11ea-9947-bc764e2007e4; Tue, 26 May 2020 11:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TR/B8SHlPTzBlu5hBCEacsa41BqcJDbC5eiDn6QOQTg=; b=COrn7iJsgC/xNz75IFf51kEoyl TAI7whY4IX2UBPHPcirovfjfV6qX05Asq90q/nM68HV7DomuHgGCIRnw/WKZ20458jD7AJMPl3MDk wcr4OA3qjVYXPTKarQDghBg92OVPJRQLPTnLKlLBAsWnEn56yxNsxOtp8tCfBsE1axUY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdXU9-0000kN-4c for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 11:11:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdXU9-0002UQ-3U for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 11:11:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang: Add a minimum go version to go.mod Message-Id: Date: Tue, 26 May 2020 11:11:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 31af6cedd9e9cc8e1d70ca7e8ac6fad346d0b192 Author: George Dunlap AuthorDate: Tue May 26 12:01:26 2020 +0100 Commit: George Dunlap CommitDate: Tue May 26 12:01:26 2020 +0100 golang: Add a minimum go version to go.mod `go build` wants to add the current go version to go.mod as the minimum every time we run `make` in the directory. Add 1.11 (the earliest Go version that supports modules) there to make it happy. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- tools/golang/xenlight/go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/golang/xenlight/go.mod b/tools/golang/xenlight/go.mod index 926474d929..7dfbd758d1 100644 --- a/tools/golang/xenlight/go.mod +++ b/tools/golang/xenlight/go.mod @@ -1 +1,3 @@ module xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight + +go 1.11 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 26 11:11:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 May 2020 11:11:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdXUK-0006XO-Ni; Tue, 26 May 2020 11:11:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdXUJ-0006XI-QF for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 11:11:15 +0000 X-Inumbo-ID: 9d8bc90e-9f41-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9d8bc90e-9f41-11ea-8993-bc764e2007e4; Tue, 26 May 2020 11:11:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uLLqibc7kh2biwzWGDYN0G2XitW2k3pR7pmRLshEP/A=; b=YmEwDdIy7w1VTw8dPUrEVd5wC/ MaefXVjt/+1JLQHsJuNP63mdjMh9uZ6mQrDpkrbGaYGlZZ5HtPe+yxhXb3ZUkjSn33xqrQHvY5f6g SNPD5AuNaCYHkVbOGw2mIcMX+3z51kV8vW0cTUvfKQhVhbpd1uhn7uw8vlypllYLIEkg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdXUJ-0000kT-7c for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 11:11:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdXUJ-0002X2-6k for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 11:11:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang: Add a variable for the libxl source directory Message-Id: Date: Tue, 26 May 2020 11:11:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d9b29088603f8438160eb4852cedd85cb7c61a19 Author: George Dunlap AuthorDate: Tue May 26 12:01:27 2020 +0100 Commit: George Dunlap CommitDate: Tue May 26 12:01:27 2020 +0100 golang: Add a variable for the libxl source directory ...rather than duplicating the path in several places. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- tools/golang/xenlight/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 37ed1358c4..cd0a62505f 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -9,6 +9,8 @@ GOXL_INSTALL_DIR = $(GOCODE_DIR)$(GOXL_PKG_DIR) GO ?= go +LIBXL_SRC_DIR = ../../libxl + .PHONY: all all: build @@ -21,8 +23,8 @@ $(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go types.gen.go helpers. $(INSTALL_DATA) types.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) helpers.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) -%.gen.go: gengotypes.py $(XEN_ROOT)/tools/libxl/libxl_types.idl $(XEN_ROOT)/tools/libxl/idl.py - XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py ../../libxl/libxl_types.idl +%.gen.go: gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl $(LIBXL_SRC_DIR)/idl.py + XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl # Go will do its own dependency checking, and not actuall go through # with the build if none of the input files have changed. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 26 14:00:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 May 2020 14:00:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jda7j-0005YJ-H5; Tue, 26 May 2020 14:00:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jda7h-0005T4-O2 for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 14:00:05 +0000 X-Inumbo-ID: 331aaae6-9f59-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 331aaae6-9f59-11ea-81bc-bc764e2007e4; Tue, 26 May 2020 14:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=o3jal1wF6qxqv9p8ez8oNsxqkOFYFxN1E74CgZgsH/o=; b=hGsFTEUfajkPdSNZggoV0izjY+ 96BWfhx/iY8eyqGnJ92qHlO8CwppT3eCcRDZXm3IEuAdgJa+WyRdnGuONA7QlyBtBFTsEq13G9mZO SgkRW6wpWT5VlUXWGIudgrYAad4sduaeZiTiGgE+Xeg9dOAkQ5Pdn/4+y9iWARhHFnrg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jda7g-0004Ic-J1 for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 14:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jda7g-0005s8-Hw for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 14:00:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/ioemul: Rewrite stub generation to be shadow stack compatible Message-Id: Date: Tue, 26 May 2020 14:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d89e5e65f305740b2f7bd56e6f3b6c9c52ee0707 Author: Andrew Cooper AuthorDate: Mon Apr 27 13:19:21 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 26 14:33:06 2020 +0100 x86/ioemul: Rewrite stub generation to be shadow stack compatible The logic is completely undocumented and almost impossible to follow. It actually uses return oriented programming. Rewrite it to conform to more normal call mechanics, and leave a big comment explaining thing. As well as the code being easier to follow, it will execute faster as it isn't fighting the branch predictor. Move the ioemul_handle_quirk() function pointer from traps.c to ioport_emulate.c. There is no reason for it to be in neither of the two translation units which use it. Alter the behaviour to return the number of bytes written into the stub. Introduce a new nocall annotation using __attribute__((error)) to prohibit calls being made. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/ioport_emulate.c | 10 +++-- xen/arch/x86/pv/emul-priv-op.c | 97 ++++++++++++++++++++++++++++++++---------- xen/arch/x86/pv/gpr_switch.S | 44 ++++++++----------- xen/arch/x86/traps.c | 3 -- xen/include/asm-x86/io.h | 4 +- xen/include/xen/compiler.h | 2 + 6 files changed, 101 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/ioport_emulate.c b/xen/arch/x86/ioport_emulate.c index 499c1f6056..cf1f3f9229 100644 --- a/xen/arch/x86/ioport_emulate.c +++ b/xen/arch/x86/ioport_emulate.c @@ -8,7 +8,10 @@ #include #include -static bool ioemul_handle_proliant_quirk( +unsigned int (*__read_mostly ioemul_handle_quirk)( + uint8_t opcode, char *io_emul_stub, struct cpu_user_regs *regs); + +static unsigned int ioemul_handle_proliant_quirk( u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs) { static const char stub[] = { @@ -19,18 +22,17 @@ static bool ioemul_handle_proliant_quirk( 0xa8, 0x80, /* test $0x80, %al */ 0x75, 0xfb, /* jnz 1b */ 0x9d, /* popf */ - 0xc3, /* ret */ }; uint16_t port = regs->dx; uint8_t value = regs->al; if ( (opcode != 0xee) || (port != 0xcd4) || !(value & 0x80) ) - return false; + return 0; memcpy(io_emul_stub, stub, sizeof(stub)); BUILD_BUG_ON(IOEMUL_QUIRK_STUB_BYTES < sizeof(stub)); - return true; + return sizeof(stub); } /* This table is the set of system-specific I/O emulation hooks. */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 3b705299cf..fad6c754ad 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -47,51 +47,102 @@ struct priv_op_ctxt { unsigned int bpmatch; }; -/* I/O emulation support. Helper routines for, and type of, the stack stub. */ -void host_to_guest_gpr_switch(struct cpu_user_regs *); -unsigned long guest_to_host_gpr_switch(unsigned long); +/* I/O emulation helpers. Use non-standard calling conventions. */ +void nocall load_guest_gprs(struct cpu_user_regs *); +void nocall save_guest_gprs(void); typedef void io_emul_stub_t(struct cpu_user_regs *); static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, unsigned int port, unsigned int bytes) { + /* + * Construct a stub for IN/OUT emulation. + * + * Some platform drivers communicate with the SMM handler using GPRs as a + * mailbox. Therefore, we must perform the emulation with the hardware + * domain's registers in view. + * + * We write a stub of the following form, using the guest load/save + * helpers (non-standard ABI), and one of several possible stubs + * performing the real I/O. + */ + static const char prologue[] = { + 0x53, /* push %rbx */ + 0x55, /* push %rbp */ + 0x41, 0x54, /* push %r12 */ + 0x41, 0x55, /* push %r13 */ + 0x41, 0x56, /* push %r14 */ + 0x41, 0x57, /* push %r15 */ + 0x57, /* push %rdi (param for save_guest_gprs) */ + }; /* call load_guest_gprs */ + /* */ + /* call save_guest_gprs */ + static const char epilogue[] = { + 0x5f, /* pop %rdi */ + 0x41, 0x5f, /* pop %r15 */ + 0x41, 0x5e, /* pop %r14 */ + 0x41, 0x5d, /* pop %r13 */ + 0x41, 0x5c, /* pop %r12 */ + 0x5d, /* pop %rbp */ + 0x5b, /* pop %rbx */ + 0xc3, /* ret */ + }; + struct stubs *this_stubs = &this_cpu(stubs); unsigned long stub_va = this_stubs->addr + STUB_BUF_SIZE / 2; - long disp; - bool use_quirk_stub = false; + unsigned int quirk_bytes = 0; + char *p; + + /* Helpers - Read outer scope but only modify p. */ +#define APPEND_BUFF(b) ({ memcpy(p, b, sizeof(b)); p += sizeof(b); }) +#define APPEND_CALL(f) \ + ({ \ + long disp = (long)(f) - (stub_va + p - ctxt->io_emul_stub + 5); \ + BUG_ON((int32_t)disp != disp); \ + *p++ = 0xe8; \ + *(int32_t *)p = disp; p += 4; \ + }) if ( !ctxt->io_emul_stub ) ctxt->io_emul_stub = map_domain_page(_mfn(this_stubs->mfn)) + (stub_va & ~PAGE_MASK); - /* call host_to_guest_gpr_switch */ - ctxt->io_emul_stub[0] = 0xe8; - disp = (long)host_to_guest_gpr_switch - (stub_va + 5); - BUG_ON((int32_t)disp != disp); - *(int32_t *)&ctxt->io_emul_stub[1] = disp; + p = ctxt->io_emul_stub; + + APPEND_BUFF(prologue); + APPEND_CALL(load_guest_gprs); + /* Some platforms might need to quirk the stub for specific inputs. */ if ( unlikely(ioemul_handle_quirk) ) - use_quirk_stub = ioemul_handle_quirk(opcode, &ctxt->io_emul_stub[5], - ctxt->ctxt.regs); + { + quirk_bytes = ioemul_handle_quirk(opcode, p, ctxt->ctxt.regs); + p += quirk_bytes; + } - if ( !use_quirk_stub ) + /* Default I/O stub. */ + if ( likely(!quirk_bytes) ) { - /* data16 or nop */ - ctxt->io_emul_stub[5] = (bytes != 2) ? 0x90 : 0x66; - /* */ - ctxt->io_emul_stub[6] = opcode; - /* imm8 or nop */ - ctxt->io_emul_stub[7] = !(opcode & 8) ? port : 0x90; - /* ret (jumps to guest_to_host_gpr_switch) */ - ctxt->io_emul_stub[8] = 0xc3; + *p++ = (bytes != 2) ? 0x90 : 0x66; /* data16 or nop */ + *p++ = opcode; /* */ + *p++ = !(opcode & 8) ? port : 0x90; /* imm8 or nop */ } - BUILD_BUG_ON(STUB_BUF_SIZE / 2 < MAX(9, /* Default emul stub */ - 5 + IOEMUL_QUIRK_STUB_BYTES)); + APPEND_CALL(save_guest_gprs); + APPEND_BUFF(epilogue); + + /* Build-time best effort attempt to catch problems. */ + BUILD_BUG_ON(STUB_BUF_SIZE / 2 < + (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + /* Runtime confirmation that we haven't clobbered an adjacent stub. */ + BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); /* Handy function-typed pointer to the stub. */ return (void *)stub_va; + +#undef APPEND_CALL +#undef APPEND_BUFF } diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 6d26192c2c..e7f5bfcd2d 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -9,59 +9,49 @@ #include -ENTRY(host_to_guest_gpr_switch) - movq (%rsp), %rcx - movq %rdi, (%rsp) +/* Load guest GPRs. Parameter in %rdi, clobbers all registers. */ +ENTRY(load_guest_gprs) movq UREGS_rdx(%rdi), %rdx - pushq %rbx movq UREGS_rax(%rdi), %rax movq UREGS_rbx(%rdi), %rbx - pushq %rbp movq UREGS_rsi(%rdi), %rsi movq UREGS_rbp(%rdi), %rbp - pushq %r12 - movq UREGS_r8(%rdi), %r8 + movq UREGS_r8 (%rdi), %r8 movq UREGS_r12(%rdi), %r12 - pushq %r13 - movq UREGS_r9(%rdi), %r9 + movq UREGS_r9 (%rdi), %r9 movq UREGS_r13(%rdi), %r13 - pushq %r14 movq UREGS_r10(%rdi), %r10 movq UREGS_r14(%rdi), %r14 - pushq %r15 movq UREGS_r11(%rdi), %r11 movq UREGS_r15(%rdi), %r15 - pushq %rcx /* dummy push, filled by guest_to_host_gpr_switch pointer */ - pushq %rcx - leaq guest_to_host_gpr_switch(%rip),%rcx - movq %rcx,8(%rsp) movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi ret -ENTRY(guest_to_host_gpr_switch) + .size load_guest_gprs, . - load_guest_gprs + .type load_guest_gprs, STT_FUNC + + +/* Save guest GPRs. Parameter on the stack above the return address. */ +ENTRY(save_guest_gprs) pushq %rdi - movq 7*8(%rsp), %rdi + movq 2*8(%rsp), %rdi movq %rax, UREGS_rax(%rdi) - popq UREGS_rdi(%rdi) + popq UREGS_rdi(%rdi) movq %r15, UREGS_r15(%rdi) movq %r11, UREGS_r11(%rdi) - popq %r15 movq %r14, UREGS_r14(%rdi) movq %r10, UREGS_r10(%rdi) - popq %r14 movq %r13, UREGS_r13(%rdi) - movq %r9, UREGS_r9(%rdi) - popq %r13 + movq %r9, UREGS_r9 (%rdi) movq %r12, UREGS_r12(%rdi) - movq %r8, UREGS_r8(%rdi) - popq %r12 + movq %r8, UREGS_r8 (%rdi) movq %rbp, UREGS_rbp(%rdi) movq %rsi, UREGS_rsi(%rdi) - popq %rbp movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) - popq %rbx movq %rcx, UREGS_rcx(%rdi) - popq %rcx ret + + .size save_guest_gprs, . - save_guest_gprs + .type save_guest_gprs, STT_FUNC diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e8a0877344..a8300c214d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -118,9 +118,6 @@ idt_entry_t *idt_tables[NR_CPUS] __read_mostly; */ DEFINE_PER_CPU_PAGE_ALIGNED(struct tss_page, tss_page); -bool (*ioemul_handle_quirk)( - u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); - static int debug_stack_lines = 20; integer_param("debug_stack_lines", debug_stack_lines); diff --git a/xen/include/asm-x86/io.h b/xen/include/asm-x86/io.h index 8708b79b99..5afe68239d 100644 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -49,8 +49,8 @@ __OUT(w,"w",short) __OUT(l,,int) /* Function pointer used to handle platform specific I/O port emulation. */ -#define IOEMUL_QUIRK_STUB_BYTES 10 -extern bool (*ioemul_handle_quirk)( +#define IOEMUL_QUIRK_STUB_BYTES 9 +extern unsigned int (*ioemul_handle_quirk)( u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); #endif diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 8c846261d2..c22439b7a4 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -20,6 +20,8 @@ #define __weak __attribute__((__weak__)) +#define nocall __attribute__((error("Nonstandard ABI"))) + #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) #else -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue May 26 22:11:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 May 2020 22:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdhms-0007jZ-N2; Tue, 26 May 2020 22:11:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdhmq-0007jU-Oe for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 22:11:04 +0000 X-Inumbo-ID: c97da990-9f9d-11ea-a6c2-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c97da990-9f9d-11ea-a6c2-12813bfff9fa; Tue, 26 May 2020 22:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=r2g5FrP/ouXcG3jxS1ZE+mqpktFX/6nN8eUI0KXsVmg=; b=q/wJW1RjzrpFxfyGr9z3jxNvPk uiGR0t3cDbgQzfae+E/7lXNdSHjZN5sKE99Xc69uyMhhWW0i1Fk/nQtn6qpVnHm+IF6oONJt7cYhq nQNhHrRSLGyuHcDLZZ/oPDgYsCd/SdWfEEc2sLPo4fCjYI7WfpLF5r3SJ+eNBwfluxU0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdhmo-0006dp-LI for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 22:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdhmo-0003cn-KL for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 22:11:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] vmx: let opt_ept_ad always reflect the current setting Message-Id: Date: Tue, 26 May 2020 22:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b4d01ede23847bed9471ca0b7071394aef693a1a Author: Juergen Gross AuthorDate: Mon May 25 08:21:55 2020 +0200 Commit: Jan Beulich CommitDate: Mon May 25 08:21:55 2020 +0200 vmx: let opt_ept_ad always reflect the current setting In case opt_ept_ad has not been set explicitly by the user via command line or runtime parameter, it is treated as "no" on Avoton cpus. Change that handling by setting opt_ept_ad to 0 for this cpu type explicitly if no user value has been set. By putting this into the (renamed) boot time initialization of vmcs.c _vmx_cpu_up() can be made static. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmcs.c | 22 +++++++++++++++------- xen/arch/x86/hvm/vmx/vmx.c | 4 +--- xen/include/asm-x86/hvm/vmx/vmcs.h | 3 +-- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 4c23645454..221af9737a 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -315,10 +315,6 @@ static int vmx_init_vmcs_config(void) if ( !opt_ept_ad ) _vmx_ept_vpid_cap &= ~VMX_EPT_AD_BIT; - else if ( /* Work around Erratum AVR41 on Avoton processors. */ - boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x4d && - opt_ept_ad < 0 ) - _vmx_ept_vpid_cap &= ~VMX_EPT_AD_BIT; /* * Additional sanity checking before using EPT: @@ -652,7 +648,7 @@ void vmx_cpu_dead(unsigned int cpu) vmx_pi_desc_fixup(cpu); } -int _vmx_cpu_up(bool bsp) +static int _vmx_cpu_up(bool bsp) { u32 eax, edx; int rc, bios_locked, cpu = smp_processor_id(); @@ -2108,9 +2104,21 @@ static void vmcs_dump(unsigned char ch) printk("**************************************\n"); } -void __init setup_vmcs_dump(void) +int __init vmx_vmcs_init(void) { - register_keyhandler('v', vmcs_dump, "dump VT-x VMCSs", 1); + int ret; + + if ( opt_ept_ad < 0 ) + /* Work around Erratum AVR41 on Avoton processors. */ + opt_ept_ad = !(boot_cpu_data.x86 == 6 && + boot_cpu_data.x86_model == 0x4d); + + ret = _vmx_cpu_up(true); + + if ( !ret ) + register_keyhandler('v', vmcs_dump, "dump VT-x VMCSs", 1); + + return ret; } static void __init __maybe_unused build_assertions(void) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 6efa80e422..11a4dd94cf 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2482,7 +2482,7 @@ const struct hvm_function_table * __init start_vmx(void) { set_in_cr4(X86_CR4_VMXE); - if ( _vmx_cpu_up(true) ) + if ( vmx_vmcs_init() ) { printk("VMX: failed to initialise.\n"); return NULL; @@ -2553,8 +2553,6 @@ const struct hvm_function_table * __init start_vmx(void) vmx_function_table.get_guest_bndcfgs = vmx_get_guest_bndcfgs; } - setup_vmcs_dump(); - lbr_tsx_fixup_check(); bdf93_fixup_check(); diff --git a/xen/include/asm-x86/hvm/vmx/vmcs.h b/xen/include/asm-x86/hvm/vmx/vmcs.h index 95c1dea7b8..906810592f 100644 --- a/xen/include/asm-x86/hvm/vmx/vmcs.h +++ b/xen/include/asm-x86/hvm/vmx/vmcs.h @@ -21,11 +21,10 @@ #include extern void vmcs_dump_vcpu(struct vcpu *v); -extern void setup_vmcs_dump(void); +extern int vmx_vmcs_init(void); extern int vmx_cpu_up_prepare(unsigned int cpu); extern void vmx_cpu_dead(unsigned int cpu); extern int vmx_cpu_up(void); -extern int _vmx_cpu_up(bool bsp); extern void vmx_cpu_down(void); struct vmcs_struct { -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Tue May 26 22:11:15 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 26 May 2020 22:11:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdhn1-0007kA-Of; Tue, 26 May 2020 22:11:15 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdhn0-0007k1-5k for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 22:11:14 +0000 X-Inumbo-ID: cf84ee20-9f9d-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cf84ee20-9f9d-11ea-81bc-bc764e2007e4; Tue, 26 May 2020 22:11:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=N3ssFoy2pwjSJ/qNGQxq2EYIX94dyDCoz3+d304jk90=; b=SPRL9XwDV8h4ar3nIZiuPjDWdR wLW1X1b+BJ8gL9TEenXhXtebY8eb24HtRMqc+F6jb67b04A0sZGIB53o6kwZ/ya1HQcr8UGfXKxKH fpY8R50BcUZlnmQ8FSZG9dBRNC+uDiTa3A05r4kQ2T5WhGks18SllAL24HVZ7gXTyp8I=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdhmy-0006ds-Ol for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 22:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdhmy-0003fH-Nd for xen-changelog@lists.xenproject.org; Tue, 26 May 2020 22:11:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/shadow: Reposition sh_remove_write_access_from_sl1p() Message-Id: Date: Tue, 26 May 2020 22:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 354e8318d5a9b6f32fbd3c01d1a9f1970007010b Author: Andrew Cooper AuthorDate: Thu May 21 09:45:27 2020 +0100 Commit: Andrew Cooper CommitDate: Mon May 25 16:37:48 2020 +0100 x86/shadow: Reposition sh_remove_write_access_from_sl1p() When compiling with SHOPT_OUT_OF_SYNC disabled, the build fails with: common.c:41:12: error: ‘sh_remove_write_access_from_sl1p’ declared ‘static’ but never defined [-Werror=unused-function] static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ due to an unguarded forward declaration. It turns out there is no need to forward declare sh_remove_write_access_from_sl1p() to begin with, so move it to just ahead of its first user, which is within a larger #ifdef'd SHOPT_OUT_OF_SYNC block. Fix up for style while moving it. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Reviewed-by: Tim Deegan --- xen/arch/x86/mm/shadow/common.c | 58 +++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 0ac3f880e1..5fcb04ce8b 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -38,9 +38,6 @@ #include #include "private.h" -static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, - mfn_t smfn, unsigned long offset); - DEFINE_PER_CPU(uint32_t,trace_shadow_path_flags); static int sh_enable_log_dirty(struct domain *, bool log_global); @@ -252,6 +249,33 @@ static inline void _sh_resync_l1(struct vcpu *v, mfn_t gmfn, mfn_t snpmfn) SHADOW_INTERNAL_NAME(sh_resync_l1, 4)(v, gmfn, snpmfn); } +static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, + mfn_t smfn, unsigned long off) +{ + ASSERT(mfn_valid(smfn)); + ASSERT(mfn_valid(gmfn)); + + switch ( mfn_to_page(smfn)->u.sh.type ) + { + case SH_type_l1_32_shadow: + case SH_type_fl1_32_shadow: + return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, 2) + (d, gmfn, smfn, off); + + case SH_type_l1_pae_shadow: + case SH_type_fl1_pae_shadow: + return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, 3) + (d, gmfn, smfn, off); + + case SH_type_l1_64_shadow: + case SH_type_fl1_64_shadow: + return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p, 4) + (d, gmfn, smfn, off); + + default: + return 0; + } +} /* * Fixup arrays: We limit the maximum number of writable mappings to @@ -2001,34 +2025,6 @@ int sh_remove_write_access(struct domain *d, mfn_t gmfn, } #endif /* CONFIG_HVM */ -#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC) -static int sh_remove_write_access_from_sl1p(struct domain *d, mfn_t gmfn, - mfn_t smfn, unsigned long off) -{ - struct page_info *sp = mfn_to_page(smfn); - - ASSERT(mfn_valid(smfn)); - ASSERT(mfn_valid(gmfn)); - - if ( sp->u.sh.type == SH_type_l1_32_shadow - || sp->u.sh.type == SH_type_fl1_32_shadow ) - { - return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,2) - (d, gmfn, smfn, off); - } - else if ( sp->u.sh.type == SH_type_l1_pae_shadow - || sp->u.sh.type == SH_type_fl1_pae_shadow ) - return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,3) - (d, gmfn, smfn, off); - else if ( sp->u.sh.type == SH_type_l1_64_shadow - || sp->u.sh.type == SH_type_fl1_64_shadow ) - return SHADOW_INTERNAL_NAME(sh_rm_write_access_from_sl1p,4) - (d, gmfn, smfn, off); - - return 0; -} -#endif - /**************************************************************************/ /* Remove all mappings of a guest frame from the shadow tables. * Returns non-zero if we need to flush TLBs. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 27 06:33:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2020 06:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpce-0001i1-9c; Wed, 27 May 2020 06:33:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpcc-0001hw-Se for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:03 +0000 X-Inumbo-ID: ea064564-9fe3-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ea064564-9fe3-11ea-9dbe-bc764e2007e4; Wed, 27 May 2020 06:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=JMMG8HX0CddIOsWCuEMEdBz+uXg/HRO3zg/oVj+bdVU=; b=g8Jvsym0A9LqLBrabDxa9mzsuG FR7d+EnbeKPohupH1JN2t3N1614fA72xe96N9Jm2SsSr/sMkdDlOYycxWjueuVemapjE+F0oBzMSA xLqIT5PB+qwcpD1MLjzGGUhLOK2H/7l1BeALqh2fMrDuStPPhiLoXgwBVJogxniTreaA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpcc-00031B-0D for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdpcb-0003N2-VR for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang: Add a minimum go version to go.mod Message-Id: Date: Wed, 27 May 2020 06:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 31af6cedd9e9cc8e1d70ca7e8ac6fad346d0b192 Author: George Dunlap AuthorDate: Tue May 26 12:01:26 2020 +0100 Commit: George Dunlap CommitDate: Tue May 26 12:01:26 2020 +0100 golang: Add a minimum go version to go.mod `go build` wants to add the current go version to go.mod as the minimum every time we run `make` in the directory. Add 1.11 (the earliest Go version that supports modules) there to make it happy. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- tools/golang/xenlight/go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/golang/xenlight/go.mod b/tools/golang/xenlight/go.mod index 926474d929..7dfbd758d1 100644 --- a/tools/golang/xenlight/go.mod +++ b/tools/golang/xenlight/go.mod @@ -1 +1,3 @@ module xenbits.xenproject.org/git-http/xen.git/tools/golang/xenlight + +go 1.11 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 27 06:33:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2020 06:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpco-0001jP-CV; Wed, 27 May 2020 06:33:14 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpcn-0001jK-Bv for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:13 +0000 X-Inumbo-ID: f00c57e6-9fe3-11ea-a6f6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f00c57e6-9fe3-11ea-a6f6-12813bfff9fa; Wed, 27 May 2020 06:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=i2VDgML+KRS8IK68f31/4W/OknQ8RF7s4BYZuOqmbkg=; b=Z9HCpW38DKrGzjVg9zPBrw1Qdr AWOFJJmh/IqXyHIatJqcHadAV3bjFBPJzRHzp+ta1AVl3sMflcecgFO5WJJ2VBw7Sk8UUEVxXaqQ5 OdY4ZxuawM/e22Wwb058ypUyQmPs51E8z8ohUGeUcZgGzCTs/zlyGfQk9Ca2QWFUudJQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpcm-00031E-3E for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdpcm-0003Nk-2E for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang: Add a variable for the libxl source directory Message-Id: Date: Wed, 27 May 2020 06:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d9b29088603f8438160eb4852cedd85cb7c61a19 Author: George Dunlap AuthorDate: Tue May 26 12:01:27 2020 +0100 Commit: George Dunlap CommitDate: Tue May 26 12:01:27 2020 +0100 golang: Add a variable for the libxl source directory ...rather than duplicating the path in several places. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- tools/golang/xenlight/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 37ed1358c4..cd0a62505f 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -9,6 +9,8 @@ GOXL_INSTALL_DIR = $(GOCODE_DIR)$(GOXL_PKG_DIR) GO ?= go +LIBXL_SRC_DIR = ../../libxl + .PHONY: all all: build @@ -21,8 +23,8 @@ $(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go types.gen.go helpers. $(INSTALL_DATA) types.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) helpers.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) -%.gen.go: gengotypes.py $(XEN_ROOT)/tools/libxl/libxl_types.idl $(XEN_ROOT)/tools/libxl/idl.py - XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py ../../libxl/libxl_types.idl +%.gen.go: gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl $(LIBXL_SRC_DIR)/idl.py + XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl # Go will do its own dependency checking, and not actuall go through # with the build if none of the input files have changed. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 27 06:33:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2020 06:33:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpcy-0001kW-E8; Wed, 27 May 2020 06:33:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpcx-0001kI-8e for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:23 +0000 X-Inumbo-ID: f60ca09c-9fe3-11ea-a6f6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f60ca09c-9fe3-11ea-a6f6-12813bfff9fa; Wed, 27 May 2020 06:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=VqpYVf1lp+5iQWlb3GaUjOaj6Njix/a1A58w3CrWkRA=; b=aomGh4W/b5/Wjr0FLwPEucwoJH lMBAVRyyr8PV73fH9hWNLOr9Sfrly/2j347ZcDYU2NIW7EKAv4yM2m/ImbHH2detMx2H1GNjDI+xt YWetYkvQbXDTJnPbmuXMsvNrwku80EomG/AH3fX8nZPiOHRkcv/S3D8yR2K73rnc9zzE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdpcw-00031Q-6N for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdpcw-0003OP-5N for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 06:33:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/ioemul: Rewrite stub generation to be shadow stack compatible Message-Id: Date: Wed, 27 May 2020 06:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d89e5e65f305740b2f7bd56e6f3b6c9c52ee0707 Author: Andrew Cooper AuthorDate: Mon Apr 27 13:19:21 2020 +0100 Commit: Andrew Cooper CommitDate: Tue May 26 14:33:06 2020 +0100 x86/ioemul: Rewrite stub generation to be shadow stack compatible The logic is completely undocumented and almost impossible to follow. It actually uses return oriented programming. Rewrite it to conform to more normal call mechanics, and leave a big comment explaining thing. As well as the code being easier to follow, it will execute faster as it isn't fighting the branch predictor. Move the ioemul_handle_quirk() function pointer from traps.c to ioport_emulate.c. There is no reason for it to be in neither of the two translation units which use it. Alter the behaviour to return the number of bytes written into the stub. Introduce a new nocall annotation using __attribute__((error)) to prohibit calls being made. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/ioport_emulate.c | 10 +++-- xen/arch/x86/pv/emul-priv-op.c | 97 ++++++++++++++++++++++++++++++++---------- xen/arch/x86/pv/gpr_switch.S | 44 ++++++++----------- xen/arch/x86/traps.c | 3 -- xen/include/asm-x86/io.h | 4 +- xen/include/xen/compiler.h | 2 + 6 files changed, 101 insertions(+), 59 deletions(-) diff --git a/xen/arch/x86/ioport_emulate.c b/xen/arch/x86/ioport_emulate.c index 499c1f6056..cf1f3f9229 100644 --- a/xen/arch/x86/ioport_emulate.c +++ b/xen/arch/x86/ioport_emulate.c @@ -8,7 +8,10 @@ #include #include -static bool ioemul_handle_proliant_quirk( +unsigned int (*__read_mostly ioemul_handle_quirk)( + uint8_t opcode, char *io_emul_stub, struct cpu_user_regs *regs); + +static unsigned int ioemul_handle_proliant_quirk( u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs) { static const char stub[] = { @@ -19,18 +22,17 @@ static bool ioemul_handle_proliant_quirk( 0xa8, 0x80, /* test $0x80, %al */ 0x75, 0xfb, /* jnz 1b */ 0x9d, /* popf */ - 0xc3, /* ret */ }; uint16_t port = regs->dx; uint8_t value = regs->al; if ( (opcode != 0xee) || (port != 0xcd4) || !(value & 0x80) ) - return false; + return 0; memcpy(io_emul_stub, stub, sizeof(stub)); BUILD_BUG_ON(IOEMUL_QUIRK_STUB_BYTES < sizeof(stub)); - return true; + return sizeof(stub); } /* This table is the set of system-specific I/O emulation hooks. */ diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index 3b705299cf..fad6c754ad 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -47,51 +47,102 @@ struct priv_op_ctxt { unsigned int bpmatch; }; -/* I/O emulation support. Helper routines for, and type of, the stack stub. */ -void host_to_guest_gpr_switch(struct cpu_user_regs *); -unsigned long guest_to_host_gpr_switch(unsigned long); +/* I/O emulation helpers. Use non-standard calling conventions. */ +void nocall load_guest_gprs(struct cpu_user_regs *); +void nocall save_guest_gprs(void); typedef void io_emul_stub_t(struct cpu_user_regs *); static io_emul_stub_t *io_emul_stub_setup(struct priv_op_ctxt *ctxt, u8 opcode, unsigned int port, unsigned int bytes) { + /* + * Construct a stub for IN/OUT emulation. + * + * Some platform drivers communicate with the SMM handler using GPRs as a + * mailbox. Therefore, we must perform the emulation with the hardware + * domain's registers in view. + * + * We write a stub of the following form, using the guest load/save + * helpers (non-standard ABI), and one of several possible stubs + * performing the real I/O. + */ + static const char prologue[] = { + 0x53, /* push %rbx */ + 0x55, /* push %rbp */ + 0x41, 0x54, /* push %r12 */ + 0x41, 0x55, /* push %r13 */ + 0x41, 0x56, /* push %r14 */ + 0x41, 0x57, /* push %r15 */ + 0x57, /* push %rdi (param for save_guest_gprs) */ + }; /* call load_guest_gprs */ + /* */ + /* call save_guest_gprs */ + static const char epilogue[] = { + 0x5f, /* pop %rdi */ + 0x41, 0x5f, /* pop %r15 */ + 0x41, 0x5e, /* pop %r14 */ + 0x41, 0x5d, /* pop %r13 */ + 0x41, 0x5c, /* pop %r12 */ + 0x5d, /* pop %rbp */ + 0x5b, /* pop %rbx */ + 0xc3, /* ret */ + }; + struct stubs *this_stubs = &this_cpu(stubs); unsigned long stub_va = this_stubs->addr + STUB_BUF_SIZE / 2; - long disp; - bool use_quirk_stub = false; + unsigned int quirk_bytes = 0; + char *p; + + /* Helpers - Read outer scope but only modify p. */ +#define APPEND_BUFF(b) ({ memcpy(p, b, sizeof(b)); p += sizeof(b); }) +#define APPEND_CALL(f) \ + ({ \ + long disp = (long)(f) - (stub_va + p - ctxt->io_emul_stub + 5); \ + BUG_ON((int32_t)disp != disp); \ + *p++ = 0xe8; \ + *(int32_t *)p = disp; p += 4; \ + }) if ( !ctxt->io_emul_stub ) ctxt->io_emul_stub = map_domain_page(_mfn(this_stubs->mfn)) + (stub_va & ~PAGE_MASK); - /* call host_to_guest_gpr_switch */ - ctxt->io_emul_stub[0] = 0xe8; - disp = (long)host_to_guest_gpr_switch - (stub_va + 5); - BUG_ON((int32_t)disp != disp); - *(int32_t *)&ctxt->io_emul_stub[1] = disp; + p = ctxt->io_emul_stub; + + APPEND_BUFF(prologue); + APPEND_CALL(load_guest_gprs); + /* Some platforms might need to quirk the stub for specific inputs. */ if ( unlikely(ioemul_handle_quirk) ) - use_quirk_stub = ioemul_handle_quirk(opcode, &ctxt->io_emul_stub[5], - ctxt->ctxt.regs); + { + quirk_bytes = ioemul_handle_quirk(opcode, p, ctxt->ctxt.regs); + p += quirk_bytes; + } - if ( !use_quirk_stub ) + /* Default I/O stub. */ + if ( likely(!quirk_bytes) ) { - /* data16 or nop */ - ctxt->io_emul_stub[5] = (bytes != 2) ? 0x90 : 0x66; - /* */ - ctxt->io_emul_stub[6] = opcode; - /* imm8 or nop */ - ctxt->io_emul_stub[7] = !(opcode & 8) ? port : 0x90; - /* ret (jumps to guest_to_host_gpr_switch) */ - ctxt->io_emul_stub[8] = 0xc3; + *p++ = (bytes != 2) ? 0x90 : 0x66; /* data16 or nop */ + *p++ = opcode; /* */ + *p++ = !(opcode & 8) ? port : 0x90; /* imm8 or nop */ } - BUILD_BUG_ON(STUB_BUF_SIZE / 2 < MAX(9, /* Default emul stub */ - 5 + IOEMUL_QUIRK_STUB_BYTES)); + APPEND_CALL(save_guest_gprs); + APPEND_BUFF(epilogue); + + /* Build-time best effort attempt to catch problems. */ + BUILD_BUG_ON(STUB_BUF_SIZE / 2 < + (sizeof(prologue) + sizeof(epilogue) + 10 /* 2x call */ + + MAX(3 /* default stub */, IOEMUL_QUIRK_STUB_BYTES))); + /* Runtime confirmation that we haven't clobbered an adjacent stub. */ + BUG_ON(STUB_BUF_SIZE / 2 < (p - ctxt->io_emul_stub)); /* Handy function-typed pointer to the stub. */ return (void *)stub_va; + +#undef APPEND_CALL +#undef APPEND_BUFF } diff --git a/xen/arch/x86/pv/gpr_switch.S b/xen/arch/x86/pv/gpr_switch.S index 6d26192c2c..e7f5bfcd2d 100644 --- a/xen/arch/x86/pv/gpr_switch.S +++ b/xen/arch/x86/pv/gpr_switch.S @@ -9,59 +9,49 @@ #include -ENTRY(host_to_guest_gpr_switch) - movq (%rsp), %rcx - movq %rdi, (%rsp) +/* Load guest GPRs. Parameter in %rdi, clobbers all registers. */ +ENTRY(load_guest_gprs) movq UREGS_rdx(%rdi), %rdx - pushq %rbx movq UREGS_rax(%rdi), %rax movq UREGS_rbx(%rdi), %rbx - pushq %rbp movq UREGS_rsi(%rdi), %rsi movq UREGS_rbp(%rdi), %rbp - pushq %r12 - movq UREGS_r8(%rdi), %r8 + movq UREGS_r8 (%rdi), %r8 movq UREGS_r12(%rdi), %r12 - pushq %r13 - movq UREGS_r9(%rdi), %r9 + movq UREGS_r9 (%rdi), %r9 movq UREGS_r13(%rdi), %r13 - pushq %r14 movq UREGS_r10(%rdi), %r10 movq UREGS_r14(%rdi), %r14 - pushq %r15 movq UREGS_r11(%rdi), %r11 movq UREGS_r15(%rdi), %r15 - pushq %rcx /* dummy push, filled by guest_to_host_gpr_switch pointer */ - pushq %rcx - leaq guest_to_host_gpr_switch(%rip),%rcx - movq %rcx,8(%rsp) movq UREGS_rcx(%rdi), %rcx movq UREGS_rdi(%rdi), %rdi ret -ENTRY(guest_to_host_gpr_switch) + .size load_guest_gprs, . - load_guest_gprs + .type load_guest_gprs, STT_FUNC + + +/* Save guest GPRs. Parameter on the stack above the return address. */ +ENTRY(save_guest_gprs) pushq %rdi - movq 7*8(%rsp), %rdi + movq 2*8(%rsp), %rdi movq %rax, UREGS_rax(%rdi) - popq UREGS_rdi(%rdi) + popq UREGS_rdi(%rdi) movq %r15, UREGS_r15(%rdi) movq %r11, UREGS_r11(%rdi) - popq %r15 movq %r14, UREGS_r14(%rdi) movq %r10, UREGS_r10(%rdi) - popq %r14 movq %r13, UREGS_r13(%rdi) - movq %r9, UREGS_r9(%rdi) - popq %r13 + movq %r9, UREGS_r9 (%rdi) movq %r12, UREGS_r12(%rdi) - movq %r8, UREGS_r8(%rdi) - popq %r12 + movq %r8, UREGS_r8 (%rdi) movq %rbp, UREGS_rbp(%rdi) movq %rsi, UREGS_rsi(%rdi) - popq %rbp movq %rbx, UREGS_rbx(%rdi) movq %rdx, UREGS_rdx(%rdi) - popq %rbx movq %rcx, UREGS_rcx(%rdi) - popq %rcx ret + + .size save_guest_gprs, . - save_guest_gprs + .type save_guest_gprs, STT_FUNC diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index e8a0877344..a8300c214d 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -118,9 +118,6 @@ idt_entry_t *idt_tables[NR_CPUS] __read_mostly; */ DEFINE_PER_CPU_PAGE_ALIGNED(struct tss_page, tss_page); -bool (*ioemul_handle_quirk)( - u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); - static int debug_stack_lines = 20; integer_param("debug_stack_lines", debug_stack_lines); diff --git a/xen/include/asm-x86/io.h b/xen/include/asm-x86/io.h index 8708b79b99..5afe68239d 100644 --- a/xen/include/asm-x86/io.h +++ b/xen/include/asm-x86/io.h @@ -49,8 +49,8 @@ __OUT(w,"w",short) __OUT(l,,int) /* Function pointer used to handle platform specific I/O port emulation. */ -#define IOEMUL_QUIRK_STUB_BYTES 10 -extern bool (*ioemul_handle_quirk)( +#define IOEMUL_QUIRK_STUB_BYTES 9 +extern unsigned int (*ioemul_handle_quirk)( u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs); #endif diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 8c846261d2..c22439b7a4 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -20,6 +20,8 @@ #define __weak __attribute__((__weak__)) +#define nocall __attribute__((error("Nonstandard ABI"))) + #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) #else -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed May 27 07:55:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2020 07:55:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdqu3-0000AU-68; Wed, 27 May 2020 07:55:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdqu2-0000AO-FN for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 07:55:06 +0000 X-Inumbo-ID: 6022afb6-9fef-11ea-a709-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6022afb6-9fef-11ea-a709-12813bfff9fa; Wed, 27 May 2020 07:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=02iot3frzrW1bb+u2tZGD2sWgCQWNbpBleYjNzP0PxM=; b=GoOMlCZXJMG6fh6A6LPWHigj6X SXsaz4vhbO8I62N4DwyHZzpYWIn2af1We2NUM03CeFOIbmkJNiEkGxZNH5x5THsoXZ+9g84x+XkVo s9KDv0I9eeMQfrf6tUWxHPHFly10EZlDiU+6ohkZpCSP66/MshWFYahsyuON+kmK4byI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdqu0-0004it-HC for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 07:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdqu0-00018T-G7 for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 07:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: clear RDRAND CPUID bit on AMD family 15h/16h Message-Id: Date: Wed, 27 May 2020 07:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 93401e28a84b9dc5945f5d0bf5bce68e9d5ee121 Author: Jan Beulich AuthorDate: Wed May 27 09:49:37 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 27 09:49:37 2020 +0200 x86: clear RDRAND CPUID bit on AMD family 15h/16h Inspired by Linux commit c49a0a80137c7ca7d6ced4c812c9e07a949f6f24: There have been reports of RDRAND issues after resuming from suspend on some AMD family 15h and family 16h systems. This issue stems from a BIOS not performing the proper steps during resume to ensure RDRAND continues to function properly. Update the CPU initialization to clear the RDRAND CPUID bit for any family 15h and 16h processor that supports RDRAND. If it is known that the family 15h or family 16h system does not have an RDRAND resume issue or that the system will not be placed in suspend, the "cpuid=rdrand" kernel parameter can be used to stop the clearing of the RDRAND CPUID bit. Note, that clearing the RDRAND CPUID bit does not prevent a processor that normally supports the RDRAND instruction from executing it. So any code that determined the support based on family and model won't #UD. Warn if no explicit choice was given on affected hardware. Check RDRAND functions at boot as well as after S3 resume (the retry limit chosen is entirely arbitrary). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- docs/misc/xen-command-line.pandoc | 4 ++++ xen/arch/x86/cpu/amd.c | 21 +++++++++++++++++++++ xen/arch/x86/cpu/common.c | 27 +++++++++++++++++++++++++++ xen/arch/x86/cpuid.c | 3 +++ xen/include/asm-x86/processor.h | 1 + 5 files changed, 56 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index ee12b0f53f..e16bb90184 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -488,6 +488,10 @@ The Speculation Control hardware features `md-clear`, `ibrsb`, `stibp`, `ibpb`, be ignored, e.g. `no-ibrsb`, at which point Xen won't use them itself, and won't offer them to guests. +`rdrand` can be used to override the default disabling of the feature on certain +AMD systems. Its negative form can of course also be used to suppress use and +exposure of the feature. + ### cpuid_mask_cpu > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b` diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 05cbcbad73..0cc6853c42 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -747,6 +748,26 @@ static void init_amd(struct cpuinfo_x86 *c) if (acpi_smi_cmd && (acpi_enable_value | acpi_disable_value)) amd_acpi_c1e_quirk = true; break; + + case 0x15: case 0x16: + /* + * There are some Fam15/Fam16 systems where upon resume from S3 + * firmware fails to re-setup properly functioning RDRAND. + * By the time we can spot the problem, it is too late to take + * action, and there is nothing Xen can do to repair the problem. + * Clear the feature unless force-enabled on the command line. + */ + if (c == &boot_cpu_data && + cpu_has(c, X86_FEATURE_RDRAND) && + !is_forced_cpu_cap(X86_FEATURE_RDRAND)) { + static const char __initconst text[] = + "RDRAND may cease to work on this hardware upon resume from S3.\n" + "Please choose an explicit cpuid={no-}rdrand setting.\n"; + + setup_clear_cpu_cap(X86_FEATURE_RDRAND); + warning_add(text); + } + break; } display_cacheinfo(c); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 3e0d9cbe98..c413188d00 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include /* for XEN_INVALID_{SOCKET,CORE}_ID */ @@ -98,6 +99,11 @@ void __init setup_force_cpu_cap(unsigned int cap) __set_bit(cap, boot_cpu_data.x86_capability); } +bool __init is_forced_cpu_cap(unsigned int cap) +{ + return test_bit(cap, forced_caps); +} + static void default_init(struct cpuinfo_x86 * c) { /* Not much we can do here... */ @@ -497,6 +503,27 @@ void identify_cpu(struct cpuinfo_x86 *c) printk("\n"); #endif + /* + * If RDRAND is available, make an attempt to check that it actually + * (still) works. + */ + if (cpu_has(c, X86_FEATURE_RDRAND)) { + unsigned int prev = 0; + + for (i = 0; i < 5; ++i) + { + unsigned int cur = arch_get_random(); + + if (prev && cur != prev) + break; + prev = cur; + } + + if (i >= 5) + printk(XENLOG_WARNING "CPU%u: RDRAND appears to not work\n", + smp_processor_id()); + } + if (system_state == SYS_STATE_resume) return; diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 4b734284a4..ee11087626 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -72,6 +72,9 @@ static int __init parse_xen_cpuid(const char *s) { if ( !val ) setup_clear_cpu_cap(mid->bit); + else if ( mid->bit == X86_FEATURE_RDRAND && + (cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_RDRAND)) ) + setup_force_cpu_cap(X86_FEATURE_RDRAND); mid = NULL; } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 8f6f5a97dd..070691882b 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -165,6 +165,7 @@ extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id table[]); extern void identify_cpu(struct cpuinfo_x86 *); extern void setup_clear_cpu_cap(unsigned int); extern void setup_force_cpu_cap(unsigned int); +extern bool is_forced_cpu_cap(unsigned int); extern void print_cpu_info(unsigned int cpu); extern void init_intel_cacheinfo(struct cpuinfo_x86 *c); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 27 07:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2020 07:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdquC-0000Bt-7c; Wed, 27 May 2020 07:55:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdquB-0000Bf-L2 for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 07:55:15 +0000 X-Inumbo-ID: 6614bc98-9fef-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6614bc98-9fef-11ea-8993-bc764e2007e4; Wed, 27 May 2020 07:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xeMKfJM1irwCIl0k953njdAzodvY4NvIbezOMpO0+QE=; b=46gDYIQA4x5KplcU3E83Ybpds2 QVEs/kcYWoeCv4fRhglbAIN4s08jjvxw8PwkN9oq69aNYcS1Y7pEuZVUfpWb98MvLOLIBXwbyyWXz /n6+4QaATmmQEZ3U1yDMbGuVqfCFUwSj54lgBd33uQ3ck8VTGUkp+ox2QfYdJrB/lJKU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdquA-0004ix-KN for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 07:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdquA-00019B-JO for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 07:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mem_sharing: gate enabling on cpu_has_vmx Message-Id: Date: Wed, 27 May 2020 07:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b66e28226dd9df8a28101438f44c0a26d63b76fa Author: Tamas K Lengyel AuthorDate: Wed May 27 09:50:55 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 27 09:50:55 2020 +0200 x86/mem_sharing: gate enabling on cpu_has_vmx It is unclear whether mem_sharing was ever made to work on other architectures but at this time the only verified platform for it is vmx. No plans to support or maintain it on other architectures. Make this explicit by checking during initialization. Signed-off-by: Tamas K Lengyel Reviewed-by: Wei Liu --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 7271e5c90b..19922ab5d1 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1444,7 +1444,7 @@ static inline int mem_sharing_control(struct domain *d, bool enable, { if ( enable ) { - if ( unlikely(!is_hvm_domain(d)) ) + if ( unlikely(!is_hvm_domain(d) || !cpu_has_vmx) ) return -EOPNOTSUPP; if ( unlikely(!hap_enabled(d)) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 27 15:55:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2020 15:55:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdyOY-0002Vd-Bd; Wed, 27 May 2020 15:55:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdyOX-0002VY-QU for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 15:55:05 +0000 X-Inumbo-ID: 6e30afd4-a032-11ea-a762-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 6e30afd4-a032-11ea-a762-12813bfff9fa; Wed, 27 May 2020 15:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NYqXBjoefhvb99tqGjgs6d7R4bpe9130ZSwya6vq6Y0=; b=BTH9K9l0/YEXd7fCVENRMF9Sw4 JScez1Tgd0TAMw/WnVc3SHBaKRy4UD27aBOrJG1acexAgOm0Kmss0QGalyepcd4h3RCGKktWYkyNW /gCTfEPQIQ3ibZf0krQrOveUxJFDGNEX1LjN7fnx5OqzLFqULC901vyP1v3fwLDhvMqs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jdyOW-0006xG-FT for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jdyOW-0005EF-Ec for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 15:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/boot: Fix load_system_tables() to be NMI/#MC-safe Message-Id: Date: Wed, 27 May 2020 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9f3e9139fa6c3d620eb08dff927518fc88200b8d Author: Andrew Cooper AuthorDate: Wed May 27 13:48:45 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 27 16:44:04 2020 +0100 x86/boot: Fix load_system_tables() to be NMI/#MC-safe During boot, load_system_tables() is used in reinit_bsp_stack() to switch the virtual addresses used from their .data/.bss alias, to their directmap alias. The structure assignment is implemented as a memset() to zero first, then a copy-in of the new data. This causes the NMI/#MC stack pointers to transiently become 0, at a point where we may have an NMI watchdog running. Rewrite the logic using a volatile tss pointer (equivalent to, but more readable than, using ACCESS_ONCE() for all writes). This does drop the zeroing side effect for holes in the structure, but the backing memory for the TSS is fully zeroed anyway, and architecturally, they are all reserved. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 49 ++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index c413188d00..09b911b3ba 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -730,11 +730,12 @@ static cpumask_t cpu_initialized; */ void load_system_tables(void) { - unsigned int cpu = smp_processor_id(); + unsigned int i, cpu = smp_processor_id(); unsigned long stack_bottom = get_stack_bottom(), stack_top = stack_bottom & ~(STACK_SIZE - 1); - struct tss64 *tss = &this_cpu(tss_page).tss; + /* The TSS may be live. Disuade any clever optimisations. */ + volatile struct tss64 *tss = &this_cpu(tss_page).tss; seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; @@ -747,30 +748,26 @@ void load_system_tables(void) .limit = (IDT_ENTRIES * sizeof(idt_entry_t)) - 1, }; - *tss = (struct tss64){ - /* Main stack for interrupts/exceptions. */ - .rsp0 = stack_bottom, - - /* Ring 1 and 2 stacks poisoned. */ - .rsp1 = 0x8600111111111111ul, - .rsp2 = 0x8600111111111111ul, - - /* - * MCE, NMI and Double Fault handlers get their own stacks. - * All others poisoned. - */ - .ist = { - [IST_MCE - 1] = stack_top + IST_MCE * PAGE_SIZE, - [IST_DF - 1] = stack_top + IST_DF * PAGE_SIZE, - [IST_NMI - 1] = stack_top + IST_NMI * PAGE_SIZE, - [IST_DB - 1] = stack_top + IST_DB * PAGE_SIZE, - - [IST_MAX ... ARRAY_SIZE(tss->ist) - 1] = - 0x8600111111111111ul, - }, - - .bitmap = IOBMP_INVALID_OFFSET, - }; + /* + * Set up the TSS. Warning - may be live, and the NMI/#MC must remain + * valid on every instruction boundary. (Note: these are all + * semantically ACCESS_ONCE() due to tss's volatile qualifier.) + * + * rsp0 refers to the primary stack. #MC, #DF, NMI and #DB handlers + * each get their own stacks. No IO Bitmap. + */ + tss->rsp0 = stack_bottom; + tss->ist[IST_MCE - 1] = stack_top + IST_MCE * PAGE_SIZE; + tss->ist[IST_DF - 1] = stack_top + IST_DF * PAGE_SIZE; + tss->ist[IST_NMI - 1] = stack_top + IST_NMI * PAGE_SIZE; + tss->ist[IST_DB - 1] = stack_top + IST_DB * PAGE_SIZE; + tss->bitmap = IOBMP_INVALID_OFFSET; + + /* All other stack pointers poisioned. */ + for ( i = IST_MAX; i < ARRAY_SIZE(tss->ist); ++i ) + tss->ist[i] = 0x8600111111111111ul; + tss->rsp1 = 0x8600111111111111ul; + tss->rsp2 = 0x8600111111111111ul; BUILD_BUG_ON(sizeof(*tss) <= 0x67); /* Mandated by the architecture. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed May 27 20:33:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 27 May 2020 20:33:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1je2ja-0003Vb-GV; Wed, 27 May 2020 20:33:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1je2jZ-0003VW-Rw for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 20:33:05 +0000 X-Inumbo-ID: 4490798a-a059-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4490798a-a059-11ea-9dbe-bc764e2007e4; Wed, 27 May 2020 20:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EETfbKd6u5gckMjgcsfl1SDfW0GCsnBUosj7t6a2X0g=; b=dSNwvvyySDGveL7mYrEavrVl+T bOLop8NuyviiYeJXaublMlduLkE4U37RmXsPATJMHR9hPr6D/K1SGg5r8UwSLq+8UHLDtzVpyB/n8 oERMAWWiannuvOZ7UJnELe3vRV/iKdBCd863c/S/UE9VXIRRw+Zg9mRP/P/7J687fLQk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1je2jZ-00051q-0P for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 20:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1je2jY-0007yp-Vj for xen-changelog@lists.xenproject.org; Wed, 27 May 2020 20:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: call iomem_permit_access for passthrough devices Message-Id: Date: Wed, 27 May 2020 20:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6b75c7a95420acbb9c118624ff0a5e973287c1e4 Author: Stefano Stabellini AuthorDate: Tue Apr 14 18:02:55 2020 -0700 Commit: Stefano Stabellini CommitDate: Wed May 27 13:21:22 2020 -0700 xen/arm: call iomem_permit_access for passthrough devices iomem_permit_access should be called for MMIO regions of devices assigned to a domain. Currently it is not called for MMIO regions of passthrough devices of Dom0less guests. This patch fixes it. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 3d7a75c318..e824ba34b0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1804,6 +1804,17 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, return -EINVAL; } + res = iomem_permit_access(kinfo->d, paddr_to_pfn(mstart), + paddr_to_pfn(PAGE_ALIGN(mstart + size - 1))); + if ( res ) + { + printk(XENLOG_ERR "Unable to permit to dom%d access to" + " 0x%"PRIx64" - 0x%"PRIx64"\n", + kinfo->d->domain_id, + mstart & PAGE_MASK, PAGE_ALIGN(mstart + size) - 1); + return res; + } + res = map_regions_p2mt(kinfo->d, gaddr_to_gfn(gstart), PFN_DOWN(size), -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 10:11:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 10:11:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeFVD-0008Oa-8M; Thu, 28 May 2020 10:11:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeFVC-0008OV-FE for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 10:11:06 +0000 X-Inumbo-ID: 8a40024e-a0cb-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8a40024e-a0cb-11ea-8993-bc764e2007e4; Thu, 28 May 2020 10:11:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zRfuMnSJTWop7NOBebVrPFUUUstqgI62jYTEANwKv8E=; b=NjcesBWuk9xHP1VpE+OiItCMRG LPOqwqGCBEwgphLiHd41yeACTo22HU+Rj6qSSNIi9pjCL9nhdWjK18xyFjy5Z3gNAZWRO3e66zD+q XUQ6AdmjcYpOp9gNRlppogDaxOtheWGCosV/oSeh2F1B7BKZMlUaLGjSsDzL47aUb4iA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeFVA-00006F-Ij for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 10:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeFVA-0001d6-HM for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 10:11:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: relax LDT check in arch_set_info_guest() Message-Id: Date: Thu, 28 May 2020 10:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cb8a478e1d246c1273e457d9c48d4609416c82e5 Author: Jan Beulich AuthorDate: Thu May 28 12:00:24 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:00:24 2020 +0200 x86: relax LDT check in arch_set_info_guest() It is wrong for us to check the base address when there's no LDT in the first place. Once we don't do this check anymore we can also set the base address to a non-canonical value when the LDT is empty. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/domain.c | 7 +++++-- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/mm.c | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6327ba0790..fee6c3931a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -967,8 +967,10 @@ int arch_set_info_guest( if ( !compat && !(flags & VGCF_in_kernel) && !c.nat->ctrlreg[1] ) return -EINVAL; - v->arch.pv.ldt_base = c(ldt_base); v->arch.pv.ldt_ents = c(ldt_ents); + v->arch.pv.ldt_base = v->arch.pv.ldt_ents + ? c(ldt_base) + : (unsigned long)ZERO_BLOCK_PTR; } else { @@ -997,8 +999,9 @@ int arch_set_info_guest( for ( i = 0; !fail && i < nr_gdt_frames; ++i ) fail = v->arch.pv.gdt_frames[i] != c(gdt_frames[i]); - fail |= v->arch.pv.ldt_base != c(ldt_base); fail |= v->arch.pv.ldt_ents != c(ldt_ents); + if ( v->arch.pv.ldt_ents ) + fail |= v->arch.pv.ldt_base != c(ldt_base); if ( fail ) return -EOPNOTSUPP; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 8c55db2f69..6f2c69788d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1583,7 +1583,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) } else { - c(ldt_base = v->arch.pv.ldt_base); + c(ldt_base = v->arch.pv.ldt_ents ? v->arch.pv.ldt_base : 0); c(ldt_ents = v->arch.pv.ldt_ents); for ( i = 0; i < ARRAY_SIZE(v->arch.pv.gdt_frames); ++i ) c(gdt_frames[i] = v->arch.pv.gdt_frames[i]); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e42044eb74..54980b4eb1 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3669,14 +3669,15 @@ long do_mmuext_op( case MMUEXT_SET_LDT: { unsigned int ents = op.arg2.nr_ents; - unsigned long ptr = ents ? op.arg1.linear_addr : 0; + unsigned long ptr = ents ? op.arg1.linear_addr + : (unsigned long)ZERO_BLOCK_PTR; if ( unlikely(currd != pg_owner) ) rc = -EPERM; else if ( paging_mode_external(currd) ) rc = -EINVAL; - else if ( ((ptr & (PAGE_SIZE - 1)) != 0) || !__addr_ok(ptr) || - (ents > 8192) ) + else if ( (ents > 8192) || + (ents && ((ptr & (PAGE_SIZE - 1)) || !__addr_ok(ptr))) ) { gdprintk(XENLOG_WARNING, "Bad args to SET_LDT: ptr=%lx, ents=%x\n", ptr, ents); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 10:11:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 10:11:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeFVO-0008P6-A6; Thu, 28 May 2020 10:11:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeFVN-0008P0-Jm for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 10:11:17 +0000 X-Inumbo-ID: 904a6fbc-a0cb-11ea-a7ac-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 904a6fbc-a0cb-11ea-a7ac-12813bfff9fa; Thu, 28 May 2020 10:11:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=fmGQMNJNIB5ZVEHtr8SKmS4UGG4Mw4VP4hZXwsjKz7E=; b=iFF8NBWMtEbokbTn0YGLejyCQc RYA/0iVWEysjqt4+ABAtyWP4qSxbGqG0ohu9HS5dx6NSAWI8h23MpOLRCyQFUj08NPh0/656DocG8 H4F69vZ7UeRwyOBzL8MRL+JpSn5+rEDW8Sv7G69RCZQTohK8TD+1aOhd8o+MpCIxrLdI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeFVK-00006L-Mn for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 10:11:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeFVK-0001fd-L2 for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 10:11:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] VT-x: extend LBR Broadwell errata coverage Message-Id: Date: Thu, 28 May 2020 10:11:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 724913de8ac8426d313a4645741d86c1169ae406 Author: Jan Beulich AuthorDate: Thu May 28 12:03:25 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:03:25 2020 +0200 VT-x: extend LBR Broadwell errata coverage For lbr_tsx_fixup_check() simply name a few more specific erratum numbers. For bdf93_fixup_check(), however, more models are affected. Oddly enough despite being the same model and stepping, the erratum is listed for Xeon E3 but not its Core counterpart. Apply the workaround uniformly, and also for Xeon D, which only has the LBR-from one listed in its spec update. Seeing this broader applicability, rename anything BDF93-related to more generic names. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 52 ++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 11a4dd94cf..b7d0c58214 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2380,7 +2380,7 @@ static void pi_notification_interrupt(struct cpu_user_regs *regs) } static void __init lbr_tsx_fixup_check(void); -static void __init bdf93_fixup_check(void); +static void __init ler_to_fixup_check(void); /* * Calculate whether the CPU is vulnerable to Instruction Fetch page @@ -2554,7 +2554,7 @@ const struct hvm_function_table * __init start_vmx(void) } lbr_tsx_fixup_check(); - bdf93_fixup_check(); + ler_to_fixup_check(); return &vmx_function_table; } @@ -2832,11 +2832,11 @@ enum #define LBR_MSRS_INSERTED (1u << 0) #define LBR_FIXUP_TSX (1u << 1) -#define LBR_FIXUP_BDF93 (1u << 2) -#define LBR_FIXUP_MASK (LBR_FIXUP_TSX | LBR_FIXUP_BDF93) +#define LBR_FIXUP_LER_TO (1u << 2) +#define LBR_FIXUP_MASK (LBR_FIXUP_TSX | LBR_FIXUP_LER_TO) static bool __read_mostly lbr_tsx_fixup_needed; -static bool __read_mostly bdf93_fixup_needed; +static bool __read_mostly ler_to_fixup_needed; static void __init lbr_tsx_fixup_check(void) { @@ -2844,7 +2844,7 @@ static void __init lbr_tsx_fixup_check(void) uint32_t lbr_format; /* - * HSM182, HSD172, HSE117, BDM127, BDD117, BDF85, BDE105: + * Haswell erratum HSM182 et al, Broadwell erratum BDM127 et al: * * On processors that do not support Intel Transactional Synchronization * Extensions (Intel TSX) (CPUID.07H.EBX bits 4 and 11 are both zero), @@ -2868,8 +2868,11 @@ static void __init lbr_tsx_fixup_check(void) case 0x45: /* HSM182 - 4th gen Core */ case 0x46: /* HSM182, HSD172 - 4th gen Core (GT3) */ case 0x3d: /* BDM127 - 5th gen Core */ - case 0x47: /* BDD117 - 5th gen Core (GT3) */ - case 0x4f: /* BDF85 - Xeon E5-2600 v4 */ + case 0x47: /* BDD117 - 5th gen Core (GT3) + BDW117 - Xeon E3-1200 v4 */ + case 0x4f: /* BDF85 - Xeon E5-2600 v4 + BDH75 - Core-i7 for LGA2011-v3 Socket + BDX88 - Xeon E7-x800 v4 */ case 0x56: /* BDE105 - Xeon D-1500 */ break; default: @@ -2890,18 +2893,31 @@ static void __init lbr_tsx_fixup_check(void) lbr_tsx_fixup_needed = true; } -static void __init bdf93_fixup_check(void) +static void __init ler_to_fixup_check(void) { /* - * Broadwell erratum BDF93: + * Broadwell erratum BDF93 et al: * * Reads from MSR_LER_TO_LIP (MSR 1DEH) may return values for bits[63:61] * that are not equal to bit[47]. Attempting to context switch this value * may cause a #GP. Software should sign extend the MSR. */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && - boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x4f ) - bdf93_fixup_needed = true; + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || + boot_cpu_data.x86 != 6 ) + return; + + switch ( boot_cpu_data.x86_model ) + { + case 0x3d: /* BDM131 - 5th gen Core */ + case 0x47: /* BDD??? - 5th gen Core (H-Processor line) + BDW120 - Xeon E3-1200 v4 */ + case 0x4f: /* BDF93 - Xeon E5-2600 v4 + BDH80 - Core-i7 for LGA2011-v3 Socket + BDX93 - Xeon E7-x800 v4 */ + case 0x56: /* BDE??? - Xeon D-1500 */ + ler_to_fixup_needed = true; + break; + } } static int is_last_branch_msr(u32 ecx) @@ -3276,8 +3292,8 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) v->arch.hvm.vmx.lbr_flags |= LBR_MSRS_INSERTED; if ( lbr_tsx_fixup_needed ) v->arch.hvm.vmx.lbr_flags |= LBR_FIXUP_TSX; - if ( bdf93_fixup_needed ) - v->arch.hvm.vmx.lbr_flags |= LBR_FIXUP_BDF93; + if ( ler_to_fixup_needed ) + v->arch.hvm.vmx.lbr_flags |= LBR_FIXUP_LER_TO; } __vmwrite(GUEST_IA32_DEBUGCTL, msr_content); @@ -4338,7 +4354,7 @@ static void sign_extend_msr(struct vcpu *v, u32 msr, int type) entry->data = canonicalise_addr(entry->data); } -static void bdf93_fixup(void) +static void ler_to_fixup(void) { struct vcpu *curr = current; @@ -4351,8 +4367,8 @@ static void lbr_fixup(void) if ( curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_TSX ) lbr_tsx_fixup(); - if ( curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_BDF93 ) - bdf93_fixup(); + if ( curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_LER_TO ) + ler_to_fixup(); } /* Returns false if the vmentry has to be restarted */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 11:22:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 11:22:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGbv-00067j-4H; Thu, 28 May 2020 11:22:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGbt-00067e-GD for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:05 +0000 X-Inumbo-ID: 7585b2ae-a0d5-11ea-a7b0-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7585b2ae-a0d5-11ea-a7b0-12813bfff9fa; Thu, 28 May 2020 11:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mPkSzhtBh7TIt+h4XB/R06XgJyo1oBnLAsJcFtwvwOA=; b=IcF4u/8yaKRxneJfNU2mjO+7J2 USgNRWtqL4B5hKlbDQQar+QlioJlJYzMUK0mO7biUjqjjeQ4KygY2KxRRUQDRNdBjqZO6m0iT47zo VFKfx11WuHvgZMPabZgjDOoq6c6DkJh/ATtYWeYZi+KtrU/FcHAwbqFTxRtdgd7Cd5KQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGbs-0001bk-NC for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeGbs-0006D6-M7 for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxl: Generate golang bindings in libxl Makefile Message-Id: Date: Thu, 28 May 2020 11:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 60db5da62ac051aab0b217fa2d96acca1cd3ca3e Author: George Dunlap AuthorDate: Thu May 28 12:20:53 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:53 2020 +0100 libxl: Generate golang bindings in libxl Makefile The generated golang bindings (types.gen.go and helpers.gen.go) are left checked in so that they can be fetched from xenbits using the golang tooling. This means that they must be updated whenever libxl_types.idl (or other dependencies) are updated. However, the golang bindings are only built optionally; we can't assume that anyone updating libxl_types.idl will also descend into the tools/golang tree to re-generate the bindings. Fix this by re-generating the golang bindings from the libxl Makefile when the IDL dependencies are updated, so that anyone who updates libxl_types.idl will also end up updating the golang generated files as well. - Make a variable for the generated files, and a target in xenlight/Makefile which will only re-generate the files. - Add a target in libxl/Makefile to call external idl generation targets (currently only golang). For ease of testing, also add a specific target in libxl/Makefile just to check and update files generated from the IDL. This does mean that there are two potential paths for generating the files during a parallel build; but that shouldn't be an issue, since tools/golang/xenlight should never be built until after tools/libxl has completed building anyway. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook Acked-by: Ian Jackson --- tools/golang/xenlight/Makefile | 11 ++++++++++- tools/libxl/Makefile | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index cd0a62505f..8ab4cb5665 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -17,12 +17,21 @@ all: build .PHONY: package package: $(XEN_GOPATH)$(GOXL_PKG_DIR) -$(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go types.gen.go helpers.gen.go +GOXL_GEN_FILES = types.gen.go helpers.gen.go + +$(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go $(GOXL_GEN_FILES) $(INSTALL_DIR) $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) xenlight.go $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) types.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) helpers.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) +# NOTE: This target is called from libxl/Makefile:all. Since that +# target must finish before golang/Makefile is called, this is +# currently safe. It must not be called from anywhere else in the +# Makefile system without careful thought about races with +# xenlight/Makefile:all +idl-gen: $(GOXL_GEN_FILES) + %.gen.go: gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl $(LIBXL_SRC_DIR)/idl.py XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 69fcf21577..947eb6036e 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -218,7 +218,7 @@ testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) .PHONY: all all: $(CLIENTS) $(TEST_PROGS) $(PKG_CONFIG) $(PKG_CONFIG_LOCAL) \ libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ - $(AUTOSRCS) $(AUTOINCS) + $(AUTOSRCS) $(AUTOINCS) idl-external $(LIBXL_OBJS) $(LIBXLU_OBJS) $(SAVE_HELPER_OBJS) \ $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \ @@ -274,6 +274,21 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_ $(call move-if-changed,__libxl_type$(stem)_json.h,_libxl_type$(stem)_json.h) $(call move-if-changed,__libxl_type$(stem).c,_libxl_type$(stem).c) +# NOTE: This is safe to do at the moment because idl-external and +# idl-gen are only called from libxl/Makefile:all, which must return +# before golang/Makefile is callid. idl-external and idl-gen must +# never be called from another part of the make system without careful thought +# about races with tools/golang/xenlight/Makefile:all +.PHONY: idl-external +idl-external: + $(MAKE) -C $(XEN_ROOT)/tools/golang/xenlight idl-gen + +LIBXL_IDLGEN_FILES = _libxl_types.h _libxl_types_json.h _libxl_types_private.h _libxl_types.c \ + _libxl_types_internal.h _libxl_types_internal_json.h _libxl_types_internal_private.h _libxl_types_internal.c + + +idl-gen: $(LIBXL_GEN_FILES) idl-external + libxenlight.so: libxenlight.so.$(MAJOR) $(SYMLINK_SHLIB) $< $@ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 11:22:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 11:22:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGc5-00068W-7U; Thu, 28 May 2020 11:22:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGc3-00068M-Qd for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:15 +0000 X-Inumbo-ID: 7b8b0014-a0d5-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7b8b0014-a0d5-11ea-9dbe-bc764e2007e4; Thu, 28 May 2020 11:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=75hrmfiv/oUCtWAhafE0Ppdd1j14700isDWZ36btuKk=; b=W4+38nPTkGTGHjgvtMujCkQVQZ P5Lokh9w9flNIc1i+1f8gka6iCKpQl//9QkgYBwlTPY3pstV8A/KgVB39uuBzFG1gFeSRkcGWHBuY EUTjv/DrgUmEqCFa6ldViRr7skg3fvT1PUmVe/CBW//H8YaaBBwJ7VW51KcoHGav08WQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGc2-0001bq-QD for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeGc2-0006Dg-PF for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] golang/xenlight: Get rid of GOPATH-based build artefacts Message-Id: Date: Thu, 28 May 2020 11:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b84c47221d2273b7d84866fce9c511ec3ba5abb8 Author: George Dunlap AuthorDate: Thu May 28 12:20:54 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:54 2020 +0100 golang/xenlight: Get rid of GOPATH-based build artefacts The original build setup used a "fake GOPATH" in tools/golang to test the mechanism of building from go package files installed on a filesystem. With the move to modules, this isn't necessary, and leads to potentially confusing directories being created. (I.e., it might not be obvious that files under tools/golang/src shouldn't be edited.) Get rid of the code that creates this (now unused) intermediate directory. Add direct dependencies from 'build' onto the source files. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- tools/Rules.mk | 1 - tools/golang/Makefile | 10 ---------- tools/golang/xenlight/Makefile | 22 +++++----------------- 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 59c72e7a88..76acaef988 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -35,7 +35,6 @@ XENSTORE_XENSTORED ?= y debug ?= y debug_symbols ?= $(debug) -XEN_GOPATH = $(XEN_ROOT)/tools/golang XEN_GOCODE_URL = golang.xenproject.org ifeq ($(debug_symbols),y) diff --git a/tools/golang/Makefile b/tools/golang/Makefile index aba11ebc39..b022e2c5a3 100644 --- a/tools/golang/Makefile +++ b/tools/golang/Makefile @@ -1,16 +1,6 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -# In order to link against a package in Go, the package must live in a -# directory tree in the way that Go expects. To make this possible, -# there must be a directory such that we can set GOPATH=${dir}, and -# the package will be under $GOPATH/src/${full-package-path}. - -# So we set XEN_GOPATH to $XEN_ROOT/tools/golang. The xenlight -# "package build" directory ($PWD/xenlight) will create the "package -# source" directory in the proper place. Go programs can use this -# package by setting GOPATH=$(XEN_GOPATH). - SUBDIRS-y = xenlight .PHONY: build all diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 8ab4cb5665..eac9dbf12a 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -4,8 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk # Standing boldly against convention, we insist on installing the # package source under $(prefix)/share/gocode GOCODE_DIR ?= $(prefix)/share/gocode/ -GOXL_PKG_DIR = /src/$(XEN_GOCODE_URL)/xenlight/ -GOXL_INSTALL_DIR = $(GOCODE_DIR)$(GOXL_PKG_DIR) +GOXL_INSTALL_DIR = $(GOCODE_DIR)/src/$(XEN_GOCODE_URL)/xenlight/ GO ?= go @@ -14,17 +13,8 @@ LIBXL_SRC_DIR = ../../libxl .PHONY: all all: build -.PHONY: package -package: $(XEN_GOPATH)$(GOXL_PKG_DIR) - GOXL_GEN_FILES = types.gen.go helpers.gen.go -$(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go $(GOXL_GEN_FILES) - $(INSTALL_DIR) $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(INSTALL_DATA) xenlight.go $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(INSTALL_DATA) types.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(INSTALL_DATA) helpers.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) - # NOTE: This target is called from libxl/Makefile:all. Since that # target must finish before golang/Makefile is called, this is # currently safe. It must not be called from anywhere else in the @@ -43,23 +33,21 @@ idl-gen: $(GOXL_GEN_FILES) # in the LDFLAGS; and thus we need to add -L$(XEN_XENLIGHT) here # so that it can find the actual library. .PHONY: build -build: package +build: xenlight.go $(GOXL_GEN_FILES) CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_XENLIGHT) -L$(XEN_LIBXENTOOLLOG)" $(GO) build -x .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(GOXL_INSTALL_DIR) - $(INSTALL_DATA) $(XEN_GOPATH)$(GOXL_PKG_DIR)xenlight.go $(DESTDIR)$(GOXL_INSTALL_DIR) - $(INSTALL_DATA) $(XEN_GOPATH)$(GOXL_PKG_DIR)types.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) - $(INSTALL_DATA) $(XEN_GOPATH)$(GOXL_PKG_DIR)helpers.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) + $(INSTALL_DATA) xenlight.go $(DESTDIR)$(GOXL_INSTALL_DIR) + $(INSTALL_DATA) types.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) + $(INSTALL_DATA) helpers.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) .PHONY: uninstall rm -rf $(DESTDIR)$(GOXL_INSTALL_DIR) .PHONY: clean clean: - $(RM) -r $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(RM) $(XEN_GOPATH)/pkg/*/$(XEN_GOCODE_URL)/xenlight.a .PHONY: distclean distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 11:22:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 11:22:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcF-00069j-9J; Thu, 28 May 2020 11:22:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcD-00069U-Fw for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:25 +0000 X-Inumbo-ID: 8187724a-a0d5-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8187724a-a0d5-11ea-9947-bc764e2007e4; Thu, 28 May 2020 11:22:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CvYR99g4TsSRwezgy0skrjqFxI4HrbqQPu7yHSuMj3E=; b=jCubIHn375xSQkidkcF4e8YZWu b07ksoj2H3l+SebN1MCYiwqLdUAWr73T1ZaXYiaE7IXoEiYnZA8xysbHBClD9Kc9xhTxMIyAnctef BlIdAzim9vDxhCcs1snAhKxjBTUUoq7U4bnybQiLVgIu2dOvogaJGq8cdturMAlIHPVY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcC-0001cd-To for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeGcC-0006ER-SF for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] automation/archlinux: Add 32-bit glibc headers Message-Id: Date: Thu, 28 May 2020 11:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8a4d0a82bcaf83e76d7b34136c870602d3f54a4b Author: George Dunlap AuthorDate: Thu May 28 12:20:55 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:55 2020 +0100 automation/archlinux: Add 32-bit glibc headers This fixes the following build error in hvmloader: usr/include/gnu/stubs.h:7:11: fatal error: gnu/stubs-32.h: No such file or directory Signed-off-by: George Dunlap Acked-by: Anthony PERARD Acked-by: Wei Liu --- automation/build/archlinux/current.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 9af5d66afc..5095de65b8 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -19,6 +19,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ iasl \ inetutils \ iproute \ + lib32-glibc \ libaio \ libcacard \ libgl \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 11:22:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 11:22:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcP-0006Aw-An; Thu, 28 May 2020 11:22:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcN-0006Aj-Ir for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:35 +0000 X-Inumbo-ID: 878a6fee-a0d5-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 878a6fee-a0d5-11ea-81bc-bc764e2007e4; Thu, 28 May 2020 11:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hDGabhUwSv38R3ovOlLUG+nMc1cGKK567+QpLSzkltw=; b=RmlkpDfUKUiDFI2sIXdmzgv+uX OXngAQ/GpFB4wPGINZRGYWJ/9yzKw+X7DPae7QsaSOs3jbQrDb7/Zs4VbhJao6kqRdPE6+A0B3mjj EqDHl14Gvb3V4Shze47j2Xrl7RQWiLGfoqeisuJ6LyBw+cGaNaxcXeiQ4odUlFD1fkDw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcN-0001cq-0d for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeGcM-0006F8-Vt for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] automation: Add golang packages to various dockerfiles Message-Id: Date: Thu, 28 May 2020 11:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7173d79049441bde5e4e98c0b34654ca29c3baf9 Author: George Dunlap AuthorDate: Thu May 28 12:20:56 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:56 2020 +0100 automation: Add golang packages to various dockerfiles Specifically, Fedora 29, Archlinux, and Debian unstable. This will cause the CI loop to detect golang build failures. CentOS 6 and 7 don't have golang packages, and the packages in stretch, jessie, xenial, and trusty are too old. Signed-off-by: George Dunlap Acked-by: Wei Liu --- automation/build/archlinux/current.dockerfile | 1 + automation/build/debian/unstable.dockerfile | 1 + automation/build/fedora/29.dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 5095de65b8..d8fbebaf79 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -16,6 +16,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ ghostscript \ git \ gnutls \ + go \ iasl \ inetutils \ iproute \ diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/unstable.dockerfile index d0aa5ad2bb..aeb4f3448b 100644 --- a/automation/build/debian/unstable.dockerfile +++ b/automation/build/debian/unstable.dockerfile @@ -45,6 +45,7 @@ RUN apt-get update && \ nasm \ gnupg \ apt-transport-https \ + golang \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile index 5be4a9e229..6a4e5b0413 100644 --- a/automation/build/fedora/29.dockerfile +++ b/automation/build/fedora/29.dockerfile @@ -40,5 +40,6 @@ RUN dnf -y install \ nasm \ ocaml \ ocaml-findlib \ + golang \ && dnf clean all && \ rm -rf /var/cache/dnf -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 11:22:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 11:22:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcZ-0006Bx-CR; Thu, 28 May 2020 11:22:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcX-0006Bi-Gs for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:45 +0000 X-Inumbo-ID: 8d932b38-a0d5-11ea-a7b0-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8d932b38-a0d5-11ea-a7b0-12813bfff9fa; Thu, 28 May 2020 11:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=01IfO48Gd08hGATmG8J+mWCXvBUf3ReP3R/X4I4inbE=; b=tHKoWmAB2lgPZr2xTaPnoXBYt9 WEaCBR4NBfxXlZJxhT+0t4ZFPG5tkp92lJdpfysiGYIux6luXzOoP6efr7Bp0+JI7cBK6KkXPSVzd tf8Y3ApX88vgnuc4EaxC5z1mBTtxdkvj5PYgF7G2PLn26Tvwaol+fNDGlVXgSMqRfcXw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeGcX-0001d3-4N for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeGcX-0006Fq-2o for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 11:22:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] automation/containerize: Add a shortcut for Debian unstable Message-Id: Date: Thu, 28 May 2020 11:22:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1497e78068421d83956f8e82fb6e1bf1fc3b1199 Author: George Dunlap AuthorDate: Thu May 28 12:20:57 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:57 2020 +0100 automation/containerize: Add a shortcut for Debian unstable Signed-off-by: George Dunlap Acked-by: Wei Liu --- automation/scripts/containerize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/containerize b/automation/scripts/containerize index fbc4bc22d6..b71edd736c 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -22,6 +22,7 @@ case "_${CONTAINER}" in _fedora) CONTAINER="${BASE}/fedora:29";; _jessie) CONTAINER="${BASE}/debian:jessie" ;; _stretch|_) CONTAINER="${BASE}/debian:stretch" ;; + _unstable|_) CONTAINER="${BASE}/debian:unstable" ;; _trusty) CONTAINER="${BASE}/ubuntu:trusty" ;; _xenial) CONTAINER="${BASE}/ubuntu:xenial" ;; esac @@ -91,4 +92,3 @@ exec docker run \ -${termint}i --rm -- \ ${CONTAINER} \ ${cmd} - -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Thu May 28 15:33:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 15:33:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKWn-0003Zx-Jm; Thu, 28 May 2020 15:33:05 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKWm-0003Zl-Kl for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:04 +0000 X-Inumbo-ID: 84c8e31c-a0f8-11ea-a7f7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 84c8e31c-a0f8-11ea-a7f7-12813bfff9fa; Thu, 28 May 2020 15:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NfozZRNHK1CpoYBXtqvEzJ5IvJvDDdF5ZNlU3+/AvfY=; b=PTUsTSb13wFAu8Jd8v0fcmSDrV 6Xqb/guo+C2/wueziYA0S01jfI/Y2cCNCrjefmVe741LB3PV9NwBBNL+SNipvyai7E5v0noX462M6 aCpfdYw6YvSsxAEH0U+bUYGfoZdn9+hkMVJzTE/Uti2M/CZmyJiohXNnKkzH2KtpAHvo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKWk-0006uW-Ns for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeKWk-0005lJ-Ms for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: clear RDRAND CPUID bit on AMD family 15h/16h Message-Id: Date: Thu, 28 May 2020 15:33:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 93401e28a84b9dc5945f5d0bf5bce68e9d5ee121 Author: Jan Beulich AuthorDate: Wed May 27 09:49:37 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 27 09:49:37 2020 +0200 x86: clear RDRAND CPUID bit on AMD family 15h/16h Inspired by Linux commit c49a0a80137c7ca7d6ced4c812c9e07a949f6f24: There have been reports of RDRAND issues after resuming from suspend on some AMD family 15h and family 16h systems. This issue stems from a BIOS not performing the proper steps during resume to ensure RDRAND continues to function properly. Update the CPU initialization to clear the RDRAND CPUID bit for any family 15h and 16h processor that supports RDRAND. If it is known that the family 15h or family 16h system does not have an RDRAND resume issue or that the system will not be placed in suspend, the "cpuid=rdrand" kernel parameter can be used to stop the clearing of the RDRAND CPUID bit. Note, that clearing the RDRAND CPUID bit does not prevent a processor that normally supports the RDRAND instruction from executing it. So any code that determined the support based on family and model won't #UD. Warn if no explicit choice was given on affected hardware. Check RDRAND functions at boot as well as after S3 resume (the retry limit chosen is entirely arbitrary). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- docs/misc/xen-command-line.pandoc | 4 ++++ xen/arch/x86/cpu/amd.c | 21 +++++++++++++++++++++ xen/arch/x86/cpu/common.c | 27 +++++++++++++++++++++++++++ xen/arch/x86/cpuid.c | 3 +++ xen/include/asm-x86/processor.h | 1 + 5 files changed, 56 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index ee12b0f53f..e16bb90184 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -488,6 +488,10 @@ The Speculation Control hardware features `md-clear`, `ibrsb`, `stibp`, `ibpb`, be ignored, e.g. `no-ibrsb`, at which point Xen won't use them itself, and won't offer them to guests. +`rdrand` can be used to override the default disabling of the feature on certain +AMD systems. Its negative form can of course also be used to suppress use and +exposure of the feature. + ### cpuid_mask_cpu > `= fam_0f_rev_[cdefg] | fam_10_rev_[bc] | fam_11_rev_b` diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c index 05cbcbad73..0cc6853c42 100644 --- a/xen/arch/x86/cpu/amd.c +++ b/xen/arch/x86/cpu/amd.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include @@ -747,6 +748,26 @@ static void init_amd(struct cpuinfo_x86 *c) if (acpi_smi_cmd && (acpi_enable_value | acpi_disable_value)) amd_acpi_c1e_quirk = true; break; + + case 0x15: case 0x16: + /* + * There are some Fam15/Fam16 systems where upon resume from S3 + * firmware fails to re-setup properly functioning RDRAND. + * By the time we can spot the problem, it is too late to take + * action, and there is nothing Xen can do to repair the problem. + * Clear the feature unless force-enabled on the command line. + */ + if (c == &boot_cpu_data && + cpu_has(c, X86_FEATURE_RDRAND) && + !is_forced_cpu_cap(X86_FEATURE_RDRAND)) { + static const char __initconst text[] = + "RDRAND may cease to work on this hardware upon resume from S3.\n" + "Please choose an explicit cpuid={no-}rdrand setting.\n"; + + setup_clear_cpu_cap(X86_FEATURE_RDRAND); + warning_add(text); + } + break; } display_cacheinfo(c); diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 3e0d9cbe98..c413188d00 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include /* for XEN_INVALID_{SOCKET,CORE}_ID */ @@ -98,6 +99,11 @@ void __init setup_force_cpu_cap(unsigned int cap) __set_bit(cap, boot_cpu_data.x86_capability); } +bool __init is_forced_cpu_cap(unsigned int cap) +{ + return test_bit(cap, forced_caps); +} + static void default_init(struct cpuinfo_x86 * c) { /* Not much we can do here... */ @@ -497,6 +503,27 @@ void identify_cpu(struct cpuinfo_x86 *c) printk("\n"); #endif + /* + * If RDRAND is available, make an attempt to check that it actually + * (still) works. + */ + if (cpu_has(c, X86_FEATURE_RDRAND)) { + unsigned int prev = 0; + + for (i = 0; i < 5; ++i) + { + unsigned int cur = arch_get_random(); + + if (prev && cur != prev) + break; + prev = cur; + } + + if (i >= 5) + printk(XENLOG_WARNING "CPU%u: RDRAND appears to not work\n", + smp_processor_id()); + } + if (system_state == SYS_STATE_resume) return; diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 4b734284a4..ee11087626 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -72,6 +72,9 @@ static int __init parse_xen_cpuid(const char *s) { if ( !val ) setup_clear_cpu_cap(mid->bit); + else if ( mid->bit == X86_FEATURE_RDRAND && + (cpuid_ecx(1) & cpufeat_mask(X86_FEATURE_RDRAND)) ) + setup_force_cpu_cap(X86_FEATURE_RDRAND); mid = NULL; } diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 8f6f5a97dd..070691882b 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -165,6 +165,7 @@ extern const struct x86_cpu_id *x86_match_cpu(const struct x86_cpu_id table[]); extern void identify_cpu(struct cpuinfo_x86 *); extern void setup_clear_cpu_cap(unsigned int); extern void setup_force_cpu_cap(unsigned int); +extern bool is_forced_cpu_cap(unsigned int); extern void print_cpu_info(unsigned int cpu); extern void init_intel_cacheinfo(struct cpuinfo_x86 *c); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 28 15:33:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 15:33:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKWw-0003b7-LR; Thu, 28 May 2020 15:33:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKWv-0003ay-Qq for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:13 +0000 X-Inumbo-ID: 8acbe3a4-a0f8-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8acbe3a4-a0f8-11ea-8993-bc764e2007e4; Thu, 28 May 2020 15:33:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tHNYyk3S06gUP3oj3+DFrCwZM6K/l/uzUys1kH4brJA=; b=P74My3njg9jjoRvy6Vc2wp/0J6 cYc9t8JNfqMEYbr11Wuoll7OGJ1/BFInuD80JVMwR2abP6FoCWsGIQJ6vDEfS6BDSAw2aqeEMQgpj sCuNKqgzh2ff6a2bObJLyjbHWMiTlLo/1X3q5HgVXWW/Qj6p4zYqXInw13iNgO5v8UMo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKWu-0006ui-R2 for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeKWu-0005m2-Q3 for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/mem_sharing: gate enabling on cpu_has_vmx Message-Id: Date: Thu, 28 May 2020 15:33:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b66e28226dd9df8a28101438f44c0a26d63b76fa Author: Tamas K Lengyel AuthorDate: Wed May 27 09:50:55 2020 +0200 Commit: Jan Beulich CommitDate: Wed May 27 09:50:55 2020 +0200 x86/mem_sharing: gate enabling on cpu_has_vmx It is unclear whether mem_sharing was ever made to work on other architectures but at this time the only verified platform for it is vmx. No plans to support or maintain it on other architectures. Make this explicit by checking during initialization. Signed-off-by: Tamas K Lengyel Reviewed-by: Wei Liu --- xen/arch/x86/mm/mem_sharing.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 7271e5c90b..19922ab5d1 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -1444,7 +1444,7 @@ static inline int mem_sharing_control(struct domain *d, bool enable, { if ( enable ) { - if ( unlikely(!is_hvm_domain(d)) ) + if ( unlikely(!is_hvm_domain(d) || !cpu_has_vmx) ) return -EOPNOTSUPP; if ( unlikely(!hap_enabled(d)) ) -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Thu May 28 15:33:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Thu, 28 May 2020 15:33:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKX6-0003cu-NL; Thu, 28 May 2020 15:33:24 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKX5-0003ch-R5 for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:23 +0000 X-Inumbo-ID: 90cdc56a-a0f8-11ea-a7f7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 90cdc56a-a0f8-11ea-a7f7-12813bfff9fa; Thu, 28 May 2020 15:33:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=D30Hz+V+fpSSOLATXYhuhjQreof6qKEm+Pv/LWap2rc=; b=gMSTmi+KM4OEhjADlHtPu9cYFw ZVnIznn0adm8nu9at0w3tBv6gDwC/csvPYKRP55+wpqNrLjX8oWIiDaGNaasQB4S5Gm2+wq1ijo8L yBilf1J++N6flmO/l+gTUjLejSfTW7uLNfHRcFxqIlzuk+7AwGJ/arpdc0wVfH3CjJ4M=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeKX4-0006ux-U7 for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeKX4-0005mb-T9 for xen-changelog@lists.xenproject.org; Thu, 28 May 2020 15:33:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86/boot: Fix load_system_tables() to be NMI/#MC-safe Message-Id: Date: Thu, 28 May 2020 15:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9f3e9139fa6c3d620eb08dff927518fc88200b8d Author: Andrew Cooper AuthorDate: Wed May 27 13:48:45 2020 +0100 Commit: Andrew Cooper CommitDate: Wed May 27 16:44:04 2020 +0100 x86/boot: Fix load_system_tables() to be NMI/#MC-safe During boot, load_system_tables() is used in reinit_bsp_stack() to switch the virtual addresses used from their .data/.bss alias, to their directmap alias. The structure assignment is implemented as a memset() to zero first, then a copy-in of the new data. This causes the NMI/#MC stack pointers to transiently become 0, at a point where we may have an NMI watchdog running. Rewrite the logic using a volatile tss pointer (equivalent to, but more readable than, using ACCESS_ONCE() for all writes). This does drop the zeroing side effect for holes in the structure, but the backing memory for the TSS is fully zeroed anyway, and architecturally, they are all reserved. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/cpu/common.c | 49 ++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index c413188d00..09b911b3ba 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -730,11 +730,12 @@ static cpumask_t cpu_initialized; */ void load_system_tables(void) { - unsigned int cpu = smp_processor_id(); + unsigned int i, cpu = smp_processor_id(); unsigned long stack_bottom = get_stack_bottom(), stack_top = stack_bottom & ~(STACK_SIZE - 1); - struct tss64 *tss = &this_cpu(tss_page).tss; + /* The TSS may be live. Disuade any clever optimisations. */ + volatile struct tss64 *tss = &this_cpu(tss_page).tss; seg_desc_t *gdt = this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY; @@ -747,30 +748,26 @@ void load_system_tables(void) .limit = (IDT_ENTRIES * sizeof(idt_entry_t)) - 1, }; - *tss = (struct tss64){ - /* Main stack for interrupts/exceptions. */ - .rsp0 = stack_bottom, - - /* Ring 1 and 2 stacks poisoned. */ - .rsp1 = 0x8600111111111111ul, - .rsp2 = 0x8600111111111111ul, - - /* - * MCE, NMI and Double Fault handlers get their own stacks. - * All others poisoned. - */ - .ist = { - [IST_MCE - 1] = stack_top + IST_MCE * PAGE_SIZE, - [IST_DF - 1] = stack_top + IST_DF * PAGE_SIZE, - [IST_NMI - 1] = stack_top + IST_NMI * PAGE_SIZE, - [IST_DB - 1] = stack_top + IST_DB * PAGE_SIZE, - - [IST_MAX ... ARRAY_SIZE(tss->ist) - 1] = - 0x8600111111111111ul, - }, - - .bitmap = IOBMP_INVALID_OFFSET, - }; + /* + * Set up the TSS. Warning - may be live, and the NMI/#MC must remain + * valid on every instruction boundary. (Note: these are all + * semantically ACCESS_ONCE() due to tss's volatile qualifier.) + * + * rsp0 refers to the primary stack. #MC, #DF, NMI and #DB handlers + * each get their own stacks. No IO Bitmap. + */ + tss->rsp0 = stack_bottom; + tss->ist[IST_MCE - 1] = stack_top + IST_MCE * PAGE_SIZE; + tss->ist[IST_DF - 1] = stack_top + IST_DF * PAGE_SIZE; + tss->ist[IST_NMI - 1] = stack_top + IST_NMI * PAGE_SIZE; + tss->ist[IST_DB - 1] = stack_top + IST_DB * PAGE_SIZE; + tss->bitmap = IOBMP_INVALID_OFFSET; + + /* All other stack pointers poisioned. */ + for ( i = IST_MAX; i < ARRAY_SIZE(tss->ist); ++i ) + tss->ist[i] = 0x8600111111111111ul; + tss->rsp1 = 0x8600111111111111ul; + tss->rsp2 = 0x8600111111111111ul; BUILD_BUG_ON(sizeof(*tss) <= 0x67); /* Mandated by the architecture. */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 29 08:33:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 08:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaRu-0004fD-O3; Fri, 29 May 2020 08:33:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaRt-0004f2-Rq for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:05 +0000 X-Inumbo-ID: 040f1838-a187-11ea-a87e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 040f1838-a187-11ea-a87e-12813bfff9fa; Fri, 29 May 2020 08:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=X7Vxcex9c840Vthlzj/03kzTPfsEj3AH1+4k/jnZGMo=; b=KyOr8STF3m+bOjzuyX49YOw3v5 HCBM5ZtACi9YdlaV7JQotKWonF+6jx4Gx0tH+0Adyt5gqm2R1dZgE4ay2S3CkzmRsqvcQVkqsYOzY dfx1/qEikUBiyxVb+7FktcabhQ9xCuE3R/n5/o1k21MhE70bPJrdFUrmmTqByXl2YzgQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaRs-0006sk-Pv for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeaRs-0004wj-Or for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: add a generic way to include binary files as variables Message-Id: Date: Fri, 29 May 2020 08:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c48a9956e334a5dd99e846d04ad56185b07aab64 Author: Juergen Gross AuthorDate: Fri May 29 10:15:08 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 10:15:08 2020 +0200 xen: add a generic way to include binary files as variables Add a new script xen/tools/binfile for including a binary file at build time being usable via a pointer and a size variable in the hypervisor. Make use of that generic tool in xsm. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Reviewed-by: Wei Liu --- .gitignore | 1 + xen/tools/binfile | 43 +++++++++++++++++++++++++++++++++++++++++++ xen/xsm/flask/Makefile | 5 ++++- xen/xsm/flask/flask-policy.S | 16 ---------------- 4 files changed, 48 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 7418ce9829..15a089b887 100644 --- a/.gitignore +++ b/.gitignore @@ -314,6 +314,7 @@ xen/test/livepatch/*.livepatch xen/tools/kconfig/.tmp_gtkcheck xen/tools/kconfig/.tmp_qtcheck xen/tools/symbols +xen/xsm/flask/flask-policy.S xen/xsm/flask/include/av_perm_to_string.h xen/xsm/flask/include/av_permissions.h xen/xsm/flask/include/class_to_string.h diff --git a/xen/tools/binfile b/xen/tools/binfile new file mode 100755 index 0000000000..df0301183f --- /dev/null +++ b/xen/tools/binfile @@ -0,0 +1,43 @@ +#!/bin/sh +# usage: binfile [-i] [-a ] +# -a align data at 2^ boundary (default: byte alignment) +# -i add to .init.rodata (default: .rodata) section + +section="" +align=0 + +OPTIND=1 +while getopts "ia:" opt; do + case "$opt" in + i) + section=".init" + ;; + a) + align=$OPTARG + ;; + esac +done +let "SHIFT=$OPTIND-1" +shift $SHIFT + +target=$1 +binsource=$2 +varname=$3 + +cat <$target +#include + + .section $section.rodata, "a", %progbits + + .p2align $align + .global $varname +$varname: + .incbin "$binsource" +.Lend: + + .type $varname, %object + .size $varname, .Lend - $varname + + .global ${varname}_size + ASM_INT(${varname}_size, .Lend - $varname) +EOF diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index eebfceecc5..07f36d075d 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -39,6 +39,9 @@ $(subst include/,%/,$(AV_H_FILES)): $(AV_H_DEPEND) $(mkaccess) FORCE obj-bin-$(CONFIG_XSM_FLASK_POLICY) += flask-policy.o flask-policy.o: policy.bin +flask-policy.S: $(XEN_ROOT)/xen/tools/binfile + $(SHELL) $(XEN_ROOT)/xen/tools/binfile -i $@ policy.bin xsm_flask_init_policy + FLASK_BUILD_DIR := $(CURDIR) POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) @@ -48,4 +51,4 @@ policy.bin: FORCE .PHONY: clean clean:: - rm -f $(ALL_H_FILES) *.o $(DEPS_RM) policy.* $(POLICY_SRC) + rm -f $(ALL_H_FILES) *.o $(DEPS_RM) policy.* $(POLICY_SRC) flask-policy.S diff --git a/xen/xsm/flask/flask-policy.S b/xen/xsm/flask/flask-policy.S deleted file mode 100644 index d38aa39964..0000000000 --- a/xen/xsm/flask/flask-policy.S +++ /dev/null @@ -1,16 +0,0 @@ -#include - - .section .init.rodata, "a", %progbits - -/* const unsigned char xsm_flask_init_policy[] __initconst */ - .global xsm_flask_init_policy -xsm_flask_init_policy: - .incbin "policy.bin" -.Lend: - - .type xsm_flask_init_policy, %object - .size xsm_flask_init_policy, . - xsm_flask_init_policy - -/* const unsigned int __initconst xsm_flask_init_policy_size */ - .global xsm_flask_init_policy_size - ASM_INT(xsm_flask_init_policy_size, .Lend - xsm_flask_init_policy) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 08:33:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 08:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaS5-0004h7-Pk; Fri, 29 May 2020 08:33:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaS4-0004gw-T0 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:16 +0000 X-Inumbo-ID: 0a10b584-a187-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0a10b584-a187-11ea-8993-bc764e2007e4; Fri, 29 May 2020 08:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Y3oI8v3cXJZhq9t22GETXWr3AK0OLUwj9WkyhwHx4H4=; b=CS/ax35ONYiZdzcMKYYyEOdE1w vRbDZlHIryI/AbjpmTr1BoYRh9q87rgX/wMcP/StFJJGYsTsDuJFH8mhvc15zJXgmVZF+/lZoDlWw rdmvtq9w1LfbXcrg8DcHOj0Kx2V7CL6qG7rG/9era6EOjQh3KqvoRkE8aCNLyCp/2pso=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaS2-0006sw-Tf for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeaS2-0004xX-S2 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] docs: add feature document for Xen hypervisor sysfs-like support Message-Id: Date: Fri, 29 May 2020 08:33:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 0e9dcd0159c671608e154da5b8b7e0edd2905067 Author: Juergen Gross AuthorDate: Fri May 29 10:15:35 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 10:15:35 2020 +0200 docs: add feature document for Xen hypervisor sysfs-like support On the 2019 Xen developer summit there was agreement that the Xen hypervisor should gain support for a hierarchical name-value store similar to the Linux kernel's sysfs. In the beginning there should only be basic support: entries can be added from the hypervisor itself only, there is a simple hypercall interface to read the data. Add a feature document for setting the base of a discussion regarding the desired functionality and the entries to add. Signed-off-by: Juergen Gross Acked-by: Julien Grall --- docs/features/hypervisorfs.pandoc | 92 ++++++++++++++++++++++++++++++++ docs/misc/hypfs-paths.pandoc | 107 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+) diff --git a/docs/features/hypervisorfs.pandoc b/docs/features/hypervisorfs.pandoc new file mode 100644 index 0000000000..a0a0ead057 --- /dev/null +++ b/docs/features/hypervisorfs.pandoc @@ -0,0 +1,92 @@ +% Hypervisor FS +% Revision 1 + +\clearpage + +# Basics +---------------- --------------------- + Status: **Supported** + + Architectures: all + + Components: Hypervisor, toolstack +---------------- --------------------- + +# Overview + +The Hypervisor FS is a hierarchical name-value store for reporting +information to guests, especially dom0. It is similar to the Linux +kernel's sysfs. Entries and directories are created by the hypervisor, +while the toolstack is able to use a hypercall to query the entry +values or (if allowed by the hypervisor) to modify them. + +# User details + +With: + + xenhypfs ls + +the user can list the entries of a specific path of the FS. Using: + + xenhypfs cat + +the content of an entry can be retrieved. Using: + + xenhypfs write + +a writable entry can be modified. With: + + xenhypfs tree + +the complete Hypervisor FS entry tree can be printed. + +The FS paths are documented in `docs/misc/hypfs-paths.pandoc`. + +# Technical details + +Access to the hypervisor filesystem is done via the stable new hypercall +__HYPERVISOR_filesystem_op. This hypercall supports a sub-command +XEN_HYPFS_OP_get_version which will return the highest version of the +interface supported by the hypervisor. Additions to the interface need +to bump the interface version. The hypervisor is required to support the +previous interface versions, too (this implies that additions will always +require new sub-commands in order to allow the hypervisor to decide which +version of the interface to use). + +* hypercall interface specification + * `xen/include/public/hypfs.h` +* hypervisor internal files + * `xen/include/xen/hypfs.h` + * `xen/common/hypfs.c` +* `libxenhypfs` + * `tools/libs/libxenhypfs/*` +* `xenhypfs` + * `tools/misc/xenhypfs.c` +* path documentation + * `docs/misc/hypfs-paths.pandoc` + +# Testing + +Any new parameters or hardware mitigations should be verified to show up +correctly in the filesystem. + +# Areas for improvement + +* More detailed access rights +* Entries per domain and/or per cpupool + +# Known issues + +* None + +# References + +* None + +# History + +------------------------------------------------------------------------ +Date Revision Version Notes +---------- -------- -------- ------------------------------------------- +2020-01-23 1 Xen 4.14 Document written +---------- -------- -------- ------------------------------------------- diff --git a/docs/misc/hypfs-paths.pandoc b/docs/misc/hypfs-paths.pandoc new file mode 100644 index 0000000000..39539fa1b5 --- /dev/null +++ b/docs/misc/hypfs-paths.pandoc @@ -0,0 +1,107 @@ +# Xenhypfs Paths + +This document attempts to define all the paths which are available +in the Xen hypervisor file system (hypfs). + +The hypervisor file system can be accessed via the xenhypfs tool. + +## Notation + +The hypervisor file system is similar to the Linux kernel's sysfs. +In this document directories are always specified with a trailing "/". + +The following notation conventions apply: + + DIRECTORY/ + + PATH = VALUES [TAGS] + +The first syntax defines a directory. It normally contains related +entries and the general scope of the directory is described. + +The second syntax defines a file entry containing values which are +either set by the hypervisor or, if the file is writable, can be set +by the user. + +PATH can contain simple regex constructs following the Perl compatible +regexp syntax described in pcre(3) or perlre(1). + +A hypervisor file system entry name can be any 0-delimited byte string +not containing any '/' character. The names "." and ".." are reserved +for file system internal use. + +VALUES are strings and can take the following forms (note that this represents +only the syntax used in this document): + +* STRING -- an arbitrary 0-delimited byte string. +* INTEGER -- An integer, in decimal representation unless otherwise + noted. +* "a literal string" -- literal strings are contained within quotes. +* (VALUE | VALUE | ... ) -- a set of alternatives. Alternatives are + separated by a "|" and all the alternatives are enclosed in "(" and + ")". +* {VALUE, VALUE, ... } -- a list of possible values separated by "," and + enclosed in "{" and "}". + +Additional TAGS may follow as a comma separated set of the following +tags enclosed in square brackets. + +* w -- Path is writable by the user. This capability is usually + limited to the control domain (e.g. dom0). +* ARM | ARM32 | ARM64 | X86: the path is available for the respective + architecture only. +* PV -- Path is valid for PV capable hypervisors only. +* HVM -- Path is valid for HVM capable hypervisors only. +* CONFIG_* -- Path is valid only in case the hypervisor was built with + the respective config option. + +So an entry could look like this: + + /cpu-bugs/active-pv/xpti = ("No"|{"dom0", "domU", "PCID-on"}) [w,X86,PV] + +Possible values would be "No" or a list of "dom0", "domU", and "PCID-on" with +the list elements separated by spaces, e.g. "dom0 PCID-on". +The entry would be writable and it would exist on X86 only and only if the +hypervisor is configured to support PV guests. + +## Example + +A populated Xen hypervisor file system might look like the following example: + + / + buildinfo/ directory containing build-time data + config contents of .config file used to build Xen + cpu-bugs/ x86: directory of cpu bug information + l1tf "Vulnerable" or "Not vulnerable" + mds "Vulnerable" or "Not vulnerable" + meltdown "Vulnerable" or "Not vulnerable" + spec-store-bypass "Vulnerable" or "Not vulnerable" + spectre-v1 "Vulnerable" or "Not vulnerable" + spectre-v2 "Vulnerable" or "Not vulnerable" + mitigations/ directory of mitigation settings + bti-thunk "N/A", "RETPOLINE", "LFENCE" or "JMP" + spec-ctrl "No", "IBRS+" or "IBRS-" + ibpb "No" or "Yes" + l1d-flush "No" or "Yes" + md-clear "No" or "VERW" + l1tf-barrier "No" or "Yes" + active-hvm/ directory for mitigations active in hvm doamins + msr-spec-ctrl "No" or "Yes" + rsb "No" or "Yes" + eager-fpu "No" or "Yes" + md-clear "No" or "Yes" + active-pv/ directory for mitigations active in pv doamins + msr-spec-ctrl "No" or "Yes" + rsb "No" or "Yes" + eager-fpu "No" or "Yes" + md-clear "No" or "Yes" + xpti "No" or list of "dom0", "domU", "PCID-on" + l1tf-shadow "No" or list of "dom0", "domU" + params/ directory with hypervisor parameter values + (boot/runtime parameters) + +## General Paths + +#### / + +The root of the hypervisor file system. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 08:33:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 08:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSF-0004jo-St; Fri, 29 May 2020 08:33:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSF-0004je-5L for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:27 +0000 X-Inumbo-ID: 101c38ae-a187-11ea-a87e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 101c38ae-a187-11ea-a87e-12813bfff9fa; Fri, 29 May 2020 08:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vmd2IYiF5osrv+6X3wPw/d1oppc7ORnxDoKqMioHOEw=; b=2ypnlJuiku1WtWXEFQsysUEAFW vQzSgbV2tPHByTkUnJaqcf3X5lHNRpIYJCNuiLXVQWCGe2ibnbk7bcKYWNp4qk/xeA0eiZfMKLZBc Wy4b/SLkbKVVtAh5QW8Opvl5XnQjtS65fNMDHZ+oczFbserZHfPkmhRmnu65odhwZdI0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSD-0006tE-1s for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeaSD-0004yJ-0H for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: add basic hypervisor filesystem support Message-Id: Date: Fri, 29 May 2020 08:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5b5ccafb0c425b85a60fd4f241d5f6951d0e4928 Author: Juergen Gross AuthorDate: Fri May 29 10:15:50 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 10:15:50 2020 +0200 xen: add basic hypervisor filesystem support Add the infrastructure for the hypervisor filesystem. This includes the hypercall interface and the base functions for entry creation, deletion and modification. In order not to have to repeat the same pattern multiple times in case adding a new node should BUG_ON() failure, the helpers for adding a node (hypfs_add_dir() and hypfs_add_leaf()) get a nofault parameter causing the BUG() in case of a failure. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Acked-by: Julien Grall --- tools/flask/policy/modules/dom0.te | 2 +- xen/arch/arm/traps.c | 3 + xen/arch/x86/hvm/hypercall.c | 3 + xen/arch/x86/hypercall.c | 3 + xen/arch/x86/pv/hypercall.c | 3 + xen/common/Kconfig | 11 + xen/common/Makefile | 1 + xen/common/hypfs.c | 422 ++++++++++++++++++++++++++++++++++++ xen/include/Makefile | 1 + xen/include/public/hypfs.h | 129 +++++++++++ xen/include/public/xen.h | 1 + xen/include/xen/hypercall.h | 10 + xen/include/xen/hypfs.h | 121 +++++++++++ xen/include/xlat.lst | 2 + xen/include/xsm/dummy.h | 6 + xen/include/xsm/xsm.h | 6 + xen/xsm/dummy.c | 1 + xen/xsm/flask/hooks.c | 6 + xen/xsm/flask/policy/access_vectors | 2 + 19 files changed, 732 insertions(+), 1 deletion(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 272f6a4f75..20925e38a2 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -11,7 +11,7 @@ allow dom0_t xen_t:xen { mtrr_del mtrr_read microcode physinfo quirk writeconsole readapic writeapic privprofile nonprivprofile kexec firmware sleep frequency getidle debug getcpuinfo heap pm_op mca_op lockprof cpupool_op - getscheduler setscheduler + getscheduler setscheduler hypfs_op }; allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 30c4c1830b..8f40d0e0b6 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -1381,6 +1381,9 @@ static arm_hypercall_t arm_hypercall_table[] = { #ifdef CONFIG_ARGO HYPERCALL(argo_op, 5), #endif +#ifdef CONFIG_HYPFS + HYPERCALL(hypfs_op, 5), +#endif }; #ifndef NDEBUG diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c index c41c2179c9..b6ccaf4457 100644 --- a/xen/arch/x86/hvm/hypercall.c +++ b/xen/arch/x86/hvm/hypercall.c @@ -150,6 +150,9 @@ static const hypercall_table_t hvm_hypercall_table[] = { #endif HYPERCALL(xenpmu_op), COMPAT_CALL(dm_op), +#ifdef CONFIG_HYPFS + HYPERCALL(hypfs_op), +#endif HYPERCALL(arch_1) }; diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c index 7f299d45c6..dd00983005 100644 --- a/xen/arch/x86/hypercall.c +++ b/xen/arch/x86/hypercall.c @@ -72,6 +72,9 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] = #ifdef CONFIG_HVM ARGS(hvm_op, 2), ARGS(dm_op, 3), +#endif +#ifdef CONFIG_HYPFS + ARGS(hypfs_op, 5), #endif ARGS(mca, 1), ARGS(arch_1, 1), diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index b0d1d0ed77..53a52360fa 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -84,6 +84,9 @@ const hypercall_table_t pv_hypercall_table[] = { #ifdef CONFIG_HVM HYPERCALL(hvm_op), COMPAT_CALL(dm_op), +#endif +#ifdef CONFIG_HYPFS + HYPERCALL(hypfs_op), #endif HYPERCALL(mca), HYPERCALL(arch_1), diff --git a/xen/common/Kconfig b/xen/common/Kconfig index fe9b41f721..e768ea36b2 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -116,6 +116,17 @@ config SPECULATIVE_HARDEN_BRANCH endmenu +config HYPFS + bool "Hypervisor file system support" + default y + ---help--- + Support Xen hypervisor file system. This file system is used to + present various hypervisor internal data to dom0 and in some + cases to allow modifying settings. Disabling the support might + result in some features not being available. + + If unsure, say Y. + config KEXEC bool "kexec support" default y diff --git a/xen/common/Makefile b/xen/common/Makefile index e8cde65370..bf7d0e25a3 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_CRASH_DEBUG) += gdbstub.o obj-$(CONFIG_GRANT_TABLE) += grant_table.o obj-y += guestcopy.o obj-bin-y += gunzip.init.o +obj-$(CONFIG_HYPFS) += hypfs.o obj-y += irq.o obj-y += kernel.o obj-y += keyhandler.o diff --git a/xen/common/hypfs.c b/xen/common/hypfs.c new file mode 100644 index 0000000000..9c2213a068 --- /dev/null +++ b/xen/common/hypfs.c @@ -0,0 +1,422 @@ +/****************************************************************************** + * + * hypfs.c + * + * Simple sysfs-like file system for the hypervisor. + */ + +#include +#include +#include +#include +#include +#include +#include + +#ifdef CONFIG_COMPAT +#include +CHECK_hypfs_dirlistentry; +#endif + +#define DIRENTRY_NAME_OFF offsetof(struct xen_hypfs_dirlistentry, name) +#define DIRENTRY_SIZE(name_len) \ + (DIRENTRY_NAME_OFF + \ + ROUNDUP((name_len) + 1, alignof(struct xen_hypfs_direntry))) + +static DEFINE_RWLOCK(hypfs_lock); +enum hypfs_lock_state { + hypfs_unlocked, + hypfs_read_locked, + hypfs_write_locked +}; +static DEFINE_PER_CPU(enum hypfs_lock_state, hypfs_locked); + +HYPFS_DIR_INIT(hypfs_root, ""); + +static void hypfs_read_lock(void) +{ + ASSERT(this_cpu(hypfs_locked) != hypfs_write_locked); + + read_lock(&hypfs_lock); + this_cpu(hypfs_locked) = hypfs_read_locked; +} + +static void hypfs_write_lock(void) +{ + ASSERT(this_cpu(hypfs_locked) == hypfs_unlocked); + + write_lock(&hypfs_lock); + this_cpu(hypfs_locked) = hypfs_write_locked; +} + +static void hypfs_unlock(void) +{ + enum hypfs_lock_state locked = this_cpu(hypfs_locked); + + this_cpu(hypfs_locked) = hypfs_unlocked; + + switch ( locked ) + { + case hypfs_read_locked: + read_unlock(&hypfs_lock); + break; + case hypfs_write_locked: + write_unlock(&hypfs_lock); + break; + default: + BUG(); + } +} + +static int add_entry(struct hypfs_entry_dir *parent, struct hypfs_entry *new) +{ + int ret = -ENOENT; + struct hypfs_entry *e; + + hypfs_write_lock(); + + list_for_each_entry ( e, &parent->dirlist, list ) + { + int cmp = strcmp(e->name, new->name); + + if ( cmp > 0 ) + { + ret = 0; + list_add_tail(&new->list, &e->list); + break; + } + if ( cmp == 0 ) + { + ret = -EEXIST; + break; + } + } + + if ( ret == -ENOENT ) + { + ret = 0; + list_add_tail(&new->list, &parent->dirlist); + } + + if ( !ret ) + { + unsigned int sz = strlen(new->name); + + parent->e.size += DIRENTRY_SIZE(sz); + } + + hypfs_unlock(); + + return ret; +} + +int hypfs_add_dir(struct hypfs_entry_dir *parent, + struct hypfs_entry_dir *dir, bool nofault) +{ + int ret; + + ret = add_entry(parent, &dir->e); + BUG_ON(nofault && ret); + + return ret; +} + +int hypfs_add_leaf(struct hypfs_entry_dir *parent, + struct hypfs_entry_leaf *leaf, bool nofault) +{ + int ret; + + if ( !leaf->content ) + ret = -EINVAL; + else + ret = add_entry(parent, &leaf->e); + BUG_ON(nofault && ret); + + return ret; +} + +static int hypfs_get_path_user(char *buf, + XEN_GUEST_HANDLE_PARAM(const_char) uaddr, + unsigned long ulen) +{ + if ( ulen > XEN_HYPFS_MAX_PATHLEN ) + return -EINVAL; + + if ( copy_from_guest(buf, uaddr, ulen) ) + return -EFAULT; + + if ( memchr(buf, 0, ulen) != buf + ulen - 1 ) + return -EINVAL; + + return 0; +} + +static struct hypfs_entry *hypfs_get_entry_rel(struct hypfs_entry_dir *dir, + const char *path) +{ + const char *end; + struct hypfs_entry *entry; + unsigned int name_len; + bool again = true; + + while ( again ) + { + if ( dir->e.type != XEN_HYPFS_TYPE_DIR ) + return NULL; + + if ( !*path ) + return &dir->e; + + end = strchr(path, '/'); + if ( !end ) + end = strchr(path, '\0'); + name_len = end - path; + + again = false; + + list_for_each_entry ( entry, &dir->dirlist, list ) + { + int cmp = strncmp(path, entry->name, name_len); + struct hypfs_entry_dir *d = container_of(entry, + struct hypfs_entry_dir, e); + + if ( cmp < 0 ) + return NULL; + if ( !cmp && strlen(entry->name) == name_len ) + { + if ( !*end ) + return entry; + + again = true; + dir = d; + path = end + 1; + + break; + } + } + } + + return NULL; +} + +static struct hypfs_entry *hypfs_get_entry(const char *path) +{ + if ( path[0] != '/' ) + return NULL; + + return hypfs_get_entry_rel(&hypfs_root, path + 1); +} + +int hypfs_read_dir(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr) +{ + const struct hypfs_entry_dir *d; + const struct hypfs_entry *e; + unsigned int size = entry->size; + + ASSERT(this_cpu(hypfs_locked) != hypfs_unlocked); + + d = container_of(entry, const struct hypfs_entry_dir, e); + + list_for_each_entry ( e, &d->dirlist, list ) + { + struct xen_hypfs_dirlistentry direntry; + unsigned int e_namelen = strlen(e->name); + unsigned int e_len = DIRENTRY_SIZE(e_namelen); + + direntry.e.pad = 0; + direntry.e.type = e->type; + direntry.e.encoding = e->encoding; + direntry.e.content_len = e->size; + direntry.e.max_write_len = e->max_size; + direntry.off_next = list_is_last(&e->list, &d->dirlist) ? 0 : e_len; + if ( copy_to_guest(uaddr, &direntry, 1) ) + return -EFAULT; + + if ( copy_to_guest_offset(uaddr, DIRENTRY_NAME_OFF, + e->name, e_namelen + 1) ) + return -EFAULT; + + guest_handle_add_offset(uaddr, e_len); + + ASSERT(e_len <= size); + size -= e_len; + } + + return 0; +} + +int hypfs_read_leaf(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr) +{ + const struct hypfs_entry_leaf *l; + + ASSERT(this_cpu(hypfs_locked) != hypfs_unlocked); + + l = container_of(entry, const struct hypfs_entry_leaf, e); + + return copy_to_guest(uaddr, l->content, entry->size) ? -EFAULT: 0; +} + +static int hypfs_read(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned long ulen) +{ + struct xen_hypfs_direntry e; + long ret = -EINVAL; + + if ( ulen < sizeof(e) ) + goto out; + + e.pad = 0; + e.type = entry->type; + e.encoding = entry->encoding; + e.content_len = entry->size; + e.max_write_len = entry->max_size; + + ret = -EFAULT; + if ( copy_to_guest(uaddr, &e, 1) ) + goto out; + + ret = -ENOBUFS; + if ( ulen < entry->size + sizeof(e) ) + goto out; + + guest_handle_add_offset(uaddr, sizeof(e)); + + ret = entry->read(entry, uaddr); + + out: + return ret; +} + +int hypfs_write_leaf(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen) +{ + char *buf; + int ret; + + ASSERT(this_cpu(hypfs_locked) == hypfs_write_locked); + ASSERT(ulen <= leaf->e.max_size); + + if ( leaf->e.type != XEN_HYPFS_TYPE_STRING && + leaf->e.type != XEN_HYPFS_TYPE_BLOB && ulen != leaf->e.size ) + return -EDOM; + + buf = xmalloc_array(char, ulen); + if ( !buf ) + return -ENOMEM; + + ret = -EFAULT; + if ( copy_from_guest(buf, uaddr, ulen) ) + goto out; + + ret = -EINVAL; + if ( leaf->e.type == XEN_HYPFS_TYPE_STRING && + leaf->e.encoding == XEN_HYPFS_ENC_PLAIN && + memchr(buf, 0, ulen) != (buf + ulen - 1) ) + goto out; + + ret = 0; + memcpy(leaf->write_ptr, buf, ulen); + leaf->e.size = ulen; + + out: + xfree(buf); + return ret; +} + +int hypfs_write_bool(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen) +{ + bool buf; + + ASSERT(this_cpu(hypfs_locked) == hypfs_write_locked); + ASSERT(leaf->e.type == XEN_HYPFS_TYPE_BOOL && + leaf->e.size == sizeof(bool) && + leaf->e.max_size == sizeof(bool) ); + + if ( ulen != leaf->e.max_size ) + return -EDOM; + + if ( copy_from_guest(&buf, uaddr, ulen) ) + return -EFAULT; + + *(bool *)leaf->write_ptr = buf; + + return 0; +} + +static int hypfs_write(struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned long ulen) +{ + struct hypfs_entry_leaf *l; + + if ( !entry->write ) + return -EACCES; + + ASSERT(entry->max_size); + + if ( ulen > entry->max_size ) + return -ENOSPC; + + l = container_of(entry, struct hypfs_entry_leaf, e); + + return entry->write(l, uaddr, ulen); +} + +long do_hypfs_op(unsigned int cmd, + XEN_GUEST_HANDLE_PARAM(const_char) arg1, unsigned long arg2, + XEN_GUEST_HANDLE_PARAM(void) arg3, unsigned long arg4) +{ + int ret; + struct hypfs_entry *entry; + static char path[XEN_HYPFS_MAX_PATHLEN]; + + if ( xsm_hypfs_op(XSM_PRIV) ) + return -EPERM; + + if ( cmd == XEN_HYPFS_OP_get_version ) + { + if ( !guest_handle_is_null(arg1) || arg2 || + !guest_handle_is_null(arg3) || arg4 ) + return -EINVAL; + + return XEN_HYPFS_VERSION; + } + + if ( cmd == XEN_HYPFS_OP_write_contents ) + hypfs_write_lock(); + else + hypfs_read_lock(); + + ret = hypfs_get_path_user(path, arg1, arg2); + if ( ret ) + goto out; + + entry = hypfs_get_entry(path); + if ( !entry ) + { + ret = -ENOENT; + goto out; + } + + switch ( cmd ) + { + case XEN_HYPFS_OP_read: + ret = hypfs_read(entry, arg3, arg4); + break; + + case XEN_HYPFS_OP_write_contents: + ret = hypfs_write(entry, arg3, arg4); + break; + + default: + ret = -EOPNOTSUPP; + break; + } + + out: + hypfs_unlock(); + + return ret; +} diff --git a/xen/include/Makefile b/xen/include/Makefile index 2a10725d68..089314dc72 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -9,6 +9,7 @@ headers-y := \ compat/event_channel.h \ compat/features.h \ compat/grant_table.h \ + compat/hypfs.h \ compat/kexec.h \ compat/memory.h \ compat/nmi.h \ diff --git a/xen/include/public/hypfs.h b/xen/include/public/hypfs.h new file mode 100644 index 0000000000..63a5df1629 --- /dev/null +++ b/xen/include/public/hypfs.h @@ -0,0 +1,129 @@ +/****************************************************************************** + * Xen Hypervisor Filesystem + * + * Copyright (c) 2019, SUSE Software Solutions Germany GmbH + * + * 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. + * + */ + +#ifndef __XEN_PUBLIC_HYPFS_H__ +#define __XEN_PUBLIC_HYPFS_H__ + +#include "xen.h" + +/* + * Definitions for the __HYPERVISOR_hypfs_op hypercall. + */ + +/* Highest version number of the hypfs interface currently defined. */ +#define XEN_HYPFS_VERSION 1 + +/* Maximum length of a path in the filesystem. */ +#define XEN_HYPFS_MAX_PATHLEN 1024 + +struct xen_hypfs_direntry { + uint8_t type; +#define XEN_HYPFS_TYPE_DIR 0 +#define XEN_HYPFS_TYPE_BLOB 1 +#define XEN_HYPFS_TYPE_STRING 2 +#define XEN_HYPFS_TYPE_UINT 3 +#define XEN_HYPFS_TYPE_INT 4 +#define XEN_HYPFS_TYPE_BOOL 5 + uint8_t encoding; +#define XEN_HYPFS_ENC_PLAIN 0 +#define XEN_HYPFS_ENC_GZIP 1 + uint16_t pad; /* Returned as 0. */ + uint32_t content_len; /* Current length of data. */ + uint32_t max_write_len; /* Max. length for writes (0 if read-only). */ +}; + +struct xen_hypfs_dirlistentry { + struct xen_hypfs_direntry e; + /* Offset in bytes to next entry (0 == this is the last entry). */ + uint16_t off_next; + /* Zero terminated entry name, possibly with some padding for alignment. */ + char name[XEN_FLEX_ARRAY_DIM]; +}; + +/* + * Hypercall operations. + */ + +/* + * XEN_HYPFS_OP_get_version + * + * Read highest interface version supported by the hypervisor. + * + * arg1 - arg4: all 0/NULL + * + * Possible return values: + * >0: highest supported interface version + * <0: negative Xen errno value + */ +#define XEN_HYPFS_OP_get_version 0 + +/* + * XEN_HYPFS_OP_read + * + * Read a filesystem entry. + * + * Returns the direntry and contents of an entry in the buffer supplied by the + * caller (struct xen_hypfs_direntry with the contents following directly + * after it). + * The data buffer must be at least the size of the direntry returned. If the + * data buffer was not large enough for all the data -ENOBUFS and no entry + * data is returned, but the direntry will contain the needed size for the + * returned data. + * The format of the contents is according to its entry type and encoding. + * The contents of a directory are multiple struct xen_hypfs_dirlistentry + * items. + * + * arg1: XEN_GUEST_HANDLE(path name) + * arg2: length of path name (including trailing zero byte) + * arg3: XEN_GUEST_HANDLE(data buffer written by hypervisor) + * arg4: data buffer size + * + * Possible return values: + * 0: success + * <0 : negative Xen errno value + */ +#define XEN_HYPFS_OP_read 1 + +/* + * XEN_HYPFS_OP_write_contents + * + * Write contents of a filesystem entry. + * + * Writes an entry with the contents of a buffer supplied by the caller. + * The data type and encoding can't be changed. The size can be changed only + * for blobs and strings. + * + * arg1: XEN_GUEST_HANDLE(path name) + * arg2: length of path name (including trailing zero byte) + * arg3: XEN_GUEST_HANDLE(content buffer read by hypervisor) + * arg4: content buffer size + * + * Possible return values: + * 0: success + * <0 : negative Xen errno value + */ +#define XEN_HYPFS_OP_write_contents 2 + +#endif /* __XEN_PUBLIC_HYPFS_H__ */ diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 75b1619d0d..945ef30273 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -130,6 +130,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t); #define __HYPERVISOR_argo_op 39 #define __HYPERVISOR_xenpmu_op 40 #define __HYPERVISOR_dm_op 41 +#define __HYPERVISOR_hypfs_op 42 /* Architecture-specific hypercall definitions. */ #define __HYPERVISOR_arch_0 48 diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index d82a293377..655acc7f47 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -150,6 +150,16 @@ do_dm_op( unsigned int nr_bufs, XEN_GUEST_HANDLE_PARAM(xen_dm_op_buf_t) bufs); +#ifdef CONFIG_HYPFS +extern long +do_hypfs_op( + unsigned int cmd, + XEN_GUEST_HANDLE_PARAM(const_char) arg1, + unsigned long arg2, + XEN_GUEST_HANDLE_PARAM(void) arg3, + unsigned long arg4); +#endif + #ifdef CONFIG_COMPAT extern int diff --git a/xen/include/xen/hypfs.h b/xen/include/xen/hypfs.h new file mode 100644 index 0000000000..5c6a0ccece --- /dev/null +++ b/xen/include/xen/hypfs.h @@ -0,0 +1,121 @@ +#ifndef __XEN_HYPFS_H__ +#define __XEN_HYPFS_H__ + +#ifdef CONFIG_HYPFS +#include +#include +#include + +struct hypfs_entry_leaf; + +struct hypfs_entry { + unsigned short type; + unsigned short encoding; + unsigned int size; + unsigned int max_size; + const char *name; + struct list_head list; + int (*read)(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr); + int (*write)(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); +}; + +struct hypfs_entry_leaf { + struct hypfs_entry e; + union { + const void *content; + void *write_ptr; + }; +}; + +struct hypfs_entry_dir { + struct hypfs_entry e; + struct list_head dirlist; +}; + +#define HYPFS_DIR_INIT(var, nam) \ + struct hypfs_entry_dir __read_mostly var = { \ + .e.type = XEN_HYPFS_TYPE_DIR, \ + .e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .e.name = (nam), \ + .e.size = 0, \ + .e.max_size = 0, \ + .e.list = LIST_HEAD_INIT(var.e.list), \ + .e.read = hypfs_read_dir, \ + .dirlist = LIST_HEAD_INIT(var.dirlist), \ + } + +#define HYPFS_VARSIZE_INIT(var, typ, nam, msz) \ + struct hypfs_entry_leaf __read_mostly var = { \ + .e.type = (typ), \ + .e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .e.name = (nam), \ + .e.max_size = (msz), \ + .e.read = hypfs_read_leaf, \ + } + +/* Content and size need to be set via hypfs_string_set_reference(). */ +#define HYPFS_STRING_INIT(var, nam) \ + HYPFS_VARSIZE_INIT(var, XEN_HYPFS_TYPE_STRING, nam, 0) + +/* + * Set content and size of a XEN_HYPFS_TYPE_STRING node. The node will point + * to str, so any later modification of *str should be followed by a call + * to hypfs_string_set_reference() in order to update the size of the node + * data. + */ +static inline void hypfs_string_set_reference(struct hypfs_entry_leaf *leaf, + const char *str) +{ + leaf->content = str; + leaf->e.size = strlen(str) + 1; +} + +#define HYPFS_FIXEDSIZE_INIT(var, typ, nam, contvar, wr) \ + struct hypfs_entry_leaf __read_mostly var = { \ + .e.type = (typ), \ + .e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .e.name = (nam), \ + .e.size = sizeof(contvar), \ + .e.max_size = (wr) ? sizeof(contvar) : 0, \ + .e.read = hypfs_read_leaf, \ + .e.write = (wr), \ + .content = &(contvar), \ + } + +#define HYPFS_UINT_INIT(var, nam, contvar) \ + HYPFS_FIXEDSIZE_INIT(var, XEN_HYPFS_TYPE_UINT, nam, contvar, NULL) +#define HYPFS_UINT_INIT_WRITABLE(var, nam, contvar) \ + HYPFS_FIXEDSIZE_INIT(var, XEN_HYPFS_TYPE_UINT, nam, contvar, \ + hypfs_write_leaf) + +#define HYPFS_INT_INIT(var, nam, contvar) \ + HYPFS_FIXEDSIZE_INIT(var, XEN_HYPFS_TYPE_INT, nam, contvar, NULL) +#define HYPFS_INT_INIT_WRITABLE(var, nam, contvar) \ + HYPFS_FIXEDSIZE_INIT(var, XEN_HYPFS_TYPE_INT, nam, contvar, \ + hypfs_write_leaf) + +#define HYPFS_BOOL_INIT(var, nam, contvar) \ + HYPFS_FIXEDSIZE_INIT(var, XEN_HYPFS_TYPE_BOOL, nam, contvar, NULL) +#define HYPFS_BOOL_INIT_WRITABLE(var, nam, contvar) \ + HYPFS_FIXEDSIZE_INIT(var, XEN_HYPFS_TYPE_BOOL, nam, contvar, \ + hypfs_write_bool) + +extern struct hypfs_entry_dir hypfs_root; + +int hypfs_add_dir(struct hypfs_entry_dir *parent, + struct hypfs_entry_dir *dir, bool nofault); +int hypfs_add_leaf(struct hypfs_entry_dir *parent, + struct hypfs_entry_leaf *leaf, bool nofault); +int hypfs_read_dir(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr); +int hypfs_read_leaf(const struct hypfs_entry *entry, + XEN_GUEST_HANDLE_PARAM(void) uaddr); +int hypfs_write_leaf(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); +int hypfs_write_bool(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); +#endif + +#endif /* __XEN_HYPFS_H__ */ diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 95f5e5592b..0921d4a8d0 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -86,6 +86,8 @@ ? vcpu_hvm_context hvm/hvm_vcpu.h ? vcpu_hvm_x86_32 hvm/hvm_vcpu.h ? vcpu_hvm_x86_64 hvm/hvm_vcpu.h +? hypfs_direntry hypfs.h +? hypfs_dirlistentry hypfs.h ? kexec_exec kexec.h ! kexec_image kexec.h ! kexec_range kexec.h diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h index 295dd67c48..2368acebed 100644 --- a/xen/include/xsm/dummy.h +++ b/xen/include/xsm/dummy.h @@ -434,6 +434,12 @@ static XSM_INLINE int xsm_page_offline(XSM_DEFAULT_ARG uint32_t cmd) return xsm_default_action(action, current->domain, NULL); } +static XSM_INLINE int xsm_hypfs_op(XSM_DEFAULT_VOID) +{ + XSM_ASSERT_ACTION(XSM_PRIV); + return xsm_default_action(action, current->domain, NULL); +} + static XSM_INLINE long xsm_do_xsm_op(XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) { return -ENOSYS; diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h index e22d6160b5..a80bcf3e42 100644 --- a/xen/include/xsm/xsm.h +++ b/xen/include/xsm/xsm.h @@ -127,6 +127,7 @@ struct xsm_operations { int (*resource_setup_misc) (void); int (*page_offline)(uint32_t cmd); + int (*hypfs_op)(void); long (*do_xsm_op) (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op); #ifdef CONFIG_COMPAT @@ -536,6 +537,11 @@ static inline int xsm_page_offline(xsm_default_t def, uint32_t cmd) return xsm_ops->page_offline(cmd); } +static inline int xsm_hypfs_op(xsm_default_t def) +{ + return xsm_ops->hypfs_op(); +} + static inline long xsm_do_xsm_op (XEN_GUEST_HANDLE_PARAM(xsm_op_t) op) { return xsm_ops->do_xsm_op(op); diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c index 5705e52791..d4cce68089 100644 --- a/xen/xsm/dummy.c +++ b/xen/xsm/dummy.c @@ -103,6 +103,7 @@ void __init xsm_fixup_ops (struct xsm_operations *ops) set_to_dummy_if_null(ops, resource_setup_misc); set_to_dummy_if_null(ops, page_offline); + set_to_dummy_if_null(ops, hypfs_op); set_to_dummy_if_null(ops, hvm_param); set_to_dummy_if_null(ops, hvm_control); set_to_dummy_if_null(ops, hvm_param_nested); diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 4649e6fd95..a2c78e445c 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -1173,6 +1173,11 @@ static inline int flask_page_offline(uint32_t cmd) } } +static inline int flask_hypfs_op(void) +{ + return domain_has_xen(current->domain, XEN__HYPFS_OP); +} + static int flask_add_to_physmap(struct domain *d1, struct domain *d2) { return domain_has_perm(d1, d2, SECCLASS_MMU, MMU__PHYSMAP); @@ -1812,6 +1817,7 @@ static struct xsm_operations flask_ops = { .resource_setup_misc = flask_resource_setup_misc, .page_offline = flask_page_offline, + .hypfs_op = flask_hypfs_op, .hvm_param = flask_hvm_param, .hvm_control = flask_hvm_param, .hvm_param_nested = flask_hvm_param_nested, diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index c055c14c26..c9e385fb9b 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -67,6 +67,8 @@ class xen lockprof # XEN_SYSCTL_cpupool_op cpupool_op +# hypfs hypercall + hypfs_op # XEN_SYSCTL_scheduler_op with XEN_DOMCTL_SCHEDOP_getinfo, XEN_SYSCTL_sched_id, XEN_DOMCTL_SCHEDOP_getvcpuinfo getscheduler # XEN_SYSCTL_scheduler_op with XEN_DOMCTL_SCHEDOP_putinfo, XEN_DOMCTL_SCHEDOP_putvcpuinfo -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 08:33:38 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 08:33:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSQ-0004lS-0Q; Fri, 29 May 2020 08:33:38 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSO-0004lI-Lw for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:36 +0000 X-Inumbo-ID: 16206a0e-a187-11ea-a87e-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 16206a0e-a187-11ea-a87e-12813bfff9fa; Fri, 29 May 2020 08:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=90Vyv1Jad4qnmPfA2bufcNiomF8ioR7bxivb1CoozMw=; b=EFzDqveI8AoLtFU8oiPkKaKP85 OL4kSgf8F/b/5oBxuC16SjFGBGW+tZHwdsxy1UEnVnUfrx3DXtqxGILHA9/zOO61ZIdqAhJmcoCAG yuj9c47rAWat5sm8o6gfbGTam2/uza+GV8gIw4tdkAEshX2b/C1TnJgmnrniv7tMQ7yI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSN-0006tN-4o for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeaSN-0004ys-42 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libs: add libxenhypfs Message-Id: Date: Fri, 29 May 2020 08:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 86234eafb95295621aef6c618e4c22c10d8e4138 Author: Juergen Gross AuthorDate: Fri May 29 10:20:21 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 10:20:21 2020 +0200 libs: add libxenhypfs Add the new library libxenhypfs for access to the hypervisor filesystem. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- .gitignore | 2 + tools/Rules.mk | 6 + tools/libs/Makefile | 1 + tools/libs/hypfs/Makefile | 16 ++ tools/libs/hypfs/core.c | 536 ++++++++++++++++++++++++++++++++++++ tools/libs/hypfs/include/xenhypfs.h | 90 ++++++ tools/libs/hypfs/libxenhypfs.map | 10 + tools/libs/hypfs/xenhypfs.pc.in | 10 + 8 files changed, 671 insertions(+) diff --git a/.gitignore b/.gitignore index 15a089b887..abf13df5ec 100644 --- a/.gitignore +++ b/.gitignore @@ -110,6 +110,8 @@ tools/libs/evtchn/headers.chk tools/libs/evtchn/xenevtchn.pc tools/libs/gnttab/headers.chk tools/libs/gnttab/xengnttab.pc +tools/libs/hypfs/headers.chk +tools/libs/hypfs/xenhypfs.pc tools/libs/call/headers.chk tools/libs/call/xencall.pc tools/libs/foreignmemory/headers.chk diff --git a/tools/Rules.mk b/tools/Rules.mk index 76acaef988..518bb5660a 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -19,6 +19,7 @@ XEN_LIBXENGNTTAB = $(XEN_ROOT)/tools/libs/gnttab XEN_LIBXENCALL = $(XEN_ROOT)/tools/libs/call XEN_LIBXENFOREIGNMEMORY = $(XEN_ROOT)/tools/libs/foreignmemory XEN_LIBXENDEVICEMODEL = $(XEN_ROOT)/tools/libs/devicemodel +XEN_LIBXENHYPFS = $(XEN_ROOT)/tools/libs/hypfs XEN_LIBXC = $(XEN_ROOT)/tools/libxc XEN_XENLIGHT = $(XEN_ROOT)/tools/libxl # Currently libxlutil lives in the same directory as libxenlight @@ -131,6 +132,11 @@ SHDEPS_libxendevicemodel = $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) $(SHLI LDLIBS_libxendevicemodel = $(SHDEPS_libxendevicemodel) $(XEN_LIBXENDEVICEMODEL)/libxendevicemodel$(libextension) SHLIB_libxendevicemodel = $(SHDEPS_libxendevicemodel) -Wl,-rpath-link=$(XEN_LIBXENDEVICEMODEL) +CFLAGS_libxenhypfs = -I$(XEN_LIBXENHYPFS)/include $(CFLAGS_xeninclude) +SHDEPS_libxenhypfs = $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) $(SHLIB_xencall) +LDLIBS_libxenhypfs = $(SHDEPS_libxenhypfs) $(XEN_LIBXENHYPFS)/libxenhypfs$(libextension) +SHLIB_libxenhypfs = $(SHDEPS_libxenhypfs) -Wl,-rpath-link=$(XEN_LIBXENHYPFS) + # code which compiles against libxenctrl get __XEN_TOOLS__ and # therefore sees the unstable hypercall interfaces. CFLAGS_libxenctrl = -I$(XEN_LIBXC)/include $(CFLAGS_libxentoollog) $(CFLAGS_libxenforeignmemory) $(CFLAGS_libxendevicemodel) $(CFLAGS_xeninclude) -D__XEN_TOOLS__ diff --git a/tools/libs/Makefile b/tools/libs/Makefile index 88901e7341..69cdfb5975 100644 --- a/tools/libs/Makefile +++ b/tools/libs/Makefile @@ -9,6 +9,7 @@ SUBDIRS-y += gnttab SUBDIRS-y += call SUBDIRS-y += foreignmemory SUBDIRS-y += devicemodel +SUBDIRS-y += hypfs ifeq ($(CONFIG_RUMP),y) SUBDIRS-y := toolcore diff --git a/tools/libs/hypfs/Makefile b/tools/libs/hypfs/Makefile new file mode 100644 index 0000000000..06dd449929 --- /dev/null +++ b/tools/libs/hypfs/Makefile @@ -0,0 +1,16 @@ +XEN_ROOT = $(CURDIR)/../../.. +include $(XEN_ROOT)/tools/Rules.mk + +MAJOR = 1 +MINOR = 0 +LIBNAME := hypfs +USELIBS := toollog toolcore call + +APPEND_LDFLAGS += -lz + +SRCS-y += core.c + +include ../libs.mk + +$(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_LIBXENHYPFS)/include +$(PKG_CONFIG_LOCAL): PKG_CONFIG_CFLAGS_LOCAL = $(CFLAGS_xeninclude) diff --git a/tools/libs/hypfs/core.c b/tools/libs/hypfs/core.c new file mode 100644 index 0000000000..d4309b5ae2 --- /dev/null +++ b/tools/libs/hypfs/core.c @@ -0,0 +1,536 @@ +/* + * Copyright (c) 2019 SUSE Software Solutions Germany GmbH + * + * 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 . + */ + +#define __XEN_TOOLS__ 1 + +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#define BUF_SIZE 4096 + +struct xenhypfs_handle { + xentoollog_logger *logger, *logger_tofree; + unsigned int flags; + xencall_handle *xcall; +}; + +xenhypfs_handle *xenhypfs_open(xentoollog_logger *logger, + unsigned open_flags) +{ + xenhypfs_handle *fshdl = calloc(1, sizeof(*fshdl)); + + if (!fshdl) + return NULL; + + fshdl->flags = open_flags; + fshdl->logger = logger; + fshdl->logger_tofree = NULL; + + if (!fshdl->logger) { + fshdl->logger = fshdl->logger_tofree = + (xentoollog_logger*) + xtl_createlogger_stdiostream(stderr, XTL_PROGRESS, 0); + if (!fshdl->logger) + goto err; + } + + fshdl->xcall = xencall_open(fshdl->logger, 0); + if (!fshdl->xcall) + goto err; + + /* No need to remember supported version, we only support V1. */ + if (xencall5(fshdl->xcall, __HYPERVISOR_hypfs_op, + XEN_HYPFS_OP_get_version, 0, 0, 0, 0) < 0) + goto err; + + return fshdl; + +err: + xtl_logger_destroy(fshdl->logger_tofree); + xencall_close(fshdl->xcall); + free(fshdl); + return NULL; +} + +int xenhypfs_close(xenhypfs_handle *fshdl) +{ + if (!fshdl) + return 0; + + xencall_close(fshdl->xcall); + xtl_logger_destroy(fshdl->logger_tofree); + free(fshdl); + return 0; +} + +static int xenhypfs_get_pathbuf(xenhypfs_handle *fshdl, const char *path, + char **path_buf) +{ + int ret = -1; + int path_sz; + + if (!fshdl) { + errno = EBADF; + goto out; + } + + path_sz = strlen(path) + 1; + if (path_sz > XEN_HYPFS_MAX_PATHLEN) + { + errno = ENAMETOOLONG; + goto out; + } + + *path_buf = xencall_alloc_buffer(fshdl->xcall, path_sz); + if (!*path_buf) { + errno = ENOMEM; + goto out; + } + strcpy(*path_buf, path); + + ret = path_sz; + + out: + return ret; +} + +static void *xenhypfs_inflate(void *in_data, size_t *sz) +{ + unsigned char *workbuf; + void *content = NULL; + unsigned int out_sz; + z_stream z = { .opaque = NULL }; + int ret; + + workbuf = malloc(BUF_SIZE); + if (!workbuf) + return NULL; + + z.next_in = in_data; + z.avail_in = *sz; + ret = inflateInit2(&z, MAX_WBITS + 32); /* 32 == gzip */ + + for (*sz = 0; ret == Z_OK; *sz += out_sz) { + z.next_out = workbuf; + z.avail_out = BUF_SIZE; + ret = inflate(&z, Z_SYNC_FLUSH); + if (ret != Z_OK && ret != Z_STREAM_END) + break; + + out_sz = z.next_out - workbuf; + content = realloc(content, *sz + out_sz); + if (!content) { + ret = Z_MEM_ERROR; + break; + } + memcpy(content + *sz, workbuf, out_sz); + } + + inflateEnd(&z); + if (ret != Z_STREAM_END) { + free(content); + content = NULL; + errno = EIO; + } + free(workbuf); + return content; +} + +static void xenhypfs_set_attrs(struct xen_hypfs_direntry *entry, + struct xenhypfs_dirent *dirent) +{ + dirent->size = entry->content_len; + + switch(entry->type) { + case XEN_HYPFS_TYPE_DIR: + dirent->type = xenhypfs_type_dir; + break; + case XEN_HYPFS_TYPE_BLOB: + dirent->type = xenhypfs_type_blob; + break; + case XEN_HYPFS_TYPE_STRING: + dirent->type = xenhypfs_type_string; + break; + case XEN_HYPFS_TYPE_UINT: + dirent->type = xenhypfs_type_uint; + break; + case XEN_HYPFS_TYPE_INT: + dirent->type = xenhypfs_type_int; + break; + case XEN_HYPFS_TYPE_BOOL: + dirent->type = xenhypfs_type_bool; + break; + default: + dirent->type = xenhypfs_type_blob; + } + + switch (entry->encoding) { + case XEN_HYPFS_ENC_PLAIN: + dirent->encoding = xenhypfs_enc_plain; + break; + case XEN_HYPFS_ENC_GZIP: + dirent->encoding = xenhypfs_enc_gzip; + break; + default: + dirent->encoding = xenhypfs_enc_plain; + dirent->type = xenhypfs_type_blob; + } + + dirent->is_writable = entry->max_write_len; +} + +void *xenhypfs_read_raw(xenhypfs_handle *fshdl, const char *path, + struct xenhypfs_dirent **dirent) +{ + void *retbuf = NULL, *content = NULL; + char *path_buf = NULL; + const char *name; + struct xen_hypfs_direntry *entry; + int ret; + int sz, path_sz; + + *dirent = NULL; + ret = xenhypfs_get_pathbuf(fshdl, path, &path_buf); + if (ret < 0) + goto out; + + path_sz = ret; + + for (sz = BUF_SIZE;; sz = sizeof(*entry) + entry->content_len) { + if (retbuf) + xencall_free_buffer(fshdl->xcall, retbuf); + + retbuf = xencall_alloc_buffer(fshdl->xcall, sz); + if (!retbuf) { + errno = ENOMEM; + goto out; + } + entry = retbuf; + + ret = xencall5(fshdl->xcall, __HYPERVISOR_hypfs_op, XEN_HYPFS_OP_read, + (unsigned long)path_buf, path_sz, + (unsigned long)retbuf, sz); + if (!ret) + break; + + if (ret != ENOBUFS) { + errno = -ret; + goto out; + } + } + + content = malloc(entry->content_len); + if (!content) + goto out; + memcpy(content, entry + 1, entry->content_len); + + name = strrchr(path, '/'); + if (!name) + name = path; + else { + name++; + if (!*name) + name--; + } + *dirent = calloc(1, sizeof(struct xenhypfs_dirent) + strlen(name) + 1); + if (!*dirent) { + free(content); + content = NULL; + errno = ENOMEM; + goto out; + } + (*dirent)->name = (char *)(*dirent + 1); + strcpy((*dirent)->name, name); + xenhypfs_set_attrs(entry, *dirent); + + out: + ret = errno; + xencall_free_buffer(fshdl->xcall, path_buf); + xencall_free_buffer(fshdl->xcall, retbuf); + errno = ret; + + return content; +} + +char *xenhypfs_read(xenhypfs_handle *fshdl, const char *path) +{ + char *buf, *ret_buf = NULL; + struct xenhypfs_dirent *dirent; + int ret; + + buf = xenhypfs_read_raw(fshdl, path, &dirent); + if (!buf) + goto out; + + switch (dirent->encoding) { + case xenhypfs_enc_plain: + break; + case xenhypfs_enc_gzip: + ret_buf = xenhypfs_inflate(buf, &dirent->size); + if (!ret_buf) + goto out; + free(buf); + buf = ret_buf; + ret_buf = NULL; + break; + } + + switch (dirent->type) { + case xenhypfs_type_dir: + errno = EISDIR; + break; + case xenhypfs_type_blob: + errno = EDOM; + break; + case xenhypfs_type_string: + ret_buf = buf; + buf = NULL; + break; + case xenhypfs_type_uint: + case xenhypfs_type_bool: + switch (dirent->size) { + case 1: + ret = asprintf(&ret_buf, "%"PRIu8, *(uint8_t *)buf); + break; + case 2: + ret = asprintf(&ret_buf, "%"PRIu16, *(uint16_t *)buf); + break; + case 4: + ret = asprintf(&ret_buf, "%"PRIu32, *(uint32_t *)buf); + break; + case 8: + ret = asprintf(&ret_buf, "%"PRIu64, *(uint64_t *)buf); + break; + default: + ret = -1; + errno = EDOM; + } + if (ret < 0) + ret_buf = NULL; + break; + case xenhypfs_type_int: + switch (dirent->size) { + case 1: + ret = asprintf(&ret_buf, "%"PRId8, *(int8_t *)buf); + break; + case 2: + ret = asprintf(&ret_buf, "%"PRId16, *(int16_t *)buf); + break; + case 4: + ret = asprintf(&ret_buf, "%"PRId32, *(int32_t *)buf); + break; + case 8: + ret = asprintf(&ret_buf, "%"PRId64, *(int64_t *)buf); + break; + default: + ret = -1; + errno = EDOM; + } + if (ret < 0) + ret_buf = NULL; + break; + } + + out: + ret = errno; + free(buf); + free(dirent); + errno = ret; + + return ret_buf; +} + +struct xenhypfs_dirent *xenhypfs_readdir(xenhypfs_handle *fshdl, + const char *path, + unsigned int *num_entries) +{ + void *buf, *curr; + int ret; + char *names; + struct xenhypfs_dirent *ret_buf = NULL, *dirent; + unsigned int n = 0, name_sz = 0; + struct xen_hypfs_dirlistentry *entry; + + buf = xenhypfs_read_raw(fshdl, path, &dirent); + if (!buf) + goto out; + + if (dirent->type != xenhypfs_type_dir || + dirent->encoding != xenhypfs_enc_plain) { + errno = ENOTDIR; + goto out; + } + + if (dirent->size) { + curr = buf; + for (n = 1;; n++) { + entry = curr; + name_sz += strlen(entry->name) + 1; + if (!entry->off_next) + break; + + curr += entry->off_next; + } + } + + ret_buf = malloc(n * sizeof(*ret_buf) + name_sz); + if (!ret_buf) + goto out; + + *num_entries = n; + names = (char *)(ret_buf + n); + curr = buf; + for (n = 0; n < *num_entries; n++) { + entry = curr; + xenhypfs_set_attrs(&entry->e, ret_buf + n); + ret_buf[n].name = names; + strcpy(names, entry->name); + names += strlen(entry->name) + 1; + curr += entry->off_next; + } + + out: + ret = errno; + free(buf); + free(dirent); + errno = ret; + + return ret_buf; +} + +int xenhypfs_write(xenhypfs_handle *fshdl, const char *path, const char *val) +{ + void *buf = NULL; + char *path_buf = NULL, *val_end; + int ret, saved_errno; + int sz, path_sz; + struct xen_hypfs_direntry *entry; + uint64_t mask; + + ret = xenhypfs_get_pathbuf(fshdl, path, &path_buf); + if (ret < 0) + goto out; + + path_sz = ret; + ret = -1; + + sz = BUF_SIZE; + buf = xencall_alloc_buffer(fshdl->xcall, sz); + if (!buf) { + errno = ENOMEM; + goto out; + } + + ret = xencall5(fshdl->xcall, __HYPERVISOR_hypfs_op, XEN_HYPFS_OP_read, + (unsigned long)path_buf, path_sz, + (unsigned long)buf, sizeof(*entry)); + if (ret && errno != ENOBUFS) + goto out; + ret = -1; + entry = buf; + if (!entry->max_write_len) { + errno = EACCES; + goto out; + } + if (entry->encoding != XEN_HYPFS_ENC_PLAIN) { + /* Writing compressed data currently not supported. */ + errno = EDOM; + goto out; + } + + switch (entry->type) { + case XEN_HYPFS_TYPE_STRING: + if (sz < strlen(val) + 1) { + sz = strlen(val) + 1; + xencall_free_buffer(fshdl->xcall, buf); + buf = xencall_alloc_buffer(fshdl->xcall, sz); + if (!buf) { + errno = ENOMEM; + goto out; + } + } + sz = strlen(val) + 1; + strcpy(buf, val); + break; + case XEN_HYPFS_TYPE_UINT: + sz = entry->content_len; + errno = 0; + *(unsigned long long *)buf = strtoull(val, &val_end, 0); + if (errno || !*val || *val_end) + goto out; + mask = ~0ULL << (8 * sz); + if ((*(uint64_t *)buf & mask) && ((*(uint64_t *)buf & mask) != mask)) { + errno = ERANGE; + goto out; + } + break; + case XEN_HYPFS_TYPE_INT: + sz = entry->content_len; + errno = 0; + *(unsigned long long *)buf = strtoll(val, &val_end, 0); + if (errno || !*val || *val_end) + goto out; + mask = (sz == 8) ? 0 : ~0ULL << (8 * sz); + if ((*(uint64_t *)buf & mask) && ((*(uint64_t *)buf & mask) != mask)) { + errno = ERANGE; + goto out; + } + break; + case XEN_HYPFS_TYPE_BOOL: + sz = entry->content_len; + *(unsigned long long *)buf = 0; + if (!strcmp(val, "1") || !strcmp(val, "on") || !strcmp(val, "yes") || + !strcmp(val, "true") || !strcmp(val, "enable")) + *(unsigned long long *)buf = 1; + else if (strcmp(val, "0") && strcmp(val, "no") && strcmp(val, "off") && + strcmp(val, "false") && strcmp(val, "disable")) { + errno = EDOM; + goto out; + } + break; + default: + /* No support for other types (yet). */ + errno = EDOM; + goto out; + } + + ret = xencall5(fshdl->xcall, __HYPERVISOR_hypfs_op, + XEN_HYPFS_OP_write_contents, + (unsigned long)path_buf, path_sz, + (unsigned long)buf, sz); + + out: + saved_errno = errno; + xencall_free_buffer(fshdl->xcall, path_buf); + xencall_free_buffer(fshdl->xcall, buf); + errno = saved_errno; + return ret; +} diff --git a/tools/libs/hypfs/include/xenhypfs.h b/tools/libs/hypfs/include/xenhypfs.h new file mode 100644 index 0000000000..ab157edceb --- /dev/null +++ b/tools/libs/hypfs/include/xenhypfs.h @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2019 SUSE Software Solutions Germany GmbH + * + * 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 XENHYPFS_H +#define XENHYPFS_H + +#include +#include +#include + +/* Callers who don't care don't need to #include */ +struct xentoollog_logger; + +typedef struct xenhypfs_handle xenhypfs_handle; + +struct xenhypfs_dirent { + char *name; + size_t size; + enum { + xenhypfs_type_dir, + xenhypfs_type_blob, + xenhypfs_type_string, + xenhypfs_type_uint, + xenhypfs_type_int, + xenhypfs_type_bool + } type; + enum { + xenhypfs_enc_plain, + xenhypfs_enc_gzip + } encoding; + bool is_writable; +}; + +xenhypfs_handle *xenhypfs_open(struct xentoollog_logger *logger, + unsigned int open_flags); +int xenhypfs_close(xenhypfs_handle *fshdl); + +/* + * Return the raw contents of a Xen hypfs entry and its dirent containing + * the size, type and encoding. + * Returned buffer and dirent should be freed via free(). + */ +void *xenhypfs_read_raw(xenhypfs_handle *fshdl, const char *path, + struct xenhypfs_dirent **dirent); + +/* + * Return the contents of a Xen hypfs entry as a string. + * Returned buffer should be freed via free(). + */ +char *xenhypfs_read(xenhypfs_handle *fshdl, const char *path); + +/* + * Return the contents of a Xen hypfs directory in form of an array of + * dirents. + * Returned buffer should be freed via free(). + */ +struct xenhypfs_dirent *xenhypfs_readdir(xenhypfs_handle *fshdl, + const char *path, + unsigned int *num_entries); + +/* + * Write a Xen hypfs entry with a value. The value is converted from a string + * to the appropriate type. + */ +int xenhypfs_write(xenhypfs_handle *fshdl, const char *path, const char *val); + +#endif /* XENHYPFS_H */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libs/hypfs/libxenhypfs.map b/tools/libs/hypfs/libxenhypfs.map new file mode 100644 index 0000000000..47f1edda3e --- /dev/null +++ b/tools/libs/hypfs/libxenhypfs.map @@ -0,0 +1,10 @@ +VERS_1.0 { + global: + xenhypfs_open; + xenhypfs_close; + xenhypfs_read_raw; + xenhypfs_read; + xenhypfs_readdir; + xenhypfs_write; + local: *; /* Do not expose anything by default */ +}; diff --git a/tools/libs/hypfs/xenhypfs.pc.in b/tools/libs/hypfs/xenhypfs.pc.in new file mode 100644 index 0000000000..92a262c7a2 --- /dev/null +++ b/tools/libs/hypfs/xenhypfs.pc.in @@ -0,0 +1,10 @@ +prefix=@@prefix@@ +includedir=@@incdir@@ +libdir=@@libdir@@ + +Name: Xenhypfs +Description: The Xenhypfs library for Xen hypervisor +Version: @@version@@ +Cflags: -I${includedir} @@cflagslocal@@ +Libs: @@libsflag@@${libdir} -lxenhypfs +Requires.private: xentoolcore,xentoollog,xencall,z -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 08:33:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 08:33:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSZ-0004my-28; Fri, 29 May 2020 08:33:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSY-0004mo-6u for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:46 +0000 X-Inumbo-ID: 1c270304-a187-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1c270304-a187-11ea-8993-bc764e2007e4; Fri, 29 May 2020 08:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hbxQomv0v45y0DtWhIDGGafbwHO76H1kZhIGwYV2vtY=; b=Ap+MghGASs80ZTek++6br64dSe baewEbbxz7ZsZhYYah0uGnMP5PsUDI6kt6FO/qm/WvwCTrqC/bPBgLhjwlEZC07DM5Zd75wlsvDLu 6XMyrpmt9ADI8/89yOEhE9NrwCrGhPYFrxTdZS/pNZRx9RWnuRcCFxENxTBYk5N4Bp3Y=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeaSX-0006tW-7p for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeaSX-0004zb-73 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 08:33:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools: add xenfs tool Message-Id: Date: Fri, 29 May 2020 08:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ef716e1dc6206adc5e2a181fe0e20dfd6072bf4c Author: Juergen Gross AuthorDate: Fri May 29 10:20:32 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 10:25:02 2020 +0200 tools: add xenfs tool Add the xenfs tool for accessing the hypervisor filesystem. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- .gitignore | 1 + docs/man/xenhypfs.1.pod | 60 +++++++++++++++ tools/misc/Makefile | 6 ++ tools/misc/xenhypfs.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 259 insertions(+) diff --git a/.gitignore b/.gitignore index abf13df5ec..f5f9770de9 100644 --- a/.gitignore +++ b/.gitignore @@ -368,6 +368,7 @@ tools/libxl/test_timedereg tools/libxl/test_fdderegrace tools/firmware/etherboot/eb-roms.h tools/firmware/etherboot/gpxe-git-snapshot.tar.gz +tools/misc/xenhypfs tools/misc/xenwatchdogd tools/misc/xen-hvmcrash tools/misc/xen-lowmemd diff --git a/docs/man/xenhypfs.1.pod b/docs/man/xenhypfs.1.pod new file mode 100644 index 0000000000..d5553b1150 --- /dev/null +++ b/docs/man/xenhypfs.1.pod @@ -0,0 +1,60 @@ +=head1 NAME + +xenhypfs - Xen tool to access Xen hypervisor file system + +=head1 SYNOPSIS + +B I [I] [I] + +=head1 DESCRIPTION + +The B program is used to access the Xen hypervisor file system. +It can be used to show the available entries, to show their contents and +(if allowed) to modify their contents. + +=head1 SUBCOMMANDS + +=over 4 + +=item B I + +List the available entries below I. + +=item B [I<-b>] I + +Show the contents of the entry specified by I. Non-printable characters +other than white space characters (like tab, new line) will be shown as +B<\xnn> (B being a two digit hex number) unless the option B<-b> is +specified. + +=item B I I + +Set the contents of the entry specified by I to I. + +=item B + +Show all the entries of the file system as a tree. + +=back + +=head1 RETURN CODES + +=over 4 + +=item B<0> + +Success + +=item B<1> + +Invalid usage (e.g. unknown subcommand, unknown option, missing parameter). + +=item B<2> + +Entry not found while traversing the tree. + +=item B<3> + +Access right violation. + +=back diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 63947bfadc..9fdb13597f 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -24,6 +24,7 @@ INSTALL_SBIN-$(CONFIG_X86) += xen-lowmemd INSTALL_SBIN-$(CONFIG_X86) += xen-mfndump INSTALL_SBIN-$(CONFIG_X86) += xen-ucode INSTALL_SBIN += xencov +INSTALL_SBIN += xenhypfs INSTALL_SBIN += xenlockprof INSTALL_SBIN += xenperf INSTALL_SBIN += xenpm @@ -86,6 +87,9 @@ xenperf: xenperf.o xenpm: xenpm.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) +xenhypfs: xenhypfs.o + $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenhypfs) $(APPEND_LDFLAGS) + xenlockprof: xenlockprof.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenctrl) $(APPEND_LDFLAGS) @@ -94,6 +98,8 @@ xen-hptool.o: CFLAGS += -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall) xen-hptool: xen-hptool.o $(CC) $(LDFLAGS) -o $@ $< $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(APPEND_LDFLAGS) +xenhypfs.o: CFLAGS += $(CFLAGS_libxenhypfs) + # xen-mfndump incorrectly uses libxc internals xen-mfndump.o: CFLAGS += -I$(XEN_ROOT)/tools/libxc $(CFLAGS_libxencall) xen-mfndump: xen-mfndump.o diff --git a/tools/misc/xenhypfs.c b/tools/misc/xenhypfs.c new file mode 100644 index 0000000000..158b901f42 --- /dev/null +++ b/tools/misc/xenhypfs.c @@ -0,0 +1,192 @@ +#define _GNU_SOURCE +#include +#include +#include +#include +#include + +static struct xenhypfs_handle *hdl; + +static int usage(void) +{ + fprintf(stderr, "usage: xenhypfs ls \n"); + fprintf(stderr, " xenhypfs cat [-b] \n"); + fprintf(stderr, " xenhypfs write \n"); + fprintf(stderr, " xenhypfs tree\n"); + + return 1; +} + +static void xenhypfs_print_escaped(char *string) +{ + char *c; + + for (c = string; *c; c++) { + if (isgraph(*c) || isspace(*c)) + printf("%c", *c); + else + printf("\\x%02x", *c); + } + printf("\n"); +} + +static int xenhypfs_cat(int argc, char *argv[]) +{ + int ret = 0; + char *result; + char *path; + bool bin = false; + + switch (argc) { + case 1: + path = argv[0]; + break; + + case 2: + if (strcmp(argv[0], "-b")) + return usage(); + bin = true; + path = argv[1]; + break; + + default: + return usage(); + } + + result = xenhypfs_read(hdl, path); + if (!result) { + perror("could not read"); + ret = 3; + } else { + if (!bin) + printf("%s\n", result); + else + xenhypfs_print_escaped(result); + free(result); + } + + return ret; +} + +static int xenhypfs_wr(char *path, char *val) +{ + int ret; + + ret = xenhypfs_write(hdl, path, val); + if (ret) { + perror("could not write"); + ret = 3; + } + + return ret; +} + +static char *xenhypfs_type(struct xenhypfs_dirent *ent) +{ + char *res; + + switch (ent->type) { + case xenhypfs_type_dir: + res = " "; + break; + case xenhypfs_type_blob: + res = " "; + break; + case xenhypfs_type_string: + res = ""; + break; + case xenhypfs_type_uint: + res = " "; + break; + case xenhypfs_type_int: + res = " "; + break; + case xenhypfs_type_bool: + res = " "; + break; + default: + res = "<\?\?\?> "; + break; + } + + return res; +} + +static int xenhypfs_ls(char *path) +{ + struct xenhypfs_dirent *ent; + unsigned int n, i; + int ret = 0; + + ent = xenhypfs_readdir(hdl, path, &n); + if (!ent) { + perror("could not read dir"); + ret = 3; + } else { + for (i = 0; i < n; i++) + printf("%s r%c %s\n", xenhypfs_type(ent + i), + ent[i].is_writable ? 'w' : '-', ent[i].name); + + free(ent); + } + + return ret; +} + +static int xenhypfs_tree_sub(char *path, unsigned int depth) +{ + struct xenhypfs_dirent *ent; + unsigned int n, i; + int ret = 0; + char *p; + + ent = xenhypfs_readdir(hdl, path, &n); + if (!ent) + return 2; + + for (i = 0; i < n; i++) { + printf("%*s%s%s\n", depth * 2, "", ent[i].name, + ent[i].type == xenhypfs_type_dir ? "/" : ""); + if (ent[i].type == xenhypfs_type_dir) { + asprintf(&p, "%s%s%s", path, (depth == 1) ? "" : "/", ent[i].name); + if (xenhypfs_tree_sub(p, depth + 1)) + ret = 2; + } + } + + free(ent); + + return ret; +} + +static int xenhypfs_tree(void) +{ + printf("/\n"); + + return xenhypfs_tree_sub("/", 1); +} + +int main(int argc, char *argv[]) +{ + int ret; + + hdl = xenhypfs_open(NULL, 0); + + if (!hdl) { + fprintf(stderr, "Could not open libxenhypfs\n"); + ret = 2; + } else if (argc >= 3 && !strcmp(argv[1], "cat")) + ret = xenhypfs_cat(argc - 2, argv + 2); + else if (argc == 3 && !strcmp(argv[1], "ls")) + ret = xenhypfs_ls(argv[2]); + else if (argc == 4 && !strcmp(argv[1], "write")) + ret = xenhypfs_wr(argv[2], argv[3]); + else if (argc == 2 && !strcmp(argv[1], "tree")) + ret = xenhypfs_tree(); + else + ret = usage(); + + xenhypfs_close(hdl); + + return ret; +} -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:33:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecK3-0000Lp-6v; Fri, 29 May 2020 10:33:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecK1-0000Lj-SI for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:05 +0000 X-Inumbo-ID: c7d4a0e8-a197-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c7d4a0e8-a197-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 10:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WufvX1GJWJw2q00iWoXkJsrUs7c6VOjHROPVb8IuMmk=; b=tz5XVowtkiOUOc4e21EHJbimGG FRqiS3dAkvvfExvPwoq4U4qzhle9lzx/DpIE5hojMoaB+LooSlip6B3dj+z7I9oypt1AvgcQgFWc2 mTBKmcw03lYmWTR5lDtjpuNgueg7lVnzn1eKZYHQwUxORgKAsy2175o1r9mDr76zbbPU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecK1-00018G-7t for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecK1-00042J-6w for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/hypfs: make struct hypfs_entry_leaf initializers work with gcc 4.1 Message-Id: Date: Fri, 29 May 2020 10:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 048f82ccd1b3dda511af25a7a8524c8ba5ca2786 Author: Juergen Gross AuthorDate: Fri May 29 12:14:24 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:14:24 2020 +0200 xen/hypfs: make struct hypfs_entry_leaf initializers work with gcc 4.1 gcc 4.1 has problems with static initializers for anonymous unions. Fix this by naming the union in struct hypfs_entry_leaf. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Tested-by: Jan Beulich --- xen/common/hypfs.c | 8 ++++---- xen/include/xen/hypfs.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/common/hypfs.c b/xen/common/hypfs.c index 9c2213a068..a111c2f86d 100644 --- a/xen/common/hypfs.c +++ b/xen/common/hypfs.c @@ -126,7 +126,7 @@ int hypfs_add_leaf(struct hypfs_entry_dir *parent, { int ret; - if ( !leaf->content ) + if ( !leaf->u.content ) ret = -EINVAL; else ret = add_entry(parent, &leaf->e); @@ -255,7 +255,7 @@ int hypfs_read_leaf(const struct hypfs_entry *entry, l = container_of(entry, const struct hypfs_entry_leaf, e); - return copy_to_guest(uaddr, l->content, entry->size) ? -EFAULT: 0; + return copy_to_guest(uaddr, l->u.content, entry->size) ? -EFAULT: 0; } static int hypfs_read(const struct hypfs_entry *entry, @@ -317,7 +317,7 @@ int hypfs_write_leaf(struct hypfs_entry_leaf *leaf, goto out; ret = 0; - memcpy(leaf->write_ptr, buf, ulen); + memcpy(leaf->u.write_ptr, buf, ulen); leaf->e.size = ulen; out: @@ -341,7 +341,7 @@ int hypfs_write_bool(struct hypfs_entry_leaf *leaf, if ( copy_from_guest(&buf, uaddr, ulen) ) return -EFAULT; - *(bool *)leaf->write_ptr = buf; + *(bool *)leaf->u.write_ptr = buf; return 0; } diff --git a/xen/include/xen/hypfs.h b/xen/include/xen/hypfs.h index 5c6a0ccece..39845ec5ae 100644 --- a/xen/include/xen/hypfs.h +++ b/xen/include/xen/hypfs.h @@ -26,7 +26,7 @@ struct hypfs_entry_leaf { union { const void *content; void *write_ptr; - }; + } u; }; struct hypfs_entry_dir { @@ -68,7 +68,7 @@ struct hypfs_entry_dir { static inline void hypfs_string_set_reference(struct hypfs_entry_leaf *leaf, const char *str) { - leaf->content = str; + leaf->u.content = str; leaf->e.size = strlen(str) + 1; } @@ -81,7 +81,7 @@ static inline void hypfs_string_set_reference(struct hypfs_entry_leaf *leaf, .e.max_size = (wr) ? sizeof(contvar) : 0, \ .e.read = hypfs_read_leaf, \ .e.write = (wr), \ - .content = &(contvar), \ + .u.content = &(contvar), \ } #define HYPFS_UINT_INIT(var, nam, contvar) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:33:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:33:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKE-0000Mp-8X; Fri, 29 May 2020 10:33:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKC-0000Ma-Lu for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:16 +0000 X-Inumbo-ID: cdd974dc-a197-11ea-a88c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id cdd974dc-a197-11ea-a88c-12813bfff9fa; Fri, 29 May 2020 10:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=z09iiSPHX9zNnFudGP7Qm9D50sMBEhdMW3ClMQpTesA=; b=i6id0xeIAW9BM4PThmyLjoTwK1 n2iqYAhZKFm8G4O+qT+FDVbLLqQjLbcij5dTD2lWK6GNuNYfqxywu94NmuIP8jMuI4kIhho0l40Nw kjJ48vWdtNVBDdLZPcj/50WNhYBPMgOectrBm21uQpipZpIC6QKUUvxo9a4FnNTnyrPk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKB-00018M-Au for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecKB-00043Q-A2 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: provide version information in hypfs Message-Id: Date: Fri, 29 May 2020 10:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b5d4711d2b17753498a3f587585f11bf9ca5af85 Author: Juergen Gross AuthorDate: Fri May 29 12:14:51 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:14:51 2020 +0200 xen: provide version information in hypfs Provide version and compile information in /buildinfo/ node of the Xen hypervisor file system. As this information is accessible by dom0 only no additional security problem arises. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- docs/misc/hypfs-paths.pandoc | 45 ++++++++++++++++++++++++++++++++++++++++++ xen/common/kernel.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/docs/misc/hypfs-paths.pandoc b/docs/misc/hypfs-paths.pandoc index 39539fa1b5..d730caf394 100644 --- a/docs/misc/hypfs-paths.pandoc +++ b/docs/misc/hypfs-paths.pandoc @@ -105,3 +105,48 @@ A populated Xen hypervisor file system might look like the following example: #### / The root of the hypervisor file system. + +#### /buildinfo/ + +A directory containing static information generated while building the +hypervisor. + +#### /buildinfo/changeset = STRING + +Git commit of the hypervisor. + +#### /buildinfo/compileinfo/ + +A directory containing information about compilation of Xen. + +#### /buildinfo/compileinfo/compile_by = STRING + +Information who compiled the hypervisor. + +#### /buildinfo/compileinfo/compile_date = STRING + +Date of the hypervisor compilation. + +#### /buildinfo/compileinfo/compile_domain = STRING + +Information about the compile domain. + +#### /buildinfo/compileinfo/compiler = STRING + +The compiler used to build Xen. + +#### /buildinfo/version/ + +A directory containing version information of the hypervisor. + +#### /buildinfo/version/extra = STRING + +Extra version information. + +#### /buildinfo/version/major = INTEGER + +The major version of Xen. + +#### /buildinfo/version/minor = INTEGER + +The minor version of Xen. diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 572e3fc07d..db7bd23fcb 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -373,6 +374,52 @@ void __init do_initcalls(void) (*call)(); } +#ifdef CONFIG_HYPFS +static unsigned int __read_mostly major_version; +static unsigned int __read_mostly minor_version; + +static HYPFS_DIR_INIT(buildinfo, "buildinfo"); +static HYPFS_DIR_INIT(compileinfo, "compileinfo"); +static HYPFS_DIR_INIT(version, "version"); +static HYPFS_UINT_INIT(major, "major", major_version); +static HYPFS_UINT_INIT(minor, "minor", minor_version); +static HYPFS_STRING_INIT(changeset, "changeset"); +static HYPFS_STRING_INIT(compiler, "compiler"); +static HYPFS_STRING_INIT(compile_by, "compile_by"); +static HYPFS_STRING_INIT(compile_date, "compile_date"); +static HYPFS_STRING_INIT(compile_domain, "compile_domain"); +static HYPFS_STRING_INIT(extra, "extra"); + +static int __init buildinfo_init(void) +{ + hypfs_add_dir(&hypfs_root, &buildinfo, true); + + hypfs_string_set_reference(&changeset, xen_changeset()); + hypfs_add_leaf(&buildinfo, &changeset, true); + + hypfs_add_dir(&buildinfo, &compileinfo, true); + hypfs_string_set_reference(&compiler, xen_compiler()); + hypfs_string_set_reference(&compile_by, xen_compile_by()); + hypfs_string_set_reference(&compile_date, xen_compile_date()); + hypfs_string_set_reference(&compile_domain, xen_compile_domain()); + hypfs_add_leaf(&compileinfo, &compiler, true); + hypfs_add_leaf(&compileinfo, &compile_by, true); + hypfs_add_leaf(&compileinfo, &compile_date, true); + hypfs_add_leaf(&compileinfo, &compile_domain, true); + + major_version = xen_major_version(); + minor_version = xen_minor_version(); + hypfs_add_dir(&buildinfo, &version, true); + hypfs_string_set_reference(&extra, xen_extra_version()); + hypfs_add_leaf(&version, &extra, true); + hypfs_add_leaf(&version, &major, true); + hypfs_add_leaf(&version, &minor, true); + + return 0; +} +__initcall(buildinfo_init); +#endif + # define DO(fn) long do_##fn #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:33:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKN-0000Nv-A5; Fri, 29 May 2020 10:33:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKM-0000Nn-5A for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:26 +0000 X-Inumbo-ID: d3dcb1e6-a197-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d3dcb1e6-a197-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 10:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6SpNhX2+pdgpM6Mm8EJxQVz82OMxboIHuz2EPsNa4l4=; b=RGiCxujc+39TDYxrmU5NPIX1Vd RMvgxe4My41yJOABAPitx6usmrGfzAYZFcYMNaanD/fOMkIckLTiLt5zD/s8JeWT1hBvbGTNpPIzn p9AmZbhLFbOElLte+PrZsdQzMPV4wd5vCN5yBLNPpD9QGz9GR2+pTuDfVxfdQ6cFCZ3Q=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKL-00018Y-Dk for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecKL-000447-D3 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: add /buildinfo/config entry to hypervisor filesystem Message-Id: Date: Fri, 29 May 2020 10:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 58263ed7713e8132c2bc00bc870399ea31bf2231 Author: Juergen Gross AuthorDate: Fri May 29 12:15:54 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:15:54 2020 +0200 xen: add /buildinfo/config entry to hypervisor filesystem Add the /buildinfo/config entry to the hypervisor filesystem. This entry contains the .config file used to build the hypervisor. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich --- .gitignore | 2 ++ docs/misc/hypfs-paths.pandoc | 4 ++++ xen/common/Kconfig | 11 +++++++++++ xen/common/Makefile | 12 ++++++++++++ xen/common/kernel.c | 11 +++++++++++ xen/include/xen/kernel.h | 3 +++ 6 files changed, 43 insertions(+) diff --git a/.gitignore b/.gitignore index f5f9770de9..36ce2ea104 100644 --- a/.gitignore +++ b/.gitignore @@ -298,6 +298,8 @@ xen/arch/*/efi/boot.c xen/arch/*/efi/compat.c xen/arch/*/efi/efi.h xen/arch/*/efi/runtime.c +xen/common/config_data.S +xen/common/config.gz xen/include/headers*.chk xen/include/asm xen/include/asm-*/asm-offsets.h diff --git a/docs/misc/hypfs-paths.pandoc b/docs/misc/hypfs-paths.pandoc index d730caf394..9a76bc383b 100644 --- a/docs/misc/hypfs-paths.pandoc +++ b/docs/misc/hypfs-paths.pandoc @@ -135,6 +135,10 @@ Information about the compile domain. The compiler used to build Xen. +#### /buildinfo/config = STRING [CONFIG_HYPFS_CONFIG] + +The contents of the `xen/.config` file at the time of the hypervisor build. + #### /buildinfo/version/ A directory containing version information of the hypervisor. diff --git a/xen/common/Kconfig b/xen/common/Kconfig index e768ea36b2..065f2ee454 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -127,6 +127,17 @@ config HYPFS If unsure, say Y. +config HYPFS_CONFIG + bool "Provide hypervisor .config via hypfs entry" + default y + depends on HYPFS + ---help--- + When enabled the contents of the .config file used to build the + hypervisor are provided via the hypfs entry /buildinfo/config. + + Disable this option in case you want to spare some memory or you + want to hide the .config contents from dom0. + config KEXEC bool "kexec support" default y diff --git a/xen/common/Makefile b/xen/common/Makefile index bf7d0e25a3..91581e1815 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -1,6 +1,7 @@ obj-$(CONFIG_ARGO) += argo.o obj-y += bitmap.o obj-y += bsearch.o +obj-$(CONFIG_HYPFS_CONFIG) += config_data.o obj-$(CONFIG_CORE_PARKING) += core_parking.o obj-y += cpu.o obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o @@ -73,3 +74,14 @@ obj-$(CONFIG_UBSAN) += ubsan/ obj-$(CONFIG_NEEDS_LIBELF) += libelf/ obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/ + +config.gz: ../.config + gzip -c $< >$@ + +config_data.o: config.gz + +config_data.S: $(XEN_ROOT)/xen/tools/binfile + $(SHELL) $(XEN_ROOT)/xen/tools/binfile $@ config.gz xen_config_data + +clean:: + rm -f config_data.S config.gz 2>/dev/null diff --git a/xen/common/kernel.c b/xen/common/kernel.c index db7bd23fcb..0fb5b50b45 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -390,6 +390,10 @@ static HYPFS_STRING_INIT(compile_date, "compile_date"); static HYPFS_STRING_INIT(compile_domain, "compile_domain"); static HYPFS_STRING_INIT(extra, "extra"); +#ifdef CONFIG_HYPFS_CONFIG +static HYPFS_STRING_INIT(config, "config"); +#endif + static int __init buildinfo_init(void) { hypfs_add_dir(&hypfs_root, &buildinfo, true); @@ -415,6 +419,13 @@ static int __init buildinfo_init(void) hypfs_add_leaf(&version, &major, true); hypfs_add_leaf(&version, &minor, true); +#ifdef CONFIG_HYPFS_CONFIG + config.e.encoding = XEN_HYPFS_ENC_GZIP; + config.e.size = xen_config_data_size; + config.u.content = xen_config_data; + hypfs_add_leaf(&buildinfo, &config, true); +#endif + return 0; } __initcall(buildinfo_init); diff --git a/xen/include/xen/kernel.h b/xen/include/xen/kernel.h index 548b64da9f..8cd142032d 100644 --- a/xen/include/xen/kernel.h +++ b/xen/include/xen/kernel.h @@ -100,5 +100,8 @@ extern enum system_state { bool_t is_active_kernel_text(unsigned long addr); +extern const char xen_config_data[]; +extern const unsigned int xen_config_data_size; + #endif /* _LINUX_KERNEL_H */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:33:39 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:33:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKZ-0000Ph-BZ; Fri, 29 May 2020 10:33:39 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKX-0000PP-9P for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:37 +0000 X-Inumbo-ID: d9e2dd4a-a197-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d9e2dd4a-a197-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 10:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+CsLK3+U5r+CjEaHQYtpxrcwzWZWSlXdmOoUOmgppd0=; b=ZPOqxL2AoIhkW1McM/oFDRe3yS 7lfi5GM8/8DK9/Lrp/VYaJkfTgtsvYSv8CqTYNoYY3g4uYejn7zR4xgQJbh9kx1wO/yuvyFqfbCC0 nS72ZJJwSP2AIQS2uKWBfuW7ut4Enix6dEH551kEHEUVsuHeXSoieyNs2O4frzN0fVSQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKV-00018h-HF for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecKV-00044t-GI for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: add runtime parameter access support to hypfs Message-Id: Date: Fri, 29 May 2020 10:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a659d7cab9afcba337cb60225738fd85ff7aa3da Author: Juergen Gross AuthorDate: Fri May 29 12:18:36 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:18:36 2020 +0200 xen: add runtime parameter access support to hypfs Add support to read and modify values of hypervisor runtime parameters via the hypervisor file system. As runtime parameters can be modified via a sysctl, too, this path has to take the hypfs rw_lock as writer. For custom runtime parameters the connection between the parameter value and the file system is done via an init function which will set the initial value (if needed) and the leaf properties. Signed-off-by: Juergen Gross Reviewed-by: Jan Beulich Acked-by: Julien Grall --- docs/misc/hypfs-paths.pandoc | 9 ++++ xen/arch/arm/xen.lds.S | 8 +++ xen/arch/x86/hvm/vmx/vmcs.c | 29 ++++++++++- xen/arch/x86/pv/domain.c | 21 +++++++- xen/arch/x86/xen.lds.S | 7 +++ xen/common/grant_table.c | 62 ++++++++++++++++++---- xen/common/hypfs.c | 34 ++++++++++++- xen/common/kernel.c | 29 ++++++++++- xen/drivers/char/console.c | 72 +++++++++++++++++++++++--- xen/include/xen/hypfs.h | 7 +++ xen/include/xen/param.h | 119 +++++++++++++++++++++++++++++++++++++++++-- 11 files changed, 372 insertions(+), 25 deletions(-) diff --git a/docs/misc/hypfs-paths.pandoc b/docs/misc/hypfs-paths.pandoc index 9a76bc383b..a111c6f25c 100644 --- a/docs/misc/hypfs-paths.pandoc +++ b/docs/misc/hypfs-paths.pandoc @@ -154,3 +154,12 @@ The major version of Xen. #### /buildinfo/version/minor = INTEGER The minor version of Xen. + +#### /params/ + +A directory of runtime parameters. + +#### /params/* + +The individual parameters. The description of the different parameters can be +found in `docs/misc/xen-command-line.pandoc`. diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index a497f6a48d..549ceb9749 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -89,6 +89,14 @@ SECTIONS __start_schedulers_array = .; *(.data.schedulers) __end_schedulers_array = .; + +#ifdef CONFIG_HYPFS + . = ALIGN(8); + __paramhypfs_start = .; + *(.data.paramhypfs) + __paramhypfs_end = .; +#endif + *(.data.rel) *(.data.rel.*) CONSTRUCTORS diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 221af9737a..3410bc5f6d 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -97,6 +97,30 @@ static int __init parse_ept_param(const char *s) } custom_param("ept", parse_ept_param); +#ifdef CONFIG_HYPFS +static char opt_ept_setting[10]; + +static void update_ept_param(void) +{ + if ( opt_ept_exec_sp >= 0 ) + snprintf(opt_ept_setting, sizeof(opt_ept_setting), "exec-sp=%d", + opt_ept_exec_sp); +} + +static void __init init_ept_param(struct param_hypfs *par) +{ + update_ept_param(); + custom_runtime_set_var(par, opt_ept_setting); +} +#else +static void update_ept_param(void) +{ +} +#endif + +static int parse_ept_param_runtime(const char *s); +custom_runtime_only_param("ept", parse_ept_param_runtime, init_ept_param); + static int parse_ept_param_runtime(const char *s) { struct domain *d; @@ -115,6 +139,10 @@ static int parse_ept_param_runtime(const char *s) opt_ept_exec_sp = val; + update_ept_param(); + custom_runtime_set_var(param_2_parfs(parse_ept_param_runtime), + opt_ept_setting); + rcu_read_lock(&domlist_read_lock); for_each_domain ( d ) { @@ -144,7 +172,6 @@ static int parse_ept_param_runtime(const char *s) return 0; } -custom_runtime_only_param("ept", parse_ept_param_runtime); /* Dynamic (run-time adjusted) execution control flags. */ u32 vmx_pin_based_exec_control __read_mostly; diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index 0a4a5bd001..f4e863a410 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -55,6 +55,23 @@ static __read_mostly enum { PCID_NOXPTI } opt_pcid = PCID_XPTI; +#ifdef CONFIG_HYPFS +static const char opt_pcid_2_string[][7] = { + [PCID_OFF] = "off", + [PCID_ALL] = "on", + [PCID_XPTI] = "xpti", + [PCID_NOXPTI] = "noxpti", +}; + +static void __init opt_pcid_init(struct param_hypfs *par) +{ + custom_runtime_set_var(par, opt_pcid_2_string[opt_pcid]); +} +#endif + +static int parse_pcid(const char *s); +custom_runtime_param("pcid", parse_pcid, opt_pcid_init); + static int parse_pcid(const char *s) { int rc = 0; @@ -87,9 +104,11 @@ static int parse_pcid(const char *s) break; } + custom_runtime_set_var(param_2_parfs(parse_pcid), + opt_pcid_2_string[opt_pcid]); + return rc; } -custom_runtime_param("pcid", parse_pcid); static void noreturn continue_nonidle_domain(struct vcpu *v) { diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 0e3a733cab..3ed020e26b 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -279,6 +279,13 @@ SECTIONS __start_schedulers_array = .; *(.data.schedulers) __end_schedulers_array = .; + +#ifdef CONFIG_HYPFS + . = ALIGN(8); + __paramhypfs_start = .; + *(.data.paramhypfs) + __paramhypfs_end = .; +#endif } :text DECL_SECTION(.data) { diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 5ef7ff940d..ece670e484 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -85,8 +85,43 @@ struct grant_table { struct grant_table_arch arch; }; -static int parse_gnttab_limit(const char *param, const char *arg, - unsigned int *valp) +unsigned int __read_mostly opt_max_grant_frames = 64; +static unsigned int __read_mostly opt_max_maptrack_frames = 1024; + +#ifdef CONFIG_HYPFS +#define GRANT_CUSTOM_VAL_SZ 12 +static char __read_mostly opt_max_grant_frames_val[GRANT_CUSTOM_VAL_SZ]; +static char __read_mostly opt_max_maptrack_frames_val[GRANT_CUSTOM_VAL_SZ]; + +static void update_gnttab_par(unsigned int val, struct param_hypfs *par, + char *parval) +{ + snprintf(parval, GRANT_CUSTOM_VAL_SZ, "%u", val); + custom_runtime_set_var_sz(par, parval, GRANT_CUSTOM_VAL_SZ); +} + +static void __init gnttab_max_frames_init(struct param_hypfs *par) +{ + update_gnttab_par(opt_max_grant_frames, par, opt_max_grant_frames_val); +} + +static void __init max_maptrack_frames_init(struct param_hypfs *par) +{ + update_gnttab_par(opt_max_maptrack_frames, par, + opt_max_maptrack_frames_val); +} +#else +#define update_gnttab_par(v, unused1, unused2) update_gnttab_par(v) +#define parse_gnttab_limit(a, v, unused1, unused2) parse_gnttab_limit(a, v) + +static void update_gnttab_par(unsigned int val, struct param_hypfs *par, + char *parval) +{ +} +#endif + +static int parse_gnttab_limit(const char *arg, unsigned int *valp, + struct param_hypfs *par, char *parval) { const char *e; unsigned long val; @@ -99,28 +134,33 @@ static int parse_gnttab_limit(const char *param, const char *arg, return -ERANGE; *valp = val; + update_gnttab_par(val, par, parval); return 0; } -unsigned int __read_mostly opt_max_grant_frames = 64; +static int parse_gnttab_max_frames(const char *arg); +custom_runtime_param("gnttab_max_frames", parse_gnttab_max_frames, + gnttab_max_frames_init); static int parse_gnttab_max_frames(const char *arg) { - return parse_gnttab_limit("gnttab_max_frames", arg, - &opt_max_grant_frames); + return parse_gnttab_limit(arg, &opt_max_grant_frames, + param_2_parfs(parse_gnttab_max_frames), + opt_max_grant_frames_val); } -custom_runtime_param("gnttab_max_frames", parse_gnttab_max_frames); -static unsigned int __read_mostly opt_max_maptrack_frames = 1024; +static int parse_gnttab_max_maptrack_frames(const char *arg); +custom_runtime_param("gnttab_max_maptrack_frames", + parse_gnttab_max_maptrack_frames, + max_maptrack_frames_init); static int parse_gnttab_max_maptrack_frames(const char *arg) { - return parse_gnttab_limit("gnttab_max_maptrack_frames", arg, - &opt_max_maptrack_frames); + return parse_gnttab_limit(arg, &opt_max_maptrack_frames, + param_2_parfs(parse_gnttab_max_maptrack_frames), + opt_max_maptrack_frames_val); } -custom_runtime_param("gnttab_max_maptrack_frames", - parse_gnttab_max_maptrack_frames); #ifndef GNTTAB_MAX_VERSION #define GNTTAB_MAX_VERSION 2 diff --git a/xen/common/hypfs.c b/xen/common/hypfs.c index a111c2f86d..b982c74fba 100644 --- a/xen/common/hypfs.c +++ b/xen/common/hypfs.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -41,7 +42,7 @@ static void hypfs_read_lock(void) this_cpu(hypfs_locked) = hypfs_read_locked; } -static void hypfs_write_lock(void) +void hypfs_write_lock(void) { ASSERT(this_cpu(hypfs_locked) == hypfs_unlocked); @@ -49,7 +50,7 @@ static void hypfs_write_lock(void) this_cpu(hypfs_locked) = hypfs_write_locked; } -static void hypfs_unlock(void) +void hypfs_unlock(void) { enum hypfs_lock_state locked = this_cpu(hypfs_locked); @@ -346,6 +347,35 @@ int hypfs_write_bool(struct hypfs_entry_leaf *leaf, return 0; } +int hypfs_write_custom(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen) +{ + struct param_hypfs *p; + char *buf; + int ret; + + ASSERT(this_cpu(hypfs_locked) == hypfs_write_locked); + + buf = xzalloc_array(char, ulen); + if ( !buf ) + return -ENOMEM; + + ret = -EFAULT; + if ( copy_from_guest(buf, uaddr, ulen) ) + goto out; + + ret = -EDOM; + if ( memchr(buf, 0, ulen) != (buf + ulen - 1) ) + goto out; + + p = container_of(leaf, struct param_hypfs, hypfs); + ret = p->param->par.func(buf); + + out: + xfree(buf); + return ret; +} + static int hypfs_write(struct hypfs_entry *entry, XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned long ulen) { diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 0fb5b50b45..952fab59e4 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -198,7 +198,13 @@ static void __init _cmdline_parse(const char *cmdline) int runtime_parse(const char *line) { - return parse_params(line, __param_start, __param_end); + int ret; + + hypfs_write_lock(); + ret = parse_params(line, __param_start, __param_end); + hypfs_unlock(); + + return ret; } /** @@ -429,6 +435,27 @@ static int __init buildinfo_init(void) return 0; } __initcall(buildinfo_init); + +static HYPFS_DIR_INIT(params, "params"); + +static int __init param_init(void) +{ + struct param_hypfs *param; + + hypfs_add_dir(&hypfs_root, ¶ms, true); + + for ( param = __paramhypfs_start; param < __paramhypfs_end; param++ ) + { + if ( param->init_leaf ) + param->init_leaf(param); + else if ( param->hypfs.e.type == XEN_HYPFS_TYPE_STRING ) + param->hypfs.e.size = strlen(param->hypfs.u.content) + 1; + hypfs_add_leaf(¶ms, ¶m->hypfs, true); + } + + return 0; +} +__initcall(param_init); #endif # define DO(fn) long do_##fn diff --git a/xen/drivers/char/console.c b/xen/drivers/char/console.c index 913ae1b66a..56e24821b2 100644 --- a/xen/drivers/char/console.c +++ b/xen/drivers/char/console.c @@ -79,8 +79,28 @@ enum con_timestamp_mode static enum con_timestamp_mode __read_mostly opt_con_timestamp_mode = TSM_NONE; +#ifdef CONFIG_HYPFS +static const char con_timestamp_mode_2_string[][7] = { + [TSM_NONE] = "none", + [TSM_DATE] = "date", + [TSM_DATE_MS] = "datems", + [TSM_BOOT] = "boot", + [TSM_RAW] = "raw", +}; + +static void con_timestamp_mode_upd(struct param_hypfs *par) +{ + const char *val = con_timestamp_mode_2_string[opt_con_timestamp_mode]; + + custom_runtime_set_var_sz(par, val, 7); +} +#else +#define con_timestamp_mode_upd(par) +#endif + static int parse_console_timestamps(const char *s); -custom_runtime_param("console_timestamps", parse_console_timestamps); +custom_runtime_param("console_timestamps", parse_console_timestamps, + con_timestamp_mode_upd); /* conring_size: allows a large console ring than default (16kB). */ static uint32_t __initdata opt_conring_size; @@ -143,6 +163,39 @@ static int __read_mostly xenlog_guest_lower_thresh = static int parse_loglvl(const char *s); static int parse_guest_loglvl(const char *s); +#ifdef CONFIG_HYPFS +#define LOGLVL_VAL_SZ 16 +static char xenlog_val[LOGLVL_VAL_SZ]; +static char xenlog_guest_val[LOGLVL_VAL_SZ]; + +static char *lvl2opt[] = { "none", "error", "warning", "info", "all" }; + +static void xenlog_update_val(int lower, int upper, char *val) +{ + snprintf(val, LOGLVL_VAL_SZ, "%s/%s", lvl2opt[lower], lvl2opt[upper]); +} + +static void __init xenlog_init(struct param_hypfs *par) +{ + xenlog_update_val(xenlog_lower_thresh, xenlog_upper_thresh, xenlog_val); + custom_runtime_set_var(par, xenlog_val); +} + +static void __init xenlog_guest_init(struct param_hypfs *par) +{ + xenlog_update_val(xenlog_guest_lower_thresh, xenlog_guest_upper_thresh, + xenlog_guest_val); + custom_runtime_set_var(par, xenlog_guest_val); +} +#else +#define xenlog_val NULL +#define xenlog_guest_val NULL + +static void xenlog_update_val(int lower, int upper, char *val) +{ +} +#endif + /* * := none|error|warning|info|debug|all * loglvl=[/] @@ -151,8 +204,8 @@ static int parse_guest_loglvl(const char *s); * Similar definitions for guest_loglvl, but applies to guest tracing. * Defaults: loglvl=warning ; guest_loglvl=none/warning */ -custom_runtime_param("loglvl", parse_loglvl); -custom_runtime_param("guest_loglvl", parse_guest_loglvl); +custom_runtime_param("loglvl", parse_loglvl, xenlog_init); +custom_runtime_param("guest_loglvl", parse_guest_loglvl, xenlog_guest_init); static atomic_t print_everything = ATOMIC_INIT(0); @@ -173,7 +226,7 @@ static int __parse_loglvl(const char *s, const char **ps) return 2; /* sane fallback */ } -static int _parse_loglvl(const char *s, int *lower, int *upper) +static int _parse_loglvl(const char *s, int *lower, int *upper, char *val) { *lower = *upper = __parse_loglvl(s, &s); if ( *s == '/' ) @@ -181,18 +234,21 @@ static int _parse_loglvl(const char *s, int *lower, int *upper) if ( *upper < *lower ) *upper = *lower; + xenlog_update_val(*lower, *upper, val); + return *s ? -EINVAL : 0; } static int parse_loglvl(const char *s) { - return _parse_loglvl(s, &xenlog_lower_thresh, &xenlog_upper_thresh); + return _parse_loglvl(s, &xenlog_lower_thresh, &xenlog_upper_thresh, + xenlog_val); } static int parse_guest_loglvl(const char *s) { return _parse_loglvl(s, &xenlog_guest_lower_thresh, - &xenlog_guest_upper_thresh); + &xenlog_guest_upper_thresh, xenlog_guest_val); } static char *loglvl_str(int lvl) @@ -731,9 +787,11 @@ static int parse_console_timestamps(const char *s) { case 0: opt_con_timestamp_mode = TSM_NONE; + con_timestamp_mode_upd(param_2_parfs(parse_console_timestamps)); return 0; case 1: opt_con_timestamp_mode = TSM_DATE; + con_timestamp_mode_upd(param_2_parfs(parse_console_timestamps)); return 0; } if ( *s == '\0' || /* Compat for old booleanparam() */ @@ -750,6 +808,8 @@ static int parse_console_timestamps(const char *s) else return -EINVAL; + con_timestamp_mode_upd(param_2_parfs(parse_console_timestamps)); + return 0; } diff --git a/xen/include/xen/hypfs.h b/xen/include/xen/hypfs.h index 39845ec5ae..c3947eb2b3 100644 --- a/xen/include/xen/hypfs.h +++ b/xen/include/xen/hypfs.h @@ -116,6 +116,13 @@ int hypfs_write_leaf(struct hypfs_entry_leaf *leaf, XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); int hypfs_write_bool(struct hypfs_entry_leaf *leaf, XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); +int hypfs_write_custom(struct hypfs_entry_leaf *leaf, + XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); +void hypfs_write_lock(void); +void hypfs_unlock(void); +#else +static inline void hypfs_write_lock(void) {} +static inline void hypfs_unlock(void) {} #endif #endif /* __XEN_HYPFS_H__ */ diff --git a/xen/include/xen/param.h b/xen/include/xen/param.h index a1dc3ba8f0..26831e9304 100644 --- a/xen/include/xen/param.h +++ b/xen/include/xen/param.h @@ -1,6 +1,7 @@ #ifndef _XEN_PARAM_H #define _XEN_PARAM_H +#include #include #include #include @@ -80,7 +81,115 @@ extern const struct kernel_param __param_start[], __param_end[]; #define __rtparam __param(__dataparam) -#define custom_runtime_only_param(_name, _var) \ +#ifdef CONFIG_HYPFS + +struct param_hypfs { + const struct kernel_param *param; + struct hypfs_entry_leaf hypfs; + void (*init_leaf)(struct param_hypfs *par); +}; + +extern struct param_hypfs __paramhypfs_start[], __paramhypfs_end[]; + +#define __paramhypfs __used_section(".data.paramhypfs") + +#define __paramfs static __paramhypfs \ + __attribute__((__aligned__(sizeof(void *)))) struct param_hypfs + +#define custom_runtime_set_var_sz(parfs, var, sz) \ + { \ + (parfs)->hypfs.u.content = var; \ + (parfs)->hypfs.e.max_size = sz; \ + (parfs)->hypfs.e.size = strlen(var) + 1; \ + } +#define custom_runtime_set_var(parfs, var) \ + custom_runtime_set_var_sz(parfs, var, sizeof(var)) + +#define param_2_parfs(par) &__parfs_##par + +/* initfunc needs to set size and content, e.g. via custom_runtime_set_var(). */ +#define custom_runtime_only_param(nam, variable, initfunc) \ + __rtparam __rtpar_##variable = \ + { .name = (nam), \ + .type = OPT_CUSTOM, \ + .par.func = (variable) }; \ + __paramfs __parfs_##variable = \ + { .param = &__rtpar_##variable, \ + .init_leaf = (initfunc), \ + .hypfs.e.type = XEN_HYPFS_TYPE_STRING, \ + .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .hypfs.e.name = (nam), \ + .hypfs.e.read = hypfs_read_leaf, \ + .hypfs.e.write = hypfs_write_custom } +#define boolean_runtime_only_param(nam, variable) \ + __rtparam __rtpar_##variable = \ + { .name = (nam), \ + .type = OPT_BOOL, \ + .len = sizeof(variable) + \ + BUILD_BUG_ON_ZERO(sizeof(variable) != sizeof(bool)), \ + .par.var = &(variable) }; \ + __paramfs __parfs_##variable = \ + { .param = &__rtpar_##variable, \ + .hypfs.e.type = XEN_HYPFS_TYPE_BOOL, \ + .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .hypfs.e.name = (nam), \ + .hypfs.e.size = sizeof(variable), \ + .hypfs.e.max_size = sizeof(variable), \ + .hypfs.e.read = hypfs_read_leaf, \ + .hypfs.e.write = hypfs_write_bool, \ + .hypfs.u.content = &(variable) } +#define integer_runtime_only_param(nam, variable) \ + __rtparam __rtpar_##variable = \ + { .name = (nam), \ + .type = OPT_UINT, \ + .len = sizeof(variable), \ + .par.var = &(variable) }; \ + __paramfs __parfs_##variable = \ + { .param = &__rtpar_##variable, \ + .hypfs.e.type = XEN_HYPFS_TYPE_UINT, \ + .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .hypfs.e.name = (nam), \ + .hypfs.e.size = sizeof(variable), \ + .hypfs.e.max_size = sizeof(variable), \ + .hypfs.e.read = hypfs_read_leaf, \ + .hypfs.e.write = hypfs_write_leaf, \ + .hypfs.u.content = &(variable) } +#define size_runtime_only_param(nam, variable) \ + __rtparam __rtpar_##variable = \ + { .name = (nam), \ + .type = OPT_SIZE, \ + .len = sizeof(variable), \ + .par.var = &(variable) }; \ + __paramfs __parfs_##variable = \ + { .param = &__rtpar_##variable, \ + .hypfs.e.type = XEN_HYPFS_TYPE_UINT, \ + .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .hypfs.e.name = (nam), \ + .hypfs.e.size = sizeof(variable), \ + .hypfs.e.max_size = sizeof(variable), \ + .hypfs.e.read = hypfs_read_leaf, \ + .hypfs.e.write = hypfs_write_leaf, \ + .hypfs.u.content = &(variable) } +#define string_runtime_only_param(nam, variable) \ + __rtparam __rtpar_##variable = \ + { .name = (nam), \ + .type = OPT_STR, \ + .len = sizeof(variable), \ + .par.var = &(variable) }; \ + __paramfs __parfs_##variable = \ + { .param = &__rtpar_##variable, \ + .hypfs.e.type = XEN_HYPFS_TYPE_STRING, \ + .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ + .hypfs.e.name = (nam), \ + .hypfs.e.size = 0, \ + .hypfs.e.max_size = sizeof(variable), \ + .hypfs.e.read = hypfs_read_leaf, \ + .hypfs.e.write = hypfs_write_leaf, \ + .hypfs.u.content = &(variable) } + +#else + +#define custom_runtime_only_param(_name, _var, unused) \ __rtparam __rtpar_##_var = \ { .name = _name, \ .type = OPT_CUSTOM, \ @@ -111,9 +220,13 @@ extern const struct kernel_param __param_start[], __param_end[]; .len = sizeof(_var), \ .par.var = &_var } -#define custom_runtime_param(_name, _var) \ +#define custom_runtime_set_var(parfs, var) + +#endif + +#define custom_runtime_param(_name, _var, initfunc) \ custom_param(_name, _var); \ - custom_runtime_only_param(_name, _var) + custom_runtime_only_param(_name, _var, initfunc) #define boolean_runtime_param(_name, _var) \ boolean_param(_name, _var); \ boolean_runtime_only_param(_name, _var) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:33:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:33:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKh-0000Qs-Ec; Fri, 29 May 2020 10:33:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKh-0000Qm-7S for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:47 +0000 X-Inumbo-ID: dfe964a2-a197-11ea-a88c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id dfe964a2-a197-11ea-a88c-12813bfff9fa; Fri, 29 May 2020 10:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uRkXJnaqlxcrUlmNuOt/MRlN8/w4QNn5VXDgauGjrBY=; b=uLGKoJRsv5PQcGuK74guOawmsB wdxoRFXiPQEBU57ZHF3Nj16LNuTL88eo5tXcOTuBLVVzd+ZCaZBXQNED1lKJifaQyXDKP0WJ/lqWR nYrTycNi3bfZ0S2aKj+3DoMVT5JcuZMnO2wihW8HqUV4QxsuWzg4Y7rHyCkm5cb3CSKI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKf-00018s-KZ for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecKf-00045W-Jj for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxl: use libxenhypfs for setting xen runtime parameters Message-Id: Date: Fri, 29 May 2020 10:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 2ea4b9829cf95b59f75f0c70543f2368d702305e Author: Juergen Gross AuthorDate: Fri May 29 12:20:08 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:20:08 2020 +0200 tools/libxl: use libxenhypfs for setting xen runtime parameters Instead of xc_set_parameters() use xenhypfs_write() for setting parameters of the hypervisor. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/Rules.mk | 2 +- tools/libxl/Makefile | 3 ++- tools/libxl/libxl.c | 53 +++++++++++++++++++++++++++++++++++++++----- tools/libxl/libxl_internal.h | 1 + tools/libxl/xenlight.pc.in | 2 +- tools/xl/xl_misc.c | 1 - 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 518bb5660a..ac2b0115ec 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -177,7 +177,7 @@ CFLAGS += -O2 -fomit-frame-pointer endif CFLAGS_libxenlight = -I$(XEN_XENLIGHT) $(CFLAGS_libxenctrl) $(CFLAGS_xeninclude) -SHDEPS_libxenlight = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) +SHDEPS_libxenlight = $(SHLIB_libxenctrl) $(SHLIB_libxenstore) $(SHLIB_libxenhypfs) LDLIBS_libxenlight = $(SHDEPS_libxenlight) $(XEN_XENLIGHT)/libxenlight$(libextension) SHLIB_libxenlight = $(SHDEPS_libxenlight) -Wl,-rpath-link=$(XEN_XENLIGHT) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 947eb6036e..38cd43abae 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -20,7 +20,7 @@ LIBUUID_LIBS += -luuid endif LIBXL_LIBS = -LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) +LIBXL_LIBS = $(LDLIBS_libxentoollog) $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxenguest) $(LDLIBS_libxenhypfs) $(LDLIBS_libxenstore) $(LDLIBS_libxentoolcore) $(PTYFUNCS_LIBS) $(LIBUUID_LIBS) ifeq ($(CONFIG_LIBNL),y) LIBXL_LIBS += $(LIBNL3_LIBS) endif @@ -33,6 +33,7 @@ CFLAGS_LIBXL += $(CFLAGS_libxentoolcore) CFLAGS_LIBXL += $(CFLAGS_libxenevtchn) CFLAGS_LIBXL += $(CFLAGS_libxenctrl) CFLAGS_LIBXL += $(CFLAGS_libxenguest) +CFLAGS_LIBXL += $(CFLAGS_libxenhypfs) CFLAGS_LIBXL += $(CFLAGS_libxenstore) ifeq ($(CONFIG_LIBNL),y) CFLAGS_LIBXL += $(LIBNL3_CFLAGS) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index f60fd3e4fd..621acc88f3 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -663,15 +663,56 @@ int libxl_set_parameters(libxl_ctx *ctx, char *params) { int ret; GC_INIT(ctx); + char *par, *val, *end, *path; + xenhypfs_handle *hypfs; - ret = xc_set_parameters(ctx->xch, params); - if (ret < 0) { - LOGEV(ERROR, ret, "setting parameters"); - GC_FREE; - return ERROR_FAIL; + hypfs = xenhypfs_open(ctx->lg, 0); + if (!hypfs) { + LOGE(ERROR, "opening Xen hypfs"); + ret = ERROR_FAIL; + goto out; } + + while (isblank(*params)) + params++; + + for (par = params; *par; par = end) { + end = strchr(par, ' '); + if (!end) + end = par + strlen(par); + + val = strchr(par, '='); + if (val > end) + val = NULL; + if (!val && !strncmp(par, "no", 2)) { + path = libxl__sprintf(gc, "/params/%s", par + 2); + path[end - par - 2 + 8] = 0; + val = "no"; + par += 2; + } else { + path = libxl__sprintf(gc, "/params/%s", par); + path[val - par + 8] = 0; + val = libxl__strndup(gc, val + 1, end - val - 1); + } + + LOG(DEBUG, "setting node \"%s\" to value \"%s\"", path, val); + ret = xenhypfs_write(hypfs, path, val); + if (ret < 0) { + LOGE(ERROR, "setting parameters"); + ret = ERROR_FAIL; + goto out; + } + + while (isblank(*end)) + end++; + } + + ret = 0; + +out: + xenhypfs_close(hypfs); GC_FREE; - return 0; + return ret; } static int fd_set_flags(libxl_ctx *ctx, int fd, diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 41b51b07cd..c7ece066c4 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -56,6 +56,7 @@ #define XC_WANT_COMPAT_MAP_FOREIGN_API #include #include +#include #include #include diff --git a/tools/libxl/xenlight.pc.in b/tools/libxl/xenlight.pc.in index c0f769fd20..6b351ba096 100644 --- a/tools/libxl/xenlight.pc.in +++ b/tools/libxl/xenlight.pc.in @@ -9,4 +9,4 @@ Description: The Xenlight library for Xen hypervisor Version: @@version@@ Cflags: -I${includedir} Libs: @@libsflag@@${libdir} -lxenlight -Requires.private: xentoollog,xenevtchn,xencontrol,xenguest,xenstore +Requires.private: xentoollog,xenevtchn,xencontrol,xenguest,xenstore,xenhypfs diff --git a/tools/xl/xl_misc.c b/tools/xl/xl_misc.c index 20ed605f4f..08f0fb6dc9 100644 --- a/tools/xl/xl_misc.c +++ b/tools/xl/xl_misc.c @@ -168,7 +168,6 @@ int main_set_parameters(int argc, char **argv) if (libxl_set_parameters(ctx, params)) { fprintf(stderr, "cannot set parameters: %s\n", params); - fprintf(stderr, "Use \"xl dmesg\" to look for possible reason.\n"); return EXIT_FAILURE; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:33:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKr-0000S6-GD; Fri, 29 May 2020 10:33:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKq-0000Rt-CF for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:56 +0000 X-Inumbo-ID: e5ee5be6-a197-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e5ee5be6-a197-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 10:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=XxKQ2NxyTVQaVUVyb3hDt2FzLdQ3rlPCZKgMygwVTcQ=; b=c8xAf3zALcexDZ6WRE9DZ2gH8g yYKuQeELabHZSLUcAw6N1hiu/bRg/6hH1pi4QtxXOTH2QNzB63brlg9w6tiHp203clsTSoQ5sp9Cm gCUvuoYhNFdu+H7eWctiSPp02Lo2ccLx2gpv07BSroTH3pUQqSEFoTj76EH3HUCrDCQc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKp-000191-Nu for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecKp-00046c-N3 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:33:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxc: remove xc_set_parameters() Message-Id: Date: Fri, 29 May 2020 10:33:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a2486890689713116351e5bbfb8f104c797479cc Author: Juergen Gross AuthorDate: Fri May 29 12:20:16 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:20:16 2020 +0200 tools/libxc: remove xc_set_parameters() There is no user of xc_set_parameters() left, so remove it. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- tools/libxc/include/xenctrl.h | 1 - tools/libxc/xc_misc.c | 21 --------------------- 2 files changed, 22 deletions(-) diff --git a/tools/libxc/include/xenctrl.h b/tools/libxc/include/xenctrl.h index 45ff7db1e8..f9e17ae424 100644 --- a/tools/libxc/include/xenctrl.h +++ b/tools/libxc/include/xenctrl.h @@ -1226,7 +1226,6 @@ int xc_readconsolering(xc_interface *xch, int clear, int incremental, uint32_t *pindex); int xc_send_debug_keys(xc_interface *xch, const char *keys); -int xc_set_parameters(xc_interface *xch, const char *params); typedef struct xen_sysctl_physinfo xc_physinfo_t; typedef struct xen_sysctl_cputopo xc_cputopo_t; diff --git a/tools/libxc/xc_misc.c b/tools/libxc/xc_misc.c index fe477bf344..3820394413 100644 --- a/tools/libxc/xc_misc.c +++ b/tools/libxc/xc_misc.c @@ -187,27 +187,6 @@ int xc_send_debug_keys(xc_interface *xch, const char *keys) return ret; } -int xc_set_parameters(xc_interface *xch, const char *params) -{ - int ret, len = strlen(params); - DECLARE_SYSCTL; - DECLARE_HYPERCALL_BOUNCE_IN(params, len); - - if ( xc_hypercall_bounce_pre(xch, params) ) - return -1; - - sysctl.cmd = XEN_SYSCTL_set_parameter; - set_xen_guest_handle(sysctl.u.set_parameter.params, params); - sysctl.u.set_parameter.size = len; - memset(sysctl.u.set_parameter.pad, 0, sizeof(sysctl.u.set_parameter.pad)); - - ret = do_sysctl(xch, &sysctl); - - xc_hypercall_bounce_post(xch, params); - - return ret; -} - int xc_physinfo(xc_interface *xch, xc_physinfo_t *put_info) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:34:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:34:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecL1-0000TB-Hw; Fri, 29 May 2020 10:34:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecL1-0000T5-7R for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:07 +0000 X-Inumbo-ID: ebf6a5ca-a197-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ebf6a5ca-a197-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 10:34:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=YhVqS2oTS4kRs8gj8olRXdifw/j/eBoVnNTKpVaeha0=; b=fyZngFK4kIsD/mf/OSfxHPrX5F sgU3oeK8VNUJ0OTaAj2WSB6iQuGvAb/XJBpzdBj9foBcCwiKcUO7jq5BNip8FKQwinzSZOsb3bvyL cCoeiFnYKrvCybY5/iSgjhTMq6+GrVtkYgFGYT7eAQmh/vPx6vRAM/xvjR66cwyK3f/U=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecKz-00019r-RX for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecKz-00047b-Qa for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: remove XEN_SYSCTL_set_parameter support Message-Id: Date: Fri, 29 May 2020 10:34:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 02e9a9cf20950e78c816987415ed920d72444f94 Author: Juergen Gross AuthorDate: Fri May 29 12:20:31 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:20:31 2020 +0200 xen: remove XEN_SYSCTL_set_parameter support The functionality of XEN_SYSCTL_set_parameter is available via hypfs now, so it can be removed. This allows to remove the kernel_param structure for runtime parameters by putting the now only used structure element into the hypfs node structure of the runtime parameters. Signed-off-by: Juergen Gross Acked-by: Jan Beulich --- tools/flask/policy/modules/dom0.te | 2 +- xen/arch/arm/xen.lds.S | 5 --- xen/arch/x86/hvm/vmx/vmcs.c | 6 +-- xen/arch/x86/xen.lds.S | 5 --- xen/common/Kconfig | 5 ++- xen/common/hypfs.c | 6 +-- xen/common/kernel.c | 11 ----- xen/common/sysctl.c | 36 --------------- xen/include/public/sysctl.h | 19 +------- xen/include/xen/hypfs.h | 5 --- xen/include/xen/lib.h | 1 - xen/include/xen/param.h | 87 ++++++------------------------------- xen/xsm/flask/hooks.c | 3 -- xen/xsm/flask/policy/access_vectors | 2 - 14 files changed, 23 insertions(+), 170 deletions(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 20925e38a2..0a63ce15b6 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -16,7 +16,7 @@ allow dom0_t xen_t:xen { allow dom0_t xen_t:xen2 { resource_op psr_cmt_op psr_alloc pmu_ctrl get_symbol get_cpu_levelling_caps get_cpu_featureset livepatch_op - coverage_op set_parameter + coverage_op }; # Allow dom0 to use all XENVER_ subops that have checks. diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S index 549ceb9749..6342ac4ead 100644 --- a/xen/arch/arm/xen.lds.S +++ b/xen/arch/arm/xen.lds.S @@ -54,11 +54,6 @@ SECTIONS *(.data.rel.ro) *(.data.rel.ro.*) - . = ALIGN(POINTER_ALIGN); - __param_start = .; - *(.data.param) - __param_end = .; - __proc_info_start = .; *(.proc.info) __proc_info_end = .; diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 3410bc5f6d..ca94c2bedc 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -112,11 +112,6 @@ static void __init init_ept_param(struct param_hypfs *par) update_ept_param(); custom_runtime_set_var(par, opt_ept_setting); } -#else -static void update_ept_param(void) -{ -} -#endif static int parse_ept_param_runtime(const char *s); custom_runtime_only_param("ept", parse_ept_param_runtime, init_ept_param); @@ -172,6 +167,7 @@ static int parse_ept_param_runtime(const char *s) return 0; } +#endif /* Dynamic (run-time adjusted) execution control flags. */ u32 vmx_pin_based_exec_control __read_mostly; diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S index 3ed020e26b..0273f79152 100644 --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -128,11 +128,6 @@ SECTIONS *(.ex_table.pre) __stop___pre_ex_table = .; - . = ALIGN(POINTER_ALIGN); - __param_start = .; - *(.data.param) - __param_end = .; - #if defined(CONFIG_HAS_VPCI) && defined(CONFIG_LATE_HWDOM) . = ALIGN(POINTER_ALIGN); __start_vpci_array = .; diff --git a/xen/common/Kconfig b/xen/common/Kconfig index 065f2ee454..15e3b79ff5 100644 --- a/xen/common/Kconfig +++ b/xen/common/Kconfig @@ -122,8 +122,9 @@ config HYPFS ---help--- Support Xen hypervisor file system. This file system is used to present various hypervisor internal data to dom0 and in some - cases to allow modifying settings. Disabling the support might - result in some features not being available. + cases to allow modifying settings. Disabling the support will + result in some features not being available, e.g. runtime parameter + setting. If unsure, say Y. diff --git a/xen/common/hypfs.c b/xen/common/hypfs.c index b982c74fba..b74c228191 100644 --- a/xen/common/hypfs.c +++ b/xen/common/hypfs.c @@ -42,7 +42,7 @@ static void hypfs_read_lock(void) this_cpu(hypfs_locked) = hypfs_read_locked; } -void hypfs_write_lock(void) +static void hypfs_write_lock(void) { ASSERT(this_cpu(hypfs_locked) == hypfs_unlocked); @@ -50,7 +50,7 @@ void hypfs_write_lock(void) this_cpu(hypfs_locked) = hypfs_write_locked; } -void hypfs_unlock(void) +static void hypfs_unlock(void) { enum hypfs_lock_state locked = this_cpu(hypfs_locked); @@ -369,7 +369,7 @@ int hypfs_write_custom(struct hypfs_entry_leaf *leaf, goto out; p = container_of(leaf, struct param_hypfs, hypfs); - ret = p->param->par.func(buf); + ret = p->func(buf); out: xfree(buf); diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 952fab59e4..9de07b7ac5 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -196,17 +196,6 @@ static void __init _cmdline_parse(const char *cmdline) parse_params(cmdline, __setup_start, __setup_end); } -int runtime_parse(const char *line) -{ - int ret; - - hypfs_write_lock(); - ret = parse_params(line, __param_start, __param_end); - hypfs_unlock(); - - return ret; -} - /** * cmdline_parse -- parses the xen command line. * If CONFIG_CMDLINE is set, it would be parsed prior to @cmdline. diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 1c6a817476..ec916424e5 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -471,42 +471,6 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl) copyback = 1; break; - case XEN_SYSCTL_set_parameter: - { -#define XEN_SET_PARAMETER_MAX_SIZE 1023 - char *params; - - if ( op->u.set_parameter.pad[0] || op->u.set_parameter.pad[1] || - op->u.set_parameter.pad[2] ) - { - ret = -EINVAL; - break; - } - if ( op->u.set_parameter.size > XEN_SET_PARAMETER_MAX_SIZE ) - { - ret = -E2BIG; - break; - } - params = xmalloc_bytes(op->u.set_parameter.size + 1); - if ( !params ) - { - ret = -ENOMEM; - break; - } - if ( copy_from_guest(params, op->u.set_parameter.params, - op->u.set_parameter.size) ) - ret = -EFAULT; - else - { - params[op->u.set_parameter.size] = 0; - ret = runtime_parse(params); - } - - xfree(params); - - break; - } - default: ret = arch_do_sysctl(op, u_sysctl); copyback = 0; diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 3a08c512e8..a073647117 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -1026,22 +1026,6 @@ struct xen_sysctl_livepatch_op { } u; }; -/* - * XEN_SYSCTL_set_parameter - * - * Change hypervisor parameters at runtime. - * The input string is parsed similar to the boot parameters. - * Parameters are a single string terminated by a NUL byte of max. size - * characters. Multiple settings can be specified by separating them - * with blanks. - */ - -struct xen_sysctl_set_parameter { - XEN_GUEST_HANDLE_64(const_char) params; /* IN: pointer to parameters. */ - uint16_t size; /* IN: size of parameters. */ - uint16_t pad[3]; /* IN: MUST be zero. */ -}; - #if defined(__i386__) || defined(__x86_64__) /* * XEN_SYSCTL_get_cpu_policy (x86 specific) @@ -1106,7 +1090,7 @@ struct xen_sysctl { #define XEN_SYSCTL_get_cpu_levelling_caps 25 #define XEN_SYSCTL_get_cpu_featureset 26 #define XEN_SYSCTL_livepatch_op 27 -#define XEN_SYSCTL_set_parameter 28 +/* #define XEN_SYSCTL_set_parameter 28 */ #define XEN_SYSCTL_get_cpu_policy 29 uint32_t interface_version; /* XEN_SYSCTL_INTERFACE_VERSION */ union { @@ -1135,7 +1119,6 @@ struct xen_sysctl { struct xen_sysctl_cpu_levelling_caps cpu_levelling_caps; struct xen_sysctl_cpu_featureset cpu_featureset; struct xen_sysctl_livepatch_op livepatch; - struct xen_sysctl_set_parameter set_parameter; #if defined(__i386__) || defined(__x86_64__) struct xen_sysctl_cpu_policy cpu_policy; #endif diff --git a/xen/include/xen/hypfs.h b/xen/include/xen/hypfs.h index c3947eb2b3..5ad99cb558 100644 --- a/xen/include/xen/hypfs.h +++ b/xen/include/xen/hypfs.h @@ -118,11 +118,6 @@ int hypfs_write_bool(struct hypfs_entry_leaf *leaf, XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); int hypfs_write_custom(struct hypfs_entry_leaf *leaf, XEN_GUEST_HANDLE_PARAM(void) uaddr, unsigned int ulen); -void hypfs_write_lock(void); -void hypfs_unlock(void); -#else -static inline void hypfs_write_lock(void) {} -static inline void hypfs_unlock(void) {} #endif #endif /* __XEN_HYPFS_H__ */ diff --git a/xen/include/xen/lib.h b/xen/include/xen/lib.h index 2d7a054931..e5b0a007b8 100644 --- a/xen/include/xen/lib.h +++ b/xen/include/xen/lib.h @@ -75,7 +75,6 @@ struct domain; void cmdline_parse(const char *cmdline); -int runtime_parse(const char *line); int parse_bool(const char *s, const char *e); /** diff --git a/xen/include/xen/param.h b/xen/include/xen/param.h index 26831e9304..c2fd075dd0 100644 --- a/xen/include/xen/param.h +++ b/xen/include/xen/param.h @@ -27,9 +27,6 @@ struct kernel_param { }; extern const struct kernel_param __setup_start[], __setup_end[]; -extern const struct kernel_param __param_start[], __param_end[]; - -#define __dataparam __used_section(".data.param") #define __param(att) static const att \ __attribute__((__aligned__(sizeof(void *)))) struct kernel_param @@ -79,14 +76,12 @@ extern const struct kernel_param __param_start[], __param_end[]; { .name = setup_str_ign, \ .type = OPT_IGNORE } -#define __rtparam __param(__dataparam) - #ifdef CONFIG_HYPFS struct param_hypfs { - const struct kernel_param *param; struct hypfs_entry_leaf hypfs; void (*init_leaf)(struct param_hypfs *par); + int (*func)(const char *); }; extern struct param_hypfs __paramhypfs_start[], __paramhypfs_end[]; @@ -109,28 +104,17 @@ extern struct param_hypfs __paramhypfs_start[], __paramhypfs_end[]; /* initfunc needs to set size and content, e.g. via custom_runtime_set_var(). */ #define custom_runtime_only_param(nam, variable, initfunc) \ - __rtparam __rtpar_##variable = \ - { .name = (nam), \ - .type = OPT_CUSTOM, \ - .par.func = (variable) }; \ __paramfs __parfs_##variable = \ - { .param = &__rtpar_##variable, \ - .init_leaf = (initfunc), \ - .hypfs.e.type = XEN_HYPFS_TYPE_STRING, \ + { .hypfs.e.type = XEN_HYPFS_TYPE_STRING, \ .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ .hypfs.e.name = (nam), \ .hypfs.e.read = hypfs_read_leaf, \ - .hypfs.e.write = hypfs_write_custom } + .hypfs.e.write = hypfs_write_custom, \ + .init_leaf = (initfunc), \ + .func = (variable) } #define boolean_runtime_only_param(nam, variable) \ - __rtparam __rtpar_##variable = \ - { .name = (nam), \ - .type = OPT_BOOL, \ - .len = sizeof(variable) + \ - BUILD_BUG_ON_ZERO(sizeof(variable) != sizeof(bool)), \ - .par.var = &(variable) }; \ __paramfs __parfs_##variable = \ - { .param = &__rtpar_##variable, \ - .hypfs.e.type = XEN_HYPFS_TYPE_BOOL, \ + { .hypfs.e.type = XEN_HYPFS_TYPE_BOOL, \ .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ .hypfs.e.name = (nam), \ .hypfs.e.size = sizeof(variable), \ @@ -139,14 +123,8 @@ extern struct param_hypfs __paramhypfs_start[], __paramhypfs_end[]; .hypfs.e.write = hypfs_write_bool, \ .hypfs.u.content = &(variable) } #define integer_runtime_only_param(nam, variable) \ - __rtparam __rtpar_##variable = \ - { .name = (nam), \ - .type = OPT_UINT, \ - .len = sizeof(variable), \ - .par.var = &(variable) }; \ __paramfs __parfs_##variable = \ - { .param = &__rtpar_##variable, \ - .hypfs.e.type = XEN_HYPFS_TYPE_UINT, \ + { .hypfs.e.type = XEN_HYPFS_TYPE_UINT, \ .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ .hypfs.e.name = (nam), \ .hypfs.e.size = sizeof(variable), \ @@ -155,14 +133,8 @@ extern struct param_hypfs __paramhypfs_start[], __paramhypfs_end[]; .hypfs.e.write = hypfs_write_leaf, \ .hypfs.u.content = &(variable) } #define size_runtime_only_param(nam, variable) \ - __rtparam __rtpar_##variable = \ - { .name = (nam), \ - .type = OPT_SIZE, \ - .len = sizeof(variable), \ - .par.var = &(variable) }; \ __paramfs __parfs_##variable = \ - { .param = &__rtpar_##variable, \ - .hypfs.e.type = XEN_HYPFS_TYPE_UINT, \ + { .hypfs.e.type = XEN_HYPFS_TYPE_UINT, \ .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ .hypfs.e.name = (nam), \ .hypfs.e.size = sizeof(variable), \ @@ -171,14 +143,8 @@ extern struct param_hypfs __paramhypfs_start[], __paramhypfs_end[]; .hypfs.e.write = hypfs_write_leaf, \ .hypfs.u.content = &(variable) } #define string_runtime_only_param(nam, variable) \ - __rtparam __rtpar_##variable = \ - { .name = (nam), \ - .type = OPT_STR, \ - .len = sizeof(variable), \ - .par.var = &(variable) }; \ __paramfs __parfs_##variable = \ - { .param = &__rtpar_##variable, \ - .hypfs.e.type = XEN_HYPFS_TYPE_STRING, \ + { .hypfs.e.type = XEN_HYPFS_TYPE_STRING, \ .hypfs.e.encoding = XEN_HYPFS_ENC_PLAIN, \ .hypfs.e.name = (nam), \ .hypfs.e.size = 0, \ @@ -189,36 +155,11 @@ extern struct param_hypfs __paramhypfs_start[], __paramhypfs_end[]; #else -#define custom_runtime_only_param(_name, _var, unused) \ - __rtparam __rtpar_##_var = \ - { .name = _name, \ - .type = OPT_CUSTOM, \ - .par.func = _var } -#define boolean_runtime_only_param(_name, _var) \ - __rtparam __rtpar_##_var = \ - { .name = _name, \ - .type = OPT_BOOL, \ - .len = sizeof(_var) + \ - BUILD_BUG_ON_ZERO(sizeof(_var) != sizeof(bool)), \ - .par.var = &_var } -#define integer_runtime_only_param(_name, _var) \ - __rtparam __rtpar_##_var = \ - { .name = _name, \ - .type = OPT_UINT, \ - .len = sizeof(_var), \ - .par.var = &_var } -#define size_runtime_only_param(_name, _var) \ - __rtparam __rtpar_##_var = \ - { .name = _name, \ - .type = OPT_SIZE, \ - .len = sizeof(_var), \ - .par.var = &_var } -#define string_runtime_only_param(_name, _var) \ - __rtparam __rtpar_##_var = \ - { .name = _name, \ - .type = OPT_STR, \ - .len = sizeof(_var), \ - .par.var = &_var } +#define custom_runtime_only_param(nam, var, initfunc) +#define boolean_runtime_only_param(nam, var) +#define integer_runtime_only_param(nam, var) +#define size_runtime_only_param(nam, var) +#define string_runtime_only_param(nam, var) #define custom_runtime_set_var(parfs, var) diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index a2c78e445c..a314bf85ce 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -822,9 +822,6 @@ static int flask_sysctl(int cmd) case XEN_SYSCTL_coverage_op: return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, XEN2__COVERAGE_OP, NULL); - case XEN_SYSCTL_set_parameter: - return avc_current_has_perm(SECINITSID_XEN, SECCLASS_XEN2, - XEN2__SET_PARAMETER, NULL); default: return avc_unknown_permission("sysctl", cmd); diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index c9e385fb9b..b87c99ea98 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -99,8 +99,6 @@ class xen2 livepatch_op # XEN_SYSCTL_coverage_op coverage_op -# XEN_SYSCTL_set_parameter - set_parameter } # Classes domain and domain2 consist of operations that a domain performs on -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:34:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:34:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecLB-0000UL-Kw; Fri, 29 May 2020 10:34:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecLB-0000UD-0m for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:17 +0000 X-Inumbo-ID: f1fd3524-a197-11ea-a88c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f1fd3524-a197-11ea-a88c-12813bfff9fa; Fri, 29 May 2020 10:34:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LzKGxoZuKVq68fpD4lxMNL/nAtcsXoOWYqkhSJFJls0=; b=d5savLg86BBFk33vjilDCyzBkb EVRDDsIJOY78fiDn+/gflLCj7FIAOyKxhEQrUsSCl1SDrFT7ffA6Oyko6xPiPSFUrigm/qcN8nU9Z NIqJDlVd4zoEGr22rnztF3bhwyp7EHP6o8y/2xgahKfRr7d+0/Q7xWjZnIXbit1fLgI4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecL9-0001A0-VG for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecL9-00048o-Tj for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] CHANGELOG: add hypervisor file system support Message-Id: Date: Fri, 29 May 2020 10:34:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7f8d2dc29ea5a51f88ec253be93970768ec9fac2 Author: Juergen Gross AuthorDate: Fri May 29 12:22:42 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:22:42 2020 +0200 CHANGELOG: add hypervisor file system support Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ccb5055c87..75b7582447 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) fixes. - Hypervisor framework to ease porting Xen to run on hypervisors. - Initial support to run on Hyper-V. + - Initial hypervisor file system (hypfs) support. ## [4.13.0](https://xenbits.xen.org/gitweb/?p=xen.git;a=shortlog;h=RELEASE-4.13.0) - 2019-12-17 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 10:34:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 10:34:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecLL-0000W5-MW; Fri, 29 May 2020 10:34:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecLK-0000VH-M4 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:26 +0000 X-Inumbo-ID: f8009c2c-a197-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f8009c2c-a197-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 10:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=0f6LtT3Q5MsSiA8IoMTNhRETKqd7Z82i3k8C2y3TP/Q=; b=LvPDFmTCx0EYYLqsQHAiw0pdT5 o8WYUmOTLCg8zUI208yCvM+X+LB8Zh92sW9zCSY4Zyr3Cz4oSYcTzrl9//CLflZlZ1sFDbs7JZ9Pb YP2zBVhhBvtrxe6BHRzmSj4iWhsC08WHz/56TCOkJRPMhoBdLexoSQ5QU+rnaI8M9MVE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jecLK-0001AA-1x for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jecLK-00049l-17 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 10:34:26 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] SUPPORT.md: add hypervisor file system Message-Id: Date: Fri, 29 May 2020 10:34:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9b9a83e43598b231111487378d6037fa8fa473d5 Author: Juergen Gross AuthorDate: Fri May 29 12:22:50 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 12:22:50 2020 +0200 SUPPORT.md: add hypervisor file system Signed-off-by: Juergen Gross Acked-by: Jan Beulich --- SUPPORT.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index e3a366fd56..a1f7eb6434 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -109,6 +109,20 @@ ARM only has one guest type at the moment Status: Supported +## Hypervisor file system + +### Build info + + Status: Supported + +### Hypervisor config + + Status: Supported + +### Runtime parameters + + Status: Supported + ## Toolstack ### xl -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 12:11:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 12:11:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedqr-0000GO-1y; Fri, 29 May 2020 12:11:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedqp-0000GF-P9 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:03 +0000 X-Inumbo-ID: 76d5fe36-a1a5-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 76d5fe36-a1a5-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 12:11:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=xiM/9qLRzigJ1qABmvamqemWyaKXGTW2fiTWD9LM8LY=; b=sf+28qwffeb+LS1ZSBEhoHaKAV SSTikhrBOSZ6pRD2CEXKfmkJLBECZe6k1QXYVYmobmaQ5LFiC90i2dDFQJrkMHvaQJdF/SqSt245j OmiORxL3qV8LplVnQQwJKcX8N7olLnYg3Y/VErBcKmIwkx314pxjDWQX6yWqpCMgB1/w=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedqo-0003au-9A for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:02 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jedqo-00021D-8C for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:02 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xen/arm: call iomem_permit_access for passthrough devices Message-Id: Date: Fri, 29 May 2020 12:11:02 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6b75c7a95420acbb9c118624ff0a5e973287c1e4 Author: Stefano Stabellini AuthorDate: Tue Apr 14 18:02:55 2020 -0700 Commit: Stefano Stabellini CommitDate: Wed May 27 13:21:22 2020 -0700 xen/arm: call iomem_permit_access for passthrough devices iomem_permit_access should be called for MMIO regions of devices assigned to a domain. Currently it is not called for MMIO regions of passthrough devices of Dom0less guests. This patch fixes it. Signed-off-by: Stefano Stabellini Acked-by: Julien Grall --- xen/arch/arm/domain_build.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 3d7a75c318..e824ba34b0 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1804,6 +1804,17 @@ static int __init handle_passthrough_prop(struct kernel_info *kinfo, return -EINVAL; } + res = iomem_permit_access(kinfo->d, paddr_to_pfn(mstart), + paddr_to_pfn(PAGE_ALIGN(mstart + size - 1))); + if ( res ) + { + printk(XENLOG_ERR "Unable to permit to dom%d access to" + " 0x%"PRIx64" - 0x%"PRIx64"\n", + kinfo->d->domain_id, + mstart & PAGE_MASK, PAGE_ALIGN(mstart + size) - 1); + return res; + } + res = map_regions_p2mt(kinfo->d, gaddr_to_gfn(gstart), PFN_DOWN(size), -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 29 12:11:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 12:11:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedr0-0000Jt-3T; Fri, 29 May 2020 12:11:14 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedqz-0000IA-4B for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:13 +0000 X-Inumbo-ID: 7cdfcc9e-a1a5-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7cdfcc9e-a1a5-11ea-8993-bc764e2007e4; Fri, 29 May 2020 12:11:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=2bRGn7I7nu8xKSSHsf6RI17ua9tp0j07RoQ3GUbY7oY=; b=MGqTGMYzWUhK5iD+2L15F8KbfL H19oKxK+64zGyxXQRrp92x+bA8eUVXCx9HjwpvSnUHA+wv6cA7BETJxPOYMRKLxTItiJ6F9aHWGZ+ zukqx2V4AvpyJ0kMv0SNOqEWyta0cWt6x0Q0SFJCh3ieM6VJ07W5Mlj8TWeQ5ep5Qacw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedqy-0003b0-Ce for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jedqy-00023s-Ba for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: relax LDT check in arch_set_info_guest() Message-Id: Date: Fri, 29 May 2020 12:11:12 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cb8a478e1d246c1273e457d9c48d4609416c82e5 Author: Jan Beulich AuthorDate: Thu May 28 12:00:24 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:00:24 2020 +0200 x86: relax LDT check in arch_set_info_guest() It is wrong for us to check the base address when there's no LDT in the first place. Once we don't do this check anymore we can also set the base address to a non-canonical value when the LDT is empty. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/domain.c | 7 +++++-- xen/arch/x86/domctl.c | 2 +- xen/arch/x86/mm.c | 7 ++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 6327ba0790..fee6c3931a 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -967,8 +967,10 @@ int arch_set_info_guest( if ( !compat && !(flags & VGCF_in_kernel) && !c.nat->ctrlreg[1] ) return -EINVAL; - v->arch.pv.ldt_base = c(ldt_base); v->arch.pv.ldt_ents = c(ldt_ents); + v->arch.pv.ldt_base = v->arch.pv.ldt_ents + ? c(ldt_base) + : (unsigned long)ZERO_BLOCK_PTR; } else { @@ -997,8 +999,9 @@ int arch_set_info_guest( for ( i = 0; !fail && i < nr_gdt_frames; ++i ) fail = v->arch.pv.gdt_frames[i] != c(gdt_frames[i]); - fail |= v->arch.pv.ldt_base != c(ldt_base); fail |= v->arch.pv.ldt_ents != c(ldt_ents); + if ( v->arch.pv.ldt_ents ) + fail |= v->arch.pv.ldt_base != c(ldt_base); if ( fail ) return -EOPNOTSUPP; diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 8c55db2f69..6f2c69788d 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -1583,7 +1583,7 @@ void arch_get_info_guest(struct vcpu *v, vcpu_guest_context_u c) } else { - c(ldt_base = v->arch.pv.ldt_base); + c(ldt_base = v->arch.pv.ldt_ents ? v->arch.pv.ldt_base : 0); c(ldt_ents = v->arch.pv.ldt_ents); for ( i = 0; i < ARRAY_SIZE(v->arch.pv.gdt_frames); ++i ) c(gdt_frames[i] = v->arch.pv.gdt_frames[i]); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index e42044eb74..54980b4eb1 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -3669,14 +3669,15 @@ long do_mmuext_op( case MMUEXT_SET_LDT: { unsigned int ents = op.arg2.nr_ents; - unsigned long ptr = ents ? op.arg1.linear_addr : 0; + unsigned long ptr = ents ? op.arg1.linear_addr + : (unsigned long)ZERO_BLOCK_PTR; if ( unlikely(currd != pg_owner) ) rc = -EPERM; else if ( paging_mode_external(currd) ) rc = -EINVAL; - else if ( ((ptr & (PAGE_SIZE - 1)) != 0) || !__addr_ok(ptr) || - (ents > 8192) ) + else if ( (ents > 8192) || + (ents && ((ptr & (PAGE_SIZE - 1)) || !__addr_ok(ptr))) ) { gdprintk(XENLOG_WARNING, "Bad args to SET_LDT: ptr=%lx, ents=%x\n", ptr, ents); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 29 12:11:24 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 12:11:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedrA-0000QN-50; Fri, 29 May 2020 12:11:24 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedr9-0000QD-9l for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:23 +0000 X-Inumbo-ID: 82dda72e-a1a5-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 82dda72e-a1a5-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 12:11:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sOZ/K3UUkjo1Uv08/gtuFcv3s+7zkw9en6KK0rKAb8I=; b=ADRlHYNUCTJttg9VOIQtBf5I09 eQn5vhTwKvIh5K6ZkkHOEs18IkRHGx/tyFNg9sfAvfefL1wocLihSvNtvOvASir//vn5uJJ9yXLhy RjV3xbHvfyIKTpFodYFcBgYaliLxea1OZrnKBgMm5zwAsHIeXxVt6bfdQkOmpmosoBpY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jedr8-0003bC-Ft for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jedr8-00024k-Ey for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 12:11:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] VT-x: extend LBR Broadwell errata coverage Message-Id: Date: Fri, 29 May 2020 12:11:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 724913de8ac8426d313a4645741d86c1169ae406 Author: Jan Beulich AuthorDate: Thu May 28 12:03:25 2020 +0200 Commit: Jan Beulich CommitDate: Thu May 28 12:03:25 2020 +0200 VT-x: extend LBR Broadwell errata coverage For lbr_tsx_fixup_check() simply name a few more specific erratum numbers. For bdf93_fixup_check(), however, more models are affected. Oddly enough despite being the same model and stepping, the erratum is listed for Xeon E3 but not its Core counterpart. Apply the workaround uniformly, and also for Xeon D, which only has the LBR-from one listed in its spec update. Seeing this broader applicability, rename anything BDF93-related to more generic names. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 52 ++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 11a4dd94cf..b7d0c58214 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -2380,7 +2380,7 @@ static void pi_notification_interrupt(struct cpu_user_regs *regs) } static void __init lbr_tsx_fixup_check(void); -static void __init bdf93_fixup_check(void); +static void __init ler_to_fixup_check(void); /* * Calculate whether the CPU is vulnerable to Instruction Fetch page @@ -2554,7 +2554,7 @@ const struct hvm_function_table * __init start_vmx(void) } lbr_tsx_fixup_check(); - bdf93_fixup_check(); + ler_to_fixup_check(); return &vmx_function_table; } @@ -2832,11 +2832,11 @@ enum #define LBR_MSRS_INSERTED (1u << 0) #define LBR_FIXUP_TSX (1u << 1) -#define LBR_FIXUP_BDF93 (1u << 2) -#define LBR_FIXUP_MASK (LBR_FIXUP_TSX | LBR_FIXUP_BDF93) +#define LBR_FIXUP_LER_TO (1u << 2) +#define LBR_FIXUP_MASK (LBR_FIXUP_TSX | LBR_FIXUP_LER_TO) static bool __read_mostly lbr_tsx_fixup_needed; -static bool __read_mostly bdf93_fixup_needed; +static bool __read_mostly ler_to_fixup_needed; static void __init lbr_tsx_fixup_check(void) { @@ -2844,7 +2844,7 @@ static void __init lbr_tsx_fixup_check(void) uint32_t lbr_format; /* - * HSM182, HSD172, HSE117, BDM127, BDD117, BDF85, BDE105: + * Haswell erratum HSM182 et al, Broadwell erratum BDM127 et al: * * On processors that do not support Intel Transactional Synchronization * Extensions (Intel TSX) (CPUID.07H.EBX bits 4 and 11 are both zero), @@ -2868,8 +2868,11 @@ static void __init lbr_tsx_fixup_check(void) case 0x45: /* HSM182 - 4th gen Core */ case 0x46: /* HSM182, HSD172 - 4th gen Core (GT3) */ case 0x3d: /* BDM127 - 5th gen Core */ - case 0x47: /* BDD117 - 5th gen Core (GT3) */ - case 0x4f: /* BDF85 - Xeon E5-2600 v4 */ + case 0x47: /* BDD117 - 5th gen Core (GT3) + BDW117 - Xeon E3-1200 v4 */ + case 0x4f: /* BDF85 - Xeon E5-2600 v4 + BDH75 - Core-i7 for LGA2011-v3 Socket + BDX88 - Xeon E7-x800 v4 */ case 0x56: /* BDE105 - Xeon D-1500 */ break; default: @@ -2890,18 +2893,31 @@ static void __init lbr_tsx_fixup_check(void) lbr_tsx_fixup_needed = true; } -static void __init bdf93_fixup_check(void) +static void __init ler_to_fixup_check(void) { /* - * Broadwell erratum BDF93: + * Broadwell erratum BDF93 et al: * * Reads from MSR_LER_TO_LIP (MSR 1DEH) may return values for bits[63:61] * that are not equal to bit[47]. Attempting to context switch this value * may cause a #GP. Software should sign extend the MSR. */ - if ( boot_cpu_data.x86_vendor == X86_VENDOR_INTEL && - boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 0x4f ) - bdf93_fixup_needed = true; + if ( boot_cpu_data.x86_vendor != X86_VENDOR_INTEL || + boot_cpu_data.x86 != 6 ) + return; + + switch ( boot_cpu_data.x86_model ) + { + case 0x3d: /* BDM131 - 5th gen Core */ + case 0x47: /* BDD??? - 5th gen Core (H-Processor line) + BDW120 - Xeon E3-1200 v4 */ + case 0x4f: /* BDF93 - Xeon E5-2600 v4 + BDH80 - Core-i7 for LGA2011-v3 Socket + BDX93 - Xeon E7-x800 v4 */ + case 0x56: /* BDE??? - Xeon D-1500 */ + ler_to_fixup_needed = true; + break; + } } static int is_last_branch_msr(u32 ecx) @@ -3276,8 +3292,8 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) v->arch.hvm.vmx.lbr_flags |= LBR_MSRS_INSERTED; if ( lbr_tsx_fixup_needed ) v->arch.hvm.vmx.lbr_flags |= LBR_FIXUP_TSX; - if ( bdf93_fixup_needed ) - v->arch.hvm.vmx.lbr_flags |= LBR_FIXUP_BDF93; + if ( ler_to_fixup_needed ) + v->arch.hvm.vmx.lbr_flags |= LBR_FIXUP_LER_TO; } __vmwrite(GUEST_IA32_DEBUGCTL, msr_content); @@ -4338,7 +4354,7 @@ static void sign_extend_msr(struct vcpu *v, u32 msr, int type) entry->data = canonicalise_addr(entry->data); } -static void bdf93_fixup(void) +static void ler_to_fixup(void) { struct vcpu *curr = current; @@ -4351,8 +4367,8 @@ static void lbr_fixup(void) if ( curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_TSX ) lbr_tsx_fixup(); - if ( curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_BDF93 ) - bdf93_fixup(); + if ( curr->arch.hvm.vmx.lbr_flags & LBR_FIXUP_LER_TO ) + ler_to_fixup(); } /* Returns false if the vmentry has to be restarted */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:33:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:33:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeh0M-0007mv-5h; Fri, 29 May 2020 15:33:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeh0L-0007mq-CZ for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:33:05 +0000 X-Inumbo-ID: b0487b5a-a1c1-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b0487b5a-a1c1-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 15:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=k80t1ce+optq9NML+lD303mzdc1r6x1o6Zdh5nlOdMQ=; b=eBAbD9QiiTdw7FHAcOD2A7uob5 OYL9j30PJ0c1zr2H2VyL6TvIIS5u7DJSIDBFxqsmgs2q0/bsGGAliUwxCISyHG6xzJ28Ia4j4O8ht dJ8cXUCc096jinkKYaQhEMdpZeejzvwl7eB0cbzy2sDmlVQ/L+OKpw8W+smDOce/Gghs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeh0K-00089i-IH for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeh0K-0007vL-Gz for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/hvm: Improve error information in handle_pio() Message-Id: Date: Fri, 29 May 2020 15:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4609fc8eb04e6af531d86923c9d057f32a96b7d8 Author: Andrew Cooper AuthorDate: Thu May 28 14:03:22 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 16:25:05 2020 +0100 x86/hvm: Improve error information in handle_pio() domain_crash() should always have a message which is emitted even in release builds, so something more useful than this is presented to the user. (XEN) domain_crash called from io.c:171 (XEN) domain_crash called from io.c:171 (XEN) domain_crash called from io.c:171 ... To avoid possibly printing stack rubble, initialise data to ~0 right away. Furthermore, the maximum access size is 4, so drop data from long to int. Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/hvm/io.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c index a5b0a23f06..724ab44a76 100644 --- a/xen/arch/x86/hvm/io.c +++ b/xen/arch/x86/hvm/io.c @@ -132,13 +132,15 @@ bool handle_pio(uint16_t port, unsigned int size, int dir) { struct vcpu *curr = current; struct hvm_vcpu_io *vio = &curr->arch.hvm.hvm_io; - unsigned long data; + unsigned int data; int rc; ASSERT((size - 1) < 4 && size != 3); if ( dir == IOREQ_WRITE ) data = guest_cpu_user_regs()->eax; + else + data = ~0; /* Avoid any risk of stack rubble. */ rc = hvmemul_do_pio_buffer(port, size, dir, &data); @@ -151,7 +153,7 @@ bool handle_pio(uint16_t port, unsigned int size, int dir) if ( dir == IOREQ_READ ) { if ( size == 4 ) /* Needs zero extension. */ - guest_cpu_user_regs()->rax = (uint32_t)data; + guest_cpu_user_regs()->rax = data; else memcpy(&guest_cpu_user_regs()->rax, &data, size); } @@ -167,7 +169,9 @@ bool handle_pio(uint16_t port, unsigned int size, int dir) break; default: - gdprintk(XENLOG_ERR, "Weird HVM ioemulation status %d.\n", rc); + gprintk(XENLOG_ERR, "Unexpected PIO status %d, port %#x %s 0x%0*x\n", + rc, port, dir == IOREQ_WRITE ? "write" : "read", + size * 2, data & ((1u << (size * 8)) - 1)); domain_crash(curr->domain); return false; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:44:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:44:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehB3-0000Qz-GB; Fri, 29 May 2020 15:44:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehB1-0000Ql-Ux for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:07 +0000 X-Inumbo-ID: 3a1ba45a-a1c3-11ea-a8da-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3a1ba45a-a1c3-11ea-a8da-12813bfff9fa; Fri, 29 May 2020 15:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ic+g7EvYR5nQJoY+UFgjqbwL+YYo8IX87CVYd3QXcdA=; b=GQ6sCHoz2ybNP/ca2FrpKKk1nl NErTkDF7RFig79/8o6B/4L+HgVyLsJvoZ68xL7nH9nX5SoWaqGUW7ct7LcSvHknCj0ddRy4kc9KGq C330ht9vUhrD8ZV9DWG8KH0SO9tPj/MEKf2Wtyjnl8b6q20eOwgPu6ehFagphqati30E=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehAz-0008Ot-9M for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehAz-0000QQ-85 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: address x86_insn_is_mem_{access, write}() omissions Message-Id: Date: Fri, 29 May 2020 15:44:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e28d13eeb65c25c0bd56e8bfa83c7473047d778d Author: Jan Beulich AuthorDate: Fri May 29 17:28:04 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:28:04 2020 +0200 x86emul: address x86_insn_is_mem_{access,write}() omissions First of all explain in comments what the functions' purposes are. Then make them actually match their comments. Note that fc6fa977be54 ("x86emul: extend x86_insn_is_mem_write() coverage") didn't actually fix the function's behavior for {,V}STMXCSR: Both are covered by generic code higher up in the function, due to x86_decode_twobyte() already doing suitable adjustments. And VSTMXCSR wouldn't have been covered anyway without a further X86EMUL_OPC_VEX() case label. Keep the inner case label in a comment for reference. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 126 ++++++++++++++++++++++++++++++--- 1 file changed, 118 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index fa24b1d725..080732b75b 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -11474,25 +11474,87 @@ x86_insn_operand_ea(const struct x86_emulate_state *state, return state->ea.mem.off; } +/* + * This function means to return 'true' for all supported insns with explicit + * accesses to memory. This means also insns which don't have an explicit + * memory operand (like POP), but it does not mean e.g. segment selector + * loads, where the descriptor table access is considered an implicit one. + */ bool x86_insn_is_mem_access(const struct x86_emulate_state *state, const struct x86_emulate_ctxt *ctxt) { + if ( mode_64bit() && state->not_64bit ) + return false; + if ( state->ea.type == OP_MEM ) - return ctxt->opcode != 0x8d /* LEA */ && - (ctxt->opcode != X86EMUL_OPC(0x0f, 0x01) || - (state->modrm_reg & 7) != 7) /* INVLPG */; + { + switch ( ctxt->opcode ) + { + case 0x8d: /* LEA */ + case X86EMUL_OPC(0x0f, 0x0d): /* PREFETCH */ + case X86EMUL_OPC(0x0f, 0x18) + ... X86EMUL_OPC(0x0f, 0x1f): /* NOP space */ + case X86EMUL_OPC_66(0x0f, 0x18) + ... X86EMUL_OPC_66(0x0f, 0x1f): /* NOP space */ + case X86EMUL_OPC_F3(0x0f, 0x18) + ... X86EMUL_OPC_F3(0x0f, 0x1f): /* NOP space */ + case X86EMUL_OPC_F2(0x0f, 0x18) + ... X86EMUL_OPC_F2(0x0f, 0x1f): /* NOP space */ + case X86EMUL_OPC(0x0f, 0xb9): /* UD1 */ + case X86EMUL_OPC(0x0f, 0xff): /* UD0 */ + return false; + + case X86EMUL_OPC(0x0f, 0x01): + return (state->modrm_reg & 7) != 7; /* INVLPG */ + + case X86EMUL_OPC(0x0f, 0xae): + return (state->modrm_reg & 7) != 7; /* CLFLUSH */ + + case X86EMUL_OPC_66(0x0f, 0xae): + return (state->modrm_reg & 7) < 6; /* CLWB, CLFLUSHOPT */ + } + + return true; + } switch ( ctxt->opcode ) { + case 0x06 ... 0x07: /* PUSH / POP %es */ + case 0x0e: /* PUSH %cs */ + case 0x16 ... 0x17: /* PUSH / POP %ss */ + case 0x1e ... 0x1f: /* PUSH / POP %ds */ + case 0x50 ... 0x5f: /* PUSH / POP reg */ + case 0x60 ... 0x61: /* PUSHA / POPA */ + case 0x68: case 0x6a: /* PUSH imm */ case 0x6c ... 0x6f: /* INS / OUTS */ + case 0x8f: /* POP r/m */ + case 0x9a: /* CALL (far, direct) */ + case 0x9c ... 0x9d: /* PUSHF / POPF */ case 0xa4 ... 0xa7: /* MOVS / CMPS */ case 0xaa ... 0xaf: /* STOS / LODS / SCAS */ + case 0xc2 ... 0xc3: /* RET (near) */ + case 0xc8 ... 0xc9: /* ENTER / LEAVE */ + case 0xca ... 0xcb: /* RET (far) */ case 0xd7: /* XLAT */ + case 0xe8: /* CALL (near, direct) */ + case X86EMUL_OPC(0x0f, 0xa0): /* PUSH %fs */ + case X86EMUL_OPC(0x0f, 0xa1): /* POP %fs */ + case X86EMUL_OPC(0x0f, 0xa8): /* PUSH %gs */ + case X86EMUL_OPC(0x0f, 0xa9): /* POP %gs */ CASE_SIMD_PACKED_INT_VEX(0x0f, 0xf7): /* MASKMOV{Q,DQU} */ /* VMASKMOVDQU */ return true; + case 0xff: + switch ( state->modrm_reg & 7 ) + { + case 2: /* CALL (near, indirect) */ + case 6: /* PUSH r/m */ + return true; + } + break; + case X86EMUL_OPC(0x0f, 0x01): /* Cover CLZERO. */ return (state->modrm_rm & 7) == 4 && (state->modrm_reg & 7) == 7; @@ -11501,10 +11563,20 @@ x86_insn_is_mem_access(const struct x86_emulate_state *state, return false; } +/* + * This function means to return 'true' for all supported insns with explicit + * writes to memory. This means also insns which don't have an explicit + * memory operand (like PUSH), but it does not mean e.g. segment selector + * loads, where the (possible) descriptor table write is considered an + * implicit access. + */ bool x86_insn_is_mem_write(const struct x86_emulate_state *state, const struct x86_emulate_ctxt *ctxt) { + if ( mode_64bit() && state->not_64bit ) + return false; + switch ( state->desc & DstMask ) { case DstMem: @@ -11516,19 +11588,48 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, break; default: + switch ( ctxt->opcode ) + { + case 0x63: /* ARPL */ + return !mode_64bit(); + } + return false; } if ( state->modrm_mod == 3 ) - /* CLZERO is the odd one. */ - return ctxt->opcode == X86EMUL_OPC(0x0f, 0x01) && - (state->modrm_rm & 7) == 4 && (state->modrm_reg & 7) == 7; + { + switch ( ctxt->opcode ) + { + case 0xff: /* Grp5 */ + break; + + case X86EMUL_OPC(0x0f, 0x01): /* CLZERO is the odd one. */ + return (state->modrm_rm & 7) == 4 && (state->modrm_reg & 7) == 7; + + default: + return false; + } + } switch ( ctxt->opcode ) { + case 0x06: /* PUSH %es */ + case 0x0e: /* PUSH %cs */ + case 0x16: /* PUSH %ss */ + case 0x1e: /* PUSH %ds */ + case 0x50 ... 0x57: /* PUSH reg */ + case 0x60: /* PUSHA */ + case 0x68: case 0x6a: /* PUSH imm */ case 0x6c: case 0x6d: /* INS */ + case 0x9a: /* CALL (far, direct) */ + case 0x9c: /* PUSHF */ case 0xa4: case 0xa5: /* MOVS */ case 0xaa: case 0xab: /* STOS */ + case 0xc8: /* ENTER */ + case 0xe8: /* CALL (near, direct) */ + case X86EMUL_OPC(0x0f, 0xa0): /* PUSH %fs */ + case X86EMUL_OPC(0x0f, 0xa8): /* PUSH %gs */ case X86EMUL_OPC(0x0f, 0xab): /* BTS */ case X86EMUL_OPC(0x0f, 0xb3): /* BTR */ case X86EMUL_OPC(0x0f, 0xbb): /* BTC */ @@ -11586,6 +11687,16 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, } break; + case 0xff: + switch ( state->modrm_reg & 7 ) + { + case 2: /* CALL (near, indirect) */ + case 3: /* CALL (far, indirect) */ + case 6: /* PUSH r/m */ + return true; + } + break; + case X86EMUL_OPC(0x0f, 0x01): switch ( state->modrm_reg & 7 ) { @@ -11600,7 +11711,7 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, switch ( state->modrm_reg & 7 ) { case 0: /* FXSAVE */ - case 3: /* {,V}STMXCSR */ + /* case 3: STMXCSR - handled above */ case 4: /* XSAVE */ case 6: /* XSAVEOPT */ return true; @@ -11616,7 +11727,6 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, case 1: /* CMPXCHG{8,16}B */ case 4: /* XSAVEC */ case 5: /* XSAVES */ - case 7: /* VMPTRST */ return true; } break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:44:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:44:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBB-0000SK-J5; Fri, 29 May 2020 15:44:17 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBA-0000S4-8f for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:16 +0000 X-Inumbo-ID: 4020bb60-a1c3-11ea-a8da-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 4020bb60-a1c3-11ea-a8da-12813bfff9fa; Fri, 29 May 2020 15:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Hlf/qQ3TxqEPEgnJHExECpkRsNu+sEukEpyjWBx7sxg=; b=McOuUnj/ou883Z7O6XFB81xHYZ X6sfCevpqMgTL2R87bj1nVrZZn4+b/Jdu8asHWh6yQQSiut9YOmOADYV2xAhWcYOvFUn7hDUOU1IE cUBweH3yW496xTbRTSQpm+cjMxPy4g4G3XXIhUqtqAZEoMAeQ1K+Q5y4AWsl+dmMEgWI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehB9-0008PQ-D9 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehB9-0000RA-CB for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: rework CMP and TEST emulation Message-Id: Date: Fri, 29 May 2020 15:44:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 20bc1b9cc99b70b17757e1903f629c7a26584790 Author: Jan Beulich AuthorDate: Fri May 29 17:28:45 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:28:45 2020 +0200 x86emul: rework CMP and TEST emulation Unlike similarly encoded insns these don't write their memory operands, and hence x86_is_mem_write() should return false for them. However, rather than adding special logic there, rework how their emulation gets done, by making decoding attributes properly describe the r/o nature of their memory operands: - change the table entries for opcodes 0x38 and 0x39, with no other adjustments to the attributes later on, - for the other opcodes, leave the table entries as they are, and override the attributes for the specific sub-cases (identified by ModRM.reg). For opcodes 0x38 and 0x39 the change of the table entries implies changing the order of operands as passed to emulate_2op_SrcV(), hence the splitting of the cases in the main switch(). Note how this also allows dropping custom LOCK prefix checks. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/arch/x86/x86_emulate/x86_emulate.c | 37 +++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 080732b75b..1d44653007 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -84,7 +84,7 @@ static const opcode_desc_t opcode_table[256] = { ByteOp|DstReg|SrcMem|ModRM, DstReg|SrcMem|ModRM, ByteOp|DstEax|SrcImm, DstEax|SrcImm, 0, ImplicitOps, /* 0x38 - 0x3F */ - ByteOp|DstMem|SrcReg|ModRM, DstMem|SrcReg|ModRM, + ByteOp|DstReg|SrcMem|ModRM, DstReg|SrcMem|ModRM, ByteOp|DstReg|SrcMem|ModRM, DstReg|SrcMem|ModRM, ByteOp|DstEax|SrcImm, DstEax|SrcImm, 0, ImplicitOps, /* 0x40 - 0x4F */ @@ -2481,7 +2481,6 @@ x86_decode_onebyte( case 0x60: /* pusha */ case 0x61: /* popa */ case 0x62: /* bound */ - case 0x82: /* Grp1 (x86/32 only) */ case 0xc4: /* les */ case 0xc5: /* lds */ case 0xce: /* into */ @@ -2491,6 +2490,14 @@ x86_decode_onebyte( state->not_64bit = true; break; + case 0x82: /* Grp1 (x86/32 only) */ + state->not_64bit = true; + /* fall through */ + case 0x80: case 0x81: case 0x83: /* Grp1 */ + if ( (modrm_reg & 7) == 7 ) /* cmp */ + state->desc = (state->desc & ByteOp) | DstNone | SrcMem; + break; + case 0x90: /* nop / pause */ if ( repe_prefix() ) ctxt->opcode |= X86EMUL_OPC_F3(0, 0); @@ -2521,6 +2528,11 @@ x86_decode_onebyte( imm2 = insn_fetch_type(uint8_t); break; + case 0xf6: case 0xf7: /* Grp3 */ + if ( !(modrm_reg & 6) ) /* test */ + state->desc = (state->desc & ByteOp) | DstNone | SrcMem; + break; + case 0xff: /* Grp5 */ switch ( modrm_reg & 7 ) { @@ -3928,13 +3940,11 @@ x86_emulate( break; case 0x38: case 0x39: cmp: /* cmp reg,mem */ - if ( ops->rmw && dst.type == OP_MEM && - (rc = read_ulong(dst.mem.seg, dst.mem.off, &dst.val, - dst.bytes, ctxt, ops)) != X86EMUL_OKAY ) - goto done; - /* fall through */ + emulate_2op_SrcV("cmp", dst, src, _regs.eflags); + dst.type = OP_NONE; + break; + case 0x3a ... 0x3d: /* cmp */ - generate_exception_if(lock_prefix, EXC_UD); emulate_2op_SrcV("cmp", src, dst, _regs.eflags); dst.type = OP_NONE; break; @@ -4239,7 +4249,9 @@ x86_emulate( case 4: goto and; case 5: goto sub; case 6: goto xor; - case 7: goto cmp; + case 7: + dst.val = imm1; + goto cmp; } break; @@ -5233,11 +5245,8 @@ x86_emulate( unsigned long u[2], v; case 0 ... 1: /* test */ - generate_exception_if(lock_prefix, EXC_UD); - if ( ops->rmw && dst.type == OP_MEM && - (rc = read_ulong(dst.mem.seg, dst.mem.off, &dst.val, - dst.bytes, ctxt, ops)) != X86EMUL_OKAY ) - goto done; + dst.val = imm1; + dst.bytes = src.bytes; goto test; case 2: /* not */ if ( ops->rmw && dst.type == OP_MEM ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:44:29 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBN-0000Vr-0t; Fri, 29 May 2020 15:44:29 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBL-0000VX-TP for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:27 +0000 X-Inumbo-ID: 462bb4b0-a1c3-11ea-a8da-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 462bb4b0-a1c3-11ea-a8da-12813bfff9fa; Fri, 29 May 2020 15:44:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mcv+p3WUf/3AZwVOV5tnyIbt/toKh1S+D5nBYacC2LI=; b=vYEelOY+FakKNbnR9TIF7Rv6CY nUuMOZlkskUNhaIbkxQ2Diuh6n87q0GgiBKIpPWFJLbv8gsxcngUpyl873EHw52cpbcE1fpl86BD5 CYFIU9ko4PO0O4xWChaUgMe0qmajqQSRGVYldUFaiZhfNW9SJD6kopVn5HwslWL6ZTvU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBJ-0008Ph-H7 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehBJ-0000S0-GA for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: also test decoding and mem access / write logic Message-Id: Date: Fri, 29 May 2020 15:44:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 3351acaee706b8e238b031a456bf181f97f167c3 Author: Jan Beulich AuthorDate: Fri May 29 17:29:59 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:29:59 2020 +0200 x86emul: also test decoding and mem access / write logic x86emul_is_mem_{access,write}() (and their interaction with x86_decode()) have become sufficiently complex that we should have a way to test this logic. Start by covering legacy encoded GPR insns, with the exception of a few the main emulator doesn't support yet (left as comments in the respective tables, or about to be added by subsequent patches). This has already helped spot a few flaws in said logic, addressed by (revised) earlier patches. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/Makefile | 4 +- tools/tests/x86_emulator/predicates.c | 671 +++++++++++++++++++++++++++ tools/tests/x86_emulator/test_x86_emulator.c | 2 + tools/tests/x86_emulator/x86-emulate.c | 6 + tools/tests/x86_emulator/x86-emulate.h | 6 + xen/arch/x86/x86_emulate.c | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 12 +- xen/arch/x86/x86_emulate/x86_emulate.h | 6 +- 8 files changed, 694 insertions(+), 14 deletions(-) diff --git a/tools/tests/x86_emulator/Makefile b/tools/tests/x86_emulator/Makefile index b414773810..48b3e6dce1 100644 --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -250,7 +250,7 @@ xop.h avx512f.h: simd-fma.c endif # 32-bit override -$(TARGET): x86-emulate.o cpuid.o test_x86_emulator.o evex-disp8.o wrappers.o +$(TARGET): x86-emulate.o cpuid.o test_x86_emulator.o evex-disp8.o predicates.o wrappers.o $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ .PHONY: clean @@ -289,7 +289,7 @@ x86.h := $(addprefix $(XEN_ROOT)/tools/include/xen/asm/,\ cpuid.h cpuid-autogen.h) x86_emulate.h := x86-emulate.h x86_emulate/x86_emulate.h $(x86.h) -x86-emulate.o cpuid.o test_x86_emulator.o evex-disp8.o wrappers.o: %.o: %.c $(x86_emulate.h) +x86-emulate.o cpuid.o test_x86_emulator.o evex-disp8.o predicates.o wrappers.o: %.o: %.c $(x86_emulate.h) $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< x86-emulate.o: x86_emulate/x86_emulate.c diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c new file mode 100644 index 0000000000..404e03c30d --- /dev/null +++ b/tools/tests/x86_emulator/predicates.c @@ -0,0 +1,671 @@ +#include "x86-emulate.h" + +#include + +enum mem_access { mem_none, mem_read, mem_write }; +enum pfx { pfx_none, pfx_66, pfx_f3, pfx_f2 }; +static const uint8_t prefixes[] = { 0x66, 0xf3, 0xf2 }; + +#define F false +#define T true + +#define N mem_none +#define R mem_read +#define W mem_write + +/* + * ModR/M bytes and immediates don't need spelling out in the opcodes, + * unless the implied zeros aren't good enough. + */ +static const struct { + uint8_t opc[8]; + uint8_t len[2]; /* 32- and 64-bit mode */ + bool modrm:1; /* Should register form (also) be tested? */ + unsigned int mem:2; + unsigned int pfx:2; +#define REG(opc, more...) \ + { { (opc) | 0 }, more }, /* %?ax */ \ + { { (opc) | 1 }, more }, /* %?cx */ \ + { { (opc) | 2 }, more }, /* %?dx */ \ + { { (opc) | 3 }, more }, /* %?bx */ \ + { { (opc) | 4 }, more }, /* %?sp */ \ + { { (opc) | 5 }, more }, /* %?bp */ \ + { { (opc) | 6 }, more }, /* %?si */ \ + { { (opc) | 7 }, more } /* %?di */ +#define CND(opc, more...) \ + { { (opc) | 0x0 }, more }, /* ..o */ \ + { { (opc) | 0x1 }, more }, /* ..no */ \ + { { (opc) | 0x2 }, more }, /* ..c / ..b */ \ + { { (opc) | 0x3 }, more }, /* ..nc / ..nb */ \ + { { (opc) | 0x4 }, more }, /* ..z / ..e */ \ + { { (opc) | 0x5 }, more }, /* ..nz / ..ne */ \ + { { (opc) | 0x6 }, more }, /* ..be / ..na */ \ + { { (opc) | 0x7 }, more }, /* ..a / ..nbe */ \ + { { (opc) | 0x8 }, more }, /* ..s */ \ + { { (opc) | 0x9 }, more }, /* ..ns */ \ + { { (opc) | 0xa }, more }, /* ..pe / ..p */ \ + { { (opc) | 0xb }, more }, /* ..po / ..np */ \ + { { (opc) | 0xc }, more }, /* ..l / ..nge */ \ + { { (opc) | 0xd }, more }, /* ..ge / ..nl */ \ + { { (opc) | 0xe }, more }, /* ..le / ..ng */ \ + { { (opc) | 0xf }, more } /* ..g / .. nle */ +} legacy[] = { + { { 0x00 }, { 2, 2 }, T, W }, /* add */ + { { 0x01 }, { 2, 2 }, T, W }, /* add */ + { { 0x02 }, { 2, 2 }, T, R }, /* add */ + { { 0x03 }, { 2, 2 }, T, R }, /* add */ + { { 0x04 }, { 2, 2 }, F, N }, /* add */ + { { 0x05 }, { 5, 5 }, F, N }, /* add */ + { { 0x06 }, { 1, 0 }, F, W }, /* push %es */ + { { 0x07 }, { 1, 0 }, F, R }, /* pop %es */ + { { 0x08 }, { 2, 2 }, T, W }, /* or */ + { { 0x09 }, { 2, 2 }, T, W }, /* or */ + { { 0x0a }, { 2, 2 }, T, R }, /* or */ + { { 0x0b }, { 2, 2 }, T, R }, /* or */ + { { 0x0c }, { 2, 2 }, F, N }, /* or */ + { { 0x0d }, { 5, 5 }, F, N }, /* or */ + { { 0x0e }, { 1, 0 }, F, W }, /* push %cs */ + { { 0x10 }, { 2, 2 }, T, W }, /* adc */ + { { 0x11 }, { 2, 2 }, T, W }, /* adc */ + { { 0x12 }, { 2, 2 }, T, R }, /* adc */ + { { 0x13 }, { 2, 2 }, T, R }, /* adc */ + { { 0x14 }, { 2, 2 }, F, N }, /* adc */ + { { 0x15 }, { 5, 5 }, F, N }, /* adc */ + { { 0x16 }, { 1, 0 }, F, W }, /* push %ss */ + { { 0x17 }, { 1, 0 }, F, R }, /* pop %ss */ + { { 0x18 }, { 2, 2 }, T, W }, /* adc */ + { { 0x19 }, { 2, 2 }, T, W }, /* adc */ + { { 0x1a }, { 2, 2 }, T, R }, /* adc */ + { { 0x1b }, { 2, 2 }, T, R }, /* adc */ + { { 0x1c }, { 2, 2 }, F, N }, /* adc */ + { { 0x1d }, { 5, 5 }, F, N }, /* adc */ + { { 0x1e }, { 1, 0 }, F, W }, /* push %ds */ + { { 0x1f }, { 1, 0 }, F, R }, /* pop %ds */ + { { 0x20 }, { 2, 2 }, T, W }, /* and */ + { { 0x21 }, { 2, 2 }, T, W }, /* and */ + { { 0x22 }, { 2, 2 }, T, R }, /* and */ + { { 0x23 }, { 2, 2 }, T, R }, /* and */ + { { 0x24 }, { 2, 2 }, F, N }, /* and */ + { { 0x25 }, { 5, 5 }, F, N }, /* and */ + { { 0x27 }, { 1, 0 }, F, N }, /* daa */ + { { 0x28 }, { 2, 2 }, T, W }, /* sub */ + { { 0x29 }, { 2, 2 }, T, W }, /* sub */ + { { 0x2a }, { 2, 2 }, T, R }, /* sub */ + { { 0x2b }, { 2, 2 }, T, R }, /* sub */ + { { 0x2c }, { 2, 2 }, F, N }, /* sub */ + { { 0x2d }, { 5, 5 }, F, N }, /* sub */ + { { 0x2f }, { 1, 0 }, F, N }, /* das */ + { { 0x30 }, { 2, 2 }, T, W }, /* xor */ + { { 0x31 }, { 2, 2 }, T, W }, /* xor */ + { { 0x32 }, { 2, 2 }, T, R }, /* xor */ + { { 0x33 }, { 2, 2 }, T, R }, /* xor */ + { { 0x34 }, { 2, 2 }, F, N }, /* xor */ + { { 0x35 }, { 5, 5 }, F, N }, /* xor */ + { { 0x37 }, { 1, 0 }, F, N }, /* aaa */ + { { 0x38 }, { 2, 2 }, T, R }, /* cmp */ + { { 0x39 }, { 2, 2 }, T, R }, /* cmp */ + { { 0x3a }, { 2, 2 }, T, R }, /* cmp */ + { { 0x3b }, { 2, 2 }, T, R }, /* cmp */ + { { 0x3c }, { 2, 2 }, F, N }, /* cmp */ + { { 0x3d }, { 5, 5 }, F, N }, /* cmp */ + { { 0x3f }, { 1, 0 }, F, N }, /* aas */ + REG(0x40, { 1, 0 }, F, N ), /* inc */ + REG(0x48, { 1, 0 }, F, N ), /* dec */ + REG(0x50, { 1, 0 }, F, W ), /* push */ + REG(0x58, { 1, 0 }, F, R ), /* pop */ + { { 0x60 }, { 1, 0 }, F, W }, /* pusha */ + { { 0x61 }, { 1, 0 }, F, R }, /* popa */ + { { 0x62 }, { 2, 0 }, F, R }, /* bound */ + { { 0x63 }, { 2, 0 }, F, W }, /* arpl */ + { { 0x63 }, { 0, 2 }, F, R }, /* movsxd */ + { { 0x68 }, { 5, 5 }, F, W }, /* push */ + { { 0x69 }, { 6, 6 }, T, R }, /* imul */ + { { 0x6a }, { 2, 2 }, F, W }, /* push */ + { { 0x6b }, { 3, 3 }, T, R }, /* imul */ + { { 0x6c }, { 1, 1 }, F, W }, /* ins */ + { { 0x6d }, { 1, 1 }, F, W }, /* ins */ + { { 0x6e }, { 1, 1 }, F, R }, /* outs */ + { { 0x6f }, { 1, 1 }, F, R }, /* outs */ + CND(0x70, { 2, 2 }, F, N ), /* j */ + { { 0x80, 0x00 }, { 3, 3 }, T, W }, /* add */ + { { 0x80, 0x08 }, { 3, 3 }, T, W }, /* or */ + { { 0x80, 0x10 }, { 3, 3 }, T, W }, /* adc */ + { { 0x80, 0x18 }, { 3, 3 }, T, W }, /* sbb */ + { { 0x80, 0x20 }, { 3, 3 }, T, W }, /* and */ + { { 0x80, 0x28 }, { 3, 3 }, T, W }, /* sub */ + { { 0x80, 0x30 }, { 3, 3 }, T, W }, /* xor */ + { { 0x80, 0x38 }, { 3, 3 }, T, R }, /* cmp */ + { { 0x81, 0x00 }, { 6, 6 }, T, W }, /* add */ + { { 0x81, 0x08 }, { 6, 6 }, T, W }, /* or */ + { { 0x81, 0x10 }, { 6, 6 }, T, W }, /* adc */ + { { 0x81, 0x18 }, { 6, 6 }, T, W }, /* sbb */ + { { 0x81, 0x20 }, { 6, 6 }, T, W }, /* and */ + { { 0x81, 0x28 }, { 6, 6 }, T, W }, /* sub */ + { { 0x81, 0x30 }, { 6, 6 }, T, W }, /* add */ + { { 0x81, 0x38 }, { 6, 6 }, T, R }, /* cmp */ + { { 0x82, 0x00 }, { 3, 0 }, T, W }, /* xor */ + { { 0x82, 0x08 }, { 3, 0 }, T, W }, /* or */ + { { 0x82, 0x10 }, { 3, 0 }, T, W }, /* adc */ + { { 0x82, 0x18 }, { 3, 0 }, T, W }, /* sbb */ + { { 0x82, 0x20 }, { 3, 0 }, T, W }, /* and */ + { { 0x82, 0x28 }, { 3, 0 }, T, W }, /* sub */ + { { 0x82, 0x30 }, { 3, 0 }, T, W }, /* xor */ + { { 0x82, 0x38 }, { 3, 0 }, T, R }, /* cmp */ + { { 0x83, 0x00 }, { 3, 3 }, T, W }, /* add */ + { { 0x83, 0x08 }, { 3, 3 }, T, W }, /* or */ + { { 0x83, 0x10 }, { 3, 3 }, T, W }, /* adc */ + { { 0x83, 0x18 }, { 3, 3 }, T, W }, /* sbb */ + { { 0x83, 0x20 }, { 3, 3 }, T, W }, /* and */ + { { 0x83, 0x28 }, { 3, 3 }, T, W }, /* sub */ + { { 0x83, 0x30 }, { 3, 3 }, T, W }, /* xor */ + { { 0x83, 0x38 }, { 3, 3 }, T, R }, /* cmp */ + { { 0x84 }, { 2, 2 }, T, R }, /* test */ + { { 0x85 }, { 2, 2 }, T, R }, /* test */ + { { 0x86 }, { 2, 2 }, T, W }, /* xchg */ + { { 0x87 }, { 2, 2 }, T, W }, /* xchg */ + { { 0x88 }, { 2, 2 }, T, W }, /* mov */ + { { 0x89 }, { 2, 2 }, T, W }, /* mov */ + { { 0x8a }, { 2, 2 }, T, R }, /* mov */ + { { 0x8b }, { 2, 2 }, T, R }, /* mov */ + { { 0x8c }, { 2, 2 }, T, W }, /* mov */ + { { 0x8d }, { 2, 2 }, F, N }, /* lea */ + { { 0x8e }, { 2, 2 }, T, R }, /* mov */ + { { 0x8f, 0x00 }, { 2, 2 }, F, W }, /* pop */ + { { 0x8f, 0xc0 }, { 2, 2 }, F, R }, /* pop */ + REG(0x90, { 1, 0 }, F, N ), /* xchg */ + { { 0x98 }, { 1, 1 }, F, N }, /* cbw */ + { { 0x99 }, { 1, 1 }, F, N }, /* cwd */ + { { 0x9a }, { 7, 0 }, F, W }, /* lcall */ + { { 0x9b }, { 1, 1 }, F, N }, /* wait */ + { { 0x9c }, { 1, 1 }, F, W }, /* pushf */ + { { 0x9d }, { 1, 1 }, F, R }, /* popf */ + { { 0x9e }, { 1, 1 }, F, N }, /* sahf */ + { { 0x9f }, { 1, 1 }, F, N }, /* lahf */ + { { 0xa0 }, { 5, 9 }, F, R }, /* mov */ + { { 0xa1 }, { 5, 9 }, F, R }, /* mov */ + { { 0xa2 }, { 5, 9 }, F, W }, /* mov */ + { { 0xa3 }, { 5, 9 }, F, W }, /* mov */ + { { 0xa4 }, { 1, 1 }, F, W }, /* movs */ + { { 0xa5 }, { 1, 1 }, F, W }, /* movs */ + { { 0xa6 }, { 1, 1 }, F, R }, /* cmps */ + { { 0xa7 }, { 1, 1 }, F, R }, /* cmps */ + { { 0xa8 }, { 2, 2 }, F, N }, /* test */ + { { 0xa9 }, { 5, 5 }, F, N }, /* test */ + { { 0xaa }, { 1, 1 }, F, W }, /* stos */ + { { 0xab }, { 1, 1 }, F, W }, /* stos */ + { { 0xac }, { 1, 1 }, F, R }, /* lods */ + { { 0xad }, { 1, 1 }, F, R }, /* lods */ + { { 0xae }, { 1, 1 }, F, R }, /* scas */ + { { 0xaf }, { 1, 1 }, F, R }, /* scas */ + REG(0xb0, { 2, 2 }, F, N ), /* mov */ + REG(0xb8, { 5, 5 }, F, N ), /* mov */ + { { 0xc0, 0x00 }, { 3, 3 }, T, W }, /* rol */ + { { 0xc0, 0x08 }, { 3, 3 }, T, W }, /* ror */ + { { 0xc0, 0x10 }, { 3, 3 }, T, W }, /* rcl */ + { { 0xc0, 0x18 }, { 3, 3 }, T, W }, /* rcr */ + { { 0xc0, 0x20 }, { 3, 3 }, T, W }, /* shl */ + { { 0xc0, 0x28 }, { 3, 3 }, T, W }, /* shr */ + { { 0xc0, 0x30 }, { 3, 3 }, T, W }, /* sal */ + { { 0xc0, 0x38 }, { 3, 3 }, T, W }, /* sar */ + { { 0xc1, 0x00 }, { 3, 3 }, T, W }, /* rol */ + { { 0xc1, 0x08 }, { 3, 3 }, T, W }, /* ror */ + { { 0xc1, 0x10 }, { 3, 3 }, T, W }, /* rcl */ + { { 0xc1, 0x18 }, { 3, 3 }, T, W }, /* rcr */ + { { 0xc1, 0x20 }, { 3, 3 }, T, W }, /* shl */ + { { 0xc1, 0x28 }, { 3, 3 }, T, W }, /* shr */ + { { 0xc1, 0x30 }, { 3, 3 }, T, W }, /* sal */ + { { 0xc1, 0x38 }, { 3, 3 }, T, W }, /* sar */ + { { 0xc2 }, { 3, 3 }, F, R }, /* ret */ + { { 0xc3 }, { 1, 1 }, F, R }, /* ret */ + { { 0xc4 }, { 2, 0 }, F, R }, /* les */ + { { 0xc5 }, { 2, 0 }, F, R }, /* lds */ + { { 0xc6, 0x00 }, { 3, 3 }, T, W }, /* mov */ + { { 0xc6, 0xf8 }, { 3, 3 }, F, N }, /* xabort */ + { { 0xc7, 0x00 }, { 6, 6 }, T, W }, /* mov */ + { { 0xc7, 0xf8 }, { 6, 6 }, F, N }, /* xbegin */ + { { 0xc8 }, { 4, 4 }, F, W }, /* enter */ + { { 0xc9 }, { 1, 1 }, F, R }, /* leave */ + { { 0xca }, { 3, 3 }, F, R }, /* lret */ + { { 0xcb }, { 1, 1 }, F, R }, /* lret */ + { { 0xcc }, { 1, 1 }, F, N }, /* int3 */ + { { 0xcd }, { 2, 2 }, F, N }, /* int */ + { { 0xce }, { 1, 0 }, F, N }, /* into */ + { { 0xcf }, { 1, 1 }, F, N }, /* iret */ + { { 0xd0, 0x00 }, { 2, 2 }, T, W }, /* rol */ + { { 0xd0, 0x08 }, { 2, 2 }, T, W }, /* ror */ + { { 0xd0, 0x10 }, { 2, 2 }, T, W }, /* rcl */ + { { 0xd0, 0x18 }, { 2, 2 }, T, W }, /* rcr */ + { { 0xd0, 0x20 }, { 2, 2 }, T, W }, /* shl */ + { { 0xd0, 0x28 }, { 2, 2 }, T, W }, /* shr */ + { { 0xd0, 0x30 }, { 2, 2 }, T, W }, /* sal */ + { { 0xd0, 0x38 }, { 2, 2 }, T, W }, /* sar */ + { { 0xd1, 0x00 }, { 2, 2 }, T, W }, /* rol */ + { { 0xd1, 0x08 }, { 2, 2 }, T, W }, /* ror */ + { { 0xd1, 0x10 }, { 2, 2 }, T, W }, /* rcl */ + { { 0xd1, 0x18 }, { 2, 2 }, T, W }, /* rcr */ + { { 0xd1, 0x20 }, { 2, 2 }, T, W }, /* shl */ + { { 0xd1, 0x28 }, { 2, 2 }, T, W }, /* shr */ + { { 0xd1, 0x30 }, { 2, 2 }, T, W }, /* sal */ + { { 0xd1, 0x38 }, { 2, 2 }, T, W }, /* sar */ + { { 0xd2, 0x00 }, { 2, 2 }, T, W }, /* rol */ + { { 0xd2, 0x08 }, { 2, 2 }, T, W }, /* ror */ + { { 0xd2, 0x10 }, { 2, 2 }, T, W }, /* rcl */ + { { 0xd2, 0x18 }, { 2, 2 }, T, W }, /* rcr */ + { { 0xd2, 0x20 }, { 2, 2 }, T, W }, /* shl */ + { { 0xd2, 0x28 }, { 2, 2 }, T, W }, /* shr */ + { { 0xd2, 0x30 }, { 2, 2 }, T, W }, /* sal */ + { { 0xd2, 0x38 }, { 2, 2 }, T, W }, /* sar */ + { { 0xd3, 0x00 }, { 2, 2 }, T, W }, /* rol */ + { { 0xd3, 0x08 }, { 2, 2 }, T, W }, /* ror */ + { { 0xd3, 0x10 }, { 2, 2 }, T, W }, /* rcl */ + { { 0xd3, 0x18 }, { 2, 2 }, T, W }, /* rcr */ + { { 0xd3, 0x20 }, { 2, 2 }, T, W }, /* shl */ + { { 0xd3, 0x28 }, { 2, 2 }, T, W }, /* shr */ + { { 0xd3, 0x30 }, { 2, 2 }, T, W }, /* sal */ + { { 0xd3, 0x38 }, { 2, 2 }, T, W }, /* sar */ + { { 0xd4 }, { 2, 0 }, F, N }, /* aam */ + { { 0xd5 }, { 2, 0 }, F, N }, /* aad */ + { { 0xd6 }, { 1, 0 }, F, N }, /* salc */ + { { 0xd7 }, { 1, 1 }, F, R }, /* xlat */ + { { 0xe0 }, { 2, 2 }, F, N }, /* loopne */ + { { 0xe1 }, { 2, 2 }, F, N }, /* loope */ + { { 0xe2 }, { 2, 2 }, F, N }, /* loop */ + { { 0xe3 }, { 2, 2 }, F, N }, /* j?cxz */ + { { 0xe4 }, { 2, 2 }, F, N }, /* in */ + { { 0xe5 }, { 2, 2 }, F, N }, /* in */ + { { 0xe6 }, { 2, 2 }, F, N }, /* out */ + { { 0xe7 }, { 2, 2 }, F, N }, /* out */ + { { 0xe8 }, { 5, 5 }, F, W }, /* call */ + { { 0xe9 }, { 5, 5 }, F, N }, /* jmp */ + { { 0xea }, { 7, 0 }, F, N }, /* ljmp */ + { { 0xeb }, { 2, 2 }, F, N }, /* jmp */ + { { 0xec }, { 1, 1 }, F, N }, /* in */ + { { 0xed }, { 1, 1 }, F, N }, /* in */ + { { 0xee }, { 1, 1 }, F, N }, /* out */ + { { 0xef }, { 1, 1 }, F, N }, /* out */ + { { 0xf1 }, { 1, 1 }, F, N }, /* icebp */ + { { 0xf4 }, { 1, 1 }, F, N }, /* hlt */ + { { 0xf5 }, { 1, 1 }, F, N }, /* cmc */ + { { 0xf6, 0x00 }, { 3, 3 }, T, R }, /* test */ + { { 0xf6, 0x08 }, { 3, 3 }, T, R }, /* test */ + { { 0xf6, 0x10 }, { 2, 2 }, T, W }, /* not */ + { { 0xf6, 0x18 }, { 2, 2 }, T, W }, /* neg */ + { { 0xf6, 0x20 }, { 2, 2 }, T, R }, /* mul */ + { { 0xf6, 0x28 }, { 2, 2 }, T, R }, /* imul */ + { { 0xf6, 0x30 }, { 2, 2 }, T, R }, /* div */ + { { 0xf6, 0x38 }, { 2, 2 }, T, R }, /* idiv */ + { { 0xf7, 0x00 }, { 6, 6 }, T, R }, /* test */ + { { 0xf7, 0x08 }, { 6, 6 }, T, R }, /* test */ + { { 0xf7, 0x10 }, { 2, 2 }, T, W }, /* not */ + { { 0xf7, 0x18 }, { 2, 2 }, T, W }, /* neg */ + { { 0xf7, 0x20 }, { 2, 2 }, T, R }, /* mul */ + { { 0xf7, 0x28 }, { 2, 2 }, T, R }, /* imul */ + { { 0xf7, 0x30 }, { 2, 2 }, T, R }, /* div */ + { { 0xf7, 0x38 }, { 2, 2 }, T, R }, /* idiv */ + { { 0xf8 }, { 1, 1 }, F, N }, /* clc */ + { { 0xf9 }, { 1, 1 }, F, N }, /* stc */ + { { 0xfa }, { 1, 1 }, F, N }, /* cli */ + { { 0xfb }, { 1, 1 }, F, N }, /* sti */ + { { 0xfc }, { 1, 1 }, F, N }, /* cld */ + { { 0xfd }, { 1, 1 }, F, N }, /* std */ + { { 0xfe, 0x00 }, { 2, 2 }, T, W }, /* inc */ + { { 0xfe, 0x08 }, { 2, 2 }, T, W }, /* dec */ + { { 0xff, 0x00 }, { 2, 2 }, T, W }, /* inc */ + { { 0xff, 0x08 }, { 2, 2 }, T, W }, /* dec */ + { { 0xff, 0x10 }, { 2, 2 }, F, W }, /* call */ + { { 0xff, 0x18 }, { 2, 2 }, F, W }, /* lcall */ + { { 0xff, 0x20 }, { 2, 2 }, T, R }, /* jmp */ + { { 0xff, 0x28 }, { 2, 2 }, F, R }, /* ljmp */ + { { 0xff, 0x30 }, { 2, 2 }, F, W }, /* push */ + { { 0xff, 0xd0 }, { 2, 2 }, F, W }, /* call */ + { { 0xff, 0xf0 }, { 2, 2 }, F, W }, /* push */ +}, legacy_0f[] = { + { { 0x00, 0x00 }, { 2, 2 }, T, W }, /* sldt */ + { { 0x00, 0x08 }, { 2, 2 }, T, W }, /* str */ + { { 0x00, 0x10 }, { 2, 2 }, T, R }, /* lldt */ + { { 0x00, 0x18 }, { 2, 2 }, T, R }, /* ltr */ + { { 0x00, 0x20 }, { 2, 2 }, T, R }, /* verr */ + { { 0x00, 0x28 }, { 2, 2 }, T, R }, /* verw */ + { { 0x01, 0x00 }, { 2, 2 }, F, W }, /* sgdt */ + { { 0x01, 0x08 }, { 2, 2 }, F, W }, /* sidt */ + { { 0x01, 0x10 }, { 2, 2 }, F, R }, /* lgdt */ + { { 0x01, 0x18 }, { 2, 2 }, F, R }, /* lidt */ + { { 0x01, 0x20 }, { 2, 2 }, T, W }, /* smsw */ + /*{ 0x01, 0x28 }, { 2, 2 }, F, W, pfx_f3 }, rstorssp */ + { { 0x01, 0x30 }, { 2, 2 }, T, R }, /* lmsw */ + { { 0x01, 0x38 }, { 2, 2 }, F, N }, /* invlpg */ + { { 0x01, 0xc0 }, { 2, 2 }, T, N }, /* enclv */ + { { 0x01, 0xc1 }, { 2, 2 }, T, N }, /* vmcall */ + /*{ 0x01, 0xc2 }, { 2, 2 }, F, R }, vmlaunch */ + /*{ 0x01, 0xc3 }, { 2, 2 }, F, R }, vmresume */ + { { 0x01, 0xc4 }, { 2, 2 }, T, N }, /* vmxoff */ + { { 0x01, 0xc5 }, { 2, 2 }, T, N }, /* pconfig */ + { { 0x01, 0xc8 }, { 2, 2 }, T, N }, /* monitor */ + { { 0x01, 0xc9 }, { 2, 2 }, T, N }, /* mwait */ + { { 0x01, 0xca }, { 2, 2 }, T, N }, /* clac */ + { { 0x01, 0xcb }, { 2, 2 }, T, N }, /* stac */ + { { 0x01, 0xcf }, { 2, 2 }, T, N }, /* encls */ + { { 0x01, 0xd0 }, { 2, 2 }, T, N }, /* xgetbv */ + { { 0x01, 0xd1 }, { 2, 2 }, T, N }, /* xsetbv */ + { { 0x01, 0xd4 }, { 2, 2 }, T, N }, /* vmfunc */ + { { 0x01, 0xd5 }, { 2, 2 }, T, N }, /* xend */ + { { 0x01, 0xd6 }, { 2, 2 }, T, N }, /* xtest */ + { { 0x01, 0xd7 }, { 2, 2 }, T, N }, /* enclu */ + /*{ 0x01, 0xd8 }, { 2, 2 }, F, R }, vmrun */ + { { 0x01, 0xd9 }, { 2, 2 }, T, N }, /* vmcall */ + { { 0x01, 0xd9 }, { 2, 2 }, T, N, pfx_f3 }, /* vmgexit */ + { { 0x01, 0xd9 }, { 2, 2 }, T, N, pfx_f2 }, /* vmgexit */ + /*{ 0x01, 0xda }, { 2, 2 }, F, R }, vmload */ + /*{ 0x01, 0xdb }, { 2, 2 }, F, W }, vmsave */ + { { 0x01, 0xdc }, { 2, 2 }, T, N }, /* stgi */ + { { 0x01, 0xdd }, { 2, 2 }, T, N }, /* clgi */ + /*{ 0x01, 0xde }, { 2, 2 }, F, R }, skinit */ + { { 0x01, 0xdf }, { 2, 2 }, T, N }, /* invlpga */ + { { 0x01, 0xe8 }, { 2, 2 }, T, N }, /* serialize */ + /*{ 0x01, 0xe8 }, { 2, 2 }, F, W, pfx_f3 }, setssbsy */ + { { 0x01, 0xe8 }, { 2, 2 }, T, N, pfx_f2 }, /* xsusldtrk */ + { { 0x01, 0xe9 }, { 2, 2 }, T, N, pfx_f2 }, /* xresldtrk */ + /*{ 0x01, 0xea }, { 2, 2 }, F, W, pfx_f3 }, saveprevssp */ + { { 0x01, 0xee }, { 2, 2 }, T, N }, /* rdpkru */ + { { 0x01, 0xef }, { 2, 2 }, T, N }, /* wrpkru */ + { { 0x01, 0xf8 }, { 0, 2 }, T, N }, /* swapgs */ + { { 0x01, 0xf9 }, { 2, 2 }, T, N }, /* rdtscp */ + { { 0x01, 0xfa }, { 2, 2 }, T, N }, /* monitorx */ + { { 0x01, 0xfa }, { 2, 2 }, T, N, pfx_f3 }, /* mcommit */ + { { 0x01, 0xfb }, { 2, 2 }, T, N }, /* mwaitx */ + { { 0x01, 0xfc }, { 2, 2 }, F, W }, /* clzero */ + { { 0x01, 0xfd }, { 2, 2 }, T, N }, /* rdpru */ + { { 0x01, 0xfe }, { 2, 2 }, T, N }, /* invlpgb */ + { { 0x01, 0xfe }, { 0, 2 }, T, N, pfx_f3 }, /* rmpadjust */ + { { 0x01, 0xfe }, { 0, 2 }, T, N, pfx_f2 }, /* rmpupdate */ + { { 0x01, 0xff }, { 2, 2 }, T, N }, /* tlbsync */ + { { 0x01, 0xff }, { 0, 2 }, T, N, pfx_f3 }, /* psmash */ + { { 0x01, 0xff }, { 0, 2 }, T, N, pfx_f2 }, /* pvalidate */ + { { 0x02 }, { 2, 2 }, T, R }, /* lar */ + { { 0x03 }, { 2, 2 }, T, R }, /* lsl */ + { { 0x05 }, { 1, 1 }, F, N }, /* syscall */ + { { 0x06 }, { 1, 1 }, F, N }, /* clts */ + { { 0x07 }, { 1, 1 }, F, N }, /* sysret */ + { { 0x08 }, { 1, 1 }, F, N }, /* invd */ + { { 0x09 }, { 1, 1 }, F, N }, /* wbinvd */ + { { 0x09 }, { 1, 1 }, F, N, pfx_f3 }, /* wbnoinvd */ + { { 0x0b }, { 1, 1 }, F, N }, /* ud2 */ + { { 0x0d, 0x00 }, { 2, 2 }, F, N }, /* prefetch */ + { { 0x0d, 0x08 }, { 2, 2 }, F, N }, /* prefetchw */ + { { 0x0e }, { 1, 1 }, F, N }, /* femms */ + { { 0x18, 0x00 }, { 2, 2 }, F, N }, /* prefetchnta */ + { { 0x18, 0x08 }, { 2, 2 }, F, N }, /* prefetch0 */ + { { 0x18, 0x10 }, { 2, 2 }, F, N }, /* prefetch1 */ + { { 0x18, 0x18 }, { 2, 2 }, F, N }, /* prefetch2 */ + /*{ 0x1a }, { 2, 2 }, F, R }, bndldx */ + /*{ 0x1a }, { 2, 2 }, T, R, pfx_66 }, bndmov */ + { { 0x1a }, { 2, 2 }, T, N, pfx_f3 }, /* bndcl */ + { { 0x1a }, { 2, 2 }, T, N, pfx_f2 }, /* bndcu */ + /*{ 0x1b }, { 2, 2 }, F, W }, bndstx */ + /*{ 0x1b }, { 2, 2 }, T, W, pfx_66 }, bndmov */ + { { 0x1b }, { 2, 2 }, F, N, pfx_f3 }, /* bndmk */ + { { 0x1b }, { 2, 2 }, T, N, pfx_f2 }, /* bndcn */ + { { 0x1c, 0x00 }, { 2, 2 }, F, N }, /* cldemote */ + { { 0x1e, 0xc8 }, { 2, 2 }, F, N, pfx_f3 }, /* rdssp */ + { { 0x1e, 0xfa }, { 2, 2 }, F, N, pfx_f3 }, /* endbr64 */ + { { 0x1e, 0xfb }, { 2, 2 }, F, N, pfx_f3 }, /* endbr32 */ + { { 0x1f, 0x00 }, { 2, 2 }, T, N }, /* nop */ + { { 0x20 }, { 2, 2 }, T, N }, /* mov */ + { { 0x21 }, { 2, 2 }, T, N }, /* mov */ + { { 0x22 }, { 2, 2 }, T, N }, /* mov */ + { { 0x23 }, { 2, 2 }, T, N }, /* mov */ + { { 0x30 }, { 1, 1 }, F, N }, /* wrmsr */ + { { 0x31 }, { 1, 1 }, F, N }, /* rdtsc */ + { { 0x32 }, { 1, 1 }, F, N }, /* rdmsr */ + { { 0x33 }, { 1, 1 }, F, N }, /* rdpmc */ + { { 0x34 }, { 1, 1 }, F, N }, /* sysenter */ + { { 0x35 }, { 1, 1 }, F, N }, /* sysexit */ + CND(0x40, { 2, 2 }, T, R ), /* cmov */ + /*{ 0x78 }, { 2, 2 }, T, W }, vmread */ + { { 0x79 }, { 2, 2 }, T, R }, /* vmwrite */ + CND(0x80, { 5, 5 }, F, N ), /* j */ + CND(0x90, { 2, 2 }, T, W ), /* set */ + { { 0xa0 }, { 1, 1 }, F, W }, /* push %fs */ + { { 0xa1 }, { 1, 1 }, F, R }, /* pop %fs */ + { { 0xa2 }, { 1, 1 }, F, N }, /* cpuid */ + { { 0xa3 }, { 2, 2 }, T, R }, /* bt */ + { { 0xa4 }, { 3, 3 }, T, W }, /* shld */ + { { 0xa5 }, { 2, 2 }, T, W }, /* shld */ + { { 0xa8 }, { 1, 1 }, F, W }, /* push %gs */ + { { 0xa9 }, { 1, 1 }, F, R }, /* pop %gs */ + { { 0xaa }, { 1, 1 }, F, N }, /* rsm */ + { { 0xab }, { 2, 2 }, T, W }, /* bts */ + { { 0xac }, { 3, 3 }, T, W }, /* shrd */ + { { 0xad }, { 2, 2 }, T, W }, /* shrd */ + { { 0xae, 0x00 }, { 2, 2 }, F, W }, /* fxsave */ + { { 0xae, 0x08 }, { 2, 2 }, F, R }, /* fxrstor */ + { { 0xae, 0x10 }, { 2, 2 }, F, R }, /* ldmxcsr */ + { { 0xae, 0x18 }, { 2, 2 }, F, W }, /* stmxcsr */ + { { 0xae, 0x20 }, { 2, 2 }, F, W }, /* xsave */ + { { 0xae, 0x20 }, { 2, 2 }, F, R, pfx_f3 }, /* ptwrite */ + { { 0xae, 0x28 }, { 2, 2 }, F, R }, /* xrstor */ + { { 0xae, 0x30 }, { 2, 2 }, F, W }, /* xsaveopt */ + { { 0xae, 0x30 }, { 2, 2 }, F, N, pfx_66 }, /* clwb */ + /*{ 0xae, 0x30 }, { 2, 2 }, F, W, pfx_f3 }, clrssbsy */ + { { 0xae, 0x38 }, { 2, 2 }, F, N }, /* clflush */ + { { 0xae, 0x38 }, { 2, 2 }, F, N, pfx_66 }, /* clflushopt */ + { { 0xae, 0xc0 }, { 0, 2 }, F, N, pfx_f3 }, /* rdfsbase */ + { { 0xae, 0xc8 }, { 0, 2 }, F, N, pfx_f3 }, /* rdgsbase */ + { { 0xae, 0xd0 }, { 0, 2 }, F, N, pfx_f3 }, /* wrfsbase */ + { { 0xae, 0xd8 }, { 0, 2 }, F, N, pfx_f3 }, /* wrgsbase */ + { { 0xae, 0xe8 }, { 2, 2 }, F, N }, /* lfence */ + /*{ 0xae, 0xe8 }, { 2, 2 }, F, R, pfx_f3 }, incssp */ + { { 0xae, 0xf0 }, { 2, 2 }, F, N }, /* mfence */ + { { 0xae, 0xf0 }, { 2, 2 }, F, N, pfx_66 }, /* tpause */ + { { 0xae, 0xf0 }, { 2, 2 }, F, N, pfx_f3 }, /* umonitor */ + { { 0xae, 0xf0 }, { 2, 2 }, F, N, pfx_f2 }, /* umwait */ + { { 0xae, 0xf8 }, { 2, 2 }, F, N }, /* sfence */ + { { 0xaf }, { 2, 2 }, T, R }, /* imul */ + { { 0xb0 }, { 2, 2 }, F, W }, /* cmpxchg */ + { { 0xb1 }, { 2, 2 }, F, W }, /* cmpxchg */ + { { 0xb2 }, { 2, 2 }, F, R }, /* lss */ + { { 0xb3 }, { 2, 2 }, T, W }, /* btr */ + { { 0xb4 }, { 2, 2 }, F, R }, /* lfs */ + { { 0xb5 }, { 2, 2 }, F, R }, /* lgs */ + { { 0xb6 }, { 2, 2 }, F, R }, /* movzx */ + { { 0xb7 }, { 2, 2 }, F, R }, /* movzx */ + { { 0xb8 }, { 2, 2 }, F, R }, /* popcnt */ + { { 0xb9 }, { 2, 2 }, F, N }, /* ud1 */ + { { 0xba, 0x20 }, { 3, 3 }, T, R }, /* bt */ + { { 0xba, 0x28 }, { 3, 3 }, T, W }, /* bts */ + { { 0xba, 0x30 }, { 3, 3 }, T, W }, /* btr */ + { { 0xba, 0x38 }, { 3, 3 }, T, W }, /* btc */ + { { 0xbb }, { 2, 2 }, T, W }, /* btc */ + { { 0xbc }, { 2, 2 }, T, R }, /* bsf */ + { { 0xbc }, { 2, 2 }, T, R, pfx_f3 }, /* tzcnt */ + { { 0xbd }, { 2, 2 }, T, R }, /* bsr */ + { { 0xbd }, { 2, 2 }, T, R, pfx_f3 }, /* lzcnt */ + { { 0xbe }, { 2, 2 }, F, R }, /* movsx */ + { { 0xbf }, { 2, 2 }, F, R }, /* movsx */ + { { 0xc0 }, { 2, 2 }, F, W }, /* xadd */ + { { 0xc1 }, { 2, 2 }, F, W }, /* xadd */ + { { 0xc3 }, { 2, 2 }, F, W }, /* movnti */ + { { 0xc7, 0x08 }, { 2, 2 }, F, W }, /* cmpxchg8b */ + { { 0xc7, 0x18 }, { 2, 2 }, F, R }, /* xrstors */ + { { 0xc7, 0x20 }, { 2, 2 }, F, W }, /* xsavec */ + { { 0xc7, 0x28 }, { 2, 2 }, F, W }, /* xsaves */ + { { 0xc7, 0x30 }, { 2, 2 }, F, R }, /* vmptrld */ + { { 0xc7, 0x30 }, { 2, 2 }, F, R, pfx_66 }, /* vmclear */ + { { 0xc7, 0x30 }, { 2, 2 }, F, R, pfx_f3 }, /* vmxon */ + { { 0xc7, 0x38 }, { 2, 2 }, F, R }, /* vmptrst */ + { { 0xc7, 0xf0 }, { 2, 2 }, F, N }, /* rdrand */ + { { 0xc7, 0xf8 }, { 2, 2 }, F, N }, /* rdseed */ + { { 0xc7, 0xf8 }, { 2, 2 }, F, N, pfx_f3 }, /* rdpid */ + REG(0xc8, { 1, 1 }, F, N ), /* bswap */ + { { 0xff }, { 2, 2 }, F, N }, /* ud0 */ +}, legacy_0f38[] = { + { { 0x80 }, { 2, 2 }, T, R, pfx_66 }, /* invept */ + { { 0x81 }, { 2, 2 }, T, R, pfx_66 }, /* invvpid */ + { { 0x82 }, { 2, 2 }, T, R, pfx_66 }, /* invpcid */ + { { 0xf0 }, { 2, 2 }, T, R }, /* movbe */ + { { 0xf0 }, { 2, 2 }, T, R, pfx_f2 }, /* crc32 */ + { { 0xf1 }, { 2, 2 }, T, W }, /* movbe */ + { { 0xf1 }, { 2, 2 }, T, R, pfx_f2 }, /* crc32 */ + /*{ 0xf5 }, { 2, 2 }, F, W, pfx_66 }, wruss */ + /*{ 0xf6 }, { 2, 2 }, F, W }, wrss */ + { { 0xf6 }, { 2, 2 }, T, R, pfx_66 }, /* adcx */ + { { 0xf6 }, { 2, 2 }, T, R, pfx_f3 }, /* adox */ +}; +#undef CND +#undef REG +#undef F +#undef N +#undef R +#undef T +#undef W + +static unsigned int errors; + +static void print_insn(const uint8_t *instr, unsigned int len) +{ + if ( !errors++ ) + puts(""); + while ( len--) + printf("%02x%c", *instr++, len ? ' ' : ':'); +} + +void do_test(uint8_t *instr, unsigned int len, unsigned int modrm, + enum mem_access mem, struct x86_emulate_ctxt *ctxt, + int (*fetch)(enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt)) +{ + struct x86_emulate_state *s; + + if ( !modrm || mem != mem_none ) + { + s = x86_decode_insn(ctxt, fetch); + + if ( x86_insn_length(s, ctxt) != len ) + { + print_insn(instr, len); + printf(" length %u (expected %u)\n", x86_insn_length(s, ctxt), len); + } + + if ( x86_insn_is_mem_access(s, ctxt) != (mem != mem_none) ) + { + print_insn(instr, len); + printf(" mem access %d (expected %d)\n", + x86_insn_is_mem_access(s, ctxt), mem != mem_none); + } + + if ( x86_insn_is_mem_write(s, ctxt) != (mem == mem_write) ) + { + print_insn(instr, len); + printf(" mem write %d (expected %d)\n", + x86_insn_is_mem_write(s, ctxt), mem == mem_write); + } + + x86_emulate_free_state(s); + } + + if ( modrm ) + { + instr[modrm] |= 0xc0; + + s = x86_decode_insn(ctxt, fetch); + + if ( x86_insn_length(s, ctxt) != len ) + { + print_insn(instr, len); + printf(" length %u (expected %u)\n", x86_insn_length(s, ctxt), len); + } + + if ( x86_insn_is_mem_access(s, ctxt) || + x86_insn_is_mem_write(s, ctxt) ) + { + print_insn(instr, len); + printf(" mem access %d / write %d unexpected\n", + x86_insn_is_mem_access(s, ctxt), + x86_insn_is_mem_write(s, ctxt)); + } + + x86_emulate_free_state(s); + } +} + +void predicates_test(void *instr, struct x86_emulate_ctxt *ctxt, + int (*fetch)(enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt)) +{ + unsigned int m; + + ctxt->regs->eip = (unsigned long)instr; + + for ( m = 0; m < sizeof(long) / sizeof(int); ++m ) + { + unsigned int t; + + ctxt->addr_size = 32 << m; + ctxt->sp_size = 32 << m; + ctxt->lma = ctxt->sp_size == 64; + + printf("Testing %u-bit decoding / predicates...", ctxt->sp_size); + + for ( t = 0; t < ARRAY_SIZE(legacy); ++t ) + { + if ( !legacy[t].len[m] ) + continue; + + assert(!legacy[t].pfx); + + memset(instr + 1, 0xcc, 14); + memcpy(instr, legacy[t].opc, legacy[t].len[m]); + + do_test(instr, legacy[t].len[m], legacy[t].modrm, legacy[t].mem, + ctxt, fetch); + } + + for ( t = 0; t < ARRAY_SIZE(legacy_0f); ++t ) + { + uint8_t *ptr = instr; + + if ( !legacy_0f[t].len[m] ) + continue; + + memset(instr + 2, 0xcc, 13); + if ( legacy_0f[t].pfx ) + *ptr++ = prefixes[legacy_0f[t].pfx - 1]; + *ptr++ = 0x0f; + memcpy(ptr, legacy_0f[t].opc, legacy_0f[t].len[m]); + + do_test(instr, legacy_0f[t].len[m] + ((void *)ptr - instr), + legacy_0f[t].modrm ? (void *)ptr - instr + 1 : 0, + legacy_0f[t].mem, ctxt, fetch); + } + + for ( t = 0; t < ARRAY_SIZE(legacy_0f38); ++t ) + { + uint8_t *ptr = instr; + + if ( !legacy_0f38[t].len[m] ) + continue; + + memset(instr + 3, 0xcc, 12); + if ( legacy_0f38[t].pfx ) + *ptr++ = prefixes[legacy_0f38[t].pfx - 1]; + *ptr++ = 0x0f; + *ptr++ = 0x38; + memcpy(ptr, legacy_0f38[t].opc, legacy_0f38[t].len[m]); + + do_test(instr, legacy_0f38[t].len[m] + ((void *)ptr - instr), + legacy_0f38[t].modrm ? (void *)ptr - instr + 1 : 0, + legacy_0f38[t].mem, ctxt, fetch); + } + + if ( errors ) + exit(1); + + puts(" okay"); + } +} diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index 6aa2d5129b..ec89368050 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -4810,6 +4810,8 @@ int main(int argc, char **argv) if ( stack_exec ) evex_disp8_test(instr, &ctxt, &emulops); + predicates_test(instr, &ctxt, fetch); + for ( j = 0; j < ARRAY_SIZE(blobs); j++ ) { if ( blobs[j].check_cpu && !blobs[j].check_cpu() ) diff --git a/tools/tests/x86_emulator/x86-emulate.c b/tools/tests/x86_emulator/x86-emulate.c index 23dcbe4247..82c7db4651 100644 --- a/tools/tests/x86_emulator/x86-emulate.c +++ b/tools/tests/x86_emulator/x86-emulate.c @@ -1,7 +1,13 @@ #include "x86-emulate.h" +#include #include +#define DEFINE_PER_CPU(type, var) type per_cpu_##var +#define this_cpu(var) per_cpu_##var + +#define ERR_PTR(val) NULL + #define cpu_has_amd_erratum(nr) 0 #define cpu_has_mpx false #define read_bndcfgu() 0 diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index dfb0a19394..b7f428b9e1 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -101,6 +101,12 @@ WRAP(puts); void evex_disp8_test(void *instr, struct x86_emulate_ctxt *ctxt, const struct x86_emulate_ops *ops); +void predicates_test(void *instr, struct x86_emulate_ctxt *ctxt, + int (*fetch)(enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + struct x86_emulate_ctxt *ctxt)); static inline uint64_t xgetbv(uint32_t xcr) { diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c index e763278012..1e21e069cb 100644 --- a/xen/arch/x86/x86_emulate.c +++ b/xen/arch/x86/x86_emulate.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include /* current_cpu_info */ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 1d44653007..34dfca259e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -11382,10 +11382,6 @@ int x86_emulate_wrapper( } #endif -#ifdef __XEN__ - -#include - struct x86_emulate_state * x86_decode_insn( struct x86_emulate_ctxt *ctxt, @@ -11408,7 +11404,7 @@ x86_decode_insn( if ( unlikely(rc != X86EMUL_OKAY) ) return ERR_PTR(-rc); -#ifndef NDEBUG +#if defined(__XEN__) && !defined(NDEBUG) /* * While we avoid memory allocation (by use of per-CPU data) above, * nevertheless make sure callers properly release the state structure @@ -11428,12 +11424,12 @@ x86_decode_insn( static inline void check_state(const struct x86_emulate_state *state) { -#ifndef NDEBUG +#if defined(__XEN__) && !defined(NDEBUG) ASSERT(state->caller); #endif } -#ifndef NDEBUG +#if defined(__XEN__) && !defined(NDEBUG) void x86_emulate_free_state(struct x86_emulate_state *state) { check_state(state); @@ -11806,5 +11802,3 @@ x86_insn_length(const struct x86_emulate_state *state, return state->ip - ctxt->regs->r(ip); } - -#endif diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 90d6329962..2ac788c008 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -730,8 +730,6 @@ x86emul_unhandleable_rw( unsigned int bytes, struct x86_emulate_ctxt *ctxt); -#ifdef __XEN__ - struct x86_emulate_state * x86_decode_insn( struct x86_emulate_ctxt *ctxt, @@ -767,12 +765,14 @@ bool x86_insn_is_cr_access(const struct x86_emulate_state *state, const struct x86_emulate_ctxt *ctxt); -#ifdef NDEBUG +#if !defined(__XEN__) || defined(NDEBUG) static inline void x86_emulate_free_state(struct x86_emulate_state *state) {} #else void x86_emulate_free_state(struct x86_emulate_state *state); #endif +#ifdef __XEN__ + int x86emul_read_xcr(unsigned int reg, uint64_t *val, struct x86_emulate_ctxt *ctxt); int x86emul_write_xcr(unsigned int reg, uint64_t val, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:44:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:44:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBV-0000YX-40; Fri, 29 May 2020 15:44:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBU-0000YF-3x for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:36 +0000 X-Inumbo-ID: 4c2acf2c-a1c3-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4c2acf2c-a1c3-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 15:44:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1yzPctY+giNYuLughJCv3AVpOxi6+Vnc+4Oq6odU+oM=; b=eyU5GRR5C7M/SSlPUBCR0Nr80f IR6EHY9pSlhecHxfPdR6m9BZwEdwR3hc9ilHDMENZfuSbp0DDtcYhi1N5yjCHO/jktrutZJzHeRow 1w9aBLOqa0Kk7BtBj8SLxoH2LhW8WBzGfhx1P1uxkKU0DGP1ZT9GpnAOdPql5HhH1fBg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBT-0008Q2-KD for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehBT-0000Si-JQ for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging Message-Id: Date: Fri, 29 May 2020 15:44:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8c439e9ee4aa202306f5c0ca1391b6c8adf0f7e1 Merge: 3351acaee706b8e238b031a456bf181f97f167c3 4609fc8eb04e6af531d86923c9d057f32a96b7d8 Author: Jan Beulich AuthorDate: Fri May 29 17:30:35 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:30:35 2020 +0200 Merge branch 'staging' of xenbits.xen.org:/home/xen/git/xen into staging xen/arch/x86/hvm/io.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:44:48 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:44:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBg-0000bR-5e; Fri, 29 May 2020 15:44:48 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBf-0000bJ-Ho for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:47 +0000 X-Inumbo-ID: 513f254f-a1c3-11ea-a8da-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 513f254f-a1c3-11ea-a8da-12813bfff9fa; Fri, 29 May 2020 15:44:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3OJovZKuFu6OyJrbwvY6Yv2arc5cTAYFPhfg7xCyRpg=; b=pAwLpnVuFM84ISIviS5Y4rCtJ/ p+RzMyWRI43Ntf38GPw/XhlXanPH7ADkpFXkEB/Q4Gk5GBba8wsXMF9D2A/vtaAvJq5YbZR93issy ewqdwePkQpsfA1xelVqBMgwt5dcGpDsK+lNQTCjoTwJOF/UOXe/UAU6ykFkYV2kJxSs8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBd-0008QE-NY for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehBd-0000TP-Mn for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: disable FPU/MMX/SIMD insn emulation when !HVM Message-Id: Date: Fri, 29 May 2020 15:44:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fced27b002c73c47c6c24ece2fe32b78157ad6b6 Author: Jan Beulich AuthorDate: Fri May 29 17:31:13 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:31:13 2020 +0200 x86emul: disable FPU/MMX/SIMD insn emulation when !HVM In a pure PV environment (the PV shim in particular) we don't really need emulation of all these. To limit #ifdef-ary utilize some of the CASE_*() macros we have, by providing variants expanding to (effectively) nothing (really a label, which in turn requires passing -Wno-unused-label to the compiler when build such configurations). Due to the mixture of macro and #ifdef use, the placement of some of the #ifdef-s is a little arbitrary. The resulting object file's .text is less than half the size of the original, and looks to also be compiling a little more quickly. This is meant as a first step; more parts can likely be disabled down the road. Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Bregrudingly-acked-by: Andrew Cooper --- xen/arch/x86/Makefile | 3 + xen/arch/x86/x86_emulate.c | 6 ++ xen/arch/x86/x86_emulate/x86_emulate.c | 182 +++++++++++++++++++++++++++++++-- 3 files changed, 181 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 44137d919b..07eeefbf82 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -73,6 +73,9 @@ obj-y += vm_event.o obj-y += xstate.o extra-y += asm-macros.i +ifneq ($(CONFIG_HVM),y) +x86_emulate.o: CFLAGS-y += -Wno-unused-label +endif x86_emulate.o: x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h efi-y := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \ diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c index 1e21e069cb..33516f4e5d 100644 --- a/xen/arch/x86/x86_emulate.c +++ b/xen/arch/x86/x86_emulate.c @@ -43,6 +43,12 @@ } \ }) +#ifndef CONFIG_HVM +# define X86EMUL_NO_FPU +# define X86EMUL_NO_MMX +# define X86EMUL_NO_SIMD +#endif + #include "x86_emulate/x86_emulate.c" int x86emul_read_xcr(unsigned int reg, uint64_t *val, diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 34dfca259e..44bb3e59e9 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -3506,6 +3506,7 @@ x86_decode( op_bytes = 4; break; +#ifndef X86EMUL_NO_SIMD case simd_packed_int: switch ( vex.pfx ) { @@ -3571,6 +3572,7 @@ x86_decode( case simd_256: op_bytes = 32; break; +#endif /* !X86EMUL_NO_SIMD */ default: op_bytes = 0; @@ -3725,6 +3727,7 @@ x86_emulate( break; } +#ifndef X86EMUL_NO_SIMD /* With a memory operand, fetch the mask register in use (if any). */ if ( ea.type == OP_MEM && evex.opmsk && _get_fpu(fpu_type = X86EMUL_FPU_opmask, ctxt, ops) == X86EMUL_OKAY ) @@ -3755,6 +3758,7 @@ x86_emulate( put_fpu(X86EMUL_FPU_opmask, false, state, ctxt, ops); fpu_type = X86EMUL_FPU_none; } +#endif /* !X86EMUL_NO_SIMD */ /* Decode (but don't fetch) the destination operand: register or memory. */ switch ( d & DstMask ) @@ -4400,11 +4404,13 @@ x86_emulate( singlestep = _regs.eflags & X86_EFLAGS_TF; break; +#ifndef X86EMUL_NO_FPU case 0x9b: /* wait/fwait */ host_and_vcpu_must_have(fpu); get_fpu(X86EMUL_FPU_wait); emulate_fpu_insn_stub(b); break; +#endif case 0x9c: /* pushf */ if ( (_regs.eflags & X86_EFLAGS_VM) && @@ -4814,6 +4820,7 @@ x86_emulate( break; } +#ifndef X86EMUL_NO_FPU case 0xd8: /* FPU 0xd8 */ host_and_vcpu_must_have(fpu); get_fpu(X86EMUL_FPU_fpu); @@ -5148,6 +5155,7 @@ x86_emulate( } } break; +#endif /* !X86EMUL_NO_FPU */ case 0xe0 ... 0xe2: /* loop{,z,nz} */ { unsigned long count = get_loop_count(&_regs, ad_bytes); @@ -6124,6 +6132,8 @@ x86_emulate( case X86EMUL_OPC(0x0f, 0x19) ... X86EMUL_OPC(0x0f, 0x1f): /* nop */ break; +#ifndef X86EMUL_NO_MMX + case X86EMUL_OPC(0x0f, 0x0e): /* femms */ host_and_vcpu_must_have(3dnow); asm volatile ( "femms" ); @@ -6144,39 +6154,71 @@ x86_emulate( state->simd_size = simd_other; goto simd_0f_imm8; -#define CASE_SIMD_PACKED_INT(pfx, opc) \ +#endif /* !X86EMUL_NO_MMX */ + +#if !defined(X86EMUL_NO_SIMD) && !defined(X86EMUL_NO_MMX) +# define CASE_SIMD_PACKED_INT(pfx, opc) \ case X86EMUL_OPC(pfx, opc): \ case X86EMUL_OPC_66(pfx, opc) -#define CASE_SIMD_PACKED_INT_VEX(pfx, opc) \ +#elif !defined(X86EMUL_NO_SIMD) +# define CASE_SIMD_PACKED_INT(pfx, opc) \ + case X86EMUL_OPC_66(pfx, opc) +#elif !defined(X86EMUL_NO_MMX) +# define CASE_SIMD_PACKED_INT(pfx, opc) \ + case X86EMUL_OPC(pfx, opc) +#else +# define CASE_SIMD_PACKED_INT(pfx, opc) C##pfx##_##opc +#endif + +#ifndef X86EMUL_NO_SIMD + +# define CASE_SIMD_PACKED_INT_VEX(pfx, opc) \ CASE_SIMD_PACKED_INT(pfx, opc): \ case X86EMUL_OPC_VEX_66(pfx, opc) -#define CASE_SIMD_ALL_FP(kind, pfx, opc) \ +# define CASE_SIMD_ALL_FP(kind, pfx, opc) \ CASE_SIMD_PACKED_FP(kind, pfx, opc): \ CASE_SIMD_SCALAR_FP(kind, pfx, opc) -#define CASE_SIMD_PACKED_FP(kind, pfx, opc) \ +# define CASE_SIMD_PACKED_FP(kind, pfx, opc) \ case X86EMUL_OPC##kind(pfx, opc): \ case X86EMUL_OPC##kind##_66(pfx, opc) -#define CASE_SIMD_SCALAR_FP(kind, pfx, opc) \ +# define CASE_SIMD_SCALAR_FP(kind, pfx, opc) \ case X86EMUL_OPC##kind##_F3(pfx, opc): \ case X86EMUL_OPC##kind##_F2(pfx, opc) -#define CASE_SIMD_SINGLE_FP(kind, pfx, opc) \ +# define CASE_SIMD_SINGLE_FP(kind, pfx, opc) \ case X86EMUL_OPC##kind(pfx, opc): \ case X86EMUL_OPC##kind##_F3(pfx, opc) -#define CASE_SIMD_ALL_FP_VEX(pfx, opc) \ +# define CASE_SIMD_ALL_FP_VEX(pfx, opc) \ CASE_SIMD_ALL_FP(, pfx, opc): \ CASE_SIMD_ALL_FP(_VEX, pfx, opc) -#define CASE_SIMD_PACKED_FP_VEX(pfx, opc) \ +# define CASE_SIMD_PACKED_FP_VEX(pfx, opc) \ CASE_SIMD_PACKED_FP(, pfx, opc): \ CASE_SIMD_PACKED_FP(_VEX, pfx, opc) -#define CASE_SIMD_SCALAR_FP_VEX(pfx, opc) \ +# define CASE_SIMD_SCALAR_FP_VEX(pfx, opc) \ CASE_SIMD_SCALAR_FP(, pfx, opc): \ CASE_SIMD_SCALAR_FP(_VEX, pfx, opc) -#define CASE_SIMD_SINGLE_FP_VEX(pfx, opc) \ +# define CASE_SIMD_SINGLE_FP_VEX(pfx, opc) \ CASE_SIMD_SINGLE_FP(, pfx, opc): \ CASE_SIMD_SINGLE_FP(_VEX, pfx, opc) +#else + +# define CASE_SIMD_PACKED_INT_VEX(pfx, opc) \ + CASE_SIMD_PACKED_INT(pfx, opc) + +# define CASE_SIMD_ALL_FP(kind, pfx, opc) C##kind##pfx##_##opc +# define CASE_SIMD_PACKED_FP(kind, pfx, opc) Cp##kind##pfx##_##opc +# define CASE_SIMD_SCALAR_FP(kind, pfx, opc) Cs##kind##pfx##_##opc +# define CASE_SIMD_SINGLE_FP(kind, pfx, opc) C##kind##pfx##_##opc + +# define CASE_SIMD_ALL_FP_VEX(pfx, opc) CASE_SIMD_ALL_FP(, pfx, opc) +# define CASE_SIMD_PACKED_FP_VEX(pfx, opc) CASE_SIMD_PACKED_FP(, pfx, opc) +# define CASE_SIMD_SCALAR_FP_VEX(pfx, opc) CASE_SIMD_SCALAR_FP(, pfx, opc) +# define CASE_SIMD_SINGLE_FP_VEX(pfx, opc) CASE_SIMD_SINGLE_FP(, pfx, opc) + +#endif + CASE_SIMD_SCALAR_FP(, 0x0f, 0x2b): /* movnts{s,d} xmm,mem */ host_and_vcpu_must_have(sse4a); /* fall through */ @@ -6314,6 +6356,8 @@ x86_emulate( insn_bytes = EVEX_PFX_BYTES + 2; break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_66(0x0f, 0x12): /* movlpd m64,xmm */ case X86EMUL_OPC_VEX_66(0x0f, 0x12): /* vmovlpd m64,xmm,xmm */ CASE_SIMD_PACKED_FP_VEX(0x0f, 0x13): /* movlp{s,d} xmm,m64 */ @@ -6420,6 +6464,8 @@ x86_emulate( avx512_vlen_check(false); goto simd_zmm; +#endif /* !X86EMUL_NO_SIMD */ + case X86EMUL_OPC(0x0f, 0x20): /* mov cr,reg */ case X86EMUL_OPC(0x0f, 0x21): /* mov dr,reg */ case X86EMUL_OPC(0x0f, 0x22): /* mov reg,cr */ @@ -6446,6 +6492,8 @@ x86_emulate( goto done; break; +#if !defined(X86EMUL_NO_MMX) && !defined(X86EMUL_NO_SIMD) + case X86EMUL_OPC_66(0x0f, 0x2a): /* cvtpi2pd mm/m64,xmm */ if ( ea.type == OP_REG ) { @@ -6457,6 +6505,8 @@ x86_emulate( op_bytes = (b & 4) && (vex.pfx & VEX_PREFIX_DOUBLE_MASK) ? 16 : 8; goto simd_0f_fp; +#endif /* !X86EMUL_NO_MMX && !X86EMUL_NO_SIMD */ + CASE_SIMD_SCALAR_FP_VEX(0x0f, 0x2a): /* {,v}cvtsi2s{s,d} r/m,xmm */ if ( vex.opcx == vex_none ) { @@ -6803,6 +6853,8 @@ x86_emulate( dst.val = src.val; break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_VEX(0x0f, 0x4a): /* kadd{w,q} k,k,k */ if ( !vex.w ) host_and_vcpu_must_have(avx512dq); @@ -6857,6 +6909,8 @@ x86_emulate( generate_exception_if(!vex.l || vex.w, EXC_UD); goto opmask_common; +#endif /* X86EMUL_NO_SIMD */ + CASE_SIMD_PACKED_FP_VEX(0x0f, 0x50): /* movmskp{s,d} xmm,reg */ /* vmovmskp{s,d} {x,y}mm,reg */ CASE_SIMD_PACKED_INT_VEX(0x0f, 0xd7): /* pmovmskb {,x}mm,reg */ @@ -6940,6 +6994,8 @@ x86_emulate( evex.w); goto avx512f_all_fp; +#ifndef X86EMUL_NO_SIMD + CASE_SIMD_PACKED_FP_VEX(0x0f, 0x5b): /* cvt{ps,dq}2{dq,ps} xmm/mem,xmm */ /* vcvt{ps,dq}2{dq,ps} {x,y}mm/mem,{x,y}mm */ case X86EMUL_OPC_F3(0x0f, 0x5b): /* cvttps2dq xmm/mem,xmm */ @@ -6970,6 +7026,8 @@ x86_emulate( op_bytes = 16 << evex.lr; goto simd_zmm; +#endif /* !X86EMUL_NO_SIMD */ + CASE_SIMD_PACKED_INT_VEX(0x0f, 0x60): /* punpcklbw {,x}mm/mem,{,x}mm */ /* vpunpcklbw {x,y}mm/mem,{x,y}mm,{x,y}mm */ CASE_SIMD_PACKED_INT_VEX(0x0f, 0x61): /* punpcklwd {,x}mm/mem,{,x}mm */ @@ -6996,6 +7054,7 @@ x86_emulate( /* vpackusbw {x,y}mm/mem,{x,y}mm,{x,y}mm */ CASE_SIMD_PACKED_INT_VEX(0x0f, 0x6b): /* packsswd {,x}mm/mem,{,x}mm */ /* vpacksswd {x,y}mm/mem,{x,y}mm,{x,y}mm */ +#ifndef X86EMUL_NO_SIMD case X86EMUL_OPC_66(0x0f, 0x6c): /* punpcklqdq xmm/m128,xmm */ case X86EMUL_OPC_VEX_66(0x0f, 0x6c): /* vpunpcklqdq {x,y}mm/mem,{x,y}mm,{x,y}mm */ case X86EMUL_OPC_66(0x0f, 0x6d): /* punpckhqdq xmm/m128,xmm */ @@ -7080,6 +7139,7 @@ x86_emulate( /* vpsubd {x,y}mm/mem,{x,y}mm,{x,y}mm */ case X86EMUL_OPC_66(0x0f, 0xfb): /* psubq xmm/m128,xmm */ case X86EMUL_OPC_VEX_66(0x0f, 0xfb): /* vpsubq {x,y}mm/mem,{x,y}mm,{x,y}mm */ +#endif /* !X86EMUL_NO_SIMD */ CASE_SIMD_PACKED_INT_VEX(0x0f, 0xfc): /* paddb {,x}mm/mem,{,x}mm */ /* vpaddb {x,y}mm/mem,{x,y}mm,{x,y}mm */ CASE_SIMD_PACKED_INT_VEX(0x0f, 0xfd): /* paddw {,x}mm/mem,{,x}mm */ @@ -7087,6 +7147,7 @@ x86_emulate( CASE_SIMD_PACKED_INT_VEX(0x0f, 0xfe): /* paddd {,x}mm/mem,{,x}mm */ /* vpaddd {x,y}mm/mem,{x,y}mm,{x,y}mm */ simd_0f_int: +#ifndef X86EMUL_NO_SIMD if ( vex.opcx != vex_none ) { case X86EMUL_OPC_VEX_66(0x0f38, 0x00): /* vpshufb {x,y}mm/mem,{x,y}mm,{x,y}mm */ @@ -7128,11 +7189,14 @@ x86_emulate( } if ( vex.pfx ) goto simd_0f_sse2; +#endif /* !X86EMUL_NO_SIMD */ simd_0f_mmx: host_and_vcpu_must_have(mmx); get_fpu(X86EMUL_FPU_mmx); goto simd_0f_common; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f, 0xf6): /* vpsadbw [xyz]mm/mem,[xyz]mm,[xyz]mm */ generate_exception_if(evex.opmsk, EXC_UD); /* fall through */ @@ -7226,6 +7290,8 @@ x86_emulate( generate_exception_if(!evex.w, EXC_UD); goto avx512f_no_sae; +#endif /* X86EMUL_NO_SIMD */ + CASE_SIMD_PACKED_INT_VEX(0x0f, 0x6e): /* mov{d,q} r/m,{,x}mm */ /* vmov{d,q} r/m,xmm */ CASE_SIMD_PACKED_INT_VEX(0x0f, 0x7e): /* mov{d,q} {,x}mm,r/m */ @@ -7267,6 +7333,8 @@ x86_emulate( ASSERT(!state->simd_size); break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f, 0x6e): /* vmov{d,q} r/m,xmm */ case X86EMUL_OPC_EVEX_66(0x0f, 0x7e): /* vmov{d,q} xmm,r/m */ generate_exception_if((evex.lr || evex.opmsk || evex.brs || @@ -7339,11 +7407,15 @@ x86_emulate( d |= TwoOp; /* fall through */ case X86EMUL_OPC_66(0x0f, 0xd6): /* movq xmm,xmm/m64 */ +#endif /* !X86EMUL_NO_SIMD */ +#ifndef X86EMUL_NO_MMX case X86EMUL_OPC(0x0f, 0x6f): /* movq mm/m64,mm */ case X86EMUL_OPC(0x0f, 0x7f): /* movq mm,mm/m64 */ +#endif op_bytes = 8; goto simd_0f_int; +#ifndef X86EMUL_NO_SIMD CASE_SIMD_PACKED_INT_VEX(0x0f, 0x70):/* pshuf{w,d} $imm8,{,x}mm/mem,{,x}mm */ /* vpshufd $imm8,{x,y}mm/mem,{x,y}mm */ case X86EMUL_OPC_F3(0x0f, 0x70): /* pshufhw $imm8,xmm/m128,xmm */ @@ -7352,12 +7424,15 @@ x86_emulate( case X86EMUL_OPC_VEX_F2(0x0f, 0x70): /* vpshuflw $imm8,{x,y}mm/mem,{x,y}mm */ d = (d & ~SrcMask) | SrcMem | TwoOp; op_bytes = vex.pfx ? 16 << vex.l : 8; +#endif simd_0f_int_imm8: if ( vex.opcx != vex_none ) { +#ifndef X86EMUL_NO_SIMD case X86EMUL_OPC_VEX_66(0x0f3a, 0x0e): /* vpblendw $imm8,{x,y}mm/mem,{x,y}mm,{x,y}mm */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x0f): /* vpalignr $imm8,{x,y}mm/mem,{x,y}mm,{x,y}mm */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x42): /* vmpsadbw $imm8,{x,y}mm/mem,{x,y}mm,{x,y}mm */ +#endif if ( vex.l ) { simd_0f_imm8_avx2: @@ -7365,6 +7440,7 @@ x86_emulate( } else { +#ifndef X86EMUL_NO_SIMD case X86EMUL_OPC_VEX_66(0x0f3a, 0x08): /* vroundps $imm8,{x,y}mm/mem,{x,y}mm */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x09): /* vroundpd $imm8,{x,y}mm/mem,{x,y}mm */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x0a): /* vroundss $imm8,{x,y}mm/mem,{x,y}mm,{x,y}mm */ @@ -7372,6 +7448,7 @@ x86_emulate( case X86EMUL_OPC_VEX_66(0x0f3a, 0x0c): /* vblendps $imm8,{x,y}mm/mem,{x,y}mm,{x,y}mm */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x0d): /* vblendpd $imm8,{x,y}mm/mem,{x,y}mm,{x,y}mm */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x40): /* vdpps $imm8,{x,y}mm/mem,{x,y}mm,{x,y}mm */ +#endif simd_0f_imm8_avx: host_and_vcpu_must_have(avx); } @@ -7405,6 +7482,8 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f, 0x70): /* vpshufd $imm8,[xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_F3(0x0f, 0x70): /* vpshufhw $imm8,[xyz]mm/mem,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_F2(0x0f, 0x70): /* vpshuflw $imm8,[xyz]mm/mem,[xyz]mm{k} */ @@ -7463,6 +7542,9 @@ x86_emulate( opc[1] = modrm; opc[2] = imm1; insn_bytes = PFX_BYTES + 3; + +#endif /* X86EMUL_NO_SIMD */ + simd_0f_reg_only: opc[insn_bytes - PFX_BYTES] = 0xc3; @@ -7473,6 +7555,8 @@ x86_emulate( ASSERT(!state->simd_size); break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f, 0x71): /* Grp12 */ switch ( modrm_reg & 7 ) { @@ -7504,6 +7588,9 @@ x86_emulate( } goto unrecognized_insn; +#endif /* !X86EMUL_NO_SIMD */ +#ifndef X86EMUL_NO_MMX + case X86EMUL_OPC(0x0f, 0x73): /* Grp14 */ switch ( modrm_reg & 7 ) { @@ -7513,6 +7600,9 @@ x86_emulate( } goto unrecognized_insn; +#endif /* !X86EMUL_NO_MMX */ +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_66(0x0f, 0x73): case X86EMUL_OPC_VEX_66(0x0f, 0x73): switch ( modrm_reg & 7 ) @@ -7543,7 +7633,12 @@ x86_emulate( } goto unrecognized_insn; +#endif /* !X86EMUL_NO_SIMD */ + +#ifndef X86EMUL_NO_MMX case X86EMUL_OPC(0x0f, 0x77): /* emms */ +#endif +#ifndef X86EMUL_NO_SIMD case X86EMUL_OPC_VEX(0x0f, 0x77): /* vzero{all,upper} */ if ( vex.opcx != vex_none ) { @@ -7589,6 +7684,7 @@ x86_emulate( #endif } else +#endif /* !X86EMUL_NO_SIMD */ { host_and_vcpu_must_have(mmx); get_fpu(X86EMUL_FPU_mmx); @@ -7602,6 +7698,8 @@ x86_emulate( insn_bytes = PFX_BYTES + 1; goto simd_0f_reg_only; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_66(0x0f, 0x78): /* Grp17 */ switch ( modrm_reg & 7 ) { @@ -7699,6 +7797,8 @@ x86_emulate( op_bytes = 8; goto simd_zmm; +#endif /* !X86EMUL_NO_SIMD */ + case X86EMUL_OPC(0x0f, 0x80) ... X86EMUL_OPC(0x0f, 0x8f): /* jcc (near) */ if ( test_cc(b, _regs.eflags) ) jmp_rel((int32_t)src.val); @@ -7709,6 +7809,8 @@ x86_emulate( dst.val = test_cc(b, _regs.eflags); break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_VEX(0x0f, 0x91): /* kmov{w,q} k,mem */ case X86EMUL_OPC_VEX_66(0x0f, 0x91): /* kmov{b,d} k,mem */ generate_exception_if(ea.type != OP_MEM, EXC_UD); @@ -7857,6 +7959,8 @@ x86_emulate( dst.type = OP_NONE; break; +#endif /* !X86EMUL_NO_SIMD */ + case X86EMUL_OPC(0x0f, 0xa2): /* cpuid */ msr_val = 0; fail_if(ops->cpuid == NULL); @@ -7953,6 +8057,7 @@ x86_emulate( case X86EMUL_OPC(0x0f, 0xae): case X86EMUL_OPC_66(0x0f, 0xae): /* Grp15 */ switch ( modrm_reg & 7 ) { +#ifndef X86EMUL_NO_SIMD case 2: /* ldmxcsr */ generate_exception_if(vex.pfx, EXC_UD); vcpu_must_have(sse); @@ -7971,6 +8076,7 @@ x86_emulate( get_fpu(vex.opcx ? X86EMUL_FPU_ymm : X86EMUL_FPU_xmm); asm volatile ( "stmxcsr %0" : "=m" (dst.val) ); break; +#endif /* X86EMUL_NO_SIMD */ case 5: /* lfence */ fail_if(modrm_mod != 3); @@ -8019,6 +8125,8 @@ x86_emulate( } break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_VEX(0x0f, 0xae): /* Grp15 */ switch ( modrm_reg & 7 ) { @@ -8033,6 +8141,8 @@ x86_emulate( } goto unrecognized_insn; +#endif /* !X86EMUL_NO_SIMD */ + case X86EMUL_OPC_F3(0x0f, 0xae): /* Grp15 */ fail_if(modrm_mod != 3); generate_exception_if((modrm_reg & 4) || !mode_64bit(), EXC_UD); @@ -8272,6 +8382,8 @@ x86_emulate( } goto simd_0f_imm8_avx; +#ifndef X86EMUL_NO_SIMD + CASE_SIMD_ALL_FP(_EVEX, 0x0f, 0xc2): /* vcmp{p,s}{s,d} $imm8,[xyz]mm/mem,[xyz]mm,k{k} */ generate_exception_if((evex.w != (evex.pfx & VEX_PREFIX_DOUBLE_MASK) || (ea.type != OP_REG && evex.brs && @@ -8298,6 +8410,8 @@ x86_emulate( insn_bytes = EVEX_PFX_BYTES + 3; break; +#endif /* !X86EMUL_NO_SIMD */ + case X86EMUL_OPC(0x0f, 0xc3): /* movnti */ /* Ignore the non-temporal hint for now. */ vcpu_must_have(sse2); @@ -8312,6 +8426,8 @@ x86_emulate( ea.type = OP_MEM; goto simd_0f_int_imm8; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f, 0xc4): /* vpinsrw $imm8,r32/m16,xmm,xmm */ case X86EMUL_OPC_EVEX_66(0x0f3a, 0x20): /* vpinsrb $imm8,r32/m8,xmm,xmm */ case X86EMUL_OPC_EVEX_66(0x0f3a, 0x22): /* vpinsr{d,q} $imm8,r/m,xmm,xmm */ @@ -8329,6 +8445,8 @@ x86_emulate( state->simd_size = simd_other; goto avx512f_imm8_no_sae; +#endif /* !X86EMUL_NO_SIMD */ + CASE_SIMD_PACKED_INT_VEX(0x0f, 0xc5): /* pextrw $imm8,{,x}mm,reg */ /* vpextrw $imm8,xmm,reg */ generate_exception_if(vex.l, EXC_UD); @@ -8344,6 +8462,8 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; goto simd_0f_to_gpr; +#ifndef X86EMUL_NO_SIMD + CASE_SIMD_PACKED_FP(_EVEX, 0x0f, 0xc6): /* vshufp{s,d} $imm8,[xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ generate_exception_if(evex.w != (evex.pfx & VEX_PREFIX_DOUBLE_MASK), EXC_UD); @@ -8358,6 +8478,8 @@ x86_emulate( avx512_vlen_check(false); goto simd_imm8_zmm; +#endif /* X86EMUL_NO_SIMD */ + case X86EMUL_OPC(0x0f, 0xc7): /* Grp9 */ { union { @@ -8548,6 +8670,8 @@ x86_emulate( } break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f, 0xd2): /* vpsrld xmm/m128,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(0x0f, 0xd3): /* vpsrlq xmm/m128,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(0x0f, 0xe2): /* vpsra{d,q} xmm/m128,[xyz]mm,[xyz]mm{k} */ @@ -8569,12 +8693,18 @@ x86_emulate( generate_exception_if(evex.w != (b & 1), EXC_UD); goto avx512f_no_sae; +#endif /* !X86EMUL_NO_SIMD */ +#ifndef X86EMUL_NO_MMX + case X86EMUL_OPC(0x0f, 0xd4): /* paddq mm/m64,mm */ case X86EMUL_OPC(0x0f, 0xf4): /* pmuludq mm/m64,mm */ case X86EMUL_OPC(0x0f, 0xfb): /* psubq mm/m64,mm */ vcpu_must_have(sse2); goto simd_0f_mmx; +#endif /* !X86EMUL_NO_MMX */ +#if !defined(X86EMUL_NO_MMX) && !defined(X86EMUL_NO_SIMD) + case X86EMUL_OPC_F3(0x0f, 0xd6): /* movq2dq mm,xmm */ case X86EMUL_OPC_F2(0x0f, 0xd6): /* movdq2q xmm,mm */ generate_exception_if(ea.type != OP_REG, EXC_UD); @@ -8582,6 +8712,9 @@ x86_emulate( host_and_vcpu_must_have(mmx); goto simd_0f_int; +#endif /* !X86EMUL_NO_MMX && !X86EMUL_NO_SIMD */ +#ifndef X86EMUL_NO_MMX + case X86EMUL_OPC(0x0f, 0xe7): /* movntq mm,m64 */ generate_exception_if(ea.type != OP_MEM, EXC_UD); sfence = true; @@ -8597,6 +8730,9 @@ x86_emulate( vcpu_must_have(mmxext); goto simd_0f_mmx; +#endif /* !X86EMUL_NO_MMX */ +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f, 0xda): /* vpminub [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(0x0f, 0xde): /* vpmaxub [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ case X86EMUL_OPC_EVEX_66(0x0f, 0xe4): /* vpmulhuw [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ @@ -8617,6 +8753,8 @@ x86_emulate( op_bytes = 8 << (!!(vex.pfx & VEX_PREFIX_DOUBLE_MASK) + vex.l); goto simd_0f_cvt; +#endif /* !X86EMUL_NO_SIMD */ + CASE_SIMD_PACKED_INT_VEX(0x0f, 0xf7): /* {,v}maskmov{q,dqu} {,x}mm,{,x}mm */ generate_exception_if(ea.type != OP_REG, EXC_UD); if ( vex.opcx != vex_none ) @@ -8720,6 +8858,8 @@ x86_emulate( insn_bytes = PFX_BYTES + 3; break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_VEX_66(0x0f38, 0x19): /* vbroadcastsd xmm/m64,ymm */ case X86EMUL_OPC_VEX_66(0x0f38, 0x1a): /* vbroadcastf128 m128,ymm */ generate_exception_if(!vex.l, EXC_UD); @@ -9302,6 +9442,8 @@ x86_emulate( ASSERT(!state->simd_size); break; +#endif /* !X86EMUL_NO_SIMD */ + case X86EMUL_OPC_66(0x0f38, 0x82): /* invpcid reg,m128 */ vcpu_must_have(invpcid); generate_exception_if(ea.type != OP_MEM, EXC_UD); @@ -9344,6 +9486,8 @@ x86_emulate( state->simd_size = simd_none; break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f38, 0x83): /* vpmultishiftqb [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ generate_exception_if(!evex.w, EXC_UD); host_and_vcpu_must_have(avx512_vbmi); @@ -9907,6 +10051,8 @@ x86_emulate( generate_exception_if(evex.brs || evex.opmsk, EXC_UD); goto avx512f_no_sae; +#endif /* !X86EMUL_NO_SIMD */ + case X86EMUL_OPC(0x0f38, 0xf0): /* movbe m,r */ case X86EMUL_OPC(0x0f38, 0xf1): /* movbe r,m */ vcpu_must_have(movbe); @@ -10072,6 +10218,8 @@ x86_emulate( : "0" ((uint32_t)src.val), "rm" (_regs.edx) ); break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_VEX_66(0x0f3a, 0x00): /* vpermq $imm8,ymm/m256,ymm */ case X86EMUL_OPC_VEX_66(0x0f3a, 0x01): /* vpermpd $imm8,ymm/m256,ymm */ generate_exception_if(!vex.l || !vex.w, EXC_UD); @@ -10132,6 +10280,8 @@ x86_emulate( avx512_vlen_check(b & 2); goto simd_imm8_zmm; +#endif /* X86EMUL_NO_SIMD */ + CASE_SIMD_PACKED_INT(0x0f3a, 0x0f): /* palignr $imm8,{,x}mm/mem,{,x}mm */ host_and_vcpu_must_have(ssse3); if ( vex.pfx ) @@ -10159,6 +10309,8 @@ x86_emulate( insn_bytes = PFX_BYTES + 4; break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_EVEX_66(0x0f3a, 0x42): /* vdbpsadbw $imm8,[xyz]mm/mem,[xyz]mm,[xyz]mm{k} */ generate_exception_if(evex.w, EXC_UD); /* fall through */ @@ -10657,6 +10809,8 @@ x86_emulate( generate_exception_if(vex.l, EXC_UD); goto simd_0f_imm8_avx; +#endif /* X86EMUL_NO_SIMD */ + case X86EMUL_OPC_VEX_F2(0x0f3a, 0xf0): /* rorx imm,r/m,r */ vcpu_must_have(bmi2); generate_exception_if(vex.l || vex.reg != 0xf, EXC_UD); @@ -10671,6 +10825,8 @@ x86_emulate( asm ( "rorl %b1,%k0" : "=g" (dst.val) : "c" (imm1), "0" (src.val) ); break; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_XOP(08, 0x85): /* vpmacssww xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x86): /* vpmacsswd xmm,xmm/m128,xmm,xmm */ case X86EMUL_OPC_XOP(08, 0x87): /* vpmacssdql xmm,xmm/m128,xmm,xmm */ @@ -10706,6 +10862,8 @@ x86_emulate( host_and_vcpu_must_have(xop); goto simd_0f_imm8_ymm; +#endif /* X86EMUL_NO_SIMD */ + case X86EMUL_OPC_XOP(09, 0x01): /* XOP Grp1 */ switch ( modrm_reg & 7 ) { @@ -10765,6 +10923,8 @@ x86_emulate( } goto unrecognized_insn; +#ifndef X86EMUL_NO_SIMD + case X86EMUL_OPC_XOP(09, 0x82): /* vfrczss xmm/m128,xmm */ case X86EMUL_OPC_XOP(09, 0x83): /* vfrczsd xmm/m128,xmm */ generate_exception_if(vex.l, EXC_UD); @@ -10820,6 +10980,8 @@ x86_emulate( host_and_vcpu_must_have(xop); goto simd_0f_ymm; +#endif /* X86EMUL_NO_SIMD */ + case X86EMUL_OPC_XOP(0a, 0x10): /* bextr imm,r/m,r */ { uint8_t *buf = get_stub(stub); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:44:58 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBq-0000dM-8u; Fri, 29 May 2020 15:44:58 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBp-0000dB-60 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:57 +0000 X-Inumbo-ID: 57c08fe9-a1c3-11ea-a8da-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 57c08fe9-a1c3-11ea-a8da-12813bfff9fa; Fri, 29 May 2020 15:44:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Is5jWCCkcivxMybYhWG7eeauMo0tBm9NIk3BF7jSJhI=; b=n8ellPePkYTgBpkuBPzp8pBgIX x2sfarvSwdFncws10HbkkVEaHzUjsYkK+Jehrn1UtQyqNCxSBjxxC9rNso5mLNWWV771ILnZ//gaM RzIcZeeKlH5GapFxQHVw367tMf/n2zF3Q6EFlOQWlJVBoNxTSz2C5Ju5Md4oScYtB6QE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBn-0008QT-Ru for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehBn-0000d0-Qw for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:44:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: support MOVDIR{I,64B} insns Message-Id: Date: Fri, 29 May 2020 15:44:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a9ecb9e780e2373c53b469f81ea54db19b9378dd Author: Jan Beulich AuthorDate: Fri May 29 17:32:14 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:32:14 2020 +0200 x86emul: support MOVDIR{I,64B} insns Introduce a new blk() hook, paralleling the rmw() one in a certain way, but being intended for larger data sizes, and hence its HVM intermediate handling function doesn't fall back to splitting the operation if the requested virtual address can't be mapped. Note that SDM revision 071 doesn't specify exception behavior for ModRM.mod == 0b11; assuming #UD here. Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant Acked-by: Andrew Cooper --- tools/tests/x86_emulator/predicates.c | 2 + tools/tests/x86_emulator/test_x86_emulator.c | 57 ++++++++++++++ tools/tests/x86_emulator/x86-emulate.h | 2 + xen/arch/x86/arch.mk | 1 + xen/arch/x86/hvm/emulate.c | 42 ++++++++++ xen/arch/x86/x86_emulate/x86_emulate.c | 114 ++++++++++++++++++++++++++- xen/arch/x86/x86_emulate/x86_emulate.h | 24 ++++++ xen/include/asm-x86/cpufeature.h | 2 + xen/include/public/arch-x86/cpufeatureset.h | 2 + 9 files changed, 245 insertions(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 404e03c30d..7baf3dede9 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -510,6 +510,8 @@ static const struct { /*{ 0xf6 }, { 2, 2 }, F, W }, wrss */ { { 0xf6 }, { 2, 2 }, T, R, pfx_66 }, /* adcx */ { { 0xf6 }, { 2, 2 }, T, R, pfx_f3 }, /* adox */ + { { 0xf8 }, { 2, 2 }, F, W, pfx_66 }, /* movdir64b */ + { { 0xf9 }, { 2, 2 }, F, W }, /* movdiri */ }; #undef CND #undef REG diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index ec89368050..c80cb58d7d 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -652,6 +652,18 @@ static int cmpxchg( return X86EMUL_OKAY; } +static int blk( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + uint32_t *eflags, + struct x86_emulate_state *state, + struct x86_emulate_ctxt *ctxt) +{ + return x86_emul_blk((void *)offset, p_data, bytes, eflags, state, ctxt); +} + static int read_segment( enum x86_segment seg, struct segment_register *reg, @@ -721,6 +733,7 @@ static struct x86_emulate_ops emulops = { .insn_fetch = fetch, .write = write, .cmpxchg = cmpxchg, + .blk = blk, .read_segment = read_segment, .cpuid = emul_test_cpuid, .read_cr = emul_test_read_cr, @@ -2339,6 +2352,50 @@ int main(int argc, char **argv) goto fail; printf("okay\n"); + printf("%-40s", "Testing movdiri %edx,(%ecx)..."); + if ( stack_exec && cpu_has_movdiri ) + { + instr[0] = 0x0f; instr[1] = 0x38; instr[2] = 0xf9; instr[3] = 0x11; + + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)memset(res, -1, 16); + regs.edx = 0x44332211; + + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (regs.eip != (unsigned long)&instr[4]) || + res[0] != 0x44332211 || ~res[1] ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing movdir64b 144(%edx),%ecx..."); + if ( stack_exec && cpu_has_movdir64b ) + { + instr[0] = 0x66; instr[1] = 0x0f; instr[2] = 0x38; instr[3] = 0xf8; + instr[4] = 0x8a; instr[5] = 0x90; instr[8] = instr[7] = instr[6] = 0; + + regs.eip = (unsigned long)&instr[0]; + for ( i = 0; i < 64; ++i ) + res[i] = i - 20; + regs.edx = (unsigned long)res; + regs.ecx = (unsigned long)(res + 16); + + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + (regs.eip != (unsigned long)&instr[9]) || + res[15] != -5 || res[32] != 12 ) + goto fail; + for ( i = 16; i < 32; ++i ) + if ( res[i] != i ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index b7f428b9e1..859f0c379b 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -160,6 +160,8 @@ static inline bool xcr0_mask(uint64_t mask) #define cpu_has_avx512_vnni (cp.feat.avx512_vnni && xcr0_mask(0xe6)) #define cpu_has_avx512_bitalg (cp.feat.avx512_bitalg && xcr0_mask(0xe6)) #define cpu_has_avx512_vpopcntdq (cp.feat.avx512_vpopcntdq && xcr0_mask(0xe6)) +#define cpu_has_movdiri cp.feat.movdiri +#define cpu_has_movdir64b cp.feat.movdir64b #define cpu_has_avx512_4vnniw (cp.feat.avx512_4vnniw && xcr0_mask(0xe6)) #define cpu_has_avx512_4fmaps (cp.feat.avx512_4fmaps && xcr0_mask(0xe6)) #define cpu_has_serialize cp.feat.serialize diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 62b7c97007..19c0cc38f8 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -47,6 +47,7 @@ $(call as-option-add,CFLAGS,CC,"rdseed %eax",-DHAVE_AS_RDSEED) $(call as-option-add,CFLAGS,CC,"clwb (%rax)",-DHAVE_AS_CLWB) $(call as-option-add,CFLAGS,CC,".equ \"x\"$$(comma)1",-DHAVE_AS_QUOTED_SYM) $(call as-option-add,CFLAGS,CC,"invpcid (%rax)$$(comma)%rax",-DHAVE_AS_INVPCID) +$(call as-option-add,CFLAGS,CC,"movdiri %rax$$(comma)(%rax)",-DHAVE_AS_MOVDIR) # GAS's idea of true is -1. Clang's idea is 1 $(call as-option-add,CFLAGS,CC,\ diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 57f36b7be9..8b4e73ab06 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -1441,6 +1441,47 @@ static int hvmemul_rmw( return rc; } +static int hvmemul_blk( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + uint32_t *eflags, + struct x86_emulate_state *state, + struct x86_emulate_ctxt *ctxt) +{ + struct hvm_emulate_ctxt *hvmemul_ctxt = + container_of(ctxt, struct hvm_emulate_ctxt, ctxt); + unsigned long addr; + uint32_t pfec = PFEC_page_present; + int rc; + void *mapping = NULL; + + rc = hvmemul_virtual_to_linear( + seg, offset, bytes, NULL, hvm_access_write, hvmemul_ctxt, &addr); + if ( rc != X86EMUL_OKAY || !bytes ) + return rc; + + if ( x86_insn_is_mem_write(state, ctxt) ) + pfec |= PFEC_write_access; + + if ( is_x86_system_segment(seg) ) + pfec |= PFEC_implicit; + else if ( hvmemul_ctxt->seg_reg[x86_seg_ss].dpl == 3 ) + pfec |= PFEC_user_mode; + + mapping = hvmemul_map_linear_addr(addr, bytes, pfec, hvmemul_ctxt); + if ( IS_ERR(mapping) ) + return ~PTR_ERR(mapping); + if ( !mapping ) + return X86EMUL_UNHANDLEABLE; + + rc = x86_emul_blk(mapping, p_data, bytes, eflags, state, ctxt); + hvmemul_unmap_linear_addr(mapping, addr, bytes, hvmemul_ctxt); + + return rc; +} + static int hvmemul_write_discard( enum x86_segment seg, unsigned long offset, @@ -2518,6 +2559,7 @@ static const struct x86_emulate_ops hvm_emulate_ops = { .write = hvmemul_write, .rmw = hvmemul_rmw, .cmpxchg = hvmemul_cmpxchg, + .blk = hvmemul_blk, .validate = hvmemul_validate, .rep_ins = hvmemul_rep_ins, .rep_outs = hvmemul_rep_outs, diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 44bb3e59e9..da1f77e629 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -548,6 +548,8 @@ static const struct ext0f38_table { [0xf1] = { .to_mem = 1, .two_op = 1 }, [0xf2 ... 0xf3] = {}, [0xf5 ... 0xf7] = {}, + [0xf8] = { .simd_size = simd_other }, + [0xf9] = { .to_mem = 1, .two_op = 1 /* Mov */ }, }; /* Shift values between src and dst sizes of pmov{s,z}x{b,w,d}{w,d,q}. */ @@ -851,6 +853,10 @@ struct x86_emulate_state { rmw_xchg, rmw_xor, } rmw; + enum { + blk_NONE, + blk_movdir, + } blk; uint8_t modrm, modrm_mod, modrm_reg, modrm_rm; uint8_t sib_index, sib_scale; uint8_t rex_prefix; @@ -1915,6 +1921,8 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_avx512_vpopcntdq() (ctxt->cpuid->feat.avx512_vpopcntdq) #define vcpu_has_tsxldtrk() (ctxt->cpuid->feat.tsxldtrk) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) +#define vcpu_has_movdiri() (ctxt->cpuid->feat.movdiri) +#define vcpu_has_movdir64b() (ctxt->cpuid->feat.movdir64b) #define vcpu_has_avx512_4vnniw() (ctxt->cpuid->feat.avx512_4vnniw) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) #define vcpu_has_serialize() (ctxt->cpuid->feat.serialize) @@ -2736,10 +2744,12 @@ x86_decode_0f38( { case 0x00 ... 0xef: case 0xf2 ... 0xf5: - case 0xf7 ... 0xff: + case 0xf7 ... 0xf8: + case 0xfa ... 0xff: op_bytes = 0; /* fall through */ case 0xf6: /* adcx / adox */ + case 0xf9: /* movdiri */ ctxt->opcode |= MASK_INSR(vex.pfx, X86EMUL_OPC_PFX_MASK); break; @@ -10218,6 +10228,34 @@ x86_emulate( : "0" ((uint32_t)src.val), "rm" (_regs.edx) ); break; + case X86EMUL_OPC_66(0x0f38, 0xf8): /* movdir64b r,m512 */ + host_and_vcpu_must_have(movdir64b); + generate_exception_if(ea.type != OP_MEM, EXC_UD); + src.val = truncate_ea(*dst.reg); + generate_exception_if(!is_aligned(x86_seg_es, src.val, 64, ctxt, ops), + EXC_GP, 0); + fail_if(!ops->blk); + state->blk = blk_movdir; + BUILD_BUG_ON(sizeof(*mmvalp) < 64); + if ( (rc = ops->read(ea.mem.seg, ea.mem.off, mmvalp, 64, + ctxt)) != X86EMUL_OKAY || + (rc = ops->blk(x86_seg_es, src.val, mmvalp, 64, &_regs.eflags, + state, ctxt)) != X86EMUL_OKAY ) + goto done; + state->simd_size = simd_none; + break; + + case X86EMUL_OPC(0x0f38, 0xf9): /* movdiri mem,r */ + host_and_vcpu_must_have(movdiri); + generate_exception_if(dst.type != OP_MEM, EXC_UD); + fail_if(!ops->blk); + state->blk = blk_movdir; + if ( (rc = ops->blk(dst.mem.seg, dst.mem.off, &src.val, op_bytes, + &_regs.eflags, state, ctxt)) != X86EMUL_OKAY ) + goto done; + dst.type = OP_NONE; + break; + #ifndef X86EMUL_NO_SIMD case X86EMUL_OPC_VEX_66(0x0f3a, 0x00): /* vpermq $imm8,ymm/m256,ymm */ @@ -11477,6 +11515,77 @@ int x86_emul_rmw( return X86EMUL_OKAY; } +int x86_emul_blk( + void *ptr, + void *data, + unsigned int bytes, + uint32_t *eflags, + struct x86_emulate_state *state, + struct x86_emulate_ctxt *ctxt) +{ + switch ( state->blk ) + { + /* + * Throughout this switch(), memory clobbers are used to compensate + * that other operands may not properly express the (full) memory + * ranges covered. + */ + case blk_movdir: + switch ( bytes ) + { +#ifdef __x86_64__ + case sizeof(uint32_t): +# ifdef HAVE_AS_MOVDIR + asm ( "movdiri %0, (%1)" + :: "r" (*(uint32_t *)data), "r" (ptr) : "memory" ); +# else + /* movdiri %esi, (%rdi) */ + asm ( ".byte 0x0f, 0x38, 0xf9, 0x37" + :: "S" (*(uint32_t *)data), "D" (ptr) : "memory" ); +# endif + break; +#endif + + case sizeof(unsigned long): +#ifdef HAVE_AS_MOVDIR + asm ( "movdiri %0, (%1)" + :: "r" (*(unsigned long *)data), "r" (ptr) : "memory" ); +#else + /* movdiri %rsi, (%rdi) */ + asm ( ".byte 0x48, 0x0f, 0x38, 0xf9, 0x37" + :: "S" (*(unsigned long *)data), "D" (ptr) : "memory" ); +#endif + break; + + case 64: + if ( ((unsigned long)ptr & 0x3f) ) + { + ASSERT_UNREACHABLE(); + return X86EMUL_UNHANDLEABLE; + } +#ifdef HAVE_AS_MOVDIR + asm ( "movdir64b (%0), %1" :: "r" (data), "r" (ptr) : "memory" ); +#else + /* movdir64b (%rsi), %rdi */ + asm ( ".byte 0x66, 0x0f, 0x38, 0xf8, 0x3e" + :: "S" (data), "D" (ptr) : "memory" ); +#endif + break; + + default: + ASSERT_UNREACHABLE(); + return X86EMUL_UNHANDLEABLE; + } + break; + + default: + ASSERT_UNREACHABLE(); + return X86EMUL_UNHANDLEABLE; + } + + return X86EMUL_OKAY; +} + static void __init __maybe_unused build_assertions(void) { /* Check the values against SReg3 encoding in opcode/ModRM bytes. */ @@ -11759,6 +11868,9 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, { case 0x63: /* ARPL */ return !mode_64bit(); + + case X86EMUL_OPC_66(0x0f38, 0xf8): /* MOVDIR64B */ + return true; } return false; diff --git a/xen/arch/x86/x86_emulate/x86_emulate.h b/xen/arch/x86/x86_emulate/x86_emulate.h index 2ac788c008..d8fb3a9909 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.h +++ b/xen/arch/x86/x86_emulate/x86_emulate.h @@ -309,6 +309,22 @@ struct x86_emulate_ops bool lock, struct x86_emulate_ctxt *ctxt); + /* + * blk: Emulate a large (block) memory access. + * @p_data: [IN/OUT] (optional) Pointer to source/destination buffer. + * @eflags: [IN/OUT] Pointer to EFLAGS to be updated according to + * instruction effects. + * @state: [IN/OUT] Pointer to (opaque) emulator state. + */ + int (*blk)( + enum x86_segment seg, + unsigned long offset, + void *p_data, + unsigned int bytes, + uint32_t *eflags, + struct x86_emulate_state *state, + struct x86_emulate_ctxt *ctxt); + /* * validate: Post-decode, pre-emulate hook to allow caller controlled * filtering. @@ -794,6 +810,14 @@ x86_emul_rmw( uint32_t *eflags, struct x86_emulate_state *state, struct x86_emulate_ctxt *ctxt); +int +x86_emul_blk( + void *ptr, + void *data, + unsigned int bytes, + uint32_t *eflags, + struct x86_emulate_state *state, + struct x86_emulate_ctxt *ctxt); static inline void x86_emul_hw_exception( unsigned int vector, int error_code, struct x86_emulate_ctxt *ctxt) diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index cadef4e824..0e772e39c1 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -118,6 +118,8 @@ #define cpu_has_avx512_bitalg boot_cpu_has(X86_FEATURE_AVX512_BITALG) #define cpu_has_avx512_vpopcntdq boot_cpu_has(X86_FEATURE_AVX512_VPOPCNTDQ) #define cpu_has_rdpid boot_cpu_has(X86_FEATURE_RDPID) +#define cpu_has_movdiri boot_cpu_has(X86_FEATURE_MOVDIRI) +#define cpu_has_movdir64b boot_cpu_has(X86_FEATURE_MOVDIR64B) /* CPUID level 0x80000007.edx */ #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index c24eae948d..79f8ad3dd8 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -241,6 +241,8 @@ XEN_CPUFEATURE(AVX512_VPOPCNTDQ, 6*32+14) /*A POPCNT for vectors of DW/QW */ XEN_CPUFEATURE(TSXLDTRK, 6*32+16) /*a TSX load tracking suspend/resume insns */ XEN_CPUFEATURE(RDPID, 6*32+22) /*A RDPID instruction */ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ +XEN_CPUFEATURE(MOVDIRI, 6*32+27) /*a MOVDIRI instruction */ +XEN_CPUFEATURE(MOVDIR64B, 6*32+28) /*a MOVDIR64B instruction */ /* AMD-defined CPU features, CPUID level 0x80000007.edx, word 7 */ XEN_CPUFEATURE(ITSC, 7*32+ 8) /* Invariant TSC */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:45:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:45:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehC0-0000f3-AU; Fri, 29 May 2020 15:45:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBz-0000eo-7T for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:07 +0000 X-Inumbo-ID: 5e469114-a1c3-11ea-a8db-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5e469114-a1c3-11ea-a8db-12813bfff9fa; Fri, 29 May 2020 15:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BvfEXtmTu9KkSSFsHt8KwrqpZWthnLQaDqKdizhB3cY=; b=kA7vQgZraLe9rDhgVEAuKpayVQ 6pe8666RCD814GTA+3F+eMj/Ro9nUPa5dCL944BCqC3eXv/IDmBRsAO8bhtGDHajTem8ndpd2Go8q 9rOTT4/8XCI1wDBsG8m1NaMEB+jTHgEIWuO6z5Q9UwY5KDKcNaGrrVy7cJFsqdxN1OEE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehBx-0008Rg-Vp for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehBx-0000e4-Uv for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: support ENQCMD insns Message-Id: Date: Fri, 29 May 2020 15:45:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d273859687415f5b36dde976d43e04162aeadfdc Author: Jan Beulich AuthorDate: Fri May 29 17:32:55 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:32:55 2020 +0200 x86emul: support ENQCMD insns Note that the ISA extensions document revision 038 doesn't specify exception behavior for ModRM.mod == 0b11; assuming #UD here. No tests are being added to the harness - this would be quite hard, we can't just issue the insns against RAM. Their similarity with MOVDIR64B should have the test case there be god enough to cover any fundamental flaws. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/predicates.c | 2 + tools/tests/x86_emulator/x86-emulate.h | 3 ++ xen/arch/x86/arch.mk | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 60 +++++++++++++++++++++++++++++ xen/include/asm-x86/cpufeature.h | 1 + xen/include/asm-x86/msr-index.h | 4 ++ xen/include/public/arch-x86/cpufeatureset.h | 1 + 7 files changed, 72 insertions(+) diff --git a/tools/tests/x86_emulator/predicates.c b/tools/tests/x86_emulator/predicates.c index 7baf3dede9..80491ef3ed 100644 --- a/tools/tests/x86_emulator/predicates.c +++ b/tools/tests/x86_emulator/predicates.c @@ -511,6 +511,8 @@ static const struct { { { 0xf6 }, { 2, 2 }, T, R, pfx_66 }, /* adcx */ { { 0xf6 }, { 2, 2 }, T, R, pfx_f3 }, /* adox */ { { 0xf8 }, { 2, 2 }, F, W, pfx_66 }, /* movdir64b */ + { { 0xf8 }, { 2, 2 }, F, W, pfx_f3 }, /* enqcmds */ + { { 0xf8 }, { 2, 2 }, F, W, pfx_f2 }, /* enqcmd */ { { 0xf9 }, { 2, 2 }, F, W }, /* movdiri */ }; #undef CND diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 859f0c379b..978dc48b33 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -59,6 +59,9 @@ (type *)((char *)mptr__ - offsetof(type, member)); \ }) +#define AC_(n,t) (n##t) +#define _AC(n,t) AC_(n,t) + #define hweight32 __builtin_popcount #define hweight64 __builtin_popcountll diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 19c0cc38f8..9927a42061 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -48,6 +48,7 @@ $(call as-option-add,CFLAGS,CC,"clwb (%rax)",-DHAVE_AS_CLWB) $(call as-option-add,CFLAGS,CC,".equ \"x\"$$(comma)1",-DHAVE_AS_QUOTED_SYM) $(call as-option-add,CFLAGS,CC,"invpcid (%rax)$$(comma)%rax",-DHAVE_AS_INVPCID) $(call as-option-add,CFLAGS,CC,"movdiri %rax$$(comma)(%rax)",-DHAVE_AS_MOVDIR) +$(call as-option-add,CFLAGS,CC,"enqcmd (%rax)$$(comma)%rax",-DHAVE_AS_ENQCMD) # GAS's idea of true is -1. Clang's idea is 1 $(call as-option-add,CFLAGS,CC,\ diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index da1f77e629..505ec09662 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -855,6 +855,7 @@ struct x86_emulate_state { } rmw; enum { blk_NONE, + blk_enqcmd, blk_movdir, } blk; uint8_t modrm, modrm_mod, modrm_reg, modrm_rm; @@ -901,6 +902,7 @@ typedef union { uint64_t __attribute__ ((aligned(16))) xmm[2]; uint64_t __attribute__ ((aligned(32))) ymm[4]; uint64_t __attribute__ ((aligned(64))) zmm[8]; + uint32_t data32[16]; } mmval_t; /* @@ -1923,6 +1925,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_rdpid() (ctxt->cpuid->feat.rdpid) #define vcpu_has_movdiri() (ctxt->cpuid->feat.movdiri) #define vcpu_has_movdir64b() (ctxt->cpuid->feat.movdir64b) +#define vcpu_has_enqcmd() (ctxt->cpuid->feat.enqcmd) #define vcpu_has_avx512_4vnniw() (ctxt->cpuid->feat.avx512_4vnniw) #define vcpu_has_avx512_4fmaps() (ctxt->cpuid->feat.avx512_4fmaps) #define vcpu_has_serialize() (ctxt->cpuid->feat.serialize) @@ -10245,6 +10248,36 @@ x86_emulate( state->simd_size = simd_none; break; + case X86EMUL_OPC_F2(0x0f38, 0xf8): /* enqcmd r,m512 */ + case X86EMUL_OPC_F3(0x0f38, 0xf8): /* enqcmds r,m512 */ + host_and_vcpu_must_have(enqcmd); + generate_exception_if(ea.type != OP_MEM, EXC_UD); + generate_exception_if(vex.pfx != vex_f2 && !mode_ring0(), EXC_GP, 0); + src.val = truncate_ea(*dst.reg); + generate_exception_if(!is_aligned(x86_seg_es, src.val, 64, ctxt, ops), + EXC_GP, 0); + fail_if(!ops->blk); + BUILD_BUG_ON(sizeof(*mmvalp) < 64); + if ( (rc = ops->read(ea.mem.seg, ea.mem.off, mmvalp, 64, + ctxt)) != X86EMUL_OKAY ) + goto done; + if ( vex.pfx == vex_f2 ) /* enqcmd */ + { + fail_if(!ops->read_msr); + if ( (rc = ops->read_msr(MSR_PASID, &msr_val, + ctxt)) != X86EMUL_OKAY ) + goto done; + generate_exception_if(!(msr_val & PASID_VALID), EXC_GP, 0); + mmvalp->data32[0] = MASK_EXTR(msr_val, PASID_PASID_MASK); + } + mmvalp->data32[0] &= ~0x7ff00000; + state->blk = blk_enqcmd; + if ( (rc = ops->blk(x86_seg_es, src.val, mmvalp, 64, &_regs.eflags, + state, ctxt)) != X86EMUL_OKAY ) + goto done; + state->simd_size = simd_none; + break; + case X86EMUL_OPC(0x0f38, 0xf9): /* movdiri mem,r */ host_and_vcpu_must_have(movdiri); generate_exception_if(dst.type != OP_MEM, EXC_UD); @@ -11525,11 +11558,36 @@ int x86_emul_blk( { switch ( state->blk ) { + bool zf; + /* * Throughout this switch(), memory clobbers are used to compensate * that other operands may not properly express the (full) memory * ranges covered. */ + case blk_enqcmd: + ASSERT(bytes == 64); + if ( ((unsigned long)ptr & 0x3f) ) + { + ASSERT_UNREACHABLE(); + return X86EMUL_UNHANDLEABLE; + } + *eflags &= ~EFLAGS_MASK; +#ifdef HAVE_AS_ENQCMD + asm ( "enqcmds (%[src]), %[dst]" ASM_FLAG_OUT(, "; setz %[zf]") + : [zf] ASM_FLAG_OUT("=@ccz", "=qm") (zf) + : [src] "r" (data), [dst] "r" (ptr) : "memory" ); +#else + /* enqcmds (%rsi), %rdi */ + asm ( ".byte 0xf3, 0x0f, 0x38, 0xf8, 0x3e" + ASM_FLAG_OUT(, "; setz %[zf]") + : [zf] ASM_FLAG_OUT("=@ccz", "=qm") (zf) + : "S" (data), "D" (ptr) : "memory" ); +#endif + if ( zf ) + *eflags |= X86_EFLAGS_ZF; + break; + case blk_movdir: switch ( bytes ) { @@ -11870,6 +11928,8 @@ x86_insn_is_mem_write(const struct x86_emulate_state *state, return !mode_64bit(); case X86EMUL_OPC_66(0x0f38, 0xf8): /* MOVDIR64B */ + case X86EMUL_OPC_F2(0x0f38, 0xf8): /* ENQCMD */ + case X86EMUL_OPC_F3(0x0f38, 0xf8): /* ENQCMDS */ return true; } diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 0e772e39c1..025f29e83e 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -120,6 +120,7 @@ #define cpu_has_rdpid boot_cpu_has(X86_FEATURE_RDPID) #define cpu_has_movdiri boot_cpu_has(X86_FEATURE_MOVDIRI) #define cpu_has_movdir64b boot_cpu_has(X86_FEATURE_MOVDIR64B) +#define cpu_has_enqcmd boot_cpu_has(X86_FEATURE_ENQCMD) /* CPUID level 0x80000007.edx */ #define cpu_has_itsc boot_cpu_has(X86_FEATURE_ITSC) diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 85c5f20b76..5fa14ca136 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -74,6 +74,10 @@ #define MSR_PL3_SSP 0x000006a7 #define MSR_INTERRUPT_SSP_TABLE 0x000006a8 +#define MSR_PASID 0x00000d93 +#define PASID_PASID_MASK 0x000fffff +#define PASID_VALID (_AC(1, ULL) << 31) + /* * Legacy MSR constants in need of cleanup. No new MSRs below this comment. */ diff --git a/xen/include/public/arch-x86/cpufeatureset.h b/xen/include/public/arch-x86/cpufeatureset.h index 79f8ad3dd8..8347a405ac 100644 --- a/xen/include/public/arch-x86/cpufeatureset.h +++ b/xen/include/public/arch-x86/cpufeatureset.h @@ -243,6 +243,7 @@ XEN_CPUFEATURE(RDPID, 6*32+22) /*A RDPID instruction */ XEN_CPUFEATURE(CLDEMOTE, 6*32+25) /*A CLDEMOTE instruction */ XEN_CPUFEATURE(MOVDIRI, 6*32+27) /*a MOVDIRI instruction */ XEN_CPUFEATURE(MOVDIR64B, 6*32+28) /*a MOVDIR64B instruction */ +XEN_CPUFEATURE(ENQCMD, 6*32+29) /* ENQCMD{,S} instructions */ /* AMD-defined CPU features, CPUID level 0x80000007.edx, word 7 */ XEN_CPUFEATURE(ITSC, 7*32+ 8) /* Invariant TSC */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:45:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:45:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehCA-0000h0-Dw; Fri, 29 May 2020 15:45:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehC9-0000gm-7j for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:17 +0000 X-Inumbo-ID: 644b9df2-a1c3-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 644b9df2-a1c3-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 15:45:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=oHWQf+zVO5UIeD9HBdg7+Fd2+H+qBYeXexA0O2Z+MpY=; b=o3AuMK6Oizz00UYqPNoAswwvU+ uaAlHOdXsW/Yir3wrANSu6N412y/qDQP4TkFaiDFOIdGdeY8P2FNPQKpt/eUv8SZoFl8SJ+XYQFVL u7SwKNxZCuVgzQ2bZ8wfj7qYyzHsykavUo4TKewc1w+vbQFAcaPnoLceI82TAh0YAjPQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehC8-0008Rp-3L for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehC8-0000en-2a for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: support FNSTENV and FNSAVE Message-Id: Date: Fri, 29 May 2020 15:45:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 422a104ba3c84795a08fa107117d6d08e79ef106 Author: Jan Beulich AuthorDate: Fri May 29 17:33:54 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:33:54 2020 +0200 x86emul: support FNSTENV and FNSAVE To avoid introducing another boolean into emulator state, the rex_prefix field gets (ab)used to convey the real/VM86 vs protected mode info (affecting structure layout, albeit not size) to x86_emul_blk(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/test_x86_emulator.c | 75 +++++++++++ tools/tests/x86_emulator/x86-emulate.h | 1 + xen/arch/x86/x86_emulate/x86_emulate.c | 181 ++++++++++++++++++++++++++- 3 files changed, 254 insertions(+), 3 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index c80cb58d7d..ae8f140aa8 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -748,6 +748,25 @@ static struct x86_emulate_ops emulops = { #define MMAP_ADDR 0x100000 +/* + * 64-bit OSes may not (be able to) properly restore the two selectors in + * the FPU environment. Zap them so that memcmp() on two saved images will + * work regardless of whether a context switch occurred in the middle. + */ +static void zap_fpsel(unsigned int *env, bool is_32bit) +{ + if ( is_32bit ) + { + env[4] &= ~0xffff; + env[6] &= ~0xffff; + } + else + { + env[2] &= ~0xffff; + env[3] &= ~0xffff; + } +} + #ifdef __x86_64__ # define STKVAL_DISP 64 static const struct { @@ -2396,6 +2415,62 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing fnstenv 4(%ecx)..."); + if ( stack_exec && cpu_has_fpu ) + { + const uint16_t three = 3; + + asm volatile ( "fninit\n\t" + "fld1\n\t" + "fidivs %1\n\t" + "fstenv %0" + : "=m" (res[9]) : "m" (three) : "memory" ); + zap_fpsel(&res[9], true); + instr[0] = 0xd9; instr[1] = 0x71; instr[2] = 0x04; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + res[8] = 0xaa55aa55; + rc = x86_emulate(&ctxt, &emulops); + zap_fpsel(&res[1], true); + if ( (rc != X86EMUL_OKAY) || + memcmp(res + 1, res + 9, 28) || + res[8] != 0xaa55aa55 || + (regs.eip != (unsigned long)&instr[3]) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing 16-bit fnsave (%ecx)..."); + if ( stack_exec && cpu_has_fpu ) + { + const uint16_t five = 5; + + asm volatile ( "fninit\n\t" + "fld1\n\t" + "fidivs %1\n\t" + "fsaves %0" + : "=m" (res[25]) : "m" (five) : "memory" ); + zap_fpsel(&res[25], false); + asm volatile ( "frstors %0" :: "m" (res[25]) : "memory" ); + instr[0] = 0x66; instr[1] = 0xdd; instr[2] = 0x31; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)res; + res[23] = 0xaa55aa55; + res[24] = 0xaa55aa55; + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + memcmp(res, res + 25, 94) || + (res[23] >> 16) != 0xaa55 || + res[24] != 0xaa55aa55 || + (regs.eip != (unsigned long)&instr[3]) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { diff --git a/tools/tests/x86_emulator/x86-emulate.h b/tools/tests/x86_emulator/x86-emulate.h index 978dc48b33..6ea6cbc658 100644 --- a/tools/tests/x86_emulator/x86-emulate.h +++ b/tools/tests/x86_emulator/x86-emulate.h @@ -129,6 +129,7 @@ static inline bool xcr0_mask(uint64_t mask) } #define cache_line_size() (cp.basic.clflush_size * 8) +#define cpu_has_fpu cp.basic.fpu #define cpu_has_mmx cp.basic.mmx #define cpu_has_fxsr cp.basic.fxsr #define cpu_has_sse cp.basic.sse diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 505ec09662..5ecf5c6335 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -856,6 +856,9 @@ struct x86_emulate_state { enum { blk_NONE, blk_enqcmd, +#ifndef X86EMUL_NO_FPU + blk_fst, /* FNSTENV, FNSAVE */ +#endif blk_movdir, } blk; uint8_t modrm, modrm_mod, modrm_reg, modrm_rm; @@ -897,6 +900,50 @@ struct x86_emulate_state { #define PTR_POISON NULL /* 32-bit builds are for user-space, so NULL is OK. */ #endif +#ifndef X86EMUL_NO_FPU +struct x87_env16 { + uint16_t fcw; + uint16_t fsw; + uint16_t ftw; + union { + struct { + uint16_t fip_lo; + uint16_t fop:11, :1, fip_hi:4; + uint16_t fdp_lo; + uint16_t :12, fdp_hi:4; + } real; + struct { + uint16_t fip; + uint16_t fcs; + uint16_t fdp; + uint16_t fds; + } prot; + } mode; +}; + +struct x87_env32 { + uint32_t fcw:16, :16; + uint32_t fsw:16, :16; + uint32_t ftw:16, :16; + union { + struct { + /* some CPUs/FPUs also store the full FIP here */ + uint32_t fip_lo:16, :16; + uint32_t fop:11, :1, fip_hi:16, :4; + /* some CPUs/FPUs also store the full FDP here */ + uint32_t fdp_lo:16, :16; + uint32_t :12, fdp_hi:16, :4; + } real; + struct { + uint32_t fip; + uint32_t fcs:16, fop:11, :5; + uint32_t fdp; + uint32_t fds:16, :16; + } prot; + } mode; +}; +#endif + typedef union { uint64_t mmx; uint64_t __attribute__ ((aligned(16))) xmm[2]; @@ -4924,9 +4971,22 @@ x86_emulate( goto done; emulate_fpu_insn_memsrc(b, modrm_reg & 7, src.val); break; - case 6: /* fnstenv - TODO */ + case 6: /* fnstenv */ + fail_if(!ops->blk); + state->blk = blk_fst; + /* + * REX is meaningless for this insn by this point - (ab)use + * the field to communicate real vs protected mode to ->blk(). + */ + /*state->*/rex_prefix = in_protmode(ctxt, ops); + if ( (rc = ops->blk(ea.mem.seg, ea.mem.off, NULL, + op_bytes > 2 ? sizeof(struct x87_env32) + : sizeof(struct x87_env16), + &_regs.eflags, + state, ctxt)) != X86EMUL_OKAY ) + goto done; state->fpu_ctrl = true; - goto unimplemented_insn; + break; case 7: /* fnstcw m2byte */ state->fpu_ctrl = true; fpu_memdst16: @@ -5080,9 +5140,24 @@ x86_emulate( emulate_fpu_insn_memdst(b, modrm_reg & 7, dst.val); break; case 4: /* frstor - TODO */ - case 6: /* fnsave - TODO */ state->fpu_ctrl = true; goto unimplemented_insn; + case 6: /* fnsave */ + fail_if(!ops->blk); + state->blk = blk_fst; + /* + * REX is meaningless for this insn by this point - (ab)use + * the field to communicate real vs protected mode to ->blk(). + */ + /*state->*/rex_prefix = in_protmode(ctxt, ops); + if ( (rc = ops->blk(ea.mem.seg, ea.mem.off, NULL, + op_bytes > 2 ? sizeof(struct x87_env32) + 80 + : sizeof(struct x87_env16) + 80, + &_regs.eflags, + state, ctxt)) != X86EMUL_OKAY ) + goto done; + state->fpu_ctrl = true; + break; case 7: /* fnstsw m2byte */ state->fpu_ctrl = true; goto fpu_memdst16; @@ -11559,6 +11634,14 @@ int x86_emul_blk( switch ( state->blk ) { bool zf; +#ifndef X86EMUL_NO_FPU + struct { + struct x87_env32 env; + struct { + uint8_t bytes[10]; + } freg[8]; + } fpstate; +#endif /* * Throughout this switch(), memory clobbers are used to compensate @@ -11588,6 +11671,98 @@ int x86_emul_blk( *eflags |= X86_EFLAGS_ZF; break; +#ifndef X86EMUL_NO_FPU + + case blk_fst: + ASSERT(!data); + + /* Don't chance consuming uninitialized data. */ + memset(&fpstate, 0, sizeof(fpstate)); + if ( bytes > sizeof(fpstate.env) ) + asm ( "fnsave %0" : "+m" (fpstate) ); + else + asm ( "fnstenv %0" : "+m" (fpstate.env) ); + + /* state->rex_prefix carries CR0.PE && !EFLAGS.VM setting */ + switch ( bytes ) + { + case sizeof(fpstate.env): /* 32-bit FNSTENV */ + case sizeof(fpstate): /* 32-bit FNSAVE */ + if ( !state->rex_prefix ) + { + /* Convert 32-bit prot to 32-bit real/vm86 format. */ + unsigned int fip = fpstate.env.mode.prot.fip + + (fpstate.env.mode.prot.fcs << 4); + unsigned int fdp = fpstate.env.mode.prot.fdp + + (fpstate.env.mode.prot.fds << 4); + unsigned int fop = fpstate.env.mode.prot.fop; + + memset(&fpstate.env.mode, 0, sizeof(fpstate.env.mode)); + fpstate.env.mode.real.fip_lo = fip; + fpstate.env.mode.real.fip_hi = fip >> 16; + fpstate.env.mode.real.fop = fop; + fpstate.env.mode.real.fdp_lo = fdp; + fpstate.env.mode.real.fdp_hi = fdp >> 16; + } + memcpy(ptr, &fpstate.env, sizeof(fpstate.env)); + if ( bytes == sizeof(fpstate.env) ) + ptr = NULL; + else + ptr += sizeof(fpstate.env); + break; + + case sizeof(struct x87_env16): /* 16-bit FNSTENV */ + case sizeof(struct x87_env16) + sizeof(fpstate.freg): /* 16-bit FNSAVE */ + if ( state->rex_prefix ) + { + /* Convert 32-bit prot to 16-bit prot format. */ + struct x87_env16 *env = ptr; + + env->fcw = fpstate.env.fcw; + env->fsw = fpstate.env.fsw; + env->ftw = fpstate.env.ftw; + env->mode.prot.fip = fpstate.env.mode.prot.fip; + env->mode.prot.fcs = fpstate.env.mode.prot.fcs; + env->mode.prot.fdp = fpstate.env.mode.prot.fdp; + env->mode.prot.fds = fpstate.env.mode.prot.fds; + } + else + { + /* Convert 32-bit prot to 16-bit real/vm86 format. */ + unsigned int fip = fpstate.env.mode.prot.fip + + (fpstate.env.mode.prot.fcs << 4); + unsigned int fdp = fpstate.env.mode.prot.fdp + + (fpstate.env.mode.prot.fds << 4); + struct x87_env16 env = { + .fcw = fpstate.env.fcw, + .fsw = fpstate.env.fsw, + .ftw = fpstate.env.ftw, + .mode.real.fip_lo = fip, + .mode.real.fip_hi = fip >> 16, + .mode.real.fop = fpstate.env.mode.prot.fop, + .mode.real.fdp_lo = fdp, + .mode.real.fdp_hi = fdp >> 16 + }; + + memcpy(ptr, &env, sizeof(env)); + } + if ( bytes == sizeof(struct x87_env16) ) + ptr = NULL; + else + ptr += sizeof(struct x87_env16); + break; + + default: + ASSERT_UNREACHABLE(); + return X86EMUL_UNHANDLEABLE; + } + + if ( ptr ) + memcpy(ptr, fpstate.freg, sizeof(fpstate.freg)); + break; + +#endif /* X86EMUL_NO_FPU */ + case blk_movdir: switch ( bytes ) { -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:45:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:45:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehCK-0000iS-Fi; Fri, 29 May 2020 15:45:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehCJ-0000iI-5t for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:27 +0000 X-Inumbo-ID: 6a53dd5e-a1c3-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6a53dd5e-a1c3-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 15:45:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=x4Ar/6+z/tEg1NlDQhLIQhamPhtf4+PtQ0n1BhtEhQE=; b=IkjKbuDC/e5QrP4AQ+KVTZ26dT cGFkaXVYwakiPXpU3olvmNZNYEG14fDyQNS2zPvK7YRnogF/13eaoSGIlEudz0tiYT95xAgHv06Wi 1qw9u3vLk7alL+ixzY0PiJ3CGxeF6MxPRep1fQReTliuJEB3O+ETzD0Sp7+5INAH+mS8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehCI-0008S3-7A for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehCI-0000fS-6G for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:26 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: support FLDENV and FRSTOR Message-Id: Date: Fri, 29 May 2020 15:45:26 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit be55ed744ed81ffb114ce16abb4bfe2f22af5a1d Author: Jan Beulich AuthorDate: Fri May 29 17:34:31 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:34:31 2020 +0200 x86emul: support FLDENV and FRSTOR While the Intel SDM claims that FRSTOR itself may raise #MF upon completion, this was confirmed by Intel to be a doc error which will be corrected in due course; behavior is like FLDENV, and like old hard copy manuals describe it. Re-arrange a switch() statement's case label order to allow for fall-through from FLDENV handling to FNSTENV's. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/test_x86_emulator.c | 46 ++++++++++ xen/arch/x86/x86_emulate/x86_emulate.c | 125 +++++++++++++++++++++++---- 2 files changed, 153 insertions(+), 18 deletions(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index ae8f140aa8..a5011d6783 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -2442,6 +2442,27 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing fldenv 8(%edx)..."); + if ( stack_exec && cpu_has_fpu ) + { + asm volatile ( "fnstenv %0\n\t" + "fninit" + : "=m" (res[2]) :: "memory" ); + zap_fpsel(&res[2], true); + instr[0] = 0xd9; instr[1] = 0x62; instr[2] = 0x08; + regs.eip = (unsigned long)&instr[0]; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + asm volatile ( "fnstenv %0" : "=m" (res[9]) :: "memory" ); + if ( (rc != X86EMUL_OKAY) || + memcmp(res + 2, res + 9, 28) || + (regs.eip != (unsigned long)&instr[3]) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing 16-bit fnsave (%ecx)..."); if ( stack_exec && cpu_has_fpu ) { @@ -2471,6 +2492,31 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing frstor (%edx)..."); + if ( stack_exec && cpu_has_fpu ) + { + const uint16_t seven = 7; + + asm volatile ( "fninit\n\t" + "fld1\n\t" + "fidivs %1\n\t" + "fnsave %0\n\t" + : "=&m" (res[0]) : "m" (seven) : "memory" ); + zap_fpsel(&res[0], true); + instr[0] = 0xdd; instr[1] = 0x22; + regs.eip = (unsigned long)&instr[0]; + regs.edx = (unsigned long)res; + rc = x86_emulate(&ctxt, &emulops); + asm volatile ( "fnsave %0" : "=m" (res[27]) :: "memory" ); + if ( (rc != X86EMUL_OKAY) || + memcmp(res, res + 27, 108) || + (regs.eip != (unsigned long)&instr[2]) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 5ecf5c6335..725f0b8b3e 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -857,6 +857,7 @@ struct x86_emulate_state { blk_NONE, blk_enqcmd, #ifndef X86EMUL_NO_FPU + blk_fld, /* FLDENV, FRSTOR */ blk_fst, /* FNSTENV, FNSAVE */ #endif blk_movdir, @@ -4960,22 +4961,15 @@ x86_emulate( dst.bytes = 4; emulate_fpu_insn_memdst(b, modrm_reg & 7, dst.val); break; - case 4: /* fldenv - TODO */ - state->fpu_ctrl = true; - goto unimplemented_insn; - case 5: /* fldcw m2byte */ - state->fpu_ctrl = true; - fpu_memsrc16: - if ( (rc = ops->read(ea.mem.seg, ea.mem.off, &src.val, - 2, ctxt)) != X86EMUL_OKAY ) - goto done; - emulate_fpu_insn_memsrc(b, modrm_reg & 7, src.val); - break; + case 4: /* fldenv */ + /* Raise #MF now if there are pending unmasked exceptions. */ + emulate_fpu_insn_stub(0xd9, 0xd0 /* fnop */); + /* fall through */ case 6: /* fnstenv */ fail_if(!ops->blk); - state->blk = blk_fst; + state->blk = modrm_reg & 2 ? blk_fst : blk_fld; /* - * REX is meaningless for this insn by this point - (ab)use + * REX is meaningless for these insns by this point - (ab)use * the field to communicate real vs protected mode to ->blk(). */ /*state->*/rex_prefix = in_protmode(ctxt, ops); @@ -4987,6 +4981,14 @@ x86_emulate( goto done; state->fpu_ctrl = true; break; + case 5: /* fldcw m2byte */ + state->fpu_ctrl = true; + fpu_memsrc16: + if ( (rc = ops->read(ea.mem.seg, ea.mem.off, &src.val, + 2, ctxt)) != X86EMUL_OKAY ) + goto done; + emulate_fpu_insn_memsrc(b, modrm_reg & 7, src.val); + break; case 7: /* fnstcw m2byte */ state->fpu_ctrl = true; fpu_memdst16: @@ -5139,14 +5141,15 @@ x86_emulate( dst.bytes = 8; emulate_fpu_insn_memdst(b, modrm_reg & 7, dst.val); break; - case 4: /* frstor - TODO */ - state->fpu_ctrl = true; - goto unimplemented_insn; + case 4: /* frstor */ + /* Raise #MF now if there are pending unmasked exceptions. */ + emulate_fpu_insn_stub(0xd9, 0xd0 /* fnop */); + /* fall through */ case 6: /* fnsave */ fail_if(!ops->blk); - state->blk = blk_fst; + state->blk = modrm_reg & 2 ? blk_fst : blk_fld; /* - * REX is meaningless for this insn by this point - (ab)use + * REX is meaningless for these insns by this point - (ab)use * the field to communicate real vs protected mode to ->blk(). */ /*state->*/rex_prefix = in_protmode(ctxt, ops); @@ -11673,6 +11676,92 @@ int x86_emul_blk( #ifndef X86EMUL_NO_FPU + case blk_fld: + ASSERT(!data); + + /* state->rex_prefix carries CR0.PE && !EFLAGS.VM setting */ + switch ( bytes ) + { + case sizeof(fpstate.env): /* 32-bit FLDENV */ + case sizeof(fpstate): /* 32-bit FRSTOR */ + memcpy(&fpstate.env, ptr, sizeof(fpstate.env)); + if ( !state->rex_prefix ) + { + /* Convert 32-bit real/vm86 to 32-bit prot format. */ + unsigned int fip = fpstate.env.mode.real.fip_lo + + (fpstate.env.mode.real.fip_hi << 16); + unsigned int fdp = fpstate.env.mode.real.fdp_lo + + (fpstate.env.mode.real.fdp_hi << 16); + unsigned int fop = fpstate.env.mode.real.fop; + + fpstate.env.mode.prot.fip = fip & 0xf; + fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fop = fop; + fpstate.env.mode.prot.fdp = fdp & 0xf; + fpstate.env.mode.prot.fds = fdp >> 4; + } + + if ( bytes == sizeof(fpstate.env) ) + ptr = NULL; + else + ptr += sizeof(fpstate.env); + break; + + case sizeof(struct x87_env16): /* 16-bit FLDENV */ + case sizeof(struct x87_env16) + sizeof(fpstate.freg): /* 16-bit FRSTOR */ + { + const struct x87_env16 *env = ptr; + + fpstate.env.fcw = env->fcw; + fpstate.env.fsw = env->fsw; + fpstate.env.ftw = env->ftw; + + if ( state->rex_prefix ) + { + /* Convert 16-bit prot to 32-bit prot format. */ + fpstate.env.mode.prot.fip = env->mode.prot.fip; + fpstate.env.mode.prot.fcs = env->mode.prot.fcs; + fpstate.env.mode.prot.fdp = env->mode.prot.fdp; + fpstate.env.mode.prot.fds = env->mode.prot.fds; + fpstate.env.mode.prot.fop = 0; /* unknown */ + } + else + { + /* Convert 16-bit real/vm86 to 32-bit prot format. */ + unsigned int fip = env->mode.real.fip_lo + + (env->mode.real.fip_hi << 16); + unsigned int fdp = env->mode.real.fdp_lo + + (env->mode.real.fdp_hi << 16); + unsigned int fop = env->mode.real.fop; + + fpstate.env.mode.prot.fip = fip & 0xf; + fpstate.env.mode.prot.fcs = fip >> 4; + fpstate.env.mode.prot.fop = fop; + fpstate.env.mode.prot.fdp = fdp & 0xf; + fpstate.env.mode.prot.fds = fdp >> 4; + } + + if ( bytes == sizeof(*env) ) + ptr = NULL; + else + ptr += sizeof(*env); + break; + } + + default: + ASSERT_UNREACHABLE(); + return X86EMUL_UNHANDLEABLE; + } + + if ( ptr ) + { + memcpy(fpstate.freg, ptr, sizeof(fpstate.freg)); + asm volatile ( "frstor %0" :: "m" (fpstate) ); + } + else + asm volatile ( "fldenv %0" :: "m" (fpstate.env) ); + break; + case blk_fst: ASSERT(!data); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:45:38 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:45:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehCU-0000kI-HL; Fri, 29 May 2020 15:45:38 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehCT-0000k3-Fp for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:37 +0000 X-Inumbo-ID: 7032ac0b-a1c3-11ea-a8db-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7032ac0b-a1c3-11ea-a8db-12813bfff9fa; Fri, 29 May 2020 15:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EUGkt4lynLJ903XePjvJUM06eI6gHHuwNJx/qbfB8yA=; b=RSi7xNfVUrW50sAafuVhzbmeE+ rOJVTl7AQWw2RI2DGyHkBbhVJtlODCFbEw2dJDUsE4H4SPnlVXuwsOvZlQJrZtSs1MK9YZy3CFypN pDZGA79CjdYxsBK0LyJqcCjQrh3wXa6iYou8FPfch30xEFsoSaKu0K/aGJ1Nmlg4LetY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehCS-0008SI-Av for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehCS-0000g6-A6 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:45:36 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86emul: support FXSAVE/FXRSTOR Message-Id: Date: Fri, 29 May 2020 15:45:36 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit beb164ea11da62237d723af098f9371f35fe0323 Author: Jan Beulich AuthorDate: Fri May 29 17:35:09 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:35:09 2020 +0200 x86emul: support FXSAVE/FXRSTOR Note that FPU selector handling as well as MXCSR mask saving for now does not honor differences between host and guest visible featuresets. While for Intel operation of the insns with CR4.OSFXSR=0 is implementation dependent, use the easiest solution there: Simply don't look at the bit in the first place. For AMD and alike the behavior is well defined, so it gets handled together with FFXSR. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- tools/tests/x86_emulator/test_x86_emulator.c | 91 ++++++++++++++++ tools/tests/x86_emulator/x86-emulate.c | 7 ++ xen/arch/x86/x86_emulate.c | 2 + xen/arch/x86/x86_emulate/x86_emulate.c | 157 ++++++++++++++++++++++++++- 4 files changed, 256 insertions(+), 1 deletion(-) diff --git a/tools/tests/x86_emulator/test_x86_emulator.c b/tools/tests/x86_emulator/test_x86_emulator.c index a5011d6783..e7de37eaef 100644 --- a/tools/tests/x86_emulator/test_x86_emulator.c +++ b/tools/tests/x86_emulator/test_x86_emulator.c @@ -767,6 +767,12 @@ static void zap_fpsel(unsigned int *env, bool is_32bit) } } +static void zap_xfpsel(unsigned int *env) +{ + env[3] &= ~0xffff; + env[5] &= ~0xffff; +} + #ifdef __x86_64__ # define STKVAL_DISP 64 static const struct { @@ -2517,6 +2523,91 @@ int main(int argc, char **argv) else printf("skipped\n"); + printf("%-40s", "Testing fxsave 4(%ecx)..."); + if ( stack_exec && cpu_has_fxsr ) + { + const uint16_t nine = 9; + + memset(res + 0x80, 0xcc, 0x400); + if ( cpu_has_sse2 ) + asm volatile ( "pcmpeqd %xmm7, %xmm7\n\t" + "pxor %xmm6, %xmm6\n\t" + "psubw %xmm7, %xmm6" ); + asm volatile ( "fninit\n\t" + "fld1\n\t" + "fidivs %1\n\t" + "fxsave %0" + : "=m" (res[0x100]) : "m" (nine) : "memory" ); + zap_xfpsel(&res[0x100]); + instr[0] = 0x0f; instr[1] = 0xae; instr[2] = 0x41; instr[3] = 0x04; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 0x7f); + memset(res + 0x100 + 0x74, 0x33, 0x30); + memset(res + 0x80 + 0x74, 0x33, 0x30); + rc = x86_emulate(&ctxt, &emulops); + zap_xfpsel(&res[0x80]); + if ( (rc != X86EMUL_OKAY) || + memcmp(res + 0x80, res + 0x100, 0x200) || + (regs.eip != (unsigned long)&instr[4]) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + + printf("%-40s", "Testing fxrstor -4(%ecx)..."); + if ( stack_exec && cpu_has_fxsr ) + { + const uint16_t eleven = 11; + + memset(res + 0x80, 0xcc, 0x400); + asm volatile ( "fxsave %0" : "=m" (res[0x80]) :: "memory" ); + zap_xfpsel(&res[0x80]); + if ( cpu_has_sse2 ) + asm volatile ( "pxor %xmm7, %xmm6\n\t" + "pxor %xmm7, %xmm3\n\t" + "pxor %xmm7, %xmm0\n\t" + "pxor %xmm7, %xmm7" ); + asm volatile ( "fninit\n\t" + "fld1\n\t" + "fidivs %0\n\t" + :: "m" (eleven) ); + instr[0] = 0x0f; instr[1] = 0xae; instr[2] = 0x49; instr[3] = 0xfc; + regs.eip = (unsigned long)&instr[0]; + regs.ecx = (unsigned long)(res + 0x81); + rc = x86_emulate(&ctxt, &emulops); + asm volatile ( "fxsave %0" : "=m" (res[0x100]) :: "memory" ); + if ( (rc != X86EMUL_OKAY) || + memcmp(res + 0x100, res + 0x80, 0x200) || + (regs.eip != (unsigned long)&instr[4]) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); + +#ifdef __x86_64__ + printf("%-40s", "Testing fxsaveq 8(%edx)..."); + if ( stack_exec && cpu_has_fxsr ) + { + memset(res + 0x80, 0xcc, 0x400); + asm volatile ( "fxsaveq %0" : "=m" (res[0x100]) :: "memory" ); + instr[0] = 0x48; instr[1] = 0x0f; instr[2] = 0xae; instr[3] = 0x42; instr[4] = 0x08; + regs.eip = (unsigned long)&instr[0]; + regs.edx = (unsigned long)(res + 0x7e); + memset(res + 0x100 + 0x74, 0x33, 0x30); + memset(res + 0x80 + 0x74, 0x33, 0x30); + rc = x86_emulate(&ctxt, &emulops); + if ( (rc != X86EMUL_OKAY) || + memcmp(res + 0x80, res + 0x100, 0x200) || + (regs.eip != (unsigned long)&instr[5]) ) + goto fail; + printf("okay\n"); + } + else + printf("skipped\n"); +#endif + printf("%-40s", "Testing movq %mm3,(%ecx)..."); if ( stack_exec && cpu_has_mmx ) { diff --git a/tools/tests/x86_emulator/x86-emulate.c b/tools/tests/x86_emulator/x86-emulate.c index 82c7db4651..572989078a 100644 --- a/tools/tests/x86_emulator/x86-emulate.c +++ b/tools/tests/x86_emulator/x86-emulate.c @@ -36,6 +36,13 @@ struct cpuid_policy cp; static char fpu_save_area[4096] __attribute__((__aligned__((64)))); static bool use_xsave; +/* + * Re-use the area above also as scratch space for the emulator itself. + * (When debugging the emulator, care needs to be taken when inserting + * printf() or alike function calls into regions using this.) + */ +#define FXSAVE_AREA ((struct x86_fxsr *)fpu_save_area) + void emul_save_fpu_state(void) { if ( use_xsave ) diff --git a/xen/arch/x86/x86_emulate.c b/xen/arch/x86/x86_emulate.c index 33516f4e5d..1e082e6f3b 100644 --- a/xen/arch/x86/x86_emulate.c +++ b/xen/arch/x86/x86_emulate.c @@ -43,6 +43,8 @@ } \ }) +#define FXSAVE_AREA current->arch.fpu_ctxt + #ifndef CONFIG_HVM # define X86EMUL_NO_FPU # define X86EMUL_NO_MMX diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c index 725f0b8b3e..84bb8e0c9b 100644 --- a/xen/arch/x86/x86_emulate/x86_emulate.c +++ b/xen/arch/x86/x86_emulate/x86_emulate.c @@ -859,6 +859,11 @@ struct x86_emulate_state { #ifndef X86EMUL_NO_FPU blk_fld, /* FLDENV, FRSTOR */ blk_fst, /* FNSTENV, FNSAVE */ +#endif +#if !defined(X86EMUL_NO_FPU) || !defined(X86EMUL_NO_MMX) || \ + !defined(X86EMUL_NO_SIMD) + blk_fxrstor, + blk_fxsave, #endif blk_movdir, } blk; @@ -953,6 +958,29 @@ typedef union { uint32_t data32[16]; } mmval_t; +struct x86_fxsr { + uint16_t fcw; + uint16_t fsw; + uint8_t ftw, :8; + uint16_t fop; + union { + struct { + uint32_t offs; + uint16_t sel, :16; + }; + uint64_t addr; + } fip, fdp; + uint32_t mxcsr; + uint32_t mxcsr_mask; + struct { + uint8_t data[10]; + uint16_t :16, :16, :16; + } fpreg[8]; + uint64_t __attribute__ ((aligned(16))) xmm[16][2]; + uint64_t rsvd[6]; + uint64_t avl[6]; +}; + /* * While proper alignment gets specified above, this doesn't get honored by * the compiler for automatic variables. Use this helper to instantiate a @@ -1910,6 +1938,7 @@ amd_like(const struct x86_emulate_ctxt *ctxt) #define vcpu_has_cmov() (ctxt->cpuid->basic.cmov) #define vcpu_has_clflush() (ctxt->cpuid->basic.clflush) #define vcpu_has_mmx() (ctxt->cpuid->basic.mmx) +#define vcpu_has_fxsr() (ctxt->cpuid->basic.fxsr) #define vcpu_has_sse() (ctxt->cpuid->basic.sse) #define vcpu_has_sse2() (ctxt->cpuid->basic.sse2) #define vcpu_has_sse3() (ctxt->cpuid->basic.sse3) @@ -8148,6 +8177,49 @@ x86_emulate( case X86EMUL_OPC(0x0f, 0xae): case X86EMUL_OPC_66(0x0f, 0xae): /* Grp15 */ switch ( modrm_reg & 7 ) { +#if !defined(X86EMUL_NO_FPU) || !defined(X86EMUL_NO_MMX) || \ + !defined(X86EMUL_NO_SIMD) + case 0: /* fxsave */ + case 1: /* fxrstor */ + generate_exception_if(vex.pfx, EXC_UD); + vcpu_must_have(fxsr); + generate_exception_if(ea.type != OP_MEM, EXC_UD); + generate_exception_if(!is_aligned(ea.mem.seg, ea.mem.off, 16, + ctxt, ops), + EXC_GP, 0); + fail_if(!ops->blk); + op_bytes = +#ifdef __x86_64__ + !mode_64bit() ? offsetof(struct x86_fxsr, xmm[8]) : +#endif + sizeof(struct x86_fxsr); + if ( amd_like(ctxt) ) + { + /* Assume "normal" operation in case of missing hooks. */ + if ( !ops->read_cr || + ops->read_cr(4, &cr4, ctxt) != X86EMUL_OKAY ) + cr4 = X86_CR4_OSFXSR; + if ( !ops->read_msr || + ops->read_msr(MSR_EFER, &msr_val, ctxt) != X86EMUL_OKAY ) + msr_val = 0; + if ( !(cr4 & X86_CR4_OSFXSR) || + (mode_64bit() && mode_ring0() && (msr_val & EFER_FFXSE)) ) + op_bytes = offsetof(struct x86_fxsr, xmm[0]); + } + /* + * This could also be X86EMUL_FPU_mmx, but it shouldn't be + * X86EMUL_FPU_xmm, as we don't want CR4.OSFXSR checked. + */ + get_fpu(X86EMUL_FPU_fpu); + state->fpu_ctrl = true; + state->blk = modrm_reg & 1 ? blk_fxrstor : blk_fxsave; + if ( (rc = ops->blk(ea.mem.seg, ea.mem.off, NULL, + sizeof(struct x86_fxsr), &_regs.eflags, + state, ctxt)) != X86EMUL_OKAY ) + goto done; + break; +#endif /* X86EMUL_NO_{FPU,MMX,SIMD} */ + #ifndef X86EMUL_NO_SIMD case 2: /* ldmxcsr */ generate_exception_if(vex.pfx, EXC_UD); @@ -11634,6 +11706,8 @@ int x86_emul_blk( struct x86_emulate_state *state, struct x86_emulate_ctxt *ctxt) { + int rc = X86EMUL_OKAY; + switch ( state->blk ) { bool zf; @@ -11852,6 +11926,86 @@ int x86_emul_blk( #endif /* X86EMUL_NO_FPU */ +#if !defined(X86EMUL_NO_FPU) || !defined(X86EMUL_NO_MMX) || \ + !defined(X86EMUL_NO_SIMD) + + case blk_fxrstor: + { + struct x86_fxsr *fxsr = FXSAVE_AREA; + + ASSERT(!data); + ASSERT(bytes == sizeof(*fxsr)); + ASSERT(state->op_bytes <= bytes); + + if ( state->op_bytes < sizeof(*fxsr) ) + { + if ( state->rex_prefix & REX_W ) + { + /* + * The only way to force fxsaveq on a wide range of gas + * versions. On older versions the rex64 prefix works only if + * we force an addressing mode that doesn't require extended + * registers. + */ + asm volatile ( ".byte 0x48; fxsave (%1)" + : "=m" (*fxsr) : "R" (fxsr) ); + } + else + asm volatile ( "fxsave %0" : "=m" (*fxsr) ); + } + + /* + * Don't chance the reserved or available ranges to contain any + * data FXRSTOR may actually consume in some way: Copy only the + * defined portion, and zero the rest. + */ + memcpy(fxsr, ptr, min(state->op_bytes, + (unsigned int)offsetof(struct x86_fxsr, rsvd))); + memset(fxsr->rsvd, 0, sizeof(*fxsr) - offsetof(struct x86_fxsr, rsvd)); + + generate_exception_if(fxsr->mxcsr & ~mxcsr_mask, EXC_GP, 0); + + if ( state->rex_prefix & REX_W ) + { + /* See above for why operand/constraints are this way. */ + asm volatile ( ".byte 0x48; fxrstor (%1)" + :: "m" (*fxsr), "R" (fxsr) ); + } + else + asm volatile ( "fxrstor %0" :: "m" (*fxsr) ); + break; + } + + case blk_fxsave: + { + struct x86_fxsr *fxsr = FXSAVE_AREA; + + ASSERT(!data); + ASSERT(bytes == sizeof(*fxsr)); + ASSERT(state->op_bytes <= bytes); + + if ( state->op_bytes < sizeof(*fxsr) ) + /* Don't chance consuming uninitialized data. */ + memset(fxsr, 0, state->op_bytes); + else + fxsr = ptr; + + if ( state->rex_prefix & REX_W ) + { + /* See above for why operand/constraints are this way. */ + asm volatile ( ".byte 0x48; fxsave (%1)" + : "=m" (*fxsr) : "R" (fxsr) ); + } + else + asm volatile ( "fxsave %0" : "=m" (*fxsr) ); + + if ( fxsr != ptr ) /* i.e. state->op_bytes < sizeof(*fxsr) */ + memcpy(ptr, fxsr, state->op_bytes); + break; + } + +#endif /* X86EMUL_NO_{FPU,MMX,SIMD} */ + case blk_movdir: switch ( bytes ) { @@ -11905,7 +12059,8 @@ int x86_emul_blk( return X86EMUL_UNHANDLEABLE; } - return X86EMUL_OKAY; + done: + return rc; } static void __init __maybe_unused build_assertions(void) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:55:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:55:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehLe-00027i-Hz; Fri, 29 May 2020 15:55:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehLd-00027c-E7 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:55:05 +0000 X-Inumbo-ID: c329aade-a1c4-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c329aade-a1c4-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 15:55:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=WxBV9pIvqT6RrFcd+9uaE5qXISSPuM/aLbqS7+/s9hg=; b=P6bo3AbJrplbEiM7tZTSZQhTUI eEC91Ma3BzL0lc0GsBjreyRCawmhp5/smZNyHQ2MNRKqt8TmO9+IvQUrbr6d21i7fEKLsWaV24tkB Du4HypGepp46SwwhjcaJpOSWGQZCCcyqq9CN72itiZ/VXNjEkgzLlIcqnEvOxg6AUajM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehLc-0000Er-Og for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehLc-0001N1-Nq for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools: fix Rules.mk library make variables Message-Id: Date: Fri, 29 May 2020 15:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 669d48afc4ec2215ea82e7174bf77aa8503ea20b Author: Juergen Gross AuthorDate: Fri May 29 11:29:53 2020 +0100 Commit: Ian Jackson CommitDate: Fri May 29 16:51:29 2020 +0100 tools: fix Rules.mk library make variables Both SHDEPS_libxendevicemodel and SHDEPS_libxenhypfs have a bug by adding $(SHLIB_xencall) instead of $(SHLIB_libxencall). The former seems not to have any negative impact, probably because it is not used anywhere in Xen without the correct $(SHLIB_libxencall) being used, too. Fixes: 86234eafb95295 ("libs: add libxenhypfs") Signed-off-by: Juergen Gross Acked-by: Juergen Gross --- tools/Rules.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index ac2b0115ec..5ed5664bf7 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -128,12 +128,12 @@ LDLIBS_libxenforeignmemory = $(SHDEPS_libxenforeignmemory) $(XEN_LIBXENFOREIGNME SHLIB_libxenforeignmemory = $(SHDEPS_libxenforeignmemory) -Wl,-rpath-link=$(XEN_LIBXENFOREIGNMEMORY) CFLAGS_libxendevicemodel = -I$(XEN_LIBXENDEVICEMODEL)/include $(CFLAGS_xeninclude) -SHDEPS_libxendevicemodel = $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) $(SHLIB_xencall) +SHDEPS_libxendevicemodel = $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) $(SHLIB_libxencall) LDLIBS_libxendevicemodel = $(SHDEPS_libxendevicemodel) $(XEN_LIBXENDEVICEMODEL)/libxendevicemodel$(libextension) SHLIB_libxendevicemodel = $(SHDEPS_libxendevicemodel) -Wl,-rpath-link=$(XEN_LIBXENDEVICEMODEL) CFLAGS_libxenhypfs = -I$(XEN_LIBXENHYPFS)/include $(CFLAGS_xeninclude) -SHDEPS_libxenhypfs = $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) $(SHLIB_xencall) +SHDEPS_libxenhypfs = $(SHLIB_libxentoollog) $(SHLIB_libxentoolcore) $(SHLIB_libxencall) LDLIBS_libxenhypfs = $(SHDEPS_libxenhypfs) $(XEN_LIBXENHYPFS)/libxenhypfs$(libextension) SHLIB_libxenhypfs = $(SHDEPS_libxenhypfs) -Wl,-rpath-link=$(XEN_LIBXENHYPFS) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 15:55:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 15:55:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehLq-00028d-Ji; Fri, 29 May 2020 15:55:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehLo-00028R-Pu for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:55:16 +0000 X-Inumbo-ID: c92d99e0-a1c4-11ea-a8dc-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c92d99e0-a1c4-11ea-a8dc-12813bfff9fa; Fri, 29 May 2020 15:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=et1VMy/7AprcZAobTVj1ipAVDG3zi4FNcH7aJQrJf9M=; b=PUxOkFTBWPxYGSNG3cCc1ZPNej Sz40pEg60zE2XBx6VlE+1D/mb3ywH3gd4FNJTv7cC7tFQlMf+X63T97oOzS0JT9pQdq1f9SqACuHc h61+KtSluXXkMNc2I/ukC0/7m5qQvlLg/30bG618GFZG3s+VvBcQAaYNW0dw8NjcVuX8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehLm-0000Fh-RY for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:55:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehLm-0001Nw-Qd for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 15:55:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] clang: don't define nocall Message-Id: Date: Fri, 29 May 2020 15:55:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9164e93203979755bfa8bf81a1e8e9f8125d4414 Author: Roger Pau Monné AuthorDate: Fri May 29 17:52:06 2020 +0200 Commit: Jan Beulich CommitDate: Fri May 29 17:52:06 2020 +0200 clang: don't define nocall Clang doesn't support attribute error, and the possible equivalents like diagnose_if don't seem to work well in this case as they trigger when when the function is not called (just by being used by the APPEND_CALL macro). Define nocall to a noop on clang until a proper solution can be found. Signed-off-by: Roger Pau Monné Acked-by: Julien Grall [jb: error -> __error__] Acked-by: Jan Beulich --- xen/include/xen/compiler.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index c22439b7a4..c0e0ee9f27 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -20,7 +20,11 @@ #define __weak __attribute__((__weak__)) -#define nocall __attribute__((error("Nonstandard ABI"))) +#if !defined(__clang__) +# define nocall __attribute__((__error__("Nonstandard ABI"))) +#else +# define nocall +#endif #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 16:11:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 16:11:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehb9-0004mk-KL; Fri, 29 May 2020 16:11:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehb8-0004mf-0d for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 16:11:06 +0000 X-Inumbo-ID: ff6cf2a6-a1c6-11ea-a8e7-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ff6cf2a6-a1c6-11ea-a8e7-12813bfff9fa; Fri, 29 May 2020 16:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TDma5ObV0Hk5SU9DLdln3sDKTbLmgZZTSoVDrHdjhNU=; b=tmSkoghYDqtlTtNyE4qF63Tr24 NfTwn/4Iq29yoUBOz58DCUUYtawHfDDxDC6Ot1JgixkxonJGvy4pBZbZBGbM9DEkoLbkp4wWDn32U PjKHvUi16CNg4wrEzO890vQHyG+j++kSpR14WplXW0kiCwmyanCNvvZ/JAzLYHpn2WXo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehb6-00019O-QU for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 16:11:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehb6-0002kq-Pf for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 16:11:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] docs: update xenstore-migration.md Message-Id: Date: Fri, 29 May 2020 16:11:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 51f9df5c19f2b8a780aa2547cdf3d20736bfddcc Author: Juergen Gross AuthorDate: Fri May 29 12:37:09 2020 +0100 Commit: Ian Jackson CommitDate: Fri May 29 17:00:50 2020 +0100 docs: update xenstore-migration.md Update connection record details: - make flags common for sockets and domains (makes it easier to have a C union for conn-spec) - add pending incoming data (needed for handling partially read requests when doing live update) - add partial response length (needed for proper split to individual responses after live update) Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant --- docs/designs/xenstore-migration.md | 72 ++++++++++++++++++++++---------------- 1 file changed, 41 insertions(+), 31 deletions(-) diff --git a/docs/designs/xenstore-migration.md b/docs/designs/xenstore-migration.md index 34a2afd17e..2ce2c836f5 100644 --- a/docs/designs/xenstore-migration.md +++ b/docs/designs/xenstore-migration.md @@ -147,43 +147,60 @@ the domain being migrated. ``` 0 1 2 3 4 5 6 7 octet +-------+-------+-------+-------+-------+-------+-------+-------+ -| conn-id | conn-type | conn-spec +| conn-id | conn-type | flags | ++-------------------------------+---------------+---------------+ +| conn-spec ... -+-------------------------------+-------------------------------+ -| data-len | data -+-------------------------------+ ++---------------+---------------+-------------------------------+ +| in-data-len | out-resp-len | out-data-len | ++---------------+---------------+-------------------------------+ +| data ... ``` -| Field | Description | -|-------------|-------------------------------------------------| -| `conn-id` | A non-zero number used to identify this | -| | connection in subsequent connection-specific | -| | records | -| | | -| `conn-type` | 0x0000: shared ring | -| | 0x0001: socket | -| | 0x0002 - 0xFFFF: reserved for future use | -| | | -| `conn-spec` | See below | -| | | -| `data-len` | The length (in octets) of any pending data not | -| | yet written to the connection | -| | | -| `data` | Pending data (may be empty) | +| Field | Description | +|----------------|----------------------------------------------| +| `conn-id` | A non-zero number used to identify this | +| | connection in subsequent connection-specific | +| | records | +| | | +| `conn-type` | 0x0000: shared ring | +| | 0x0001: socket | +| | 0x0002 - 0xFFFF: reserved for future use | +| | | +| `flags` | A bit-wise OR of: | +| | 0001: read-only | +| | | +| `conn-spec` | See below | +| | | +| `in-data-len` | The length (in octets) of any data read | +| | from the connection not yet processed | +| | | +| `out-resp-len` | The length (in octets) of a partial response | +| | not yet written to the connection | +| | | +| `out-data-len` | The length (in octets) of any pending data | +| | not yet written to the connection, including | +| | a partial response (see `out-resp-len`) | +| | | +| `data` | Pending data: first in-data-len octets of | +| | read data, then out-data-len octets of | +| | written data (any of both may be empty) | -The format of `conn-spec` is dependent upon `conn-type`. +In case of live update the connection record for the connection via which +the live update command was issued will contain the response for the live +update command in the pending not yet written data. \pagebreak +The format of `conn-spec` is dependent upon `conn-type`. + For `shared ring` connections it is as follows: ``` 0 1 2 3 4 5 6 7 octet - +-------+-------+ - | flags | +---------------+---------------+---------------+---------------+ | domid | tdomid | evtchn | +-------------------------------+-------------------------------+ @@ -198,8 +215,6 @@ For `shared ring` connections it is as follows: | | it has been subject to an SET_TARGET | | | operation [2] or DOMID_INVALID [3] otherwise | | | | -| `flags` | Must be zero | -| | | | `evtchn` | The port number of the interdomain channel used | | | by `domid` to communicate with xenstored | | | | @@ -211,8 +226,6 @@ For `socket` connections it is as follows: ``` - +-------+-------+ - | flags | +---------------+---------------+---------------+---------------+ | socket-fd | pad | +-------------------------------+-------------------------------+ @@ -221,9 +234,6 @@ For `socket` connections it is as follows: | Field | Description | |-------------|-------------------------------------------------| -| `flags` | A bit-wise OR of: | -| | 0001: read-only | -| | | | `socket-fd` | The file descriptor of the connected socket | This type of connection is only relevant for live update, where the xenstored @@ -398,4 +408,4 @@ explanation of node permissions. [3] See https://xenbits.xen.org/gitweb/?p=xen.git;a=blob;f=xen/include/public/xen.h;hb=HEAD#l612 -[4] https://wiki.xen.org/wiki/XenBus \ No newline at end of file +[4] https://wiki.xen.org/wiki/XenBus -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 16:33:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 16:33:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehwQ-0007Kc-DR; Fri, 29 May 2020 16:33:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehwP-0007KQ-Hb for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 16:33:05 +0000 X-Inumbo-ID: 11ffd836-a1ca-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 11ffd836-a1ca-11ea-8993-bc764e2007e4; Fri, 29 May 2020 16:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ER6jewgY652lm77dWoFzcbJGGFeqP3kGEgJYIDwA/wQ=; b=vTz5M8ghYUatOrhkdf4nvpRkKZ hyVzcix194AuxFdZ0s7SzZgx2FnTgWkMwZE8mE9yO7KoVIcKKhdRi+8XDlpVglq/g7Mo4LxSShB82 +0pouAG/SOuJR5zmkQUyrkCBKbcn5rmq3q++UdlYs+daZl0I72u2BHxv6E5uiCCOqZDk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jehwO-0001e6-Ge for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 16:33:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jehwO-0004Hg-Fc for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 16:33:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxl: fix setting altp2m param broken by 1e9bc407cf0 Message-Id: Date: Fri, 29 May 2020 16:33:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7582bbc14cbae56a732d83b916b60bf7c4d6d690 Author: Tamas K Lengyel AuthorDate: Fri May 29 17:22:34 2020 +0100 Commit: Ian Jackson CommitDate: Fri May 29 17:31:12 2020 +0100 tools/libxl: fix setting altp2m param broken by 1e9bc407cf0 The patch 1e9bc407cf0 mistakenly converted the altp2m config option to a boolean. This is incorrect and breaks external-only usecases of altp2m that is set with a value of 2. Signed-off-by: Tamas K Lengyel Reviewed-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxl/libxl_x86.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c index f8bc828e62..e57f63282e 100644 --- a/tools/libxl/libxl_x86.c +++ b/tools/libxl/libxl_x86.c @@ -391,7 +391,7 @@ static int hvm_set_conf_params(libxl__gc *gc, uint32_t domid, libxl_ctx *ctx = libxl__gc_owner(gc); xc_interface *xch = ctx->xch; int ret = ERROR_FAIL; - bool altp2m = info->altp2m; + unsigned int altp2m = info->altp2m; switch(info->type) { case LIBXL_DOMAIN_TYPE_HVM: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:33:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisU-0004pi-KM; Fri, 29 May 2020 17:33:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisU-0004pd-26 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:06 +0000 X-Inumbo-ID: 741e36ae-a1d2-11ea-a8f4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 741e36ae-a1d2-11ea-a8f4-12813bfff9fa; Fri, 29 May 2020 17:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=c8NNeHDoGr7VP5g01oje4hLDXq49GCubEGtP/OeNU0E=; b=zgNgkHndJcq/08byrmI311OOja cEVFmlh9HuTe0H2NkIhhFnsH1iAVZ8ASDuPdRDN0fTD7Zo1OopRT/Yo7GJbNh7AaJjOdpbjd0fvqs CUU4awYPJZskh18qJOS9rCUMZgCaUA6bN9nvu/egl+C/WHtdiME4nq14p/dv3EGqEWIM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisT-0002sj-2X for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeisT-0000Vx-1S for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/migration: Drop IHDR_VERSION constant from libxc and python Message-Id: Date: Fri, 29 May 2020 17:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7bac300b42a407cb9f4c07431997267c5264cbc1 Author: Andrew Cooper AuthorDate: Mon Dec 16 18:53:02 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 tools/migration: Drop IHDR_VERSION constant from libxc and python Migration v3 is in the process of being introduced, meaning that the code has to cope with both versions. Use an explicit 2 for now. For the verify-stream-v2 and convert-legacy-stream scripts, update text to say "v2 (or later)". What matters is the distinction vs legacy streams. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/xc_sr_restore.c | 6 +++--- tools/libxc/xc_sr_save.c | 2 +- tools/libxc/xc_sr_stream_format.h | 1 - tools/python/scripts/convert-legacy-stream | 6 +++--- tools/python/scripts/verify-stream-v2 | 2 +- tools/python/xen/migration/libxc.py | 9 ++++----- 6 files changed, 12 insertions(+), 14 deletions(-) diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 5e31908ca8..dc2ffcf855 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -35,10 +35,10 @@ static int read_headers(struct xc_sr_context *ctx) return -1; } - if ( ihdr.version != IHDR_VERSION ) + if ( ihdr.version != 2 ) { - ERROR("Invalid Version: Expected %d, Got %d", - IHDR_VERSION, ihdr.version); + ERROR("Invalid Version: Expected 2, Got %d", + ihdr.version); return -1; } diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 6ba6623ff3..02e140b300 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -13,7 +13,7 @@ static int write_headers(struct xc_sr_context *ctx, uint16_t guest_type) struct xc_sr_ihdr ihdr = { .marker = IHDR_MARKER, .id = htonl(IHDR_ID), - .version = htonl(IHDR_VERSION), + .version = htonl(2), .options = htons(IHDR_OPT_LITTLE_ENDIAN), }; struct xc_sr_dhdr dhdr = { diff --git a/tools/libxc/xc_sr_stream_format.h b/tools/libxc/xc_sr_stream_format.h index 37a7da6eab..ae7c0de393 100644 --- a/tools/libxc/xc_sr_stream_format.h +++ b/tools/libxc/xc_sr_stream_format.h @@ -23,7 +23,6 @@ struct xc_sr_ihdr #define IHDR_MARKER 0xffffffffffffffffULL #define IHDR_ID 0x58454E46U -#define IHDR_VERSION 2 #define _IHDR_OPT_ENDIAN 0 #define IHDR_OPT_LITTLE_ENDIAN (0 << _IHDR_OPT_ENDIAN) diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index 2922fb3185..02a194178f 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -79,7 +79,7 @@ def write_libxc_ihdr(): stream_write(pack(libxc.IHDR_FORMAT, libxc.IHDR_MARKER, # Marker libxc.IHDR_IDENT, # Ident - libxc.IHDR_VERSION, # Version + 2, # Version libxc.IHDR_OPT_LE, # Options 0, 0)) # Reserved @@ -632,13 +632,13 @@ def main(): usage = ("%prog [options] -i INPUT -o OUTPUT" " -w WIDTH -g GUEST"), description = - "Convert a legacy stream to a v2 stream") + "Convert a legacy stream to a v2 (or later) stream") # Required options parser.add_option("-i", "--in", dest = "fin", metavar = "", help = "Legacy input to convert") parser.add_option("-o", "--out", dest = "fout", metavar = "", - help = "v2 format output") + help = "v2 (or later) format output") parser.add_option("-w", "--width", dest = "twidth", metavar = "<32/64>", choices = ["32", "64"], help = "Legacy toolstack bitness") diff --git a/tools/python/scripts/verify-stream-v2 b/tools/python/scripts/verify-stream-v2 index 8bac04d566..fe82b86c11 100755 --- a/tools/python/scripts/verify-stream-v2 +++ b/tools/python/scripts/verify-stream-v2 @@ -108,7 +108,7 @@ def main(): parser = OptionParser(usage = "%prog [options]", description = - "Verify a stream according to the v2 spec") + "Verify a stream according to the v2 (or later) spec") # Optional options parser.add_option("-i", "--in", dest = "fin", metavar = "", diff --git a/tools/python/xen/migration/libxc.py b/tools/python/xen/migration/libxc.py index 8a800df980..63b3558029 100644 --- a/tools/python/xen/migration/libxc.py +++ b/tools/python/xen/migration/libxc.py @@ -19,7 +19,6 @@ IHDR_FORMAT = "!QIIHHI" IHDR_MARKER = 0xffffffffffffffff IHDR_IDENT = 0x58454E46 # "XENF" in ASCII -IHDR_VERSION = 2 IHDR_OPT_BIT_ENDIAN = 0 IHDR_OPT_LE = (0 << IHDR_OPT_BIT_ENDIAN) @@ -113,7 +112,7 @@ HVM_PARAMS_ENTRY_FORMAT = "QQ" HVM_PARAMS_FORMAT = "II" class VerifyLibxc(VerifyBase): - """ Verify a Libxc v2 stream """ + """ Verify a Libxc v2 (or later) stream """ def __init__(self, info, read): VerifyBase.__init__(self, info, read) @@ -144,9 +143,9 @@ class VerifyLibxc(VerifyBase): raise StreamError("Bad image id: Expected 0x%x, got 0x%x" % (IHDR_IDENT, ident)) - if version != IHDR_VERSION: - raise StreamError("Unknown image version: Expected %d, got %d" % - (IHDR_VERSION, version)) + if version != 2: + raise StreamError("Unknown image version: Expected 2, got %d" % + (version, )) if options & IHDR_OPT_RESZ_MASK: raise StreamError("Reserved bits set in image options field: 0x%x" % -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:33:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:33:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeise-0004qW-NT; Fri, 29 May 2020 17:33:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeise-0004qR-4H for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:16 +0000 X-Inumbo-ID: 7a22cc0e-a1d2-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 7a22cc0e-a1d2-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 17:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=nBUQjJtRF5H1x3ns7qYL4F/A/euox1mUpVNhIm+TG3Y=; b=kWZmHempM2J82y1BFhCrqHmFzI nCiS2NquAyX/VKzDxcwd3fr9apoX6FA23xdZHA4ZvQiiaGI96RzOYmzXcbNVcEOJxvmt5789d3WWE h36OVDlu6hS16Qtvd9XFmS8u2u7OqWxs1WGSShfnMLjuBrFcjbxhYKGKw9zz+l9Ncpq8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisd-0002tU-5z for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeisd-0000X3-4t for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] docs/migration Specify migration v3 and STATIC_DATA_END Message-Id: Date: Fri, 29 May 2020 17:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6f71b5b150615ad97405605596af658697b05a00 Author: Andrew Cooper AuthorDate: Thu Dec 5 15:57:13 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 docs/migration Specify migration v3 and STATIC_DATA_END Migration data can be split into two parts - that which is invariant of guest execution, and that which is not. Separate these two with the STATIC_DATA_END record. The short term, we want to move the x86 CPU Policy data into the stream. In the longer term, we want to provisionally send the static data only to the destination as a more robust compatibility check. In both cases, we will want a callback into the higher level toolstack. Mandate the presence of the STATIC_DATA_END record, and declare this v3, along with instructions for how to compatibly interpret a v2 stream. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- docs/specs/libxc-migration-stream.pandoc | 39 +++++++++++++++++++++++++++++--- tools/libxc/xc_sr_common.c | 1 + tools/libxc/xc_sr_stream_format.h | 1 + tools/python/xen/migration/libxc.py | 2 ++ 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/docs/specs/libxc-migration-stream.pandoc b/docs/specs/libxc-migration-stream.pandoc index 89705c9207..346d243175 100644 --- a/docs/specs/libxc-migration-stream.pandoc +++ b/docs/specs/libxc-migration-stream.pandoc @@ -127,7 +127,7 @@ marker 0xFFFFFFFFFFFFFFFF. id 0x58454E46 ("XENF" in ASCII). -version 0x00000002. The version of this specification. +version 0x00000003. The version of this specification. options bit 0: Endianness. 0 = little-endian, 1 = big-endian. @@ -620,6 +620,21 @@ The count of pfns is: record->length/sizeof(uint64_t). \clearpage +STATIC_DATA_END +--------------- + +A static data end record marks the end of the static state. I.e. state which +is invariant of guest execution. + + + 0 1 2 3 4 5 6 7 octet + +-------------------------------------------------+ + +The end record contains no fields; its body_length is 0. + +\clearpage + + Layout ====== @@ -639,7 +654,9 @@ A typical save record for an x86 PV guest image would look like: * Image header * Domain header -* X86_PV_INFO record +* Static data records: + * X86_PV_INFO record + * STATIC_DATA_END * X86_PV_P2M_FRAMES record * Many PAGE_DATA records * X86_TSC_INFO @@ -667,6 +684,8 @@ A typical save record for an x86 HVM guest image would look like: * Image header * Domain header +* Static data records: + * STATIC_DATA_END * Many PAGE_DATA records * X86_TSC_INFO * HVM_PARAMS @@ -675,9 +694,23 @@ A typical save record for an x86 HVM guest image would look like: HVM_PARAMS must precede HVM_CONTEXT, as certain parameters can affect the validity of architectural state in the context. +Compatibility with older versions +================================= + +v3 compat with v2 +----------------- + +A v3 stream is compatible with a v2 stream, but mandates the presense of a +STATIC_DATA_END record ahead of any memory/register content. This is to ease +the introduction of new static configuration records over time. + +A v3-compatible reciever interpreting a v2 stream should infer the position of +STATIC_DATA_END based on finding the first X86_PV_P2M_FRAMES record (for PV +guests), or PAGE_DATA record (for HVM guests) and behave as if STATIC_DATA_END +had been sent. Legacy Images (x86 only) -======================== +------------------------ Restoring legacy images from older tools shall be handled by translating the legacy format image into this new format. diff --git a/tools/libxc/xc_sr_common.c b/tools/libxc/xc_sr_common.c index dd9a11b4b5..7f22cf0365 100644 --- a/tools/libxc/xc_sr_common.c +++ b/tools/libxc/xc_sr_common.c @@ -36,6 +36,7 @@ static const char *const mandatory_rec_types[] = [REC_TYPE_VERIFY] = "Verify", [REC_TYPE_CHECKPOINT] = "Checkpoint", [REC_TYPE_CHECKPOINT_DIRTY_PFN_LIST] = "Checkpoint dirty pfn list", + [REC_TYPE_STATIC_DATA_END] = "Static data end", }; const char *rec_type_to_str(uint32_t type) diff --git a/tools/libxc/xc_sr_stream_format.h b/tools/libxc/xc_sr_stream_format.h index ae7c0de393..81c9765b0a 100644 --- a/tools/libxc/xc_sr_stream_format.h +++ b/tools/libxc/xc_sr_stream_format.h @@ -73,6 +73,7 @@ struct xc_sr_rhdr #define REC_TYPE_VERIFY 0x0000000dU #define REC_TYPE_CHECKPOINT 0x0000000eU #define REC_TYPE_CHECKPOINT_DIRTY_PFN_LIST 0x0000000fU +#define REC_TYPE_STATIC_DATA_END 0x00000010U #define REC_TYPE_OPTIONAL 0x80000000U diff --git a/tools/python/xen/migration/libxc.py b/tools/python/xen/migration/libxc.py index 63b3558029..d0c4f3527d 100644 --- a/tools/python/xen/migration/libxc.py +++ b/tools/python/xen/migration/libxc.py @@ -56,6 +56,7 @@ REC_TYPE_x86_pv_vcpu_msrs = 0x0000000c REC_TYPE_verify = 0x0000000d REC_TYPE_checkpoint = 0x0000000e REC_TYPE_checkpoint_dirty_pfn_list = 0x0000000f +REC_TYPE_static_data_end = 0x00000010 rec_type_to_str = { REC_TYPE_end : "End", @@ -74,6 +75,7 @@ rec_type_to_str = { REC_TYPE_verify : "Verify", REC_TYPE_checkpoint : "Checkpoint", REC_TYPE_checkpoint_dirty_pfn_list : "Checkpoint dirty pfn list", + REC_TYPE_static_data_end : "Static data end", } # page_data -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:33:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisp-0004ra-P4; Fri, 29 May 2020 17:33:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiso-0004rS-Ry for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:26 +0000 X-Inumbo-ID: 802a2296-a1d2-11ea-a8f4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 802a2296-a1d2-11ea-a8f4-12813bfff9fa; Fri, 29 May 2020 17:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Rq6aI/2+bIxtFPLLAyeyJRd+wwFmKtG21/KgXzG81xc=; b=poisZ9gCCYAK/XXsZnlLWZcQAP UE2WabLYK+ERAXUoYYe0kee8u6xC5s/GH32DSlK3E0yao0yb/w7hN4xa1o2yD66zI+fzrFjLLRbxO mX++9Py7W6L6/mtLtOc/7hqrw/njNXQtqffWo5i9Y16xDOsRFI2CuWD2cPcnphJSWWbg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisn-0002tj-9S for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeisn-0000Y6-85 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] python/migration: Update validation logic to understand a v3 stream Message-Id: Date: Fri, 29 May 2020 17:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 9a0749da8fdd62db1724fb855443dfcc8b6cbe6e Author: Andrew Cooper AuthorDate: Mon Dec 16 19:39:43 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 python/migration: Update validation logic to understand a v3 stream Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/python/xen/migration/libxc.py | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/migration/libxc.py b/tools/python/xen/migration/libxc.py index d0c4f3527d..5fb51b56ac 100644 --- a/tools/python/xen/migration/libxc.py +++ b/tools/python/xen/migration/libxc.py @@ -119,6 +119,7 @@ class VerifyLibxc(VerifyBase): def __init__(self, info, read): VerifyBase.__init__(self, info, read) + self.version = 0 self.squashed_pagedata_records = 0 @@ -145,9 +146,12 @@ class VerifyLibxc(VerifyBase): raise StreamError("Bad image id: Expected 0x%x, got 0x%x" % (IHDR_IDENT, ident)) - if version != 2: - raise StreamError("Unknown image version: Expected 2, got %d" % - (version, )) + if not (2 <= version <= 3): + raise StreamError( + "Unknown image version: Expected 2 <= ver <= 3, got %d" % + (version, )) + + self.version = version if options & IHDR_OPT_RESZ_MASK: raise StreamError("Reserved bits set in image options field: 0x%x" % @@ -164,7 +168,8 @@ class VerifyLibxc(VerifyBase): "Stream is not native endianess - unable to validate") endian = ["little", "big"][options & IHDR_OPT_LE] - self.info("Libxc Image Header: %s endian" % (endian, )) + self.info("Libxc Image Header: Version %d, %s endian" % + (version, endian)) def verify_dhdr(self): @@ -424,6 +429,16 @@ class VerifyLibxc(VerifyBase): raise RecordError("Found checkpoint dirty pfn list record in stream") + def verify_record_static_data_end(self, content): + """ static data end record """ + + if len(content) != 0: + raise RecordError("End record with non-zero length") + + if self.version < 3: + raise RecordError("Static data end record found in v2 stream") + + record_verifiers = { REC_TYPE_end: VerifyLibxc.verify_record_end, @@ -465,4 +480,7 @@ record_verifiers = { VerifyLibxc.verify_record_checkpoint, REC_TYPE_checkpoint_dirty_pfn_list: VerifyLibxc.verify_record_checkpoint_dirty_pfn_list, + + REC_TYPE_static_data_end: + VerifyLibxc.verify_record_static_data_end, } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:33:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:33:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisy-0004sX-QY; Fri, 29 May 2020 17:33:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisy-0004sO-6b for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:36 +0000 X-Inumbo-ID: 86310272-a1d2-11ea-a8f4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 86310272-a1d2-11ea-a8f4-12813bfff9fa; Fri, 29 May 2020 17:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=3xR1lZs3yuC34JnIgws09Tk29wXXHh5bho8w2UernOU=; b=hG+H2KBjSQaZevSNqXWJ3SP3EU Eo+duhp7OIUzWtXoJvmcBuYx+h4W5SFaKBCZmyO+++ioxWK6Tr3kGJQaFE7/lGqkQLrXLzvBqFV8w fCWzjuZz+GFOTL2w78oZ7aZFFryzyhUr7jQ0vPLxAmTouZ96N6H4JWC5I0XGW8cfTxHI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeisx-0002ts-CV for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeisx-0000Yt-Bd for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxc/restore: Support v3 streams and handle STATIC_DATA_END Message-Id: Date: Fri, 29 May 2020 17:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 6501e46ca797d445253ee48974220d939ae9ec4f Author: Andrew Cooper AuthorDate: Mon Dec 16 19:03:14 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 libxc/restore: Support v3 streams and handle STATIC_DATA_END Higher level toolstacks may wish to know when the static data is complete, so introduce a restore_callback for the purpose. No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/include/xenguest.h | 3 +++ tools/libxc/xc_sr_common.h | 3 +++ tools/libxc/xc_sr_restore.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index 19d828a7f2..efd90b0d42 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -139,6 +139,9 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, /* callbacks provided by xc_domain_restore */ struct restore_callbacks { + /* Called once the STATIC_DATA_END record has been received. */ + int (*static_data_done)(void *data); + /* Called after a new checkpoint to suspend the guest. */ int (*suspend)(void *data); diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 5dd51ccb15..ae0ab70f76 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -253,6 +253,9 @@ struct xc_sr_context /* Currently buffering records between a checkpoint */ bool buffer_all_records; + /* Whether a STATIC_DATA_END record has been seen. */ + bool seen_static_data_end; + /* * With Remus/COLO, we buffer the records sent by the primary at checkpoint, * in case the primary will fail, we can recover from the last diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index dc2ffcf855..9c924387ae 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -35,9 +35,9 @@ static int read_headers(struct xc_sr_context *ctx) return -1; } - if ( ihdr.version != 2 ) + if ( ihdr.version < 2 || ihdr.version > 3 ) { - ERROR("Invalid Version: Expected 2, Got %d", + ERROR("Invalid Version: Expected 2 <= ver <= 3, Got %d", ihdr.version); return -1; } @@ -631,6 +631,27 @@ static int buffer_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) return 0; } +static int handle_static_data_end(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + int rc = 0; + + if ( ctx->restore.seen_static_data_end ) + { + ERROR("Multiple STATIC_DATA_END records found"); + return -1; + } + + ctx->restore.seen_static_data_end = true; + + if ( ctx->restore.callbacks->static_data_done && + (rc = ctx->restore.callbacks->static_data_done( + ctx->restore.callbacks->data) != 0) ) + ERROR("static_data_done() callback failed: %d\n", rc); + + return rc; +} + static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) { xc_interface *xch = ctx->xch; @@ -654,6 +675,10 @@ static int process_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) rc = handle_checkpoint(ctx); break; + case REC_TYPE_STATIC_DATA_END: + rc = handle_static_data_end(ctx); + break; + default: rc = ctx->restore.ops.process_record(ctx, rec); break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:33:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:33:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeit9-0004uM-SB; Fri, 29 May 2020 17:33:47 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeit8-0004u5-8p for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:46 +0000 X-Inumbo-ID: 8c33c984-a1d2-11ea-a8f4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8c33c984-a1d2-11ea-a8f4-12813bfff9fa; Fri, 29 May 2020 17:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6l0TfZyQuVOTSRToFGuAQTvA7iTq3skU9yO8lOTAVSM=; b=TvcStmedxdR2uOCw9diHgL9Csa 7ery4zx/vxVqDhccoWiY6mbyZ0ONdgccfWuTXuRUhbjw9KSCpBWtUWP2NeECuNBcACoTxF6mSd2aI LwiVW5k4ITZy5lMeyDYhkqZopPB1+z03VgcCarrYYCGJtjsZOgNjvQb7+8HVhE+6VkoI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeit7-0002u1-Fg for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeit7-0000aL-Em for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxc/restore: STATIC_DATA_END inference for v2 compatibility Message-Id: Date: Fri, 29 May 2020 17:33:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4f8b684117f7e6cc02dfbb21cde15aa431259d2c Author: Andrew Cooper AuthorDate: Mon Dec 16 19:03:14 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 libxc/restore: STATIC_DATA_END inference for v2 compatibility A v3 stream can compatibly read a v2 stream by inferring the position of the STATIC_DATA_END record. v2 compatibility is only needed for x86. No other architectures exist yet, but they will have a minimum of v3 when introduced. The x86 HVM compatibility point being in handle_page_data() (which is common code) is a bit awkward. However, as the two compatibility points are subtly different, and it is (intentionally) not possible to call into arch specific code from common code (except via the ops hooks), use some #ifdef-ary and opencode the check, rather than make handle_page_data() a per-arch helper. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/include/xenguest.h | 2 +- tools/libxc/xc_sr_common.h | 5 ++++- tools/libxc/xc_sr_restore.c | 27 ++++++++++++++++++++++++++- tools/libxc/xc_sr_restore_x86_pv.c | 17 +++++++++++++++++ 4 files changed, 48 insertions(+), 3 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index efd90b0d42..b4df8d0ffe 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -139,7 +139,7 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, /* callbacks provided by xc_domain_restore */ struct restore_callbacks { - /* Called once the STATIC_DATA_END record has been received. */ + /* Called once the STATIC_DATA_END record has been received/inferred. */ int (*static_data_done)(void *data); /* Called after a new checkpoint to suspend the guest. */ diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index ae0ab70f76..51e3d3ee3b 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -253,7 +253,7 @@ struct xc_sr_context /* Currently buffering records between a checkpoint */ bool buffer_all_records; - /* Whether a STATIC_DATA_END record has been seen. */ + /* Whether a STATIC_DATA_END record has been seen/inferred. */ bool seen_static_data_end; /* @@ -428,6 +428,9 @@ int read_record(struct xc_sr_context *ctx, int fd, struct xc_sr_record *rec); int populate_pfns(struct xc_sr_context *ctx, unsigned int count, const xen_pfn_t *original_pfns, const uint32_t *types); +/* Handle a STATIC_DATA_END record. */ +int handle_static_data_end(struct xc_sr_context *ctx); + #endif /* * Local variables: diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index 9c924387ae..bb94cd879d 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -342,6 +342,31 @@ static int handle_page_data(struct xc_sr_context *ctx, struct xc_sr_record *rec) xen_pfn_t *pfns = NULL, pfn; uint32_t *types = NULL, type; + /* + * v2 compatibility only exists for x86 streams. This is a bit of a + * bodge, but it is less bad than duplicating handle_page_data() between + * different architectures. + */ +#if defined(__i386__) || defined(__x86_64__) + /* v2 compat. Infer the position of STATIC_DATA_END. */ + if ( ctx->restore.format_version < 3 && !ctx->restore.seen_static_data_end ) + { + rc = handle_static_data_end(ctx); + if ( rc ) + { + ERROR("Inferred STATIC_DATA_END record failed"); + goto err; + } + rc = -1; + } + + if ( !ctx->restore.seen_static_data_end ) + { + ERROR("No STATIC_DATA_END seen"); + goto err; + } +#endif + if ( rec->length < sizeof(*pages) ) { ERROR("PAGE_DATA record truncated: length %u, min %zu", @@ -631,7 +656,7 @@ static int buffer_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) return 0; } -static int handle_static_data_end(struct xc_sr_context *ctx) +int handle_static_data_end(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; int rc = 0; diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 904ccc462a..0adfcdcdda 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -679,6 +679,23 @@ static int handle_x86_pv_p2m_frames(struct xc_sr_context *ctx, unsigned int start, end, x, fpp = PAGE_SIZE / ctx->x86.pv.width; int rc; + /* v2 compat. Infer the position of STATIC_DATA_END. */ + if ( ctx->restore.format_version < 3 && !ctx->restore.seen_static_data_end ) + { + rc = handle_static_data_end(ctx); + if ( rc ) + { + ERROR("Inferred STATIC_DATA_END record failed"); + return rc; + } + } + + if ( !ctx->restore.seen_static_data_end ) + { + ERROR("No STATIC_DATA_END seen"); + return -1; + } + if ( !ctx->x86.pv.restore.seen_pv_info ) { ERROR("Not yet received X86_PV_INFO record"); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:33:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:33:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitJ-0004vR-To; Fri, 29 May 2020 17:33:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitI-0004vE-FL for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:56 +0000 X-Inumbo-ID: 9237c3c6-a1d2-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 9237c3c6-a1d2-11ea-9947-bc764e2007e4; Fri, 29 May 2020 17:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=um2/+e/883nu85OopuicY4vHtXL3jgQMsPxjzpCuQ6A=; b=rLqiDLd+H0MZn+fEvoi5+bA2ht SXGkCItY7MMTJZpfaRDMDiVJfMQqHRoENzMH57Ic/6DYpM8oYE/zInwK0Zfx4+ooVSii6xAq9kqXU Hp/cUo1mUZamqHiu6HNT00kueWwWBMqeZPwvP+4UiJcVFsQt3tbjJiiMdoJd1AAkfbPU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitH-0002uA-It for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeitH-0000bb-I0 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:33:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxc/save: Write a v3 stream Message-Id: Date: Fri, 29 May 2020 17:33:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit a6a2b9d1eae3e18ee8d9be5da448655ac918a827 Author: Andrew Cooper AuthorDate: Tue Dec 17 12:29:42 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 libxc/save: Write a v3 stream Introduce a new static_data() hook which is responsible for writing out any static data records. The HVM side continues to be a no-op, while the PV side moves write_x86_pv_info() into this earlier hook. The the common code writes out a STATIC_DATA_END record, and the stream version is bumped to 3. Update convert-legacy-stream to write a v3 stream, because this will bypass the compatibly logic in libxc. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/xc_sr_common.h | 10 ++++++++-- tools/libxc/xc_sr_save.c | 20 +++++++++++++++++++- tools/libxc/xc_sr_save_x86_hvm.c | 6 ++++++ tools/libxc/xc_sr_save_x86_pv.c | 10 ++++++---- tools/python/scripts/convert-legacy-stream | 9 ++++++++- 5 files changed, 47 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 51e3d3ee3b..fd7fb67305 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -63,8 +63,14 @@ struct xc_sr_save_ops int (*setup)(struct xc_sr_context *ctx); /** - * Send records which need to be at the start of the stream. This is - * called once, after the Image and Domain headers are written. + * Send static records at the head of the stream. This is called once, + * after the Image and Domain headers are written. + */ + int (*static_data)(struct xc_sr_context *ctx); + + /** + * Send dynamic records which need to be at the start of the stream. This + * is called after the STATIC_DATA_END record is written. */ int (*start_of_stream)(struct xc_sr_context *ctx); diff --git a/tools/libxc/xc_sr_save.c b/tools/libxc/xc_sr_save.c index 02e140b300..80b1d5de1f 100644 --- a/tools/libxc/xc_sr_save.c +++ b/tools/libxc/xc_sr_save.c @@ -13,7 +13,7 @@ static int write_headers(struct xc_sr_context *ctx, uint16_t guest_type) struct xc_sr_ihdr ihdr = { .marker = IHDR_MARKER, .id = htonl(IHDR_ID), - .version = htonl(2), + .version = htonl(3), .options = htons(IHDR_OPT_LITTLE_ENDIAN), }; struct xc_sr_dhdr dhdr = { @@ -54,6 +54,16 @@ static int write_end_record(struct xc_sr_context *ctx) return write_record(ctx, &end); } +/* + * Writes a STATIC_DATA_END record into the stream. + */ +static int write_static_data_end_record(struct xc_sr_context *ctx) +{ + struct xc_sr_record end = { .type = REC_TYPE_STATIC_DATA_END }; + + return write_record(ctx, &end); +} + /* * Writes a CHECKPOINT record into the stream. */ @@ -856,6 +866,14 @@ static int save(struct xc_sr_context *ctx, uint16_t guest_type) if ( rc ) goto err; + rc = ctx->save.ops.static_data(ctx); + if ( rc ) + goto err; + + rc = write_static_data_end_record(ctx); + if ( rc ) + goto err; + rc = ctx->save.ops.start_of_stream(ctx); if ( rc ) goto err; diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index 7d3f3ddb8f..bab9bd2877 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -169,6 +169,11 @@ static int x86_hvm_setup(struct xc_sr_context *ctx) return 0; } +static int x86_hvm_static_data(struct xc_sr_context *ctx) +{ + return 0; +} + static int x86_hvm_start_of_stream(struct xc_sr_context *ctx) { return 0; @@ -227,6 +232,7 @@ struct xc_sr_save_ops save_ops_x86_hvm = .pfn_to_gfn = x86_hvm_pfn_to_gfn, .normalise_page = x86_hvm_normalise_page, .setup = x86_hvm_setup, + .static_data = x86_hvm_static_data, .start_of_stream = x86_hvm_start_of_stream, .start_of_checkpoint = x86_hvm_start_of_checkpoint, .end_of_checkpoint = x86_hvm_end_of_checkpoint, diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c index f3ccf5bb4b..46019d962d 100644 --- a/tools/libxc/xc_sr_save_x86_pv.c +++ b/tools/libxc/xc_sr_save_x86_pv.c @@ -1052,14 +1052,15 @@ static int x86_pv_setup(struct xc_sr_context *ctx) return 0; } +static int x86_pv_static_data(struct xc_sr_context *ctx) +{ + return write_x86_pv_info(ctx); +} + static int x86_pv_start_of_stream(struct xc_sr_context *ctx) { int rc; - rc = write_x86_pv_info(ctx); - if ( rc ) - return rc; - /* * Ideally should be able to change during migration. Currently * corruption will occur if the contents or location of the P2M changes @@ -1126,6 +1127,7 @@ struct xc_sr_save_ops save_ops_x86_pv = .pfn_to_gfn = x86_pv_pfn_to_gfn, .normalise_page = x86_pv_normalise_page, .setup = x86_pv_setup, + .static_data = x86_pv_static_data, .start_of_stream = x86_pv_start_of_stream, .start_of_checkpoint = x86_pv_start_of_checkpoint, .end_of_checkpoint = x86_pv_end_of_checkpoint, diff --git a/tools/python/scripts/convert-legacy-stream b/tools/python/scripts/convert-legacy-stream index 02a194178f..ca93a93848 100755 --- a/tools/python/scripts/convert-legacy-stream +++ b/tools/python/scripts/convert-legacy-stream @@ -79,7 +79,7 @@ def write_libxc_ihdr(): stream_write(pack(libxc.IHDR_FORMAT, libxc.IHDR_MARKER, # Marker libxc.IHDR_IDENT, # Ident - 2, # Version + 3, # Version libxc.IHDR_OPT_LE, # Options 0, 0)) # Reserved @@ -166,6 +166,9 @@ def write_libxc_hvm_params(params): pack(libxc.HVM_PARAMS_FORMAT, len(params) / 2, 0), pack("Q" * len(params), *params)) +def write_libxc_static_data_end(): + write_record(libxc.REC_TYPE_static_data_end) + def write_libxl_end(): write_record(libxl.REC_TYPE_end) @@ -590,6 +593,10 @@ def read_legacy_stream(vm): if pv: read_pv_extended_info(vm) + + write_libxc_static_data_end() + + if pv: read_pv_p2m_frames(vm) read_chunks(vm) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:34:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:34:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitU-0004wg-0t; Fri, 29 May 2020 17:34:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitS-0004wS-As for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:06 +0000 X-Inumbo-ID: 983dc702-a1d2-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 983dc702-a1d2-11ea-9947-bc764e2007e4; Fri, 29 May 2020 17:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=wbI0IhnNJlv4fOwYwoQiZqMo7bgdgnF/vylPCIpvRLM=; b=vc4vn09wwoWJZYROmWxdI03iuN 9upTeJkXLm47/hJ7QHbb4QTfdqhdJh5qLv4odK+B01XzQrmnXs8/HEMPtM/8mtDf6OJqGHqgI4tN0 ZYvLACKKSFQNrzz7zpkGJyfmFjtoN7h9YIGE0UQVyyvpNVbc/SJCitT3VwCA3O6+DXaM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitR-0002uW-Me for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeitR-0000co-L9 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxl: Provide a static_data_done callback for domain restore Message-Id: Date: Fri, 29 May 2020 17:34:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c1a552ec7fcd95a2c5af0da105c58a2773944cd7 Author: Andrew Cooper AuthorDate: Fri Dec 20 11:58:03 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 tools/libxl: Provide a static_data_done callback for domain restore This will be needed shortly to provide backwards compatiblity for migration streams which do not have CPUID information contained within them. No functional change yet. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 12 ++++++++++++ tools/libxl/libxl_save_msgs_gen.pl | 1 + 2 files changed, 13 insertions(+) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 8614a2c241..baed817a96 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1358,6 +1358,7 @@ static void domcreate_bootloader_done(libxl__egc *egc, dcs->srs.dcs = dcs; /* Restore */ + callbacks->static_data_done = libxl__srm_callout_callback_static_data_done; callbacks->restore_results = libxl__srm_callout_callback_restore_results; /* COLO only supports HVM now because it does not work very @@ -1427,6 +1428,17 @@ static void libxl__colo_restore_setup_done(libxl__egc *egc, libxl__stream_read_start(egc, &dcs->srs); } +int libxl__srm_callout_callback_static_data_done(void *user) +{ + libxl__save_helper_state *shs = user; + libxl__domain_create_state *dcs = shs->caller_state; + STATE_AO_GC(dcs->ao); + + /* Nothing to do (yet). */ + + return 0; +} + void libxl__srm_callout_callback_restore_results(xen_pfn_t store_mfn, xen_pfn_t console_mfn, void *user) { diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 831a15e0bb..93dc252370 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -29,6 +29,7 @@ our @msgs = ( [ 'srcxA', "wait_checkpoint", [] ], [ 'scxA', "switch_qemu_logdirty", [qw(uint32_t domid unsigned enable)] ], + [ 'rcxW', "static_data_done", [] ], [ 'rcx', "restore_results", ['xen_pfn_t', 'store_gfn', 'xen_pfn_t', 'console_gfn'] ], [ 'srW', "complete", [qw(int retval -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:34:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:34:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeite-0004xm-2P; Fri, 29 May 2020 17:34:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitc-0004xa-Gd for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:16 +0000 X-Inumbo-ID: 9dd7d02d-a1d2-11ea-a8f4-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9dd7d02d-a1d2-11ea-a8f4-12813bfff9fa; Fri, 29 May 2020 17:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=K7V4ufWx+MqlU7Nfj+eVBWIYLuF/2MRrOcSueWYcCJ0=; b=Z/zFIdrSYR7qJsf0/HuHcPWpQV mN4NF01LaD7YuqK+Y05EbpvUjSEvfl3jjGI16RXXikNE8glK0yo5yFFr+k/GTXcuswblhSL5fc3PD sOVP9piVcPPqcuJt2O8HbxX9J9xgHUKmLGosS/xeiuv85j7JXY4cF5e8flwpMs19+7zo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitb-0002v6-Pq for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeitb-0000eE-P2 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxl: Re-position CPUID handling during domain construction Message-Id: Date: Fri, 29 May 2020 17:34:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 454239acc59cd067867f56e42f2ca910ec98cc56 Author: Andrew Cooper AuthorDate: Thu Jan 2 19:44:36 2020 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 tools/libxl: Re-position CPUID handling during domain construction CPUID handling needs to be earlier in construction. Move it from its current position in libxl__build_post() to libxl__build_pre() for fresh builds, and libxl__srm_callout_callback_static_data_done() for the migration/resume case. Later changes will make the migration/resume case conditional on whether CPUID data was present in the migration stream, and the libxc layer took care of restoring it. No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxl/libxl_create.c | 6 +++++- tools/libxl/libxl_dom.c | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index baed817a96..cc7340c48d 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1433,8 +1433,12 @@ int libxl__srm_callout_callback_static_data_done(void *user) libxl__save_helper_state *shs = user; libxl__domain_create_state *dcs = shs->caller_state; STATE_AO_GC(dcs->ao); + libxl_ctx *ctx = libxl__gc_owner(gc); + + libxl_domain_config *d_config = dcs->guest_config; + libxl_domain_build_info *info = &d_config->b_info; - /* Nothing to do (yet). */ + libxl__cpuid_legacy(ctx, dcs->guest_domid, info); return 0; } diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c index 71cb578923..dd1aff89a3 100644 --- a/tools/libxl/libxl_dom.c +++ b/tools/libxl/libxl_dom.c @@ -387,6 +387,12 @@ int libxl__build_pre(libxl__gc *gc, uint32_t domid, rc = libxl__arch_domain_create(gc, d_config, domid); + /* Construct a CPUID policy, but only for brand new domains. Domains + * being migrated-in/restored have CPUID handled during the + * static_data_done() callback. */ + if (!state->restore) + libxl__cpuid_legacy(ctx, domid, info); + return rc; } @@ -454,8 +460,6 @@ int libxl__build_post(libxl__gc *gc, uint32_t domid, if (rc) return rc; - libxl__cpuid_legacy(ctx, domid, info); - if (info->type == LIBXL_DOMAIN_TYPE_HVM && !libxl_ms_vm_genid_is_zero(&info->u.hvm.ms_vm_genid)) { rc = libxl__ms_vm_genid_set(gc, domid, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:34:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:34:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeito-0004yj-42; Fri, 29 May 2020 17:34:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitm-0004yU-Mo for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:26 +0000 X-Inumbo-ID: a445a54c-a1d2-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a445a54c-a1d2-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 17:34:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DMJLIvFxUXDApMwC4m292ZHvix755tHoIf3P9kgapSo=; b=EIZ+OhqihYd6Oqi0UvaFJ3dvyA 5E3yJcRUNyqWBojLxYikWvt7dBEBnt6lq9vIBakvxGg4MvpyTNa70DzB6srBlpMEaxeXtmNg9/n7m 82lhhv7xmUwbc6wD8OSXQIrN4EVsTs2xFETC7+q+VkJAK1AKveGdRCJ2Yrd6PIY6oCeU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitl-0002vI-So for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeitl-0000fI-S2 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] docs/migration: Specify X86_{CPUID,MSR}_POLICY records Message-Id: Date: Fri, 29 May 2020 17:34:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ddd273d88632a0b20f80c20742d6759ed6b83c8b Author: Andrew Cooper AuthorDate: Tue Dec 17 13:10:04 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 docs/migration: Specify X86_{CPUID,MSR}_POLICY records These two records move blobs from the XEN_DOMCTL_{get,set}_cpu_policy hypercall. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- docs/specs/libxc-migration-stream.pandoc | 42 +++++++++++++++++++++++++++++++ tools/libxc/xc_sr_common.c | 2 ++ tools/libxc/xc_sr_stream_format.h | 2 ++ tools/python/xen/migration/libxc.py | 43 ++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+) diff --git a/docs/specs/libxc-migration-stream.pandoc b/docs/specs/libxc-migration-stream.pandoc index 346d243175..6b0c49e97a 100644 --- a/docs/specs/libxc-migration-stream.pandoc +++ b/docs/specs/libxc-migration-stream.pandoc @@ -634,6 +634,46 @@ The end record contains no fields; its body_length is 0. \clearpage +X86_CPUID_POLICY +---------------- + +CPUID policy content, as accessed by the XEN_DOMCTL_{get,set}_cpu_policy +hypercall sub-ops. + + 0 1 2 3 4 5 6 7 octet + +-------------------------------------------------+ + | CPUID_policy | + ... + +-------------------------------------------------+ + +-------------------------------------------------------------------- +Field Description +------------ --------------------------------------------------- +CPUID_policy Array of xen_cpuid_leaf_t[]'s +-------------------------------------------------------------------- + +\clearpage + +X86_MSR_POLICY +-------------- + +MSR policy content, as accessed by the XEN_DOMCTL_{get,set}_cpu_policy +hypercall sub-ops. + + 0 1 2 3 4 5 6 7 octet + +-------------------------------------------------+ + | MSR_policy | + ... + +-------------------------------------------------+ + +-------------------------------------------------------------------- +Field Description +---------- --------------------------------------------------- +MSR_policy Array of xen_msr_entry_t[]'s +-------------------------------------------------------------------- + +\clearpage + Layout ====== @@ -656,6 +696,7 @@ A typical save record for an x86 PV guest image would look like: * Domain header * Static data records: * X86_PV_INFO record + * X86_{CPUID,MSR}_POLICY * STATIC_DATA_END * X86_PV_P2M_FRAMES record * Many PAGE_DATA records @@ -685,6 +726,7 @@ A typical save record for an x86 HVM guest image would look like: * Image header * Domain header * Static data records: + * X86_{CPUID,MSR}_POLICY * STATIC_DATA_END * Many PAGE_DATA records * X86_TSC_INFO diff --git a/tools/libxc/xc_sr_common.c b/tools/libxc/xc_sr_common.c index 7f22cf0365..7c54b03414 100644 --- a/tools/libxc/xc_sr_common.c +++ b/tools/libxc/xc_sr_common.c @@ -37,6 +37,8 @@ static const char *const mandatory_rec_types[] = [REC_TYPE_CHECKPOINT] = "Checkpoint", [REC_TYPE_CHECKPOINT_DIRTY_PFN_LIST] = "Checkpoint dirty pfn list", [REC_TYPE_STATIC_DATA_END] = "Static data end", + [REC_TYPE_X86_CPUID_POLICY] = "x86 CPUID policy", + [REC_TYPE_X86_MSR_POLICY] = "x86 MSR policy", }; const char *rec_type_to_str(uint32_t type) diff --git a/tools/libxc/xc_sr_stream_format.h b/tools/libxc/xc_sr_stream_format.h index 81c9765b0a..8a0da26f75 100644 --- a/tools/libxc/xc_sr_stream_format.h +++ b/tools/libxc/xc_sr_stream_format.h @@ -74,6 +74,8 @@ struct xc_sr_rhdr #define REC_TYPE_CHECKPOINT 0x0000000eU #define REC_TYPE_CHECKPOINT_DIRTY_PFN_LIST 0x0000000fU #define REC_TYPE_STATIC_DATA_END 0x00000010U +#define REC_TYPE_X86_CPUID_POLICY 0x00000011U +#define REC_TYPE_X86_MSR_POLICY 0x00000012U #define REC_TYPE_OPTIONAL 0x80000000U diff --git a/tools/python/xen/migration/libxc.py b/tools/python/xen/migration/libxc.py index 5fb51b56ac..9881f5ced4 100644 --- a/tools/python/xen/migration/libxc.py +++ b/tools/python/xen/migration/libxc.py @@ -57,6 +57,8 @@ REC_TYPE_verify = 0x0000000d REC_TYPE_checkpoint = 0x0000000e REC_TYPE_checkpoint_dirty_pfn_list = 0x0000000f REC_TYPE_static_data_end = 0x00000010 +REC_TYPE_x86_cpuid_policy = 0x00000011 +REC_TYPE_x86_msr_policy = 0x00000012 rec_type_to_str = { REC_TYPE_end : "End", @@ -76,6 +78,8 @@ rec_type_to_str = { REC_TYPE_checkpoint : "Checkpoint", REC_TYPE_checkpoint_dirty_pfn_list : "Checkpoint dirty pfn list", REC_TYPE_static_data_end : "Static data end", + REC_TYPE_x86_cpuid_policy : "x86 CPUID policy", + REC_TYPE_x86_msr_policy : "x86 MSR policy", } # page_data @@ -113,6 +117,12 @@ X86_TSC_INFO_FORMAT = "IIQII" HVM_PARAMS_ENTRY_FORMAT = "QQ" HVM_PARAMS_FORMAT = "II" +# x86_cpuid_policy => xen_cpuid_leaf_t[] +X86_CPUID_POLICY_FORMAT = "IIIIII" + +# x86_msr_policy => xen_msr_entry_t[] +X86_MSR_POLICY_FORMAT = "QII" + class VerifyLibxc(VerifyBase): """ Verify a Libxc v2 (or later) stream """ @@ -439,6 +449,34 @@ class VerifyLibxc(VerifyBase): raise RecordError("Static data end record found in v2 stream") + def verify_record_x86_cpuid_policy(self, content): + """ x86 CPUID policy record """ + + if self.version < 3: + raise RecordError("x86 CPUID policy record found in v2 stream") + + sz = calcsize(X86_CPUID_POLICY_FORMAT) + contentsz = len(content) + + if contentsz < sz or (contentsz % sz) != 0: + raise RecordError("Record length %u, expected multiple of %u" % + (contentsz, sz)) + + + def verify_record_x86_msr_policy(self, content): + """ x86 MSR policy record """ + + if self.version < 3: + raise RecordError("x86 MSR policy record found in v2 stream") + + sz = calcsize(X86_MSR_POLICY_FORMAT) + contentsz = len(content) + + if contentsz < sz or (contentsz % sz) != 0: + raise RecordError("Record length %u, expected multiple of %u" % + (contentsz, sz)) + + record_verifiers = { REC_TYPE_end: VerifyLibxc.verify_record_end, @@ -483,4 +521,9 @@ record_verifiers = { REC_TYPE_static_data_end: VerifyLibxc.verify_record_static_data_end, + + REC_TYPE_x86_cpuid_policy: + VerifyLibxc.verify_record_x86_cpuid_policy, + REC_TYPE_x86_msr_policy: + VerifyLibxc.verify_record_x86_msr_policy, } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:34:38 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:34:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeity-0004zx-5k; Fri, 29 May 2020 17:34:38 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitw-0004zj-QV for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:36 +0000 X-Inumbo-ID: aa53984a-a1d2-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id aa53984a-a1d2-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 17:34:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NHc22tNV+ol69TWahlLQpIwWpCC7zqjkr0glm3C1/HQ=; b=TNE7cAY3epPehX/Zzx1CEmaXX0 2Jfx35ErSaeou23mZi0oMQvszUfVs6SXLiNBoZ/Zxx/cFyb7+VfKKKIrXAqwSqTD4+if70OdL4Uov jgSbQUM9wzgd0fky8yURzN6njoheWvXIijykYi8NeE+U8x73HxaUJiSxDp6mI7CoPSX8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeitw-0002vX-0F for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeitv-0000gf-V3 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxc/restore: Handle X86_{CPUID,MSR}_DATA records Message-Id: Date: Fri, 29 May 2020 17:34:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8baf4363e19c6f6e48b286b4643899564f98e620 Author: Andrew Cooper AuthorDate: Wed Dec 18 18:51:01 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 libxc/restore: Handle X86_{CPUID,MSR}_DATA records For now, the data are just stashed, and discarded at the end. A future change will restore the data, once libxl has been adjusted to avoid clobbering the data. No functional change. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/xc_sr_common.h | 10 ++++++++++ tools/libxc/xc_sr_common_x86.c | 40 +++++++++++++++++++++++++++++++++++++ tools/libxc/xc_sr_common_x86.h | 14 +++++++++++++ tools/libxc/xc_sr_restore_x86_hvm.c | 9 +++++++++ tools/libxc/xc_sr_restore_x86_pv.c | 9 +++++++++ 5 files changed, 82 insertions(+) diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index fd7fb67305..7742260690 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -296,6 +296,16 @@ struct xc_sr_context { struct /* x86 */ { + /* Common save/restore data. */ + union + { + struct + { + /* X86_{CPUID,MSR}_DATA blobs for CPU Policy. */ + struct xc_sr_blob cpuid, msr; + } restore; + }; + struct /* x86 PV guest. */ { /* 4 or 8; 32 or 64 bit domain */ diff --git a/tools/libxc/xc_sr_common_x86.c b/tools/libxc/xc_sr_common_x86.c index 011684df97..8980299e9a 100644 --- a/tools/libxc/xc_sr_common_x86.c +++ b/tools/libxc/xc_sr_common_x86.c @@ -42,6 +42,46 @@ int handle_x86_tsc_info(struct xc_sr_context *ctx, struct xc_sr_record *rec) return 0; } +int handle_x86_cpuid_policy(struct xc_sr_context *ctx, struct xc_sr_record *rec) +{ + xc_interface *xch = ctx->xch; + int rc; + + if ( rec->length == 0 || + rec->length % sizeof(xen_cpuid_leaf_t) != 0 ) + { + ERROR("X86_CPUID_POLICY size %u should be multiple of %zu", + rec->length, sizeof(xen_cpuid_leaf_t)); + return -1; + } + + rc = update_blob(&ctx->x86.restore.cpuid, rec->data, rec->length); + if ( rc ) + ERROR("Unable to allocate %u bytes for X86_CPUID_POLICY", rec->length); + + return rc; +} + +int handle_x86_msr_policy(struct xc_sr_context *ctx, struct xc_sr_record *rec) +{ + xc_interface *xch = ctx->xch; + int rc; + + if ( rec->length == 0 || + rec->length % sizeof(xen_msr_entry_t) != 0 ) + { + ERROR("X86_MSR_POLICY size %u should be multiple of %zu", + rec->length, sizeof(xen_cpuid_leaf_t)); + return -1; + } + + rc = update_blob(&ctx->x86.restore.msr, rec->data, rec->length); + if ( rc ) + ERROR("Unable to allocate %u bytes for X86_MSR_POLICY", rec->length); + + return rc; +} + /* * Local variables: * mode: C diff --git a/tools/libxc/xc_sr_common_x86.h b/tools/libxc/xc_sr_common_x86.h index ebc4355bd1..c458c1aa37 100644 --- a/tools/libxc/xc_sr_common_x86.h +++ b/tools/libxc/xc_sr_common_x86.h @@ -14,6 +14,20 @@ int write_x86_tsc_info(struct xc_sr_context *ctx); */ int handle_x86_tsc_info(struct xc_sr_context *ctx, struct xc_sr_record *rec); +/* + * Parses an X86_CPUID_POLICY record and stashes the content for application + * when a STATIC_DATA_END record is encountered. + */ +int handle_x86_cpuid_policy(struct xc_sr_context *ctx, + struct xc_sr_record *rec); + +/* + * Parses an X86_MSR_POLICY record and stashes the content for application + * when a STATIC_DATA_END record is encountered. + */ +int handle_x86_msr_policy(struct xc_sr_context *ctx, + struct xc_sr_record *rec); + #endif /* * Local variables: diff --git a/tools/libxc/xc_sr_restore_x86_hvm.c b/tools/libxc/xc_sr_restore_x86_hvm.c index adbdf1ae5f..1704d524b4 100644 --- a/tools/libxc/xc_sr_restore_x86_hvm.c +++ b/tools/libxc/xc_sr_restore_x86_hvm.c @@ -181,6 +181,12 @@ static int x86_hvm_process_record(struct xc_sr_context *ctx, case REC_TYPE_HVM_PARAMS: return handle_hvm_params(ctx, rec); + case REC_TYPE_X86_CPUID_POLICY: + return handle_x86_cpuid_policy(ctx, rec); + + case REC_TYPE_X86_MSR_POLICY: + return handle_x86_msr_policy(ctx, rec); + default: return RECORD_NOT_PROCESSED; } @@ -237,6 +243,9 @@ static int x86_hvm_cleanup(struct xc_sr_context *ctx) { free(ctx->x86.hvm.restore.context.ptr); + free(ctx->x86.restore.cpuid.ptr); + free(ctx->x86.restore.msr.ptr); + return 0; } diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index 0adfcdcdda..a3d85d517d 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -1102,6 +1102,12 @@ static int x86_pv_process_record(struct xc_sr_context *ctx, case REC_TYPE_X86_TSC_INFO: return handle_x86_tsc_info(ctx, rec); + case REC_TYPE_X86_CPUID_POLICY: + return handle_x86_cpuid_policy(ctx, rec); + + case REC_TYPE_X86_MSR_POLICY: + return handle_x86_msr_policy(ctx, rec); + default: return RECORD_NOT_PROCESSED; } @@ -1173,6 +1179,9 @@ static int x86_pv_cleanup(struct xc_sr_context *ctx) if ( ctx->x86.pv.m2p ) munmap(ctx->x86.pv.m2p, ctx->x86.pv.nr_m2p_frames * PAGE_SIZE); + free(ctx->x86.restore.cpuid.ptr); + free(ctx->x86.restore.msr.ptr); + return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:34:48 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:34:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiu8-00051b-7F; Fri, 29 May 2020 17:34:48 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiu6-00051M-Ql for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:46 +0000 X-Inumbo-ID: b053010e-a1d2-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b053010e-a1d2-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 17:34:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=l20rB3jmybI3KDIyC06rCwZE1PB3GTQH9Z8EDznwucQ=; b=ZHmVtjISbNQYp1GvVhTXhA3sys g2vABf108aBolywawb41GEKiExhUl5rUpzsDXDiEIEiUDYq9ERzLf3Fjr/Zap8Q0nCGRrA7GrcW0/ kd4cuSI9jBcZiDM3RgcOtlH+lpvEts+WdM7Tj2N+DjmDX9tpeq6JS56gXvT51nAzP7TQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiu6-0002vg-3R for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeiu6-0000hu-2Q for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:46 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libxc/save: Write X86_{CPUID,MSR}_DATA records Message-Id: Date: Fri, 29 May 2020 17:34:46 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit f6b2b8ec53de8a6f178e53b180e47b05d6d2ea72 Author: Andrew Cooper AuthorDate: Tue Dec 17 12:41:02 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 libxc/save: Write X86_{CPUID,MSR}_DATA records With the destination side now able to understand X86_{CPUID,MSR}_DATA records (and compatibly handle their absense), update the sending logic to obtain and forward this data from Xen. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/xc_sr_common_x86.c | 50 ++++++++++++++++++++++++++++++++++++++++ tools/libxc/xc_sr_common_x86.h | 6 +++++ tools/libxc/xc_sr_save_x86_hvm.c | 2 +- tools/libxc/xc_sr_save_x86_pv.c | 12 +++++++++- 4 files changed, 68 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_sr_common_x86.c b/tools/libxc/xc_sr_common_x86.c index 8980299e9a..6267655dab 100644 --- a/tools/libxc/xc_sr_common_x86.c +++ b/tools/libxc/xc_sr_common_x86.c @@ -42,6 +42,56 @@ int handle_x86_tsc_info(struct xc_sr_context *ctx, struct xc_sr_record *rec) return 0; } +int write_x86_cpu_policy_records(struct xc_sr_context *ctx) +{ + xc_interface *xch = ctx->xch; + struct xc_sr_record cpuid = { .type = REC_TYPE_X86_CPUID_POLICY, }; + struct xc_sr_record msrs = { .type = REC_TYPE_X86_MSR_POLICY, }; + uint32_t nr_leaves = 0, nr_msrs = 0; + int rc; + + if ( xc_get_cpu_policy_size(xch, &nr_leaves, &nr_msrs) < 0 ) + { + PERROR("Unable to get CPU Policy size"); + return -1; + } + + cpuid.data = malloc(nr_leaves * sizeof(xen_cpuid_leaf_t)); + msrs.data = malloc(nr_msrs * sizeof(xen_msr_entry_t)); + if ( !cpuid.data || !msrs.data ) + { + ERROR("Cannot allocate memory for CPU Policy"); + rc = -1; + goto out; + } + + if ( xc_get_domain_cpu_policy(xch, ctx->domid, &nr_leaves, cpuid.data, + &nr_msrs, msrs.data) ) + { + PERROR("Unable to get d%d CPU Policy", ctx->domid); + rc = -1; + goto out; + } + + cpuid.length = nr_leaves * sizeof(xen_cpuid_leaf_t); + if ( cpuid.length ) + { + rc = write_record(ctx, &cpuid); + if ( rc ) + goto out; + } + + msrs.length = nr_msrs * sizeof(xen_msr_entry_t); + if ( msrs.length ) + rc = write_record(ctx, &msrs); + + out: + free(cpuid.data); + free(msrs.data); + + return rc; +} + int handle_x86_cpuid_policy(struct xc_sr_context *ctx, struct xc_sr_record *rec) { xc_interface *xch = ctx->xch; diff --git a/tools/libxc/xc_sr_common_x86.h b/tools/libxc/xc_sr_common_x86.h index c458c1aa37..d1050981dd 100644 --- a/tools/libxc/xc_sr_common_x86.h +++ b/tools/libxc/xc_sr_common_x86.h @@ -14,6 +14,12 @@ int write_x86_tsc_info(struct xc_sr_context *ctx); */ int handle_x86_tsc_info(struct xc_sr_context *ctx, struct xc_sr_record *rec); +/* + * Obtains a domains CPU Policy from Xen, and writes X86_{CPUID,MSR}_POLICY + * records into the stream. + */ +int write_x86_cpu_policy_records(struct xc_sr_context *ctx); + /* * Parses an X86_CPUID_POLICY record and stashes the content for application * when a STATIC_DATA_END record is encountered. diff --git a/tools/libxc/xc_sr_save_x86_hvm.c b/tools/libxc/xc_sr_save_x86_hvm.c index bab9bd2877..0b2abb26bd 100644 --- a/tools/libxc/xc_sr_save_x86_hvm.c +++ b/tools/libxc/xc_sr_save_x86_hvm.c @@ -171,7 +171,7 @@ static int x86_hvm_setup(struct xc_sr_context *ctx) static int x86_hvm_static_data(struct xc_sr_context *ctx) { - return 0; + return write_x86_cpu_policy_records(ctx); } static int x86_hvm_start_of_stream(struct xc_sr_context *ctx) diff --git a/tools/libxc/xc_sr_save_x86_pv.c b/tools/libxc/xc_sr_save_x86_pv.c index 46019d962d..c7e246ef4f 100644 --- a/tools/libxc/xc_sr_save_x86_pv.c +++ b/tools/libxc/xc_sr_save_x86_pv.c @@ -1054,7 +1054,17 @@ static int x86_pv_setup(struct xc_sr_context *ctx) static int x86_pv_static_data(struct xc_sr_context *ctx) { - return write_x86_pv_info(ctx); + int rc; + + rc = write_x86_pv_info(ctx); + if ( rc ) + return rc; + + rc = write_x86_cpu_policy_records(ctx); + if ( rc ) + return rc; + + return 0; } static int x86_pv_start_of_stream(struct xc_sr_context *ctx) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:34:58 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:34:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiuI-00052p-AJ; Fri, 29 May 2020 17:34:58 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiuH-00052d-3d for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:57 +0000 X-Inumbo-ID: b6587e44-a1d2-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b6587e44-a1d2-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 17:34:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NuouhNo63zXx6NyIszNv2nAqjdOxTpjLghofZ0dgank=; b=SlRr0jln23zDaNicLzGC+h/iIK jvxQNNBRywl+vprpaNErDIqhwijLYx9Q+NAaF2b/bcENuDYx2fPYeqAK4Z9RgDZ3GxY9pBLZ0+YFF OCjjm5tWaGpSAjwL2kxUKgT7qCTyujOakOhPrWRNyvQbNvYuHy/FNdCk/kGuG3zcQyO4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiuG-0002vq-6w for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeiuG-0000jK-66 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:34:56 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libx[cl]: Plumb 'missing' through static_data_done() up into libxl Message-Id: Date: Fri, 29 May 2020 17:34:56 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 63350b3fda28a6ee9073127aa368144b0eaa3e45 Author: Andrew Cooper AuthorDate: Mon Dec 16 19:03:14 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 tools/libx[cl]: Plumb 'missing' through static_data_done() up into libxl Pre Xen-4.14 streams will not contain any CPUID/MSR information. There is nothing libxc can do about this, and will have to rely on the higher level toolstack to provide backwards compatibility. To facilitate this, extend the static_data_done() callback, highlighting the missing information, and modify libxl to use it. At the libxc level, this requires an arch-specific hook which, for now, always reports CPUID and MSR as missing. This will be adjusted in a later change. No overall functional change - this is just plumbing. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/include/xenguest.h | 12 ++++++++++-- tools/libxc/xc_sr_common.h | 9 +++++++++ tools/libxc/xc_sr_common_x86.c | 8 ++++++++ tools/libxc/xc_sr_common_x86.h | 5 +++++ tools/libxc/xc_sr_restore.c | 7 ++++++- tools/libxc/xc_sr_restore_x86_hvm.c | 1 + tools/libxc/xc_sr_restore_x86_pv.c | 1 + tools/libxl/libxl_create.c | 13 +++++++++++-- tools/libxl/libxl_save_msgs_gen.pl | 2 +- 9 files changed, 52 insertions(+), 6 deletions(-) diff --git a/tools/libxc/include/xenguest.h b/tools/libxc/include/xenguest.h index b4df8d0ffe..7a12d21ff2 100644 --- a/tools/libxc/include/xenguest.h +++ b/tools/libxc/include/xenguest.h @@ -139,8 +139,16 @@ int xc_domain_save(xc_interface *xch, int io_fd, uint32_t dom, /* callbacks provided by xc_domain_restore */ struct restore_callbacks { - /* Called once the STATIC_DATA_END record has been received/inferred. */ - int (*static_data_done)(void *data); + /* + * Called once the STATIC_DATA_END record has been received/inferred. + * + * For compatibility with older streams, provides a list of static data + * expected to be found in the stream, which was missing. A higher level + * toolstack is responsible for providing any necessary compatibiltiy. + */ +#define XGR_SDD_MISSING_CPUID (1 << 0) +#define XGR_SDD_MISSING_MSR (1 << 1) + int (*static_data_done)(unsigned int missing, void *data); /* Called after a new checkpoint to suspend the guest. */ int (*suspend)(void *data); diff --git a/tools/libxc/xc_sr_common.h b/tools/libxc/xc_sr_common.h index 7742260690..f3bdea8006 100644 --- a/tools/libxc/xc_sr_common.h +++ b/tools/libxc/xc_sr_common.h @@ -158,6 +158,15 @@ struct xc_sr_restore_ops #define BROKEN_CHANNEL 2 int (*process_record)(struct xc_sr_context *ctx, struct xc_sr_record *rec); + /** + * Perform any actions required after the static data has arrived. Called + * when the STATIC_DATA_COMPLETE record has been recieved/inferred. + * 'missing' should be filled in for any data item the higher level + * toolstack needs to provide compatiblity for. + */ + int (*static_data_complete)(struct xc_sr_context *ctx, + unsigned int *missing); + /** * Perform any actions required after the stream has been finished. Called * after the END record has been received. diff --git a/tools/libxc/xc_sr_common_x86.c b/tools/libxc/xc_sr_common_x86.c index 6267655dab..a849891634 100644 --- a/tools/libxc/xc_sr_common_x86.c +++ b/tools/libxc/xc_sr_common_x86.c @@ -132,6 +132,14 @@ int handle_x86_msr_policy(struct xc_sr_context *ctx, struct xc_sr_record *rec) return rc; } +int x86_static_data_complete(struct xc_sr_context *ctx, unsigned int *missing) +{ + /* TODO: Become conditional on there being no data in the stream. */ + *missing = XGR_SDD_MISSING_MSR | XGR_SDD_MISSING_CPUID; + + return 0; +} + /* * Local variables: * mode: C diff --git a/tools/libxc/xc_sr_common_x86.h b/tools/libxc/xc_sr_common_x86.h index d1050981dd..e08d81e0e7 100644 --- a/tools/libxc/xc_sr_common_x86.h +++ b/tools/libxc/xc_sr_common_x86.h @@ -34,6 +34,11 @@ int handle_x86_cpuid_policy(struct xc_sr_context *ctx, int handle_x86_msr_policy(struct xc_sr_context *ctx, struct xc_sr_record *rec); +/* + * Perform common x86 actions required after the static data has arrived. + */ +int x86_static_data_complete(struct xc_sr_context *ctx, unsigned int *missing); + #endif /* * Local variables: diff --git a/tools/libxc/xc_sr_restore.c b/tools/libxc/xc_sr_restore.c index bb94cd879d..bc811e6e3a 100644 --- a/tools/libxc/xc_sr_restore.c +++ b/tools/libxc/xc_sr_restore.c @@ -659,6 +659,7 @@ static int buffer_record(struct xc_sr_context *ctx, struct xc_sr_record *rec) int handle_static_data_end(struct xc_sr_context *ctx) { xc_interface *xch = ctx->xch; + unsigned int missing = 0; int rc = 0; if ( ctx->restore.seen_static_data_end ) @@ -669,9 +670,13 @@ int handle_static_data_end(struct xc_sr_context *ctx) ctx->restore.seen_static_data_end = true; + rc = ctx->restore.ops.static_data_complete(ctx, &missing); + if ( rc ) + return rc; + if ( ctx->restore.callbacks->static_data_done && (rc = ctx->restore.callbacks->static_data_done( - ctx->restore.callbacks->data) != 0) ) + missing, ctx->restore.callbacks->data) != 0) ) ERROR("static_data_done() callback failed: %d\n", rc); return rc; diff --git a/tools/libxc/xc_sr_restore_x86_hvm.c b/tools/libxc/xc_sr_restore_x86_hvm.c index 1704d524b4..a77624cc9d 100644 --- a/tools/libxc/xc_sr_restore_x86_hvm.c +++ b/tools/libxc/xc_sr_restore_x86_hvm.c @@ -258,6 +258,7 @@ struct xc_sr_restore_ops restore_ops_x86_hvm = .localise_page = x86_hvm_localise_page, .setup = x86_hvm_setup, .process_record = x86_hvm_process_record, + .static_data_complete = x86_static_data_complete, .stream_complete = x86_hvm_stream_complete, .cleanup = x86_hvm_cleanup, }; diff --git a/tools/libxc/xc_sr_restore_x86_pv.c b/tools/libxc/xc_sr_restore_x86_pv.c index a3d85d517d..d086271efb 100644 --- a/tools/libxc/xc_sr_restore_x86_pv.c +++ b/tools/libxc/xc_sr_restore_x86_pv.c @@ -1194,6 +1194,7 @@ struct xc_sr_restore_ops restore_ops_x86_pv = .localise_page = x86_pv_localise_page, .setup = x86_pv_setup, .process_record = x86_pv_process_record, + .static_data_complete = x86_static_data_complete, .stream_complete = x86_pv_stream_complete, .cleanup = x86_pv_cleanup, }; diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index cc7340c48d..75862dc6ed 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -1428,7 +1428,8 @@ static void libxl__colo_restore_setup_done(libxl__egc *egc, libxl__stream_read_start(egc, &dcs->srs); } -int libxl__srm_callout_callback_static_data_done(void *user) +int libxl__srm_callout_callback_static_data_done(unsigned int missing, + void *user) { libxl__save_helper_state *shs = user; libxl__domain_create_state *dcs = shs->caller_state; @@ -1438,7 +1439,15 @@ int libxl__srm_callout_callback_static_data_done(void *user) libxl_domain_config *d_config = dcs->guest_config; libxl_domain_build_info *info = &d_config->b_info; - libxl__cpuid_legacy(ctx, dcs->guest_domid, info); + /* + * CPUID/MSR information is not present in pre Xen-4.14 streams. + * + * Libxl used to always regenerate the CPUID policy from first principles + * on migrate. Continue to do so for backwards compatibility when the + * stream doesn't contain any CPUID data. + */ + if (missing & XGR_SDD_MISSING_CPUID) + libxl__cpuid_legacy(ctx, dcs->guest_domid, info); return 0; } diff --git a/tools/libxl/libxl_save_msgs_gen.pl b/tools/libxl/libxl_save_msgs_gen.pl index 93dc252370..5bfbd4fd10 100755 --- a/tools/libxl/libxl_save_msgs_gen.pl +++ b/tools/libxl/libxl_save_msgs_gen.pl @@ -29,7 +29,7 @@ our @msgs = ( [ 'srcxA', "wait_checkpoint", [] ], [ 'scxA', "switch_qemu_logdirty", [qw(uint32_t domid unsigned enable)] ], - [ 'rcxW', "static_data_done", [] ], + [ 'rcxW', "static_data_done", [qw(unsigned missing)] ], [ 'rcx', "restore_results", ['xen_pfn_t', 'store_gfn', 'xen_pfn_t', 'console_gfn'] ], [ 'srW', "complete", [qw(int retval -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:35:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:35:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiuS-00053o-Bu; Fri, 29 May 2020 17:35:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiuQ-00053b-V6 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:35:06 +0000 X-Inumbo-ID: bc5c0388-a1d2-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id bc5c0388-a1d2-11ea-8993-bc764e2007e4; Fri, 29 May 2020 17:35:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=zKdwDyBcUPC8fn+fU/O90RcS1+1XtSrcKq9VDplDnPw=; b=wMsdINoseI6ADE74qHM6jp6Z2r hdjCfCMxs6OQpvJSAsVJ2uBTVecJSLIdSuXuDEbbHv0jMU+eRxOcUU0+/TG9mPUP2X2BBgQxWgAyG uOLBD4ocMwLBWdXyVjeU+2cA+fRqUXsTobF14JYr9D3qem4kUVwTjZaWT77OouZ+3NYs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiuQ-0002wC-9x for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:35:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeiuQ-0000kZ-9H for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:35:06 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/libxc: Restore CPUID/MSR data found in the migration stream Message-Id: Date: Fri, 29 May 2020 17:35:06 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1a6be420e04441bbf5f03968ab43a7908167fcb5 Author: Andrew Cooper AuthorDate: Fri Dec 20 19:38:26 2019 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 tools/libxc: Restore CPUID/MSR data found in the migration stream With all other pieces in place, it is now safe to restore the CPUID and MSR data in the migration stream, rather than discarding them and using the higher level toolstacks compatibility logic. While this is a small patch, it has large implications for migrated/resumed domains. Most obviously, the CPU family/model/stepping data, cache/tlb/etc. will no longer change behind the guests back. Another change is the interpretation of the Xend cpuid strings. The 'k' option is not a sensible thing to have ever supported, and 's' is how how the stream will end up behaving. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- tools/libxc/xc_cpuid_x86.c | 8 ++++---- tools/libxc/xc_sr_common_x86.c | 26 ++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index f045b03223..89d2ecdad2 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -273,10 +273,9 @@ int xc_set_domain_cpu_policy(xc_interface *xch, uint32_t domid, * '0' -> force to 0 * 'x' -> we don't care (use default) * 'k' -> pass through host value - * 's' -> pass through the first time and then keep the same value - * across save/restore and migration. + * 's' -> legacy alias for 'k' * - * For 's' and 'x' the configuration is overwritten with the value applied. + * In all cases, the returned string consists of just '0' and '1'. */ int xc_cpuid_set( xc_interface *xch, uint32_t domid, const unsigned int *input, @@ -402,7 +401,8 @@ int xc_cpuid_set( clear_feature(31 - j, regs[i]); config_transformed[i][j] = config[i][j]; - if ( config[i][j] == 's' ) + /* All non 0/1 values get overwritten. */ + if ( (config[i][j] & ~1) != '0' ) config_transformed[i][j] = '0' + val; } } diff --git a/tools/libxc/xc_sr_common_x86.c b/tools/libxc/xc_sr_common_x86.c index a849891634..77ea044a74 100644 --- a/tools/libxc/xc_sr_common_x86.c +++ b/tools/libxc/xc_sr_common_x86.c @@ -134,8 +134,30 @@ int handle_x86_msr_policy(struct xc_sr_context *ctx, struct xc_sr_record *rec) int x86_static_data_complete(struct xc_sr_context *ctx, unsigned int *missing) { - /* TODO: Become conditional on there being no data in the stream. */ - *missing = XGR_SDD_MISSING_MSR | XGR_SDD_MISSING_CPUID; + xc_interface *xch = ctx->xch; + uint32_t nr_leaves = 0, nr_msrs = 0; + uint32_t err_l = ~0, err_s = ~0, err_m = ~0; + + if ( ctx->x86.restore.cpuid.ptr ) + nr_leaves = ctx->x86.restore.cpuid.size / sizeof(xen_cpuid_leaf_t); + else + *missing |= XGR_SDD_MISSING_CPUID; + + if ( ctx->x86.restore.msr.ptr ) + nr_msrs = ctx->x86.restore.msr.size / sizeof(xen_msr_entry_t); + else + *missing |= XGR_SDD_MISSING_MSR; + + if ( (nr_leaves || nr_msrs) && + xc_set_domain_cpu_policy(xch, ctx->domid, + nr_leaves, ctx->x86.restore.cpuid.ptr, + nr_msrs, ctx->x86.restore.msr.ptr, + &err_l, &err_s, &err_m) ) + { + PERROR("Failed to set CPUID policy: leaf %08x, subleaf %08x, msr %08x", + err_l, err_s, err_m); + return -1; + } return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:35:19 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:35:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiuc-00054u-DU; Fri, 29 May 2020 17:35:18 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiub-00054i-5r for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:35:17 +0000 X-Inumbo-ID: c2614748-a1d2-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c2614748-a1d2-11ea-9947-bc764e2007e4; Fri, 29 May 2020 17:35:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=n+ibi6MWR4CjzQZKninLkVnBJ5NzsErW6OJ8brhXThY=; b=YhgGcyfZHkpUpRFKV6WWtZBsK6 kqV7Wrg30RPz1wvAGrLsXu3tHIBD3w/EHmT4N7zMFRF63NcUY/dmjkD6nD14mxfJmzATGuPeSNUfK F6PNtDQYecF8Em8xqLlQE8d8K77rUicw3o8RaFR+Qvqz4JquG22MXP6QvRCN2k52f868=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeiua-0002wz-Cy for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:35:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeiua-0000ld-CH for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:35:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] docs/xl.cfg: Rewrite cpuid= section Message-Id: Date: Fri, 29 May 2020 17:35:16 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 17a68b8a66d793738fd8ca1b4227325320476a07 Author: Andrew Cooper AuthorDate: Tue Sep 1 16:08:00 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 17:33:03 2020 +0100 docs/xl.cfg: Rewrite cpuid= section This is partly to adjust the description of 'k' and 's' seeing as they have changed, but mostly restructuring the information for clarity. In particular, use indentation to clearly separate the areas discussing libxl format from xend format. In addition, extend the xend format section to discuss subleaf notation. Signed-off-by: Andrew Cooper Acked-by: Ian Jackson --- docs/man/xl.cfg.5.pod.in | 74 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 21 deletions(-) diff --git a/docs/man/xl.cfg.5.pod.in b/docs/man/xl.cfg.5.pod.in index c9bc181a95..0532739c1f 100644 --- a/docs/man/xl.cfg.5.pod.in +++ b/docs/man/xl.cfg.5.pod.in @@ -1977,26 +1977,42 @@ This option is disabled by default. Configure the value returned when a guest executes the CPUID instruction. Two versions of config syntax are recognized: libxl and xend. -The libxl syntax is a comma separated list of key=value pairs, preceded by the -word "host". A few keys take a numerical value, all others take a single -character which describes what to do with the feature bit. - -Possible values for a single feature bit: +Both formats use a common notation for specifying a single feature bit. +Possible values are: '1' -> force the corresponding bit to 1 '0' -> force to 0 'x' -> Get a safe value (pass through and mask with the default policy) - 'k' -> pass through the host bit value - 's' -> as 'k' but preserve across save/restore and migration (not implemented) + 'k' -> pass through the host bit value (at boot only - value preserved on migrate) + 's' -> legacy alias for 'k' -Note: when specifying B for hypervisor leaves (0x4000xxxx major group) -only the lowest 8 bits of leaf's 0x4000xx00 EAX register are processed, the -rest are ignored (these 8 bits signify maximum number of hypervisor leaves). +B: + +=over 4 + +The libxl format is a single string, starting with the word "host", and +followed by a comma separated list of key=value pairs. A few keys take a +numerical value, all others take a single character which describes what to do +with the feature bit. e.g.: + +=over 4 + +cpuid="host,tm=0,sse3=0" + +=back List of keys taking a value: + +=over 4 + apicidsize brandid clflush family localapicid maxleaf maxhvleaf model nc proccount procpkg stepping +=back + List of keys taking a character: + +=over 4 + 3dnow 3dnowext 3dnowprefetch abm acpi adx aes altmovcr8 apic arat avx avx2 avx512-4fmaps avx512-4vnniw avx512bw avx512cd avx512dq avx512er avx512f avx512ifma avx512pf avx512vbmi avx512vl bmi1 bmi2 clflushopt clfsh clwb cmov @@ -2010,21 +2026,37 @@ ssse3 svm svm_decode svm_lbrv svm_npt svm_nrips svm_pausefilt svm_tscrate svm_vmcbclean syscall sysenter tbm tm tm2 topoext tsc tsc-deadline tsc_adjust umip vme vmx wdt x2apic xop xsave xtpr +=back + +=back + +B: -The xend syntax is a list of values in the form of -'leafnum:register=bitstring,register=bitstring' - "leafnum" is the requested function, - "register" is the response register to modify - "bitstring" represents all bits in the register, its length must be 32 chars. - Each successive character represent a lesser-significant bit, possible values - are listed above in the libxl section. +=over 4 -Example to hide two features from the guest: 'tm', which is bit #29 in EDX, and -'pni' (SSE3), which is bit #0 in ECX: +Xend format consists of an array of one or more strings of the form +"leaf:reg=bitstring,...". e.g. (matching the libxl example above): -xend: [ "1:ecx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0,edx=xx0xxxxxxxxxxxxxxxxxxxxxxxxxxxxx" ] +=over 4 -libxl: "host,tm=0,sse3=0" +cpuid=["1:ecx=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx0,edx=xx0xxxxxxxxxxxxxxxxxxxxxxxxxxxxx", ...] + +=back + +"leaf" is an integer, either decimal or hex with a "0x" prefix. e.g. to +specify something in the AMD feature leaves, use "0x80000001:ecx=...". + +Some leaves have subleaves which can be specified as "leaf,subleaf". e.g. for +the Intel structured feature leaf, use "7,0:ebx=..." + +The bitstring represents all bits in the register, its length must be 32 +chars. Each successive character represent a lesser-significant bit. + +=back + +Note: when specifying B for hypervisor leaves (0x4000xxxx major group) +only the lowest 8 bits of leaf's 0x4000xx00 EAX register are processed, the +rest are ignored (these 8 bits signify maximum number of hypervisor leaves). More info about the CPUID instruction can be found in the processor manuals, and on Wikipedia: L -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:55:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:55:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejDn-0007CO-Js; Fri, 29 May 2020 17:55:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejDm-0007CJ-8X for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:06 +0000 X-Inumbo-ID: 86d39dae-a1d5-11ea-a8f6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 86d39dae-a1d5-11ea-a8f6-12813bfff9fa; Fri, 29 May 2020 17:55:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=EL/2klGE9S8qZysoLIkCaDYsNjO4kV1TNQOFwzYWbwg=; b=aZ1Bvoyz7+uVI04akhJnLy3iVM 7N4GxFhGg1qPoPxaf551mZrjAcEOVWd64xF62yrKzUcHgAbT+TO/Rezq2IJR/xp3n+vUVn+weZZuW 9gk7YFC1LTNSRyXo7QJ0pt5RQi8TPd96CFloDG3LIkr7wurqiHGY8XsPGk1dtcoAKh/Y=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejDk-0003M8-UN for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jejDk-0002fC-Sg for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: credit2: factor cpu to runqueue matching in a function Message-Id: Date: Fri, 29 May 2020 17:55:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1a7eb22b3cb627b3d9604b32d362c5af43dbdc69 Author: Dario Faggioli AuthorDate: Thu May 28 23:29:24 2020 +0200 Commit: George Dunlap CommitDate: Fri May 29 18:53:53 2020 +0100 xen: credit2: factor cpu to runqueue matching in a function Just move the big if() condition in an inline function. No functional change intended. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross --- xen/common/sched/credit2.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index 34f05c3e2a..697c9f917d 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -838,6 +838,20 @@ static inline bool same_core(unsigned int cpua, unsigned int cpub) cpu_to_core(cpua) == cpu_to_core(cpub); } +static inline bool +cpu_runqueue_match(const struct csched2_runqueue_data *rqd, unsigned int cpu) +{ + unsigned int peer_cpu = rqd->pick_bias; + + BUG_ON(cpu_to_socket(peer_cpu) == XEN_INVALID_SOCKET_ID); + + /* OPT_RUNQUEUE_CPU will never find an existing runqueue. */ + return opt_runqueue == OPT_RUNQUEUE_ALL || + (opt_runqueue == OPT_RUNQUEUE_CORE && same_core(peer_cpu, cpu)) || + (opt_runqueue == OPT_RUNQUEUE_SOCKET && same_socket(peer_cpu, cpu)) || + (opt_runqueue == OPT_RUNQUEUE_NODE && same_node(peer_cpu, cpu)); +} + static struct csched2_runqueue_data * cpu_add_to_runqueue(struct csched2_private *prv, unsigned int cpu) { @@ -855,21 +869,11 @@ cpu_add_to_runqueue(struct csched2_private *prv, unsigned int cpu) rqd_ins = &prv->rql; list_for_each_entry ( rqd, &prv->rql, rql ) { - unsigned int peer_cpu; - /* Remember first unused queue index. */ if ( !rqi_unused && rqd->id > rqi ) rqi_unused = true; - peer_cpu = rqd->pick_bias; - BUG_ON(cpu_to_socket(cpu) == XEN_INVALID_SOCKET_ID || - cpu_to_socket(peer_cpu) == XEN_INVALID_SOCKET_ID); - - /* OPT_RUNQUEUE_CPU will never find an existing runqueue. */ - if ( opt_runqueue == OPT_RUNQUEUE_ALL || - (opt_runqueue == OPT_RUNQUEUE_CORE && same_core(peer_cpu, cpu)) || - (opt_runqueue == OPT_RUNQUEUE_SOCKET && same_socket(peer_cpu, cpu)) || - (opt_runqueue == OPT_RUNQUEUE_NODE && same_node(peer_cpu, cpu)) ) + if ( cpu_runqueue_match(rqd, cpu) ) { rqd_valid = true; break; @@ -3744,6 +3748,8 @@ csched2_alloc_pdata(const struct scheduler *ops, int cpu) struct csched2_pcpu *spc; struct csched2_runqueue_data *rqd; + BUG_ON(cpu_to_socket(cpu) == XEN_INVALID_SOCKET_ID); + spc = xzalloc(struct csched2_pcpu); if ( spc == NULL ) return ERR_PTR(-ENOMEM); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:55:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:55:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejDw-0007DB-Mh; Fri, 29 May 2020 17:55:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejDv-0007D3-OD for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:15 +0000 X-Inumbo-ID: 8cd76c8a-a1d5-11ea-a8f6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8cd76c8a-a1d5-11ea-a8f6-12813bfff9fa; Fri, 29 May 2020 17:55:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=4ek2GlW6ZlM92ur9ryefi/NnvGRPdP/epDe2ONRq5pg=; b=DA7K7ZER7tKMH49+pcc0O0flWG Yv+AMJcon/vIXqcRkl9K8E2p22ZqfZqnnlgSO45hqH2AmNxt1xnUe85D0ThHvjn1XY7KYGY77TBgS xvoZGPLvnBQ5UDAcX7fLWyRXzUOCUjSxEi5mAHYJlqXaUK2dSrxGDpbXE0x5NGlTfqoA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejDv-0003Ms-1a for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jejDv-0002g1-0S for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: credit2: factor runqueue initialization in its own function. Message-Id: Date: Fri, 29 May 2020 17:55:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c963db8d18e6583d688693ed2e9ca4f15a24c7d9 Author: Dario Faggioli AuthorDate: Thu May 28 23:29:30 2020 +0200 Commit: George Dunlap CommitDate: Fri May 29 18:53:53 2020 +0100 xen: credit2: factor runqueue initialization in its own function. As it will be useful in later changes. While there, fix the doc-comment. No functional change intended. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross --- xen/common/sched/credit2.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index 697c9f917d..8a4f28b9f5 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -3766,21 +3766,16 @@ csched2_alloc_pdata(const struct scheduler *ops, int cpu) return spc; } -/* Returns the ID of the runqueue the cpu is assigned to. */ -static struct csched2_runqueue_data * -init_pdata(struct csched2_private *prv, struct csched2_pcpu *spc, - unsigned int cpu) +/* + * Do what's necessary to add cpu to the rqd (including activating the + * runqueue, if this is the first CPU we put in it). + */ +static void +init_cpu_runqueue(struct csched2_private *prv, struct csched2_pcpu *spc, + unsigned int cpu, struct csched2_runqueue_data *rqd) { - struct csched2_runqueue_data *rqd; unsigned int rcpu; - ASSERT(rw_is_write_locked(&prv->lock)); - ASSERT(!cpumask_test_cpu(cpu, &prv->initialized)); - /* CPU data needs to be allocated, but still uninitialized. */ - ASSERT(spc); - - rqd = spc->rqd; - ASSERT(rqd && !cpumask_test_cpu(cpu, &spc->rqd->active)); printk(XENLOG_INFO "Adding cpu %d to runqueue %d\n", cpu, rqd->id); @@ -3816,6 +3811,22 @@ init_pdata(struct csched2_private *prv, struct csched2_pcpu *spc, if ( rqd->nr_cpus == 1 ) rqd->pick_bias = cpu; +} + +/* Returns a pointer to the runqueue the cpu is assigned to. */ +static struct csched2_runqueue_data * +init_pdata(struct csched2_private *prv, struct csched2_pcpu *spc, + unsigned int cpu) +{ + struct csched2_runqueue_data *rqd; + + ASSERT(rw_is_write_locked(&prv->lock)); + ASSERT(!cpumask_test_cpu(cpu, &prv->initialized)); + /* CPU data needs to be allocated, but still uninitialized. */ + ASSERT(spc); + + rqd = spc->rqd; + init_cpu_runqueue(prv, spc, cpu, rqd); return rqd; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:55:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:55:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejE6-0007EI-OH; Fri, 29 May 2020 17:55:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejE5-0007EB-Sy for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:25 +0000 X-Inumbo-ID: 92e1dff2-a1d5-11ea-a8f6-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 92e1dff2-a1d5-11ea-a8f6-12813bfff9fa; Fri, 29 May 2020 17:55:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=tToel20LRQgGvuceWkKLoFYqaHJ+D6KA2nLkAreZGfs=; b=xR27tNa9MTu7TE9WAIzNjam3V9 oOkSmwKSLdIXZ0PzaFKgktyalHEWkijAGJnQCWL438qAB25SOvdgXK3BE+s+Elj8gQtMeSx4eu9cl RmA/zJ5c9KFTA/TcXOgX4UeaJAvLl4K28PIaITTmbnjkx4c6SSB4z451Rnw9vuv/uWYw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejE5-0003N4-5L for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jejE5-0002h0-3e for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: cpupool: add a back-pointer from a scheduler to its pool Message-Id: Date: Fri, 29 May 2020 17:55:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 524cc89c288b9ec5ae94f3e9b28a9c460b997cc2 Author: Dario Faggioli AuthorDate: Thu May 28 23:29:37 2020 +0200 Commit: George Dunlap CommitDate: Fri May 29 18:53:54 2020 +0100 xen: cpupool: add a back-pointer from a scheduler to its pool If we need to know within which pool a particular scheduler is working, we can do that by querying the cpupool pointer of any of the sched_resource-s (i.e., ~ any of the CPUs) assigned to the scheduler itself. Basically, we pick any sched_resource that we know uses that scheduler, and we check its *cpupool pointer. If we really know that the resource uses the scheduler, this is fine, as it also means the resource is inside the pool we are looking for. But, of course, we can't do that for a pool/scheduler that has not any been given any sched_resource yet (or if we do not know whether or not it has any sched_resource). To overcome such limitation, add a back pointer from the scheduler, to its own pool. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross --- xen/common/sched/cpupool.c | 1 + xen/common/sched/private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/xen/common/sched/cpupool.c b/xen/common/sched/cpupool.c index 0664f7fa3d..7ea641ca26 100644 --- a/xen/common/sched/cpupool.c +++ b/xen/common/sched/cpupool.c @@ -287,6 +287,7 @@ static struct cpupool *cpupool_create( if ( c->sched == NULL ) goto err; } + c->sched->cpupool = c; c->gran = opt_sched_granularity; *q = c; diff --git a/xen/common/sched/private.h b/xen/common/sched/private.h index b9a5b4c01c..df50976eb2 100644 --- a/xen/common/sched/private.h +++ b/xen/common/sched/private.h @@ -275,6 +275,7 @@ struct scheduler { char *opt_name; /* option name for this scheduler */ unsigned int sched_id; /* ID for this scheduler */ void *sched_data; /* global data pointer */ + struct cpupool *cpupool;/* points to this scheduler's pool */ int (*global_init) (void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 17:55:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 17:55:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejEH-0007FJ-Q9; Fri, 29 May 2020 17:55:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejEG-0007FB-Ov for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:36 +0000 X-Inumbo-ID: 98e41fdc-a1d5-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 98e41fdc-a1d5-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 17:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Lrvb1/czkrf4muqOcAUI7Tv87KLbL37d+jpiKNRuIhw=; b=HCjysH2oIEexZi05SYooM9ZJrs MZFU4RuCEKWQRdzMaMoeBK35K1FIS8EbS17KbyPkQOQvgXnt+XzegkNtYuNVH0ItUtPmdh+onnG+a uIWk0PDrWBzYMVu+9lScTg2btGd1I/1ggzZK7uFlITvJuliqjbr5Bcmfm9r8fo4sExDo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jejEF-0003ND-8f for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jejEF-0002iJ-7r for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 17:55:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen: credit2: limit the max number of CPUs in a runqueue Message-Id: Date: Fri, 29 May 2020 17:55:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8e2aa76dc1670e82eaa15683353853bc66bf54fc Author: Dario Faggioli AuthorDate: Thu May 28 23:29:44 2020 +0200 Commit: George Dunlap CommitDate: Fri May 29 18:53:54 2020 +0100 xen: credit2: limit the max number of CPUs in a runqueue In Credit2 CPUs (can) share runqueues, depending on the topology. For instance, with per-socket runqueues (the default) all the CPUs that are part of the same socket share a runqueue. On platform with a huge number of CPUs per socket, that could be a problem. An example is AMD EPYC2 servers, where we can have up to 128 CPUs in a socket. It is of course possible to define other, still topology-based, runqueue arrangements (e.g., per-LLC, per-DIE, etc). But that may still result in runqueues with too many CPUs on other/future platforms. For instance, a system with 96 CPUs and 2 NUMA nodes will end up having 48 CPUs per runqueue. Not as bad, but still a lot! Therefore, let's set a limit to the max number of CPUs that can share a Credit2 runqueue. The actual value is configurable (at boot time), the default being 16. If, for instance, there are more than 16 CPUs in a socket, they'll be split among two (or more) runqueues. Note: with core scheduling enabled, this parameter sets the max number of *scheduling resources* that can share a runqueue. Therefore, with granularity set to core (and assumint 2 threads per core), we will have at most 16 cores per runqueue, which corresponds to 32 threads. But that is fine, considering how core scheduling works. Signed-off-by: Dario Faggioli Reviewed-by: Juergen Gross --- docs/misc/xen-command-line.pandoc | 14 ++++ xen/common/sched/credit2.c | 144 ++++++++++++++++++++++++++++++++++++-- xen/include/asm-arm/cpufeature.h | 5 ++ xen/include/asm-x86/processor.h | 5 ++ 4 files changed, 162 insertions(+), 6 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index e16bb90184..1787f2c8fb 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -1840,6 +1840,20 @@ with read and write permissions. Choose the default scheduler. +### sched_credit2_max_cpus_runqueue +> `= ` + +> Default: `16` + +Defines how many CPUs will be put, at most, in each Credit2 runqueue. + +Runqueues are still arranged according to the host topology (and following +what indicated by the 'credit2_runqueue' parameter). But we also have a cap +to the number of CPUs that share each runqueues. + +A value that is a submultiple of the number of online CPUs is recommended, +as that would likely produce a perfectly balanced runqueue configuration. + ### sched_credit2_migrate_resist > `= ` diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index 8a4f28b9f5..f4d3f8ae6b 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -25,6 +25,7 @@ #include #include #include +#include #include "private.h" @@ -471,6 +472,22 @@ static int __init parse_credit2_runqueue(const char *s) } custom_param("credit2_runqueue", parse_credit2_runqueue); +/* + * How many CPUs will be put, at most, in each runqueue. + * + * Runqueues are still arranged according to the host topology (and according + * to the value of the 'credit2_runqueue' parameter). But we also have a cap + * to the number of CPUs that share runqueues. + * + * This should be considered an upper limit. In fact, we also try to balance + * the number of CPUs in each runqueue. And, when doing that, it is possible + * that fewer CPUs than what this parameters mandates will actually be put + * in each runqueue. + */ +#define MAX_CPUS_RUNQ 16 +static unsigned int __read_mostly opt_max_cpus_runqueue = MAX_CPUS_RUNQ; +integer_param("sched_credit2_max_cpus_runqueue", opt_max_cpus_runqueue); + /* * Per-runqueue data */ @@ -852,18 +869,83 @@ cpu_runqueue_match(const struct csched2_runqueue_data *rqd, unsigned int cpu) (opt_runqueue == OPT_RUNQUEUE_NODE && same_node(peer_cpu, cpu)); } +/* + * Additional checks, to avoid separating siblings in different runqueues. + * This deals with both Intel's HTs and AMD's CUs. An arch that does not have + * any similar concept will just have cpu_nr_siblings() always return 1, and + * setup the cpu_sibling_mask-s acordingly (as currently does ARM), and things + * will just work as well. + */ +static bool +cpu_runqueue_siblings_match(const struct csched2_runqueue_data *rqd, + unsigned int cpu, unsigned int max_cpus_runq) +{ + unsigned int nr_sibls = cpu_nr_siblings(cpu); + unsigned int rcpu, tot_sibls = 0; + + /* + * If we put the CPU in this runqueue, we must be sure that there will + * be enough room for accepting its sibling(s) as well. + */ + cpumask_clear(cpumask_scratch_cpu(cpu)); + for_each_cpu ( rcpu, &rqd->active ) + { + ASSERT(rcpu != cpu); + if ( !cpumask_intersects(per_cpu(cpu_sibling_mask, rcpu), cpumask_scratch_cpu(cpu)) ) + { + /* + * For each CPU already in the runqueue, account for it and for + * its sibling(s), independently from whether they are in the + * runqueue or not. Of course, we do this only once, for each CPU + * that is already inside the runqueue and all its siblings! + * + * This way, even if there are CPUs in the runqueue with siblings + * in a different cpupools, we still count all of them here. + * The reason for this is that, if at some future point we will + * move those sibling CPUs to this cpupool, we want them to land + * in this runqueue. Hence we must be sure to leave space for them. + */ + cpumask_or(cpumask_scratch_cpu(cpu), cpumask_scratch_cpu(cpu), + per_cpu(cpu_sibling_mask, rcpu)); + tot_sibls += cpu_nr_siblings(rcpu); + } + } + /* + * We know that neither the CPU, nor any of its sibling are here, + * or we wouldn't even have entered the function. + */ + ASSERT(!cpumask_intersects(cpumask_scratch_cpu(cpu), + per_cpu(cpu_sibling_mask, cpu))); + + /* Try adding CPU and its sibling(s) to the count and check... */ + return tot_sibls + nr_sibls <= max_cpus_runq; +} + static struct csched2_runqueue_data * -cpu_add_to_runqueue(struct csched2_private *prv, unsigned int cpu) +cpu_add_to_runqueue(const struct scheduler *ops, unsigned int cpu) { + struct csched2_private *prv = csched2_priv(ops); struct csched2_runqueue_data *rqd, *rqd_new; + struct csched2_runqueue_data *rqd_valid = NULL; struct list_head *rqd_ins; unsigned long flags; int rqi = 0; - bool rqi_unused = false, rqd_valid = false; + unsigned int min_rqs, max_cpus_runq; + bool rqi_unused = false; /* Prealloc in case we need it - not allowed with interrupts off. */ rqd_new = xzalloc(struct csched2_runqueue_data); + /* + * While respecting the limit of not having more than the max number of + * CPUs per runqueue, let's also try to "spread" the CPU, as evenly as + * possible, among the runqueues. For doing that, we need to know upfront + * how many CPUs we have, so let's use the number of CPUs that are online + * for that. + */ + min_rqs = ((num_online_cpus() - 1) / opt_max_cpus_runqueue) + 1; + max_cpus_runq = num_online_cpus() / min_rqs; + write_lock_irqsave(&prv->lock, flags); rqd_ins = &prv->rql; @@ -873,10 +955,59 @@ cpu_add_to_runqueue(struct csched2_private *prv, unsigned int cpu) if ( !rqi_unused && rqd->id > rqi ) rqi_unused = true; + /* + * First of all, let's check whether, according to the system + * topology, this CPU belongs in this runqueue. + */ if ( cpu_runqueue_match(rqd, cpu) ) { - rqd_valid = true; - break; + /* + * If the CPU has any siblings, they are online and they are + * being added to this cpupool, always keep them together. Even + * if that means violating what the opt_max_cpus_runqueue param + * indicates. However, if this happens, chances are high that a + * too small value was used for the parameter, so warn the user + * about that. + * + * Note that we cannot check this once and for all, say, during + * scheduler initialization. In fact, at least in theory, the + * number of siblings a CPU has may not be the same for all the + * CPUs. + */ + if ( cpumask_intersects(&rqd->active, per_cpu(cpu_sibling_mask, cpu)) ) + { + if ( cpumask_weight(&rqd->active) >= opt_max_cpus_runqueue ) + { + printk("WARNING: %s: more than opt_max_cpus_runqueue " + "in a runqueue (%u vs %u), due to topology constraints.\n" + "Consider raising it!\n", + __func__, opt_max_cpus_runqueue, + cpumask_weight(&rqd->active)); + } + rqd_valid = rqd; + break; + } + + /* + * If we're using core (or socket) scheduling, no need to do any + * further checking beyond the number of CPUs already in this + * runqueue respecting our upper bound. + * + * Otherwise, let's try to make sure that siblings stay in the + * same runqueue, pretty much under any cinrcumnstances. + */ + if ( rqd->refcnt < max_cpus_runq && (ops->cpupool->gran != SCHED_GRAN_cpu || + cpu_runqueue_siblings_match(rqd, cpu, max_cpus_runq)) ) + { + /* + * This runqueue is ok, but as we said, we also want an even + * distribution of the CPUs. So, unless this is the very first + * match, we go on, check all runqueues and actually add the + * CPU into the one that is less full. + */ + if ( !rqd_valid || rqd->refcnt < rqd_valid->refcnt ) + rqd_valid = rqd; + } } if ( !rqi_unused ) @@ -900,6 +1031,8 @@ cpu_add_to_runqueue(struct csched2_private *prv, unsigned int cpu) rqd->pick_bias = cpu; rqd->id = rqi; } + else + rqd = rqd_valid; rqd->refcnt++; @@ -3744,7 +3877,6 @@ csched2_dump(const struct scheduler *ops) static void * csched2_alloc_pdata(const struct scheduler *ops, int cpu) { - struct csched2_private *prv = csched2_priv(ops); struct csched2_pcpu *spc; struct csched2_runqueue_data *rqd; @@ -3754,7 +3886,7 @@ csched2_alloc_pdata(const struct scheduler *ops, int cpu) if ( spc == NULL ) return ERR_PTR(-ENOMEM); - rqd = cpu_add_to_runqueue(prv, cpu); + rqd = cpu_add_to_runqueue(ops, cpu); if ( IS_ERR(rqd) ) { xfree(spc); diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 9af5666628..8fdf9685d7 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -64,6 +64,11 @@ static inline bool cpus_have_cap(unsigned int num) return test_bit(num, cpu_hwcaps); } +static inline cpu_nr_siblings(unsigned int) +{ + return 1; +} + /* System capability check for constant cap */ #define cpus_have_const_cap(num) ({ \ register_t __ret; \ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 070691882b..73017c3f4b 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -174,6 +174,11 @@ extern void init_intel_cacheinfo(struct cpuinfo_x86 *c); unsigned int apicid_to_socket(unsigned int); +static inline int cpu_nr_siblings(unsigned int cpu) +{ + return cpu_data[cpu].x86_num_siblings; +} + /* * Generic CPUID function * clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 21:33:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 21:33:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemcl-00048I-Hd; Fri, 29 May 2020 21:33:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemck-00048B-1H for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:06 +0000 X-Inumbo-ID: fb2dd49e-a1f3-11ea-a91f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fb2dd49e-a1f3-11ea-a91f-12813bfff9fa; Fri, 29 May 2020 21:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=slrmrZjuDojD9ZvLAkqeGkkSRHYSgmguJt4c52Xg7i0=; b=b6u//yKhkKeF89ehzlZNw0d9Dz WRPI9po0IuioT2Zcb4JI2sprDkjXZqxzDoVrga+jaEe50vVyccqib6BsstpO1i/7z909kGx/dzPDe l0rW+gZhVHob42ACs3Mg6aMYNMGqpL8yewyLnzRO9oSltlwi3z07XAaPjVgUuhe4OonM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemcj-00081b-29 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jemcj-0001Yj-17 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/build: introduce CLANG_FLAGS for testing other CFLAGS Message-Id: Date: Fri, 29 May 2020 21:33:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit fa0854478d0b2b64680e558db760851f6f1c6d16 Author: Anthony PERARD AuthorDate: Fri May 29 16:43:43 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 18:58:21 2020 +0100 xen/build: introduce CLANG_FLAGS for testing other CFLAGS Commit 534519f0514f ("xen: Have Kconfig check $(CC)'s version") introduced the use of CLANG_FLAGS in Kconfig which is used when testing for other CFLAGS via $(cc-option ...) but CLANG_FLAGS doesn't exist in the Xen build system. (It's a Linux/Kbuild variable that haven't been added yet.) The missing CLANG_FLAGS isn't an issue for $(cc-option ..) but it would be when $(as-instr ..) gets imported from Kbuild to tests assembly instruction. We need to know if we are going to use clang's assembler or not. CLANG_FLAGS needs to be calculated before we call Kconfig. So, this patch adds CLANG_FLAGS which may contain two flags which are needed for further testing of $(CC)'s capabilities: -no-integrated-as This flags isn't new, but simply tested earlier so that it can be used in Kconfig. The flags is only added for x86 builds like before. -Werror=unknown-warning-option The one is new and is to make sure that the warning is enabled, even though it is by default but could be disabled in a particular build of clang, see Linux's commit e8de12fb7cde ("kbuild: Check for unknown options with cc-option usage in Kconfig and clang") It is present in clang 3.0.0, according Linux's commit 589834b3a009 ("kbuild: Add -Werror=unknown-warning-option to CLANG_FLAGS"). (The "note" that say that the flags was only added once wasn't true when tested on CentOS 6, so the patch uses $(or) and the flag will only be added once.) Fixes: 534519f0514f ("xen: Have Kconfig check $(CC)'s version") Signed-off-by: Anthony PERARD Acked-by: Andrew Cooper --- xen/Makefile | 31 +++++++++++++++++++++++++++++-- xen/arch/x86/arch.mk | 24 ------------------------ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index 286f374b54..d53d1f7b5e 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -48,6 +48,7 @@ default: build .PHONY: dist dist: install +include scripts/Kbuild.include ifneq ($(root-make-done),y) # section to run before calling Rules.mk, but only once. @@ -124,11 +125,37 @@ ifneq ($(filter %config,$(MAKECMDGOALS)),) config-build := y endif +# CLANG_FLAGS needs to be calculated before calling Kconfig +ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) +CLANG_FLAGS := + +ifeq ($(TARGET_ARCH),x86) +# The tests to select whether the integrated assembler is usable need to happen +# before testing any assembler features, or else the result of the tests would +# be stale if the integrated assembler is not used. + +# Older clang's built-in assembler doesn't understand .skip with labels: +# https://bugs.llvm.org/show_bug.cgi?id=27369 +t1 = $(call as-insn,$(CC),".L0: .L1: .skip (.L1 - .L0)",,-no-integrated-as) + +# Check whether clang asm()-s support .include. +t2 = $(call as-insn,$(CC) -I$(BASEDIR)/include,".include \"asm-x86/indirect_thunk_asm.h\"",,-no-integrated-as) + +# Check whether clang keeps .macro-s between asm()-s: +# https://bugs.llvm.org/show_bug.cgi?id=36110 +t3 = $(call as-insn,$(CC),".macro FOO;.endm"$(close); asm volatile $(open)".macro FOO;.endm",-no-integrated-as) + +CLANG_FLAGS += $(call or,$(t1),$(t2),$(t3)) +endif + +CLANG_FLAGS += -Werror=unknown-warning-option +CFLAGS += $(CLANG_FLAGS) +export CLANG_FLAGS +endif + export root-make-done := y endif # root-make-done -include scripts/Kbuild.include - # Shorthand for kconfig kconfig = -f $(BASEDIR)/tools/kconfig/Makefile.kconfig ARCH=$(ARCH) SRCARCH=$(SRCARCH) HOSTCC="$(HOSTCC)" HOSTCXX="$(HOSTCXX)" diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 9927a42061..04e967436b 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -11,30 +11,6 @@ CFLAGS += -DXEN_IMG_OFFSET=$(XEN_IMG_OFFSET) # Prevent floating-point variables from creeping into Xen. CFLAGS += -msoft-float -ifeq ($(CONFIG_CC_IS_CLANG),y) -# Note: Any test which adds -no-integrated-as will cause subsequent tests to -# succeed, and not trigger further additions. -# -# The tests to select whether the integrated assembler is usable need to happen -# before testing any assembler features, or else the result of the tests would -# be stale if the integrated assembler is not used. - -# Older clang's built-in assembler doesn't understand .skip with labels: -# https://bugs.llvm.org/show_bug.cgi?id=27369 -$(call as-option-add,CFLAGS,CC,".L0: .L1: .skip (.L1 - .L0)",,\ - -no-integrated-as) - -# Check whether clang asm()-s support .include. -$(call as-option-add,CFLAGS,CC,".include \"asm-x86/indirect_thunk_asm.h\"",,\ - -no-integrated-as) - -# Check whether clang keeps .macro-s between asm()-s: -# https://bugs.llvm.org/show_bug.cgi?id=36110 -$(call as-option-add,CFLAGS,CC,\ - ".macro FOO;.endm"$$(close); asm volatile $$(open)".macro FOO;.endm",\ - -no-integrated-as) -endif - $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS)) $(call cc-option-add,CFLAGS,CC,-Wnested-externs) $(call as-option-add,CFLAGS,CC,"vmcall",-DHAVE_AS_VMX) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 21:33:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 21:33:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemcv-00049e-KX; Fri, 29 May 2020 21:33:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemcu-00049P-A3 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:16 +0000 X-Inumbo-ID: 0133e112-a1f4-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0133e112-a1f4-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 21:33:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=HrsERNEo1hBBkNojmiuoBVbsCfYi5Obs7V2IcMYtgKM=; b=ORVRo+ybm8kQTkGC1LHI4lGVbC qWWmB1QURPT7LeVd/uCTUtF9NnoapT3/D3hE0ADm1OlbGfqsynJCq6zmzXcta/i7FDsKjBSt/i3ls PwQST1GLIaQa4jSfqbXqQQXrDAyG7106EbEYdg5C1TErBlIHS1kV1Z9Ei3nn4GIzXZ+0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemct-00081h-5M for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jemct-0001Zj-4G for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/pv: remove unnecessary toggle_guest_pt() overhead Message-Id: Date: Fri, 29 May 2020 21:33:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 422ec8fcf34cf961e81fbccd7d236fa2c1e678a8 Author: Jan Beulich AuthorDate: Tue May 5 08:16:03 2020 +0200 Commit: Andrew Cooper CommitDate: Fri May 29 18:58:21 2020 +0100 x86/pv: remove unnecessary toggle_guest_pt() overhead toggle_guest_pt() is called in pairs, to read guest kernel data structures when emulating a guest userspace action. Hence this doesn't modify cr3 from the guest's point of view, and therefore doesn't need any resync on the exit-to-guest path. Therefore move the updating of ->pv_cr3 and ->root_pgt_changed into toggle_guest_mode(), since undoing the changes during the second of these invocations wouldn't be a safe thing to do. While at it, add a comment ahead of toggle_guest_pt() to clarify its intended usage. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné Acked-by: Andrew Cooper --- xen/arch/x86/pv/domain.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index f4e863a410..ec5a7d2dca 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -412,18 +412,10 @@ bool __init xpti_pcid_enabled(void) static void _toggle_guest_pt(struct vcpu *v) { - const struct domain *d = v->domain; - struct cpu_info *cpu_info = get_cpu_info(); unsigned long cr3; v->arch.flags ^= TF_kernel_mode; update_cr3(v); - if ( d->arch.pv.xpti ) - { - cpu_info->root_pgt_changed = true; - cpu_info->pv_cr3 = __pa(this_cpu(root_pgt)) | - (d->arch.pv.pcid ? get_pcid_bits(v, true) : 0); - } /* * Don't flush user global mappings from the TLB. Don't tick TLB clock. @@ -431,15 +423,11 @@ static void _toggle_guest_pt(struct vcpu *v) * In shadow mode, though, update_cr3() may need to be accompanied by a * TLB flush (for just the incoming PCID), as the top level page table may * have changed behind our backs. To be on the safe side, suppress the - * no-flush unconditionally in this case. The XPTI CR3 write, if enabled, - * will then need to be a flushing one too. + * no-flush unconditionally in this case. */ cr3 = v->arch.cr3; - if ( shadow_mode_enabled(d) ) - { + if ( shadow_mode_enabled(v->domain) ) cr3 &= ~X86_CR3_NOFLUSH; - cpu_info->pv_cr3 &= ~X86_CR3_NOFLUSH; - } write_cr3(cr3); if ( !(v->arch.flags & TF_kernel_mode) ) @@ -455,6 +443,8 @@ static void _toggle_guest_pt(struct vcpu *v) void toggle_guest_mode(struct vcpu *v) { + const struct domain *d = v->domain; + ASSERT(!is_pv_32bit_vcpu(v)); /* %fs/%gs bases can only be stale if WR{FS,GS}BASE are usable. */ @@ -468,8 +458,27 @@ void toggle_guest_mode(struct vcpu *v) asm volatile ( "swapgs" ); _toggle_guest_pt(v); + + if ( d->arch.pv.xpti ) + { + struct cpu_info *cpu_info = get_cpu_info(); + + cpu_info->root_pgt_changed = true; + cpu_info->pv_cr3 = __pa(this_cpu(root_pgt)) | + (d->arch.pv.pcid ? get_pcid_bits(v, true) : 0); + /* + * As in _toggle_guest_pt() the XPTI CR3 write needs to be a TLB- + * flushing one too for shadow mode guests. + */ + if ( shadow_mode_enabled(d) ) + cpu_info->pv_cr3 &= ~X86_CR3_NOFLUSH; + } } +/* + * Must be called in matching pairs without returning to guest context + * inbetween. + */ void toggle_guest_pt(struct vcpu *v) { if ( !is_pv_32bit_vcpu(v) ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 21:33:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 21:33:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemd5-0004Bo-Lz; Fri, 29 May 2020 21:33:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemd3-0004BO-UR for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:25 +0000 X-Inumbo-ID: 0736c944-a1f4-11ea-a91f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0736c944-a1f4-11ea-a91f-12813bfff9fa; Fri, 29 May 2020 21:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=v8Q7NjMBwcuvuK/b4ZUnhobgzVaq8ZI6/kVo46QmhL0=; b=NMwP8PMb3ioLX+a6e2ZzbB5Wqf SjM2hXk3+bhGndDLoYU9qcbiJLojtREMABomX/Yol6CwB3M4EPMjGNbLYqlipfggd1sXQaOTQDIfH Yufa6f82Gq2/V1lbb95bZT2NNsOWX3arYgc68AWNIzT45OfVU4XmdiND0ZU35k3NH0u4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemd3-00082a-8K for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jemd3-0001aW-7U for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] arm: Fix build following c/s 8e2aa76dc Message-Id: Date: Fri, 29 May 2020 21:33:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit cc07818e5e475c4ac0ee88130a2d4b329a53651e Author: Andrew Cooper AuthorDate: Fri May 29 22:23:59 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 22:27:50 2020 +0100 arm: Fix build following c/s 8e2aa76dc The ARM side of the cpu_nr_siblings() was missing a return type. OSSTest reports: /home/osstest/build.150502.build-arm64-xsm/xen/xen/include/asm/cpufeature.h:67:15: error: return type defaults to 'int' [-Werror=implicit-int] static inline cpu_nr_siblings(unsigned int) ^~~~~~~~~~~~~~~ My local build test then reported: /local/xen.git/xen/include/asm/cpufeature.h: In function ‘cpu_nr_siblings’: /local/xen.git/xen/include/asm/cpufeature.h:67:1: error: parameter name omitted static inline int cpu_nr_siblings(unsigned int) ^ Fix it up to match its x86 counterpart. Signed-off-by: Andrew Cooper --- xen/include/asm-arm/cpufeature.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 8fdf9685d7..674beb0353 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -64,7 +64,7 @@ static inline bool cpus_have_cap(unsigned int num) return test_bit(num, cpu_hwcaps); } -static inline cpu_nr_siblings(unsigned int) +static inline int cpu_nr_siblings(unsigned int cpu) { return 1; } -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 21:33:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 21:33:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemdF-0004DS-NU; Fri, 29 May 2020 21:33:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemdE-0004D7-0i for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:36 +0000 X-Inumbo-ID: 0d410a2a-a1f4-11ea-a91f-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0d410a2a-a1f4-11ea-a91f-12813bfff9fa; Fri, 29 May 2020 21:33:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uKh5JQnrx8Z0mNOjLbwnuWy4m/GL/K3XkONFG9KFBow=; b=EGruJWTXvUAnx//JH6Dlsufu24 LH2WK0I/WNiHrbQgp2pFp2ZihFO+iQM0K2oE6lPhGcutStvZPNCNm3Tg5pXVNZ4bzYueuxI7WP7+n O/Wn3PkBl9Z5g2xrNlvchXWnDUk9fNpC50BcuSf9Tr/Uct4Ck416Dk7Z0U3rj/nIcTI4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jemdD-00082j-DG for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jemdD-0001bb-BM for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 21:33:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/build: fix xen/tools/binfile Message-Id: Date: Fri, 29 May 2020 21:33:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5e1783880d6948ea5c8fad6dd64af6e44a1e32ab Author: Juergen Gross AuthorDate: Fri May 29 20:28:00 2020 +0200 Commit: Andrew Cooper CommitDate: Fri May 29 22:30:14 2020 +0100 xen/build: fix xen/tools/binfile xen/tools/binfile contains a bash specific command (let). This leads to build failures on systems not using bash as /bin/sh. Replace "let SHIFT=$OPTIND-1" by "SHIFT=$((OPTIND-1))". Signed-off-by: Juergen Gross Acked-by: Andrew Cooper Tested-by: Andrew Cooper --- xen/tools/binfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/tools/binfile b/xen/tools/binfile index df0301183f..23099c49bf 100755 --- a/xen/tools/binfile +++ b/xen/tools/binfile @@ -17,7 +17,7 @@ while getopts "ia:" opt; do ;; esac done -let "SHIFT=$OPTIND-1" +SHIFT=$((OPTIND-1)) shift $SHIFT target=$1 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:22:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOA-0000b9-J2; Fri, 29 May 2020 22:22:06 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenO9-0000b4-RG for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:05 +0000 X-Inumbo-ID: d336f78e-a1fa-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d336f78e-a1fa-11ea-8993-bc764e2007e4; Fri, 29 May 2020 22:22:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/EEJw5wHYzvWTB7AlF9eCrhqFYSj/Z0rc+BMkttwGz4=; b=W8yVvDaMrdiEQrkvkShm77h/Zg t4Gdkm2OKtwMiWZPZ79+NzAo06hNUy86tPtnnHWwFepex+yxGhBK6xT2tE1RhxqwoCXgI6byWuXfF KUDm9GzHVLoLoMeFkdgapex5rx1AXGqn7n1KO77xlfRKYslmOmaihqrbW+o7/0Ylj44s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenO8-0000cD-Fs for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenO8-0005EJ-Ei for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/traps: Clean up printing in {do_reserved, fatal}_trap() Message-Id: Date: Fri, 29 May 2020 22:22:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d91c145e021a5a0eca774ee112ab8e79fef85f16 Author: Andrew Cooper AuthorDate: Thu Apr 30 15:05:24 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/traps: Clean up printing in {do_reserved,fatal}_trap() For one, they render the vector in a different base. Introduce X86_EXC_* constants and vec_name() to refer to exceptions by their mnemonic, which starts bringing the code/diagnostics in line with the Intel and AMD manuals. Provide constants for every archtiecturally defined exception, even those not implemented by Xen yet, as do_reserved_trap() is a catch-all handler. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/traps.c | 26 +++++++++++++++++++++----- xen/include/asm-x86/processor.h | 6 +----- xen/include/asm-x86/x86-defns.h | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index a8300c214d..427178e649 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -682,6 +682,22 @@ const char *trapstr(unsigned int trapnr) return trapnr < ARRAY_SIZE(strings) ? strings[trapnr] : "???"; } +static const char *vec_name(unsigned int vec) +{ + static const char names[][4] = { +#define P(x) [X86_EXC_ ## x] = "#" #x +#define N(x) [X86_EXC_ ## x] = #x + P(DE), P(DB), N(NMI), P(BP), P(OF), P(BR), P(UD), P(NM), + P(DF), N(CSO), P(TS), P(NP), P(SS), P(GP), P(PF), N(SPV), + P(MF), P(AC), P(MC), P(XM), P(VE), P(CP), + P(HV), P(VC), P(SX), +#undef N +#undef P + }; + + return (vec < ARRAY_SIZE(names) && names[vec][0]) ? names[vec] : "???"; +} + /* * This is called for faults at very unexpected times (e.g., when interrupts * are disabled). In such situations we can't do much that is safe. We try to @@ -739,10 +755,9 @@ void fatal_trap(const struct cpu_user_regs *regs, bool show_remote) } } - panic("FATAL TRAP: vector = %d (%s)\n" - "[error_code=%04x] %s\n", - trapnr, trapstr(trapnr), regs->error_code, - (regs->eflags & X86_EFLAGS_IF) ? "" : ", IN INTERRUPT CONTEXT"); + panic("FATAL TRAP: vec %u, %s[%04x]%s\n", + trapnr, vec_name(trapnr), regs->error_code, + (regs->eflags & X86_EFLAGS_IF) ? "" : " IN INTERRUPT CONTEXT"); } static void do_reserved_trap(struct cpu_user_regs *regs) @@ -753,7 +768,8 @@ static void do_reserved_trap(struct cpu_user_regs *regs) return; show_execution_state(regs); - panic("FATAL RESERVED TRAP %#x: %s\n", trapnr, trapstr(trapnr)); + panic("FATAL RESERVED TRAP: vec %u, %s[%04x]\n", + trapnr, vec_name(trapnr), regs->error_code); } static void do_trap(struct cpu_user_regs *regs) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 73017c3f4b..a3d72b26ef 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -43,11 +43,7 @@ #define TRAP_virtualisation 20 #define TRAP_nr 32 -#define TRAP_HAVE_EC \ - ((1u << TRAP_double_fault) | (1u << TRAP_invalid_tss) | \ - (1u << TRAP_no_segment) | (1u << TRAP_stack_error) | \ - (1u << TRAP_gp_fault) | (1u << TRAP_page_fault) | \ - (1u << TRAP_alignment_check)) +#define TRAP_HAVE_EC X86_EXC_HAVE_EC /* Set for entry via SYSCALL. Informs return code to use SYSRETQ not IRETQ. */ /* NB. Same as VGCF_in_syscall. No bits in common with any other TRAP_ defn. */ diff --git a/xen/include/asm-x86/x86-defns.h b/xen/include/asm-x86/x86-defns.h index 8bf503220a..f0157e2311 100644 --- a/xen/include/asm-x86/x86-defns.h +++ b/xen/include/asm-x86/x86-defns.h @@ -118,4 +118,38 @@ #define X86_NR_VECTORS 256 +/* Exception Vectors */ +#define X86_EXC_DE 0 /* Divide Error */ +#define X86_EXC_DB 1 /* Debug Exception */ +#define X86_EXC_NMI 2 /* NMI */ +#define X86_EXC_BP 3 /* Breakpoint */ +#define X86_EXC_OF 4 /* Overflow */ +#define X86_EXC_BR 5 /* BOUND Range */ +#define X86_EXC_UD 6 /* Invalid Opcode */ +#define X86_EXC_NM 7 /* Device Not Available */ +#define X86_EXC_DF 8 /* Double Fault */ +#define X86_EXC_CSO 9 /* Coprocessor Segment Overrun */ +#define X86_EXC_TS 10 /* Invalid TSS */ +#define X86_EXC_NP 11 /* Segment Not Present */ +#define X86_EXC_SS 12 /* Stack-Segment Fault */ +#define X86_EXC_GP 13 /* General Porection Fault */ +#define X86_EXC_PF 14 /* Page Fault */ +#define X86_EXC_SPV 15 /* PIC Spurious Interrupt Vector */ +#define X86_EXC_MF 16 /* Maths fault (x87 FPU) */ +#define X86_EXC_AC 17 /* Alignment Check */ +#define X86_EXC_MC 18 /* Machine Check */ +#define X86_EXC_XM 19 /* SIMD Exception */ +#define X86_EXC_VE 20 /* Virtualisation Exception */ +#define X86_EXC_CP 21 /* Control-flow Protection */ +#define X86_EXC_HV 28 /* Hypervisor Injection */ +#define X86_EXC_VC 29 /* VMM Communication */ +#define X86_EXC_SX 30 /* Security Exception */ + +/* Bitmap of exceptions which have error codes. */ +#define X86_EXC_HAVE_EC \ + ((1u << X86_EXC_DF) | (1u << X86_EXC_TS) | (1u << X86_EXC_NP) | \ + (1u << X86_EXC_SS) | (1u << X86_EXC_GP) | (1u << X86_EXC_PF) | \ + (1u << X86_EXC_AC) | (1u << X86_EXC_CP) | \ + (1u << X86_EXC_VC) | (1u << X86_EXC_SX)) + #endif /* __XEN_X86_DEFNS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:22:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:22:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOK-0000bf-Kc; Fri, 29 May 2020 22:22:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOJ-0000ba-Ce for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:15 +0000 X-Inumbo-ID: d9388972-a1fa-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d9388972-a1fa-11ea-8993-bc764e2007e4; Fri, 29 May 2020 22:22:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Ub2zMt2PXeiV0iSs7T480uf+Fnmrup1YKvPOjNS07Js=; b=f6gALUdiIGLv7rMBg6/I++RwRp ASVA8eb6SPWRhzfWqMcOPcPo9+VjqsWdswFVOcZqnCaszqtBHsjxr3RDApov3K9dP/mf6vdV80Pgz bGM6GA/uxLBu8S6QFOxUOvdtOe5/uB6jOm5pTj305gh616kyl/Ohf84K45T6GwTs9TJc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOI-0000cJ-J0 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenOI-0005F2-I6 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/traps: Factor out extable_fixup() and make printing consistent Message-Id: Date: Fri, 29 May 2020 22:22:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit c65da4f721efc54ea7fb35e3f7f05159f2243c61 Author: Andrew Cooper AuthorDate: Thu Apr 30 15:05:24 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/traps: Factor out extable_fixup() and make printing consistent UD faults never had any diagnostics printed, and the others were inconsistent. Don't use dprintk() because identifying traps.c is actively unhelpful in the message, as it is the location of the fixup, not the fault. Use the new vec_name() infrastructure, rather than leaving raw numbers for the log. (XEN) Running stub recovery selftests... (XEN) Fixup #UD[0000]: ffff82d07fffd040 [ffff82d07fffd040] -> ffff82d0403ac9d6 (XEN) Fixup #GP[0000]: ffff82d07fffd041 [ffff82d07fffd041] -> ffff82d0403ac9d6 (XEN) Fixup #SS[0000]: ffff82d07fffd040 [ffff82d07fffd040] -> ffff82d0403ac9d6 (XEN) Fixup #BP[0000]: ffff82d07fffd041 [ffff82d07fffd041] -> ffff82d0403ac9d6 Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 77 ++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 42 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 427178e649..eeb3e146ef 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -772,10 +772,31 @@ static void do_reserved_trap(struct cpu_user_regs *regs) trapnr, vec_name(trapnr), regs->error_code); } +static bool extable_fixup(struct cpu_user_regs *regs, bool print) +{ + unsigned long fixup = search_exception_table(regs); + + if ( unlikely(fixup == 0) ) + return false; + + /* + * Don't use dprintk() because the __FILE__ reference is unhelpful. + * Can currently be triggered by guests. Make sure we ratelimit. + */ + if ( IS_ENABLED(CONFIG_DEBUG) && print ) + printk(XENLOG_GUEST XENLOG_WARNING "Fixup %s[%04x]: %p [%ps] -> %p\n", + vec_name(regs->entry_vector), regs->error_code, + _p(regs->rip), _p(regs->rip), _p(fixup)); + + regs->rip = fixup; + this_cpu(last_extable_addr) = regs->rip; + + return true; +} + static void do_trap(struct cpu_user_regs *regs) { unsigned int trapnr = regs->entry_vector; - unsigned long fixup; if ( regs->error_code & X86_XEC_EXT ) goto hardware_trap; @@ -793,14 +814,8 @@ static void do_trap(struct cpu_user_regs *regs) return; } - if ( likely((fixup = search_exception_table(regs)) != 0) ) - { - dprintk(XENLOG_ERR, "Trap %u: %p [%ps] -> %p\n", - trapnr, _p(regs->rip), _p(regs->rip), _p(fixup)); - this_cpu(last_extable_addr) = regs->rip; - regs->rip = fixup; + if ( likely(extable_fixup(regs, true)) ) return; - } hardware_trap: if ( debugger_trap_fatal(trapnr, regs) ) @@ -1108,12 +1123,8 @@ void do_invalid_op(struct cpu_user_regs *regs) } die: - if ( (fixup = search_exception_table(regs)) != 0 ) - { - this_cpu(last_extable_addr) = regs->rip; - regs->rip = fixup; + if ( likely(extable_fixup(regs, true)) ) return; - } if ( debugger_trap_fatal(TRAP_invalid_op, regs) ) return; @@ -1129,16 +1140,8 @@ void do_int3(struct cpu_user_regs *regs) if ( !guest_mode(regs) ) { - unsigned long fixup; - - if ( (fixup = search_exception_table(regs)) != 0 ) - { - this_cpu(last_extable_addr) = regs->rip; - dprintk(XENLOG_DEBUG, "Trap %u: %p [%ps] -> %p\n", - TRAP_int3, _p(regs->rip), _p(regs->rip), _p(fixup)); - regs->rip = fixup; + if ( likely(extable_fixup(regs, true)) ) return; - } if ( !debugger_trap_fatal(TRAP_int3, regs) ) printk(XENLOG_DEBUG "Hit embedded breakpoint at %p [%ps]\n", @@ -1415,7 +1418,7 @@ static int fixup_page_fault(unsigned long addr, struct cpu_user_regs *regs) void do_page_fault(struct cpu_user_regs *regs) { - unsigned long addr, fixup; + unsigned long addr; unsigned int error_code; addr = read_cr2(); @@ -1461,11 +1464,9 @@ void do_page_fault(struct cpu_user_regs *regs) if ( pf_type != real_fault ) return; - if ( likely((fixup = search_exception_table(regs)) != 0) ) + if ( likely(extable_fixup(regs, false)) ) { perfc_incr(copy_user_faults); - this_cpu(last_extable_addr) = regs->rip; - regs->rip = fixup; return; } @@ -1521,7 +1522,6 @@ void do_general_protection(struct cpu_user_regs *regs) #ifdef CONFIG_PV struct vcpu *v = current; #endif - unsigned long fixup; if ( debugger_trap_entry(TRAP_gp_fault, regs) ) return; @@ -1588,14 +1588,8 @@ void do_general_protection(struct cpu_user_regs *regs) gp_in_kernel: - if ( likely((fixup = search_exception_table(regs)) != 0) ) - { - dprintk(XENLOG_INFO, "GPF (%04x): %p [%ps] -> %p\n", - regs->error_code, _p(regs->rip), _p(regs->rip), _p(fixup)); - this_cpu(last_extable_addr) = regs->rip; - regs->rip = fixup; + if ( likely(extable_fixup(regs, true)) ) return; - } hardware_gp: if ( debugger_trap_fatal(TRAP_gp_fault, regs) ) @@ -1754,18 +1748,17 @@ void do_device_not_available(struct cpu_user_regs *regs) if ( !guest_mode(regs) ) { - unsigned long fixup = search_exception_table(regs); - - gprintk(XENLOG_ERR, "#NM: %p [%ps] -> %p\n", - _p(regs->rip), _p(regs->rip), _p(fixup)); /* * We shouldn't be able to reach here, but for release builds have * the recovery logic in place nevertheless. */ - ASSERT_UNREACHABLE(); - BUG_ON(!fixup); - regs->rip = fixup; - return; + if ( extable_fixup(regs, true) ) + { + ASSERT_UNREACHABLE(); + return; + } + + fatal_trap(regs, false); } #ifdef CONFIG_PV -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:22:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:22:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOU-0000d4-NX; Fri, 29 May 2020 22:22:26 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOT-0000ct-Oo for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:25 +0000 X-Inumbo-ID: df3e85ce-a1fa-11ea-a922-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id df3e85ce-a1fa-11ea-a922-12813bfff9fa; Fri, 29 May 2020 22:22:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=K12AV01I1CzzVLpoZRACMInFGgM/u8z3BMkyuIIzz0A=; b=EC3Tf8BxSXzdLI6Qfi+nnehNPK vCaGSmWk8n+CwQCRzu9IulmqQjnw4iVDFNtQVxy1Ur0PZ8JguWi8rh6YeiDkcKtmDqNNPCPgd6rWz 2g8SLr1uEdiJN1HfBbopl0MjiUxZ4St+fRP/+goC1vtLAZTPSFtYHeZM6OjxSRAQNwFs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOS-0000ct-MV for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenOS-0005Fq-LW for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/shstk: Introduce Supervisor Shadow Stack support Message-Id: Date: Fri, 29 May 2020 22:22:24 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit d3fb3ed32fc8ee4cb453058e54e7c317a9b93922 Author: Andrew Cooper AuthorDate: Fri Feb 21 17:56:57 2020 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/shstk: Introduce Supervisor Shadow Stack support Introduce CONFIG_HAS_AS_CET_SS to determine whether CET Shadow Stack instructions are supported in the assembler, and CONFIG_XEN_SHSTK as the main build option. Introduce cet={no-,}shstk to for a user to select whether or not to use shadow stacks at runtime, and X86_FEATURE_XEN_SHSTK to determine Xen's overall enablement of shadow stacks. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 17 +++++++++++++++++ xen/arch/x86/Kconfig | 18 ++++++++++++++++++ xen/arch/x86/setup.c | 30 ++++++++++++++++++++++++++++++ xen/include/asm-x86/cpufeature.h | 1 + xen/include/asm-x86/cpufeatures.h | 1 + xen/scripts/Kconfig.include | 4 ++++ 6 files changed, 71 insertions(+) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index 1787f2c8fb..ec1c12cbe0 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -270,6 +270,23 @@ and not running softirqs. Reduce this if softirqs are not being run frequently enough. Setting this to a high value may cause boot failure, particularly if the NMI watchdog is also enabled. +### cet + = List of [ shstk= ] + + Applicability: x86 + +Controls for the use of Control-flow Enforcement Technology. CET is group a +of hardware features designed to combat Return-oriented Programming (ROP, also +call/jmp COP/JOP) attacks. + +* The `shstk=` boolean controls whether Xen uses Shadow Stacks for its own + protection. + + The option is available when `CONFIG_XEN_SHSTK` is compiled in, and + defaults to `true` on hardware supporting CET-SS. Specifying + `cet=no-shstk` will cause Xen not to use Shadow Stacks even when support + is available in hardware. + ### clocksource (x86) > `= pit | hpet | acpi | tsc` diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index b565f6831d..4a2ec87ff5 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -34,6 +34,10 @@ config ARCH_DEFCONFIG config INDIRECT_THUNK def_bool $(cc-option,-mindirect-branch-register) +config HAS_AS_CET_SS + # binutils >= 2.29 or LLVM >= 6 + def_bool $(as-instr,wrssq %rax$(comma)0;setssbsy) + menu "Architecture Features" source "arch/Kconfig" @@ -97,6 +101,20 @@ config HVM If unsure, say Y. +config XEN_SHSTK + bool "Supervisor Shadow Stacks" + depends on HAS_AS_CET_SS && EXPERT + default y + ---help--- + Control-flow Enforcement Technology (CET) is a set of features in + hardware designed to combat Return-oriented Programming (ROP, also + call/jump COP/JOP) attacks. Shadow Stacks are one CET feature + designed to provide return address protection. + + This option arranges for Xen to use CET-SS for its own protection. + When CET-SS is active, 32bit PV guests cannot be used. Backwards + compatiblity can be provided vai the PV Shim mechanism. + config SHADOW_PAGING bool "Shadow Paging" default y diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2dec7a3fc6..584589baff 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -95,6 +95,36 @@ unsigned long __initdata highmem_start; size_param("highmem-start", highmem_start); #endif +static bool __initdata opt_xen_shstk = true; + +static int __init parse_cet(const char *s) +{ + const char *ss; + int val, rc = 0; + + do { + ss = strchr(s, ','); + if ( !ss ) + ss = strchr(s, '\0'); + + if ( (val = parse_boolean("shstk", s, ss)) >= 0 ) + { +#ifdef CONFIG_XEN_SHSTK + opt_xen_shstk = val; +#else + no_config_param("XEN_SHSTK", "cet", s, ss); +#endif + } + else + rc = -EINVAL; + + s = ss + 1; + } while ( *ss ); + + return rc; +} +custom_param("cet", parse_cet); + cpumask_t __read_mostly cpu_present_map; unsigned long __read_mostly xen_phys_start; diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 025f29e83e..f790d5c1f8 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -140,6 +140,7 @@ #define cpu_has_aperfmperf boot_cpu_has(X86_FEATURE_APERFMPERF) #define cpu_has_lfence_dispatch boot_cpu_has(X86_FEATURE_LFENCE_DISPATCH) #define cpu_has_xen_lbr boot_cpu_has(X86_FEATURE_XEN_LBR) +#define cpu_has_xen_shstk boot_cpu_has(X86_FEATURE_XEN_SHSTK) #define cpu_has_msr_tsc_aux (cpu_has_rdtscp || cpu_has_rdpid) diff --git a/xen/include/asm-x86/cpufeatures.h b/xen/include/asm-x86/cpufeatures.h index b9d3cac975..d7e42d9bb6 100644 --- a/xen/include/asm-x86/cpufeatures.h +++ b/xen/include/asm-x86/cpufeatures.h @@ -38,6 +38,7 @@ XEN_CPUFEATURE(XEN_LBR, X86_SYNTH(22)) /* Xen uses MSR_DEBUGCTL.LBR */ XEN_CPUFEATURE(SC_VERW_PV, X86_SYNTH(23)) /* VERW used by Xen for PV */ XEN_CPUFEATURE(SC_VERW_HVM, X86_SYNTH(24)) /* VERW used by Xen for HVM */ XEN_CPUFEATURE(SC_VERW_IDLE, X86_SYNTH(25)) /* VERW used by Xen for idle */ +XEN_CPUFEATURE(XEN_SHSTK, X86_SYNTH(26)) /* Xen uses CET Shadow Stacks */ /* Bug words follow the synthetic words. */ #define X86_NR_BUG 1 diff --git a/xen/scripts/Kconfig.include b/xen/scripts/Kconfig.include index 8221095ca3..e1f13e1720 100644 --- a/xen/scripts/Kconfig.include +++ b/xen/scripts/Kconfig.include @@ -31,6 +31,10 @@ cc-option = $(success,$(CC) -Werror $(CLANG_FLAGS) $(1) -E -x c /dev/null -o /de # Return y if the linker supports , n otherwise ld-option = $(success,$(LD) -v $(1)) +# $(as-instr,) +# Return y if the assembler supports , n otherwise +as-instr = $(success,printf "%b\n" "$(1)" | $(CC) $(CLANG_FLAGS) -c -x assembler -o /dev/null -) + # check if $(CC) and $(LD) exist $(error-if,$(failure,command -v $(CC)),compiler '$(CC)' not found) $(error-if,$(failure,command -v $(LD)),linker '$(LD)' not found) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:22:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:22:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOe-0000eL-P6; Fri, 29 May 2020 22:22:36 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOd-0000e8-Ng for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:35 +0000 X-Inumbo-ID: e5443752-a1fa-11ea-a922-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e5443752-a1fa-11ea-a922-12813bfff9fa; Fri, 29 May 2020 22:22:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=bhrOA/UtmBg9gQkKbgKyoMdQCrBgPd1VVf0MwILavAw=; b=tTeSqnZV2OzdYDdOXUq8NdKu1r MUkjNtePFA+j/9JU20uXjwbU9IIvqZl7nj9h0cEoT6S4rGsESl/co68cl3az/8owD3z1/DzsAhGfm AuktadaethZywqEFDbky5uE9/BoMM/oGjxXUWwE6SBPVYkEHwhn0FpyEYcH4SXit8dXY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOc-0000d3-Pn for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenOc-0005H5-Os for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/traps: Implement #CP handler and extend #PF for shadow stacks Message-Id: Date: Fri, 29 May 2020 22:22:34 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 5ad05b9c249060fb0f8e8afb9215b08f04579f17 Author: Andrew Cooper AuthorDate: Fri Feb 21 17:56:57 2020 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/traps: Implement #CP handler and extend #PF for shadow stacks For now, any #CP exception or shadow stack #PF indicate a bug in Xen, but attempt to recover from #CP if taken in guest context. This will of course have to change as part of introducing CET-SS support for PV guests. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/traps.c | 46 ++++++++++++++++++++++++++++++++++++++++- xen/arch/x86/x86_64/entry.S | 7 ++++++- xen/include/asm-x86/processor.h | 2 ++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index eeb3e146ef..7477bd93cc 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -156,7 +156,9 @@ void (* const exception_table[TRAP_nr])(struct cpu_user_regs *regs) = { [TRAP_alignment_check] = do_trap, [TRAP_machine_check] = (void *)do_machine_check, [TRAP_simd_error] = do_trap, - [TRAP_virtualisation ... + [TRAP_virtualisation] = do_reserved_trap, + [X86_EXC_CP] = do_entry_CP, + [X86_EXC_CP + 1 ... (ARRAY_SIZE(exception_table) - 1)] = do_reserved_trap, }; @@ -1431,6 +1433,10 @@ void do_page_fault(struct cpu_user_regs *regs) perfc_incr(page_faults); + /* Any shadow stack access fault is a bug in Xen. */ + if ( error_code & PFEC_shstk ) + goto fatal; + if ( unlikely(fixup_page_fault(addr, regs) != 0) ) return; @@ -1898,6 +1904,43 @@ void do_debug(struct cpu_user_regs *regs) pv_inject_hw_exception(TRAP_debug, X86_EVENT_NO_EC); } +void do_entry_CP(struct cpu_user_regs *regs) +{ + static const char errors[][10] = { + [1] = "near ret", + [2] = "far/iret", + [3] = "endbranch", + [4] = "rstorssp", + [5] = "setssbsy", + }; + const char *err = "??"; + unsigned int ec = regs->error_code; + + if ( debugger_trap_entry(TRAP_debug, regs) ) + return; + + /* Decode ec if possible */ + if ( ec < ARRAY_SIZE(errors) && errors[ec][0] ) + err = errors[ec]; + + /* + * For now, only supervisors shadow stacks should be active. A #CP from + * guest context is probably a Xen bug, but kill the guest in an attempt + * to recover. + */ + if ( guest_mode(regs) ) + { + gprintk(XENLOG_ERR, "Hit #CP[%04x] in guest context %04x:%p\n", + ec, regs->cs, _p(regs->rip)); + ASSERT_UNREACHABLE(); + domain_crash(current->domain); + return; + } + + show_execution_state(regs); + panic("CONTROL-FLOW PROTECTION FAULT: #CP[%04x] %s\n", ec, err); +} + static void __init noinline __set_intr_gate(unsigned int n, uint32_t dpl, void *addr) { @@ -1987,6 +2030,7 @@ void __init init_idt_traps(void) set_intr_gate(TRAP_alignment_check,&alignment_check); set_intr_gate(TRAP_machine_check,&machine_check); set_intr_gate(TRAP_simd_error,&simd_coprocessor_error); + set_intr_gate(X86_EXC_CP, entry_CP); /* Specify dedicated interrupt stacks for NMI, #DF, and #MC. */ enable_each_ist(idt_table); diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index d55453f3f3..f7ee3dce91 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -795,6 +795,10 @@ ENTRY(alignment_check) movl $TRAP_alignment_check,4(%rsp) jmp handle_exception +ENTRY(entry_CP) + movl $X86_EXC_CP, 4(%rsp) + jmp handle_exception + ENTRY(double_fault) movl $TRAP_double_fault,4(%rsp) /* Set AC to reduce chance of further SMAP faults */ @@ -940,7 +944,8 @@ autogen_stubs: /* Automatically generated stubs. */ entrypoint 1b /* Reserved exceptions, heading towards do_reserved_trap(). */ - .elseif vec == TRAP_copro_seg || vec == TRAP_spurious_int || (vec > TRAP_simd_error && vec < TRAP_nr) + .elseif vec == X86_EXC_CSO || vec == X86_EXC_SPV || \ + vec == X86_EXC_VE || (vec > X86_EXC_CP && vec < TRAP_nr) 1: test $8,%spl /* 64bit exception frames are 16 byte aligned, but the word */ jz 2f /* size is 8 bytes. Check whether the processor gave us an */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index a3d72b26ef..73354b10d2 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -68,6 +68,7 @@ #define PFEC_reserved_bit (_AC(1,U) << 3) #define PFEC_insn_fetch (_AC(1,U) << 4) #define PFEC_prot_key (_AC(1,U) << 5) +#define PFEC_shstk (_AC(1,U) << 6) #define PFEC_arch_mask (_AC(0xffff,U)) /* Architectural PFEC values. */ /* Internally used only flags. */ #define PFEC_page_paged (1U<<16) @@ -535,6 +536,7 @@ DECLARE_TRAP_HANDLER(coprocessor_error); DECLARE_TRAP_HANDLER(simd_coprocessor_error); DECLARE_TRAP_HANDLER_CONST(machine_check); DECLARE_TRAP_HANDLER(alignment_check); +DECLARE_TRAP_HANDLER(entry_CP); DECLARE_TRAP_HANDLER(entry_int82); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:22:46 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:22:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOo-0000fy-Qe; Fri, 29 May 2020 22:22:46 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOo-0000fr-03 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:46 +0000 X-Inumbo-ID: eb4ed102-a1fa-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id eb4ed102-a1fa-11ea-8993-bc764e2007e4; Fri, 29 May 2020 22:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=dQh4gdcWH8/c1aKpS/TvpXeN57EWseA0Ok83N4xIt10=; b=BGHwhmjE+r0eVPT5XI0+fKiQj3 OXHvRRtItSCCiO496Q1YSHgYMneh564+HjdzwwpIRIit+xYYZdxdkrQF0YPceiJyVGeuLqyJEkGJz PdBzIZIYXSxgQITfglsdXquLK1TbD202h3FanZYDqV+Ce5ai5hrWl2TqsYM+7IbTxyAg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOm-0000dJ-Tk for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenOm-0005IR-Sq for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/shstk: Rework the stack layout to support shadow stacks Message-Id: Date: Fri, 29 May 2020 22:22:44 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 60016604739be61faf7196637739763d01a88a48 Author: Andrew Cooper AuthorDate: Thu Apr 23 20:20:59 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/shstk: Rework the stack layout to support shadow stacks We have two free pages in the current stack. A useful property of shadow stacks and regular stacks is that they act as each others guard pages as far as OoB writes go. As wild OoB stack reads aren't likely, we don't lose any meaningful protection from using read-only guard pages in general (rather than non-present guard pages), but result is far simpler for Xen as a whole by not having a feature/mode dependent stack configuration. Move the regular IST stacks up by one page, to allow their shadow stack page to be in slot 0. The primary shadow stack uses slot 5. As the shadow IST stacks are only 1k large, shuffle the order of IST vectors to have #DF numerically highest, so there is no chance of a shadow stack overflow clobbering the supervisor token. The XPTI code already breaks the MEMORY_GUARD abstraction for stacks by forcing it to be in effect (i.e. guard page not present). To avoid having too many configurations, do away with the concept entirely, and unconditionally map the pages in their read-only form. A later change will turn these properly into shadow stacks. Some of the comments written here are the intended result, and will become true in the subsequent change. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 10 +++++----- xen/arch/x86/mm.c | 19 ++++++------------- xen/arch/x86/smpboot.c | 3 +-- xen/arch/x86/traps.c | 23 ++++++----------------- xen/include/asm-x86/config.h | 3 +++ xen/include/asm-x86/current.h | 12 ++++++------ xen/include/asm-x86/mm.h | 1 - xen/include/asm-x86/processor.h | 6 +++--- 8 files changed, 30 insertions(+), 47 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 09b911b3ba..690fd8baa8 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -753,14 +753,14 @@ void load_system_tables(void) * valid on every instruction boundary. (Note: these are all * semantically ACCESS_ONCE() due to tss's volatile qualifier.) * - * rsp0 refers to the primary stack. #MC, #DF, NMI and #DB handlers + * rsp0 refers to the primary stack. #MC, NMI, #DB and #DF handlers * each get their own stacks. No IO Bitmap. */ tss->rsp0 = stack_bottom; - tss->ist[IST_MCE - 1] = stack_top + IST_MCE * PAGE_SIZE; - tss->ist[IST_DF - 1] = stack_top + IST_DF * PAGE_SIZE; - tss->ist[IST_NMI - 1] = stack_top + IST_NMI * PAGE_SIZE; - tss->ist[IST_DB - 1] = stack_top + IST_DB * PAGE_SIZE; + tss->ist[IST_MCE - 1] = stack_top + (1 + IST_MCE) * PAGE_SIZE; + tss->ist[IST_NMI - 1] = stack_top + (1 + IST_NMI) * PAGE_SIZE; + tss->ist[IST_DB - 1] = stack_top + (1 + IST_DB) * PAGE_SIZE; + tss->ist[IST_DF - 1] = stack_top + (1 + IST_DF) * PAGE_SIZE; tss->bitmap = IOBMP_INVALID_OFFSET; /* All other stack pointers poisioned. */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 54980b4eb1..5468651876 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5997,25 +5997,18 @@ void memguard_unguard_range(void *p, unsigned long l) void memguard_guard_stack(void *p) { - /* IST_MAX IST pages + at least 1 guard page + primary stack. */ - BUILD_BUG_ON((IST_MAX + 1) * PAGE_SIZE + PRIMARY_STACK_SIZE > STACK_SIZE); + map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, _PAGE_NONE); - memguard_guard_range(p + IST_MAX * PAGE_SIZE, - STACK_SIZE - PRIMARY_STACK_SIZE - IST_MAX * PAGE_SIZE); + p += PRIMARY_SHSTK_SLOT * PAGE_SIZE; + map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, _PAGE_NONE); } void memguard_unguard_stack(void *p) { - memguard_unguard_range(p + IST_MAX * PAGE_SIZE, - STACK_SIZE - PRIMARY_STACK_SIZE - IST_MAX * PAGE_SIZE); -} - -bool memguard_is_stack_guard_page(unsigned long addr) -{ - addr &= STACK_SIZE - 1; + map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, PAGE_HYPERVISOR_RW); - return addr >= IST_MAX * PAGE_SIZE && - addr < STACK_SIZE - PRIMARY_STACK_SIZE; + p += PRIMARY_SHSTK_SLOT * PAGE_SIZE; + map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, PAGE_HYPERVISOR_RW); } void arch_dump_shared_mem_info(void) diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 170ab24e66..13b3dade9c 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -823,8 +823,7 @@ static int setup_cpu_root_pgt(unsigned int cpu) /* Install direct map page table entries for stack, IDT, and TSS. */ for ( off = rc = 0; !rc && off < STACK_SIZE; off += PAGE_SIZE ) - if ( !memguard_is_stack_guard_page(off) ) - rc = clone_mapping(__va(__pa(stack_base[cpu])) + off, rpt); + rc = clone_mapping(__va(__pa(stack_base[cpu])) + off, rpt); if ( !rc ) rc = clone_mapping(idt_tables[cpu], rpt); diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 7477bd93cc..39a1f35bc1 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -365,20 +365,15 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) /* * Notes for get_stack_trace_bottom() and get_stack_dump_bottom() * - * Stack pages 0 - 3: + * Stack pages 1 - 4: * These are all 1-page IST stacks. Each of these stacks have an exception * frame and saved register state at the top. The interesting bound for a * trace is the word adjacent to this, while the bound for a dump is the * very top, including the exception frame. * - * Stack pages 4 and 5: - * None of these are particularly interesting. With MEMORY_GUARD, page 5 is - * explicitly not present, so attempting to dump or trace it is - * counterproductive. Without MEMORY_GUARD, it is possible for a call chain - * to use the entire primary stack and wander into page 5. In this case, - * consider these pages an extension of the primary stack to aid debugging - * hopefully rare situations where the primary stack has effective been - * overflown. + * Stack pages 0 and 5: + * Shadow stacks. These are mapped read-only, and used by CET-SS capable + * processors. They will never contain regular stack data. * * Stack pages 6 and 7: * These form the primary stack, and have a cpu_info at the top. For a @@ -392,13 +387,10 @@ unsigned long get_stack_trace_bottom(unsigned long sp) { switch ( get_stack_page(sp) ) { - case 0 ... 3: + case 1 ... 4: return ROUNDUP(sp, PAGE_SIZE) - offsetof(struct cpu_user_regs, es) - sizeof(unsigned long); -#ifndef MEMORY_GUARD - case 4 ... 5: -#endif case 6 ... 7: return ROUNDUP(sp, STACK_SIZE) - sizeof(struct cpu_info) - sizeof(unsigned long); @@ -412,12 +404,9 @@ unsigned long get_stack_dump_bottom(unsigned long sp) { switch ( get_stack_page(sp) ) { - case 0 ... 3: + case 1 ... 4: return ROUNDUP(sp, PAGE_SIZE) - sizeof(unsigned long); -#ifndef MEMORY_GUARD - case 4 ... 5: -#endif case 6 ... 7: return ROUNDUP(sp, STACK_SIZE) - sizeof(unsigned long); diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index 266d281718..f3cf5df462 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -75,6 +75,9 @@ /* Primary stack is restricted to 8kB by guard pages. */ #define PRIMARY_STACK_SIZE 8192 +/* Primary shadow stack is slot 5 of 8, immediately under the primary stack. */ +#define PRIMARY_SHSTK_SLOT 5 + /* Total size of syscall and emulation stubs. */ #define STUB_BUF_SHIFT (L1_CACHE_SHIFT > 7 ? L1_CACHE_SHIFT : 7) #define STUB_BUF_SIZE (1 << STUB_BUF_SHIFT) diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 5b8f4dbc79..99b66a0087 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -16,12 +16,12 @@ * * 7 - Primary stack (with a struct cpu_info at the top) * 6 - Primary stack - * 5 - Optionally not present (MEMORY_GUARD) - * 4 - Unused; optionally not present (MEMORY_GUARD) - * 3 - Unused; optionally not present (MEMORY_GUARD) - * 2 - MCE IST stack - * 1 - NMI IST stack - * 0 - Double Fault IST stack + * 5 - Primay Shadow Stack (read-only) + * 4 - #DF IST stack + * 3 - #DB IST stack + * 2 - NMI IST stack + * 1 - #MC IST stack + * 0 - IST Shadow Stacks (4x 1k, read-only) */ /* diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index 3d3f9d49ac..7e74996053 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -536,7 +536,6 @@ void memguard_unguard_range(void *p, unsigned long l); void memguard_guard_stack(void *p); void memguard_unguard_stack(void *p); -bool __attribute_const__ memguard_is_stack_guard_page(unsigned long addr); struct mmio_ro_emulate_ctxt { unsigned long cr2; diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 73354b10d2..67119fb5c5 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -445,10 +445,10 @@ struct tss_page { DECLARE_PER_CPU(struct tss_page, tss_page); #define IST_NONE 0UL -#define IST_DF 1UL +#define IST_MCE 1UL #define IST_NMI 2UL -#define IST_MCE 3UL -#define IST_DB 4UL +#define IST_DB 3UL +#define IST_DF 4UL #define IST_MAX 4UL /* Set the Interrupt Stack Table used by a particular IDT entry. */ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:22:56 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:22:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOy-0000h4-SM; Fri, 29 May 2020 22:22:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOx-0000gt-TR for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:55 +0000 X-Inumbo-ID: f15aa918-a1fa-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f15aa918-a1fa-11ea-8993-bc764e2007e4; Fri, 29 May 2020 22:22:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=sAJp8pQOzkwE7gfDcwRFypbwS4MUOIs7TlJrjUQbXf4=; b=JDe7AOC84UohAyt7ToFpHI3iNz 2/YyJUYC8tztviH923hHjmjWBc+UEB04R/ayBZ5C07v/+4p4m1zgfuIbAhcpiAEkZ4GLKdGbUKdDb IsCpb8AtmmrKgP18/0zeQIIxoQOKtgGemSdVoaWrcPR/RDiUztiaJwx0pZevoapJd8Gg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenOx-0000dY-1v for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenOx-0005Jm-0d for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:22:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/shstk: Create shadow stacks Message-Id: Date: Fri, 29 May 2020 22:22:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 91d26ed304ff562f341824be12bf49bd78c39e39 Author: Andrew Cooper AuthorDate: Thu Apr 23 20:20:59 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/shstk: Create shadow stacks Introduce HYPERVISOR_SHSTK pagetable constants, which are Read-Only + Dirty. Use these in place of _PAGE_RW for memguard_guard_stack(), to create real shadow stacks on capable hardware. Supervisor shadow stacks need a token written at the top, which is most easily done before making the frame read only. Allocate the shadow IST stack block in struct tss_page. It doesn't strictly need to live here, but it is a convenient location (and XPTI-safe, for testing purposes), and placing it ahead of the TSS doesn't risk colliding with a bad IO Bitmap offset and turning into some IO port permissions. Have load_system_tables() set up the shadow IST stack table when setting up the regular IST in the TSS. Signed-off-by: Andrew Cooper --- xen/arch/x86/cpu/common.c | 23 +++++++++++++++++++++++ xen/arch/x86/mm.c | 25 +++++++++++++++++++++++-- xen/include/asm-x86/config.h | 2 ++ xen/include/asm-x86/page.h | 1 + xen/include/asm-x86/processor.h | 3 ++- xen/include/asm-x86/x86_64/page.h | 1 + 6 files changed, 52 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 690fd8baa8..f483c81b7c 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -769,6 +769,29 @@ void load_system_tables(void) tss->rsp1 = 0x8600111111111111ul; tss->rsp2 = 0x8600111111111111ul; + /* + * Set up the shadow stack IST. Used entries must point at the + * supervisor stack token. Unused entries are poisoned. + * + * This IST Table may be live, and the NMI/#MC entries must + * remain valid on every instruction boundary, hence the + * volatile qualifier. + */ + if (cpu_has_xen_shstk) { + volatile uint64_t *ist_ssp = this_cpu(tss_page).ist_ssp; + + ist_ssp[0] = 0x8600111111111111ul; + ist_ssp[IST_MCE] = stack_top + (IST_MCE * IST_SHSTK_SIZE) - 8; + ist_ssp[IST_NMI] = stack_top + (IST_NMI * IST_SHSTK_SIZE) - 8; + ist_ssp[IST_DB] = stack_top + (IST_DB * IST_SHSTK_SIZE) - 8; + ist_ssp[IST_DF] = stack_top + (IST_DF * IST_SHSTK_SIZE) - 8; + for ( i = IST_DF + 1; + i < ARRAY_SIZE(this_cpu(tss_page).ist_ssp); ++i ) + ist_ssp[i] = 0x8600111111111111ul; + + wrmsrl(MSR_INTERRUPT_SSP_TABLE, (unsigned long)ist_ssp); + } + BUILD_BUG_ON(sizeof(*tss) <= 0x67); /* Mandated by the architecture. */ _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss, diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 5468651876..c9847043db 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5995,12 +5995,33 @@ void memguard_unguard_range(void *p, unsigned long l) #endif +static void write_sss_token(unsigned long *ptr) +{ + /* + * A supervisor shadow stack token is its own linear address, with the + * busy bit (0) clear. + */ + *ptr = (unsigned long)ptr; +} + void memguard_guard_stack(void *p) { - map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, _PAGE_NONE); + /* IST Shadow stacks. 4x 1k in stack page 0. */ + if ( IS_ENABLED(CONFIG_XEN_SHSTK) ) + { + write_sss_token(p + (IST_MCE * IST_SHSTK_SIZE) - 8); + write_sss_token(p + (IST_NMI * IST_SHSTK_SIZE) - 8); + write_sss_token(p + (IST_DB * IST_SHSTK_SIZE) - 8); + write_sss_token(p + (IST_DF * IST_SHSTK_SIZE) - 8); + } + map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, PAGE_HYPERVISOR_SHSTK); + /* Primary Shadow Stack. 1x 4k in stack page 5. */ p += PRIMARY_SHSTK_SLOT * PAGE_SIZE; - map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, _PAGE_NONE); + if ( IS_ENABLED(CONFIG_XEN_SHSTK) ) + write_sss_token(p + PAGE_SIZE - 8); + + map_pages_to_xen((unsigned long)p, virt_to_mfn(p), 1, PAGE_HYPERVISOR_SHSTK); } void memguard_unguard_stack(void *p) diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h index f3cf5df462..2ba234383d 100644 --- a/xen/include/asm-x86/config.h +++ b/xen/include/asm-x86/config.h @@ -66,6 +66,8 @@ #define STACK_ORDER 3 #define STACK_SIZE (PAGE_SIZE << STACK_ORDER) +#define IST_SHSTK_SIZE 1024 + #define TRAMPOLINE_STACK_SPACE PAGE_SIZE #define TRAMPOLINE_SPACE (KB(64) - TRAMPOLINE_STACK_SPACE) #define WAKEUP_STACK_MIN 3072 diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h index 5acf3d3d5a..f632affaef 100644 --- a/xen/include/asm-x86/page.h +++ b/xen/include/asm-x86/page.h @@ -364,6 +364,7 @@ void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t); _PAGE_DIRTY | _PAGE_RW) #define __PAGE_HYPERVISOR_UCMINUS (__PAGE_HYPERVISOR | _PAGE_PCD) #define __PAGE_HYPERVISOR_UC (__PAGE_HYPERVISOR | _PAGE_PCD | _PAGE_PWT) +#define __PAGE_HYPERVISOR_SHSTK (__PAGE_HYPERVISOR_RO | _PAGE_DIRTY) #define MAP_SMALL_PAGES _PAGE_AVAIL0 /* don't use superpages mappings */ diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index 67119fb5c5..fcd0605786 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -440,7 +440,8 @@ struct __packed tss64 { uint16_t :16, bitmap; }; struct tss_page { - struct tss64 __aligned(PAGE_SIZE) tss; + uint64_t __aligned(PAGE_SIZE) ist_ssp[8]; + struct tss64 tss; }; DECLARE_PER_CPU(struct tss_page, tss_page); diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 9876634881..26621f9519 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -171,6 +171,7 @@ static inline intpte_t put_pte_flags(unsigned int x) #define PAGE_HYPERVISOR_RW (__PAGE_HYPERVISOR_RW | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_RX (__PAGE_HYPERVISOR_RX | _PAGE_GLOBAL) #define PAGE_HYPERVISOR_RWX (__PAGE_HYPERVISOR | _PAGE_GLOBAL) +#define PAGE_HYPERVISOR_SHSTK (__PAGE_HYPERVISOR_SHSTK | _PAGE_GLOBAL) #define PAGE_HYPERVISOR PAGE_HYPERVISOR_RW #define PAGE_HYPERVISOR_UCMINUS (__PAGE_HYPERVISOR_UCMINUS | \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:23:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:23:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenP9-0000iY-03; Fri, 29 May 2020 22:23:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenP7-0000iM-Q2 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:05 +0000 X-Inumbo-ID: f75cf050-a1fa-11ea-a922-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id f75cf050-a1fa-11ea-a922-12813bfff9fa; Fri, 29 May 2020 22:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q+a4X/6Rk6Cmd1t664QKiet4H/rDW3rT0Xwi5yhyACg=; b=Qj1uptlIUoftOhxYeyAeheYPQn sQ53lwij1eufipoxqRrl6g0Iz1fYMmHisM4EyfmATzVWRumST5CN9k8qvi6qDkiXRu10/UKQ5UpB8 ROOEf3DsOKxRmvgoaL1VYqP0ha6vcTvdbkbmWTbg/3wRFbk7sGmUSuT98lTdtnc6Fbn8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenP7-0000e0-5B for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenP7-0005Kp-4I for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/cpu: Adjust enable_nmis() to be shadow stack compatible Message-Id: Date: Fri, 29 May 2020 22:23:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit e952f1d67b5641bb560fbff6b80555808faf7935 Author: Andrew Cooper AuthorDate: Fri Feb 21 17:56:57 2020 +0000 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/cpu: Adjust enable_nmis() to be shadow stack compatible When executing an IRET-to-self, the shadow stack must agree with the regular stack. We can't manipulate SSP directly, so have to fake a shadow IRET frame by executing 3 CALLs, then editing the result to look correct. This is not a fastpath, is called on the BSP long before CET can be set up, and may be called on the crash path after CET is disabled. Use the fact that INCSSP is allocated from the hint nop space to construct a test for CET being active which is safe on all processors. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/asm-x86/processor.h | 43 +++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/xen/include/asm-x86/processor.h b/xen/include/asm-x86/processor.h index fcd0605786..9acb80fdcd 100644 --- a/xen/include/asm-x86/processor.h +++ b/xen/include/asm-x86/processor.h @@ -550,17 +550,40 @@ static inline void enable_nmis(void) { unsigned long tmp; - asm volatile ( "mov %%rsp, %[tmp] \n\t" - "push %[ss] \n\t" - "push %[tmp] \n\t" - "pushf \n\t" - "push %[cs] \n\t" - "lea 1f(%%rip), %[tmp] \n\t" - "push %[tmp] \n\t" - "iretq; 1: \n\t" - : [tmp] "=&r" (tmp) + asm volatile ( "mov %%rsp, %[rsp] \n\t" + "lea .Ldone(%%rip), %[rip] \n\t" +#ifdef CONFIG_XEN_SHSTK + /* Check for CET-SS being active. */ + "mov $1, %k[ssp] \n\t" + "rdsspq %[ssp] \n\t" + "cmp $1, %k[ssp] \n\t" + "je .Lshstk_done \n\t" + + /* Push 3 words on the shadow stack */ + ".rept 3 \n\t" + "call 1f; nop; 1: \n\t" + ".endr \n\t" + + /* Fixup to be an IRET shadow stack frame */ + "wrssq %q[cs], -1*8(%[ssp]) \n\t" + "wrssq %[rip], -2*8(%[ssp]) \n\t" + "wrssq %[ssp], -3*8(%[ssp]) \n\t" + + ".Lshstk_done:" +#endif + /* Write an IRET regular frame */ + "push %[ss] \n\t" + "push %[rsp] \n\t" + "pushf \n\t" + "push %q[cs] \n\t" + "push %[rip] \n\t" + "iretq \n\t" + ".Ldone: \n\t" + : [rip] "=&r" (tmp), + [rsp] "=&r" (tmp), + [ssp] "=&r" (tmp) : [ss] "i" (__HYPERVISOR_DS), - [cs] "i" (__HYPERVISOR_CS) ); + [cs] "r" (__HYPERVISOR_CS) ); } void sysenter_entry(void); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:23:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:23:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPJ-0000jc-1X; Fri, 29 May 2020 22:23:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPH-0000jR-Sf for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:15 +0000 X-Inumbo-ID: fd601b44-a1fa-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fd601b44-a1fa-11ea-9947-bc764e2007e4; Fri, 29 May 2020 22:23:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=h4o939IWMCFeY/A1ejm21Ip2Zg3wG8Ai1WYCTVhzetA=; b=XPCfa7muzwB8CYUQxV+eq+s8Ng b+V/Uh7QpLZ0Kjt97mPA0jsrXRldPfFqd4A+/C0G/beXlQl0t7pXIc/qllZsjymFsfm1+l72jtGB8 YhDkT2pWWeKT7HMUTzgGM4f9TfGR39Tx3QyW+KyagLLK4kHrWLNFTCE4wpNZrUinQXjQ=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPH-0000eB-82 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenPH-0005MK-7J for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/cpu: Adjust reset_stack_and_jump() to be shadow stack compatible Message-Id: Date: Fri, 29 May 2020 22:23:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 18533cfc919172d0df8ce387ffc8e495f7077ee5 Author: Andrew Cooper AuthorDate: Fri Apr 24 14:38:02 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/cpu: Adjust reset_stack_and_jump() to be shadow stack compatible We need to unwind up to the supervisor token. See the comment for details. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/asm-x86/current.h | 48 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/current.h b/xen/include/asm-x86/current.h index 99b66a0087..51a4cdbf7c 100644 --- a/xen/include/asm-x86/current.h +++ b/xen/include/asm-x86/current.h @@ -124,13 +124,55 @@ unsigned long get_stack_dump_bottom (unsigned long sp); # define CHECK_FOR_LIVEPATCH_WORK "" #endif +#ifdef CONFIG_XEN_SHSTK +/* + * We need to unwind the primary shadow stack to its supervisor token, located + * in the last word of the primary shadow stack. + * + * Read the shadow stack pointer, subtract it from supervisor token position, + * and divide by 8 to get the number of slots needing popping. + * + * INCSSPQ can't pop more than 255 entries. We shouldn't ever need to pop + * that many entries, and getting this wrong will cause us to #DF later. Turn + * it into a BUG() now for fractionally easier debugging. + */ +# define SHADOW_STACK_WORK \ + "mov $1, %[ssp];" \ + "rdsspd %[ssp];" \ + "cmp $1, %[ssp];" \ + "je .L_shstk_done.%=;" /* CET not active? Skip. */ \ + "mov $%c[skstk_base], %[val];" \ + "and $%c[stack_mask], %[ssp];" \ + "sub %[ssp], %[val];" \ + "shr $3, %[val];" \ + "cmp $255, %[val];" /* More than 255 entries? Crash. */ \ + UNLIKELY_START(a, shstk_adjust) \ + _ASM_BUGFRAME_TEXT(0) \ + UNLIKELY_END_SECTION ";" \ + "incsspq %q[val];" \ + ".L_shstk_done.%=:" +#else +# define SHADOW_STACK_WORK "" +#endif + #define switch_stack_and_jump(fn, instr) \ ({ \ + unsigned int tmp; \ __asm__ __volatile__ ( \ - "mov %0,%%"__OP"sp;" \ + SHADOW_STACK_WORK \ + "mov %[stk], %%rsp;" \ instr \ - "jmp %c1" \ - : : "r" (guest_cpu_user_regs()), "i" (fn) : "memory" ); \ + "jmp %c[fun];" \ + : [val] "=&r" (tmp), \ + [ssp] "=&r" (tmp) \ + : [stk] "r" (guest_cpu_user_regs()), \ + [fun] "i" (fn), \ + [skstk_base] "i" \ + ((PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8), \ + [stack_mask] "i" (STACK_SIZE - 1), \ + _ASM_BUGFRAME_INFO(BUGFRAME_bug, __LINE__, \ + __FILE__, NULL) \ + : "memory" ); \ unreachable(); \ }) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:23:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:23:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPT-0000kb-31; Fri, 29 May 2020 22:23:27 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPR-0000kO-SS for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:25 +0000 X-Inumbo-ID: 0362ecd8-a1fb-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0362ecd8-a1fb-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 22:23:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=GBF+lbIHdiF3J79lS0s8pIYIBg07QMKURvz6k/nFdgc=; b=FdCpSSiNQYDfxNJy1fb7FHB6CN ysUfpEaqla/OVcK6hA4I3SFb12ULgu8+fvQy5WMCH2jFxYo80aapVElmoHIYP0fg3F6Yhj7PStShJ RfZpTmj5hW+cW8iN1uN7TtQnsEXfDw0ktPDF+J0+VC5dCI1RuA+UmoqBH8KlnBC+7YCU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPR-0000f1-Ax for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenPR-0005NA-A6 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/spec-ctrl: Adjust DO_OVERWRITE_RSB to be shadow stack compatible Message-Id: Date: Fri, 29 May 2020 22:23:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 4648cba0a60a660e7ecb06bc552e785250b38b45 Author: Andrew Cooper AuthorDate: Fri Apr 24 14:19:52 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/spec-ctrl: Adjust DO_OVERWRITE_RSB to be shadow stack compatible The 32 calls need dropping from the shadow stack as well as the regular stack. To shorten the code, we can use the 32bit forms of RDSSP/INCSSP, but need to double up the input to INCSSP to counter the operand size based multiplier. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/include/asm-x86/spec_ctrl_asm.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/xen/include/asm-x86/spec_ctrl_asm.h b/xen/include/asm-x86/spec_ctrl_asm.h index c60093b090..cb34299a86 100644 --- a/xen/include/asm-x86/spec_ctrl_asm.h +++ b/xen/include/asm-x86/spec_ctrl_asm.h @@ -83,9 +83,9 @@ * Requires nothing * Clobbers \tmp (%rax by default), %rcx * - * Requires 256 bytes of stack space, but %rsp has no net change. Based on - * Google's performance numbers, the loop is unrolled to 16 iterations and two - * calls per iteration. + * Requires 256 bytes of {,shadow}stack space, but %rsp/SSP has no net + * change. Based on Google's performance numbers, the loop is unrolled to 16 + * iterations and two calls per iteration. * * The call filling the RSB needs a nonzero displacement. A nop would do, but * we use "1: pause; lfence; jmp 1b" to safely contains any ret-based @@ -114,6 +114,16 @@ sub $1, %ecx jnz .L\@_fill_rsb_loop mov %\tmp, %rsp /* Restore old %rsp */ + +#ifdef CONFIG_XEN_SHSTK + mov $1, %ecx + rdsspd %ecx + cmp $1, %ecx + je .L\@_shstk_done + mov $64, %ecx /* 64 * 4 bytes, given incsspd */ + incsspd %ecx /* Restore old SSP */ +.L\@_shstk_done: +#endif .endm .macro DO_SPEC_CTRL_ENTRY_FROM_HVM -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:23:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:23:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPd-0000lq-5K; Fri, 29 May 2020 22:23:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPc-0000lj-6w for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:36 +0000 X-Inumbo-ID: 09679426-a1fb-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 09679426-a1fb-11ea-9947-bc764e2007e4; Fri, 29 May 2020 22:23:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=mbp8ejEyX9qMcGKB9KcIsBwA75NI4XlqB9qisKKCKSQ=; b=ww97oqBCPV3y2uVszf+Vm1CedM 6384JsI1jrVzPevHii2w/Zrxq8q6iqY24HpxH997cklLtSZmAewDNF+hg3EOLpHne2SzzXwmeHdft Ngvnt+x1hDP/PCdkOho2Mj4nQBNrZGMCzC5t/W7C9TG582LiBvCOuM1vtL7i3Jo1DFzk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPb-0000fA-Du for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenPb-0005Nv-DA for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/extable: Adjust extable handling to be shadow stack compatible Message-Id: Date: Fri, 29 May 2020 22:23:35 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 209fb9919b5085f97c7fcf339fa8535e025e8d78 Author: Andrew Cooper AuthorDate: Thu Apr 30 15:05:24 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/extable: Adjust extable handling to be shadow stack compatible When adjusting an IRET frame to recover from a fault, and equivalent adjustment needs making in the shadow IRET frame. The adjustment in exception_with_ints_disabled() could in principle be an alternative block rather than an ifdef, as the only two current users of _PRE_EXTABLE() are IRET-to-guest instructions. However, this is not a fastpath, and this form is more robust to future changes. Signed-off-by: Andrew Cooper --- xen/arch/x86/traps.c | 66 ++++++++++++++++++++++++++++++++++++++++++++- xen/arch/x86/x86_64/entry.S | 11 +++++++- 2 files changed, 75 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 39a1f35bc1..bc5b8f8ea3 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -363,7 +363,7 @@ static void show_guest_stack(struct vcpu *v, const struct cpu_user_regs *regs) } /* - * Notes for get_stack_trace_bottom() and get_stack_dump_bottom() + * Notes for get_{stack,shstk}*_bottom() helpers * * Stack pages 1 - 4: * These are all 1-page IST stacks. Each of these stacks have an exception @@ -400,6 +400,18 @@ unsigned long get_stack_trace_bottom(unsigned long sp) } } +static unsigned long get_shstk_bottom(unsigned long sp) +{ + switch ( get_stack_page(sp) ) + { +#ifdef CONFIG_XEN_SHSTK + case 0: return ROUNDUP(sp, IST_SHSTK_SIZE) - sizeof(unsigned long); + case 5: return ROUNDUP(sp, PAGE_SIZE) - sizeof(unsigned long); +#endif + default: return sp - sizeof(unsigned long); + } +} + unsigned long get_stack_dump_bottom(unsigned long sp) { switch ( get_stack_page(sp) ) @@ -763,6 +775,55 @@ static void do_reserved_trap(struct cpu_user_regs *regs) trapnr, vec_name(trapnr), regs->error_code); } +static void extable_shstk_fixup(struct cpu_user_regs *regs, unsigned long fixup) +{ + unsigned long ssp, *ptr, *base; + + asm ( "rdsspq %0" : "=r" (ssp) : "0" (1) ); + if ( ssp == 1 ) + return; + + ptr = _p(ssp); + base = _p(get_shstk_bottom(ssp)); + + for ( ; ptr < base; ++ptr ) + { + /* + * Search for %rip. The shstk currently looks like this: + * + * ... [Likely pointed to by SSP] + * %cs [== regs->cs] + * %rip [== regs->rip] + * SSP [Likely points to 3 slots higher, above %cs] + * ... [call tree to this function, likely 2/3 slots] + * + * and we want to overwrite %rip with fixup. There are two + * complications: + * 1) We cant depend on SSP values, because they won't differ by 3 + * slots if the exception is taken on an IST stack. + * 2) There are synthetic (unrealistic but not impossible) scenarios + * where %rip can end up in the call tree to this function, so we + * can't check against regs->rip alone. + * + * Check for both regs->rip and regs->cs matching. + */ + if ( ptr[0] == regs->rip && ptr[1] == regs->cs ) + { + asm ( "wrssq %[fix], %[stk]" + : [stk] "=m" (ptr[0]) + : [fix] "r" (fixup) ); + return; + } + } + + /* + * We failed to locate and fix up the shadow IRET frame. This could be + * due to shadow stack corruption, or bad logic above. We cannot continue + * executing the interrupted context. + */ + BUG(); +} + static bool extable_fixup(struct cpu_user_regs *regs, bool print) { unsigned long fixup = search_exception_table(regs); @@ -779,6 +840,9 @@ static bool extable_fixup(struct cpu_user_regs *regs, bool print) vec_name(regs->entry_vector), regs->error_code, _p(regs->rip), _p(regs->rip), _p(fixup)); + if ( IS_ENABLED(CONFIG_XEN_SHSTK) ) + extable_shstk_fixup(regs, fixup); + regs->rip = fixup; this_cpu(last_extable_addr) = regs->rip; diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index f7ee3dce91..e68d680791 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -708,7 +708,16 @@ exception_with_ints_disabled: call search_pre_exception_table testq %rax,%rax # no fixup code for faulting EIP? jz 1b - movq %rax,UREGS_rip(%rsp) + movq %rax,UREGS_rip(%rsp) # fixup regular stack + +#ifdef CONFIG_XEN_SHSTK + mov $1, %edi + rdsspq %rdi + cmp $1, %edi + je .L_exn_shstk_done + wrssq %rax, 1*8(%rdi) # fixup shadow stack +.L_exn_shstk_done: +#endif subq $8,UREGS_rsp(%rsp) # add ec/ev to previous stack frame testb $15,UREGS_rsp(%rsp) # return %rsp is now aligned? jz 1f # then there is a pad quadword already -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:23:47 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:23:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPn-0000nN-6w; Fri, 29 May 2020 22:23:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPm-0000nF-74 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:46 +0000 X-Inumbo-ID: 0f75a0ce-a1fb-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0f75a0ce-a1fb-11ea-9dbe-bc764e2007e4; Fri, 29 May 2020 22:23:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZElH2LWwEu0r0UZ2ddxNO5l3gnVd1o8RhLq4RRi1xiA=; b=yG801nkmV+6GBwOlf5ZQj0iL3x YagqFngmPRt6S42ZxI0s1i89jFWMLyPTgB6R7BKQvCAzwC22a2UgDfcP2UL+Ee8bqy0F7Cst+Eh3P wAkMVzXatp5mVNcLEcieDmcDkp+WEjNyoo0W3D+Stv9xZCJG0+Aq+o+NttSQylCNH5qw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPl-0000fJ-HO for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:45 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenPl-0005P0-GU for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:45 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/alt: Adjust _alternative_instructions() to not create shadow stacks Message-Id: Date: Fri, 29 May 2020 22:23:45 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 97c7e7994fe217656c0af00696c3e6dd5582cdef Author: Andrew Cooper AuthorDate: Fri May 1 18:10:00 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/alt: Adjust _alternative_instructions() to not create shadow stacks The current alternatives algorithm clears CR0.WP and writes into .text. This has a side effect of the mappings becoming shadow stacks once CET is active. Adjust _alternative_instructions() to clean up after itself. This involves extending the set of bits modify_xen_mappings() to include Dirty (and Accessed for good measure). Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/alternative.c | 14 ++++++++++++++ xen/arch/x86/mm.c | 6 +++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index ce2b4302e6..004e9ede25 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -398,6 +399,19 @@ static void __init _alternative_instructions(bool force) panic("Timed out waiting for alternatives self-NMI to hit\n"); set_nmi_callback(saved_nmi_callback); + + /* + * When Xen is using shadow stacks, the alternatives clearing CR0.WP and + * writing into the mappings set dirty bits, turning the mappings into + * shadow stack mappings. + * + * While we can execute from them, this would also permit them to be the + * target of WRSS instructions, so reset the dirty after patching. + */ + if ( cpu_has_xen_shstk ) + modify_xen_mappings(XEN_VIRT_START + MB(2), + (unsigned long)&__2M_text_end, + PAGE_HYPERVISOR_RX); } void __init alternative_instructions(void) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c9847043db..53e3dcb2d4 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -5443,8 +5443,8 @@ int populate_pt_range(unsigned long virt, unsigned long nr_mfns) * mappings, but will shatter superpages if necessary, and will destroy * mappings if not passed _PAGE_PRESENT. * - * The only flags considered are NX, RW and PRESENT. All other input flags - * are ignored. + * The only flags considered are NX, D, A, RW and PRESENT. All other input + * flags are ignored. * * It is an error to call with present flags over an unpopulated range. */ @@ -5457,7 +5457,7 @@ int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int nf) unsigned long v = s; /* Set of valid PTE bits which may be altered. */ -#define FLAGS_MASK (_PAGE_NX|_PAGE_RW|_PAGE_PRESENT) +#define FLAGS_MASK (_PAGE_NX|_PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_RW|_PAGE_PRESENT) nf &= FLAGS_MASK; ASSERT(IS_ALIGNED(s, PAGE_SIZE)); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:23:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:23:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPx-0000of-9t; Fri, 29 May 2020 22:23:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPw-0000oS-34 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:56 +0000 X-Inumbo-ID: 1570b964-a1fb-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1570b964-a1fb-11ea-8993-bc764e2007e4; Fri, 29 May 2020 22:23:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NUnCmwekpLi/yOBiyeOJXQEza2jmS59TOq4YKJtLQB4=; b=J4U0M9QhVo5wJuBUbOx1JWiQe3 1ZVA/MXFFbk7C8W74vcbQzvW0tIP1AldeMH6LlC8m5KtpOHd/mW2zz5Y9QRlIuTStZNEibPYwwFeh fIoVGZPPebnIIBhN0Td5WN6DfXeSPcr6n4qxt37mmk0WM5NODlqYaIB1O/YrcQIM0ulk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenPv-0000fS-KN for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:55 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenPv-0005QD-JU for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:23:55 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/EFI: Avoid mapping EFI system memory as shadow stacks Message-Id: Date: Fri, 29 May 2020 22:23:55 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 137d2d6310d31b4ace3df01832c37aa86b6173cc Author: Andrew Cooper AuthorDate: Fri May 29 21:49:13 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/EFI: Avoid mapping EFI system memory as shadow stacks Ensure the dirty bit is clear when creating read-only EFI mappings. Reported-by: Jan Beulich Signed-off-by: Andrew Cooper --- xen/common/efi/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index a6f84c945a..5a520bf21d 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1554,7 +1554,7 @@ void __init efi_init_memory(void) if ( desc->Attribute & (efi_bs_revision < EFI_REVISION(2, 5) ? EFI_MEMORY_WP : EFI_MEMORY_RO) ) - prot &= ~_PAGE_RW; + prot &= ~(_PAGE_DIRTY | _PAGE_RW); if ( desc->Attribute & EFI_MEMORY_XP ) prot |= _PAGE_NX; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:24:09 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:24:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQ9-0000pn-BY; Fri, 29 May 2020 22:24:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQ7-0000pg-M0 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:07 +0000 X-Inumbo-ID: 1b76af3a-a1fb-11ea-a922-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 1b76af3a-a1fb-11ea-a922-12813bfff9fa; Fri, 29 May 2020 22:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=BjmUmOfQ+z/TbxB3wKm2/Ajib67yvyu/NRg4nCH7pzA=; b=WMEwcdzrN3bwHo3Cz46uG5k8TD Vp2QyJm7alOFoo1xC+HAI++SEVwQM7geT7aTJaWoRY0oEKGPIY3tf15Y6PV8SlCDeF3pRp6oWfEBD CS8m6ONh9bPUMZ00VGGgZlPlQ/13X+GvaErFC86c55mIWC3UQIbpsg8+6h1A8rodrj/8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQ5-0000fr-NO for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenQ5-0005RB-Mf for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/entry: Adjust guest paths to be shadow stack compatible Message-Id: Date: Fri, 29 May 2020 22:24:05 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 43b98e71903845c727028d2e84b90e5905ff8d66 Author: Andrew Cooper AuthorDate: Fri Apr 24 14:34:44 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/entry: Adjust guest paths to be shadow stack compatible The SYSCALL/SYSENTER/SYSRET paths need to use {SET,CLR}SSBSY. The IRET to guest paths must not. In the SYSRET path, re-position the mov which loads rip into %rcx so we can use %rcx for CLRSSBSY, rather than spilling another register to the stack. While we can in principle detect shadow stack corruption and a failure to clear the supervisor token busy bit in the SYSRET path (by inspecting the carry flag following CLRSSBSY), we cannot detect similar problems for the IRET path (IRET is specified not to fault in this case). We will double fault at some point later, when next trying to enter Xen, due to an already-set supervisor shadow stack busy bit. As SYSRET is a uncommon path anyway, avoid the added complexity for no appreciable gain. The IST switch onto the primary stack is not great as we have an instruction boundary with no shadow stack. This is the least bad option available. These paths are not used before shadow stacks are properly established, so can use alternatives to avoid extra runtime CET detection logic. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/x86_64/compat/entry.S | 1 + xen/arch/x86/x86_64/entry.S | 36 ++++++++++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 3cd375bd48..2ca81341a4 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -198,6 +198,7 @@ ENTRY(cr4_pv32_restore) /* See lstar_enter for entry register state. */ ENTRY(cstar_enter) + ALTERNATIVE "", "setssbsy", X86_FEATURE_XEN_SHSTK /* sti could live here when we don't switch page tables below. */ CR4_PV32_RESTORE movq 8(%rsp),%rax /* Restore %rax. */ diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index e68d680791..6470266d2f 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -191,9 +191,16 @@ restore_all_guest: sarq $47,%rcx incl %ecx cmpl $1,%ecx - movq 8(%rsp),%rcx # RIP - ja iret_exit_to_guest + ja .Lrestore_rcx_iret_exit_to_guest + /* Clear the supervisor shadow stack token busy bit. */ +.macro rag_clrssbsy + rdsspq %rcx + clrssbsy (%rcx) +.endm + ALTERNATIVE "", rag_clrssbsy, X86_FEATURE_XEN_SHSTK + + movq 8(%rsp), %rcx # RIP cmpw $FLAT_USER_CS32,16(%rsp)# CS movq 32(%rsp),%rsp # RSP je 1f @@ -201,6 +208,8 @@ restore_all_guest: 1: sysretl ALIGN +.Lrestore_rcx_iret_exit_to_guest: + movq 8(%rsp), %rcx # RIP /* No special register assumptions. */ iret_exit_to_guest: andl $~(X86_EFLAGS_IOPL|X86_EFLAGS_NT|X86_EFLAGS_VM),24(%rsp) @@ -226,6 +235,7 @@ iret_exit_to_guest: * %ss must be saved into the space left by the trampoline. */ ENTRY(lstar_enter) + ALTERNATIVE "", "setssbsy", X86_FEATURE_XEN_SHSTK /* sti could live here when we don't switch page tables below. */ movq 8(%rsp),%rax /* Restore %rax. */ movq $FLAT_KERNEL_SS,8(%rsp) @@ -259,6 +269,7 @@ ENTRY(lstar_enter) jmp test_all_events ENTRY(sysenter_entry) + ALTERNATIVE "", "setssbsy", X86_FEATURE_XEN_SHSTK /* sti could live here when we don't switch page tables below. */ pushq $FLAT_USER_SS pushq $0 @@ -877,6 +888,27 @@ handle_ist_exception: movl $UREGS_kernel_sizeof/8,%ecx movq %rdi,%rsp rep movsq + + /* Switch Shadow Stacks */ +.macro ist_switch_shstk + rdsspq %rdi + clrssbsy (%rdi) + /* + * Switching supervisor shadow stacks is specially hard, as supervisor + * and restore tokens are incompatible. + * + * For now, we only need to switch on to an unused primary shadow + * stack, so use SETSSBSY for the purpose, exactly like the + * SYSCALL/SYSENTER entry. + * + * Ideally, we'd want to CLRSSBSY after switching stacks, but that + * will leave SSP zeroed so it not an option. Instead, we transiently + * have a zero SSP on this instruction boundary, and depend on IST for + * NMI/#MC protection. + */ + setssbsy +.endm + ALTERNATIVE "", ist_switch_shstk, X86_FEATURE_XEN_SHSTK 1: #else ASSERT_CONTEXT_IS_XEN -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:24:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:24:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQI-0000qk-DI; Fri, 29 May 2020 22:24:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQH-0000qa-C1 for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:17 +0000 X-Inumbo-ID: 21794460-a1fb-11ea-a922-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 21794460-a1fb-11ea-a922-12813bfff9fa; Fri, 29 May 2020 22:24:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=npnErA0c+tbEE52YDJPqL1RQZ86FzN6j3xYAaJkOPMY=; b=h8xCzHVz8bkbVzKoHJWlnyfTw5 Pa8aRuuRBJep7RyHXCzsqZ2tCxzQnKKfnJ1xsLtHuvoEJ5QSPccZjdi2aTVJLl3890+LavIIBQ+z4 KP/oSZ3H/i50ie5Phq4pqqyDG/DQwsT0+OlNnsYXmbtM1QOIeqx+GHxJCEjcJ8AYUYE4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQF-0000g0-QE for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenQF-0005S8-Pa for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/S3: Save and restore Shadow Stack configuration Message-Id: Date: Fri, 29 May 2020 22:24:15 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 633ecc4a7cb2d8d6d1903b39637c0d9a982b9693 Author: Andrew Cooper AuthorDate: Wed Apr 22 13:44:37 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/S3: Save and restore Shadow Stack configuration See code for details. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/acpi/wakeup_prot.S | 58 +++++++++++++++++++++++++++++++++++++++++ xen/include/asm-x86/msr-index.h | 3 +++ xen/include/asm-x86/x86-defns.h | 1 + 3 files changed, 62 insertions(+) diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S index 4dba6020a7..dcc7e2327d 100644 --- a/xen/arch/x86/acpi/wakeup_prot.S +++ b/xen/arch/x86/acpi/wakeup_prot.S @@ -1,3 +1,7 @@ +#include +#include +#include + .file __FILE__ .text .code64 @@ -15,6 +19,12 @@ ENTRY(do_suspend_lowlevel) mov %cr0, %rax mov %rax, saved_cr0(%rip) +#ifdef CONFIG_XEN_SHSTK + mov $1, %eax + rdsspq %rax + mov %rax, saved_ssp(%rip) +#endif + /* enter sleep state physically */ mov $3, %edi call acpi_enter_sleep_state @@ -48,6 +58,51 @@ ENTRY(s3_resume) pushq %rax lretq 1: +#ifdef CONFIG_XEN_SHSTK + /* + * Restoring SSP is a little complicated, because we are intercepting + * an in-use shadow stack. Write a temporary token under the stack, + * so SETSSBSY will successfully load a value useful for us, then + * reset MSR_PL0_SSP to its usual value and pop the temporary token. + */ + mov saved_rsp(%rip), %rdi + cmpq $1, %rdi + je .L_shstk_done + + /* Set up MSR_S_CET. */ + mov $MSR_S_CET, %ecx + xor %edx, %edx + mov $CET_SHSTK_EN | CET_WRSS_EN, %eax + wrmsr + + /* Construct the temporary supervisor token under SSP. */ + sub $8, %rdi + + /* Load it into MSR_PL0_SSP. */ + mov $MSR_PL0_SSP, %ecx + mov %rdi, %rdx + shr $32, %rdx + mov %edi, %eax + wrmsr + + /* Enable CET. MSR_INTERRUPT_SSP_TABLE is set up later in load_system_tables(). */ + mov $XEN_MINIMAL_CR4 | X86_CR4_CET, %ebx + mov %rbx, %cr4 + + /* Write the temporary token onto the shadow stack, and activate it. */ + wrssq %rdi, (%rdi) + setssbsy + + /* Reset MSR_PL0_SSP back to its normal value. */ + and $~(STACK_SIZE - 1), %eax + or $(PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8, %eax + wrmsr + + /* Pop the temporary token off the stack. */ + mov $2, %eax + incsspd %eax +.L_shstk_done: +#endif call load_system_tables @@ -65,6 +120,9 @@ ENTRY(s3_resume) saved_rsp: .quad 0 saved_cr0: .quad 0 +#ifdef CONFIG_XEN_SHSTK +saved_ssp: .quad 0 +#endif GLOBAL(saved_magic) .long 0x9abcdef0 diff --git a/xen/include/asm-x86/msr-index.h b/xen/include/asm-x86/msr-index.h index 5fa14ca136..a4dc48f51f 100644 --- a/xen/include/asm-x86/msr-index.h +++ b/xen/include/asm-x86/msr-index.h @@ -68,6 +68,9 @@ #define MSR_U_CET 0x000006a0 #define MSR_S_CET 0x000006a2 +#define CET_SHSTK_EN (_AC(1, ULL) << 0) +#define CET_WRSS_EN (_AC(1, ULL) << 1) + #define MSR_PL0_SSP 0x000006a4 #define MSR_PL1_SSP 0x000006a5 #define MSR_PL2_SSP 0x000006a6 diff --git a/xen/include/asm-x86/x86-defns.h b/xen/include/asm-x86/x86-defns.h index f0157e2311..28628807cb 100644 --- a/xen/include/asm-x86/x86-defns.h +++ b/xen/include/asm-x86/x86-defns.h @@ -73,6 +73,7 @@ #define X86_CR4_SMEP 0x00100000 /* enable SMEP */ #define X86_CR4_SMAP 0x00200000 /* enable SMAP */ #define X86_CR4_PKE 0x00400000 /* enable PKE */ +#define X86_CR4_CET 0x00800000 /* Control-flow Enforcement Technology */ /* * XSTATE component flags in XCR0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri May 29 22:24:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 29 May 2020 22:24:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQS-0000rm-Ex; Fri, 29 May 2020 22:24:28 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQQ-0000rc-Rr for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:26 +0000 X-Inumbo-ID: 277f7546-a1fb-11ea-81bc-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 277f7546-a1fb-11ea-81bc-bc764e2007e4; Fri, 29 May 2020 22:24:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=+yqt7iSSrzjPSiVSDqbOLyLswcP5lYUIsAk+CWV7LKM=; b=wAeJuP9oS+18sVzfouh5dXG7g6 zQ3XBnHXSGkA0KwrKWwnavsEHaCtrFSaMswXODCfQav/H+t2d7APVtscrXUfneJ1zWHhDM47BsTEx bRtIUV51dYZN3tDdyNmf0Bp2Bh9kpce7qTFrQdXkDCjg+ciUjnI2K9vgCNP4HaaTK4iY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jenQP-0000gb-TU for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jenQP-0005Sm-Sl for xen-changelog@lists.xenproject.org; Fri, 29 May 2020 22:24:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/shstk: Activate Supervisor Shadow Stacks Message-Id: Date: Fri, 29 May 2020 22:24:25 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b60ab42db2f04dcf56ebbfedfb9b0c65a75e4bac Author: Andrew Cooper AuthorDate: Wed Apr 22 13:44:37 2020 +0100 Commit: Andrew Cooper CommitDate: Fri May 29 23:09:46 2020 +0100 x86/shstk: Activate Supervisor Shadow Stacks With all other plumbing in place, activate shadow stacks when possible. Note that CET shares the similar problems to SMEP/SMAP with Ring1 being supervisor to the processor, and that the layout of the shadow stack differs between an IRET to Ring 1 and Ring 3. Therefore, we disable PV32 when CET is enabled. Compatibility can be maintained if necessary via PV-Shim. The BSP needs to wait until alternatives have run (to avoid interaction with CR0.WP), and after the first reset_stack_and_jump() to avoid having a pristine shadow stack interact in problematic ways with an in-use regular stack. Activate shadow stack in reinit_bsp_stack(). APs have all infrastructure set up by the booting CPU, so enable shadow stacks before entering C. Adjust the logic to call start_secondary rather than jump to it, so stack traces make more sense. The crash path needs to turn CET off to avoid interfering with the crash kernel's environment. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- docs/misc/xen-command-line.pandoc | 8 ++++++++ xen/arch/x86/boot/x86_64.S | 35 +++++++++++++++++++++++++++++++++-- xen/arch/x86/cpu/common.c | 5 +++++ xen/arch/x86/crash.c | 7 +++++++ xen/arch/x86/setup.c | 27 +++++++++++++++++++++++++++ xen/arch/x86/spec_ctrl.c | 8 ++++++++ 6 files changed, 88 insertions(+), 2 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index ec1c12cbe0..2d4d9639d6 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -287,6 +287,10 @@ call/jmp COP/JOP) attacks. `cet=no-shstk` will cause Xen not to use Shadow Stacks even when support is available in hardware. + Shadow Stacks are incompatible with 32bit PV guests. This option will + override the `pv=32` boolean to false. Backwards compatibility can be + maintained with the `pv-shim` mechanism. + ### clocksource (x86) > `= pit | hpet | acpi | tsc` @@ -1726,6 +1730,10 @@ Controls for aspects of PV guest support. * The `32` boolean controls whether 32bit PV guests can be created. It defaults to `true`, and is ignored when `CONFIG_PV32` is compiled out. + 32bit PV guests are incompatible with CET Shadow Stacks. If Xen is using + shadow stacks, this option will be overridden to `false`. Backwards + compatibility can be maintained with the `pv-shim` mechanism. + ### pv-linear-pt (x86) > `= ` diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 314a32a19f..551acd9e94 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -28,8 +28,39 @@ ENTRY(__high_start) lretq 1: test %ebx,%ebx - jnz start_secondary - + jz .L_bsp + + /* APs. Set up shadow stacks before entering C. */ + + testl $cpufeat_mask(X86_FEATURE_XEN_SHSTK), \ + CPUINFO_FEATURE_OFFSET(X86_FEATURE_XEN_SHSTK) + boot_cpu_data(%rip) + je .L_ap_shstk_done + + /* Set up MSR_S_CET. */ + mov $MSR_S_CET, %ecx + xor %edx, %edx + mov $CET_SHSTK_EN | CET_WRSS_EN, %eax + wrmsr + + /* Derive MSR_PL0_SSP from %rsp (token written when stack is allocated). */ + mov $MSR_PL0_SSP, %ecx + mov %rsp, %rdx + shr $32, %rdx + mov %esp, %eax + and $~(STACK_SIZE - 1), %eax + or $(PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8, %eax + wrmsr + + /* Enable CET. MSR_INTERRUPT_SSP_TABLE is set up later in load_system_tables(). */ + mov $XEN_MINIMAL_CR4 | X86_CR4_CET, %ecx + mov %rcx, %cr4 + setssbsy + +.L_ap_shstk_done: + call start_secondary + BUG /* start_secondary() shouldn't return. */ + +.L_bsp: /* Pass off the Multiboot info structure to C land (if applicable). */ mov multiboot_ptr(%rip),%edi call __start_xen diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index f483c81b7c..58f0876180 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -329,6 +329,11 @@ void __init early_cpu_init(void) x86_cpuid_vendor_to_str(c->x86_vendor), c->x86, c->x86, c->x86_model, c->x86_model, c->x86_mask, eax); + if (c->cpuid_level >= 7) { + cpuid_count(7, 0, &eax, &ebx, &ecx, &edx); + c->x86_capability[cpufeat_word(X86_FEATURE_CET_SS)] = ecx; + } + eax = cpuid_eax(0x80000000); if ((eax >> 16) == 0x8000 && eax >= 0x80000008) { eax = cpuid_eax(0x80000008); diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 450eecd46b..0611b4fb9b 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -200,6 +200,13 @@ void machine_crash_shutdown(void) /* Reset CPUID masking and faulting to the host's default. */ ctxt_switch_levelling(NULL); + /* Disable shadow stacks. */ + if ( cpu_has_xen_shstk ) + { + wrmsrl(MSR_S_CET, 0); + write_cr4(read_cr4() & ~X86_CR4_CET); + } + info = kexec_crash_save_info(); info->xen_phys_start = xen_phys_start; info->dom0_pfn_to_mfn_frame_list_list = diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 584589baff..665274674d 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -664,6 +664,14 @@ static void __init noreturn reinit_bsp_stack(void) stack_base[0] = stack; memguard_guard_stack(stack); + if ( cpu_has_xen_shstk ) + { + wrmsrl(MSR_PL0_SSP, + (unsigned long)stack + (PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8); + wrmsrl(MSR_S_CET, CET_SHSTK_EN | CET_WRSS_EN); + asm volatile ("setssbsy" ::: "memory"); + } + reset_stack_and_jump_nolp(init_done); } @@ -1065,6 +1073,21 @@ void __init noreturn __start_xen(unsigned long mbi_p) /* This must come before e820 code because it sets paddr_bits. */ early_cpu_init(); + /* Choose shadow stack early, to set infrastructure up appropriately. */ + if ( opt_xen_shstk && boot_cpu_has(X86_FEATURE_CET_SS) ) + { + printk("Enabling Supervisor Shadow Stacks\n"); + + setup_force_cpu_cap(X86_FEATURE_XEN_SHSTK); +#ifdef CONFIG_PV32 + if ( opt_pv32 ) + { + opt_pv32 = 0; + printk(" - Disabling PV32 due to Shadow Stacks\n"); + } +#endif + } + /* Sanitise the raw E820 map to produce a final clean version. */ max_page = raw_max_page = init_e820(memmap_type, &e820_raw); @@ -1801,6 +1824,10 @@ void __init noreturn __start_xen(unsigned long mbi_p) alternative_branches(); + /* Defer CR4.CET until alternatives have finished playing with CR0.WP */ + if ( cpu_has_xen_shstk ) + set_in_cr4(X86_CR4_CET); + /* * NB: when running as a PV shim VCPUOP_up/down is wired to the shim * physical cpu_add/remove functions, so launch the guest with only diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index c5d8e587a8..a94be2d594 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -881,6 +881,14 @@ void __init init_speculation_mitigations(void) hw_smt_enabled = check_smt_enabled(); + /* + * First, disable the use of retpolines if Xen is using shadow stacks, as + * they are incompatible. + */ + if ( cpu_has_xen_shstk && + (opt_thunk == THUNK_DEFAULT || opt_thunk == THUNK_RETPOLINE) ) + thunk = THUNK_JMP; + /* * Has the user specified any custom BTI mitigations? If so, follow their * instructions exactly and disable all heuristics. -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 30 01:00:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 May 2020 01:00:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jepr7-0001Xb-Ai; Sat, 30 May 2020 01:00:09 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jepr6-0000wL-1o for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 01:00:08 +0000 X-Inumbo-ID: e5c36cbe-a210-11ea-a92c-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e5c36cbe-a210-11ea-a92c-12813bfff9fa; Sat, 30 May 2020 01:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=E/6veJq8pc1v23q9TG58Q1ihLVqqiCmHV9XUyASveZk=; b=WSc4pEfgiBM5w5cn2lDi3KjCmk y6LvSXjRFrZBvLH/LtgG5dMzIfoVI6Urg4Murz17de5OeJU5X02goWgCe3h+qIbNQG1Kt0xL6jOvB yh+QWedZLog23qLIpLna27b3AA8QWg2FDyPhxrIdS07v//VuUTY/Hi67m37126afzL/4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jepr2-0005UB-Ht for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 01:00:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jepr2-0001vM-E8 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 01:00:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/CET: Fix build following c/s 43b98e7190 Message-Id: Date: Sat, 30 May 2020 01:00:04 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b586a81b7a90d424b54275c79e759b0294aa2fb6 Author: Andrew Cooper AuthorDate: Sat May 30 01:41:26 2020 +0100 Commit: Andrew Cooper CommitDate: Sat May 30 01:56:01 2020 +0100 x86/CET: Fix build following c/s 43b98e7190 OSSTest reports: x86_64.S: Assembler messages: x86_64.S:57: Error: no such instruction: `setssbsy' /home/osstest/build.150510.build-amd64/xen/xen/Rules.mk:183: recipe for target 'head.o' failed make[4]: Leaving directory '/home/osstest/build.150510.build-amd64/xen/xen/arch/x86/boot' make[4]: *** [head.o] Error 1 All use of CET instructions, even those inside alternative blocks, needs to be behind CONFIG_XEN_SHSTK, as it indicates suitable toolchain support. Signed-off-by: Andrew Cooper --- xen/arch/x86/boot/x86_64.S | 3 ++- xen/arch/x86/setup.c | 2 +- xen/arch/x86/x86_64/compat/entry.S | 2 ++ xen/arch/x86/x86_64/entry.S | 8 ++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/boot/x86_64.S b/xen/arch/x86/boot/x86_64.S index 551acd9e94..d61048c583 100644 --- a/xen/arch/x86/boot/x86_64.S +++ b/xen/arch/x86/boot/x86_64.S @@ -31,7 +31,7 @@ ENTRY(__high_start) jz .L_bsp /* APs. Set up shadow stacks before entering C. */ - +#ifdef CONFIG_XEN_SHSTK testl $cpufeat_mask(X86_FEATURE_XEN_SHSTK), \ CPUINFO_FEATURE_OFFSET(X86_FEATURE_XEN_SHSTK) + boot_cpu_data(%rip) je .L_ap_shstk_done @@ -55,6 +55,7 @@ ENTRY(__high_start) mov $XEN_MINIMAL_CR4 | X86_CR4_CET, %ecx mov %rcx, %cr4 setssbsy +#endif .L_ap_shstk_done: call start_secondary diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 665274674d..2aa1cd50b8 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -664,7 +664,7 @@ static void __init noreturn reinit_bsp_stack(void) stack_base[0] = stack; memguard_guard_stack(stack); - if ( cpu_has_xen_shstk ) + if ( IS_ENABLED(CONFIG_XEN_SHSTK) && cpu_has_xen_shstk ) { wrmsrl(MSR_PL0_SSP, (unsigned long)stack + (PRIMARY_SHSTK_SLOT + 1) * PAGE_SIZE - 8); diff --git a/xen/arch/x86/x86_64/compat/entry.S b/xen/arch/x86/x86_64/compat/entry.S index 2ca81341a4..c3e62f8734 100644 --- a/xen/arch/x86/x86_64/compat/entry.S +++ b/xen/arch/x86/x86_64/compat/entry.S @@ -198,7 +198,9 @@ ENTRY(cr4_pv32_restore) /* See lstar_enter for entry register state. */ ENTRY(cstar_enter) +#ifdef CONFIG_XEN_SHSTK ALTERNATIVE "", "setssbsy", X86_FEATURE_XEN_SHSTK +#endif /* sti could live here when we don't switch page tables below. */ CR4_PV32_RESTORE movq 8(%rsp),%rax /* Restore %rax. */ diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 6470266d2f..8b57a00040 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -193,12 +193,14 @@ restore_all_guest: cmpl $1,%ecx ja .Lrestore_rcx_iret_exit_to_guest +#ifdef CONFIG_XEN_SHSTK /* Clear the supervisor shadow stack token busy bit. */ .macro rag_clrssbsy rdsspq %rcx clrssbsy (%rcx) .endm ALTERNATIVE "", rag_clrssbsy, X86_FEATURE_XEN_SHSTK +#endif movq 8(%rsp), %rcx # RIP cmpw $FLAT_USER_CS32,16(%rsp)# CS @@ -235,7 +237,9 @@ iret_exit_to_guest: * %ss must be saved into the space left by the trampoline. */ ENTRY(lstar_enter) +#ifdef CONFIG_XEN_SHSTK ALTERNATIVE "", "setssbsy", X86_FEATURE_XEN_SHSTK +#endif /* sti could live here when we don't switch page tables below. */ movq 8(%rsp),%rax /* Restore %rax. */ movq $FLAT_KERNEL_SS,8(%rsp) @@ -269,7 +273,9 @@ ENTRY(lstar_enter) jmp test_all_events ENTRY(sysenter_entry) +#ifdef CONFIG_XEN_SHSTK ALTERNATIVE "", "setssbsy", X86_FEATURE_XEN_SHSTK +#endif /* sti could live here when we don't switch page tables below. */ pushq $FLAT_USER_SS pushq $0 @@ -889,6 +895,7 @@ handle_ist_exception: movq %rdi,%rsp rep movsq +#ifdef CONFIG_XEN_SHSTK /* Switch Shadow Stacks */ .macro ist_switch_shstk rdsspq %rdi @@ -909,6 +916,7 @@ handle_ist_exception: setssbsy .endm ALTERNATIVE "", ist_switch_shstk, X86_FEATURE_XEN_SHSTK +#endif 1: #else ASSERT_CONTEXT_IS_XEN -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 30 01:00:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 May 2020 01:00:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeprF-0004BZ-De; Sat, 30 May 2020 01:00:17 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeprD-0003X7-Of for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 01:00:15 +0000 X-Inumbo-ID: ebce169a-a210-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id ebce169a-a210-11ea-8993-bc764e2007e4; Sat, 30 May 2020 01:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Xkp/8OJjtyZwKRN4dPfdVOouvoVeHiE5xDckeqCQdPw=; b=KoSY0Vk7bY6jtbkJG9LouBvNTM Ky3c7RZEnG6SaVIiqaK31JPUZ6x9I45IIp5n27ZfYjoGG3J4deafdP4FkR1T0CFpVzb+cofAjDVFZ 8tHgcePOJJynr7B5+u2UKbsdVkyvMwrbJAO2RZzfg2m9xqiOvht2EpaoTnSOCtssEu2Q=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeprC-00015r-L5 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 01:00:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeprC-0001wm-KC for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 01:00:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/credit2: Fix build following c/s 8e2aa76dc (take 2) Message-Id: Date: Sat, 30 May 2020 01:00:14 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit ad33a573c009d72466432b41ba0591c64e819c19 Author: Andrew Cooper AuthorDate: Sat May 30 01:52:13 2020 +0100 Commit: Andrew Cooper CommitDate: Sat May 30 01:56:01 2020 +0100 xen/credit2: Fix build following c/s 8e2aa76dc (take 2) OSSTest reports: credit2.c: In function 'cpu_runqueue_siblings_match': credit2.c:883:29: error: implicit declaration of function 'cpu_nr_siblings' [-Werror=implicit-function-declaration] unsigned int nr_sibls = cpu_nr_siblings(cpu); ^~~~~~~~~~~~~~~ credit2.c:883:5: error: nested extern declaration of 'cpu_nr_siblings' [-Werror=nested-externs] unsigned int nr_sibls = cpu_nr_siblings(cpu); ^~~~~~~~ cc1: all warnings being treated as errors For whatever reason, cpufeature.h's inclusion is conditional, and missing for arm32. Inlcude it explicitly. Signed-off-by: Andrew Cooper --- xen/common/sched/credit2.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/common/sched/credit2.c b/xen/common/sched/credit2.c index f4d3f8ae6b..eb5e5a78c5 100644 --- a/xen/common/sched/credit2.c +++ b/xen/common/sched/credit2.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include "private.h" -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Sat May 30 08:33:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 May 2020 08:33:08 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvQ-0004yk-8t; Sat, 30 May 2020 08:33:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvP-0004yf-4W for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:03 +0000 X-Inumbo-ID: 2cbe6f76-a250-11ea-9dbe-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2cbe6f76-a250-11ea-9dbe-bc764e2007e4; Sat, 30 May 2020 08:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=8sz+a/ShuBrEDdNJFnJEmLcMNrblD5WV0qfJ3ciBsas=; b=WbH3Al+n7smns2nqRaRru8K6rx aQ0JV6bNux1q+JTKju9v+8HxEBdz4HJaghJWUp+Ch4t+U660te6fXxnqOpRZKxXYAL4/IWsMSRfRv wyD7kMlfCzqCSKhQq8z9mBLGronMiRT+i28eCXZHW91gKmvU7luoup0YHjM9ETgpVIpY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvN-00086A-U1 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:01 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jewvN-0006Ol-T1 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:01 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: Generate golang bindings in libxl Makefile Message-Id: Date: Sat, 30 May 2020 08:33:01 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 60db5da62ac051aab0b217fa2d96acca1cd3ca3e Author: George Dunlap AuthorDate: Thu May 28 12:20:53 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:53 2020 +0100 libxl: Generate golang bindings in libxl Makefile The generated golang bindings (types.gen.go and helpers.gen.go) are left checked in so that they can be fetched from xenbits using the golang tooling. This means that they must be updated whenever libxl_types.idl (or other dependencies) are updated. However, the golang bindings are only built optionally; we can't assume that anyone updating libxl_types.idl will also descend into the tools/golang tree to re-generate the bindings. Fix this by re-generating the golang bindings from the libxl Makefile when the IDL dependencies are updated, so that anyone who updates libxl_types.idl will also end up updating the golang generated files as well. - Make a variable for the generated files, and a target in xenlight/Makefile which will only re-generate the files. - Add a target in libxl/Makefile to call external idl generation targets (currently only golang). For ease of testing, also add a specific target in libxl/Makefile just to check and update files generated from the IDL. This does mean that there are two potential paths for generating the files during a parallel build; but that shouldn't be an issue, since tools/golang/xenlight should never be built until after tools/libxl has completed building anyway. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook Acked-by: Ian Jackson --- tools/golang/xenlight/Makefile | 11 ++++++++++- tools/libxl/Makefile | 17 ++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index cd0a62505f..8ab4cb5665 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -17,12 +17,21 @@ all: build .PHONY: package package: $(XEN_GOPATH)$(GOXL_PKG_DIR) -$(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go types.gen.go helpers.gen.go +GOXL_GEN_FILES = types.gen.go helpers.gen.go + +$(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go $(GOXL_GEN_FILES) $(INSTALL_DIR) $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) xenlight.go $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) types.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) $(INSTALL_DATA) helpers.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) +# NOTE: This target is called from libxl/Makefile:all. Since that +# target must finish before golang/Makefile is called, this is +# currently safe. It must not be called from anywhere else in the +# Makefile system without careful thought about races with +# xenlight/Makefile:all +idl-gen: $(GOXL_GEN_FILES) + %.gen.go: gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl $(LIBXL_SRC_DIR)/idl.py XEN_ROOT=$(XEN_ROOT) $(PYTHON) gengotypes.py $(LIBXL_SRC_DIR)/libxl_types.idl diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 69fcf21577..947eb6036e 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -218,7 +218,7 @@ testidl.c: libxl_types.idl gentest.py libxl.h $(AUTOINCS) .PHONY: all all: $(CLIENTS) $(TEST_PROGS) $(PKG_CONFIG) $(PKG_CONFIG_LOCAL) \ libxenlight.so libxenlight.a libxlutil.so libxlutil.a \ - $(AUTOSRCS) $(AUTOINCS) + $(AUTOSRCS) $(AUTOINCS) idl-external $(LIBXL_OBJS) $(LIBXLU_OBJS) $(SAVE_HELPER_OBJS) \ $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \ @@ -274,6 +274,21 @@ _libxl_type%.h _libxl_type%_json.h _libxl_type%_private.h _libxl_type%.c: libxl_ $(call move-if-changed,__libxl_type$(stem)_json.h,_libxl_type$(stem)_json.h) $(call move-if-changed,__libxl_type$(stem).c,_libxl_type$(stem).c) +# NOTE: This is safe to do at the moment because idl-external and +# idl-gen are only called from libxl/Makefile:all, which must return +# before golang/Makefile is callid. idl-external and idl-gen must +# never be called from another part of the make system without careful thought +# about races with tools/golang/xenlight/Makefile:all +.PHONY: idl-external +idl-external: + $(MAKE) -C $(XEN_ROOT)/tools/golang/xenlight idl-gen + +LIBXL_IDLGEN_FILES = _libxl_types.h _libxl_types_json.h _libxl_types_private.h _libxl_types.c \ + _libxl_types_internal.h _libxl_types_internal_json.h _libxl_types_internal_private.h _libxl_types_internal.c + + +idl-gen: $(LIBXL_GEN_FILES) idl-external + libxenlight.so: libxenlight.so.$(MAJOR) $(SYMLINK_SHLIB) $< $@ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 30 08:33:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 May 2020 08:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvZ-0004zU-AW; Sat, 30 May 2020 08:33:13 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvY-0004zO-P5 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:12 +0000 X-Inumbo-ID: 32c48950-a250-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 32c48950-a250-11ea-9947-bc764e2007e4; Sat, 30 May 2020 08:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=CMIquTd10c+PvmBYmT+v6OOUgLVf01Uq8hupEKJVAa4=; b=43jHu8H9wVbq7fAcQjEJfiZxaW YvYEf+jfhPFKoWcNMuE8OxkLibhEONpZJMv1jeb3a/0kFgEaUxXpdMhMazKG1BfJjEkD5iyi7I3Ec vPnjZMFjQpfHyVigkOsDKrAsKZyZMjpvFjwSr6KZC9k7eFmcv32crXKCaVr40oOgTNP4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvY-00086G-10 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:12 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jewvX-0006PR-WE for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:12 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] golang/xenlight: Get rid of GOPATH-based build artefacts Message-Id: Date: Sat, 30 May 2020 08:33:11 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit b84c47221d2273b7d84866fce9c511ec3ba5abb8 Author: George Dunlap AuthorDate: Thu May 28 12:20:54 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:54 2020 +0100 golang/xenlight: Get rid of GOPATH-based build artefacts The original build setup used a "fake GOPATH" in tools/golang to test the mechanism of building from go package files installed on a filesystem. With the move to modules, this isn't necessary, and leads to potentially confusing directories being created. (I.e., it might not be obvious that files under tools/golang/src shouldn't be edited.) Get rid of the code that creates this (now unused) intermediate directory. Add direct dependencies from 'build' onto the source files. Signed-off-by: George Dunlap Reviewed-by: Nick Rosbrook --- tools/Rules.mk | 1 - tools/golang/Makefile | 10 ---------- tools/golang/xenlight/Makefile | 22 +++++----------------- 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 59c72e7a88..76acaef988 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -35,7 +35,6 @@ XENSTORE_XENSTORED ?= y debug ?= y debug_symbols ?= $(debug) -XEN_GOPATH = $(XEN_ROOT)/tools/golang XEN_GOCODE_URL = golang.xenproject.org ifeq ($(debug_symbols),y) diff --git a/tools/golang/Makefile b/tools/golang/Makefile index aba11ebc39..b022e2c5a3 100644 --- a/tools/golang/Makefile +++ b/tools/golang/Makefile @@ -1,16 +1,6 @@ XEN_ROOT=$(CURDIR)/../.. include $(XEN_ROOT)/tools/Rules.mk -# In order to link against a package in Go, the package must live in a -# directory tree in the way that Go expects. To make this possible, -# there must be a directory such that we can set GOPATH=${dir}, and -# the package will be under $GOPATH/src/${full-package-path}. - -# So we set XEN_GOPATH to $XEN_ROOT/tools/golang. The xenlight -# "package build" directory ($PWD/xenlight) will create the "package -# source" directory in the proper place. Go programs can use this -# package by setting GOPATH=$(XEN_GOPATH). - SUBDIRS-y = xenlight .PHONY: build all diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index 8ab4cb5665..eac9dbf12a 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -4,8 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk # Standing boldly against convention, we insist on installing the # package source under $(prefix)/share/gocode GOCODE_DIR ?= $(prefix)/share/gocode/ -GOXL_PKG_DIR = /src/$(XEN_GOCODE_URL)/xenlight/ -GOXL_INSTALL_DIR = $(GOCODE_DIR)$(GOXL_PKG_DIR) +GOXL_INSTALL_DIR = $(GOCODE_DIR)/src/$(XEN_GOCODE_URL)/xenlight/ GO ?= go @@ -14,17 +13,8 @@ LIBXL_SRC_DIR = ../../libxl .PHONY: all all: build -.PHONY: package -package: $(XEN_GOPATH)$(GOXL_PKG_DIR) - GOXL_GEN_FILES = types.gen.go helpers.gen.go -$(XEN_GOPATH)/src/$(XEN_GOCODE_URL)/xenlight/: xenlight.go $(GOXL_GEN_FILES) - $(INSTALL_DIR) $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(INSTALL_DATA) xenlight.go $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(INSTALL_DATA) types.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(INSTALL_DATA) helpers.gen.go $(XEN_GOPATH)$(GOXL_PKG_DIR) - # NOTE: This target is called from libxl/Makefile:all. Since that # target must finish before golang/Makefile is called, this is # currently safe. It must not be called from anywhere else in the @@ -43,23 +33,21 @@ idl-gen: $(GOXL_GEN_FILES) # in the LDFLAGS; and thus we need to add -L$(XEN_XENLIGHT) here # so that it can find the actual library. .PHONY: build -build: package +build: xenlight.go $(GOXL_GEN_FILES) CGO_CFLAGS="$(CFLAGS_libxenlight) $(CFLAGS_libxentoollog)" CGO_LDFLAGS="$(LDLIBS_libxenlight) $(LDLIBS_libxentoollog) -L$(XEN_XENLIGHT) -L$(XEN_LIBXENTOOLLOG)" $(GO) build -x .PHONY: install install: build $(INSTALL_DIR) $(DESTDIR)$(GOXL_INSTALL_DIR) - $(INSTALL_DATA) $(XEN_GOPATH)$(GOXL_PKG_DIR)xenlight.go $(DESTDIR)$(GOXL_INSTALL_DIR) - $(INSTALL_DATA) $(XEN_GOPATH)$(GOXL_PKG_DIR)types.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) - $(INSTALL_DATA) $(XEN_GOPATH)$(GOXL_PKG_DIR)helpers.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) + $(INSTALL_DATA) xenlight.go $(DESTDIR)$(GOXL_INSTALL_DIR) + $(INSTALL_DATA) types.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) + $(INSTALL_DATA) helpers.gen.go $(DESTDIR)$(GOXL_INSTALL_DIR) .PHONY: uninstall rm -rf $(DESTDIR)$(GOXL_INSTALL_DIR) .PHONY: clean clean: - $(RM) -r $(XEN_GOPATH)$(GOXL_PKG_DIR) - $(RM) $(XEN_GOPATH)/pkg/*/$(XEN_GOCODE_URL)/xenlight.a .PHONY: distclean distclean: clean -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 30 08:33:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 May 2020 08:33:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvl-00050o-CL; Sat, 30 May 2020 08:33:25 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvk-00050h-CE for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:24 +0000 X-Inumbo-ID: 38c6a1a8-a250-11ea-a960-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 38c6a1a8-a250-11ea-a960-12813bfff9fa; Sat, 30 May 2020 08:33:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=1LsKyttmDrhNghtZmRVbSUxPgX7T2YBzWDQW0SBGGxQ=; b=PB5L/5cbU/YJH8Lr7DqeGL+n5I sIyJij5daAskYqScv6a7lBiEdY58w27t5hJuyor57CNj1Y26J9/tl7Z9KFigHuFjjWdLqpAfB6Ga/ 7CQQFCUhwJzGJDJetfuCTDiMOY1jzPX2/wYWvXLlcJVKcUFjFJvn8AzObL2OvOSXdMNo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvi-00086X-41 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:22 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jewvi-0006Q2-33 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:22 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] automation/archlinux: Add 32-bit glibc headers Message-Id: Date: Sat, 30 May 2020 08:33:22 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 8a4d0a82bcaf83e76d7b34136c870602d3f54a4b Author: George Dunlap AuthorDate: Thu May 28 12:20:55 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:55 2020 +0100 automation/archlinux: Add 32-bit glibc headers This fixes the following build error in hvmloader: usr/include/gnu/stubs.h:7:11: fatal error: gnu/stubs-32.h: No such file or directory Signed-off-by: George Dunlap Acked-by: Anthony PERARD Acked-by: Wei Liu --- automation/build/archlinux/current.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 9af5d66afc..5095de65b8 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -19,6 +19,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ iasl \ inetutils \ iproute \ + lib32-glibc \ libaio \ libcacard \ libgl \ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 30 08:33:33 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 May 2020 08:33:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvt-00051l-E4; Sat, 30 May 2020 08:33:33 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvs-00051g-SP for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:32 +0000 X-Inumbo-ID: 3eca7610-a250-11ea-8993-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 3eca7610-a250-11ea-8993-bc764e2007e4; Sat, 30 May 2020 08:33:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=AlHMSDSFN9BKVMR1fj37ZHuO/0sKMQAAu5P9BKo8HTw=; b=BW3XG+QcdxbzGc45gDtJrvGAhI vXDqC7fBRB2wwmIEhb/lDSAwyg8KD3zvuYpwnSPyKfJ12FMtNm2NQFoxk/doDXYo2YsuvOj8wJokL S2PAsX9BcRPj7bXToD5EkVDAgGAFAnzKDTTrrHYonoXpjWOtHuJOfS5r54izSjZIaoiA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jewvs-00086g-79 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:32 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jewvs-0006Qi-64 for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:32 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] automation: Add golang packages to various dockerfiles Message-Id: Date: Sat, 30 May 2020 08:33:32 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 7173d79049441bde5e4e98c0b34654ca29c3baf9 Author: George Dunlap AuthorDate: Thu May 28 12:20:56 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:56 2020 +0100 automation: Add golang packages to various dockerfiles Specifically, Fedora 29, Archlinux, and Debian unstable. This will cause the CI loop to detect golang build failures. CentOS 6 and 7 don't have golang packages, and the packages in stretch, jessie, xenial, and trusty are too old. Signed-off-by: George Dunlap Acked-by: Wei Liu --- automation/build/archlinux/current.dockerfile | 1 + automation/build/debian/unstable.dockerfile | 1 + automation/build/fedora/29.dockerfile | 1 + 3 files changed, 3 insertions(+) diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 5095de65b8..d8fbebaf79 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -16,6 +16,7 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \ ghostscript \ git \ gnutls \ + go \ iasl \ inetutils \ iproute \ diff --git a/automation/build/debian/unstable.dockerfile b/automation/build/debian/unstable.dockerfile index d0aa5ad2bb..aeb4f3448b 100644 --- a/automation/build/debian/unstable.dockerfile +++ b/automation/build/debian/unstable.dockerfile @@ -45,6 +45,7 @@ RUN apt-get update && \ nasm \ gnupg \ apt-transport-https \ + golang \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile index 5be4a9e229..6a4e5b0413 100644 --- a/automation/build/fedora/29.dockerfile +++ b/automation/build/fedora/29.dockerfile @@ -40,5 +40,6 @@ RUN dnf -y install \ nasm \ ocaml \ ocaml-findlib \ + golang \ && dnf clean all && \ rm -rf /var/cache/dnf -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Sat May 30 08:33:43 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Sat, 30 May 2020 08:33:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeww3-00053D-Fg; Sat, 30 May 2020 08:33:43 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeww2-000536-Sh for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:42 +0000 X-Inumbo-ID: 44ce4578-a250-11ea-9947-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 44ce4578-a250-11ea-9947-bc764e2007e4; Sat, 30 May 2020 08:33:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Date:Message-Id:Subject:Reply-To:To:From:Sender:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=b+49rfNgTlB3TTmw/3sCe9FL0nFoojGd8kZzk1zIdEc=; b=eARQLhxUlR4vHTDDjme83fBvAA Rgrk/06asEyFM75bu97YivNl5/UxHSZJBS5l3uiyblUTwqiIzURhIcSNffnLlWvMTxvq3KVTA9nAz 4kIRqQISPymlukun9YQksuuJIeGb9mHVJ/Gmucq/jBPG6Ac8RcnyHSd+tFrvMusuKnNs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1jeww2-00087T-AG for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:42 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1jeww2-0006RK-9E for xen-changelog@lists.xenproject.org; Sat, 30 May 2020 08:33:42 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] automation/containerize: Add a shortcut for Debian unstable Message-Id: Date: Sat, 30 May 2020 08:33:42 +0000 X-BeenThere: xen-changelog@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Change log for Mercurial \(receive only\)" List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Reply-To: xen-devel@lists.xenproject.org Errors-To: xen-changelog-bounces@lists.xenproject.org Sender: "Xen-changelog" commit 1497e78068421d83956f8e82fb6e1bf1fc3b1199 Author: George Dunlap AuthorDate: Thu May 28 12:20:57 2020 +0100 Commit: George Dunlap CommitDate: Thu May 28 12:20:57 2020 +0100 automation/containerize: Add a shortcut for Debian unstable Signed-off-by: George Dunlap Acked-by: Wei Liu --- automation/scripts/containerize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/containerize b/automation/scripts/containerize index fbc4bc22d6..b71edd736c 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -22,6 +22,7 @@ case "_${CONTAINER}" in _fedora) CONTAINER="${BASE}/fedora:29";; _jessie) CONTAINER="${BASE}/debian:jessie" ;; _stretch|_) CONTAINER="${BASE}/debian:stretch" ;; + _unstable|_) CONTAINER="${BASE}/debian:unstable" ;; _trusty) CONTAINER="${BASE}/ubuntu:trusty" ;; _xenial) CONTAINER="${BASE}/ubuntu:xenial" ;; esac @@ -91,4 +92,3 @@ exec docker run \ -${termint}i --rm -- \ ${CONTAINER} \ ${cmd} - -- generated by git-patchbot for /home/xen/git/xen.git#master