From nobody Fri May 3 18:10:18 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1556274260; cv=none; d=zoho.com; s=zohoarc; b=epWs/jfvXZ3JzElL3VE3FvSWqq7wJqULNKVTM1Q9pwrhM5gdrnHyZvNRf3/exAwL7dKqs5NXy+TZjy0a3lykbYgD99CgsBBQNRdAudFXjUCg4eV2POy3DusKYPphFzTJPpc6/3Az8GX7YrPmOHCIOSrMtkeo60IwfZUzxsTYGa4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556274260; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=D1PaQxV0Bt10h04aOCFNocqfSFOK7yKrPcr12qTzFIE=; b=afwVO35/sfwAJNnouyCraIij4NP+KU9VQM8Yu2dDEgy3W/yVzGihOdtMisvq8EILxroFExhuRh/DcvT/XuYouEmLJt1JkxwSsxL8VTxDNQ7ZmEoZOEB9/mN92NGXzubBf2gt/29SHgmQfNfZQmZ/vWfm3nDPk+e5Az3AZN+CiaQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1556274260223289.9099372971573; Fri, 26 Apr 2019 03:24:20 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hJy0L-0001CH-OD; Fri, 26 Apr 2019 10:22:53 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hJy0J-0001CC-W4 for xen-devel@lists.xenproject.org; Fri, 26 Apr 2019 10:22:52 +0000 Received: from SMTP03.CITRIX.COM (unknown [162.221.156.55]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3cf6191c-680d-11e9-8e78-6f51b3b727ef; Fri, 26 Apr 2019 10:22:48 +0000 (UTC) X-Inumbo-ID: 3cf6191c-680d-11e9-8e78-6f51b3b727ef X-IronPort-AV: E=Sophos;i="5.60,397,1549929600"; d="scan'208";a="84487959" From: Andrew Cooper To: Xen-devel Date: Fri, 26 Apr 2019 11:22:45 +0100 Message-ID: <1556274165-31022-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Subject: [Xen-devel] [PATCH] x86/cpu: Use cpu_has_sep for configuring the SYSENTER MSRs X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Andrew Cooper , FionaLi-oc , Wei Liu , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Currently, configuration of the SYSENTER MSRs are behind a vendor check for Intel and Centaur, but this misses Zhaoxin. Use the feature bit, rather than a vendor check. cpu_has_sep is cleared ea= rly for AMD processors, which can't use SYSENTER/SYSEXIT when operating in long mode. Suggested-by: Jan Beulich Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monn=C3=A9 CC: FionaLi-oc Please double check that this works for Zhaoxin. I've tried Intel and AMD. --- xen/arch/x86/acpi/suspend.c | 6 ++++-- xen/arch/x86/x86_64/traps.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c index 9e69bf2..ba9d2e1 100644 --- a/xen/arch/x86/acpi/suspend.c +++ b/xen/arch/x86/acpi/suspend.c @@ -27,11 +27,13 @@ void save_rest_processor_state(void) rdmsrl(MSR_SHADOW_GS_BASE, saved_kernel_gs_base); rdmsrl(MSR_CSTAR, saved_cstar); rdmsrl(MSR_LSTAR, saved_lstar); - if ( boot_cpu_data.x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR= ) ) + + if ( cpu_has_sep ) { rdmsrl(MSR_IA32_SYSENTER_ESP, saved_sysenter_esp); rdmsrl(MSR_IA32_SYSENTER_EIP, saved_sysenter_eip); } + if ( cpu_has_xsave ) saved_xcr0 =3D get_xcr0(); } @@ -51,7 +53,7 @@ void restore_rest_processor_state(void) wrgsbase(saved_gs_base); wrmsrl(MSR_SHADOW_GS_BASE, saved_kernel_gs_base); =20 - if ( boot_cpu_data.x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR= ) ) + if ( cpu_has_sep ) { /* Recover sysenter MSRs */ wrmsrl(MSR_IA32_SYSENTER_ESP, saved_sysenter_esp); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 44af765..cb4bf0a 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -334,7 +334,7 @@ void subarch_percpu_traps_init(void) (unsigned long)lstar_enter); stub_va +=3D offset; =20 - if ( boot_cpu_data.x86_vendor & (X86_VENDOR_INTEL | X86_VENDOR_CENTAUR= ) ) + if ( cpu_has_sep ) { /* SYSENTER entry. */ wrmsrl(MSR_IA32_SYSENTER_ESP, stack_bottom); --=20 2.1.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel