| commit | 2ba97029b78595eeeb540883d808007cde922e24 | [log] [tgz] |
|---|---|---|
| author | Jason Chen CJ <jason.cj.chen@intel.com> | Tue Dec 06 11:33:56 2022 |
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | Mon Dec 12 15:01:56 2022 |
| tree | e745900e958e3f26e53fd8d4927db43bca6bd61e | |
| parent | 069509decf9dea436077ea21f65d8e473197dbb6 [diff] |
CHROMIUM: pkvm: x86: Rename context_clear_dte() to context_sm_clear_dte() context_clear_dte() is only valid for context entry under scalable mode, so rename it to context_sm_clear_dte(). Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com> (cherry picked from commit 25a2df77c8a1c7891c24084cfb73f7aff2b60098 -> https://github.com/intel-staging/pKVM-IA) BUG=b:259224266 TEST=Compile and boot Change-Id: I221412a580fdab5b1f9c954ab6b75a3cb63d0b6e Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4096983 Reviewed-by: Dmytro Maluka <dmaluka@google.com> Tested-by: Tomasz Nowicki <tnowicki@google.com> Commit-Queue: Tomasz Nowicki <tnowicki@google.com>
diff --git a/arch/x86/kvm/vmx/pkvm/hyp/iommu.c b/arch/x86/kvm/vmx/pkvm/hyp/iommu.c index e09276e..4f23289 100644 --- a/arch/x86/kvm/vmx/pkvm/hyp/iommu.c +++ b/arch/x86/kvm/vmx/pkvm/hyp/iommu.c
@@ -331,7 +331,7 @@ if (ecap_smts(sdata->iommu_ecap)) /* Clear DTE to make sure device TLB is disabled for security */ - context_clear_dte(&tmp); + context_sm_clear_dte(&tmp); else { /* * Set translation type to CONTEXT_TT_MULTI_LEVEL to ensure using
diff --git a/arch/x86/kvm/vmx/pkvm/hyp/iommu_internal.h b/arch/x86/kvm/vmx/pkvm/hyp/iommu_internal.h index cbeb529..27dae52 100644 --- a/arch/x86/kvm/vmx/pkvm/hyp/iommu_internal.h +++ b/arch/x86/kvm/vmx/pkvm/hyp/iommu_internal.h
@@ -147,7 +147,7 @@ WRITE_ONCE(*ptr, (old & ~mask) | bits); } -static inline void context_clear_dte(struct context_entry *ce) +static inline void context_sm_clear_dte(struct context_entry *ce) { entry_set_bits(&ce->lo, 1 << 2, 0); }