History

KVM: x86: Replace growing set of *_in_guest bools with a u64

Store each "disabled exit" boolean in a single bit rather than a byte. No functional change intended.

Jim Mattson committed 1 year ago

Commit 6fbef861 parent e88cfd55 files · +13 −18Browse files

Unified · Split

5 files
  1. arch/x86/include/asm/kvm_host.h +1 −4
  2. arch/x86/kvm/svm/svm.c +1 −1
  3. arch/x86/kvm/vmx/vmx.c +1 −1
  4. arch/x86/kvm/x86.c +1 −8
  5. arch/x86/kvm/x86.h +9 −4
arch/x86/include/asm/kvm_host.h+1−4
@@ -1392,10 +1392,7 @@ struct kvm_arch { · 1391 unmodified lines
1392 1392
1393 gpa_t wall_clock;1393 gpa_t wall_clock;
1394 1394
1395 bool mwait_in_guest;1395 u64 disabled_exits;
1396 bool hlt_in_guest;
1397 bool pause_in_guest;
1398 bool cstate_in_guest;
1399 1396
1400 unsigned long irq_sources_bitmap;1397 unsigned long irq_sources_bitmap;
1401 s64 kvmclock_offset;1398 s64 kvmclock_offset;
arch/x86/kvm/svm/svm.c+1−1
@@ -5012,7 +5012,7 @@ static int svm_vm_init(struct kvm *kvm) · 5011 unmodified lines
5012 }5012 }
5013 5013
5014 if (!pause_filter_count || !pause_filter_thresh)5014 if (!pause_filter_count || !pause_filter_thresh)
5015 kvm->arch.pause_in_guest = true;5015 kvm_disable_exits(kvm, KVM_X86_DISABLE_EXITS_PAUSE);
5016 5016
5017 if (enable_apicv) {5017 if (enable_apicv) {
5018 int ret = avic_vm_init(kvm);5018 int ret = avic_vm_init(kvm);
arch/x86/kvm/vmx/vmx.c+1−1
@@ -7515,7 +7515,7 @@ free_vpid: · 7514 unmodified lines
7515int vmx_vm_init(struct kvm *kvm)7515int vmx_vm_init(struct kvm *kvm)
7516{7516{
7517 if (!ple_gap)7517 if (!ple_gap)
7518 kvm->arch.pause_in_guest = true;7518 kvm_disable_exits(kvm, KVM_X86_DISABLE_EXITS_PAUSE);
7519 7519
7520 if (boot_cpu_has(X86_BUG_L1TF) && enable_ept) {7520 if (boot_cpu_has(X86_BUG_L1TF) && enable_ept) {
7521 switch (l1tf_mitigation) {7521 switch (l1tf_mitigation) {
arch/x86/kvm/x86.c+1−8
@@ -6616,14 +6616,7 @@ split_irqchip_unlock: · 6615 unmodified lines
6616 (cap->args[0] & ~KVM_X86_DISABLE_EXITS_PAUSE))6616 (cap->args[0] & ~KVM_X86_DISABLE_EXITS_PAUSE))
6617 pr_warn_once(SMT_RSB_MSG);6617 pr_warn_once(SMT_RSB_MSG);
6618 6618
6619 if (cap->args[0] & KVM_X86_DISABLE_EXITS_PAUSE)6619 kvm_disable_exits(kvm, cap->args[0]);
6620 kvm->arch.pause_in_guest = true;
6621 if (cap->args[0] & KVM_X86_DISABLE_EXITS_MWAIT)
6622 kvm->arch.mwait_in_guest = true;
6623 if (cap->args[0] & KVM_X86_DISABLE_EXITS_HLT)
6624 kvm->arch.hlt_in_guest = true;
6625 if (cap->args[0] & KVM_X86_DISABLE_EXITS_CSTATE)
6626 kvm->arch.cstate_in_guest = true;
6627 r = 0;6620 r = 0;
6628disable_exits_unlock:6621disable_exits_unlock:
6629 mutex_unlock(&kvm->lock);6622 mutex_unlock(&kvm->lock);
arch/x86/kvm/x86.h+9−4
@@ -499,24 +499,29 @@ static inline u64 nsec_to_cycles(struct kvm_vcpu *vcpu, u64 nsec) · 498 unmodified lines
499 __rem; \499 __rem; \
500 })500 })
501 501
502static inline void kvm_disable_exits(struct kvm *kvm, u64 mask)
503{
504 kvm->arch.disabled_exits |= mask;
505}
506
502static inline bool kvm_mwait_in_guest(struct kvm *kvm)507static inline bool kvm_mwait_in_guest(struct kvm *kvm)
503{508{
504 return kvm->arch.mwait_in_guest;509 return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_MWAIT;
505}510}
506 511
507static inline bool kvm_hlt_in_guest(struct kvm *kvm)512static inline bool kvm_hlt_in_guest(struct kvm *kvm)
508{513{
509 return kvm->arch.hlt_in_guest;514 return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_HLT;
510}515}
511 516
512static inline bool kvm_pause_in_guest(struct kvm *kvm)517static inline bool kvm_pause_in_guest(struct kvm *kvm)
513{518{
514 return kvm->arch.pause_in_guest;519 return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_PAUSE;
515}520}
516 521
517static inline bool kvm_cstate_in_guest(struct kvm *kvm)522static inline bool kvm_cstate_in_guest(struct kvm *kvm)
518{523{
519 return kvm->arch.cstate_in_guest;524 return kvm->arch.disabled_exits & KVM_X86_DISABLE_EXITS_CSTATE;
520}525}
521 526
522static inline bool kvm_notify_vmexit_enabled(struct kvm *kvm)527static inline bool kvm_notify_vmexit_enabled(struct kvm *kvm)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t