From nobody Mon Nov 25 08:47:46 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=quarantine dis=quarantine) header.from=epam.com ARC-Seal: i=1; a=rsa-sha256; t=1722335234; cv=none; d=zohomail.com; s=zohoarc; b=G9ZZKAGunuL38yT85SH7j/ZpKyNR2sLglL8EZKDKMiGqsUm2xwjYEmv9MsTUE/yMLqPWxrKpTzc4vTTcdcwDYodzkDYrDDUN70wZIdXkPVfGkN8z1V80BlW8AGYchBfGzD7Uz4FHSyX0WhRf9g416kZoPEPROOF8cQ7SujTRmV8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1722335234; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qn2NEJ52umNwkcajzVOuuiuR5xohiqYRfIUFWhgiOQ4=; b=FJhdCT4nkRlic2n6PEtAWfFcZtpZBQ4pcxhBSNmSKVITNMYTYk+2z+vbHP85kbdTd4zAgQO0PUs3OFiCFCehPu0vZWcXcbrEe3Rcr+w+jntaXD7wntL87C+mAmUhliGcHC9E797VxtwMxgu3fdxPa0ApP+Eh7M3Qq2yELggmDz4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17223352343881015.6816696481973; Tue, 30 Jul 2024 03:27:14 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.767496.1178151 (Exim 4.92) (envelope-from ) id 1sYk4F-0004tq-Rr; Tue, 30 Jul 2024 10:26:55 +0000 Received: by outflank-mailman (output) from mailman id 767496.1178151; Tue, 30 Jul 2024 10:26:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sYk4F-0004tj-P1; Tue, 30 Jul 2024 10:26:55 +0000 Received: by outflank-mailman (input) for mailman id 767496; Tue, 30 Jul 2024 10:26:54 +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 1sYk4E-0004td-PL for xen-devel@lists.xenproject.org; Tue, 30 Jul 2024 10:26:54 +0000 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3c29963b-4e5e-11ef-bc01-fd08da9f4363; Tue, 30 Jul 2024 12:26:53 +0200 (CEST) Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id EF6652C073; Tue, 30 Jul 2024 06:26:50 -0400 (EDT) (envelope-from sakib@darkstar.site) Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id E6F752C072; Tue, 30 Jul 2024 06:26:50 -0400 (EDT) (envelope-from sakib@darkstar.site) Received: from localhost (unknown [185.130.54.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 86B932C071; Tue, 30 Jul 2024 06:26:49 -0400 (EDT) (envelope-from sakib@darkstar.site) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: 3c29963b-4e5e-11ef-bc01-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=+Yl11oadxrSru19AkHHp51vGZ ym9OE6VsrHHN87lIL4=; b=DOTjPg11+8cv+HaBfoTSiwQoJsAzKiIdihNEQRpK8 PkeDeT9T0S8RjzbsAhrxPHvfotUz8tRS/2Yc5U/WoaRvrJ3QjWrUl97jw+466Pv4 YJt0TG1Zrr3BJwBj8OrrdbcbeZwE1ElKAfHORxVJOjNcTq0xnbK49P7v/a/a0Zcc Wg= From: Sergiy Kibrik To: xen-devel@lists.xenproject.org Cc: Xenia Ragiadakou , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Xenia Ragiadakou , Sergiy Kibrik Subject: [XEN PATCH v5 06/13] x86/traps: guard vmx specific functions with usinc_vmx() check Date: Tue, 30 Jul 2024 13:26:47 +0300 Message-Id: <06e0df650a0b06ba3f56501696e455f7d4be41ce.1722333634.git.Sergiy_Kibrik@epam.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Pobox-Relay-ID: 3B0278A2-4E5E-11EF-AF65-BAC1940A682E-90055647!pb-smtp2.pobox.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @pobox.com) X-ZM-MESSAGEID: 1722335235930116600 Content-Type: text/plain; charset="utf-8" From: Xenia Ragiadakou Replace cpu_has_vmx check with using_vmx(), so that not only VMX support in= CPU is being checked at runtime, but also at build time we ensure the availabil= ity of functions vmx_vmcs_enter() & vmx_vmcs_exit(). Also since CONFIG_VMX is checked in using_vmx and it depends on CONFIG_HVM, we can drop #ifdef CONFIG_HVM lines around using_vmx. Signed-off-by: Xenia Ragiadakou Signed-off-by: Sergiy Kibrik Acked-by: Jan Beulich --- changes in v4: - adjusted call to using_vmx(), as it has become an inline function - added tag - description changed a bit for more clarity changes in v3: -using_vmx instead of IS_ENABLED(CONFIG_VMX) - updated description --- xen/arch/x86/traps.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index ee91fc56b1..d2af6d70d2 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -676,7 +676,6 @@ void vcpu_show_execution_state(struct vcpu *v) =20 vcpu_pause(v); /* acceptably dangerous */ =20 -#ifdef CONFIG_HVM /* * For VMX special care is needed: Reading some of the register state = will * require VMCS accesses. Engaging foreign VMCSes involves acquiring o= f a @@ -684,12 +683,11 @@ void vcpu_show_execution_state(struct vcpu *v) * region. Despite this being a layering violation, engage the VMCS ri= ght * here. This then also avoids doing so several times in close success= ion. */ - if ( cpu_has_vmx && is_hvm_vcpu(v) ) + if ( using_vmx() && is_hvm_vcpu(v) ) { ASSERT(!in_irq()); vmx_vmcs_enter(v); } -#endif =20 /* Prevent interleaving of output. */ flags =3D console_lock_recursive_irqsave(); @@ -714,10 +712,8 @@ void vcpu_show_execution_state(struct vcpu *v) console_unlock_recursive_irqrestore(flags); } =20 -#ifdef CONFIG_HVM - if ( cpu_has_vmx && is_hvm_vcpu(v) ) + if ( using_vmx() && is_hvm_vcpu(v) ) vmx_vmcs_exit(v); -#endif =20 vcpu_unpause(v); } --=20 2.25.1