From nobody Fri Sep 19 03:44:27 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CF83C4332F for ; Tue, 29 Nov 2022 19:41:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237108AbiK2Tlh (ORCPT ); Tue, 29 Nov 2022 14:41:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237089AbiK2Tko (ORCPT ); Tue, 29 Nov 2022 14:40:44 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82C7D26E3 for ; Tue, 29 Nov 2022 11:37:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669750669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ztV2NkJ9fzkBSStJHJoXJSpsO1jLyNUEDLKWsHdAan8=; b=X0hqoh8yH5zZSb5DNwVcKHiVRDrQb/UYtCCRNzfFwud0dpK8sedZjZmTIpA5VGhVJUnGiG jOSpyLSrunAqIbuDZkyUH57/sW/BWujuFgLnkBS4qAdnf4Bvi/yYpQPkmCGqEofGZSl4Oc b5AxX+h5LRFeMcT71rToyARJmbJe+SQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-608-b3cAepYqMuyaQIwk2L2AsQ-1; Tue, 29 Nov 2022 14:37:44 -0500 X-MC-Unique: b3cAepYqMuyaQIwk2L2AsQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6A7511C06ED8; Tue, 29 Nov 2022 19:37:43 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8F6A82028DC1; Tue, 29 Nov 2022 19:37:39 +0000 (UTC) From: Maxim Levitsky To: kvm@vger.kernel.org Cc: Sandipan Das , Paolo Bonzini , Jim Mattson , Peter Zijlstra , Dave Hansen , Borislav Petkov , Pawan Gupta , Thomas Gleixner , Ingo Molnar , Josh Poimboeuf , Daniel Sneddon , Jiaxi Chen , Babu Moger , linux-kernel@vger.kernel.org, Jing Liu , Wyes Karny , x86@kernel.org, "H. Peter Anvin" , Sean Christopherson , Maxim Levitsky Subject: [PATCH v2 05/11] KVM: x86: emulator: stop using raw host flags Date: Tue, 29 Nov 2022 21:37:11 +0200 Message-Id: <20221129193717.513824-6-mlevitsk@redhat.com> In-Reply-To: <20221129193717.513824-1-mlevitsk@redhat.com> References: <20221129193717.513824-1-mlevitsk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Instead of re-defining the H_FLAGS bits, just expose the 'in_smm' and the 'in_guest_mode' host flags using emulator callbacks. Also while at it, garbage collect the recently removed host flags. No functional change is intended. Signed-off-by: Maxim Levitsky --- arch/x86/include/asm/kvm_host.h | 6 +++--- arch/x86/kvm/emulate.c | 11 +++++------ arch/x86/kvm/kvm_emulate.h | 7 ++----- arch/x86/kvm/smm.c | 2 -- arch/x86/kvm/x86.c | 14 +++++++++----- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_hos= t.h index 9208ad7a6bd004..684a5519812fb2 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -2052,11 +2052,11 @@ enum { TASK_SWITCH_GATE =3D 3, }; =20 -#define HF_GUEST_MASK (1 << 5) /* VCPU is in guest-mode */ +#define HF_GUEST_MASK (1 << 0) /* VCPU is in guest-mode */ =20 #ifdef CONFIG_KVM_SMM -#define HF_SMM_MASK (1 << 6) -#define HF_SMM_INSIDE_NMI_MASK (1 << 7) +#define HF_SMM_MASK (1 << 1) +#define HF_SMM_INSIDE_NMI_MASK (1 << 2) =20 # define __KVM_VCPU_MULTIPLE_ADDRESS_SPACE # define KVM_ADDRESS_SPACE_NUM 2 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 5cc3efa0e21c17..d869131f84ffb3 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -2309,7 +2309,7 @@ static int em_lseg(struct x86_emulate_ctxt *ctxt) =20 static int em_rsm(struct x86_emulate_ctxt *ctxt) { - if ((ctxt->ops->get_hflags(ctxt) & X86EMUL_SMM_MASK) =3D=3D 0) + if (!ctxt->ops->in_smm(ctxt)) return emulate_ud(ctxt); =20 if (ctxt->ops->leave_smm(ctxt)) @@ -5132,7 +5132,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) const struct x86_emulate_ops *ops =3D ctxt->ops; int rc =3D X86EMUL_CONTINUE; int saved_dst_type =3D ctxt->dst.type; - unsigned emul_flags; + bool in_guest_mode =3D ctxt->ops->in_guest_mode(ctxt); =20 ctxt->mem_read.pos =3D 0; =20 @@ -5147,7 +5147,6 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) goto done; } =20 - emul_flags =3D ctxt->ops->get_hflags(ctxt); if (unlikely(ctxt->d & (No64|Undefined|Sse|Mmx|Intercept|CheckPerm|Priv|Prot|String))) { if ((ctxt->mode =3D=3D X86EMUL_MODE_PROT64 && (ctxt->d & No64)) || @@ -5181,7 +5180,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) fetch_possible_mmx_operand(&ctxt->dst); } =20 - if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && ctxt->intercept) { + if (unlikely(in_guest_mode) && ctxt->intercept) { rc =3D emulator_check_intercept(ctxt, ctxt->intercept, X86_ICPT_PRE_EXCEPT); if (rc !=3D X86EMUL_CONTINUE) @@ -5210,7 +5209,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) goto done; } =20 - if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && (ctxt->d & Intercept)) { + if (unlikely(in_guest_mode) && (ctxt->d & Intercept)) { rc =3D emulator_check_intercept(ctxt, ctxt->intercept, X86_ICPT_POST_EXCEPT); if (rc !=3D X86EMUL_CONTINUE) @@ -5264,7 +5263,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) =20 special_insn: =20 - if (unlikely(emul_flags & X86EMUL_GUEST_MASK) && (ctxt->d & Intercept)) { + if (unlikely(in_guest_mode) && (ctxt->d & Intercept)) { rc =3D emulator_check_intercept(ctxt, ctxt->intercept, X86_ICPT_POST_MEMACCESS); if (rc !=3D X86EMUL_CONTINUE) diff --git a/arch/x86/kvm/kvm_emulate.h b/arch/x86/kvm/kvm_emulate.h index 2d9662be833378..dd0203fbb27543 100644 --- a/arch/x86/kvm/kvm_emulate.h +++ b/arch/x86/kvm/kvm_emulate.h @@ -220,7 +220,8 @@ struct x86_emulate_ops { =20 void (*set_nmi_mask)(struct x86_emulate_ctxt *ctxt, bool masked); =20 - unsigned (*get_hflags)(struct x86_emulate_ctxt *ctxt); + bool (*in_smm)(struct x86_emulate_ctxt *ctxt); + bool (*in_guest_mode)(struct x86_emulate_ctxt *ctxt); int (*leave_smm)(struct x86_emulate_ctxt *ctxt); void (*triple_fault)(struct x86_emulate_ctxt *ctxt); int (*set_xcr)(struct x86_emulate_ctxt *ctxt, u32 index, u64 xcr); @@ -275,10 +276,6 @@ enum x86emul_mode { X86EMUL_MODE_PROT64, /* 64-bit (long) mode. */ }; =20 -/* These match some of the HF_* flags defined in kvm_host.h */ -#define X86EMUL_GUEST_MASK (1 << 5) /* VCPU is in guest-mode */ -#define X86EMUL_SMM_MASK (1 << 6) - /* * fastop functions are declared as taking a never-defined fastop paramete= r, * so they can't be called from C directly. diff --git a/arch/x86/kvm/smm.c b/arch/x86/kvm/smm.c index a9c1c2af8d94c2..a3a94edd2f0bc9 100644 --- a/arch/x86/kvm/smm.c +++ b/arch/x86/kvm/smm.c @@ -110,8 +110,6 @@ static void check_smram_offsets(void) =20 void kvm_smm_changed(struct kvm_vcpu *vcpu, bool entering_smm) { - BUILD_BUG_ON(HF_SMM_MASK !=3D X86EMUL_SMM_MASK); - trace_kvm_smm_transition(vcpu->vcpu_id, vcpu->arch.smbase, entering_smm); =20 if (entering_smm) { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f18f579ebde81c..85d2a12c214dda 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -8138,9 +8138,14 @@ static void emulator_set_nmi_mask(struct x86_emulate= _ctxt *ctxt, bool masked) static_call(kvm_x86_set_nmi_mask)(emul_to_vcpu(ctxt), masked); } =20 -static unsigned emulator_get_hflags(struct x86_emulate_ctxt *ctxt) +static bool emulator_in_smm(struct x86_emulate_ctxt *ctxt) { - return emul_to_vcpu(ctxt)->arch.hflags; + return emul_to_vcpu(ctxt)->arch.hflags & HF_SMM_MASK; +} + +static bool emulator_in_guest_mode(struct x86_emulate_ctxt *ctxt) +{ + return emul_to_vcpu(ctxt)->arch.hflags & HF_GUEST_MASK; } =20 #ifndef CONFIG_KVM_SMM @@ -8209,7 +8214,8 @@ static const struct x86_emulate_ops emulate_ops =3D { .guest_has_fxsr =3D emulator_guest_has_fxsr, .guest_has_rdpid =3D emulator_guest_has_rdpid, .set_nmi_mask =3D emulator_set_nmi_mask, - .get_hflags =3D emulator_get_hflags, + .in_smm =3D emulator_in_smm, + .in_guest_mode =3D emulator_in_guest_mode, .leave_smm =3D emulator_leave_smm, .triple_fault =3D emulator_triple_fault, .set_xcr =3D emulator_set_xcr, @@ -8281,8 +8287,6 @@ static void init_emulate_ctxt(struct kvm_vcpu *vcpu) (cs_l && is_long_mode(vcpu)) ? X86EMUL_MODE_PROT64 : cs_db ? X86EMUL_MODE_PROT32 : X86EMUL_MODE_PROT16; - BUILD_BUG_ON(HF_GUEST_MASK !=3D X86EMUL_GUEST_MASK); - ctxt->interruptibility =3D 0; ctxt->have_exception =3D false; ctxt->exception.vector =3D -1; --=20 2.26.3