From patchwork Fri Apr 21 13:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang, Weijiang" X-Patchwork-Id: 86417 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1206712vqo; Fri, 21 Apr 2023 09:52:31 -0700 (PDT) X-Google-Smtp-Source: AKy350bGCCPyg28eAyAVXv5x/6/NFb6Rd4IILohJV8qphlhDmqFZBt9+Fs4YSkAWXbzdbCW66AQu X-Received: by 2002:a17:90b:384c:b0:249:78bb:2bd8 with SMTP id nl12-20020a17090b384c00b0024978bb2bd8mr5950917pjb.41.1682095951546; Fri, 21 Apr 2023 09:52:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682095951; cv=none; d=google.com; s=arc-20160816; b=x7efji7JTA4noHef3chvQB9dyWt0079yWa5lDUF0L55yEo+1QHpaQ9wVDeW1gB/1Ja wZ6Ud1pdCcwBQS+NlIJrG9t/1DDM7aleuQ2cw8ZQhJ15pKpeo3Cm3Ph4z0HGZFNwZ84J LGa0v/LIRvpXGXecZLnUhEjm3fj3ZigGW015Hpb8/K2lwL3xuLOHpFS7P1zmoZQ/GXHZ UKM1O1Lb6QpA39WPnJhs8G14W4k3bFd/xuLA453oPytcYWwHG07Afjn6cwTgeDznRfNG eI/egn/JaP4uPXZYlPL1/b8azJG0sGe9jvVmDnpCtjRN50nbvuuo3jTu3OPL4+dteZNN nh5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OvWYKWAWXIIi8Ig/UblYAUPE3j+57ug2kT/IVhBIKqY=; b=R5HZRW/cpJlZdM3gtG3iofdZv35GdhUYjkbXIfUt/jv6kHarF5aRVyrgqDxhEwMiUw MFs1T2t5Jrvv25Pdv3/DHdb7ciI9KTAzv5dYW92AQEXJahBqbwHOyXDSCD/MTQ9Ywanl y9G/FzhrlQ9WglmSvBraFGMjLXv83/6TJ6Vb21eB+fNUuXfAVzmP7fpEL6MTF5Flbvb/ aZJ4KUNYSRGG/R+Ci1CtS6a27LnESZp9Qzhw4a/WbOxyrwEzjp03Sk3OKMsK7C32Ndnn igwwI4e6m1G9H6YOyhJvDgDOMgVz2NuoW+q2Rg3ptUJAO92hKRydB7RqXOQAtgLEm2We cjxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=f3mXKENJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gc3-20020a17090b310300b00240d3dc9346si4876729pjb.41.2023.04.21.09.52.17; Fri, 21 Apr 2023 09:52:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=f3mXKENJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232656AbjDUQvR (ORCPT + 99 others); Fri, 21 Apr 2023 12:51:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233251AbjDUQuu (ORCPT ); Fri, 21 Apr 2023 12:50:50 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C983D15461; Fri, 21 Apr 2023 09:50:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682095849; x=1713631849; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wTU7bnTSs0TJD+7S+WWyKuDSi/l7jpz3DffujQ6Mtuw=; b=f3mXKENJHm1cFeJDC63c4FpGBhxI1fGY4yatIoPb0YvuwbZH6GqpyOoF TiCQDT3v4RxvGW2TabNQ0tND6e5Qm51OWxAEFkxl48twN7CPhkej8Zb0T TWkX1W2GFOdy0x1agF/jbGEo/f3CEfz5a9uCGWoJLERRoT6+xOqNaeSbm P8AAjFzZi/LZgwoIQzyMSX7RDpM0e/iODOEdBVfyKIgSjv2hdyt5GjrCv gnT2nXrBrXKBIGMtGGu087vVE87g/IFA18TlRKHdA5Nsa+R0MJMYSX/vN lWzVGLM66SX/cfasvgwVQLZH7/pyHJzU1oHjwW3EcFgSWbV4XiVLWVjNS A==; X-IronPort-AV: E=McAfee;i="6600,9927,10687"; a="344787014" X-IronPort-AV: E=Sophos;i="5.99,214,1677571200"; d="scan'208";a="344787014" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2023 09:50:46 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10687"; a="722817393" X-IronPort-AV: E=Sophos;i="5.99,214,1677571200"; d="scan'208";a="722817393" Received: from embargo.jf.intel.com ([10.165.9.183]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Apr 2023 09:50:43 -0700 From: Yang Weijiang To: seanjc@google.com, pbonzini@redhat.com, peterz@infradead.org, john.allen@amd.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: rick.p.edgecombe@intel.com, weijiang.yang@intel.com Subject: [PATCH v2 10/21] KVM:x86: Add #CP support in guest exception classification Date: Fri, 21 Apr 2023 09:46:04 -0400 Message-Id: <20230421134615.62539-11-weijiang.yang@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230421134615.62539-1-weijiang.yang@intel.com> References: <20230421134615.62539-1-weijiang.yang@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DATE_IN_PAST_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763805444505787463?= X-GMAIL-MSGID: =?utf-8?q?1763805444505787463?= Add handling for Control Protection (#CP) exceptions(vector 21). The new vector is introduced for Intel's Control-Flow Enforcement Technology (CET) relevant violation cases. See Intel's SDM for details. Signed-off-by: Yang Weijiang --- arch/x86/include/uapi/asm/kvm.h | 1 + arch/x86/kvm/vmx/nested.c | 2 +- arch/x86/kvm/x86.c | 10 +++++++--- arch/x86/kvm/x86.h | 13 ++++++++++--- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/uapi/asm/kvm.h b/arch/x86/include/uapi/asm/kvm.h index 7f467fe05d42..1c002abe2be8 100644 --- a/arch/x86/include/uapi/asm/kvm.h +++ b/arch/x86/include/uapi/asm/kvm.h @@ -33,6 +33,7 @@ #define MC_VECTOR 18 #define XM_VECTOR 19 #define VE_VECTOR 20 +#define CP_VECTOR 21 /* Select x86 specific features in */ #define __KVM_HAVE_PIT diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 96ede74a6067..7bc62cd72748 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -2850,7 +2850,7 @@ static int nested_check_vm_entry_controls(struct kvm_vcpu *vcpu, /* VM-entry interruption-info field: deliver error code */ should_have_error_code = intr_type == INTR_TYPE_HARD_EXCEPTION && prot_mode && - x86_exception_has_error_code(vector); + x86_exception_has_error_code(vcpu, vector); if (CC(has_error_code != should_have_error_code)) return -EINVAL; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 7788646bbf1f..a768cbf3fbb7 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -520,11 +520,15 @@ EXPORT_SYMBOL_GPL(kvm_spurious_fault); #define EXCPT_CONTRIBUTORY 1 #define EXCPT_PF 2 -static int exception_class(int vector) +static int exception_class(struct kvm_vcpu *vcpu, int vector) { switch (vector) { case PF_VECTOR: return EXCPT_PF; + case CP_VECTOR: + if (vcpu->arch.cr4_guest_rsvd_bits & X86_CR4_CET) + return EXCPT_BENIGN; + return EXCPT_CONTRIBUTORY; case DE_VECTOR: case TS_VECTOR: case NP_VECTOR: @@ -707,8 +711,8 @@ static void kvm_multiple_exception(struct kvm_vcpu *vcpu, kvm_make_request(KVM_REQ_TRIPLE_FAULT, vcpu); return; } - class1 = exception_class(prev_nr); - class2 = exception_class(nr); + class1 = exception_class(vcpu, prev_nr); + class2 = exception_class(vcpu, nr); if ((class1 == EXCPT_CONTRIBUTORY && class2 == EXCPT_CONTRIBUTORY) || (class1 == EXCPT_PF && class2 != EXCPT_BENIGN)) { /* diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index c544602d07a3..2ba7c7fc4846 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -171,13 +171,20 @@ static inline bool is_64_bit_hypercall(struct kvm_vcpu *vcpu) return vcpu->arch.guest_state_protected || is_64_bit_mode(vcpu); } -static inline bool x86_exception_has_error_code(unsigned int vector) +static inline bool x86_exception_has_error_code(struct kvm_vcpu *vcpu, + unsigned int vector) { static u32 exception_has_error_code = BIT(DF_VECTOR) | BIT(TS_VECTOR) | BIT(NP_VECTOR) | BIT(SS_VECTOR) | BIT(GP_VECTOR) | - BIT(PF_VECTOR) | BIT(AC_VECTOR); + BIT(PF_VECTOR) | BIT(AC_VECTOR) | BIT(CP_VECTOR); - return (1U << vector) & exception_has_error_code; + if (!((1U << vector) & exception_has_error_code)) + return false; + + if (vector == CP_VECTOR) + return !(vcpu->arch.cr4_guest_rsvd_bits & X86_CR4_CET); + + return true; } static inline bool mmu_is_nested(struct kvm_vcpu *vcpu)