From patchwork Wed Jan 24 02:41:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang, Weijiang" X-Patchwork-Id: 191301 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp740056dyi; Tue, 23 Jan 2024 18:50:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFgJ/oDjkqYLwImjuPOjGyYy4M02PsUGPSlYn91e8xF1NBBCZRDrFBtASNPmCAmdSF4yPG0 X-Received: by 2002:a05:6a21:150c:b0:19c:202e:51ad with SMTP id nq12-20020a056a21150c00b0019c202e51admr159377pzb.48.1706064641747; Tue, 23 Jan 2024 18:50:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706064641; cv=pass; d=google.com; s=arc-20160816; b=HTJoYLgSVJMrbMpy7L60fz1qgTNyttV/i4ZwuLjTHKpW+WDYAgFVCQLMDYACd2/xHx JlrlNpCevmyqjqEJip7/1pg5zA6by+gyghFj3/p3LVuX/kSZBQwFneaW/qY8t5Uoc+bk q3bWERlfJLIFhMV9JcRJhmkRyhwQNVVe47mdtNKYWS2089+Ih/WcnfFvyT8H8HshrfgE vjq7GnCqmiiAtfvWPjuG14ShaXtYXjaXLjL4v4CK5GXDC6hKL4LA3vi5wPUj11zwFv/e r2Zn1SqA7JLHTKvWFrVfatvwJY70HLZaBSYJ2Hn1Sk6VgLK7tMsETSf7/8VPfeqNQYw8 /2XA== 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=bFsaq7ZDpXPjZd856rU5LGTdBbJYbWNlE9z86mc9Jis=; fh=P3RdGGFvb5N2uSrXSkzTbks6QAbSjiL8sphx8dC5Dno=; b=BjssF54l4uIwtyen5KrU1SbG2D1dMpKfyxmI1HO/vwb3axRiqfyrwGBG0fvY5dZf1s kvdUk1IwS1Mys2v9l/pIS3x3Aa2mJiicY6Gfs5qxWx5pqndIDmM7YC27vI9gjF8K3EP8 2X1pP+zHfGkH/kU113CnYkwluw4r8LkpxEnwERdnW9uCyZk+ck6lCDhoV6aZG7Gv1IFl vz+aLuiZw8XDMoy7ZP8egqA+JHuMC+pwzqd6AfCUAdNcQjPDbeacSdjAL2w+WHOAexJc 5MltdROn/2/mIl8JAmnvGfS1GIaQ462vvhLkY/kDoUk+a0Z8Cw5+5X2ICNnnlRD5Y3jX PCyw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CbDVM2+4; 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-36339-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36339-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id x14-20020a17090aca0e00b002903e315e4bsi9509506pjt.81.2024.01.23.18.50.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 18:50:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-36339-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CbDVM2+4; 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-36339-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-36339-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 071CB285CDB for ; Wed, 24 Jan 2024 02:50:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1C5AD2B9C9; Wed, 24 Jan 2024 02:42:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="CbDVM2+4" 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 CBA5318036; Wed, 24 Jan 2024 02:42:44 +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=ntSkGpstBW37Q54dTSdxr4q56BHBBuy+f9/1bcOWCV1twVqLZYfLVdAV0FpPOUqTUcdboEPDdTH+RZzwFZtP9vOQyjYRtICjJHHspCKmvxFGGBy7dH0Y2DHPo18JkwfPlYYFCquVtBoZZiyDvuHKvzwIFaLIijd5wY4zYTSFRHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706064166; c=relaxed/simple; bh=Ky/BGy7YdiRQEiX3OiH3FB749KKoV/jpv2wQq4kCc/0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=bSjaSz6u5s/noF9Nx/MsfL6pZFk7uOdBRc0M0Ztt2IS/J5wj4K+k9PgTUH66HV9RU6743PggBC/9Dp0UvRbrnkILrGsLpyXVeWdAAZuQIR+ziXexqaGQcdEJOTH++OTGwj2lVLXfDORNwBhRU36UL1g7C4X3LW0hfziNWI+rdR8= 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=CbDVM2+4; 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=1706064164; x=1737600164; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ky/BGy7YdiRQEiX3OiH3FB749KKoV/jpv2wQq4kCc/0=; b=CbDVM2+4HxyEX3niapZFJsSmH+tjZvljW8aLC/mh7+C9sP5iWdLyRoJL k+eLsDeSOtFlODZY6zk5LmHu7uYqQRqVqB97xKC7cvSWVfpoxA1f7A0yH d2AK97KCXlx/SykIyzpYxbA6LjrJNEwReN5J4kVBvwptsTbjANHqsgO0a 58MyltWSPHOjWsF2Mw09FHEc+d6duvemgVZ4i6uitir2hRrKWQibCHLCi e0gLiAtcXW/Xc4DCPAh0uiDYr5pIRyNZ8+8sg2W5Ra4upmaqxgju74mZf Yt0HIfRYWHteqqVy/dCOp7NVjzDApY8N09Ds0VJkFr/M076ACgW4r1uf2 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10962"; a="400586537" X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="400586537" 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:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,215,1701158400"; d="scan'208";a="1825894" 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 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, Zhang Yi Z Subject: [PATCH v9 18/27] KVM: VMX: Introduce CET VMCS fields and control bits Date: Tue, 23 Jan 2024 18:41:51 -0800 Message-Id: <20240124024200.102792-19-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: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788938437931657142 X-GMAIL-MSGID: 1788938437931657142 Control-flow Enforcement Technology (CET) is a kind of CPU feature used to prevent Return/CALL/Jump-Oriented Programming (ROP/COP/JOP) attacks. It provides two sub-features(SHSTK,IBT) to defend against ROP/COP/JOP style control-flow subversion attacks. Shadow Stack (SHSTK): A shadow stack is a second stack used exclusively for control transfer operations. The shadow stack is separate from the data/normal stack and can be enabled individually in user and kernel mode. When shadow stack is enabled, CALL pushes the return address on both the data and shadow stack. RET pops the return address from both stacks and compares them. If the return addresses from the two stacks do not match, the processor generates a #CP. Indirect Branch Tracking (IBT): IBT introduces instruction(ENDBRANCH)to mark valid target addresses of indirect branches (CALL, JMP etc...). If an indirect branch is executed and the next instruction is _not_ an ENDBRANCH, the processor generates a #CP. These instruction behaves as a NOP on platforms that have no CET. Several new CET MSRs are defined to support CET: MSR_IA32_{U,S}_CET: CET settings for {user,supervisor} CET respectively. MSR_IA32_PL{0,1,2,3}_SSP: SHSTK pointer linear address for CPL{0,1,2,3}. MSR_IA32_INT_SSP_TAB: Linear address of SHSTK pointer table, whose entry is indexed by IST of interrupt gate desc. Two XSAVES state bits are introduced for CET: IA32_XSS:[bit 11]: Control saving/restoring user mode CET states IA32_XSS:[bit 12]: Control saving/restoring supervisor mode CET states. Six VMCS fields are introduced for CET: {HOST,GUEST}_S_CET: Stores CET settings for kernel mode. {HOST,GUEST}_SSP: Stores current active SSP. {HOST,GUEST}_INTR_SSP_TABLE: Stores current active MSR_IA32_INT_SSP_TAB. On Intel platforms, two additional bits are defined in VM_EXIT and VM_ENTRY control fields: If VM_EXIT_LOAD_CET_STATE = 1, host CET states are loaded from following VMCS fields at VM-Exit: HOST_S_CET HOST_SSP HOST_INTR_SSP_TABLE If VM_ENTRY_LOAD_CET_STATE = 1, guest CET states are loaded from following VMCS fields at VM-Entry: GUEST_S_CET GUEST_SSP GUEST_INTR_SSP_TABLE Co-developed-by: Zhang Yi Z Signed-off-by: Zhang Yi Z Signed-off-by: Yang Weijiang Reviewed-by: Chao Gao Reviewed-by: Maxim Levitsky --- arch/x86/include/asm/vmx.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index 0e73616b82f3..451fd4f4fedc 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -104,6 +104,7 @@ #define VM_EXIT_CLEAR_BNDCFGS 0x00800000 #define VM_EXIT_PT_CONCEAL_PIP 0x01000000 #define VM_EXIT_CLEAR_IA32_RTIT_CTL 0x02000000 +#define VM_EXIT_LOAD_CET_STATE 0x10000000 #define VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR 0x00036dff @@ -117,6 +118,7 @@ #define VM_ENTRY_LOAD_BNDCFGS 0x00010000 #define VM_ENTRY_PT_CONCEAL_PIP 0x00020000 #define VM_ENTRY_LOAD_IA32_RTIT_CTL 0x00040000 +#define VM_ENTRY_LOAD_CET_STATE 0x00100000 #define VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR 0x000011ff @@ -345,6 +347,9 @@ enum vmcs_field { GUEST_PENDING_DBG_EXCEPTIONS = 0x00006822, GUEST_SYSENTER_ESP = 0x00006824, GUEST_SYSENTER_EIP = 0x00006826, + GUEST_S_CET = 0x00006828, + GUEST_SSP = 0x0000682a, + GUEST_INTR_SSP_TABLE = 0x0000682c, HOST_CR0 = 0x00006c00, HOST_CR3 = 0x00006c02, HOST_CR4 = 0x00006c04, @@ -357,6 +362,9 @@ enum vmcs_field { HOST_IA32_SYSENTER_EIP = 0x00006c12, HOST_RSP = 0x00006c14, HOST_RIP = 0x00006c16, + HOST_S_CET = 0x00006c18, + HOST_SSP = 0x00006c1a, + HOST_INTR_SSP_TABLE = 0x00006c1c }; /*