From nobody Thu Dec 18 07:11:30 2025 Received: from out-172.mta0.migadu.com (out-172.mta0.migadu.com [91.218.175.172]) (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 F15AA1F76A5 for ; Thu, 13 Mar 2025 21:56:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741902963; cv=none; b=mHYDNkbVqbabC4UXsAvTuVySzpXI3fTrTLFWKCrnFB7XmV5uxGq8eEOXtY33Srw2cUgvtxNpe3cvYZBLPM1WpaAq6Zfd5amLD8WN2ym8P85dD39UPk115ELt4wGbgHBEVJoRytRiHuEXQd5YgbCHf3MHxwqCf5i8FnyVDrkaNT0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741902963; c=relaxed/simple; bh=ruNjn6oY85pkiEVb/IVF7lfpeCNMLMhOSDdgsEu/JqE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lvnflhcyFiiglvVkDmdpnSzgiJ/QHvszrPQjlXwyfJa8hFMbK27A7pwvV2kTGWwOtMBcR/QDcavhZY/HZXIbEzFNW+Nvyc3QGXDW6Yy71rIam3iuuguGZZxi1G/duRtmobxRgab0D4hDu9JV0BT27cJuELdX+G7ktKuY0MRvKgU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=jEz08PGp; arc=none smtp.client-ip=91.218.175.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="jEz08PGp" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1741902959; 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=ISe8UFhYqt/XjX+dSaNqs8ihA9A8NUS4NuxdyQBmcGk=; b=jEz08PGpQ3m38FQK7n04+AT+KP6BbAucMht7gxSkgH/xEU7OrkH15dOc0F+ithY1mftfI2 Y5qLrBeC6Yh6cjSFH2fO+h1A14blFGYv8YTIc/DkcBIXn1O46lPlbjLNQYRYGQy0RM4HgS jGeb+mtiyB6LyVsvsuuMMJ8wEU5M0eg= From: Yosry Ahmed To: Sean Christopherson Cc: Paolo Bonzini , Maxim Levitsky , x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Yosry Ahmed Subject: [PATCH 3/7] KVM: SVM: Add helpers to set/clear ASID flush Date: Thu, 13 Mar 2025 21:55:36 +0000 Message-ID: <20250313215540.4171762-4-yosry.ahmed@linux.dev> In-Reply-To: <20250313215540.4171762-1-yosry.ahmed@linux.dev> References: <20250313215540.4171762-1-yosry.ahmed@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Incoming changes will add more code paths that set tlb_ctl to TLB_CONTROL_FLUSH_ASID, and will eliminate the use of TLB_CONTROL_FLUSH_ALL_ASID except as fallback when FLUSHBYASID is not available. Introduce set/clear helpers to set tlb_ctl to TLB_CONTROL_FLUSH_ASID or TLB_CONTROL_DO_NOTHING. Opportunistically move the TLB_CONTROL_* definitions to arch/x86/kvm/svm/svm.h as they are not used outside of arch/x86/kvm/svm/. Signed-off-by: Yosry Ahmed --- arch/x86/include/asm/svm.h | 5 ----- arch/x86/kvm/svm/nested.c | 2 +- arch/x86/kvm/svm/sev.c | 2 +- arch/x86/kvm/svm/svm.c | 4 ++-- arch/x86/kvm/svm/svm.h | 15 +++++++++++++++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 9b7fa99ae9513..a97da63562eb3 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -171,11 +171,6 @@ struct __attribute__ ((__packed__)) vmcb_control_area { }; =20 =20 -#define TLB_CONTROL_DO_NOTHING 0 -#define TLB_CONTROL_FLUSH_ALL_ASID 1 -#define TLB_CONTROL_FLUSH_ASID 3 -#define TLB_CONTROL_FLUSH_ASID_LOCAL 7 - #define V_TPR_MASK 0x0f =20 #define V_IRQ_SHIFT 8 diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 834b67672d50f..3bff948bc5752 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -681,7 +681,7 @@ static void nested_vmcb02_prepare_control(struct vcpu_s= vm *svm, /* Done at vmrun: asid. */ =20 /* Also overwritten later if necessary. */ - vmcb02->control.tlb_ctl =3D TLB_CONTROL_DO_NOTHING; + svm_vmcb_clear_flush_asid(vmcb02); =20 /* nested_cr3. */ if (nested_npt_enabled(svm)) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 0bc708ee27887..b393674733969 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3479,7 +3479,7 @@ int pre_sev_run(struct vcpu_svm *svm, int cpu) return 0; =20 sd->sev_vmcbs[asid] =3D svm->vmcb; - svm->vmcb->control.tlb_ctl =3D TLB_CONTROL_FLUSH_ASID; + svm_vmcb_set_flush_asid(svm->vmcb); vmcb_mark_dirty(svm->vmcb, VMCB_ASID); return 0; } diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 28a6d2c0f250f..8c90686a33f44 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4006,7 +4006,7 @@ static void svm_flush_tlb_asid(struct kvm_vcpu *vcpu) * VM-Exit (via kvm_mmu_reset_context()). */ if (static_cpu_has(X86_FEATURE_FLUSHBYASID)) - svm->vmcb->control.tlb_ctl =3D TLB_CONTROL_FLUSH_ASID; + svm_vmcb_set_flush_asid(svm->vmcb); else svm->current_vmcb->asid_generation--; } @@ -4373,7 +4373,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_= vcpu *vcpu, svm->nested.nested_run_pending =3D 0; } =20 - svm->vmcb->control.tlb_ctl =3D TLB_CONTROL_DO_NOTHING; + svm_vmcb_clear_flush_asid(svm->vmcb); vmcb_mark_all_clean(svm->vmcb); =20 /* if exit due to PF check for async PF */ diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index d4490eaed55dd..9fd5b249b9c19 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -638,6 +638,21 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *= svm, bool disable); void svm_complete_interrupt_delivery(struct kvm_vcpu *vcpu, int delivery_m= ode, int trig_mode, int vec); =20 +#define TLB_CONTROL_DO_NOTHING 0 +#define TLB_CONTROL_FLUSH_ALL_ASID 1 +#define TLB_CONTROL_FLUSH_ASID 3 +#define TLB_CONTROL_FLUSH_ASID_LOCAL 7 + +static inline void svm_vmcb_set_flush_asid(struct vmcb *vmcb) +{ + vmcb->control.tlb_ctl =3D TLB_CONTROL_FLUSH_ASID; +} + +static inline void svm_vmcb_clear_flush_asid(struct vmcb *vmcb) +{ + vmcb->control.tlb_ctl =3D TLB_CONTROL_DO_NOTHING; +} + /* nested.c */ =20 #define NESTED_EXIT_HOST 0 /* Exit handled on host level */ --=20 2.49.0.rc1.451.g8f38331e32-goog