From patchwork Tue Apr 1 00:52:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Mukhin X-Patchwork-Id: 14034245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7599EC3600C for ; Tue, 1 Apr 2025 00:52:58 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.933296.1335281 (Exim 4.92) (envelope-from ) id 1tzPrz-00016E-M6; Tue, 01 Apr 2025 00:52:47 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 933296.1335281; Tue, 01 Apr 2025 00:52:47 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tzPrz-00015V-HQ; Tue, 01 Apr 2025 00:52:47 +0000 Received: by outflank-mailman (input) for mailman id 933296; Tue, 01 Apr 2025 00:52:46 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tzPry-00012a-4g for xen-devel@lists.xenproject.org; Tue, 01 Apr 2025 00:52:46 +0000 Received: from mail-10630.protonmail.ch (mail-10630.protonmail.ch [79.135.106.30]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9f4d30db-0e93-11f0-9ffb-bf95429c2676; Tue, 01 Apr 2025 02:52:44 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9f4d30db-0e93-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1743468763; x=1743727963; bh=VbGdRQcIdJuxOnTDcd1yoix3INOLV2Z0Txcr2KwDyRY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=BrRU3CUwzP0YzrmSowanjdjabarJvCg4qgtATyyKwb/5lPSYRatEF4D+XolhR2xlj tRu2seO2BrG0Jo2rmzBcDtl7xo/cwHrFZdRLUweGq7p3FDtVbuohaQ0Lr4RKsEwHjY WG+nS/byz1ps5lDL3mbD4VUsSrJtpCz7QXq6I2oOMWMiknWNyeYpU21gfJyO5c9GhJ ADTrkUdPbSa2rdE7QaRmS+AVOSGf8TzR045NVY11WPlkG+Bwh/GRWUj4cJx3KezORg 6rjE1hivbAw8LWNHwO7d3Mxb0THqXvMskcZHKI+fZZGTPcXy2M/v4hbu0Q99mTWKpd QKD6bOvzWYXjg== Date: Tue, 01 Apr 2025 00:52:38 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: andrew.cooper3@citrix.com, anthony.perard@vates.tech, jbeulich@suse.com, julien@xen.org, michal.orzel@amd.com, roger.pau@citrix.com, sstabellini@kernel.org, dmukhin@ford.com Subject: [PATCH v1 1/3] xen/domain: introduce non-x86 hardware emulation flags Message-ID: <20250401005224.461325-2-dmukhin@ford.com> In-Reply-To: <20250401005224.461325-1-dmukhin@ford.com> References: <20250401005224.461325-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 18d18a5caa72342da17d3b5f5ef42323c57fea6b MIME-Version: 1.0 From: Denis Mukhin Define per-architecture emulation_flags for configuring in-hypervisor emulators. Print d->arch.emulation_flags from 'q' keyhandler for better traceability while debugging in-hypervisor hardware emulators. Simplify the x86's emulation_flags description and make it consistent with newly introduced non-x86 descriptions. Signed-off-by: Denis Mukhin --- xen/arch/arm/include/asm/domain.h | 2 ++ xen/arch/ppc/include/asm/domain.h | 2 ++ xen/arch/riscv/include/asm/domain.h | 2 ++ xen/arch/x86/include/asm/domain.h | 2 +- xen/common/keyhandler.c | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/include/asm/domain.h b/xen/arch/arm/include/asm/domain.h index 50b6a4b009..279ff64fe0 100644 --- a/xen/arch/arm/include/asm/domain.h +++ b/xen/arch/arm/include/asm/domain.h @@ -119,6 +119,8 @@ struct arch_domain void *tee; #endif + /* Hardware emulation flags. */ + uint32_t emulation_flags; } __cacheline_aligned; struct arch_vcpu diff --git a/xen/arch/ppc/include/asm/domain.h b/xen/arch/ppc/include/asm/domain.h index 3a447272c6..8aa7b4a6ac 100644 --- a/xen/arch/ppc/include/asm/domain.h +++ b/xen/arch/ppc/include/asm/domain.h @@ -21,6 +21,8 @@ struct arch_vcpu { struct arch_domain { struct hvm_domain hvm; + /* Hardware emulation flags. */ + uint32_t emulation_flags; }; #include diff --git a/xen/arch/riscv/include/asm/domain.h b/xen/arch/riscv/include/asm/domain.h index c3d965a559..b561e6f4f8 100644 --- a/xen/arch/riscv/include/asm/domain.h +++ b/xen/arch/riscv/include/asm/domain.h @@ -18,6 +18,8 @@ struct arch_vcpu { struct arch_domain { struct hvm_domain hvm; + /* Hardware emulation flags. */ + uint32_t emulation_flags; }; #include diff --git a/xen/arch/x86/include/asm/domain.h b/xen/arch/x86/include/asm/domain.h index 5fc1d1e5d0..6b877e33a1 100644 --- a/xen/arch/x86/include/asm/domain.h +++ b/xen/arch/x86/include/asm/domain.h @@ -456,7 +456,7 @@ struct arch_domain /* Don't unconditionally inject #GP for unhandled MSRs. */ bool msr_relaxed; - /* Emulated devices enabled bitmap. */ + /* Hardware emulation flags. */ uint32_t emulation_flags; } __cacheline_aligned; diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 0bb842ec00..73f5134b68 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -306,6 +306,7 @@ static void cf_check dump_domains(unsigned char key) if ( test_bit(i, &d->watchdog_inuse_map) ) printk(" watchdog %d expires in %d seconds\n", i, (u32)((d->watchdog_timer[i].expires - NOW()) >> 30)); + printk(" emulation_flags %#x\n", d->arch.emulation_flags); arch_dump_domain_info(d); From patchwork Tue Apr 1 00:52:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Mukhin X-Patchwork-Id: 14034247 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3443BC3600C for ; Tue, 1 Apr 2025 00:53:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.933297.1335297 (Exim 4.92) (envelope-from ) id 1tzPs4-0001XU-0R; Tue, 01 Apr 2025 00:52:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 933297.1335297; Tue, 01 Apr 2025 00:52:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tzPs3-0001XG-RK; Tue, 01 Apr 2025 00:52:51 +0000 Received: by outflank-mailman (input) for mailman id 933297; Tue, 01 Apr 2025 00:52:49 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tzPs1-0001Vj-P0 for xen-devel@lists.xenproject.org; Tue, 01 Apr 2025 00:52:49 +0000 Received: from mail-24418.protonmail.ch (mail-24418.protonmail.ch [109.224.244.18]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a1db7de8-0e93-11f0-9ea7-5ba50f476ded; Tue, 01 Apr 2025 02:52:48 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a1db7de8-0e93-11f0-9ea7-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1743468767; x=1743727967; bh=xy+Rn46fun91syrPY3ZLIJ9vjLWYFH0FTIVp7v5cQ80=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=blLYzK2HVp83a/yMjTd34LOlCYWV9fKn0Mlr1SvjJ3Fgv/Wp1zTxe8VdImo16FpKe FvtLBxjk1is9hPlWfOd6UyfkFf8HNwKHgddseVdlQ6ST/MvN6M3x/jzYUojxYoX8yF Hzv6QRfzg3iAj82X3B473JD/abkIuXQnwKlCB9fZfJFuPvuEFfIIJhc9FsIQpuJF37 MScUtCRHDpB4UttOvYKus9kuO4OIWCgMa2MNC0WRA5vDSFCKQIwQS/BIrIbs5P2BMA lcrsNQBZGqvcB8fuKQfGS02+TrLEOfwan6/YcMYyI5Ng9s4LzVwf7Inu2gVarz9HU/ oSWoffrJY7P1A== Date: Tue, 01 Apr 2025 00:52:42 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: andrew.cooper3@citrix.com, anthony.perard@vates.tech, jbeulich@suse.com, julien@xen.org, michal.orzel@amd.com, roger.pau@citrix.com, sstabellini@kernel.org, dmukhin@ford.com Subject: [PATCH v1 2/3] x86/domain: add helpers to simplify emulation flags management Message-ID: <20250401005224.461325-3-dmukhin@ford.com> In-Reply-To: <20250401005224.461325-1-dmukhin@ford.com> References: <20250401005224.461325-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: 2433a0764aebe7bc34d954ffd0da932cc05b0f2c MIME-Version: 1.0 From: Denis Mukhin Introduce XEN_X86_EMU_BASELINE and XEN_X86_EMU_OPTIONAL to simplify d->arch.emulation_flags management in the code. Signed-off-by: Denis Mukhin --- tools/python/xen/lowlevel/xc/xc.c | 4 +--- xen/include/public/arch-x86/xen.h | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 9feb12ae2b..2c01d47575 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -159,9 +159,7 @@ static PyObject *pyxc_domain_create(XcObject *self, #if defined (__i386) || defined(__x86_64__) if ( config.flags & XEN_DOMCTL_CDF_hvm ) - config.arch.emulation_flags = XEN_X86_EMU_ALL & - ~(XEN_X86_EMU_VPCI | - XEN_X86_EMU_USE_PIRQ); + config.arch.emulation_flags = XEN_X86_EMU_BASELINE; #elif defined (__arm__) || defined(__aarch64__) config.arch.gic_version = XEN_DOMCTL_CONFIG_GIC_NATIVE; #else diff --git a/xen/include/public/arch-x86/xen.h b/xen/include/public/arch-x86/xen.h index fc24879866..55802720f8 100644 --- a/xen/include/public/arch-x86/xen.h +++ b/xen/include/public/arch-x86/xen.h @@ -290,6 +290,13 @@ struct xen_arch_domainconfig { XEN_X86_EMU_VGA | XEN_X86_EMU_IOMMU | \ XEN_X86_EMU_PIT | XEN_X86_EMU_USE_PIRQ |\ XEN_X86_EMU_VPCI) + +#define XEN_X86_EMU_OPTIONAL (XEN_X86_EMU_VPCI | \ + XEN_X86_EMU_USE_PIRQ) + +#define XEN_X86_EMU_BASELINE (XEN_X86_EMU_ALL & ~XEN_X86_EMU_OPTIONAL) + + /* Hardware emulation flags. */ uint32_t emulation_flags; /* From patchwork Tue Apr 1 00:52:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denis Mukhin X-Patchwork-Id: 14034248 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ABDA0C36010 for ; Tue, 1 Apr 2025 00:53:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.933299.1335306 (Exim 4.92) (envelope-from ) id 1tzPs5-0001ma-5x; Tue, 01 Apr 2025 00:52:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 933299.1335306; Tue, 01 Apr 2025 00:52:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tzPs5-0001mO-2V; Tue, 01 Apr 2025 00:52:53 +0000 Received: by outflank-mailman (input) for mailman id 933299; Tue, 01 Apr 2025 00:52:52 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tzPs4-0001Vj-0o for xen-devel@lists.xenproject.org; Tue, 01 Apr 2025 00:52:52 +0000 Received: from mail-10630.protonmail.ch (mail-10630.protonmail.ch [79.135.106.30]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a379d6bf-0e93-11f0-9ea7-5ba50f476ded; Tue, 01 Apr 2025 02:52:51 +0200 (CEST) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: a379d6bf-0e93-11f0-9ea7-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1743468770; x=1743727970; bh=B+nW3wpkgRHCfK9/oUXAoU8jQvHaLOWMAP0n+f15LaY=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector:List-Unsubscribe:List-Unsubscribe-Post; b=TA1rQmaHsgnCSk9bWlamhagyRoq/7zM0ah9oNGDruOiCQzpvt0xAq+lav9GnU23hq WpGxu3+TIyNOZ7G56HdBRZLKrU2YSeBc8qysNMuBlE5m7EBhbzt8/ktEnp0uxCufkI LA8R0lMwb3sy1n08vYdEu7IkGZrqDoNYr3zovDgJsQZ3KeoijX5zwPa58HiKgkwUxV vbwghoQAwJvb5+pqdHx3inwHP34igIIyM2+ciogKI7oe0zlol/7yg3c67jBeS9h265 c4wKHez1wuEh/yP4APKKiuvn2GT8f/LjvNaBP08nPD4olDnQWce41EWiOXl6OC9cSE /db/kQoU7MBng== Date: Tue, 01 Apr 2025 00:52:46 +0000 To: xen-devel@lists.xenproject.org From: dmkhn@proton.me Cc: andrew.cooper3@citrix.com, anthony.perard@vates.tech, jbeulich@suse.com, julien@xen.org, michal.orzel@amd.com, roger.pau@citrix.com, sstabellini@kernel.org, dmukhin@ford.com Subject: [PATCH v1 3/3] xen/domain: rewrite emulation_flags_ok() Message-ID: <20250401005224.461325-4-dmukhin@ford.com> In-Reply-To: <20250401005224.461325-1-dmukhin@ford.com> References: <20250401005224.461325-1-dmukhin@ford.com> Feedback-ID: 123220910:user:proton X-Pm-Message-ID: bee36f03c1d6eac652f496a7ccdb1508ba725863 MIME-Version: 1.0 From: Denis Mukhin Rewrite emulation_flags_ok() using XEN_X86_EMU_{OPTIONAL,BASELINE} to simplify future modifications. Signed-off-by: Denis Mukhin --- Came in the context of NS16550 emulator v3 series: https://lore.kernel.org/xen-devel/20250103-vuart-ns8250-v3-v1-0-c5d36b31d66c@ford.com/ After modifying emulation_flags_ok() with a new NS16550 vUART configuration switch passed from the toolstack for the HVM case, I decided to look into how to improve emulation_flags_ok(). --- xen/arch/x86/domain.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 15c5e2a652..23051bb176 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -750,25 +750,18 @@ static bool emulation_flags_ok(const struct domain *d, uint32_t emflags) BUILD_BUG_ON(X86_EMU_ALL != XEN_X86_EMU_ALL); #endif - if ( is_hvm_domain(d) ) - { - if ( is_hardware_domain(d) && - emflags != (X86_EMU_VPCI | X86_EMU_LAPIC | X86_EMU_IOAPIC) ) - return false; - if ( !is_hardware_domain(d) && - /* HVM PIRQ feature is user-selectable. */ - (emflags & ~X86_EMU_USE_PIRQ) != - (X86_EMU_ALL & ~(X86_EMU_VPCI | X86_EMU_USE_PIRQ)) && - emflags != X86_EMU_LAPIC ) - return false; - } - else if ( emflags != 0 && emflags != X86_EMU_PIT ) - { - /* PV or classic PVH. */ - return false; - } + /* PV or classic PVH */ + if ( !is_hvm_domain(d) ) + return emflags == 0 || emflags == XEN_X86_EMU_PIT; - return true; + /* HVM */ + if ( is_hardware_domain(d) ) + return emflags == (XEN_X86_EMU_LAPIC | + XEN_X86_EMU_IOAPIC | + XEN_X86_EMU_VPCI); + + return (emflags & ~XEN_X86_EMU_OPTIONAL) == XEN_X86_EMU_BASELINE || + emflags == XEN_X86_EMU_LAPIC; } void __init arch_init_idle_domain(struct domain *d)