From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:22:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09: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 1kE7v6-0002qF-AY; Fri, 04 Sep 2020 09:22: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 1kE7v4-0002qA-UU for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:06 +0000 X-Inumbo-ID: 4b9bc2ec-cc2f-42de-9516-7e9797ac724f Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4b9bc2ec-cc2f-42de-9516-7e9797ac724f; Fri, 04 Sep 2020 09: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; bh=PpDjy3BlluTE8Atx1zyQFjs9rMsk5aud+6X+kFOKcFc=; b=p6mWYBEvMoh+TXBSyNaf/aOSzJ 8MLHSbfgS13JcUyLjDyhd26bZdVa5gHRPV8f0C6dl9p6QlngOn2w/w/fPxkMdVsN3SnbJPC8dMOf5 lviVSzedWi1+wkOemGDRr8uAfW4r/XjdokB4RJhQn8Xnk9z0mGW2OT9k8l1ECol+8644=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7v3-00006P-Je for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7v3-0001Yc-GA for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: simplify is_guest_l2_slot() Message-Id: Date: Fri, 04 Sep 2020 09: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 8cf225013582723275f0d60f1107319f5963af7f Author: Jan Beulich AuthorDate: Fri Sep 4 10:59:33 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 10:59:33 2020 +0200 x86: simplify is_guest_l2_slot() is_pv_32bit_domain() has become expensive, and its use here is redundant: Only 32-bit guests would ever get PGT_pae_xen_l2 set on their L2 page table pages anyway. (If some other error does lead to PGT_pae_xen_l2 ending up anywhere else, we still don't want to allow a guest to control the entries.) Suggested-by: Andrew Cooper Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- xen/include/asm-x86/x86_64/page.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/include/asm-x86/x86_64/page.h b/xen/include/asm-x86/x86_64/page.h index 26621f9519..60db28f4e7 100644 --- a/xen/include/asm-x86/x86_64/page.h +++ b/xen/include/asm-x86/x86_64/page.h @@ -106,8 +106,7 @@ typedef l4_pgentry_t root_pgentry_t; #define l4_linear_offset(_a) (((_a) & VADDR_MASK) >> L4_PAGETABLE_SHIFT) #define is_guest_l2_slot(_d, _t, _s) \ - ( !is_pv_32bit_domain(_d) || \ - !((_t) & PGT_pae_xen_l2) || \ + ( !((_t) & PGT_pae_xen_l2) || \ ((_s) < COMPAT_L2_PAGETABLE_FIRST_XEN_SLOT(_d)) ) #define is_guest_l4_slot(_d, _s) \ ( is_pv_32bit_domain(_d) \ -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:22:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09: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 1kE7vF-0002qj-C5; Fri, 04 Sep 2020 09: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 1kE7vE-0002qe-Ii for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:16 +0000 X-Inumbo-ID: d07103a5-85aa-4cf4-8b29-e300cadc6556 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d07103a5-85aa-4cf4-8b29-e300cadc6556; Fri, 04 Sep 2020 09: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; bh=Qo+xxeUaa5lSBvUAVl4HYVl6DJmnpCn1gzOpKZqZeGc=; b=gUCGUIaNwPlBMODONaBJ5BjkTh /7aY6y6MUbhyG+QaJIQ0dOOQFcSVVLZvvqoRphcR1aEZ8GQGtoNJiRFbak3hH4MBZh4jweVjw3wXE oUZzHtpxyYPpycKwAEfUbegP1tcmq6BgpQWu2mKNf9mAZfbunGl/oKpyLFGdNr2/zqO0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7vD-00006S-NX for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7vD-0001Zq-Md for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/msr: explicitly handle AMD DE_CFG Message-Id: Date: Fri, 04 Sep 2020 09: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 4175fd3ccd17face664036fa98e9329aa317f7b6 Author: Roger Pau Monné AuthorDate: Fri Sep 4 11:00:46 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:00:46 2020 +0200 x86/msr: explicitly handle AMD DE_CFG Report LFENCE_SERIALISE unconditionally for DE_CFG on AMD hardware and silently drop writes. Reported-by: Andrew Cooper Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper --- xen/arch/x86/msr.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c index a478b91f23..74bf7d9589 100644 --- a/xen/arch/x86/msr.c +++ b/xen/arch/x86/msr.c @@ -292,6 +292,12 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val) *val = msrs->tsc_aux; break; + case MSR_AMD64_DE_CFG: + if ( !(cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) + goto gp_fault; + *val = AMD64_DE_CFG_LFENCE_SERIALISE; + break; + case MSR_AMD64_DR0_ADDRESS_MASK: case MSR_AMD64_DR1_ADDRESS_MASK ... MSR_AMD64_DR3_ADDRESS_MASK: if ( !cp->extd.dbext ) @@ -517,6 +523,15 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) wrmsr_tsc_aux(val); break; + case MSR_AMD64_DE_CFG: + /* + * OpenBSD 6.7 will panic if writing to DE_CFG triggers a #GP: + * https://www.illumos.org/issues/12998 - drop writes. + */ + if ( !(cp->x86_vendor & (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) + goto gp_fault; + break; + case MSR_AMD64_DR0_ADDRESS_MASK: case MSR_AMD64_DR1_ADDRESS_MASK ... MSR_AMD64_DR3_ADDRESS_MASK: if ( !cp->extd.dbext || val != (uint32_t)val ) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:22:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09: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 1kE7vQ-0002ta-Dk; Fri, 04 Sep 2020 09:22: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 1kE7vP-0002tP-BO for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:27 +0000 X-Inumbo-ID: 58ae6a8f-02f3-479c-ba55-05ec01d7f782 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 58ae6a8f-02f3-479c-ba55-05ec01d7f782; Fri, 04 Sep 2020 09: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; bh=rgyKJnG1IqimwWpF5PqPLbdUlYTgr4KH+FYd0tn1KNg=; b=IEb5/ONz5pRV7TK1oKRv5giQuS 59iewKELcR8xdVv2mruXXZJfTLEj9L5yK6bgjBr/xJnslWABsndav0Sxtjq4A73SE2J8k8tDG6w2Q bV5zmOqNBgwHaW2kgnJwJaqYsNQUuKk6IuqhKNGEBaInOBhF7IEYgF6lEVyNowCIvRBU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7vN-00006b-R6 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7vN-0001aN-Py for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] add additional symbols to xen-syms.map Message-Id: Date: Fri, 04 Sep 2020 09: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 c9e88d200d1b8c4edef5bddb91690e76f7f87780 Author: Michael Kurth AuthorDate: Fri Sep 4 11:01:45 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:01:45 2020 +0200 add additional symbols to xen-syms.map Add "all_symbols" to all /tools/symbols calls so that xen-syms.map lists all symbols and not only .text section symbols. This change enhances debugging and livepatch capabilities. Signed-off-by: Michael Kurth Reviewed-by: Eslam Elnikety Reviewed-by: Julien Grall Reviewed-by: Robert Stonehouse Reviewed-by: Pawel Wieczorkiewicz Acked-by: Jan Beulich --- xen/arch/arm/Makefile | 2 +- xen/arch/x86/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/Makefile b/xen/arch/arm/Makefile index 7e82b2178c..51173d9712 100644 --- a/xen/arch/arm/Makefile +++ b/xen/arch/arm/Makefile @@ -115,7 +115,7 @@ $(TARGET)-syms: prelink.o xen.lds $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ - | $(BASEDIR)/tools/symbols --xensyms --sysv --sort \ + | $(BASEDIR)/tools/symbols --all-symbols --xensyms --sysv --sort \ >$(@D)/$(@F).map rm -f $(@D)/.$(@F).[0-9]* diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 1073e454b1..1f279b6b2e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -168,7 +168,7 @@ $(TARGET)-syms: prelink.o xen.lds $(LD) $(XEN_LDFLAGS) -T xen.lds -N prelink.o $(build_id_linker) \ $(@D)/.$(@F).1.o -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ - | $(BASEDIR)/tools/symbols --xensyms --sysv --sort \ + | $(BASEDIR)/tools/symbols --all-symbols --xensyms --sysv --sort \ >$(@D)/$(@F).map rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* @@ -224,7 +224,7 @@ $(TARGET).efi: prelink-efi.o $(note_file) efi.lds efi/relocs-dummy.o efi/mkreloc $(LD) $(call EFI_LDFLAGS,$(VIRT_BASE)) -T efi.lds -N $< \ $(@D)/.$(@F).1r.o $(@D)/.$(@F).1s.o $(note_file_option) -o $@ $(NM) -pa --format=sysv $(@D)/$(@F) \ - | $(BASEDIR)/tools/symbols --xensyms --sysv --sort >$(@D)/$(@F).map + | $(BASEDIR)/tools/symbols --all-symbols --xensyms --sysv --sort >$(@D)/$(@F).map rm -f $(@D)/.$(@F).[0-9]* $(@D)/..$(@F).[0-9]* else $(TARGET).efi: FORCE -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:22:39 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09:22: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 1kE7vb-0002ui-FR; Fri, 04 Sep 2020 09:22: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 1kE7va-0002ua-J5 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:38 +0000 X-Inumbo-ID: 8bcbe7bd-595e-4f7a-9085-c0bbe087349b Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8bcbe7bd-595e-4f7a-9085-c0bbe087349b; Fri, 04 Sep 2020 09: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; bh=LhiLUxW1uuU9L7vK5/VLK/DbJ5MrvxSprKHdpCY20/M=; b=5HPMXNyT7r7bDWNHJiODP/XqJd 82NSz21XdDL+cjFakPjd/RcSWljiISMfWWU2NzLHIx0dCGi1Jpudmj1S9Ehtj5BwFezqoEgTeYt// GTu5JiJ247GKR3A24eS4UebWG6ffPDXXTb60FmaZfoNsNAg8iKuNKDKyId8KSA07RClc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7vY-00006k-0J for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7vX-0001b1-UE for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: fix compat header generation Message-Id: Date: Fri, 04 Sep 2020 09: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 0dd40d68b10a2b3191a06ff8a996a57dcca96a88 Author: Jan Beulich AuthorDate: Fri Sep 4 11:05:46 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:05:46 2020 +0200 x86: fix compat header generation As was pointed out by 0e2e54966af5 ("mm: fix public declaration of struct xen_mem_acquire_resource"), we're not currently handling structs correctly that have uint64_aligned_t fields. #pragma pack(4) suppresses the necessary alignment even if the type did properly survive (which it also didn't) in the process of generating the headers. Overall, with the above mentioned change applied, there's only a latent issue here afaict, i.e. no other of our interface structs is currently affected. As a result it is clear that using #pragma pack(4) is not an option. Drop all uses from compat header generation. Make sure {,u}int64_aligned_t actually survives, such that explicitly aligned fields will remain aligned. Arrange for {,u}int64_t to be transformed into a type that's 64 bits wide and 4-byte aligned, by utilizing that in typedef-s the "aligned" attribute can be used to reduce alignment. Additionally, for the cases where native structures get re-used, enforce suitable alignment via typedef-s (which allow alignment to be reduced). This use of typedef-s makes necessary changes to CHECK_*() macro generation: Previously get-fields.sh relied on finding struct/union keywords when other compound types were used. We need to use the typedef-s (guaranteeing suitable alignment) now, and hence the script has to recognize those cases, too. (Unfortunately there are a few special cases to be dealt with, but this is really not much different from e.g. the pre-existing compat_domain_handle_t special case.) This need to use typedef-s is certainly somewhat fragile going forward, as in similar future cases it is imperative to also use typedef-s, or else the CHECK_*() macros won't check what they're supposed to check. I don't currently see any means to avoid this fragility, though. There's one change to generated code according to my observations: In arch_compat_vcpu_op() the runstate area "area" variable would previously have been put in a just 4-byte aligned stack slot (despite being 8 bytes in size), whereas now it gets put in an 8-byte aligned location. There also results some curious inconsistency in struct xen_mc from these changes - I intend to clean this up later on. Otherwise unrelated code would also need adjustment right here. Additionally a note about the apparently superfluous () in compat-build-header.py: The simpler form [ r"typedef(.*)@KeeP@(xen_?)?([\w]+)([^\w])", r"typedef\1\2\3 __attribute__((__aligned__(__alignof(\1compat_\3))))\4" ], upsets Python up to at least 3.4.6, claiming to be unable to find the expansion of \2 (at least when it's empty). Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/include/Makefile | 11 ------- xen/include/public/arch-x86/pmu.h | 6 ++-- xen/include/public/arch-x86/xen-mca.h | 33 ++++++++++++--------- xen/include/public/argo.h | 10 +++---- xen/include/public/event_channel.h | 20 ++++++------- xen/include/public/hvm/dm_op.h | 54 +++++++++++++++++++++++------------ xen/include/public/hvm/hvm_vcpu.h | 6 ++-- xen/include/public/hypfs.h | 3 +- xen/include/public/memory.h | 2 +- xen/include/public/physdev.h | 12 ++++---- xen/include/public/platform.h | 50 +++++++++++++++++--------------- xen/include/public/pmu.h | 2 +- xen/include/public/xen.h | 3 +- xen/include/public/xsm/flask_op.h | 39 ++++++++++++++++--------- xen/tools/compat-build-header.py | 8 ++++-- xen/tools/compat-build-source.py | 1 + xen/tools/get-fields.sh | 23 +++++++++++++++ 17 files changed, 170 insertions(+), 113 deletions(-) diff --git a/xen/include/Makefile b/xen/include/Makefile index 089314dc72..0be5540886 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -34,15 +34,6 @@ headers-$(CONFIG_XSM_FLASK) += compat/xsm/flask_op.h cppflags-y := -include public/xen-compat.h -DXEN_GENERATING_COMPAT_HEADERS cppflags-$(CONFIG_X86) += -m32 -# 8-byte types are 4-byte aligned on x86_32 ... -ifeq ($(CONFIG_CC_IS_CLANG),y) -prefix-$(CONFIG_X86) := \#pragma pack(push, 4) -suffix-$(CONFIG_X86) := \#pragma pack(pop) -else -prefix-$(CONFIG_X86) := \#pragma pack(4) -suffix-$(CONFIG_X86) := \#pragma pack() -endif - endif public-$(CONFIG_X86) := $(wildcard public/arch-x86/*.h public/arch-x86/*/*.h) @@ -57,10 +48,8 @@ compat/%.h: compat/%.i Makefile $(BASEDIR)/tools/compat-build-header.py echo "#define $$id" >>$@.new; \ echo "#include " >>$@.new; \ $(if $(filter-out compat/arch-%.h,$@),echo "#include <$(patsubst compat/%,public/%,$@)>" >>$@.new;) \ - $(if $(prefix-y),echo "$(prefix-y)" >>$@.new;) \ grep -v '^# [0-9]' $< | \ $(PYTHON) $(BASEDIR)/tools/compat-build-header.py | uniq >>$@.new; \ - $(if $(suffix-y),echo "$(suffix-y)" >>$@.new;) \ echo "#endif /* $$id */" >>$@.new mv -f $@.new $@ diff --git a/xen/include/public/arch-x86/pmu.h b/xen/include/public/arch-x86/pmu.h index c421cb7a4a..464c65dac1 100644 --- a/xen/include/public/arch-x86/pmu.h +++ b/xen/include/public/arch-x86/pmu.h @@ -105,7 +105,7 @@ struct xen_pmu_arch { * Processor's registers at the time of interrupt. * WO for hypervisor, RO for guests. */ - struct xen_pmu_regs regs; + xen_pmu_regs_t regs; /* Padding for adding new registers to xen_pmu_regs in the future */ #define XENPMU_REGS_PAD_SZ 64 uint8_t pad[XENPMU_REGS_PAD_SZ]; @@ -132,8 +132,8 @@ struct xen_pmu_arch { * hypervisor into hardware during XENPMU_flush */ union { - struct xen_pmu_amd_ctxt amd; - struct xen_pmu_intel_ctxt intel; + xen_pmu_amd_ctxt_t amd; + xen_pmu_intel_ctxt_t intel; /* * Padding for contexts (fixed parts only, does not include MSR banks diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index b5e04b5444..702998b0eb 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -112,7 +112,7 @@ struct mcinfo_common { uint16_t type; /* structure type */ uint16_t size; /* size of this struct in bytes */ }; - +typedef struct mcinfo_common xen_mcinfo_common_t; #define MC_FLAG_CORRECTABLE (1 << 0) #define MC_FLAG_UNCORRECTABLE (1 << 1) @@ -123,7 +123,7 @@ struct mcinfo_common { #define MC_FLAG_MCE (1 << 6) /* contains global x86 mc information */ struct mcinfo_global { - struct mcinfo_common common; + xen_mcinfo_common_t common; /* running domain at the time in error (most likely the impacted one) */ uint16_t mc_domid; @@ -138,7 +138,7 @@ struct mcinfo_global { /* contains bank local x86 mc information */ struct mcinfo_bank { - struct mcinfo_common common; + xen_mcinfo_common_t common; uint16_t mc_bank; /* bank nr */ uint16_t mc_domid; /* Usecase 5: domain referenced by mc_addr on dom0 @@ -156,11 +156,12 @@ struct mcinfo_msr { uint64_t reg; /* MSR */ uint64_t value; /* MSR value */ }; +typedef struct mcinfo_msr xen_mcinfo_msr_t; /* contains mc information from other * or additional mc MSRs */ struct mcinfo_extended { - struct mcinfo_common common; + xen_mcinfo_common_t common; /* You can fill up to five registers. * If you need more, then use this structure @@ -172,7 +173,7 @@ struct mcinfo_extended { * and E(R)FLAGS, E(R)IP, E(R)MISC, up to 11/19 of them might be * useful at present. So expand this array to 32 to leave room. */ - struct mcinfo_msr mc_msr[32]; + xen_mcinfo_msr_t mc_msr[32]; }; /* Recovery Action flags. Giving recovery result information to DOM0 */ @@ -208,6 +209,7 @@ struct page_offline_action uint64_t mfn; uint64_t status; }; +typedef struct page_offline_action xen_page_offline_action_t; struct cpu_offline_action { @@ -216,17 +218,18 @@ struct cpu_offline_action uint16_t mc_coreid; uint16_t mc_core_threadid; }; +typedef struct cpu_offline_action xen_cpu_offline_action_t; #define MAX_UNION_SIZE 16 struct mcinfo_recovery { - struct mcinfo_common common; + xen_mcinfo_common_t common; uint16_t mc_bank; /* bank nr */ uint8_t action_flags; uint8_t action_types; union { - struct page_offline_action page_retire; - struct cpu_offline_action cpu_offline; + xen_page_offline_action_t page_retire; + xen_cpu_offline_action_t cpu_offline; uint8_t pad[MAX_UNION_SIZE]; } action_info; }; @@ -279,7 +282,7 @@ struct mcinfo_logical_cpu { uint32_t mc_cache_size; uint32_t mc_cache_alignment; int32_t mc_nmsrvals; - struct mcinfo_msr mc_msrvalues[__MC_MSR_ARRAYSIZE]; + xen_mcinfo_msr_t mc_msrvalues[__MC_MSR_ARRAYSIZE]; }; typedef struct mcinfo_logical_cpu xen_mc_logical_cpu_t; DEFINE_XEN_GUEST_HANDLE(xen_mc_logical_cpu_t); @@ -399,8 +402,9 @@ struct xen_mc_msrinject { domid_t mcinj_domid; /* valid only if MC_MSRINJ_F_GPADDR is present in mcinj_flags */ uint16_t _pad0; - struct mcinfo_msr mcinj_msr[MC_MSRINJ_MAXMSRS]; + xen_mcinfo_msr_t mcinj_msr[MC_MSRINJ_MAXMSRS]; }; +typedef struct xen_mc_msrinject xen_mc_msrinject_t; /* Flags for mcinj_flags above; bits 16-31 are reserved */ #define MC_MSRINJ_F_INTERPOSE 0x1 @@ -410,6 +414,7 @@ struct xen_mc_msrinject { struct xen_mc_mceinject { unsigned int mceinj_cpunr; /* target processor id */ }; +typedef struct xen_mc_mceinject xen_mc_mceinject_t; #if defined(__XEN__) || defined(__XEN_TOOLS__) #define XEN_MC_inject_v2 6 @@ -422,7 +427,7 @@ struct xen_mc_mceinject { struct xen_mc_inject_v2 { uint32_t flags; - struct xenctl_bitmap cpumap; + xenctl_bitmap_t cpumap; }; #endif @@ -431,10 +436,10 @@ struct xen_mc { uint32_t interface_version; /* XEN_MCA_INTERFACE_VERSION */ union { struct xen_mc_fetch mc_fetch; - struct xen_mc_notifydomain mc_notifydomain; + xen_mc_notifydomain_t mc_notifydomain; struct xen_mc_physcpuinfo mc_physcpuinfo; - struct xen_mc_msrinject mc_msrinject; - struct xen_mc_mceinject mc_mceinject; + xen_mc_msrinject_t mc_msrinject; + xen_mc_mceinject_t mc_mceinject; #if defined(__XEN__) || defined(__XEN_TOOLS__) struct xen_mc_inject_v2 mc_inject_v2; #endif diff --git a/xen/include/public/argo.h b/xen/include/public/argo.h index 6b645f34e6..3397a3a33f 100644 --- a/xen/include/public/argo.h +++ b/xen/include/public/argo.h @@ -67,8 +67,8 @@ typedef struct xen_argo_addr typedef struct xen_argo_send_addr { - struct xen_argo_addr src; - struct xen_argo_addr dst; + xen_argo_addr_t src; + xen_argo_addr_t dst; } xen_argo_send_addr_t; typedef struct xen_argo_ring @@ -121,7 +121,7 @@ typedef struct xen_argo_unregister_ring typedef struct xen_argo_ring_data_ent { - struct xen_argo_addr ring; + xen_argo_addr_t ring; uint16_t flags; uint16_t pad; uint32_t space_required; @@ -132,13 +132,13 @@ typedef struct xen_argo_ring_data { uint32_t nent; uint32_t pad; - struct xen_argo_ring_data_ent data[XEN_FLEX_ARRAY_DIM]; + xen_argo_ring_data_ent_t data[XEN_FLEX_ARRAY_DIM]; } xen_argo_ring_data_t; struct xen_argo_ring_message_header { uint32_t len; - struct xen_argo_addr source; + xen_argo_addr_t source; uint32_t message_type; uint8_t data[XEN_FLEX_ARRAY_DIM]; }; diff --git a/xen/include/public/event_channel.h b/xen/include/public/event_channel.h index cfb7929fef..246ace4d19 100644 --- a/xen/include/public/event_channel.h +++ b/xen/include/public/event_channel.h @@ -321,16 +321,16 @@ typedef struct evtchn_set_priority evtchn_set_priority_t; struct evtchn_op { uint32_t cmd; /* enum event_channel_op */ union { - struct evtchn_alloc_unbound alloc_unbound; - struct evtchn_bind_interdomain bind_interdomain; - struct evtchn_bind_virq bind_virq; - struct evtchn_bind_pirq bind_pirq; - struct evtchn_bind_ipi bind_ipi; - struct evtchn_close close; - struct evtchn_send send; - struct evtchn_status status; - struct evtchn_bind_vcpu bind_vcpu; - struct evtchn_unmask unmask; + evtchn_alloc_unbound_t alloc_unbound; + evtchn_bind_interdomain_t bind_interdomain; + evtchn_bind_virq_t bind_virq; + evtchn_bind_pirq_t bind_pirq; + evtchn_bind_ipi_t bind_ipi; + evtchn_close_t close; + evtchn_send_t send; + evtchn_status_t status; + evtchn_bind_vcpu_t bind_vcpu; + evtchn_unmask_t unmask; } u; }; typedef struct evtchn_op evtchn_op_t; diff --git a/xen/include/public/hvm/dm_op.h b/xen/include/public/hvm/dm_op.h index fd00e9d761..66cae1afbd 100644 --- a/xen/include/public/hvm/dm_op.h +++ b/xen/include/public/hvm/dm_op.h @@ -74,6 +74,7 @@ struct xen_dm_op_create_ioreq_server { /* OUT - server id */ ioservid_t id; }; +typedef struct xen_dm_op_create_ioreq_server xen_dm_op_create_ioreq_server_t; /* * XEN_DMOP_get_ioreq_server_info: Get all the information necessary to @@ -113,6 +114,7 @@ struct xen_dm_op_get_ioreq_server_info { /* OUT - buffered ioreq gfn (see block comment above)*/ uint64_aligned_t bufioreq_gfn; }; +typedef struct xen_dm_op_get_ioreq_server_info xen_dm_op_get_ioreq_server_info_t; /* * XEN_DMOP_map_io_range_to_ioreq_server: Register an I/O range for @@ -148,6 +150,7 @@ struct xen_dm_op_ioreq_server_range { /* IN - inclusive start and end of range */ uint64_aligned_t start, end; }; +typedef struct xen_dm_op_ioreq_server_range xen_dm_op_ioreq_server_range_t; #define XEN_DMOP_PCI_SBDF(s,b,d,f) \ ((((s) & 0xffff) << 16) | \ @@ -173,6 +176,7 @@ struct xen_dm_op_set_ioreq_server_state { uint8_t enabled; uint8_t pad; }; +typedef struct xen_dm_op_set_ioreq_server_state xen_dm_op_set_ioreq_server_state_t; /* * XEN_DMOP_destroy_ioreq_server: Destroy the IOREQ Server . @@ -186,6 +190,7 @@ struct xen_dm_op_destroy_ioreq_server { ioservid_t id; uint16_t pad; }; +typedef struct xen_dm_op_destroy_ioreq_server xen_dm_op_destroy_ioreq_server_t; /* * XEN_DMOP_track_dirty_vram: Track modifications to the specified pfn @@ -203,6 +208,7 @@ struct xen_dm_op_track_dirty_vram { /* IN - first pfn to track */ uint64_aligned_t first_pfn; }; +typedef struct xen_dm_op_track_dirty_vram xen_dm_op_track_dirty_vram_t; /* * XEN_DMOP_set_pci_intx_level: Set the logical level of one of a domain's @@ -217,6 +223,7 @@ struct xen_dm_op_set_pci_intx_level { /* IN - Level: 0 -> deasserted, 1 -> asserted */ uint8_t level; }; +typedef struct xen_dm_op_set_pci_intx_level xen_dm_op_set_pci_intx_level_t; /* * XEN_DMOP_set_isa_irq_level: Set the logical level of a one of a domain's @@ -230,6 +237,7 @@ struct xen_dm_op_set_isa_irq_level { /* IN - Level: 0 -> deasserted, 1 -> asserted */ uint8_t level; }; +typedef struct xen_dm_op_set_isa_irq_level xen_dm_op_set_isa_irq_level_t; /* * XEN_DMOP_set_pci_link_route: Map a PCI INTx line to an IRQ line. @@ -242,6 +250,7 @@ struct xen_dm_op_set_pci_link_route { /* ISA IRQ (1-15) or 0 -> disable link */ uint8_t isa_irq; }; +typedef struct xen_dm_op_set_pci_link_route xen_dm_op_set_pci_link_route_t; /* * XEN_DMOP_modified_memory: Notify that a set of pages were modified by @@ -265,6 +274,7 @@ struct xen_dm_op_modified_memory { /* IN/OUT - Must be set to 0 */ uint32_t opaque; }; +typedef struct xen_dm_op_modified_memory xen_dm_op_modified_memory_t; struct xen_dm_op_modified_memory_extent { /* IN - number of contiguous pages modified */ @@ -294,6 +304,7 @@ struct xen_dm_op_set_mem_type { /* IN - first pfn in region */ uint64_aligned_t first_pfn; }; +typedef struct xen_dm_op_set_mem_type xen_dm_op_set_mem_type_t; /* * XEN_DMOP_inject_event: Inject an event into a VCPU, which will @@ -327,6 +338,7 @@ struct xen_dm_op_inject_event { /* IN - type-specific extra data (%cr2 for #PF, pending_dbg for #DB) */ uint64_aligned_t cr2; }; +typedef struct xen_dm_op_inject_event xen_dm_op_inject_event_t; /* * XEN_DMOP_inject_msi: Inject an MSI for an emulated device. @@ -340,6 +352,7 @@ struct xen_dm_op_inject_msi { /* IN - MSI address (0xfeexxxxx) */ uint64_aligned_t addr; }; +typedef struct xen_dm_op_inject_msi xen_dm_op_inject_msi_t; /* * XEN_DMOP_map_mem_type_to_ioreq_server : map or unmap the IOREQ Server @@ -366,6 +379,7 @@ struct xen_dm_op_map_mem_type_to_ioreq_server { uint64_t opaque; /* IN/OUT - only used for hypercall continuation, has to be set to zero by the caller */ }; +typedef struct xen_dm_op_map_mem_type_to_ioreq_server xen_dm_op_map_mem_type_to_ioreq_server_t; /* * XEN_DMOP_remote_shutdown : Declare a shutdown for another domain @@ -377,6 +391,7 @@ struct xen_dm_op_remote_shutdown { uint32_t reason; /* SHUTDOWN_* => enum sched_shutdown_reason */ /* (Other reason values are not blocked) */ }; +typedef struct xen_dm_op_remote_shutdown xen_dm_op_remote_shutdown_t; /* * XEN_DMOP_relocate_memory : Relocate GFNs for the specified guest. @@ -395,6 +410,7 @@ struct xen_dm_op_relocate_memory { /* Starting GFN where GFNs should be relocated. */ uint64_aligned_t dst_gfn; }; +typedef struct xen_dm_op_relocate_memory xen_dm_op_relocate_memory_t; /* * XEN_DMOP_pin_memory_cacheattr : Pin caching type of RAM space. @@ -416,30 +432,30 @@ struct xen_dm_op_pin_memory_cacheattr { uint32_t type; /* XEN_DMOP_MEM_CACHEATTR_* */ uint32_t pad; }; +typedef struct xen_dm_op_pin_memory_cacheattr xen_dm_op_pin_memory_cacheattr_t; struct xen_dm_op { uint32_t op; uint32_t pad; union { - struct xen_dm_op_create_ioreq_server create_ioreq_server; - struct xen_dm_op_get_ioreq_server_info get_ioreq_server_info; - struct xen_dm_op_ioreq_server_range map_io_range_to_ioreq_server; - struct xen_dm_op_ioreq_server_range unmap_io_range_from_ioreq_server; - struct xen_dm_op_set_ioreq_server_state set_ioreq_server_state; - struct xen_dm_op_destroy_ioreq_server destroy_ioreq_server; - struct xen_dm_op_track_dirty_vram track_dirty_vram; - struct xen_dm_op_set_pci_intx_level set_pci_intx_level; - struct xen_dm_op_set_isa_irq_level set_isa_irq_level; - struct xen_dm_op_set_pci_link_route set_pci_link_route; - struct xen_dm_op_modified_memory modified_memory; - struct xen_dm_op_set_mem_type set_mem_type; - struct xen_dm_op_inject_event inject_event; - struct xen_dm_op_inject_msi inject_msi; - struct xen_dm_op_map_mem_type_to_ioreq_server - map_mem_type_to_ioreq_server; - struct xen_dm_op_remote_shutdown remote_shutdown; - struct xen_dm_op_relocate_memory relocate_memory; - struct xen_dm_op_pin_memory_cacheattr pin_memory_cacheattr; + xen_dm_op_create_ioreq_server_t create_ioreq_server; + xen_dm_op_get_ioreq_server_info_t get_ioreq_server_info; + xen_dm_op_ioreq_server_range_t map_io_range_to_ioreq_server; + xen_dm_op_ioreq_server_range_t unmap_io_range_from_ioreq_server; + xen_dm_op_set_ioreq_server_state_t set_ioreq_server_state; + xen_dm_op_destroy_ioreq_server_t destroy_ioreq_server; + xen_dm_op_track_dirty_vram_t track_dirty_vram; + xen_dm_op_set_pci_intx_level_t set_pci_intx_level; + xen_dm_op_set_isa_irq_level_t set_isa_irq_level; + xen_dm_op_set_pci_link_route_t set_pci_link_route; + xen_dm_op_modified_memory_t modified_memory; + xen_dm_op_set_mem_type_t set_mem_type; + xen_dm_op_inject_event_t inject_event; + xen_dm_op_inject_msi_t inject_msi; + xen_dm_op_map_mem_type_to_ioreq_server_t map_mem_type_to_ioreq_server; + xen_dm_op_remote_shutdown_t remote_shutdown; + xen_dm_op_relocate_memory_t relocate_memory; + xen_dm_op_pin_memory_cacheattr_t pin_memory_cacheattr; } u; }; diff --git a/xen/include/public/hvm/hvm_vcpu.h b/xen/include/public/hvm/hvm_vcpu.h index d21abf1885..661cf89e1e 100644 --- a/xen/include/public/hvm/hvm_vcpu.h +++ b/xen/include/public/hvm/hvm_vcpu.h @@ -69,6 +69,7 @@ struct vcpu_hvm_x86_32 { uint16_t pad2[3]; }; +typedef struct vcpu_hvm_x86_32 xen_vcpu_hvm_x86_32_t; /* * The layout of the _ar fields of the segment registers is the @@ -114,6 +115,7 @@ struct vcpu_hvm_x86_64 { * the 32-bit structure should be used instead. */ }; +typedef struct vcpu_hvm_x86_64 xen_vcpu_hvm_x86_64_t; struct vcpu_hvm_context { #define VCPU_HVM_MODE_32B 0 /* 32bit fields of the structure will be used. */ @@ -124,8 +126,8 @@ struct vcpu_hvm_context { /* CPU registers. */ union { - struct vcpu_hvm_x86_32 x86_32; - struct vcpu_hvm_x86_64 x86_64; + xen_vcpu_hvm_x86_32_t x86_32; + xen_vcpu_hvm_x86_64_t x86_64; } cpu_regs; }; typedef struct vcpu_hvm_context vcpu_hvm_context_t; diff --git a/xen/include/public/hypfs.h b/xen/include/public/hypfs.h index 63a5df1629..2b7a66d68d 100644 --- a/xen/include/public/hypfs.h +++ b/xen/include/public/hypfs.h @@ -53,9 +53,10 @@ struct xen_hypfs_direntry { uint32_t content_len; /* Current length of data. */ uint32_t max_write_len; /* Max. length for writes (0 if read-only). */ }; +typedef struct xen_hypfs_direntry xen_hypfs_direntry_t; struct xen_hypfs_dirlistentry { - struct xen_hypfs_direntry e; + xen_hypfs_direntry_t 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. */ diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index 21057ed78e..21d483298e 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -604,7 +604,7 @@ struct xen_reserved_device_memory_map { XEN_GUEST_HANDLE(xen_reserved_device_memory_t) buffer; /* IN */ union { - struct physdev_pci_device pci; + physdev_pci_device_t pci; } dev; }; typedef struct xen_reserved_device_memory_map xen_reserved_device_memory_map_t; diff --git a/xen/include/public/physdev.h b/xen/include/public/physdev.h index aedb71d678..d271766ad0 100644 --- a/xen/include/public/physdev.h +++ b/xen/include/public/physdev.h @@ -229,11 +229,11 @@ DEFINE_XEN_GUEST_HANDLE(physdev_manage_pci_ext_t); struct physdev_op { uint32_t cmd; union { - struct physdev_irq_status_query irq_status_query; - struct physdev_set_iopl set_iopl; - struct physdev_set_iobitmap set_iobitmap; - struct physdev_apic apic_op; - struct physdev_irq irq_op; + physdev_irq_status_query_t irq_status_query; + physdev_set_iopl_t set_iopl; + physdev_set_iobitmap_t set_iobitmap; + physdev_apic_t apic_op; + physdev_irq_t irq_op; } u; }; typedef struct physdev_op physdev_op_t; @@ -334,7 +334,7 @@ struct physdev_dbgp_op { uint8_t op; uint8_t bus; union { - struct physdev_pci_device pci; + physdev_pci_device_t pci; } u; }; typedef struct physdev_dbgp_op physdev_dbgp_op_t; diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h index f3c84ebc78..a4c0eb6224 100644 --- a/xen/include/public/platform.h +++ b/xen/include/public/platform.h @@ -42,6 +42,7 @@ struct xenpf_settime32 { uint32_t nsecs; uint64_t system_time; }; +typedef struct xenpf_settime32 xenpf_settime32_t; #define XENPF_settime64 62 struct xenpf_settime64 { /* IN variables. */ @@ -50,6 +51,7 @@ struct xenpf_settime64 { uint32_t mbz; uint64_t system_time; }; +typedef struct xenpf_settime64 xenpf_settime64_t; #if __XEN_INTERFACE_VERSION__ < 0x00040600 #define XENPF_settime XENPF_settime32 #define xenpf_settime xenpf_settime32 @@ -529,6 +531,7 @@ struct xenpf_cpu_hotadd uint32_t acpi_id; uint32_t pxm; }; +typedef struct xenpf_cpu_hotadd xenpf_cpu_hotadd_t; #define XENPF_mem_hotadd 59 struct xenpf_mem_hotadd @@ -538,6 +541,7 @@ struct xenpf_mem_hotadd uint32_t pxm; uint32_t flags; }; +typedef struct xenpf_mem_hotadd xenpf_mem_hotadd_t; #define XENPF_core_parking 60 @@ -622,29 +626,29 @@ struct xen_platform_op { uint32_t cmd; uint32_t interface_version; /* XENPF_INTERFACE_VERSION */ union { - struct xenpf_settime settime; - struct xenpf_settime32 settime32; - struct xenpf_settime64 settime64; - struct xenpf_add_memtype add_memtype; - struct xenpf_del_memtype del_memtype; - struct xenpf_read_memtype read_memtype; - struct xenpf_microcode_update microcode; - struct xenpf_platform_quirk platform_quirk; - struct xenpf_efi_runtime_call efi_runtime_call; - struct xenpf_firmware_info firmware_info; - struct xenpf_enter_acpi_sleep enter_acpi_sleep; - struct xenpf_change_freq change_freq; - struct xenpf_getidletime getidletime; - struct xenpf_set_processor_pminfo set_pminfo; - struct xenpf_pcpuinfo pcpu_info; - struct xenpf_pcpu_version pcpu_version; - struct xenpf_cpu_ol cpu_ol; - struct xenpf_cpu_hotadd cpu_add; - struct xenpf_mem_hotadd mem_add; - struct xenpf_core_parking core_parking; - struct xenpf_resource_op resource_op; - struct xenpf_symdata symdata; - uint8_t pad[128]; + xenpf_settime_t settime; + xenpf_settime32_t settime32; + xenpf_settime64_t settime64; + xenpf_add_memtype_t add_memtype; + xenpf_del_memtype_t del_memtype; + xenpf_read_memtype_t read_memtype; + xenpf_microcode_update_t microcode; + xenpf_platform_quirk_t platform_quirk; + xenpf_efi_runtime_call_t efi_runtime_call; + xenpf_firmware_info_t firmware_info; + xenpf_enter_acpi_sleep_t enter_acpi_sleep; + xenpf_change_freq_t change_freq; + xenpf_getidletime_t getidletime; + xenpf_set_processor_pminfo_t set_pminfo; + xenpf_pcpuinfo_t pcpu_info; + xenpf_pcpu_version_t pcpu_version; + xenpf_cpu_ol_t cpu_ol; + xenpf_cpu_hotadd_t cpu_add; + xenpf_mem_hotadd_t mem_add; + xenpf_core_parking_t core_parking; + xenpf_resource_op_t resource_op; + xenpf_symdata_t symdata; + uint8_t pad[128]; } u; }; typedef struct xen_platform_op xen_platform_op_t; diff --git a/xen/include/public/pmu.h b/xen/include/public/pmu.h index 0e1312cfe5..cc2fcf8816 100644 --- a/xen/include/public/pmu.h +++ b/xen/include/public/pmu.h @@ -127,7 +127,7 @@ struct xen_pmu_data { uint8_t pad[6]; /* Architecture-specific information */ - struct xen_pmu_arch pmu; + xen_pmu_arch_t pmu; }; #endif /* __XEN_PUBLIC_PMU_H__ */ diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h index 945ef30273..e373592c33 100644 --- a/xen/include/public/xen.h +++ b/xen/include/public/xen.h @@ -726,7 +726,7 @@ struct vcpu_info { #endif /* XEN_HAVE_PV_UPCALL_MASK */ xen_ulong_t evtchn_pending_sel; struct arch_vcpu_info arch; - struct vcpu_time_info time; + vcpu_time_info_t time; }; /* 64 bytes (x86) */ #ifndef __XEN__ typedef struct vcpu_info vcpu_info_t; @@ -1031,6 +1031,7 @@ struct xenctl_bitmap { XEN_GUEST_HANDLE_64(uint8) bitmap; uint32_t nr_bits; }; +typedef struct xenctl_bitmap xenctl_bitmap_t; #endif #endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ diff --git a/xen/include/public/xsm/flask_op.h b/xen/include/public/xsm/flask_op.h index 970ec07f0b..16af7bc22f 100644 --- a/xen/include/public/xsm/flask_op.h +++ b/xen/include/public/xsm/flask_op.h @@ -33,10 +33,12 @@ struct xen_flask_load { XEN_GUEST_HANDLE(char) buffer; uint32_t size; }; +typedef struct xen_flask_load xen_flask_load_t; struct xen_flask_setenforce { uint32_t enforcing; }; +typedef struct xen_flask_setenforce xen_flask_setenforce_t; struct xen_flask_sid_context { /* IN/OUT: sid to convert to/from string */ @@ -47,6 +49,7 @@ struct xen_flask_sid_context { uint32_t size; XEN_GUEST_HANDLE(char) context; }; +typedef struct xen_flask_sid_context xen_flask_sid_context_t; struct xen_flask_access { /* IN: access request */ @@ -60,6 +63,7 @@ struct xen_flask_access { uint32_t audit_deny; uint32_t seqno; }; +typedef struct xen_flask_access xen_flask_access_t; struct xen_flask_transition { /* IN: transition SIDs and class */ @@ -69,6 +73,7 @@ struct xen_flask_transition { /* OUT: new SID */ uint32_t newsid; }; +typedef struct xen_flask_transition xen_flask_transition_t; #if __XEN_INTERFACE_VERSION__ < 0x00040800 struct xen_flask_userlist { @@ -106,11 +111,13 @@ struct xen_flask_boolean { */ XEN_GUEST_HANDLE(char) name; }; +typedef struct xen_flask_boolean xen_flask_boolean_t; struct xen_flask_setavc_threshold { /* IN */ uint32_t threshold; }; +typedef struct xen_flask_setavc_threshold xen_flask_setavc_threshold_t; struct xen_flask_hash_stats { /* OUT */ @@ -119,6 +126,7 @@ struct xen_flask_hash_stats { uint32_t buckets_total; uint32_t max_chain_len; }; +typedef struct xen_flask_hash_stats xen_flask_hash_stats_t; struct xen_flask_cache_stats { /* IN */ @@ -131,6 +139,7 @@ struct xen_flask_cache_stats { uint32_t reclaims; uint32_t frees; }; +typedef struct xen_flask_cache_stats xen_flask_cache_stats_t; struct xen_flask_ocontext { /* IN */ @@ -138,6 +147,7 @@ struct xen_flask_ocontext { uint32_t sid; uint64_t low, high; }; +typedef struct xen_flask_ocontext xen_flask_ocontext_t; struct xen_flask_peersid { /* IN */ @@ -145,12 +155,14 @@ struct xen_flask_peersid { /* OUT */ uint32_t sid; }; +typedef struct xen_flask_peersid xen_flask_peersid_t; struct xen_flask_relabel { /* IN */ uint32_t domid; uint32_t sid; }; +typedef struct xen_flask_relabel xen_flask_relabel_t; struct xen_flask_devicetree_label { /* IN */ @@ -158,6 +170,7 @@ struct xen_flask_devicetree_label { uint32_t length; XEN_GUEST_HANDLE(char) path; }; +typedef struct xen_flask_devicetree_label xen_flask_devicetree_label_t; struct xen_flask_op { uint32_t cmd; @@ -188,26 +201,26 @@ struct xen_flask_op { #define FLASK_DEVICETREE_LABEL 25 uint32_t interface_version; /* XEN_FLASK_INTERFACE_VERSION */ union { - struct xen_flask_load load; - struct xen_flask_setenforce enforce; + xen_flask_load_t load; + xen_flask_setenforce_t enforce; /* FLASK_CONTEXT_TO_SID and FLASK_SID_TO_CONTEXT */ - struct xen_flask_sid_context sid_context; - struct xen_flask_access access; + xen_flask_sid_context_t sid_context; + xen_flask_access_t access; /* FLASK_CREATE, FLASK_RELABEL, FLASK_MEMBER */ - struct xen_flask_transition transition; + xen_flask_transition_t transition; #if __XEN_INTERFACE_VERSION__ < 0x00040800 struct xen_flask_userlist userlist; #endif /* FLASK_GETBOOL, FLASK_SETBOOL */ - struct xen_flask_boolean boolean; - struct xen_flask_setavc_threshold setavc_threshold; - struct xen_flask_hash_stats hash_stats; - struct xen_flask_cache_stats cache_stats; + xen_flask_boolean_t boolean; + xen_flask_setavc_threshold_t setavc_threshold; + xen_flask_hash_stats_t hash_stats; + xen_flask_cache_stats_t cache_stats; /* FLASK_ADD_OCONTEXT, FLASK_DEL_OCONTEXT */ - struct xen_flask_ocontext ocontext; - struct xen_flask_peersid peersid; - struct xen_flask_relabel relabel; - struct xen_flask_devicetree_label devicetree_label; + xen_flask_ocontext_t ocontext; + xen_flask_peersid_t peersid; + xen_flask_relabel_t relabel; + xen_flask_devicetree_label_t devicetree_label; } u; }; typedef struct xen_flask_op xen_flask_op_t; diff --git a/xen/tools/compat-build-header.py b/xen/tools/compat-build-header.py index b85c43f13f..ca706ce353 100755 --- a/xen/tools/compat-build-header.py +++ b/xen/tools/compat-build-header.py @@ -3,7 +3,7 @@ import re,sys pats = [ - [ r"__InClUdE__(.*)", r"#include\1\n#pragma pack(4)" ], + [ r"__InClUdE__(.*)", r"#include\1" ], [ r"__IfDeF__ (XEN_HAVE.*)", r"#ifdef \1" ], [ r"__ElSe__", r"#else" ], [ r"__EnDif__", r"#endif" ], @@ -11,9 +11,11 @@ pats = [ [ r"__UnDeF__", r"#undef" ], [ r"\"xen-compat.h\"", r"" ], [ r"(struct|union|enum)\s+(xen_?)?(\w)", r"\1 compat_\3" ], - [ r"@KeeP@", r"" ], + [ r"typedef(.*)@KeeP@((xen_?)?)([\w]+)([^\w])", + r"typedef\1\2\4 __attribute__((__aligned__(__alignof(\1compat_\4))))\5" ], [ r"_t([^\w]|$)", r"_compat_t\1" ], - [ r"(8|16|32|64)_compat_t([^\w]|$)", r"\1_t\2" ], + [ r"int(8|16|32|64_aligned)_compat_t([^\w]|$)", r"int\1_t\2" ], + [ r"(\su?int64(_compat)?)_T([^\w]|$)", r"\1_t\3" ], [ r"(^|[^\w])xen_?(\w*)_compat_t([^\w]|$$)", r"\1compat_\2_t\3" ], [ r"(^|[^\w])XEN_?", r"\1COMPAT_" ], [ r"(^|[^\w])Xen_?", r"\1Compat_" ], diff --git a/xen/tools/compat-build-source.py b/xen/tools/compat-build-source.py index c664eb85e6..fc10c7063f 100755 --- a/xen/tools/compat-build-source.py +++ b/xen/tools/compat-build-source.py @@ -9,6 +9,7 @@ pats = [ [ r"^\s*#\s*endif /\* (XEN_HAVE.*) \*/\s+", r"__EnDif__" ], [ r"^\s*#\s*define\s+([A-Z_]*_GUEST_HANDLE)", r"#define HIDE_\1" ], [ r"^\s*#\s*define\s+([a-z_]*_guest_handle)", r"#define hide_\1" ], + [ r"^\s*#\s*define\s+(u?int64)_aligned_t\s.*aligned.*", r"typedef \1_T __attribute__((aligned(4))) \1_compat_T;" ], [ r"XEN_GUEST_HANDLE(_[0-9A-Fa-f]+)?", r"COMPAT_HANDLE" ], ]; diff --git a/xen/tools/get-fields.sh b/xen/tools/get-fields.sh index 45a0e2ed50..002db2093f 100644 --- a/xen/tools/get-fields.sh +++ b/xen/tools/get-fields.sh @@ -418,6 +418,21 @@ check_field () "}") level=$(expr $level - 1) id= ;; + compat_*_t) + if [ $level = 2 ] + then + fields=" " + token="${token%_t}" + token="${token#compat_}" + fi + ;; + evtchn_*_compat_t) + if [ $level = 2 -a $token != evtchn_port_compat_t ] + then + fields=" " + token="${token%_compat_t}" + fi + ;; [a-zA-Z]*) id=$token ;; @@ -464,6 +479,14 @@ build_check () "]") arrlvl=$(expr $arrlvl - 1) ;; + compat_*_t) + if [ $level = 2 -a $token != compat_argo_port_t ] + then + fields=" " + token="${token%_t}" + token="${token#compat_}" + fi + ;; [a-zA-Z_]*) test $level != 2 -o $arrlvl != 1 || id=$token ;; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:22:48 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09:22: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 1kE7vk-0002vn-Im; Fri, 04 Sep 2020 09:22: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 1kE7vj-0002vY-3G for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:47 +0000 X-Inumbo-ID: d5c3d76a-1941-47e6-bcc5-85ca25633589 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d5c3d76a-1941-47e6-bcc5-85ca25633589; Fri, 04 Sep 2020 09:22: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; bh=2HlkN0YrpOSOBZY+9HT6eQVe6TXQN6gnZhXmHnl9DAI=; b=DBlt7CHo4lzBJ7riPV+gnyIfda fQOj3whT9lHljzwFwRccRhhavYtM3fIPmnLAE+45zjwJtn/kY2mBFVi1okbbCLBz1NZtU6i96raLO V7mmNw1duMjgCa9pE97phRc4XupszfRrdHAz07FOO+3EYQg9t3VYj4oLG8jbwcZRmAFg=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7vi-00007W-5W for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7vi-0001bn-3p for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:46 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mce: add compat struct checking for XEN_MC_inject_v2 Message-Id: Date: Fri, 04 Sep 2020 09:22: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 9d207b88ff208ad829822a4f1da9d8ab020ef263 Author: Jan Beulich AuthorDate: Fri Sep 4 11:06:56 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:06:56 2020 +0200 x86/mce: add compat struct checking for XEN_MC_inject_v2 84e364f2eda2 ("x86: add CMCI software injection interface") merely made sure things would build, without any concern about things actually working: - despite the addition of xenctl_bitmap to xlat.lst, the resulting macro wasn't invoked anywhere (which would have lead to recognizing that the structure appeared to have no fully compatible layout, despite the use of a 64-bit handle), - the interface struct itself was neither added to xlat.lst (and the resulting macro then invoked) nor was any manual checking of individual fields added. Adjust compat header generation logic to retain XEN_GUEST_HANDLE_64(), which is intentionally layed out to be compatible between different size guests. Invoke the missing checking (implicitly through CHECK_mc). No change in the resulting generated code. Fixes: 84e364f2eda2 ("x86: add CMCI software injection interface") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/mcheck/mce.c | 4 +++- xen/include/public/arch-x86/xen-mca.h | 3 ++- xen/include/xlat.lst | 1 + xen/tools/compat-build-header.py | 1 + xen/tools/compat-build-source.py | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index fe9667e0c3..5ec16fab87 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1312,10 +1312,12 @@ CHECK_FIELD_(struct, mc_fetch, fetch_id); CHECK_FIELD_(struct, mc_physcpuinfo, ncpus); # define CHECK_compat_mc_physcpuinfo struct mc_physcpuinfo -#define CHECK_compat_mc_inject_v2 struct mc_inject_v2 +# define xen_ctl_bitmap xenctl_bitmap + CHECK_mc; # undef CHECK_compat_mc_fetch # undef CHECK_compat_mc_physcpuinfo +# undef xen_ctl_bitmap # define xen_mc_info mc_info CHECK_mc_info; diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index 702998b0eb..628b79e22a 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -429,6 +429,7 @@ struct xen_mc_inject_v2 { uint32_t flags; xenctl_bitmap_t cpumap; }; +typedef struct xen_mc_inject_v2 xen_mc_inject_v2_t; #endif struct xen_mc { @@ -441,7 +442,7 @@ struct xen_mc { xen_mc_msrinject_t mc_msrinject; xen_mc_mceinject_t mc_mceinject; #if defined(__XEN__) || defined(__XEN_TOOLS__) - struct xen_mc_inject_v2 mc_inject_v2; + xen_mc_inject_v2_t mc_inject_v2; #endif } u; }; diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 20d4dccce6..1eb28dbe66 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -44,6 +44,7 @@ ? mcinfo_recovery arch-x86/xen-mca.h ! mc_fetch arch-x86/xen-mca.h ? mc_info arch-x86/xen-mca.h +? mc_inject_v2 arch-x86/xen-mca.h ? mc_mceinject arch-x86/xen-mca.h ? mc_msrinject arch-x86/xen-mca.h ? mc_notifydomain arch-x86/xen-mca.h diff --git a/xen/tools/compat-build-header.py b/xen/tools/compat-build-header.py index ca706ce353..065d3b1b6e 100755 --- a/xen/tools/compat-build-header.py +++ b/xen/tools/compat-build-header.py @@ -19,6 +19,7 @@ pats = [ [ r"(^|[^\w])xen_?(\w*)_compat_t([^\w]|$$)", r"\1compat_\2_t\3" ], [ r"(^|[^\w])XEN_?", r"\1COMPAT_" ], [ r"(^|[^\w])Xen_?", r"\1Compat_" ], + [ r"(^|[^\w])COMPAT_HANDLE_64\(", r"\1XEN_GUEST_HANDLE_64(" ], [ r"(^|[^\w])long([^\w]|$$)", r"\1int\2" ] ]; diff --git a/xen/tools/compat-build-source.py b/xen/tools/compat-build-source.py index fc10c7063f..2bcaf27d05 100755 --- a/xen/tools/compat-build-source.py +++ b/xen/tools/compat-build-source.py @@ -10,7 +10,7 @@ pats = [ [ r"^\s*#\s*define\s+([A-Z_]*_GUEST_HANDLE)", r"#define HIDE_\1" ], [ r"^\s*#\s*define\s+([a-z_]*_guest_handle)", r"#define hide_\1" ], [ r"^\s*#\s*define\s+(u?int64)_aligned_t\s.*aligned.*", r"typedef \1_T __attribute__((aligned(4))) \1_compat_T;" ], - [ r"XEN_GUEST_HANDLE(_[0-9A-Fa-f]+)?", r"COMPAT_HANDLE" ], + [ r"XEN_GUEST_HANDLE", r"COMPAT_HANDLE" ], ]; xlatf = open('xlat.lst', 'r') -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:22:59 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09:22: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 1kE7vv-0002xT-KO; Fri, 04 Sep 2020 09:22: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 1kE7vt-0002xE-RS for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:57 +0000 X-Inumbo-ID: 64cf948e-66b3-43ad-ae1c-d4c99eadd6ae Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 64cf948e-66b3-43ad-ae1c-d4c99eadd6ae; Fri, 04 Sep 2020 09:22: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; bh=OpqSLD6cVThfv1w09oLtw6XfMYXwvdfq4jJDqSdzJZA=; b=ole2RvA794h6Da6FwvTIV75lqO uj455F9TQ6exm14zUMXN7qO0N2Nom8uHlgOeIlSy/6YR+mcmGYGIBSGQ4M+I8n9yxyYGzEoPubZGU ld9mGOsotMlyckaJ9DfG5DRU6OIYHay+U/w1N0S8DxV7wkChfY3XefYoPd7s/5EeZT3s=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7vs-00007j-8z for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:56 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7vs-0001ce-8A for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:22:56 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/mce: bring hypercall subop compat checking in sync again Message-Id: Date: Fri, 04 Sep 2020 09:22: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 7dcd33d562ee8a8177c843f42721d5345f796fe8 Author: Jan Beulich AuthorDate: Fri Sep 4 11:07:47 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:07:47 2020 +0200 x86/mce: bring hypercall subop compat checking in sync again Use a typedef in struct xen_mc also for the two subops "manually" translated in the handler, just for consistency. No functional change. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/cpu/mcheck/mce.c | 8 ++++---- xen/include/public/arch-x86/xen-mca.h | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c index 5ec16fab87..0e84368ae2 100644 --- a/xen/arch/x86/cpu/mcheck/mce.c +++ b/xen/arch/x86/cpu/mcheck/mce.c @@ -1307,16 +1307,16 @@ CHECK_mcinfo_common; CHECK_FIELD_(struct, mc_fetch, flags); CHECK_FIELD_(struct, mc_fetch, fetch_id); -# define CHECK_compat_mc_fetch struct mc_fetch +# define CHECK_mc_fetch struct mc_fetch CHECK_FIELD_(struct, mc_physcpuinfo, ncpus); -# define CHECK_compat_mc_physcpuinfo struct mc_physcpuinfo +# define CHECK_mc_physcpuinfo struct mc_physcpuinfo # define xen_ctl_bitmap xenctl_bitmap CHECK_mc; -# undef CHECK_compat_mc_fetch -# undef CHECK_compat_mc_physcpuinfo +# undef CHECK_mc_fetch +# undef CHECK_mc_physcpuinfo # undef xen_ctl_bitmap # define xen_mc_info mc_info diff --git a/xen/include/public/arch-x86/xen-mca.h b/xen/include/public/arch-x86/xen-mca.h index 628b79e22a..d930c344c0 100644 --- a/xen/include/public/arch-x86/xen-mca.h +++ b/xen/include/public/arch-x86/xen-mca.h @@ -391,6 +391,7 @@ struct xen_mc_physcpuinfo { /* OUT */ XEN_GUEST_HANDLE(xen_mc_logical_cpu_t) info; }; +typedef struct xen_mc_physcpuinfo xen_mc_physcpuinfo_t; #define XEN_MC_msrinject 4 #define MC_MSRINJ_MAXMSRS 8 @@ -436,9 +437,9 @@ struct xen_mc { uint32_t cmd; uint32_t interface_version; /* XEN_MCA_INTERFACE_VERSION */ union { - struct xen_mc_fetch mc_fetch; + xen_mc_fetch_t mc_fetch; xen_mc_notifydomain_t mc_notifydomain; - struct xen_mc_physcpuinfo mc_physcpuinfo; + xen_mc_physcpuinfo_t mc_physcpuinfo; xen_mc_msrinject_t mc_msrinject; xen_mc_mceinject_t mc_mceinject; #if defined(__XEN__) || defined(__XEN_TOOLS__) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:23:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09: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 1kE7w4-0002yP-M2; Fri, 04 Sep 2020 09:23: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 1kE7w3-0002yH-6b for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:07 +0000 X-Inumbo-ID: e24d76cf-540e-4f33-beb2-fb793eec852a Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e24d76cf-540e-4f33-beb2-fb793eec852a; Fri, 04 Sep 2020 09:23: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; bh=XqAcJdDYzTHFvO9vb4163OIwJh6DBQpVjfnm3rY4MK8=; b=6mROWEMJOoPmcjZyQwZisO+q2g 8Rr2cv76LUl4zARxFD5RXMM+Xsz1zoNHMrpuDsVDRo/ddUfNFmaXqQf02Z0lfAQB8Yck2saXvAdrR c1DF9DgwaonQKOB4YHMlbslk5zzcQw3fMp+cFHMBmR9RH0mekWCKeivKF+C+eUhtsdY8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7w2-00008H-Cr for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7w2-0001dG-Bg for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:06 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/dmop: add compat struct checking for XEN_DMOP_map_mem_type_to_ioreq_server Message-Id: Date: Fri, 04 Sep 2020 09:23: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 4d7bcd128f11dff49b0fd8eb367a3c546a8e38af Author: Jan Beulich AuthorDate: Fri Sep 4 11:08:40 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:08:40 2020 +0200 x86/dmop: add compat struct checking for XEN_DMOP_map_mem_type_to_ioreq_server This was forgotten when the subop was added. Also take the opportunity and move the dm_op_relocate_memory entry in xlat.lst to its designated place. No change in the resulting generated code. Fixes: ca2b511d3ff4 ("x86/ioreq server: add DMOP to map guest ram with p2m_ioreq_server to an ioreq server") Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/dm.c | 1 + xen/include/xlat.lst | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index 9930d68860..cf3787d9ff 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -731,6 +731,7 @@ CHECK_dm_op_modified_memory; CHECK_dm_op_set_mem_type; CHECK_dm_op_inject_event; CHECK_dm_op_inject_msi; +CHECK_dm_op_map_mem_type_to_ioreq_server; CHECK_dm_op_remote_shutdown; CHECK_dm_op_relocate_memory; CHECK_dm_op_pin_memory_cacheattr; diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 1eb28dbe66..bab3a9bad1 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -86,15 +86,16 @@ ? grant_entry_v2 grant_table.h ? gnttab_swap_grant_ref grant_table.h ! dm_op_buf hvm/dm_op.h -? dm_op_relocate_memory hvm/dm_op.h ? dm_op_create_ioreq_server hvm/dm_op.h ? dm_op_destroy_ioreq_server hvm/dm_op.h ? dm_op_get_ioreq_server_info hvm/dm_op.h ? dm_op_inject_event hvm/dm_op.h ? dm_op_inject_msi hvm/dm_op.h ? dm_op_ioreq_server_range hvm/dm_op.h +? dm_op_map_mem_type_to_ioreq_server hvm/dm_op.h ? dm_op_modified_memory hvm/dm_op.h ? dm_op_pin_memory_cacheattr hvm/dm_op.h +? dm_op_relocate_memory hvm/dm_op.h ? dm_op_remote_shutdown hvm/dm_op.h ? dm_op_set_ioreq_server_state hvm/dm_op.h ? dm_op_set_isa_irq_level hvm/dm_op.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:23:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09:23: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 1kE7wE-0002zS-Nb; Fri, 04 Sep 2020 09:23: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 1kE7wD-0002zH-9H for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:17 +0000 X-Inumbo-ID: 1e572164-38eb-4d4e-8b27-d6af483df0fc Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1e572164-38eb-4d4e-8b27-d6af483df0fc; Fri, 04 Sep 2020 09:23: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; bh=rW2PEkV+zKGxEzthP6vdQ/J6NSt1RabrK4dESlyz9RI=; b=avwl5LtpB23k73qcPwL/82YccU +GG762nt35tGg9YsP9iBtxlaxxaXKdJYHwXvua7WdkMTLAoCjLOb7pHAhqHRXEHyLH1Zg3DOEq7n2 IfALCKL9JxEHYb0RlGBOnpenVebdAzaSUMEF7197/R2sFpobLaUxsgG8PlBPAlrogO1g=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7wC-00008V-GI for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7wC-0001di-FS for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] evtchn: add compat struct checking for newer sub-ops Message-Id: Date: Fri, 04 Sep 2020 09:23: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 a609b6577f7867db4be1470130b7b3c686398c4f Author: Jan Beulich AuthorDate: Fri Sep 4 11:11:35 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:11:35 2020 +0200 evtchn: add compat struct checking for newer sub-ops Various additions to the interface did not get mirrored into the compat handling machinery. Luckily all additions were done in ways not making any form of translation necessary. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/common/compat/xlat.c | 16 ++++++++++++++++ xen/include/xlat.lst | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/xen/common/compat/xlat.c b/xen/common/compat/xlat.c index ffc8f8f50e..e21f032413 100644 --- a/xen/common/compat/xlat.c +++ b/xen/common/compat/xlat.c @@ -54,6 +54,22 @@ CHECK_evtchn_op; #undef xen_evtchn_status #undef xen_evtchn_unmask +#define xen_evtchn_expand_array evtchn_expand_array +CHECK_evtchn_expand_array; +#undef xen_evtchn_expand_array + +#define xen_evtchn_init_control evtchn_init_control +CHECK_evtchn_init_control; +#undef xen_evtchn_init_control + +#define xen_evtchn_reset evtchn_reset +CHECK_evtchn_reset; +#undef xen_evtchn_reset + +#define xen_evtchn_set_priority evtchn_set_priority +CHECK_evtchn_set_priority; +#undef xen_evtchn_set_priority + #define xen_mmu_update mmu_update CHECK_mmu_update; #undef xen_mmu_update diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index bab3a9bad1..57a17a2b62 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -66,8 +66,12 @@ ? evtchn_bind_vcpu event_channel.h ? evtchn_bind_virq event_channel.h ? evtchn_close event_channel.h +? evtchn_expand_array event_channel.h +? evtchn_init_control event_channel.h ? evtchn_op event_channel.h +? evtchn_reset event_channel.h ? evtchn_send event_channel.h +? evtchn_set_priority event_channel.h ? evtchn_status event_channel.h ? evtchn_unmask event_channel.h ? gnttab_cache_flush grant_table.h -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:23:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09:23: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 1kE7wO-00030Q-PI; Fri, 04 Sep 2020 09:23: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 1kE7wN-00030G-HF for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:27 +0000 X-Inumbo-ID: 8552804a-4092-4a2c-867d-1ad0aa3aa86c Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 8552804a-4092-4a2c-867d-1ad0aa3aa86c; Fri, 04 Sep 2020 09: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; bh=C7Ur/5zKl99To7rk65g6P0QWwtEFAKHejmhx1aICiBw=; b=sHd7ZyQTCFU3m9MssYTfU0GD+F lQKWTFUWXMMFdHIO89SDaEqiolnSoSOpdsBMmDwbysfuPw9H9CdJ1ZvAspAJOmBlGP81I6SkJ70PJ 1yQdrEp0q3ddDNCPy7IPQpecxZMglv+FVTXwEyzLHnWVX14aP7PabR6HxKQF3xVgJibY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7wM-00008f-K7 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7wM-0001e6-Ip for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:26 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: generalize padding field handling Message-Id: Date: Fri, 04 Sep 2020 09: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 696c273f3d9a169911308fb7e0a702a3eb6a150d Author: Jan Beulich AuthorDate: Fri Sep 4 11:13:01 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:13:01 2020 +0200 x86: generalize padding field handling The original intention was to ignore padding fields, but the pattern matched only ones whose names started with an underscore. Also match fields whose names are in line with the C spec by not having a leading underscore. (Note that the leading ^ in the sed regexps was pointless and hence get dropped.) This requires adjusting some vNUMA macros, to avoid triggering "enumeration value ... not handled in switch" warnings, which - due to -Werror - would cause the build to fail. (I have to admit that I find these padding fields odd, when translation of the containing structure is needed anyway.) Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/common/compat/memory.c | 3 +++ xen/tools/get-fields.sh | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 3851f756c7..215b8f52d6 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -354,10 +354,13 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) return -EFAULT; #define XLAT_vnuma_topology_info_HNDL_vdistance_h(_d_, _s_) \ + case XLAT_vnuma_topology_info_vdistance_pad: \ guest_from_compat_handle((_d_)->vdistance.h, (_s_)->vdistance.h) #define XLAT_vnuma_topology_info_HNDL_vcpu_to_vnode_h(_d_, _s_) \ + case XLAT_vnuma_topology_info_vcpu_to_vnode_pad: \ guest_from_compat_handle((_d_)->vcpu_to_vnode.h, (_s_)->vcpu_to_vnode.h) #define XLAT_vnuma_topology_info_HNDL_vmemrange_h(_d_, _s_) \ + case XLAT_vnuma_topology_info_vmemrange_pad: \ guest_from_compat_handle((_d_)->vmemrange.h, (_s_)->vmemrange.h) XLAT_vnuma_topology_info(nat.vnuma, &cmp.vnuma); diff --git a/xen/tools/get-fields.sh b/xen/tools/get-fields.sh index 002db2093f..753e37eb2e 100644 --- a/xen/tools/get-fields.sh +++ b/xen/tools/get-fields.sh @@ -218,7 +218,7 @@ for line in sys.stdin.readlines(): fi ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] then if [ $kind = union ] then @@ -347,7 +347,7 @@ build_body () fi ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] then if [ -z "$array" -a -z "$array_type" ] then @@ -437,7 +437,7 @@ check_field () id=$token ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] then check_field $1 $2 $3.$id "$fields" test "$token" != ";" || fields= id= @@ -491,7 +491,7 @@ build_check () test $level != 2 -o $arrlvl != 1 || id=$token ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] then check_field $kind $1 $id "$fields" test "$token" != ";" || fields= id= -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:23:39 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09:23: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 1kE7wZ-00031a-Qv; Fri, 04 Sep 2020 09:23:39 +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 1kE7wY-00031P-F4 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:38 +0000 X-Inumbo-ID: a41eac9d-dd47-42fb-94fb-99db024a22d2 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id a41eac9d-dd47-42fb-94fb-99db024a22d2; Fri, 04 Sep 2020 09: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; bh=Y6umMvoBadTWSzp+Na/fB5kiGLzSknUGooxINnGoZkA=; b=4Er4mcvtcCB03WGHk2qP+edCyb NloAVRESgDT0XMLIVAsxcl/BpgpNxKVE+Oe8Sw0y5ilz/y+NCsPJV+nr5Hcryyha4g3kupQbvVbtw CaaS4kH84JfvPRukjWm/lDMbKM5FLGY9v/3gBV4DiUi2i1IMzbCP9vSNBuOt4u19tGEo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7wW-00008n-NS for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:36 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7wW-0001ea-Me for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:36 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] flask: drop dead compat translation code Message-Id: Date: Fri, 04 Sep 2020 09: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 7dcf89d9ec96254f69744ab6d91e8af13f4cda83 Author: Jan Beulich AuthorDate: Fri Sep 4 11:14:28 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:14:28 2020 +0200 flask: drop dead compat translation code Translation macros aren't used (and hence needed) at all (or else a devicetree_label entry would have been missing), and userlist has been removed quite some time ago. No functional change. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/include/xlat.lst | 3 --- xen/xsm/flask/flask_op.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/xen/include/xlat.lst b/xen/include/xlat.lst index 57a17a2b62..398993d5f4 100644 --- a/xen/include/xlat.lst +++ b/xen/include/xlat.lst @@ -171,14 +171,11 @@ ? xenoprof_init xenoprof.h ? xenoprof_passive xenoprof.h ? flask_access xsm/flask_op.h -! flask_boolean xsm/flask_op.h ? flask_cache_stats xsm/flask_op.h ? flask_hash_stats xsm/flask_op.h -! flask_load xsm/flask_op.h ? flask_ocontext xsm/flask_op.h ? flask_peersid xsm/flask_op.h ? flask_relabel xsm/flask_op.h ? flask_setavc_threshold xsm/flask_op.h ? flask_setenforce xsm/flask_op.h -! flask_sid_context xsm/flask_op.h ? flask_transition xsm/flask_op.h diff --git a/xen/xsm/flask/flask_op.c b/xen/xsm/flask/flask_op.c index a5f2b104e2..01e52138a1 100644 --- a/xen/xsm/flask/flask_op.c +++ b/xen/xsm/flask/flask_op.c @@ -790,8 +790,6 @@ CHECK_flask_transition; #define xen_flask_load compat_flask_load #define flask_security_load compat_security_load -#define xen_flask_userlist compat_flask_userlist - #define xen_flask_sid_context compat_flask_sid_context #define flask_security_context compat_security_context #define flask_security_sid compat_security_sid -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 09:23:49 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 09:23: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 1kE7wj-00032m-Th; Fri, 04 Sep 2020 09:23:49 +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 1kE7wh-00032Z-QU for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:47 +0000 X-Inumbo-ID: fc5b80b0-8646-457a-a32c-c21198c2e27b Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id fc5b80b0-8646-457a-a32c-c21198c2e27b; Fri, 04 Sep 2020 09: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; bh=qH3wJylSOdgq9ZJrcB5RGaNnYunhDxLztCNBt3jgs5o=; b=RDK9yFoAC+cHx4Hl6t7cAVy7Zy EtwuGNbpnVuhIREmEfX6cUUMlJXyiZVTpCO3zRfr72i/be+BBmKmhitsjUqpEUdN76qV0Srsm7LWD V3zalmI/GkvEH4SU7+AlJoPSISnxyPHykK6IFJJVPGPEX8H/saXxq9s226wzQeBRk9Nw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE7wg-00009K-RV for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:46 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE7wg-0001fI-QN for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 09:23:46 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86: only generate compat headers actually needed Message-Id: Date: Fri, 04 Sep 2020 09:23: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 2c8fabb2232d34d6d20a9ce6989e2e6cbee07d52 Author: Jan Beulich AuthorDate: Fri Sep 4 11:15:21 2020 +0200 Commit: Jan Beulich CommitDate: Fri Sep 4 11:15:21 2020 +0200 x86: only generate compat headers actually needed As was already the case for XSM/Flask, avoid generating compat headers when they're not going to be needed. To address resulting build issues - move compat/hvm/dm_op.h inclusion to the only source file needing it, - add a little bit of #ifdef-ary. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/hvm/dm.c | 2 ++ xen/common/compat/domain.c | 9 ++++++++- xen/include/Makefile | 24 +++++++++++++----------- xen/include/xen/hypercall.h | 2 -- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/hvm/dm.c b/xen/arch/x86/hvm/dm.c index cf3787d9ff..71f5ca4941 100644 --- a/xen/arch/x86/hvm/dm.c +++ b/xen/arch/x86/hvm/dm.c @@ -718,6 +718,8 @@ static int dm_op(const struct dmop_args *op_args) return rc; } +#include + CHECK_dm_op_create_ioreq_server; CHECK_dm_op_get_ioreq_server_info; CHECK_dm_op_ioreq_server_range; diff --git a/xen/common/compat/domain.c b/xen/common/compat/domain.c index 11c6afc463..98b8c15cea 100644 --- a/xen/common/compat/domain.c +++ b/xen/common/compat/domain.c @@ -11,7 +11,6 @@ EMIT_FILE; #include #include #include -#include #define xen_vcpu_set_periodic_timer vcpu_set_periodic_timer CHECK_vcpu_set_periodic_timer; @@ -25,6 +24,10 @@ CHECK_SIZE_(struct, vcpu_info); CHECK_vcpu_register_vcpu_info; #undef xen_vcpu_register_vcpu_info +#ifdef CONFIG_HVM + +#include + #define xen_vcpu_hvm_context vcpu_hvm_context #define xen_vcpu_hvm_x86_32 vcpu_hvm_x86_32 #define xen_vcpu_hvm_x86_64 vcpu_hvm_x86_64 @@ -33,6 +36,8 @@ CHECK_vcpu_hvm_context; #undef xen_vcpu_hvm_x86_32 #undef xen_vcpu_hvm_context +#endif + int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) arg) { struct domain *d = current->domain; @@ -49,6 +54,7 @@ int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) ar if ( v->vcpu_info == &dummy_vcpu_info ) return -EINVAL; +#ifdef CONFIG_HVM if ( is_hvm_vcpu(v) ) { struct vcpu_hvm_context ctxt; @@ -61,6 +67,7 @@ int compat_vcpu_op(int cmd, unsigned int vcpuid, XEN_GUEST_HANDLE_PARAM(void) ar domain_unlock(d); } else +#endif { struct compat_vcpu_guest_context *ctxt; diff --git a/xen/include/Makefile b/xen/include/Makefile index 0be5540886..5c2f57a0f6 100644 --- a/xen/include/Makefile +++ b/xen/include/Makefile @@ -3,32 +3,34 @@ ifneq ($(CONFIG_COMPAT),) compat-arch-$(CONFIG_X86) := x86_32 headers-y := \ - compat/argo.h \ - compat/callback.h \ + compat/arch-$(compat-arch-y).h \ compat/elfnote.h \ compat/event_channel.h \ compat/features.h \ - compat/grant_table.h \ - compat/hypfs.h \ - compat/kexec.h \ compat/memory.h \ compat/nmi.h \ compat/physdev.h \ compat/platform.h \ + compat/pmu.h \ compat/sched.h \ - compat/trace.h \ compat/vcpu.h \ compat/version.h \ compat/xen.h \ - compat/xenoprof.h + compat/xlat.h headers-$(CONFIG_X86) += compat/arch-x86/pmu.h headers-$(CONFIG_X86) += compat/arch-x86/xen-mca.h headers-$(CONFIG_X86) += compat/arch-x86/xen.h headers-$(CONFIG_X86) += compat/arch-x86/xen-$(compat-arch-y).h -headers-$(CONFIG_X86) += compat/hvm/dm_op.h -headers-$(CONFIG_X86) += compat/hvm/hvm_op.h -headers-$(CONFIG_X86) += compat/hvm/hvm_vcpu.h -headers-y += compat/arch-$(compat-arch-y).h compat/pmu.h compat/xlat.h +headers-$(CONFIG_ARGO) += compat/argo.h +headers-$(CONFIG_PV) += compat/callback.h +headers-$(CONFIG_GRANT_TABLE) += compat/grant_table.h +headers-$(CONFIG_HVM) += compat/hvm/dm_op.h +headers-$(CONFIG_HVM) += compat/hvm/hvm_op.h +headers-$(CONFIG_HVM) += compat/hvm/hvm_vcpu.h +headers-$(CONFIG_HYPFS) += compat/hypfs.h +headers-$(CONFIG_KEXEC) += compat/kexec.h +headers-$(CONFIG_TRACEBUFFER) += compat/trace.h +headers-$(CONFIG_XENOPROF) += compat/xenoprof.h headers-$(CONFIG_XSM_FLASK) += compat/xsm/flask_op.h cppflags-y := -include public/xen-compat.h -DXEN_GENERATING_COMPAT_HEADERS diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h index 655acc7f47..34b7f1fed6 100644 --- a/xen/include/xen/hypercall.h +++ b/xen/include/xen/hypercall.h @@ -216,8 +216,6 @@ extern long compat_argo_op( unsigned long arg4); #endif -#include - extern int compat_dm_op( domid_t domid, -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 11:22:11 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 11: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 1kE9nD-0007yl-1h; Fri, 04 Sep 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 1kE9nC-0007yf-K3 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 11:22:06 +0000 X-Inumbo-ID: 9b4e6064-2154-4d4f-aac3-8c9bcba00f23 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9b4e6064-2154-4d4f-aac3-8c9bcba00f23; Fri, 04 Sep 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; bh=0iXwK6B7oERa+Fp51Ux7JbXKc5QiCPIK97HZVkF0eOg=; b=FzjRqHOipHGQKHZfYCyXV7n9eV ztFlOQ1V/gR/STTvSdMC/Ua8juwwNT6kDH4ZHn9RjxgpQ4gSVxDpTQ3U1/OV9uor6feXxFF/KyQY9 3ycLVTh4uTsWMx+RbtqXcTqYha5Y88eaEvA2KwMxW1WNZx2E2nh78mA7z3vOQwk0FtS0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kE9nB-0002ix-AO for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 11:22:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kE9nB-0000Yi-8I for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 11:22:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] fix build with make 3.81 Message-Id: Date: Fri, 04 Sep 2020 11: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 fc4b1cbd8d8d22c80dd8f2fc744287ab7c89c912 Author: Juergen Gross AuthorDate: Tue Sep 1 13:58:16 2020 +0200 Commit: Ian Jackson CommitDate: Fri Sep 4 12:15:54 2020 +0100 fix build with make 3.81 make 3.81 doesn't support multiline variables defined with define var = ... endef Dropping the "=" in the first line will fix the issue. Fixes: ded08cdfa72bb ("tools: generate most contents of library make variables") Fixes: ddb2934a914df ("stubdom: add correct dependencies for Xen libraries") Reported-by: Jan Beulich Signed-off-by: Juergen Gross Reviewed-by: Ian Jackson --- stubdom/Makefile | 2 +- tools/Rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stubdom/Makefile b/stubdom/Makefile index 4fd86dd44b..98eba8efe3 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -25,7 +25,7 @@ endif include $(XEN_ROOT)/tools/libs/uselibs.mk -define LIB_deps = +define LIB_deps LIBDEPS_$(1) = $$(foreach use,$$(USELIBS_$(1)),libxen$$(use)) endef $(foreach lib,$(LIBS_LIBS),$(eval $(call LIB_deps,$(lib)))) diff --git a/tools/Rules.mk b/tools/Rules.mk index 7e019a8a65..385807a71c 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -94,7 +94,7 @@ endif # Consumers of libfoo should not directly use $(SHDEPS_libfoo) or # $(SHLIB_libfoo) -define LIB_defs = +define LIB_defs XEN_libxen$(1) = $$(XEN_ROOT)/tools/libs/$(1) CFLAGS_libxen$(1) = -I$$(XEN_libxen$(1))/include $$(CFLAGS_xeninclude) SHDEPS_libxen$(1) = $$(foreach use,$$(USELIBS_$(1)),$$(SHLIB_libxen$$(use))) -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 14:44:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 14:44: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 1kECwh-00043v-Ip; Fri, 04 Sep 2020 14: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 1kECwg-00043q-Kj for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 14:44:06 +0000 X-Inumbo-ID: d6653c88-2647-4281-82c7-446011c0fa82 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d6653c88-2647-4281-82c7-446011c0fa82; Fri, 04 Sep 2020 14: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; bh=WWI3gxxar6OnVarL1gNLcD2n8nGVyr9v0V79lEsLwJE=; b=U4C5ShlRR08X0bNnE4aM2ychm0 6o1gmvn+oexEe1A3PA/TNVEzXaq6w61xz7WJD8bD6ZX3t+0qx7YZPDBPbupd5EgyjF20l2/I+SyUl TAE95erluo6XyRKfJhDhpzEz8Qnn+v0xl7kHHcy7EcbuJrZrgd/Vq532fSGQnJRRPk5c=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kECwf-0006wp-ER for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 14:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kECwf-0005pL-Bz for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 14:44:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] Revert "libxl: Generate golang bindings in libxl Makefile" Message-Id: Date: Fri, 04 Sep 2020 14: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 ac7a21cf5c125810ee0193338a0f710cba0ab079 Author: George Dunlap AuthorDate: Fri Aug 28 15:33:37 2020 +0100 Commit: George Dunlap CommitDate: Fri Sep 4 15:38:56 2020 +0100 Revert "libxl: Generate golang bindings in libxl Makefile" This reverts commit 60db5da62ac051aab0b217fa2d96acca1cd3ca3e. This is in preparation for the planned move to hosting the xenlight package in a separate repo. This also fixes a regression when building with a read-only source and an out-of-tree build. Signed-off-by: George Dunlap Acked-by: Nick Rosbrook --- tools/golang/xenlight/Makefile | 7 ------- tools/libxl/Makefile | 17 +---------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/tools/golang/xenlight/Makefile b/tools/golang/xenlight/Makefile index a83fff7573..b17095e64b 100644 --- a/tools/golang/xenlight/Makefile +++ b/tools/golang/xenlight/Makefile @@ -15,13 +15,6 @@ all: build GOXL_GEN_FILES = types.gen.go helpers.gen.go -# 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 0e8dfc6193..c26b3a8093 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -219,7 +219,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) idl-external + $(AUTOSRCS) $(AUTOINCS) $(LIBXL_OBJS) $(LIBXLU_OBJS) $(SAVE_HELPER_OBJS) \ $(LIBXL_TEST_OBJS) $(TEST_PROG_OBJS): \ @@ -275,21 +275,6 @@ _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 Fri Sep 04 16:55:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 16: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 1kEEzT-0001ge-RR; Fri, 04 Sep 2020 16: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 1kEEzS-0001gZ-S8 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 16:55:06 +0000 X-Inumbo-ID: 062062c5-df6e-414f-b5e4-70c737efc0d9 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 062062c5-df6e-414f-b5e4-70c737efc0d9; Fri, 04 Sep 2020 16: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; bh=iY3XO9QFw2JZ89ry7k+EpIivQUeXKBaeXP38IRTyi9g=; b=ERXduYb15PYa78KXnUnscylaId Q5Hv57XONFPksKb8wuTg2sg2zpsK1GeCS8GD+jRmAtLgWDKMWhWlTI/1zXCUHVqTYBLoCPcJKFyfD 497FM6cuBapus6ttSy7Sz+VxL1HdJvzH5LEgdo8r2tZdnIWrI2224USi4z0L5oftIok0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kEEzR-0001q6-0N for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 16:55:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kEEzQ-00016G-Uo for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 16:55:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] minios: Revert recent change and revert to working minios Message-Id: Date: Fri, 04 Sep 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 82c3d15c903aa434473dfdb570096ae5db809b94 Author: Ian Jackson AuthorDate: Fri Sep 4 16:42:01 2020 +0100 Commit: Ian Jackson CommitDate: Fri Sep 4 16:50:55 2020 +0100 minios: Revert recent change and revert to working minios Currently, xen.git#staging does not build in many environments because of issues with minios master. This regression was introduced in an uncontrolled manner by an update to mini-os.git#master. This is because in e013e8514389 "config: use mini-os master for unstable" we switched to tracking minios master in an uncontrolled manner. At the time we thought it was unlikely that minios changes would break the Xen build. This turns out to have been overly optimistic. Xen currently uses unstable internal interfaces of minios. Until this can be sorted out, internal changes to minios can require lockstep changes in Xen. All this means that "config: use mini-os master for unstable" was wrong. We should undo it. Instead, we go back to the previous situation: xen.git names a specific minios commit. This scheme is the model used for qemu-xen-traditional. That nailed commit must be updated manually, to have xen.git pick up changes from minios. If the minios changes require changes in xen.git too, to avoid breaking the Xen build, they can be made freely in minios without adverse consequences. When the minios commitid is updated in xen.git, the corresponding changes to the actual source files in xen.git should be bundled together. For example, when minios is fixed, 8d990807ec2c "stubdom/grub: update init_netfront() call for mini-os" will need to be reapplied, folded into the same commit as updates MINIOS_UPSTREAM_REVISION. For now that commit must be reverted as we are going back to a previous version of minios. This reverts commit 8d990807ec2cde3061222a5ed2df62aba78bace9. This reverts commit e013e8514389b739153016349e49f5a78e34ddf0. CC: Jan Beulich CC: Costin Lupu CC: Wei Liu CC: Samuel Thibault Signed-off-by: Ian Jackson --- Config.mk | 2 +- stubdom/grub/mini-os.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Config.mk b/Config.mk index 8269503f73..db434ee2c6 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= a3741780fe3535e19e02efa869a7cac481891129 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= master +MINIOS_UPSTREAM_REVISION ?= 0b4b7897e08b967a09bed2028a79fabff82342dd SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0 diff --git a/stubdom/grub/mini-os.c b/stubdom/grub/mini-os.c index b33dbf02fb..4fc052a255 100644 --- a/stubdom/grub/mini-os.c +++ b/stubdom/grub/mini-os.c @@ -291,6 +291,8 @@ struct netfront_dev *net_dev; int minios_probe (struct nic *nic) { + char *ip; + if (net_dev) return 1; @@ -298,7 +300,7 @@ minios_probe (struct nic *nic) grub_memset ((char *) arptable, 0, MAX_ARP * sizeof (struct arptable_t)); - net_dev = init_netfront(NULL, (void*) -1, nic->node_addr, NULL, NULL, NULL); + net_dev = init_netfront(NULL, (void*) -1, nic->node_addr, &ip); if (!net_dev) return 0; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 17:11:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 17: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 1kEFF0-0003dU-2d; Fri, 04 Sep 2020 17:11:10 +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 1kEFEy-0003dP-PI for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:08 +0000 X-Inumbo-ID: 365ea15a-5b72-460e-b2ff-827d5ab9d25c Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 365ea15a-5b72-460e-b2ff-827d5ab9d25c; Fri, 04 Sep 2020 17:11: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; bh=ZBLMaGeR0kK7JjE9j1P3rXuFPqVu9oTC7WpRR1qCqWg=; b=wBt7TGI+9P+BGmesw+ljHFM3eC 5uZb2W8MgsEUKZd4oaNSvm5dPiE+rE0lSMgTxZ0FZYVmb9g/5pzu+dpHnlkX4pLFGlPHdL5sP8rJq q/fIBpTMmv8G/idJrposSxnbrYTHFt24VX1FngEJxhjBfJxgbVCkfT93lvFn7nTgmvO0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kEFEw-0002BJ-8L for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kEFEw-0002G7-56 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:06 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: Update silicon-errata.txt with the Neovers AT erratum Message-Id: Date: Fri, 04 Sep 2020 17:11: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 1814a626fb5811184eda64fe22f0055df4600211 Author: Julien Grall AuthorDate: Tue Aug 25 18:38:10 2020 +0100 Commit: Julien Grall CommitDate: Fri Sep 4 18:01:40 2020 +0100 xen/arm: Update silicon-errata.txt with the Neovers AT erratum Commit 858c0be8c2fa "xen/arm: Enable CPU Erratum 1165522 for Neoverse" added a new erratum but forgot to update silicon-errata.txt. Update the file accordingly to keep track of errata workaround in Xen. Signed-off-by: Julien Grall Reviewed-by: Bertrand Marquis Acked-by: Stefano Stabellini --- docs/misc/arm/silicon-errata.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/misc/arm/silicon-errata.txt b/docs/misc/arm/silicon-errata.txt index 11e5a9dcec..e15d0923e9 100644 --- a/docs/misc/arm/silicon-errata.txt +++ b/docs/misc/arm/silicon-errata.txt @@ -51,4 +51,5 @@ stable hypervisors. | ARM | Cortex-A57 | #1319537 | N/A | | ARM | Cortex-A72 | #1319367 | N/A | | ARM | Cortex-A76 | #1165522 | N/A | +| ARM | Neoverse-N1 | #1165522 | N/A | ARM | MMU-500 | #842869 | N/A | -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 17:11:19 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 17:11: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 1kEFF9-0003dw-45; Fri, 04 Sep 2020 17:11:19 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kEFF7-0003dp-Rf for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:17 +0000 X-Inumbo-ID: 6e373d02-9105-42c7-8439-38c27af36e63 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6e373d02-9105-42c7-8439-38c27af36e63; Fri, 04 Sep 2020 17:11: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; bh=ivXvfEDs+u0Vu/d++tlDfheARjVmc5EQwKVWp1ET2wE=; b=mDlr+rP9qCHLhjGtSwQ3YevF53 JnQ/xqlldzCtWVe0FHGx+3dJC+Nskgf/3B4IC7RlIAqdHRCH5XVEH4Iy4nGalH/DKRTeB3e5Zr2R0 zlCzweXF3QjY/dO6PK/AqJTdgHgoyJ3QEsyletvdzOCqq1drIO4touz6G5+U6GGfYHS0=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kEFF6-0002BO-DA for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kEFF6-0002Gk-B9 for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: Missing N1/A76/A75 FP registers in vCPU context switch Message-Id: Date: Fri, 04 Sep 2020 17:11: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 968bb86d04913f52d7678a842474f2a674a8b23e Author: Wei Chen AuthorDate: Fri Aug 28 02:34:03 2020 +0000 Commit: Julien Grall CommitDate: Fri Sep 4 18:02:35 2020 +0100 xen/arm: Missing N1/A76/A75 FP registers in vCPU context switch Xen has cpu_has_fp/cpu_has_simd to detect whether the CPU supports FP/SIMD or not. But currently, these two MACROs only consider value 0 of ID_AA64PFR0_EL1.FP/SIMD as FP/SIMD features enabled. But for CPUs that support FP/SIMD and half-precision floating-point arithmetic, the ID_AA64PFR0_EL1.FP/SIMD are 1 (see Arm ARM DDI0487F.b, D13.2.64). For these CPUs, xen will treat them as no FP/SIMD support, the vfp_save/restore_state will not take effect. From the TRM documents of Cortex-A75/A76/N1, we know these CPUs support basic Advanced SIMD/FP and half-precision floating-point arithmetic. In this case, on N1/A76/A75 platforms, Xen will always miss the floating pointer registers save/restore. If different vCPUs are running on the same pCPU, the floating pointer registers will be corrupted randomly. This patch fixes Xen on these new cores. Signed-off-by: Wei Chen Reviewed-by: Bertrand Marquis Reviewed-by: Julien Grall --- xen/include/asm-arm/cpufeature.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h index 674beb0353..10878ead8a 100644 --- a/xen/include/asm-arm/cpufeature.h +++ b/xen/include/asm-arm/cpufeature.h @@ -13,8 +13,8 @@ #define cpu_has_el2_64 (boot_cpu_feature64(el2) >= 1) #define cpu_has_el3_32 (boot_cpu_feature64(el3) == 2) #define cpu_has_el3_64 (boot_cpu_feature64(el3) >= 1) -#define cpu_has_fp (boot_cpu_feature64(fp) == 0) -#define cpu_has_simd (boot_cpu_feature64(simd) == 0) +#define cpu_has_fp (boot_cpu_feature64(fp) < 8) +#define cpu_has_simd (boot_cpu_feature64(simd) < 8) #define cpu_has_gicv3 (boot_cpu_feature64(gic) == 1) #endif -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Fri Sep 04 17:11:29 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Fri, 04 Sep 2020 17:11: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 1kEFFJ-0003fD-5x; Fri, 04 Sep 2020 17:11: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 1kEFFH-0003ex-AU for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:27 +0000 X-Inumbo-ID: 0e26d072-1ad7-486e-b7cd-a86fc74d25bd Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0e26d072-1ad7-486e-b7cd-a86fc74d25bd; Fri, 04 Sep 2020 17:11: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; bh=DRsaOF9NXJBMcBoAomLmeVRIgNU1jQkt5SqcEJPSdjQ=; b=BK/9zn2a5NDu/3HvzZbp6VQxfv T+1/JY5ecEdNoNrC2RV7LoOz5W30LyWDHbkZ/agm76HcUqWsUNqTyEFG29Wtti033kze6dhDqgYV1 fvIyxoiwVbJ+4f4dAaLJGxAWGpLe21KcUg36S45L6ugnJXdUmMKMfsq0PtRBe/YQMz5U=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kEFFG-0002D9-HS for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:26 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kEFFG-0002HF-Fi for xen-changelog@lists.xenproject.org; Fri, 04 Sep 2020 17:11:26 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] xen/arm: Throw messages for unknown FP/SIMD implement ID Message-Id: Date: Fri, 04 Sep 2020 17:11: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 f4c1a541fa351e4f613471bbf397931f9e1ddd27 Author: Wei Chen AuthorDate: Fri Aug 28 02:34:04 2020 +0000 Commit: Julien Grall CommitDate: Fri Sep 4 18:02:35 2020 +0100 xen/arm: Throw messages for unknown FP/SIMD implement ID Arm ID_AA64PFR0_EL1 register provides two fields to describe CPU FP/SIMD implementations. Currently, we exactly know the meaning of 0x0, 0x1 and 0xf of these fields. Xen treats value < 8 as FP/SIMD features presented. If there is a value 0x2 bumped in the future, Xen behaviors for value <= 0x1 can also take effect. But what Xen done for value <= 0x1 may not always cover new value 0x2 required. We throw these messages to break the silence when Xen detected unknown FP/SIMD IDs to notice user to check. Signed-off-by: Wei Chen Reviewed-by: Bertrand Marquis Acked-by: Julien Grall --- xen/arch/arm/setup.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 7968cee47d..f16b33fa87 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -133,6 +133,18 @@ static void __init processor_id(void) cpu_has_simd ? " AdvancedSIMD" : "", cpu_has_gicv3 ? " GICv3-SysReg" : ""); + /* Warn user if we find unknown floating-point features */ + if ( cpu_has_fp && (boot_cpu_feature64(fp) >= 2) ) + printk(XENLOG_WARNING "WARNING: Unknown Floating-point ID:%d, " + "this may result in corruption on the platform\n", + boot_cpu_feature64(fp)); + + /* Warn user if we find unknown AdvancedSIMD features */ + if ( cpu_has_simd && (boot_cpu_feature64(simd) >= 2) ) + printk(XENLOG_WARNING "WARNING: Unknown AdvancedSIMD ID:%d, " + "this may result in corruption on the platform\n", + boot_cpu_feature64(simd)); + printk(" Debug Features: %016"PRIx64" %016"PRIx64"\n", boot_cpu_data.dbg64.bits[0], boot_cpu_data.dbg64.bits[1]); printk(" Auxiliary Features: %016"PRIx64" %016"PRIx64"\n", -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 08:44:23 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 2020 08: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 1kFClC-0001px-IM; Mon, 07 Sep 2020 08:44:22 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFClB-0001pe-4h for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:21 +0000 X-Inumbo-ID: e9563438-f560-4389-85d5-08db4095b105 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e9563438-f560-4389-85d5-08db4095b105; Mon, 07 Sep 2020 08: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; bh=cG6HeMe5tvjBsjo/I/LkZSRlBxayu6rLBRxAdfKiFsY=; b=6+Q2V/RFvxOJVLQB99oWe/Ebkb eg4rtvmrd3XiaeYklTC/s9Zs0+XCeTYBYs6nv2uLBkSQqTwmj5J5t76jEnW7ai0hTKptRN1q43ELN F9NcXGJQEn5r10miwQb8C+vtTRHKY/P3v5NXxrGj3ywahH0KwJq+DSM608gtOMOuYWQI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFCkv-0002mQ-6m for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFCkv-0003gT-5F for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] Revert "x86: generalize padding field handling" Message-Id: Date: Mon, 07 Sep 2020 08: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 e52716154da04967f9b9d7cf9a1655ea4bcd9e93 Author: Jan Beulich AuthorDate: Mon Sep 7 10:34:03 2020 +0200 Commit: Jan Beulich CommitDate: Mon Sep 7 10:34:03 2020 +0200 Revert "x86: generalize padding field handling" This reverts commit 696c273f3d9a169911308fb7e0a702a3eb6a150d. I was based on the flase assumption that padding fields need no copying: If native code checks such fields, they of course need copying in. And if the ABI specifies them to be zero on completion, we also need to copy them out. --- xen/common/compat/memory.c | 3 --- xen/tools/get-fields.sh | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/xen/common/compat/memory.c b/xen/common/compat/memory.c index 215b8f52d6..3851f756c7 100644 --- a/xen/common/compat/memory.c +++ b/xen/common/compat/memory.c @@ -354,13 +354,10 @@ int compat_memory_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) compat) return -EFAULT; #define XLAT_vnuma_topology_info_HNDL_vdistance_h(_d_, _s_) \ - case XLAT_vnuma_topology_info_vdistance_pad: \ guest_from_compat_handle((_d_)->vdistance.h, (_s_)->vdistance.h) #define XLAT_vnuma_topology_info_HNDL_vcpu_to_vnode_h(_d_, _s_) \ - case XLAT_vnuma_topology_info_vcpu_to_vnode_pad: \ guest_from_compat_handle((_d_)->vcpu_to_vnode.h, (_s_)->vcpu_to_vnode.h) #define XLAT_vnuma_topology_info_HNDL_vmemrange_h(_d_, _s_) \ - case XLAT_vnuma_topology_info_vmemrange_pad: \ guest_from_compat_handle((_d_)->vmemrange.h, (_s_)->vmemrange.h) XLAT_vnuma_topology_info(nat.vnuma, &cmp.vnuma); diff --git a/xen/tools/get-fields.sh b/xen/tools/get-fields.sh index 753e37eb2e..002db2093f 100644 --- a/xen/tools/get-fields.sh +++ b/xen/tools/get-fields.sh @@ -218,7 +218,7 @@ for line in sys.stdin.readlines(): fi ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then if [ $kind = union ] then @@ -347,7 +347,7 @@ build_body () fi ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then if [ -z "$array" -a -z "$array_type" ] then @@ -437,7 +437,7 @@ check_field () id=$token ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then check_field $1 $2 $3.$id "$fields" test "$token" != ";" || fields= id= @@ -491,7 +491,7 @@ build_check () test $level != 2 -o $arrlvl != 1 || id=$token ;; [\,\;]) - if [ $level = 2 -a -n "$(echo $id | $SED 's,_\?pad[[:digit:]]*,,')" ] + if [ $level = 2 -a -n "$(echo $id | $SED 's,^_pad[[:digit:]]*,,')" ] then check_field $kind $1 $id "$fields" test "$token" != ";" || fields= id= -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 08:44:23 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 2020 08: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 1kFCl7-0001pj-Gt; Mon, 07 Sep 2020 08:44: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 1kFCl6-0001pe-BE for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:16 +0000 X-Inumbo-ID: a303fa33-0602-4193-8d25-67027b6c3edb Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a303fa33-0602-4193-8d25-67027b6c3edb; Mon, 07 Sep 2020 08: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; bh=PSHHHdd6s3vVB9RrIk/Z5IL1TpOo4hxrOduV9i1GOPI=; b=zXDwFvwOIdu74bfMfGlrSjH3d6 LNk+NtldY5Q0aAwthkrrAvAtO53qUhXWcYVK0umRMOxYL1ky0dyNeckwz/jt8qPTPx373+++hTMCr rnnIX6vnt7ArEixWNmo9Mpc46w0Dhx+qdSekPSIE1g8MxiRwamE5SI8MqKGdT0YGDcKc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFCl5-0002mT-AU for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:15 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFCl5-0003h5-9Q for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:15 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/vmx: handle writes to MISC_ENABLE MSR Message-Id: Date: Mon, 07 Sep 2020 08: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 2454fa428d0b0d1705b8395db7674426ebf182aa Author: Roger Pau Monné AuthorDate: Mon Sep 7 10:37:23 2020 +0200 Commit: Jan Beulich CommitDate: Mon Sep 7 10:37:23 2020 +0200 x86/vmx: handle writes to MISC_ENABLE MSR Such handling consist in checking that no bits have been changed from the read value, if that's the case silently drop the write, otherwise inject a fault. At least Windows guests will expect to write to the MISC_ENABLE MSR with the same value that's been read from it. Signed-off-by: Roger Pau Monné Acked-by: Andrew Cooper Reviewed-by: Kevin Tian --- xen/arch/x86/hvm/vmx/vmx.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index a0d58ffbe2..c4b40bf3cb 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -3163,7 +3163,7 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) switch ( msr ) { - uint64_t rsvd; + uint64_t rsvd, tmp; case MSR_IA32_SYSENTER_CS: __vmwrite(GUEST_SYSENTER_CS, msr_content); @@ -3301,6 +3301,17 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) /* None of these MSRs are writeable. */ goto gp_fault; + case MSR_IA32_MISC_ENABLE: + /* + * Silently drop writes that don't change the reported value: At least + * some Windows guests will expect to be able to write to MISC_ENABLE + * with the same value that's been read from it. + */ + if ( vmx_msr_read_intercept(msr, &tmp) != X86EMUL_OKAY || + tmp != msr_content ) + goto gp_fault; + break; + case MSR_P6_PERFCTR(0)...MSR_P6_PERFCTR(7): case MSR_P6_EVNTSEL(0)...MSR_P6_EVNTSEL(7): case MSR_CORE_PERF_FIXED_CTR0...MSR_CORE_PERF_FIXED_CTR2: -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 08:44:28 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 2020 08: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 1kFClI-0001qp-Jq; Mon, 07 Sep 2020 08: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 1kFClH-0001qj-N4 for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:27 +0000 X-Inumbo-ID: 41da9ca6-d7cd-4e9c-a1b8-6a5ab8acff63 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 41da9ca6-d7cd-4e9c-a1b8-6a5ab8acff63; Mon, 07 Sep 2020 08: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; bh=CNMqUt4iTZD56O4Gwa1H/AaTbGMviUIx1oNseh5lAow=; b=I5baLhMbFvb1ecdli2OErAwU40 Lzm6XLkoqEldaV7UIxRbaHJtWckIJr9EqVCJh5TxQD7hYX1agnzn3vleCDnXWo6OBdAYu7GiQJ9tf w74QQQyO0MKbol3vEwqXna13RIIYacqAwtlWV3LtSBpgvM8BjK3Bf9Q4f+F6oVKPe0jY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFClF-0002mW-GV for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFClF-0003hX-D2 for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 08:44:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/svm: silently drop writes to SYSCFG and related MSRs Message-Id: Date: Mon, 07 Sep 2020 08: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 f5b44269fc734474f3272a22ba9d426d234ed460 Author: Roger Pau Monné AuthorDate: Mon Sep 7 10:38:00 2020 +0200 Commit: Jan Beulich CommitDate: Mon Sep 7 10:38:00 2020 +0200 x86/svm: silently drop writes to SYSCFG and related MSRs The SYSCFG, TOP_MEM1 and TOP_MEM2 MSRs are currently exposed to guests and writes are silently discarded. Make this explicit in the SVM code now, and just return default constant values when attempting to read any of the MSRs, while continuing to silently drop writes. Signed-off-by: Roger Pau Monné Reviewed-by: Jan Beulich --- xen/arch/x86/hvm/svm/svm.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index ca3bbfcbb3..af584ff5d1 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1917,6 +1917,9 @@ static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) goto gpf; break; + case MSR_K8_SYSCFG: + case MSR_K8_TOP_MEM1: + case MSR_K8_TOP_MEM2: case MSR_K8_VM_CR: *msr_content = 0; break; @@ -2094,6 +2097,9 @@ static int svm_msr_write_intercept(unsigned int msr, uint64_t msr_content) goto gpf; break; + case MSR_K8_TOP_MEM1: + case MSR_K8_TOP_MEM2: + case MSR_K8_SYSCFG: case MSR_K8_VM_CR: /* ignore write. handle all bits as read-only. */ break; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 10:55:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 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 1kFEnl-00067T-33; Mon, 07 Sep 2020 10: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 1kFEnj-00067M-Th for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 10:55:07 +0000 X-Inumbo-ID: c494a23c-6e18-4981-9258-b983e864275a Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c494a23c-6e18-4981-9258-b983e864275a; Mon, 07 Sep 2020 10:55: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; bh=Ic6edeQ1dR8aIJzR49InSQtOUfOHKaFBuMZj4Crk9R8=; b=t0rDRspm7Q/eF0B15zRdM3z2NR eS+NfGDYYa5qZZedxNbWY8bH0LBMJhoLuzMMrc10okICAVjU/ivpS9i9zXAm3hJ/qY43J1ZP6ZypS gAP2/OBY9mX/3dEmm9SV5sNUt0pcQ7aGCS902TOGQnOoOM2M+9M+/PinVak7sGi9kIIM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFEni-0005fN-7N for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 10:55:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFEni-0003ul-69 for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 10:55:06 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/pv: Fix consistency of 64bit segment bases Message-Id: Date: Mon, 07 Sep 2020 10:55: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 a5eaac9245f4f382a3cd0e9710e9d1cba7db20e4 Author: Andrew Cooper AuthorDate: Tue Aug 11 16:05:06 2020 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 7 11:32:34 2020 +0100 x86/pv: Fix consistency of 64bit segment bases The comments in save_segments(), _toggle_guest_pt() and write_cr() are false. The %fs and %gs bases can be updated at any time by the guest. As a consequence, Xen's fs_base/etc tracking state is always stale when the vcpu is in context, and must not be used to complete MSR_{FS,GS}_BASE reads, etc. In particular, a sequence such as: wrmsr(MSR_FS_BASE, 0x1ull << 32); write_fs(__USER_DS); base = rdmsr(MSR_FS_BASE); will return the stale base, not the new base. This may cause guest a guest kernel's context switching of userspace to malfunction. Therefore: * Update save_segments(), _toggle_guest_pt() and read_msr() to always read the segment bases from hardware. * Update write_cr(), write_msr() and do_set_segment_base() to not not waste time caching data which is instantly going to become stale again. * Provide comments explaining when the tracking state is and isn't stale. This bug has been present for 14 years, but several bugfixes since have built on and extended the original flawed logic. Fixes: ba9adb737ba ("Apply stricter checking to RDMSR/WRMSR emulations.") Fixes: c42494acb2f ("x86: fix FS/GS base handling when using the fsgsbase feature") Fixed: eccc170053e ("x86/pv: Don't have %cr4.fsgsbase active behind a guest kernels back") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 21 ++++++++++++++++----- xen/arch/x86/pv/domain.c | 18 ++++++++++-------- xen/arch/x86/pv/emul-priv-op.c | 19 ++----------------- xen/arch/x86/x86_64/mm.c | 6 ------ xen/include/asm-x86/domain.h | 19 ++++++++++++++++++- 5 files changed, 46 insertions(+), 37 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 66975d5f2c..f479bc6857 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1728,6 +1728,16 @@ static void load_segments(struct vcpu *n) } } +/* + * Record all guest segment state. The guest can load segment selectors + * without trapping, which will also alter the 64bit FS/GS bases. Arbitrary + * changes to bases can also be made with the WR{FS,GS}BASE instructions, when + * enabled. + * + * Guests however cannot use SWAPGS, so there is no mechanism to modify the + * inactive GS base behind Xen's back. Therefore, Xen's copy of the inactive + * GS base is still accurate, and doesn't need reading back from hardware. + */ static void save_segments(struct vcpu *v) { struct cpu_user_regs *regs = &v->arch.user_regs; @@ -1738,14 +1748,15 @@ static void save_segments(struct vcpu *v) regs->fs = read_sreg(fs); regs->gs = read_sreg(gs); - /* %fs/%gs bases can only be stale if WR{FS,GS}BASE are usable. */ - if ( (read_cr4() & X86_CR4_FSGSBASE) && !is_pv_32bit_vcpu(v) ) + if ( !is_pv_32bit_vcpu(v) ) { - v->arch.pv.fs_base = __rdfsbase(); + unsigned long gs_base = rdgsbase(); + + v->arch.pv.fs_base = rdfsbase(); if ( v->arch.flags & TF_kernel_mode ) - v->arch.pv.gs_base_kernel = __rdgsbase(); + v->arch.pv.gs_base_kernel = gs_base; else - v->arch.pv.gs_base_user = __rdgsbase(); + v->arch.pv.gs_base_user = gs_base; } if ( regs->ds ) diff --git a/xen/arch/x86/pv/domain.c b/xen/arch/x86/pv/domain.c index ec5a7d2dca..44e4ea2582 100644 --- a/xen/arch/x86/pv/domain.c +++ b/xen/arch/x86/pv/domain.c @@ -444,17 +444,19 @@ static void _toggle_guest_pt(struct vcpu *v) void toggle_guest_mode(struct vcpu *v) { const struct domain *d = v->domain; + unsigned long gs_base; ASSERT(!is_pv_32bit_vcpu(v)); - /* %fs/%gs bases can only be stale if WR{FS,GS}BASE are usable. */ - if ( read_cr4() & X86_CR4_FSGSBASE ) - { - if ( v->arch.flags & TF_kernel_mode ) - v->arch.pv.gs_base_kernel = __rdgsbase(); - else - v->arch.pv.gs_base_user = __rdgsbase(); - } + /* + * Update the cached value of the GS base about to become inactive, as a + * subsequent context switch won't bother re-reading it. + */ + gs_base = rdgsbase(); + if ( v->arch.flags & TF_kernel_mode ) + v->arch.pv.gs_base_kernel = gs_base; + else + v->arch.pv.gs_base_user = gs_base; asm volatile ( "swapgs" ); _toggle_guest_pt(v); diff --git a/xen/arch/x86/pv/emul-priv-op.c b/xen/arch/x86/pv/emul-priv-op.c index bcc1188f6a..a192160f84 100644 --- a/xen/arch/x86/pv/emul-priv-op.c +++ b/xen/arch/x86/pv/emul-priv-op.c @@ -801,17 +801,6 @@ static int write_cr(unsigned int reg, unsigned long val, } case 4: /* Write CR4 */ - /* - * If this write will disable FSGSBASE, refresh Xen's idea of the - * guest bases now that they can no longer change. - */ - if ( (curr->arch.pv.ctrlreg[4] & X86_CR4_FSGSBASE) && - !(val & X86_CR4_FSGSBASE) ) - { - curr->arch.pv.fs_base = __rdfsbase(); - curr->arch.pv.gs_base_kernel = __rdgsbase(); - } - curr->arch.pv.ctrlreg[4] = pv_fixup_guest_cr4(curr, val); write_cr4(pv_make_cr4(curr)); ctxt_switch_levelling(curr); @@ -882,15 +871,13 @@ static int read_msr(unsigned int reg, uint64_t *val, case MSR_FS_BASE: if ( is_pv_32bit_domain(currd) ) break; - *val = (read_cr4() & X86_CR4_FSGSBASE) ? __rdfsbase() - : curr->arch.pv.fs_base; + *val = rdfsbase(); return X86EMUL_OKAY; case MSR_GS_BASE: if ( is_pv_32bit_domain(currd) ) break; - *val = (read_cr4() & X86_CR4_FSGSBASE) ? __rdgsbase() - : curr->arch.pv.gs_base_kernel; + *val = rdgsbase(); return X86EMUL_OKAY; case MSR_SHADOW_GS_BASE: @@ -1007,14 +994,12 @@ static int write_msr(unsigned int reg, uint64_t val, if ( is_pv_32bit_domain(currd) || !is_canonical_address(val) ) break; wrfsbase(val); - curr->arch.pv.fs_base = val; return X86EMUL_OKAY; case MSR_GS_BASE: if ( is_pv_32bit_domain(currd) || !is_canonical_address(val) ) break; wrgsbase(val); - curr->arch.pv.gs_base_kernel = val; return X86EMUL_OKAY; case MSR_SHADOW_GS_BASE: diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 28bc98f8f2..b69cf2dc4f 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -1030,10 +1030,7 @@ long do_set_segment_base(unsigned int which, unsigned long base) { case SEGBASE_FS: if ( is_canonical_address(base) ) - { wrfsbase(base); - v->arch.pv.fs_base = base; - } else ret = -EINVAL; break; @@ -1050,10 +1047,7 @@ long do_set_segment_base(unsigned int which, unsigned long base) case SEGBASE_GS_KERNEL: if ( is_canonical_address(base) ) - { wrgsbase(base); - v->arch.pv.gs_base_kernel = base; - } else ret = -EINVAL; break; diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index 5fb347a94c..df657dc69f 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -527,7 +527,24 @@ struct pv_vcpu bool_t syscall32_disables_events; bool_t sysenter_disables_events; - /* Segment base addresses. */ + /* + * 64bit segment bases. + * + * FS and the active GS are always stale when the vCPU is in context, as + * the guest can change them behind Xen's back with MOV SREG, or + * WR{FS,GS}BASE on capable hardware. + * + * The inactive GS base is never stale, as guests can't use SWAPGS to + * access it - all modification is performed by Xen either directly + * (hypercall, #GP emulation), or indirectly (toggle_guest_mode()). + * + * The vCPU context switch path is optimised based on this fact, so any + * path updating or swapping the inactive base must update the cached + * value as well. + * + * Which GS base is active and inactive depends on whether the vCPU is in + * user or kernel context. + */ unsigned long fs_base; unsigned long gs_base_kernel; unsigned long gs_base_user; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 10:55:19 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 2020 10:55: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 1kFEnv-00068F-4e; Mon, 07 Sep 2020 10:55: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 1kFEnt-000685-O9 for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 10:55:17 +0000 X-Inumbo-ID: 7a864168-4966-48cb-bbca-84fb547b3a44 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7a864168-4966-48cb-bbca-84fb547b3a44; Mon, 07 Sep 2020 10:55: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; bh=X5dEYxXJ/9W7c2Rpa30Qr5H6CCfP+3GGZH9vnkxbYVM=; b=b5T75Bs4/fNvaFHKbEkqFGlcVb UcdwNGyD5jv5ew8AanPLu96gf0Q/OwXe30lVKZTPNbwLg8NqWGHSl9rvXRYoekewk6WOpi6uRhX9A OCTgssMNfma79iMLtoh/lXYHIbMITi5rp7U8odCgT9WirSSuSv0xsSnLwOOQgqWrDXgA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFEns-0005fW-C3 for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 10:55:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFEns-0003vW-AD for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 10:55:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/pv: Rewrite segment context switching from scratch Message-Id: Date: Mon, 07 Sep 2020 10:55: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 ad0fd291c5e79191c2e3c70e43dded569f11a450 Author: Andrew Cooper AuthorDate: Tue Aug 11 16:05:06 2020 +0100 Commit: Andrew Cooper CommitDate: Mon Sep 7 11:32:34 2020 +0100 x86/pv: Rewrite segment context switching from scratch There are multiple bugs with the existing implementation. On AMD CPUs prior to Zen2, loading a NUL segment selector doesn't clear the segment base, which is a problem for 64bit code which typically expects to use a NUL %fs/%gs selector. On a context switch from any PV vcpu, to a 64bit PV vcpu with an %fs/%gs selector which faults, the fixup logic loads NUL, and the guest is entered at the failsafe callback with the stale base. Alternatively, a PV context switch sequence of 64 (NUL, non-zero base) => 32 (NUL) => 64 (NUL, zero base) will similarly cause Xen to enter the guest with a stale base. Both of these corner cases manifest as state corruption in the final vcpu. However, damage is limited to to 64bit code expecting to use Thread Local Storage with a base pointer of 0, which doesn't occur by default. The context switch logic is extremely complicated, and is attempting to optimise away loading a NUL selector (which is fast), or writing a 64bit base of 0 (which is rare). Furthermore, it fails to respect Linux's ABI with userspace, which manifests as userspace state corruption as far as Linux is concerned. Always restore all selector and base state, in all cases. Leave a large comment explaining hardware behaviour, and the new ABI expectations. Update the comments in the public headers. Drop all "segment preloading" to handle the AMD corner case. It was never anything but a waste of time for %ds/%es, and isn't needed now that %fs/%gs bases are unconditionally written for 64bit PV guests. In load_segments(), store the result of is_pv_32bit_vcpu() as it is an expensive predicate now, and not used in a way which impacts speculative safety. Reported-by: Andy Lutomirski Reported-by: Sarah Newman Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 184 ++++++++++--------------------- xen/include/public/arch-x86/xen-x86_64.h | 4 +- 2 files changed, 60 insertions(+), 128 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index f479bc6857..d4f4ced681 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1186,13 +1186,9 @@ int arch_set_info_guest( if ( !compat ) { v->arch.pv.syscall_callback_eip = c.nat->syscall_callback_eip; - /* non-nul selector kills fs_base */ - v->arch.pv.fs_base = - !(v->arch.user_regs.fs & ~3) ? c.nat->fs_base : 0; + v->arch.pv.fs_base = c.nat->fs_base; v->arch.pv.gs_base_kernel = c.nat->gs_base_kernel; - /* non-nul selector kills gs_base_user */ - v->arch.pv.gs_base_user = - !(v->arch.user_regs.gs & ~3) ? c.nat->gs_base_user : 0; + v->arch.pv.gs_base_user = c.nat->gs_base_user; } else { @@ -1508,58 +1504,60 @@ arch_do_vcpu_op( } /* - * Loading a nul selector does not clear bases and limits on AMD or Hygon - * CPUs. Be on the safe side and re-initialize both to flat segment values - * before loading a nul selector. - */ -#define preload_segment(seg, value) do { \ - if ( !((value) & ~3) && \ - (boot_cpu_data.x86_vendor & \ - (X86_VENDOR_AMD | X86_VENDOR_HYGON)) ) \ - asm volatile ( "movl %k0, %%" #seg \ - :: "r" (FLAT_USER_DS32) ); \ -} while ( false ) - -#define loadsegment(seg,value) ({ \ - int __r = 1; \ - asm volatile ( \ - "1: movl %k1,%%" #seg "\n2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3: xorl %k0,%k0\n" \ - " movl %k0,%%" #seg "\n" \ - " jmp 2b\n" \ - ".previous\n" \ - _ASM_EXTABLE(1b, 3b) \ - : "=r" (__r) : "r" (value), "0" (__r) );\ - __r; }) - -/* - * save_segments() writes a mask of segments which are dirty (non-zero), - * allowing load_segments() to avoid some expensive segment loads and - * MSR writes. + * Notes on PV segment handling: + * - 32bit: All data from the GDT/LDT. + * - 64bit: In addition, 64bit FS/GS/GS_KERN bases. + * + * Linux's ABI with userspace expects to preserve the full selector and + * segment base, even sel != NUL, base != GDT/LDT for 64bit code. Xen must + * honour this when context switching, to avoid breaking Linux's ABI. + * + * Note: It is impossible to preserve a selector value of 1, 2 or 3, as these + * get reset to 0 by an IRET back to guest context. Code playing with + * arcane corners of x86 get to keep all resulting pieces. + * + * Therefore, we: + * - Load the LDT. + * - Load each segment selector. + * - Any error loads zero, and triggers a failsafe callback. + * - For 64bit, further load the 64bit bases. + * + * An optimisation exists on SVM-capable hardware, where we use a VMLOAD + * instruction to load the LDT and full FS/GS/GS_KERN data in one go. + * + * AMD-like CPUs prior to Zen2 do not zero the segment base or limit when + * loading a NUL selector. This is a problem in principle when context + * switching to a 64bit guest, as a NUL FS/GS segment is usable and will pick + * up the stale base. + * + * However, it is not an issue in practice. NUL segments are unusable for + * 32bit guests (so any stale base won't be used), and we unconditionally + * write the full FS/GS bases for 64bit guests. */ -static DEFINE_PER_CPU(unsigned int, dirty_segment_mask); -#define DIRTY_DS 0x01 -#define DIRTY_ES 0x02 -#define DIRTY_FS 0x04 -#define DIRTY_GS 0x08 -#define DIRTY_FS_BASE 0x10 -#define DIRTY_GS_BASE 0x20 - static void load_segments(struct vcpu *n) { struct cpu_user_regs *uregs = &n->arch.user_regs; - int all_segs_okay = 1; - unsigned int dirty_segment_mask, cpu = smp_processor_id(); - bool fs_gs_done = false; + bool compat = is_pv_32bit_vcpu(n); + bool all_segs_okay = true, fs_gs_done = false; - /* Load and clear the dirty segment mask. */ - dirty_segment_mask = per_cpu(dirty_segment_mask, cpu); - per_cpu(dirty_segment_mask, cpu) = 0; + /* + * Attempt to load @seg with selector @val. On error, clear + * @all_segs_okay in function scope, and load NUL into @sel. + */ +#define TRY_LOAD_SEG(seg, val) \ + asm volatile ( "1: mov %k[_val], %%" #seg "\n\t" \ + "2:\n\t" \ + ".section .fixup, \"ax\"\n\t" \ + "3: xor %k[ok], %k[ok]\n\t" \ + " mov %k[ok], %%" #seg "\n\t" \ + " jmp 2b\n\t" \ + ".previous\n\t" \ + _ASM_EXTABLE(1b, 3b) \ + : [ok] "+r" (all_segs_okay) \ + : [_val] "rm" (val) ) #ifdef CONFIG_HVM - if ( cpu_has_svm && !is_pv_32bit_vcpu(n) && - !(read_cr4() & X86_CR4_FSGSBASE) && !((uregs->fs | uregs->gs) & ~3) ) + if ( cpu_has_svm && !compat ) { unsigned long gsb = n->arch.flags & TF_kernel_mode ? n->arch.pv.gs_base_kernel : n->arch.pv.gs_base_user; @@ -1572,57 +1570,21 @@ static void load_segments(struct vcpu *n) } #endif if ( !fs_gs_done ) - load_LDT(n); - - /* Either selector != 0 ==> reload. */ - if ( unlikely((dirty_segment_mask & DIRTY_DS) | uregs->ds) ) { - preload_segment(ds, uregs->ds); - all_segs_okay &= loadsegment(ds, uregs->ds); - } - - /* Either selector != 0 ==> reload. */ - if ( unlikely((dirty_segment_mask & DIRTY_ES) | uregs->es) ) - { - preload_segment(es, uregs->es); - all_segs_okay &= loadsegment(es, uregs->es); - } + load_LDT(n); - /* Either selector != 0 ==> reload. */ - if ( unlikely((dirty_segment_mask & DIRTY_FS) | uregs->fs) && !fs_gs_done ) - { - all_segs_okay &= loadsegment(fs, uregs->fs); - /* non-nul selector updates fs_base */ - if ( uregs->fs & ~3 ) - dirty_segment_mask &= ~DIRTY_FS_BASE; + TRY_LOAD_SEG(fs, uregs->fs); + TRY_LOAD_SEG(gs, uregs->gs); } - /* Either selector != 0 ==> reload. */ - if ( unlikely((dirty_segment_mask & DIRTY_GS) | uregs->gs) && !fs_gs_done ) - { - all_segs_okay &= loadsegment(gs, uregs->gs); - /* non-nul selector updates gs_base_user */ - if ( uregs->gs & ~3 ) - dirty_segment_mask &= ~DIRTY_GS_BASE; - } + TRY_LOAD_SEG(ds, uregs->ds); + TRY_LOAD_SEG(es, uregs->es); - if ( !fs_gs_done && !is_pv_32bit_vcpu(n) ) + if ( !fs_gs_done && !compat ) { - /* This can only be non-zero if selector is NULL. */ - if ( n->arch.pv.fs_base | (dirty_segment_mask & DIRTY_FS_BASE) ) - wrfsbase(n->arch.pv.fs_base); - - /* - * Most kernels have non-zero GS base, so don't bother testing. - * (For old AMD hardware this is also a serialising instruction, - * avoiding erratum #88.) - */ + wrfsbase(n->arch.pv.fs_base); wrgsshadow(n->arch.pv.gs_base_kernel); - - /* This can only be non-zero if selector is NULL. */ - if ( n->arch.pv.gs_base_user | - (dirty_segment_mask & DIRTY_GS_BASE) ) - wrgsbase(n->arch.pv.gs_base_user); + wrgsbase(n->arch.pv.gs_base_user); /* If in kernel mode then switch the GS bases around. */ if ( (n->arch.flags & TF_kernel_mode) ) @@ -1741,7 +1703,6 @@ static void load_segments(struct vcpu *n) static void save_segments(struct vcpu *v) { struct cpu_user_regs *regs = &v->arch.user_regs; - unsigned int dirty_segment_mask = 0; regs->ds = read_sreg(ds); regs->es = read_sreg(es); @@ -1758,35 +1719,6 @@ static void save_segments(struct vcpu *v) else v->arch.pv.gs_base_user = gs_base; } - - if ( regs->ds ) - dirty_segment_mask |= DIRTY_DS; - - if ( regs->es ) - dirty_segment_mask |= DIRTY_ES; - - if ( regs->fs || is_pv_32bit_vcpu(v) ) - { - dirty_segment_mask |= DIRTY_FS; - /* non-nul selector kills fs_base */ - if ( regs->fs & ~3 ) - v->arch.pv.fs_base = 0; - } - if ( v->arch.pv.fs_base ) - dirty_segment_mask |= DIRTY_FS_BASE; - - if ( regs->gs || is_pv_32bit_vcpu(v) ) - { - dirty_segment_mask |= DIRTY_GS; - /* non-nul selector kills gs_base_user */ - if ( regs->gs & ~3 ) - v->arch.pv.gs_base_user = 0; - } - if ( v->arch.flags & TF_kernel_mode ? v->arch.pv.gs_base_kernel - : v->arch.pv.gs_base_user ) - dirty_segment_mask |= DIRTY_GS_BASE; - - this_cpu(dirty_segment_mask) = dirty_segment_mask; } void paravirt_ctxt_switch_from(struct vcpu *v) @@ -1996,7 +1928,7 @@ static void __context_switch(void) #if defined(CONFIG_PV) && defined(CONFIG_HVM) /* Prefetch the VMCB if we expect to use it later in the context switch */ if ( cpu_has_svm && is_pv_domain(nd) && !is_pv_32bit_domain(nd) && - !is_idle_domain(nd) && !(read_cr4() & X86_CR4_FSGSBASE) ) + !is_idle_domain(nd) ) svm_load_segs(0, 0, 0, 0, 0, 0, 0); #endif diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h index 342eabc957..40aed14366 100644 --- a/xen/include/public/arch-x86/xen-x86_64.h +++ b/xen/include/public/arch-x86/xen-x86_64.h @@ -203,8 +203,8 @@ struct cpu_user_regs { uint16_t ss, _pad2[3]; uint16_t es, _pad3[3]; uint16_t ds, _pad4[3]; - uint16_t fs, _pad5[3]; /* Non-nul => takes precedence over fs_base. */ - uint16_t gs, _pad6[3]; /* Non-nul => takes precedence over gs_base_user. */ + uint16_t fs, _pad5[3]; + uint16_t gs, _pad6[3]; }; typedef struct cpu_user_regs cpu_user_regs_t; DEFINE_XEN_GUEST_HANDLE(cpu_user_regs_t); -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 14:22:14 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 2020 14:22: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 1kFI24-0008L1-9v; Mon, 07 Sep 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 1kFI23-0008Kw-0z for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:22:07 +0000 X-Inumbo-ID: 864493ff-86b8-428e-9767-d793f759b8a3 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 864493ff-86b8-428e-9767-d793f759b8a3; Mon, 07 Sep 2020 14:22: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; bh=hT3vSVbywYV4HdtcjLyydr/9BomjZWody4qKn0Rn0SE=; b=rZ17+QAju3JINWdDB2SRXwuTxC l8C7htn+bJ3oClLu++T8QeBiO3K7Y8X7inleo0reCq5Iliqk86leWW4RlBq/tISQRGWuavgwQJypn 2tQUi0zw/B5HeXLo44OfV8f5TEeN2TCr2NaMqwuzBr1Z/m6rg8+O1bQIlFpZtUIKJewk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFI22-0001e5-1U for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:22:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFI21-0000E4-Vf for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:22:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] libgnttab/freebsd: add tools libs.h Message-Id: Date: Mon, 07 Sep 2020 14: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 1be24cd17741192d1e18f24e6cf92f0ae9324e62 Author: Roger Pau Monne AuthorDate: Mon Sep 7 12:18:05 2020 +0200 Commit: Wei Liu CommitDate: Mon Sep 7 14:13:31 2020 +0000 libgnttab/freebsd: add tools libs.h In order to get the ROUNDUP macro, or else the build fails. I assume ROUNDUP would previously get included from a different header. Seeing as Linux does explicitly include libs.h do the same for FreeBSD. Signed-off-by: Roger Pau Monné Acked-by: Wei Liu --- tools/libs/gnttab/freebsd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/libs/gnttab/freebsd.c b/tools/libs/gnttab/freebsd.c index 0588501d0f..768af701c6 100644 --- a/tools/libs/gnttab/freebsd.c +++ b/tools/libs/gnttab/freebsd.c @@ -30,6 +30,8 @@ #include +#include + #include "private.h" #define PAGE_SHIFT 12 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 14:22:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 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 1kFI2E-0008Ld-BZ; Mon, 07 Sep 2020 14:22: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 1kFI2D-0008LU-6r for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:22:17 +0000 X-Inumbo-ID: 99b0664f-dd27-4e9c-a8c3-4d430578412d Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 99b0664f-dd27-4e9c-a8c3-4d430578412d; Mon, 07 Sep 2020 14:22: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; bh=Qu8+59Z63AQFUk9mg+wTy8O2BVbwBCNXIMHJPBDu4ZU=; b=Vowxi4P+b4DJjd8gV1RVgqdRQe L21qmWhQshmubbT+dpQB82lAAR2+x4jeQ8UJSvDD6Ycong5wP6fH9vFfPjR9kvRw5P26Bxg7k9uz5 UL9p1R7d0jN6mwoWYpNn3fgs8VdLdYX7sB52DWCPllzFavw1Q6gBLQQKbJ7HQ2j5JROo=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFI2C-0001e8-6u for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:22:16 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFI2C-0000Ff-41 for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:22:16 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] minios: use more recent commit for building xen unstable Message-Id: Date: Mon, 07 Sep 2020 14:22: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 71039ed743a3fbf7b58815138d667913a5742e6f Author: Juergen Gross AuthorDate: Mon Sep 7 13:48:14 2020 +0200 Commit: Wei Liu CommitDate: Mon Sep 7 14:14:40 2020 +0000 minios: use more recent commit for building xen unstable Commit 82c3d15c903aa43 ("minios: Revert recent change and revert to working minios") switched the used commit for the build of Xen unstable from master to a rather old commit (the one used for Xen 4.13 instead of the last one without a known problem). Switch to Mini-OS commit 051b87bb9c196 instead, which doesn't contain the problematic modification being reason for switching away from master. Signed-off-by: Juergen Gross Acked-by: Wei Liu --- Config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Config.mk b/Config.mk index db434ee2c6..259e68863d 100644 --- a/Config.mk +++ b/Config.mk @@ -246,7 +246,7 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= a3741780fe3535e19e02efa869a7cac481891129 QEMU_UPSTREAM_REVISION ?= master -MINIOS_UPSTREAM_REVISION ?= 0b4b7897e08b967a09bed2028a79fabff82342dd +MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5 SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0 -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Mon Sep 07 14:33:08 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Mon, 07 Sep 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 1kFICg-0001GP-LH; Mon, 07 Sep 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 1kFICg-0001GK-0V for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:33:06 +0000 X-Inumbo-ID: 5d502c7f-17d8-45e7-a1ad-356d476ab234 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 5d502c7f-17d8-45e7-a1ad-356d476ab234; Mon, 07 Sep 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; bh=cnSj83Not6oglPZPO4hmv2m3KJmt5XhtZFVjy/2cDmU=; b=Rzk5dEUMB881SgM9c1Q5nYnhYl sPyp3p+5CyH6TLUh2wfgpBKbKkn22laDMJQROCGnLG2UxrO8fZF8FNqXvuh349WA08oKJDn0mbB8a hTxHBPzRkqR0HXWaJ02dPtaoLoQHRhDObeRsOx0ynj9fBc/ttOmEsusZLIL90We8d/Fc=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFICf-0001so-41 for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:33:05 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFICf-0000sD-1P for xen-changelog@lists.xenproject.org; Mon, 07 Sep 2020 14:33:05 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] tools/hotplug/Linux: don't needlessly use non-standard features in vif-{bridge, route} Message-Id: Date: Mon, 07 Sep 2020 14: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 b11910082d90bb1597f6679524eb726a33306672 Author: Jan Beulich AuthorDate: Wed Sep 2 08:09:28 2020 +0200 Commit: Wei Liu CommitDate: Mon Sep 7 14:28:59 2020 +0000 tools/hotplug/Linux: don't needlessly use non-standard features in vif-{bridge,route} We're not after any "fall-through" behavior here. Replace the constructs with ones understood by all conforming shells, including older bash (problem observed with 3.1.51(1)). Fixes: b51715f02bf9 ("tools/hotplug/Linux: remove code duplication in vif-bridge") Fixes: 3683290fc0b0 ("tools/hotplug: only attempt to call 'ip route' if there is valid command") Signed-off-by: Jan Beulich Reviewed-by: Paul Durrant Reviewed-by: Bertrand Marquis Acked-by: Wei Liu --- tools/hotplug/Linux/vif-bridge | 8 ++------ tools/hotplug/Linux/vif-route | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index b99cc82a21..906047e82f 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -77,16 +77,12 @@ then fi case "$command" in - add) - ;& - online) + add|online) setup_virtual_bridge_port "$dev" set_mtu "$bridge" "$dev" "$type_if" add_to_bridge "$bridge" "$dev" ;; - remove) - ;& - offline) + remove|offline) remove_from_bridge "$bridge" "$dev" ;; esac diff --git a/tools/hotplug/Linux/vif-route b/tools/hotplug/Linux/vif-route index 05199bf741..9cd417a005 100755 --- a/tools/hotplug/Linux/vif-route +++ b/tools/hotplug/Linux/vif-route @@ -22,17 +22,13 @@ dir=$(dirname "$0") main_ip=$(dom0_ip) case "${command}" in - add) - ;& - online) + add|online) ifconfig ${dev} ${main_ip} netmask 255.255.255.255 up echo 1 >/proc/sys/net/ipv4/conf/${dev}/proxy_arp ipcmd='add' cmdprefix='' ;; - remove) - ;& - offline) + remove|offline) do_without_error ifdown ${dev} ipcmd='del' cmdprefix='do_without_error' -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Tue Sep 08 15:55:13 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Tue, 08 Sep 2020 15: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 1kFfxc-0005j4-2W; Tue, 08 Sep 2020 15:55: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 1kFfxb-0005iy-Hu for xen-changelog@lists.xenproject.org; Tue, 08 Sep 2020 15:55:07 +0000 X-Inumbo-ID: 9a50b0ba-607c-4ed8-889b-b1efd36a7861 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9a50b0ba-607c-4ed8-889b-b1efd36a7861; Tue, 08 Sep 2020 15:55: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; bh=rwdl+jT8O2yASRigy82DXGMXmme0eYvGYMmYkXpGvJU=; b=vf8GVAPKjQz+UezGoP2pMI48wu kauk2YQsPh1u9+45G7cxt+AI1l66t5dyIqXOrK5zBtHu7Z9oFPf4lqOpJMJ0bOHJtnaFnUcGDI+4r dtNMvWjXMVqcZsYmwRSWpILwQY1Uj8fkdoKn0Nr+7BgDC+XqgVXjM2OxgwKg2hqAjrUs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFfxa-0007qs-3L for xen-changelog@lists.xenproject.org; Tue, 08 Sep 2020 15:55:06 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFfxa-0004vw-1E for xen-changelog@lists.xenproject.org; Tue, 08 Sep 2020 15:55:06 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen staging] x86/pv: Fix assertions in svm_load_segs() Message-Id: Date: Tue, 08 Sep 2020 15:55: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 1e2d3be2e516e6f415ca6029f651b76a8563a27c Author: Andrew Cooper AuthorDate: Tue Sep 8 10:47:57 2020 +0100 Commit: Andrew Cooper CommitDate: Tue Sep 8 16:46:31 2020 +0100 x86/pv: Fix assertions in svm_load_segs() OSSTest has shown an assertion failure: http://logs.test-lab.xenproject.org/osstest/logs/153906/test-xtf-amd64-amd64-1/serial-rimava1.log This is because we pass a non-NUL selector into svm_load_segs(), which is something we must not do, as this path does not load the attributes/limits from the GDT/LDT. Drop the {fs,gs}_sel parameters from svm_load_segs() and use 0 instead. This is acceptable even for non-zero NUL segments, as it is how the IRET instruction behaves in all CPUs. Only use the svm_load_segs() path when both FS and GS are NUL, which is the common case when scheduling a 64bit vcpu with 64bit userspace in context. Fixes: ad0fd291c5 ("x86/pv: Rewrite segment context switching from scratch") Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- xen/arch/x86/domain.c | 7 +++---- xen/arch/x86/hvm/svm/svm.c | 9 +++------ xen/include/asm-x86/hvm/svm/svm.h | 6 ++++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index d4f4ced681..e8e91cf080 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -1557,7 +1557,7 @@ static void load_segments(struct vcpu *n) : [_val] "rm" (val) ) #ifdef CONFIG_HVM - if ( cpu_has_svm && !compat ) + if ( cpu_has_svm && !compat && (uregs->fs | uregs->gs) <= 3 ) { unsigned long gsb = n->arch.flags & TF_kernel_mode ? n->arch.pv.gs_base_kernel : n->arch.pv.gs_base_user; @@ -1565,8 +1565,7 @@ static void load_segments(struct vcpu *n) ? n->arch.pv.gs_base_user : n->arch.pv.gs_base_kernel; fs_gs_done = svm_load_segs(n->arch.pv.ldt_ents, LDT_VIRT_START(n), - uregs->fs, n->arch.pv.fs_base, - uregs->gs, gsb, gss); + n->arch.pv.fs_base, gsb, gss); } #endif if ( !fs_gs_done ) @@ -1929,7 +1928,7 @@ static void __context_switch(void) /* Prefetch the VMCB if we expect to use it later in the context switch */ if ( cpu_has_svm && is_pv_domain(nd) && !is_pv_32bit_domain(nd) && !is_idle_domain(nd) ) - svm_load_segs(0, 0, 0, 0, 0, 0, 0); + svm_load_segs(0, 0, 0, 0, 0); #endif if ( need_full_gdt(nd) && !per_cpu(full_gdt_loaded, cpu) ) diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index af584ff5d1..23b2a2aa17 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -1521,8 +1521,7 @@ static void svm_init_erratum_383(const struct cpuinfo_x86 *c) #ifdef CONFIG_PV bool svm_load_segs(unsigned int ldt_ents, unsigned long ldt_base, - unsigned int fs_sel, unsigned long fs_base, - unsigned int gs_sel, unsigned long gs_base, + unsigned long fs_base, unsigned long gs_base, unsigned long gs_shadow) { unsigned int cpu = smp_processor_id(); @@ -1559,14 +1558,12 @@ bool svm_load_segs(unsigned int ldt_ents, unsigned long ldt_base, vmcb->ldtr.base = ldt_base; } - ASSERT(!(fs_sel & ~3)); - vmcb->fs.sel = fs_sel; + vmcb->fs.sel = 0; vmcb->fs.attr = 0; vmcb->fs.limit = 0; vmcb->fs.base = fs_base; - ASSERT(!(gs_sel & ~3)); - vmcb->gs.sel = gs_sel; + vmcb->gs.sel = 0; vmcb->gs.attr = 0; vmcb->gs.limit = 0; vmcb->gs.base = gs_base; diff --git a/xen/include/asm-x86/hvm/svm/svm.h b/xen/include/asm-x86/hvm/svm/svm.h index d568e86db9..2310878e41 100644 --- a/xen/include/asm-x86/hvm/svm/svm.h +++ b/xen/include/asm-x86/hvm/svm/svm.h @@ -52,10 +52,12 @@ void svm_update_guest_cr(struct vcpu *, unsigned int cr, unsigned int flags); /* * PV context switch helper. Calls with zero ldt_base request a prefetch of * the VMCB area to be loaded from, instead of an actual load of state. + * + * Must only be used for NUL FS/GS, as the segment attributes/limits are not + * read from the GDT/LDT. */ bool svm_load_segs(unsigned int ldt_ents, unsigned long ldt_base, - unsigned int fs_sel, unsigned long fs_base, - unsigned int gs_sel, unsigned long gs_base, + unsigned long fs_base, unsigned long gs_base, unsigned long gs_shadow); extern u32 svm_feature_flags; -- generated by git-patchbot for /home/xen/git/xen.git#staging From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:22:10 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 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 1kFxEs-0003Ou-9f; Wed, 09 Sep 2020 10: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 1kFxEq-0003Oo-Sa for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:04 +0000 X-Inumbo-ID: d98134e5-640a-4713-b804-4b0efb18563a Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id d98134e5-640a-4713-b804-4b0efb18563a; Wed, 09 Sep 2020 10:22: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; bh=2/7JHwBlRpaOsvaiEWvHpogI5gt0MRPA1rUGOEqFjM4=; b=1OGbaOqv+MbL/xIH7SNFbYkV+5 fLbYLbOyc+kRSBtVXgfI5C5lFJCPM3E8PQO1Sp/sxt/Mn9t7PBYSCYlNyr6aXGbDFLYJBQ//OsBw0 cIr8u4umCsTa+sZBAkeSU9bgGNVlOngNnQTO26Nl2g5DjhISf7eIm8ySdFy6ZgiIJhkA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxEp-0004vC-Bs for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:03 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxEp-0006iX-Ao for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:03 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] build: also check for empty .bss.* in .o -> .init.o conversion Message-Id: Date: Wed, 09 Sep 2020 10:22: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 8856a914bffd56c018a794c06d4abb6018aa958d Author: Jan Beulich AuthorDate: Thu Aug 27 09:46:55 2020 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 09:46:55 2020 +0200 build: also check for empty .bss.* in .o -> .init.o conversion We're gaining such sections, and like .text.* and .data.* they shouldn't be present in objects subject to automatic to-init conversion. Oddly enough for quite some time we did have an instance breaking this rule, which gets fixed at this occasion, by breaking out the EFI boot allocator functions into its own translation unit. Fixes: c5b9805bc1f7 ("efi: create new early memory allocator") Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Acked-by: Julien Grall --- xen/Makefile | 2 +- xen/Rules.mk | 2 +- xen/arch/arm/efi/Makefile | 2 +- xen/arch/x86/efi/Makefile | 2 +- xen/common/efi/boot.c | 53 +---------------------------------------------- xen/common/efi/ebmalloc.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++ xen/common/efi/efi.h | 6 ++++++ 7 files changed, 63 insertions(+), 56 deletions(-) diff --git a/xen/Makefile b/xen/Makefile index a87bb225dc..bf0c804d43 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -355,7 +355,7 @@ $(TARGET): delete-unfresh-files $(MAKE) -C tools $(MAKE) -f $(BASEDIR)/Rules.mk include/xen/compile.h [ -e include/asm ] || ln -sf asm-$(TARGET_ARCH) include/asm - [ -e arch/$(TARGET_ARCH)/efi ] && for f in boot.c runtime.c compat.c efi.h;\ + [ -e arch/$(TARGET_ARCH)/efi ] && for f in $$(cd common/efi; echo *.[ch]); \ do test -r arch/$(TARGET_ARCH)/efi/$$f || \ ln -nsf ../../../common/efi/$$f arch/$(TARGET_ARCH)/efi/; \ done; \ diff --git a/xen/Rules.mk b/xen/Rules.mk index e90a03d116..891c94e6ad 100644 --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -188,7 +188,7 @@ define cmd_obj_init_o $(OBJDUMP) -h $< | while read idx name sz rest; do \ case "$$name" in \ .*.local) ;; \ - .text|.text.*|.data|.data.*|.bss) \ + .text|.text.*|.data|.data.*|.bss|.bss.*) \ test $$(echo $$sz | sed 's,00*,0,') != 0 || continue; \ echo "Error: size of $<:$$name is 0x$$sz" >&2; \ exit $$(expr $$idx + 1);; \ diff --git a/xen/arch/arm/efi/Makefile b/xen/arch/arm/efi/Makefile index e3ff2c3f28..662892babd 100644 --- a/xen/arch/arm/efi/Makefile +++ b/xen/arch/arm/efi/Makefile @@ -1,4 +1,4 @@ CFLAGS-y += -fshort-wchar -obj-y += boot.init.o runtime.o +obj-y += boot.init.o ebmalloc.o runtime.o obj-$(CONFIG_ACPI) += efi-dom0.init.o diff --git a/xen/arch/x86/efi/Makefile b/xen/arch/x86/efi/Makefile index 4b2b010a80..770438a029 100644 --- a/xen/arch/x86/efi/Makefile +++ b/xen/arch/x86/efi/Makefile @@ -8,7 +8,7 @@ cmd_objcopy_o_ihex = $(OBJCOPY) -I ihex -O binary $< $@ boot.init.o: buildid.o -EFIOBJ := boot.init.o compat.o runtime.o +EFIOBJ := boot.init.o ebmalloc.o compat.o runtime.o $(call cc-option-add,cflags-stack-boundary,CC,-mpreferred-stack-boundary=4) $(EFIOBJ): CFLAGS-stack-boundary := $(cflags-stack-boundary) diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c index 5a520bf21d..4022a672c9 100644 --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -112,7 +112,6 @@ static CHAR16 *FormatDec(UINT64 Val, CHAR16 *Buffer); static CHAR16 *FormatHex(UINT64 Val, UINTN Width, CHAR16 *Buffer); static void DisplayUint(UINT64 Val, INTN Width); static CHAR16 *wstrcpy(CHAR16 *d, const CHAR16 *s); -static void noreturn blexit(const CHAR16 *str); static void PrintErrMesg(const CHAR16 *mesg, EFI_STATUS ErrCode); static char *get_value(const struct file *cfg, const char *section, const char *item); @@ -155,56 +154,6 @@ static CHAR16 __initdata newline[] = L"\r\n"; #define PrintStr(s) StdOut->OutputString(StdOut, s) #define PrintErr(s) StdErr->OutputString(StdErr, s) -#ifdef CONFIG_ARM -/* - * TODO: Enable EFI boot allocator on ARM. - * This code can be common for x86 and ARM. - * Things TODO on ARM before enabling ebmalloc: - * - estimate required EBMALLOC_SIZE value, - * - where (in which section) ebmalloc_mem[] should live; if in - * .bss.page_aligned, as it is right now, then whole BSS zeroing - * have to be disabled in xen/arch/arm/arm64/head.S; though BSS - * should be initialized somehow before use of variables living there, - * - use ebmalloc() in ARM/common EFI boot code, - * - call free_ebmalloc_unused_mem() somewhere in init code. - */ -#define EBMALLOC_SIZE MB(0) -#else -#define EBMALLOC_SIZE MB(1) -#endif - -static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) - ebmalloc_mem[EBMALLOC_SIZE]; -static unsigned long __initdata ebmalloc_allocated; - -/* EFI boot allocator. */ -static void __init __maybe_unused *ebmalloc(size_t size) -{ - void *ptr = ebmalloc_mem + ebmalloc_allocated; - - ebmalloc_allocated += ROUNDUP(size, sizeof(void *)); - - if ( ebmalloc_allocated > sizeof(ebmalloc_mem) ) - blexit(L"Out of static memory\r\n"); - - return ptr; -} - -static void __init __maybe_unused free_ebmalloc_unused_mem(void) -{ -#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ - unsigned long start, end; - - start = (unsigned long)ebmalloc_mem + PAGE_ALIGN(ebmalloc_allocated); - end = (unsigned long)ebmalloc_mem + sizeof(ebmalloc_mem); - - destroy_xen_mappings(start, end); - init_xenheap_pages(__pa(start), __pa(end)); - - printk(XENLOG_INFO "Freed %lukB unused BSS memory\n", (end - start) >> 10); -#endif -} - /* * Include architecture specific implementation here, which references the * static globals defined above. @@ -321,7 +270,7 @@ static bool __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2) !memcmp(guid1->Data4, guid2->Data4, sizeof(guid1->Data4)); } -static void __init noreturn blexit(const CHAR16 *str) +void __init noreturn blexit(const CHAR16 *str) { if ( str ) PrintStr((CHAR16 *)str); diff --git a/xen/common/efi/ebmalloc.c b/xen/common/efi/ebmalloc.c new file mode 100644 index 0000000000..c65dbd946f --- /dev/null +++ b/xen/common/efi/ebmalloc.c @@ -0,0 +1,52 @@ +#include "efi.h" +#include + +#ifdef CONFIG_ARM +/* + * TODO: Enable EFI boot allocator on ARM. + * This code can be common for x86 and ARM. + * Things TODO on ARM before enabling ebmalloc: + * - estimate required EBMALLOC_SIZE value, + * - where (in which section) ebmalloc_mem[] should live; if in + * .bss.page_aligned, as it is right now, then whole BSS zeroing + * have to be disabled in xen/arch/arm/arm64/head.S; though BSS + * should be initialized somehow before use of variables living there, + * - use ebmalloc() in ARM/common EFI boot code, + * - call free_ebmalloc_unused_mem() somewhere in init code. + */ +#define EBMALLOC_SIZE MB(0) +#else +#define EBMALLOC_SIZE MB(1) +#endif + +static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) + ebmalloc_mem[EBMALLOC_SIZE]; +static unsigned long __initdata ebmalloc_allocated; + +/* EFI boot allocator. */ +void __init *ebmalloc(size_t size) +{ + void *ptr = ebmalloc_mem + ebmalloc_allocated; + + ebmalloc_allocated += ROUNDUP(size, sizeof(void *)); + + if ( ebmalloc_allocated > sizeof(ebmalloc_mem) ) + blexit(L"Out of static memory\r\n"); + + return ptr; +} + +void __init free_ebmalloc_unused_mem(void) +{ +#if 0 /* FIXME: Putting a hole in the BSS breaks the IOMMU mappings for dom0. */ + unsigned long start, end; + + start = (unsigned long)ebmalloc_mem + PAGE_ALIGN(ebmalloc_allocated); + end = (unsigned long)ebmalloc_mem + sizeof(ebmalloc_mem); + + destroy_xen_mappings(start, end); + init_xenheap_pages(__pa(start), __pa(end)); + + printk(XENLOG_INFO "Freed %lukB unused BSS memory\n", (end - start) >> 10); +#endif +} diff --git a/xen/common/efi/efi.h b/xen/common/efi/efi.h index 2e38d05f3d..4845d84913 100644 --- a/xen/common/efi/efi.h +++ b/xen/common/efi/efi.h @@ -40,4 +40,10 @@ extern UINT64 efi_boot_max_var_store_size, efi_boot_remain_var_store_size, extern UINT64 efi_apple_properties_addr; extern UINTN efi_apple_properties_len; +void noreturn blexit(const CHAR16 *str); + const CHAR16 *wmemchr(const CHAR16 *s, CHAR16 c, UINTN n); + +/* EFI boot allocator. */ +void *ebmalloc(size_t size); +void free_ebmalloc_unused_mem(void); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:22:18 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10: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 1kFxF4-0003Q9-Ba; Wed, 09 Sep 2020 10:22: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 1kFxF3-0003Pz-Br for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:17 +0000 X-Inumbo-ID: 04bc9e45-2704-448a-9bdd-72f53bf75a4f Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 04bc9e45-2704-448a-9bdd-72f53bf75a4f; Wed, 09 Sep 2020 10:22: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; bh=R+/8thiSmcusEQPdYiUskIz5hN3BSSCIaFKY2q7rFcY=; b=kWuiug1l/zMDIUzI8eTrU/N62v X8yzzkespN0xxmni0+KwLp8ndzXXNRGPiHLRRmjIfTB6VlFzeTrO+GlMx6GG0in2BMoFbJv+yaeoL LUqxh/k00sxBJMIDxX9j2XYzZWXB/if14AeP2MdFJwWnz8sZf/jWA8B2lmQK1FtnoJGA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxEz-0004vI-HR for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:13 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxEz-0006kY-Eh for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:13 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: don't build with EFI support in shim-exclusive mode Message-Id: Date: Wed, 09 Sep 2020 10:22: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 de58ea464fb6db4b78102edc8ac4598d4eebe6c5 Author: Jan Beulich AuthorDate: Thu Aug 27 09:51:07 2020 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 09:51:07 2020 +0200 x86: don't build with EFI support in shim-exclusive mode There's no need for xen.efi at all, and there's also no need for EFI support in xen.gz since the shim runs in PVH mode, i.e. without any firmware (and hence by implication also without EFI one). The slightly odd looking use of $(space) is to ensure the new ifneq() evaluates consistently between "build" and "install" invocations of make. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 7d89467dc9..93e6dcdc70 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -80,7 +80,9 @@ x86_emulate.o: x86_emulate/x86_emulate.c x86_emulate/x86_emulate.h efi-y := $(shell if [ ! -r $(BASEDIR)/include/xen/compile.h -o \ -O $(BASEDIR)/include/xen/compile.h ]; then \ - echo '$(TARGET).efi'; fi) + echo '$(TARGET).efi'; fi) \ + $(space) +efi-$(CONFIG_PV_SHIM_EXCLUSIVE) := ifneq ($(build_id_linker),) notes_phdrs = --notes @@ -113,11 +115,13 @@ $(TARGET): $(TARGET)-syms $(efi-y) boot/mkelf32 { echo "No Multiboot2 header found" >&2; false; } mv $(TMP) $(TARGET) +ifneq ($(efi-y),) # Check if the compiler supports the MS ABI. export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check.o 2>/dev/null && echo y) # Check if the linker supports PE. XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(shell $(LD) -mi386pep --subsystem=10 -o efi/check.efi efi/check.o 2>/dev/null && echo y)) CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI +endif ALL_OBJS := $(BASEDIR)/arch/x86/boot/built_in.o $(BASEDIR)/arch/x86/efi/built_in.o $(ALL_OBJS) EFI_OBJS-$(XEN_BUILD_EFI) := efi/relocs-dummy.o -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:22:25 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:22: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 1kFxFB-0003Sg-D8; Wed, 09 Sep 2020 10:22: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 1kFxFA-0003SY-VC for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:24 +0000 X-Inumbo-ID: bf9e8d08-0d74-4752-a6d3-47c9b89b59ff Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bf9e8d08-0d74-4752-a6d3-47c9b89b59ff; Wed, 09 Sep 2020 10:22: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; bh=kyxo+9WMWN30Y8iIdvXlFiO8NGOcapy/G0fbxyln+jw=; b=x6CY61wSKnAMTwGaESSeSP43kC d28BrRZx2zUeaGuXuXH9tOE7uAc/A6U6ea5nXr+mAJEk6icjRbompclWhk2bg5GpDGRA2GfotZAcM ATUQTyIWOpQHKIP/TWeOwZvlGgm+Ep/M+lyvyO2HQKcAjrD9yr8dKPe4nSWzirFN/vn4=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxF9-0004vQ-Lv for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:23 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxF9-0006l5-KL for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:23 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] bitmap: move to/from xenctl_bitmap conversion helpers Message-Id: Date: Wed, 09 Sep 2020 10:22: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 a1568878df7d914853ba8c712aaa2315cd33ed3c Author: Jan Beulich AuthorDate: Thu Aug 27 09:52:01 2020 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 09:52:01 2020 +0200 bitmap: move to/from xenctl_bitmap conversion helpers A subsequent change will exclude domctl.c from getting built for a particular configuration, yet the two functions get used from elsewhere. While moving the code - drop unmotivated uses of min_t(), - fix style violations in the moved code, - xfree() as early as possible. Signed-off-by: Jan Beulich Acked-by: Julien Grall --- xen/common/bitmap.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++ xen/common/domctl.c | 85 ---------------------------------------------- xen/include/xen/bitmap.h | 7 ++++ xen/include/xen/domain.h | 3 -- 4 files changed, 94 insertions(+), 88 deletions(-) diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c index 88768bf8bc..b7aa2db7c7 100644 --- a/xen/common/bitmap.c +++ b/xen/common/bitmap.c @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include /* @@ -384,3 +386,88 @@ void bitmap_byte_to_long(unsigned long *lp, const uint8_t *bp, int nbits) } #endif + +int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap, + const unsigned long *bitmap, unsigned int nbits) +{ + unsigned int guest_bytes, copy_bytes, i; + uint8_t zero = 0; + int err = 0; + uint8_t *bytemap = xmalloc_array(uint8_t, (nbits + 7) / 8); + + if ( !bytemap ) + return -ENOMEM; + + guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8; + copy_bytes = min(guest_bytes, (nbits + 7) / 8); + + bitmap_long_to_byte(bytemap, bitmap, nbits); + + if ( copy_bytes && + copy_to_guest(xenctl_bitmap->bitmap, bytemap, copy_bytes) ) + err = -EFAULT; + + xfree(bytemap); + + for ( i = copy_bytes; !err && i < guest_bytes; i++ ) + if ( copy_to_guest_offset(xenctl_bitmap->bitmap, i, &zero, 1) ) + err = -EFAULT; + + return err; +} + +int xenctl_bitmap_to_bitmap(unsigned long *bitmap, + const struct xenctl_bitmap *xenctl_bitmap, + unsigned int nbits) +{ + unsigned int guest_bytes, copy_bytes; + int err = 0; + uint8_t *bytemap = xzalloc_array(uint8_t, (nbits + 7) / 8); + + if ( !bytemap ) + return -ENOMEM; + + guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8; + copy_bytes = min(guest_bytes, (nbits + 7) / 8); + + if ( copy_bytes ) + { + if ( copy_from_guest(bytemap, xenctl_bitmap->bitmap, copy_bytes) ) + err = -EFAULT; + if ( (xenctl_bitmap->nr_bits & 7) && (guest_bytes == copy_bytes) ) + bytemap[guest_bytes - 1] &= ~(0xff << (xenctl_bitmap->nr_bits & 7)); + } + + if ( !err ) + bitmap_byte_to_long(bitmap, bytemap, nbits); + + xfree(bytemap); + + return err; +} + +int cpumask_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_cpumap, + const cpumask_t *cpumask) +{ + return bitmap_to_xenctl_bitmap(xenctl_cpumap, cpumask_bits(cpumask), + nr_cpu_ids); +} + +int xenctl_bitmap_to_cpumask(cpumask_var_t *cpumask, + const struct xenctl_bitmap *xenctl_cpumap) +{ + int err = 0; + + if ( alloc_cpumask_var(cpumask) ) + { + err = xenctl_bitmap_to_bitmap(cpumask_bits(*cpumask), xenctl_cpumap, + nr_cpu_ids); + /* In case of error, cleanup is up to us, as the caller won't care! */ + if ( err ) + free_cpumask_var(*cpumask); + } + else + err = -ENOMEM; + + return err; +} diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 20ef8399bd..5ac6e9c5ca 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -34,91 +34,6 @@ static DEFINE_SPINLOCK(domctl_lock); -static int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap, - const unsigned long *bitmap, - unsigned int nbits) -{ - unsigned int guest_bytes, copy_bytes, i; - uint8_t zero = 0; - int err = 0; - uint8_t *bytemap = xmalloc_array(uint8_t, (nbits + 7) / 8); - - if ( !bytemap ) - return -ENOMEM; - - guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8; - copy_bytes = min_t(unsigned int, guest_bytes, (nbits + 7) / 8); - - bitmap_long_to_byte(bytemap, bitmap, nbits); - - if ( copy_bytes != 0 ) - if ( copy_to_guest(xenctl_bitmap->bitmap, bytemap, copy_bytes) ) - err = -EFAULT; - - for ( i = copy_bytes; !err && i < guest_bytes; i++ ) - if ( copy_to_guest_offset(xenctl_bitmap->bitmap, i, &zero, 1) ) - err = -EFAULT; - - xfree(bytemap); - - return err; -} - -int xenctl_bitmap_to_bitmap(unsigned long *bitmap, - const struct xenctl_bitmap *xenctl_bitmap, - unsigned int nbits) -{ - unsigned int guest_bytes, copy_bytes; - int err = 0; - uint8_t *bytemap = xzalloc_array(uint8_t, (nbits + 7) / 8); - - if ( !bytemap ) - return -ENOMEM; - - guest_bytes = (xenctl_bitmap->nr_bits + 7) / 8; - copy_bytes = min_t(unsigned int, guest_bytes, (nbits + 7) / 8); - - if ( copy_bytes != 0 ) - { - if ( copy_from_guest(bytemap, xenctl_bitmap->bitmap, copy_bytes) ) - err = -EFAULT; - if ( (xenctl_bitmap->nr_bits & 7) && (guest_bytes == copy_bytes) ) - bytemap[guest_bytes-1] &= ~(0xff << (xenctl_bitmap->nr_bits & 7)); - } - - if ( !err ) - bitmap_byte_to_long(bitmap, bytemap, nbits); - - xfree(bytemap); - - return err; -} - -int cpumask_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_cpumap, - const cpumask_t *cpumask) -{ - return bitmap_to_xenctl_bitmap(xenctl_cpumap, cpumask_bits(cpumask), - nr_cpu_ids); -} - -int xenctl_bitmap_to_cpumask(cpumask_var_t *cpumask, - const struct xenctl_bitmap *xenctl_cpumap) -{ - int err = 0; - - if ( alloc_cpumask_var(cpumask) ) { - err = xenctl_bitmap_to_bitmap(cpumask_bits(*cpumask), xenctl_cpumap, - nr_cpu_ids); - /* In case of error, cleanup is up to us, as the caller won't care! */ - if ( err ) - free_cpumask_var(*cpumask); - } - else - err = -ENOMEM; - - return err; -} - static int nodemask_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_nodemap, const nodemask_t *nodemask) { diff --git a/xen/include/xen/bitmap.h b/xen/include/xen/bitmap.h index c44e009f8c..634a259645 100644 --- a/xen/include/xen/bitmap.h +++ b/xen/include/xen/bitmap.h @@ -273,6 +273,13 @@ static inline void bitmap_clear(unsigned long *map, unsigned int start, void bitmap_long_to_byte(uint8_t *bp, const unsigned long *lp, int nbits); void bitmap_byte_to_long(unsigned long *lp, const uint8_t *bp, int nbits); +struct xenctl_bitmap; +int xenctl_bitmap_to_bitmap(unsigned long *bitmap, + const struct xenctl_bitmap *xenctl_bitmap, + unsigned int nbits); +int bitmap_to_xenctl_bitmap(struct xenctl_bitmap *xenctl_bitmap, + const unsigned long *bitmap, unsigned int nbits); + #endif /* __ASSEMBLY__ */ #endif /* __XEN_BITMAP_H */ diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 7e51d361de..1cb205d977 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -27,9 +27,6 @@ struct xen_domctl_getdomaininfo; void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info); void arch_get_domain_info(const struct domain *d, struct xen_domctl_getdomaininfo *info); -int xenctl_bitmap_to_bitmap(unsigned long *bitmap, - const struct xenctl_bitmap *xenctl_bitmap, - unsigned int nbits); /* * Arch-specifics. -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:22:35 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 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 1kFxFL-0003U3-GR; Wed, 09 Sep 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 1kFxFK-0003Tw-Sm for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:34 +0000 X-Inumbo-ID: 280ff707-5951-4f98-be59-ca7edbd8339d Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 280ff707-5951-4f98-be59-ca7edbd8339d; Wed, 09 Sep 2020 10: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; bh=LdPBWp5qkP1oD4z/5Y8zMLFGppfVnWbHV1tol4SQWV0=; b=S5TDBX5o5yf3POM4sdhehrXRGf p+6jL6VL2SM4bAf6PP9nQ2GHyrPGiZpxtDfyI4SHuHqqs/FEf40txt4Dnq65a1Oz/xPx/AYllCJ95 38Z1Z+nqqcZEW0Ara2kN0GzugblKWvqpT2PTRi5/UNAW6JCafdU6kuUobs41N2woSbgU=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxFJ-0004vX-QB for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:33 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxFJ-0006lj-P2 for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:33 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: don't include domctl and alike in shim-exclusive builds Message-Id: Date: Wed, 09 Sep 2020 10:22: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 8b5b49ceb3d9aaf87776584fdf0926fa6f39eb2d Author: Jan Beulich AuthorDate: Thu Aug 27 09:52:45 2020 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 09:52:45 2020 +0200 x86: don't include domctl and alike in shim-exclusive builds There is no need for platform-wide, system-wide, or per-domain control in this case. Hence avoid including this dead code in the build. Signed-off-by: Jan Beulich Reviewed-by: Roger Pau Monné --- xen/arch/x86/Makefile | 10 +++++++--- xen/arch/x86/mm/paging.c | 9 ++++++++- xen/arch/x86/pv/hypercall.c | 6 ++++++ xen/common/Makefile | 9 ++++++--- xen/include/asm-x86/paging.h | 11 +++++++++++ xen/include/xen/domain.h | 4 ++++ 6 files changed, 42 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 93e6dcdc70..1073e454b1 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -23,7 +23,6 @@ obj-$(CONFIG_GDBSX) += debug.o obj-y += delay.o obj-y += desc.o obj-bin-y += dmi_scan.init.o -obj-y += domctl.o obj-y += domain.o obj-bin-y += dom0_build.init.o obj-y += domain_page.o @@ -51,7 +50,6 @@ obj-y += numa.o obj-y += pci.o obj-y += percpu.o obj-y += physdev.o x86_64/physdev.o -obj-y += platform_hypercall.o x86_64/platform_hypercall.o obj-y += psr.o obj-y += setup.o obj-y += shutdown.o @@ -60,7 +58,6 @@ obj-y += smpboot.o obj-y += spec_ctrl.o obj-y += srat.o obj-y += string.o -obj-y += sysctl.o obj-y += time.o obj-y += trace.o obj-y += traps.o @@ -71,6 +68,13 @@ obj-$(CONFIG_TBOOT) += tboot.o obj-y += hpet.o obj-y += vm_event.o obj-y += xstate.o + +ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) +obj-y += domctl.o +obj-y += platform_hypercall.o x86_64/platform_hypercall.o +obj-y += sysctl.o +endif + extra-y += asm-macros.i ifneq ($(CONFIG_HVM),y) diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c index 7c265fb5f3..695372783d 100644 --- a/xen/arch/x86/mm/paging.c +++ b/xen/arch/x86/mm/paging.c @@ -47,6 +47,8 @@ /* Per-CPU variable for enforcing the lock ordering */ DEFINE_PER_CPU(int, mm_lock_level); +#ifndef CONFIG_PV_SHIM_EXCLUSIVE + /************************************************/ /* LOG DIRTY SUPPORT */ /************************************************/ @@ -628,6 +630,8 @@ void paging_log_dirty_init(struct domain *d, const struct log_dirty_ops *ops) d->arch.paging.log_dirty.ops = ops; } +#endif /* CONFIG_PV_SHIM_EXCLUSIVE */ + /************************************************/ /* CODE FOR PAGING SUPPORT */ /************************************************/ @@ -667,7 +671,7 @@ void paging_vcpu_init(struct vcpu *v) shadow_vcpu_init(v); } - +#ifndef CONFIG_PV_SHIM_EXCLUSIVE int paging_domctl(struct domain *d, struct xen_domctl_shadow_op *sc, XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl, bool_t resuming) @@ -788,6 +792,7 @@ long paging_domctl_continuation(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) return ret; } +#endif /* CONFIG_PV_SHIM_EXCLUSIVE */ /* Call when destroying a domain */ int paging_teardown(struct domain *d) @@ -803,10 +808,12 @@ int paging_teardown(struct domain *d) if ( preempted ) return -ERESTART; +#ifndef CONFIG_PV_SHIM_EXCLUSIVE /* clean up log dirty resources. */ rc = paging_free_log_dirty_bitmap(d, 0); if ( rc == -ERESTART ) return rc; +#endif /* Move populate-on-demand cache back to domain_list for destruction */ rc = p2m_pod_empty_cache(d); diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c index 53a52360fa..20795b4b57 100644 --- a/xen/arch/x86/pv/hypercall.c +++ b/xen/arch/x86/pv/hypercall.c @@ -42,7 +42,9 @@ const hypercall_table_t pv_hypercall_table[] = { COMPAT_CALL(set_callbacks), HYPERCALL(fpu_taskswitch), HYPERCALL(sched_op_compat), +#ifndef CONFIG_PV_SHIM_EXCLUSIVE COMPAT_CALL(platform_op), +#endif HYPERCALL(set_debugreg), HYPERCALL(get_debugreg), COMPAT_CALL(update_descriptor), @@ -72,8 +74,10 @@ const hypercall_table_t pv_hypercall_table[] = { #endif HYPERCALL(event_channel_op), COMPAT_CALL(physdev_op), +#ifndef CONFIG_PV_SHIM_EXCLUSIVE HYPERCALL(sysctl), HYPERCALL(domctl), +#endif #ifdef CONFIG_KEXEC COMPAT_CALL(kexec_op), #endif @@ -89,7 +93,9 @@ const hypercall_table_t pv_hypercall_table[] = { HYPERCALL(hypfs_op), #endif HYPERCALL(mca), +#ifndef CONFIG_PV_SHIM_EXCLUSIVE HYPERCALL(arch_1), +#endif }; #undef do_arch_1 diff --git a/xen/common/Makefile b/xen/common/Makefile index 06881d023c..b3b60a1ba2 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -6,7 +6,6 @@ obj-$(CONFIG_CORE_PARKING) += core_parking.o obj-y += cpu.o obj-$(CONFIG_DEBUG_TRACE) += debugtrace.o obj-$(CONFIG_HAS_DEVICE_TREE) += device_tree.o -obj-y += domctl.o obj-y += domain.o obj-y += event_2l.o obj-y += event_channel.o @@ -26,7 +25,6 @@ obj-$(CONFIG_NEEDS_LIST_SORT) += list_sort.o obj-$(CONFIG_LIVEPATCH) += livepatch.o livepatch_elf.o obj-$(CONFIG_MEM_ACCESS) += mem_access.o obj-y += memory.o -obj-y += monitor.o obj-y += multicall.o obj-y += notifier.o obj-y += page_alloc.o @@ -47,7 +45,6 @@ obj-y += spinlock.o obj-y += stop_machine.o obj-y += string.o obj-y += symbols.o -obj-y += sysctl.o obj-y += tasklet.o obj-y += time.o obj-y += timer.o @@ -66,6 +63,12 @@ obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma lzo unlzo un obj-$(CONFIG_COMPAT) += $(addprefix compat/,domain.o kernel.o memory.o multicall.o xlat.o) +ifneq ($(CONFIG_PV_SHIM_EXCLUSIVE),y) +obj-y += domctl.o +obj-y += monitor.o +obj-y += sysctl.o +endif + extra-y := symbols-dummy.o obj-$(CONFIG_COVERAGE) += coverage/ diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h index f53575f3d9..b803efa7b5 100644 --- a/xen/include/asm-x86/paging.h +++ b/xen/include/asm-x86/paging.h @@ -154,6 +154,8 @@ struct paging_mode { /***************************************************************************** * Log dirty code */ +#ifndef CONFIG_PV_SHIM_EXCLUSIVE + /* get the dirty bitmap for a specific range of pfns */ void paging_log_dirty_range(struct domain *d, unsigned long begin_pfn, @@ -202,6 +204,15 @@ struct sh_dirty_vram { s_time_t last_dirty; }; +#else /* !CONFIG_PV_SHIM_EXCLUSIVE */ + +static inline void paging_log_dirty_init(struct domain *d, + const struct log_dirty_ops *ops) {} +static inline void paging_mark_dirty(struct domain *d, mfn_t gmfn) {} +static inline void paging_mark_pfn_dirty(struct domain *d, pfn_t pfn) {} + +#endif /* CONFIG_PV_SHIM_EXCLUSIVE */ + /***************************************************************************** * Entry points into the paging-assistance code */ diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 1cb205d977..cde0d9c7fe 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -125,6 +125,10 @@ struct vnuma_info { struct xen_vmemrange *vmemrange; }; +#ifndef CONFIG_PV_SHIM_EXCLUSIVE void vnuma_destroy(struct vnuma_info *vnuma); +#else +static inline void vnuma_destroy(struct vnuma_info *vnuma) { ASSERT(!vnuma); } +#endif #endif /* __XEN_DOMAIN_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:22:45 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:22: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 1kFxFV-0003V7-IS; Wed, 09 Sep 2020 10:22: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 1kFxFU-0003Uz-Pa for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:44 +0000 X-Inumbo-ID: b02b94af-354b-40d6-be54-3d3a1d9a2810 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id b02b94af-354b-40d6-be54-3d3a1d9a2810; Wed, 09 Sep 2020 10: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; bh=W37vBffjt/z01xAppQCTiaxtlRn7gpoc4bm0ErTVmtU=; b=jFHix+vRWCdeLov+ZqnE3f0wlV xbbParCPHLEbIpVhbLA04gCDzLwHeitf6LG2woa0yfwj4GhmE2rNp4UnSHDpq8RRNxGbFJsW2Q02U CvYs/+ruT8Ikw+aEgT+n5lid4cTxp0mkIDQe8U2l3m74+jpSL/U+gR/msAqscCULKmpY=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxFT-0004ve-U7 for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:43 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxFT-0006mA-TC for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:43 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] x86: use constant flags for section .init.rodata Message-Id: Date: Wed, 09 Sep 2020 10:22: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 d2770047a277ccdc7924fb99d1b051eeb0d5a90f Author: Roger Pau Monné AuthorDate: Thu Aug 27 09:53:46 2020 +0200 Commit: Jan Beulich CommitDate: Thu Aug 27 09:53:46 2020 +0200 x86: use constant flags for section .init.rodata LLVM 11 complains with: :1:1: error: changed section flags for .init.rodata, expected: 0x2 .pushsection .init.rodata ^ :30:9: note: while in macro instantiation entrypoint 0 ^ entry.S:979:9: note: while in macro instantiation .rept 256 ^ And: entry.S:1015:9: error: changed section flags for .init.rodata, expected: 0x2 .section .init.rodata ^ Fix it by explicitly using the same flags and type in all the instances. Signed-off-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/x86_64/entry.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S index 8b57a00040..1e880eb9f6 100644 --- a/xen/arch/x86/x86_64/entry.S +++ b/xen/arch/x86/x86_64/entry.S @@ -967,7 +967,7 @@ GLOBAL(trap_nop) GLOBAL(autogen_entrypoints) /* pop into the .init.rodata section and record an entry point. */ .macro entrypoint ent - .pushsection .init.rodata + .pushsection .init.rodata, "a", @progbits .quad \ent .popsection .endm @@ -1012,5 +1012,5 @@ autogen_stubs: /* Automatically generated stubs. */ vec = vec + 1 .endr - .section .init.rodata + .section .init.rodata, "a", @progbits .size autogen_entrypoints, . - autogen_entrypoints -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:22:59 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:22: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 1kFxFj-0003WN-Ki; Wed, 09 Sep 2020 10:22: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 1kFxFi-0003WG-2J for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:58 +0000 X-Inumbo-ID: 7efcfda6-3de5-461e-a24e-affb7ac266e0 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 7efcfda6-3de5-461e-a24e-affb7ac266e0; Wed, 09 Sep 2020 10: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; bh=oENxBh1OYfwtafY3clxfthqSCa5JghhmkwSfgbp7AXo=; b=H8LxdP4wXbl15mqh99uFFmqymW ANXBoNBsgf5slqXt79qmRfN70i5A0feApPKfReWA2OYgIWGkZ2H/79vVKf3ZPzM3/iNmwsOdYfFsz RF5dsUiY6S/2DeSZMM2gqGcDpyLQA54HrU6VUkzmrOIYMl0c9WWPigVmtDIgDqb2+cvA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxFe-0004vo-1M for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxFe-0006mc-0Y for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:22:54 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] MAINTAINERS: Update my email address Message-Id: Date: Wed, 09 Sep 2020 10: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 86c076f06526e410c3d23af5e5d48511ae204508 Author: Ian Jackson AuthorDate: Wed Aug 26 15:47:19 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 09:33:02 2020 +0000 MAINTAINERS: Update my email address I am changing my email address. (My affiliation to Citrix remains unchanged.) See https://xenbits.xen.org/people/iwj/2020/email-transition.txt for a signed confirmation with full details. Signed-off-by: Ian Jackson Signed-off-by: Ian Jackson --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 978fc2fe72..ffe2310294 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -353,7 +353,7 @@ F: xen/arch/x86/machine_kexec.c F: xen/arch/x86/x86_64/kexec_reloc.S LIBXENLIGHT -M: Ian Jackson +M: Ian Jackson M: Wei Liu M: Anthony PERARD S: Supported @@ -413,7 +413,7 @@ S: Supported F: tools/python QEMU-DM -M: Ian Jackson +M: Ian Jackson S: Supported T: git https://xenbits.xenproject.org/git-http/qemu-xen-traditional.git @@ -465,7 +465,7 @@ F: xen/arch/arm/tee/ F: xen/include/asm-arm/tee TOOLSTACK -M: Ian Jackson +M: Ian Jackson M: Wei Liu S: Supported F: autogen.sh @@ -602,7 +602,7 @@ F: docs/misc/xsm-flask.txt THE REST M: Andrew Cooper M: George Dunlap -M: Ian Jackson +M: Ian Jackson M: Jan Beulich M: Julien Grall M: Stefano Stabellini -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:23:12 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:23: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 1kFxFw-0003YE-MT; Wed, 09 Sep 2020 10:23:12 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxFv-0003Y5-Qo for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:11 +0000 X-Inumbo-ID: 72c50e5c-6a35-4d14-a160-519fb6f7a2cc Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 72c50e5c-6a35-4d14-a160-519fb6f7a2cc; Wed, 09 Sep 2020 10:23: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; bh=bnhBLFgEJ51NYlsYZ/W3TkLwVlhs5qVVQoviNDBjIro=; b=XE+ZDm2SDKZQEBG+JpIqfChDc0 GgR1LVtMx+97jWdlN3KADXZvy8y5SElodknMp2iGQ8AG7gH2JwueiCDtb219yZVpazgTN+9E//A7/ rsBM3ALFjzZibOpozc3Cb1O7B20zZGMHxWbjtRDXQl+GzWjp+0p+U/wc7+RM1LbGgCeA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxFo-0004wZ-4w for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxFo-0006nJ-40 for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/firmware: Fix typo in uninstall target Message-Id: Date: Wed, 09 Sep 2020 10:23: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 a623841b85bde261d0627676c7cff7745f107f3c Author: Hubert Jasudowicz AuthorDate: Tue Aug 18 21:29:48 2020 +0200 Commit: Wei Liu CommitDate: Thu Aug 27 09:35:35 2020 +0000 tools/firmware: Fix typo in uninstall target When ipxe.bin is missing, make uninstall will fail due to wrong switch (-r) passed to rm command. Replace it with -f. Signed-off-by: Hubert Jasudowicz Reviewed-by: Bertrand Marquis Acked-by: Wei Liu --- tools/firmware/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 809a5fd025..1f27117794 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -72,7 +72,7 @@ ifeq ($(CONFIG_OVMF),y) rm -f $(INST_DIR)/ovmf.bin endif ifeq ($(CONFIG_IPXE),y) - rm -r $(INST_DIR)/ipxe.bin + rm -f $(INST_DIR)/ipxe.bin endif ifeq ($(CONFIG_PV_SHIM),y) rm -f $(INST_DIR)/xen-shim -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:23:16 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10: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 1kFxG0-0003Yq-Nu; Wed, 09 Sep 2020 10:23: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 1kFxFz-0003Yg-5a for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:15 +0000 X-Inumbo-ID: bfda53e4-611e-48f2-b0a4-17a70fcc07ff Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bfda53e4-611e-48f2-b0a4-17a70fcc07ff; Wed, 09 Sep 2020 10:23: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; bh=ROE7r8gHDwgYkzKLg6JqVjLatfbf0LxiJCHZwXmBuzk=; b=no4ludRDDazJdSL1mBVKSI2fdN GXJi+gcTyrmLSrFAwCJplHXSZ7hwdqG1nEpyMiAHV5+rphg206+D3Avqm6JVjXva3tsMWinbHMROg rifnKRNhVjT4FpV4KrWPrv2xFctIAfjnZ0FsTiH3BcMeUfviN/b/Fe2ypLNkctrwgFmM=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxFy-0004wm-8O for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxFy-0006nn-7Y for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: workaround gcc 10.2 maybe-uninitialized warning Message-Id: Date: Wed, 09 Sep 2020 10:23: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 d25cc3ec93ebda030349045d2c7fa14ffde07ed7 Author: Marek Marczykowski-Górecki AuthorDate: Wed Aug 19 04:00:35 2020 +0200 Commit: Wei Liu CommitDate: Thu Aug 27 09:36:39 2020 +0000 libxl: workaround gcc 10.2 maybe-uninitialized warning It seems xlu_pci_parse_bdf has a state machine that is too complex for gcc to understand. The build fails with: libxlu_pci.c: In function 'xlu_pci_parse_bdf': libxlu_pci.c:32:18: error: 'func' may be used uninitialized in this function [-Werror=maybe-uninitialized] 32 | pcidev->func = func; | ~~~~~~~~~~~~~^~~~~~ libxlu_pci.c:51:29: note: 'func' was declared here 51 | unsigned dom, bus, dev, func, vslot = 0; | ^~~~ libxlu_pci.c:31:17: error: 'dev' may be used uninitialized in this function [-Werror=maybe-uninitialized] 31 | pcidev->dev = dev; | ~~~~~~~~~~~~^~~~~ libxlu_pci.c:51:24: note: 'dev' was declared here 51 | unsigned dom, bus, dev, func, vslot = 0; | ^~~ libxlu_pci.c:30:17: error: 'bus' may be used uninitialized in this function [-Werror=maybe-uninitialized] 30 | pcidev->bus = bus; | ~~~~~~~~~~~~^~~~~ libxlu_pci.c:51:19: note: 'bus' was declared here 51 | unsigned dom, bus, dev, func, vslot = 0; | ^~~ libxlu_pci.c:29:20: error: 'dom' may be used uninitialized in this function [-Werror=maybe-uninitialized] 29 | pcidev->domain = domain; | ~~~~~~~~~~~~~~~^~~~~~~~ libxlu_pci.c:51:14: note: 'dom' was declared here 51 | unsigned dom, bus, dev, func, vslot = 0; | ^~~ cc1: all warnings being treated as errors Workaround it by setting the initial value to invalid value (0xffffffff) and then assert on each value being set. This way we mute the gcc warning, while still detecting bugs in the parse code. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Ian Jackson --- tools/libxl/libxlu_pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxlu_pci.c b/tools/libxl/libxlu_pci.c index 7947687661..e2709c5f89 100644 --- a/tools/libxl/libxlu_pci.c +++ b/tools/libxl/libxlu_pci.c @@ -45,10 +45,11 @@ static int pcidev_struct_fill(libxl_device_pci *pcidev, unsigned int domain, #define STATE_TYPE 9 #define STATE_RDM_STRATEGY 10 #define STATE_RESERVE_POLICY 11 +#define INVALID 0xffffffff int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str) { unsigned state = STATE_DOMAIN; - unsigned dom, bus, dev, func, vslot = 0; + unsigned dom = INVALID, bus = INVALID, dev = INVALID, func = INVALID, vslot = 0; char *buf2, *tok, *ptr, *end, *optkey = NULL; if ( NULL == (buf2 = ptr = strdup(str)) ) @@ -170,6 +171,8 @@ int xlu_pci_parse_bdf(XLU_Config *cfg, libxl_device_pci *pcidev, const char *str if ( tok != ptr || state != STATE_TERMINAL ) goto parse_error; + assert(dom != INVALID && bus != INVALID && dev != INVALID && func != INVALID); + /* Just a pretty way to fill in the values */ pcidev_struct_fill(pcidev, dom, bus, dev, func, vslot << 3); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:23:26 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:23: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 1kFxGA-0003a6-Pl; Wed, 09 Sep 2020 10:23: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 1kFxG9-0003Zt-9P for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:25 +0000 X-Inumbo-ID: bebeb8c2-55f3-4c66-9d2d-9811f296b43e Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id bebeb8c2-55f3-4c66-9d2d-9811f296b43e; Wed, 09 Sep 2020 10:23: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; bh=pjPxkoyCSqvgPMldo+WPtR3JknQama7magSZDYITtVI=; b=OYDX07QyhlV0txehCY9U5TIiyR uk+CthBerHCZWdvtNI1kSy6uk84KzQIBfKNSlBMQ0yQYF7SgaR4wr1+InLUbunr16SXjhuuhpMVXQ QH3/9bmURlJJlvMBwHZRItOoeEaa1Cl0yqwFaWM1ga+KnocHLIx8Bg+esomN7q/ZEjxw=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxG8-0004x0-Cc for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:24 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxG8-0006oD-BC for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:24 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: fix -Werror=stringop-truncation in libxl__prepare_sockaddr_un Message-Id: Date: Wed, 09 Sep 2020 10:23: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 fff1b7f50e75ad9535c86f3fcf425b4945c50a1c Author: Marek Marczykowski-Górecki AuthorDate: Wed Aug 19 04:00:36 2020 +0200 Commit: Wei Liu CommitDate: Thu Aug 27 09:38:47 2020 +0000 libxl: fix -Werror=stringop-truncation in libxl__prepare_sockaddr_un In file included from /usr/include/string.h:495, from libxl_internal.h:38, from libxl_utils.c:20: In function 'strncpy', inlined from 'libxl__prepare_sockaddr_un' at libxl_utils.c:1262:5: /usr/include/bits/string_fortified.h:106:10: error: '__builtin_strncpy' specified bound 108 equals destination size [-Werror=stringop-truncation] 106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Ian Jackson --- tools/libxl/libxl_utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index f360f5e228..b039143b8a 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -1252,14 +1252,14 @@ int libxl__prepare_sockaddr_un(libxl__gc *gc, struct sockaddr_un *un, const char *path, const char *what) { - if (sizeof(un->sun_path) <= strlen(path)) { + if (sizeof(un->sun_path) - 1 <= strlen(path)) { LOG(ERROR, "UNIX socket path '%s' is too long for %s", path, what); - LOG(DEBUG, "Path must be less than %zu bytes", sizeof(un->sun_path)); + LOG(DEBUG, "Path must be less than %zu bytes", sizeof(un->sun_path) - 1); return ERROR_INVAL; } memset(un, 0, sizeof(struct sockaddr_un)); un->sun_family = AF_UNIX; - strncpy(un->sun_path, path, sizeof(un->sun_path)); + strncpy(un->sun_path, path, sizeof(un->sun_path) - 1); return 0; } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:23:36 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:23: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 1kFxGK-0003bT-Su; Wed, 09 Sep 2020 10:23: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 1kFxGJ-0003bI-Be for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:35 +0000 X-Inumbo-ID: c56f765d-a325-40e6-8b4c-930156b42fca Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id c56f765d-a325-40e6-8b4c-930156b42fca; Wed, 09 Sep 2020 10:23: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; bh=Y6BmCMLXYnL+jyTBDxD/wbP60B3g/IYUbYADLWePRmA=; b=Z/7aBFUISZ76PT5LvmKf/EhpRz 8i5IJqs9Qr3xE/OEARu6iZdKlJPzSXGnhz5VmE1Rv1u4TQXAqsCBQZCILyC2NXfm4FBGtWaB4JFo4 HxzuRlrSfLR7ynmhYILm3SAxS5lpmRsLgSdMYrGDJuZeBmGGSmNkWo1mmcMcDcyrs7Rs=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxGI-0004x8-GR for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:34 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxGI-0006p8-FQ for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:34 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] public/io/netif: specify MTU override node Message-Id: Date: Wed, 09 Sep 2020 10:23: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 f9d25fa3faf66bcd4265fe01f23c5fd724e27601 Author: Paul Durrant AuthorDate: Tue Aug 11 09:01:55 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 10:03:54 2020 +0000 public/io/netif: specify MTU override node There is currently no documentation to state what MTU a frontend should adertise to its network stack. It has however long been assumed that the default value of 1500 is correct. This patch specifies a mechanism to allow the tools to set the MTU via a xenstore node in the frontend area and states that the absence of that node means the frontend should assume an MTU of 1500 octets. NOTE: The Windows PV frontend has used an MTU sampled from the xenstore node specified in this patch. Signed-off-by: Paul Durrant Reviewed-by: Juergen Gross Reviewed-by: Ian Jackson Acked-by: Wei Liu --- docs/misc/xenstore-paths.pandoc | 3 +++ xen/include/public/io/netif.h | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/docs/misc/xenstore-paths.pandoc b/docs/misc/xenstore-paths.pandoc index 766e8008dc..5cd5c8a3b9 100644 --- a/docs/misc/xenstore-paths.pandoc +++ b/docs/misc/xenstore-paths.pandoc @@ -298,6 +298,9 @@ A virtual keyboard device frontend. Described by A virtual network device frontend. Described by [xen/include/public/io/netif.h][NETIF] +NOTE: ~/device/vif/$DEVID/mtu can be used to inform the frontend of an + increased MTU. (The default MTU is 1500 octets). + #### ~/device/vscsi/$DEVID/* [] A virtual scsi device frontend. Described by diff --git a/xen/include/public/io/netif.h b/xen/include/public/io/netif.h index 9fcf91a2fe..00dd258712 100644 --- a/xen/include/public/io/netif.h +++ b/xen/include/public/io/netif.h @@ -204,6 +204,18 @@ * present). */ +/* + * MTU + * === + * + * The toolstack may set a value of MTU for the frontend by setting the + * /local/domain//device/vif//mtu node with the MTU value in + * octets. If this node is absent the frontend should assume an MTU value + * of 1500 octets. A frontend is also at liberty to ignore this value so + * it is only suitable for informing the frontend that a packet payload + * >1500 octets is permitted. + */ + /* * Hash types * ========== -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:23:46 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:23: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 1kFxGU-0003cV-UZ; Wed, 09 Sep 2020 10:23: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 1kFxGT-0003cJ-FO for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:45 +0000 X-Inumbo-ID: 6689a2f2-156c-4949-a07f-42c25d05d061 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 6689a2f2-156c-4949-a07f-42c25d05d061; Wed, 09 Sep 2020 10:23: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; bh=ZbkCKoC1hwvwHEl2cUkvhbQf4bTpZRSIPzxx7CwKE9c=; b=qPo5DSTpThWXA/bnSpDsm/zp3Q Rgnhq8HLi6Y3Gga5V9ZzlwSFjJ/keB7g/mOUlRd7uFKwtJaAL9ZNAohCNujuROpXXziLYKsoeJnmN Hk44KRWvdJPEsIv/NohuyVgJzBQCoNDVPWWwEyaDeFLmYiV0Ij5vrV0v7+QXBOlcAgy8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxGS-0004xG-K9 for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:44 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxGS-0006pg-J7 for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:44 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/hotplug/Linux: re-factor add_to_bridge() in xen-network-common.sh Message-Id: Date: Wed, 09 Sep 2020 10:23: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 70fea87a3a595632cd0a17a8388a43b95cbe7af7 Author: Paul Durrant AuthorDate: Tue Aug 11 09:01:56 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 10:04:04 2020 +0000 tools/hotplug/Linux: re-factor add_to_bridge() in xen-network-common.sh Remove duplication of 'ip link set dev'. It is perfectly fine to call it even if the device has already been added to the bridge. NOTE: This patch also adds code to write a debug log entry if the device was already on the bridge. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/hotplug/Linux/xen-network-common.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 8dd3a62068..ec3bd4ec4a 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -126,16 +126,18 @@ add_to_bridge () { local bridge=$1 local dev=$2 - # Don't add $dev to $bridge if it's already on a bridge. - if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then - ip link set dev ${dev} up || true - return - fi - if which brctl >&/dev/null; then - brctl addif ${bridge} ${dev} + # Don't add $dev to $bridge if it's already on the bridge. + if [ ! -e "/sys/class/net/${bridge}/brif/${dev}" ]; then + log debug "adding $dev to bridge $bridge" + if which brctl >&/dev/null; then + brctl addif ${bridge} ${dev} + else + ip link set ${dev} master ${bridge} + fi else - ip link set ${dev} master ${bridge} + log debug "$dev already on bridge $bridge" fi + ip link set dev ${dev} up } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:23:57 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10: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 1kFxGf-0003dT-01; Wed, 09 Sep 2020 10:23: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 1kFxGd-0003dH-Ht for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:55 +0000 X-Inumbo-ID: aab00577-c6f9-43ac-806a-04ca09511601 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id aab00577-c6f9-43ac-806a-04ca09511601; Wed, 09 Sep 2020 10:23: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; bh=mxIvIPF4COXVidY58Bbligt6hzfEuUCE5nPKWi50v1k=; b=plLx/W+Ua0Ri0eDt8NDjok3RQW v9eBRuzj1ZHa3LbP61T76/J4AzfLXGAvBDHf6psrm91Z/L0zDdJJrr2nRhEHw92/yOz1W/TdnsBlH nTiw+NB38CgqHvYPWGsRno6rwQFV2HRZ3GeJ8hDuVo9rvFeHsb/1UBOWVf288xtsQmEA=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxGc-0004xO-NU for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:54 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxGc-0006qG-Mj for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:23:54 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/hotplug/Linux: add remove_from_bridge() Message-Id: Date: Wed, 09 Sep 2020 10:23: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 bb13d936d2500f303c8fbf9420da9ed340818294 Author: Paul Durrant AuthorDate: Tue Aug 11 09:01:57 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 10:04:10 2020 +0000 tools/hotplug/Linux: add remove_from_bridge() This patch adds a remove_from_bridge() function into xen-network-common.sh to partner with the existing add_to_bridge() function. The vif-bridge script is then modified to use it. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/hotplug/Linux/vif-bridge | 7 +------ tools/hotplug/Linux/xen-network-common.sh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index e722090ca8..c3e409926d 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -84,12 +84,7 @@ case "$command" in ;; offline) - if which brctl >&/dev/null; then - do_without_error brctl delif "$bridge" "$dev" - else - do_without_error ip link set "$dev" nomaster - fi - do_without_error ifconfig "$dev" down + remove_from_bridge "$bridge" "$dev" ;; add) diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index ec3bd4ec4a..6a0904361f 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -141,6 +141,25 @@ add_to_bridge () { ip link set dev ${dev} up } +remove_from_bridge () { + local bridge=$1 + local dev=$2 + + do_without_error ip link set dev ${dev} down + + # Don't remove $dev from $bridge if it's not on the bridge. + if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then + log debug "removing $dev from bridge $bridge" + if which brctl >&/dev/null; then + do_without_error brctl delif ${bridge} ${dev} + else + do_without_error ip link set ${dev} nomaster + fi + else + log debug "$dev not on bridge $bridge" + fi +} + # Usage: set_mtu bridge dev set_mtu () { local bridge=$1 -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:24:07 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:24: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 1kFxGp-0003ed-1d; Wed, 09 Sep 2020 10:24: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 1kFxGo-0003eR-1h for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:06 +0000 X-Inumbo-ID: 3b5910bf-f9ec-40b6-90e0-d0b9f5f77101 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3b5910bf-f9ec-40b6-90e0-d0b9f5f77101; Wed, 09 Sep 2020 10: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; bh=yITYWjYSwneDcNPAKBW32wEGjSGl1nPd9GGOLaH00EM=; b=A2UvSFF7+8ttdFsFN3nZ80nApn p57fTEihVQaKbjPBZv7mcDRctqTCNlzAMJbksyoAmJhG/XsbJbC8eKGBtbiNKjTuIQVlfO5NK+Nj6 ZbqvN1MQVliuijcUGlkzjiFFWzM2OIScdfkiCz4hYsf8tcmqaaixz7t8PrwW8ZXts374=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxGm-0004yQ-RJ for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:04 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxGm-0006qr-QT for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:04 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/hotplug/Linux: remove code duplication in vif-bridge Message-Id: Date: Wed, 09 Sep 2020 10:24: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 b51715f02bf916c9cd6740b1047ba4396d85bbb0 Author: Paul Durrant AuthorDate: Tue Aug 11 09:01:58 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 10:04:14 2020 +0000 tools/hotplug/Linux: remove code duplication in vif-bridge The 'add' and 'online' cases do exactly the same thing so have 'add' simply fall through to 'online'. NOTE: This patch also adds in the missing 'remove' case, which falls though to 'offline'. (The former is passed for 'tap' devices, the latter for 'vif' devices). Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/hotplug/Linux/vif-bridge | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index c3e409926d..e1d7c49788 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -77,21 +77,18 @@ then fi case "$command" in + add) + ;& online) setup_virtual_bridge_port "$dev" set_mtu "$bridge" "$dev" add_to_bridge "$bridge" "$dev" ;; - + remove) + ;& offline) remove_from_bridge "$bridge" "$dev" ;; - - add) - setup_virtual_bridge_port "$dev" - set_mtu "$bridge" "$dev" - add_to_bridge "$bridge" "$dev" - ;; esac handle_iptable -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:24:17 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:24: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 1kFxGz-0003g1-3E; Wed, 09 Sep 2020 10:24: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 1kFxGx-0003ft-Sh for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:15 +0000 X-Inumbo-ID: 59e641de-f150-4657-b64c-73cf510ebfba Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 59e641de-f150-4657-b64c-73cf510ebfba; Wed, 09 Sep 2020 10:24: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; bh=LveUlXt1KQRZonhbNAn3G+ehaLnfGtqy7dsdON2tLHQ=; b=YZWZ8FQNZoHeF+YeieYFbvWeBl Q2EM0P4hJIW/3USjl06NkskQc7P5LksllKLEgWlrIyTvj0KYNQtS/6qQHqn6Hs+E3WhPh6hROAJjH 1bMQG+ggBDg+V1CscTIUUfzQ9I0iToE7Na0RSDGM+MPRJ1Ooc0/rzoOrz16pnPZPNKhk=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxGw-0004yT-VZ for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:14 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxGw-0006rX-UD for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:14 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] libxl: wire the libxl_device_nic 'mtu' value into xenstore Message-Id: Date: Wed, 09 Sep 2020 10:24: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 22cdff931d1239156dea74d8b4a50e91e44c5817 Author: Paul Durrant AuthorDate: Tue Aug 11 09:01:59 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 10:04:17 2020 +0000 libxl: wire the libxl_device_nic 'mtu' value into xenstore Currently the 'mtu' field of libxl_device_nic objects is effectively ignored: It is set by libxl__device_nic_setdefault() to a slightly odd default value of 1492 but otherwise ignored. This patch changes the default value to a more conventional 1500 and modifies libxl__set_xenstore_nic() to write the value into an 'mtu' node in the xenstore backend area (if it is a non-default value), as well as a read-only node of the same name in the frontend area. The backend node is used to set the value of 'mtu' in libxl__nic_from_xenstore(), when retrieving the configuration. NOTE: There is currently no way to set a non-default value of 'mtu', hence the backend node is never written. This, however, will be addressed by a subsequent patch. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/libxl/libxl_nic.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c index 07880b39e1..0e5d120ae9 100644 --- a/tools/libxl/libxl_nic.c +++ b/tools/libxl/libxl_nic.c @@ -53,13 +53,15 @@ int libxl_mac_to_device_nic(libxl_ctx *ctx, uint32_t domid, return rc; } +#define LIBXL_DEVICE_NIC_MTU_DEFAULT 1500 + static int libxl__device_nic_setdefault(libxl__gc *gc, uint32_t domid, libxl_device_nic *nic, bool hotplug) { int rc; if (!nic->mtu) - nic->mtu = 1492; + nic->mtu = LIBXL_DEVICE_NIC_MTU_DEFAULT; if (!nic->model) { nic->model = strdup("rtl8139"); if (!nic->model) return ERROR_NOMEM; @@ -223,6 +225,11 @@ static int libxl__set_xenstore_nic(libxl__gc *gc, uint32_t domid, nic->rate_interval_usecs)); } + if (nic->mtu != LIBXL_DEVICE_NIC_MTU_DEFAULT) { + flexarray_append(back, "mtu"); + flexarray_append(back, GCSPRINTF("%u", nic->mtu)); + } + flexarray_append(back, "bridge"); flexarray_append(back, libxl__strdup(gc, nic->bridge)); flexarray_append(back, "handle"); @@ -237,6 +244,9 @@ static int libxl__set_xenstore_nic(libxl__gc *gc, uint32_t domid, flexarray_append(front, GCSPRINTF( LIBXL_MAC_FMT, LIBXL_MAC_BYTES(nic->mac))); + flexarray_append(ro_front, "mtu"); + flexarray_append(ro_front, GCSPRINTF("%u", nic->mtu)); + return 0; } @@ -275,7 +285,20 @@ static int libxl__nic_from_xenstore(libxl__gc *gc, const char *libxl_path, rc = libxl__backendpath_parse_domid(gc, tmp, &nic->backend_domid); if (rc) goto out; - /* nic->mtu = */ + rc = libxl__xs_read_checked(gc, XBT_NULL, + GCSPRINTF("%s/mtu", libxl_path), &tmp); + if (rc) goto out; + if (tmp) { + char *endptr; + + nic->mtu = strtol(tmp, &endptr, 10); + if (*endptr != '\0') { + rc = ERROR_INVAL; + goto out; + } + } else { + nic->mtu = LIBXL_DEVICE_NIC_MTU_DEFAULT; + } rc = libxl__xs_read_checked(gc, XBT_NULL, GCSPRINTF("%s/mac", libxl_path), &tmp); -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:24:27 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:24: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 1kFxH9-0003h0-4x; Wed, 09 Sep 2020 10:24: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 1kFxH7-0003gr-VQ for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:26 +0000 X-Inumbo-ID: 5af508a8-71d6-4469-93ed-744760af1b63 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 5af508a8-71d6-4469-93ed-744760af1b63; Wed, 09 Sep 2020 10:24: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; bh=R0V7uydwIEoAWCxFyQwDtYrmJyfjIgyOUQe9tty8sGk=; b=ZnkR1NOJMX3WpcwyMdxAuKoO/k 9R4wCKZ6hP/bNyItt8u2cHzkspnjctWXtUq5r2uTKRwQNbtIUZJSIb1w5W70ycARzHbRDgOdruxeW AksGGgnF/1E+eoeqRE5DUilJb8urm3MBHipfEPO5aO1KPnCcUX48JPMMGvGWXhk33X2o=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxH7-0004yb-3n for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:25 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxH7-0006s1-25 for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:25 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] tools/hotplug/Linux: modify set_mtu() to optionally use a configured value... Message-Id: Date: Wed, 09 Sep 2020 10: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 c7c6de0cb9b00efc203790743ef8c37ba113d3ee Author: Paul Durrant AuthorDate: Tue Aug 11 09:02:00 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 10:04:21 2020 +0000 tools/hotplug/Linux: modify set_mtu() to optionally use a configured value... ...and also inform the frontend. The set_mtu() function in xen-network-common.sh currently sets the backend vif MTU to match that of the bridge. A prior patch added code into libxl such that a tools-configured 'mtu' value may be present in the xenstore backend area. If the node is present in xenstore then it should be authoritative. Hence set_mtu() is modified to only read the MTU of the bridge if it is not present. The function is also modified to write whatever value it applies to the backend vif into the xenstore frontend area where is may then be used to configure the frontend network stack. NOTE: There is also a small modification replacing '$mtu' with '${mtu}' for style consistency. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- tools/hotplug/Linux/vif-bridge | 2 +- tools/hotplug/Linux/xen-network-common.sh | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/tools/hotplug/Linux/vif-bridge b/tools/hotplug/Linux/vif-bridge index e1d7c49788..b99cc82a21 100644 --- a/tools/hotplug/Linux/vif-bridge +++ b/tools/hotplug/Linux/vif-bridge @@ -81,7 +81,7 @@ case "$command" in ;& online) setup_virtual_bridge_port "$dev" - set_mtu "$bridge" "$dev" + set_mtu "$bridge" "$dev" "$type_if" add_to_bridge "$bridge" "$dev" ;; remove) diff --git a/tools/hotplug/Linux/xen-network-common.sh b/tools/hotplug/Linux/xen-network-common.sh index 6a0904361f..82ee70aab4 100644 --- a/tools/hotplug/Linux/xen-network-common.sh +++ b/tools/hotplug/Linux/xen-network-common.sh @@ -164,9 +164,33 @@ remove_from_bridge () { set_mtu () { local bridge=$1 local dev=$2 - mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`" + local type_if=$3 + + XENBUS_PATH="${XENBUS_PATH:?}" + + local mtu=$(xenstore_read_default "$XENBUS_PATH/mtu" "") + if [ -z "$mtu" ] + then + mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] + then + log debug "$bridge MTU is $mtu" + fi + fi if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] then - ip link set dev ${dev} mtu $mtu || : + log debug "setting $dev MTU to $mtu" + ip link set dev ${dev} mtu ${mtu} || : + + if [ ${type_if} = vif ] + then + local dev_=${dev#vif} + local domid=${dev_%.*} + local devid=${dev_#*.} + + local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid" + + xenstore_write "$FRONTEND_PATH/mtu" ${mtu} + fi fi } -- generated by git-patchbot for /home/xen/git/xen.git#master From xen-changelog-bounces@lists.xenproject.org Wed Sep 09 10:24:37 2020 Return-path: Envelope-to: archives@lists.xen.org Delivery-date: Wed, 09 Sep 2020 10:24: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 1kFxHJ-0003i4-6m; Wed, 09 Sep 2020 10:24: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 1kFxHI-0003hu-16 for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:36 +0000 X-Inumbo-ID: 1955b847-794e-4b0b-8701-8cd6309a2437 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1955b847-794e-4b0b-8701-8cd6309a2437; Wed, 09 Sep 2020 10:24: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; bh=UQlgwwE3WoIGSCMI56yzSyEONeS7pO6gDOyF+36El8Y=; b=NxObklLNEJ8FyIYeuIDh/THE/4 Z7Kqh2nYQx/qMZKv58WQNEqi/KkHyxY323p4yCyszxlXvXu2L6pfNhV2+KY6h8TsLn8cnZNnyHQ0v pytZVQ66jPwiqJhF/1mhWq7W1GlTQkX/J4ABNhZnRvjjcoDQJ+/4gF4sGYsYmQcHNZvI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kFxHH-0004yk-7a for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:35 +0000 Received: from xen by xenbits.xenproject.org with local (Exim 4.92) (envelope-from ) id 1kFxHH-0006sX-6m for xen-changelog@lists.xenproject.org; Wed, 09 Sep 2020 10:24:35 +0000 From: patchbot@xen.org To: xen-changelog@lists.xenproject.org Subject: [xen master] xl: add 'mtu' option to network configuration Message-Id: Date: Wed, 09 Sep 2020 10:24: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 812c8e01dbb352b93ae93d24cd0df7dee139c290 Author: Paul Durrant AuthorDate: Tue Aug 11 09:02:01 2020 +0100 Commit: Wei Liu CommitDate: Thu Aug 27 10:04:25 2020 +0000 xl: add 'mtu' option to network configuration This patch adds code to parse a value for MTU from the network configuration if it is present. The documentation in xl-network-configuration.5.pod is also modified accordingly. Signed-off-by: Paul Durrant Acked-by: Wei Liu --- docs/man/xl-network-configuration.5.pod | 6 ++++++ tools/xl/xl_cmdtable.c | 2 +- tools/xl/xl_parse.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/man/xl-network-configuration.5.pod b/docs/man/xl-network-configuration.5.pod index 0ac24c4a18..af058d4d3c 100644 --- a/docs/man/xl-network-configuration.5.pod +++ b/docs/man/xl-network-configuration.5.pod @@ -249,3 +249,9 @@ on the underlying netback implementation. Specifies the devid manually instead of letting xl choose the lowest index available. NOTE: This should not be set unless you have a reason to. + +=head2 mtu + +Specifies the MTU (i.e. the maximum size of an IP payload, exclusing headers). The +default value is 1500 but, if the VIF is attached to a bridge, it will be set to match +unless overridden by this parameter. diff --git a/tools/xl/xl_cmdtable.c b/tools/xl/xl_cmdtable.c index 08335394e5..2b8e1b321a 100644 --- a/tools/xl/xl_cmdtable.c +++ b/tools/xl/xl_cmdtable.c @@ -338,7 +338,7 @@ struct cmd_spec cmd_table[] = { "Create a new virtual network device", " [type=] [mac=] [bridge=] " "[ip=] [script=