[v9,19/27] KVM: x86: Use KVM-governed feature framework to track "SHSTK/IBT enabled"
Message ID | 20240124024200.102792-20-weijiang.yang@intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-36340-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp741622dyi; Tue, 23 Jan 2024 18:56:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEhjntGJBt+OP8ru2UVSvFV3yC6iM3Vd7pB2sXIMxR8OLvoiGwThmZ0rWEKpXJHFUgdU2wC X-Received: by 2002:a17:907:1684:b0:a31:1cf8:404f with SMTP id cx4-20020a170907168400b00a311cf8404fmr141633ejd.94.1706064974406; Tue, 23 Jan 2024 18:56:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706064974; cv=pass; d=google.com; s=arc-20160816; b=dSglRvb2aGGrEJ3OqpGFsF8mAU3DcSvYJS5ydC+7N2WGKJL+FwTduWMZeJPG5LNMLH HXPv1L3KaIZX/Fd8sKTQMqcbel0A3JH9QPFHVtnHGvxujtZWZW9597pZsEhgl3usZV2c 0+vAtQgJnG96ZJoEWE8AmNotv/AJ2ivS8nfmibKMHmJLuCmZ/jOmCCO7jgSOlGyPoXcZ lNRUnNPYf2B0w2jlZNkU/ahzuvf/CY5XIpKDUBbLN5UDVNzf4VfIJllP58bfoPXoEHKo vi07y5FPjV02tLY49fbBPkMi/5VQkep83SMZdshV0rbnFUR5LQnNOkwjhEl10h/QTBYr yiDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=AJ+4U2msN7QZ9ZpIY+THcHcxA5uA7/W3GKth94CrRwQ=; fh=D+u40KSnYgjUYLGDRdXdD62xsMHg3nFDmpf3sEnyojA=; b=elo1D0xqLm4a5izhtcQhYCRBC4PWjtSi2pjgrZbPAyEmgeeGX/HxCkz5yn+xa8hdSA 8tKsCmY/pHk1PhBLTGzJlGx7NtfbjwGkyFrqNCaxENpWPPNOexGpKvOMoYxRC3e9u64K +YVi7jqYCjR+bzKReALHVJ8gEVwXhH2lpdRIdj2UcuAXd0SKmxUw02akH1qVUHU6+BAk 3TiZc1I2KhWd9olF8Je0XM6MhoqV4Os7SAU+pGYqdqMSIH42zcJKYUHQ+YxTALyMwdI4 kdeuorGikL1yhZ8/o1TmdDy1j9wZisEbZeBUtfPt+YUmWR6kZbYnSFNoUNqrTN7/bn2J t+5Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=J0+cL8v9; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-36340-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36340-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id b15-20020a170906150f00b00a28a82062f5si12548664ejd.513.2024.01.23.18.56.14 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:56:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36340-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=J0+cL8v9; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-36340-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36340-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 8A1C91F27CBB for <ouuuleilei@gmail.com>; Wed, 24 Jan 2024 02:50:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF8D42837B; Wed, 24 Jan 2024 02:42:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="J0+cL8v9" Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44997182A7; Wed, 24 Jan 2024 02:42:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.55.52.120 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064166; cv=none; b=rlxPlHzrD4ZwAYcmtjFpqWwCnuCZUYo3wHPObpIprIvd4jvNcnwlqnCZ2h3DXth+h3Yb6efae4loGl7/xS17QRG/f5ASFFS/NAd78NXsum1sHmk4bawhd8dBgWYWzddfUD9vWC3JhgDc/+dflY+wQgh8k7D4hO0KFawC9Va9voA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064166; c=relaxed/simple; bh=F9opDfCZwYUSpXz1rhkoPf6Q6E9dmRJye3dTlxS+ZDs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=IebQ9JGEWuStW2tHehNJ9SMqf4ljIO7KKxtAfzgnx0oZVkTT94kG4Edv95usw2iqHPKkAgz6el9JxsjGDA8Tzm+TkDhph0jBU4v5hjY1/VXogFrkN+4KNPQT4XWtEZQUcbO0gpdq0atd/Nku4Rl0J1TwEhTSsKPnPi+QMFABNR4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=J0+cL8v9; arc=none smtp.client-ip=192.55.52.120 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706064165; x=1737600165; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=F9opDfCZwYUSpXz1rhkoPf6Q6E9dmRJye3dTlxS+ZDs=; b=J0+cL8v9JTr26Zgfc2bvZRgmcsD2zWIn5Q4bnRewOwbziZv56MFZNfIX Pi5swcMhU7NHMlKOdHWoA70aQo3bXNFQbdoML5S0Vgz71T8CjPdzvMYDq Pe3Qp8EKEjK5EVzabcQlkwKkuOakqC4tOuW4/wfYxeQrpKHMzl/k7eQqu U6nqRVDN4+UIVQaMUo/N2+dA7todLcLRWYLtA+d6WtWKwpOhVEGhpBt6d /R1XA1JHPS0QjTwOfHQixpG5SiK/fM9FcCaCX0AZ7hUvZrdJfraLJX7hf EdomgjASZyc6/6Qww4y+cLZpjVsK2RK4pmswKq+XMc6cZSU7ws6szQclt g==; X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="400586543" X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="400586543" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2024 18:42:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="1825899" Received: from 984fee00a5ca.jf.intel.com ([10.165.9.183]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2024 18:42:40 -0800 From: Yang Weijiang <weijiang.yang@intel.com> To: seanjc@google.com, pbonzini@redhat.com, dave.hansen@intel.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, yuan.yao@linux.intel.com Cc: peterz@infradead.org, chao.gao@intel.com, rick.p.edgecombe@intel.com, mlevitsk@redhat.com, john.allen@amd.com, weijiang.yang@intel.com Subject: [PATCH v9 19/27] KVM: x86: Use KVM-governed feature framework to track "SHSTK/IBT enabled" Date: Tue, 23 Jan 2024 18:41:52 -0800 Message-Id: <20240124024200.102792-20-weijiang.yang@intel.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240124024200.102792-1-weijiang.yang@intel.com> References: <20240124024200.102792-1-weijiang.yang@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788938786806378794 X-GMAIL-MSGID: 1788938786806378794 |
Series |
Enable CET Virtualization
|
|
Commit Message
Yang, Weijiang
Jan. 24, 2024, 2:41 a.m. UTC
Use the governed feature framework to track whether X86_FEATURE_SHSTK and X86_FEATURE_IBT features can be used by userspace and guest, i.e., the features can be used iff both KVM and guest CPUID can support them. TODO: remove this patch once Sean's refactor to "KVM-governed" framework is upstreamed. See the work here [*]. [*]: https://lore.kernel.org/all/20231110235528.1561679-1-seanjc@google.com/ Signed-off-by: Yang Weijiang <weijiang.yang@intel.com> Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com> --- arch/x86/kvm/governed_features.h | 2 ++ arch/x86/kvm/vmx/vmx.c | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/arch/x86/kvm/governed_features.h b/arch/x86/kvm/governed_features.h index ad463b1ed4e4..daf0c0a3e29c 100644 --- a/arch/x86/kvm/governed_features.h +++ b/arch/x86/kvm/governed_features.h @@ -17,6 +17,8 @@ KVM_GOVERNED_X86_FEATURE(PFTHRESHOLD) KVM_GOVERNED_X86_FEATURE(VGIF) KVM_GOVERNED_X86_FEATURE(VNMI) KVM_GOVERNED_X86_FEATURE(LAM) +KVM_GOVERNED_X86_FEATURE(SHSTK) +KVM_GOVERNED_X86_FEATURE(IBT) #undef KVM_GOVERNED_X86_FEATURE #undef KVM_GOVERNED_FEATURE diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index b2f6bcf3bf9b..29a0fd3e83c5 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7764,6 +7764,8 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_VMX); kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_LAM); + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_SHSTK); + kvm_governed_feature_check_and_set(vcpu, X86_FEATURE_IBT); vmx_setup_uret_msrs(vmx);