Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp405058ybt; Wed, 1 Jul 2020 01:07:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNyOimL8F5d474Rv2nEQF+c5CFdRKZdNCr1Vu+MMDUkK5RRzWloLZDkoyyhex49Xi/00Zq X-Received: by 2002:a17:906:1394:: with SMTP id f20mr22341689ejc.114.1593590859593; Wed, 01 Jul 2020 01:07:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593590859; cv=none; d=google.com; s=arc-20160816; b=gjL7HU6muZ0WEppjGpUHTSgwNHmZqcGXJ0IEdTm47JrH+Z/JHXXxRI4POb84E0PywP SIElYMGVpnHsqIn7r3QVARahuuJTVWxzGg57tXXKXswvXd4Qoj09R3bRJRMLp2f97LP2 ivTrjwWrMyDdKA3wNPeI+xva1lwGiFi67JwTe99j9R0o1Ojmfq3gHTV6BR269TjVfxvR 4O81zonukwDs4Ri/4KI9FEL4cahu+6x+L5VppEyMaRs7u8sDxiJkvVtZDuVs28e4++8B suvr+jysX8kxKQgtH+ibPsfs24IZFb8N4fC4FtG043KeeX9pQ3ssSnFLS+vycJlul9dt Qzbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:ironport-sdr:ironport-sdr; bh=P8j/0EaqAgBweCPvzN/Q02m2I52fTF6nwCjGCtYVrd8=; b=fN9p+dKLlKxVGIBUh4EoagttTCORY7XAH4ZkF7S4zKAt4vqmJFts58YUXDuf6Af4ar A0jeTnZAMBUklHq+WwuVev7BC0D1Pe6zlQmQJsA+Si7ylJ+OfyFK2QIBWnqaLMtmGqjm OACVKnwYQh+EKgMixkvRH5neG8HU5AvaDXu7M4sfgmEmaoae3DGc8B4ovOXKzYu2pyx2 8EAXkd6vH90IRyhy4edboAyZK1kBTQ7+IgaX1TJyHJMcTVgPdFnjwmjnH8P7zZ/Kvcmc g92LY6iUgGGi5iLCQYCn1Bd6Rf0JtblHy0oHxqhkf8J4nDFThQzD+uf86vyFOUeKLEmm bXew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m15si3329513eje.623.2020.07.01.01.07.16; Wed, 01 Jul 2020 01:07:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728554AbgGAIE0 (ORCPT + 99 others); Wed, 1 Jul 2020 04:04:26 -0400 Received: from mga14.intel.com ([192.55.52.115]:2413 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728420AbgGAIEY (ORCPT ); Wed, 1 Jul 2020 04:04:24 -0400 IronPort-SDR: EQuRO9IEuwjQqllaAo0u+uUjjoZfwcgp52vqoPoVMX8oqhbrYe79sNt8mksF++NHyJgVo8EYI5 WmnqunQQTcGw== X-IronPort-AV: E=McAfee;i="6000,8403,9668"; a="145581826" X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="145581826" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jul 2020 01:04:14 -0700 IronPort-SDR: mzze7toC3jy/njNgD0C5r2G7i7KN51Ncg/FUIQJ/VGZLtwgf3uyD8GtUFiz6aPiEgjP8/S09q3 KHo7FeAbZ1zA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,299,1589266800"; d="scan'208";a="455010225" Received: from unknown (HELO local-michael-cet-test.sh.intel.com) ([10.239.159.128]) by orsmga005.jf.intel.com with ESMTP; 01 Jul 2020 01:04:12 -0700 From: Yang Weijiang To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, pbonzini@redhat.com, sean.j.christopherson@intel.com, jmattson@google.com Cc: yu.c.zhang@linux.intel.com, Yang Weijiang Subject: [PATCH v13 01/11] KVM: x86: Include CET definitions for KVM test purpose Date: Wed, 1 Jul 2020 16:04:01 +0800 Message-Id: <20200701080411.5802-2-weijiang.yang@intel.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200701080411.5802-1-weijiang.yang@intel.com> References: <20200701080411.5802-1-weijiang.yang@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These definitions are added by CET kernel patch and referenced by KVM, if the CET KVM patches are tested without CET kernel patches, this patch should be included. Signed-off-by: Yang Weijiang --- include/linux/kvm_host.h | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 01276e3d01b9..20e0fe70d3f7 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -35,6 +35,38 @@ #include +#ifndef CONFIG_X86_INTEL_CET +#define XFEATURE_CET_USER 11 +#define XFEATURE_CET_KERNEL 12 + +#define XFEATURE_MASK_CET_USER (1 << XFEATURE_CET_USER) +#define XFEATURE_MASK_CET_KERNEL (1 << XFEATURE_CET_KERNEL) + +/* Control-flow Enforcement Technology MSRs */ +#define MSR_IA32_U_CET 0x6a0 /* user mode cet setting */ +#define MSR_IA32_S_CET 0x6a2 /* kernel mode cet setting */ +#define MSR_IA32_PL0_SSP 0x6a4 /* kernel shstk pointer */ +#define MSR_IA32_PL1_SSP 0x6a5 /* ring-1 shstk pointer */ +#define MSR_IA32_PL2_SSP 0x6a6 /* ring-2 shstk pointer */ +#define MSR_IA32_PL3_SSP 0x6a7 /* user shstk pointer */ +#define MSR_IA32_INT_SSP_TAB 0x6a8 /* exception shstk table */ + +#define X86_CR4_CET_BIT 23 /* enable Control-flow Enforcement */ +#define X86_CR4_CET _BITUL(X86_CR4_CET_BIT) + +#define X86_FEATURE_SHSTK (16*32+ 7) /* Shadow Stack */ +#define X86_FEATURE_IBT (18*32+20) /* Indirect Branch Tracking */ + +/* MSR_IA32_U_CET and MSR_IA32_S_CET bits */ +#define MSR_IA32_CET_SHSTK_EN 0x0000000000000001ULL +#define MSR_IA32_CET_WRSS_EN 0x0000000000000002ULL +#define MSR_IA32_CET_ENDBR_EN 0x0000000000000004ULL +#define MSR_IA32_CET_LEG_IW_EN 0x0000000000000008ULL +#define MSR_IA32_CET_NO_TRACK_EN 0x0000000000000010ULL +#define MSR_IA32_CET_WAIT_ENDBR 0x00000000000000800UL +#define MSR_IA32_CET_BITMAP_MASK 0xfffffffffffff000ULL +#endif + #ifndef KVM_MAX_VCPU_ID #define KVM_MAX_VCPU_ID KVM_MAX_VCPUS #endif -- 2.17.2