Skip to content

KVM: x86: Clean up MSR_IA32_APICBASE_BASE code

Sean Christopherson kvm lkml 2 versions – Applied

Status from this message: Applied to kvm-x86 misc.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest9 patches 4 repliesApplied
  2. v17 patches 6 repliesSuperseded

Changes in v2 from the cover letter

- Collect reviews. [Kai, Paolo]
- Add a comment in kvm_lapic_reset() to explain its usage of the inner __kvm_apic_set_base() helper. [Paolo]
- Unpack "struct msr_data" before calling kvm_apic_set_base(), e.g. so that __set_sregs_common() doesn't half-fill a structure and rely on kvm_apic_set_base() to ignore "index". [Kai]
- Tack on a patch to short circuit all of kvm_apic_set_base() when the MSR isn't changing, to avoid the rare slow path of triggering an APIC map recalc due to some other task marking the map dirty.

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/9KVM: x86: Short-circuit all kvm_lapic_set_base() if MSR value isn't changingarch/x86/kvm/lapic.c+3 -00 replies
2/9KVM: x86: Drop superfluous kvm_lapic_set_base() call when setting APIC statearch/x86/kvm/lapic.c+0 -10 replies
3/9KVM: x86: Get vcpu->arch.apic_base directly and drop kvm_get_apic_base()arch/x86/kvm/lapic.h arch/x86/kvm/x86.c+4 -100 replies
4/9KVM: x86: Inline kvm_get_apic_mode() in lapic.harch/x86/kvm/lapic.h arch/x86/kvm/x86.c+5 -70 replies
5/9KVM: x86: Move kvm_set_apic_base() implementation to lapic.c (from x86.c)arch/x86/kvm/lapic.c arch/x86/kvm/x86.c+21 -210 replies
6/9KVM: x86: Rename APIC base setters to better capture their relationshiparch/x86/kvm/lapic.c arch/x86/kvm/lapic.h arch/x86/kvm/x86.c+14 -80 replies
7/9KVM: x86: Make kvm_recalculate_apic_map() local to lapic.carch/x86/kvm/lapic.c arch/x86/kvm/lapic.h+1 -20 replies
8/9KVM: x86: Unpack msr_data structure prior to calling kvm_apic_set_base()arch/x86/kvm/lapic.c arch/x86/kvm/lapic.h arch/x86/kvm/x86.c+8 -111 reply
9/9KVM: x86: Short-circuit all of kvm_apic_set_base() if MSR value is unchangedarch/x86/kvm/lapic.c+4 -32 replies

Reviews trailers per patch

8 of 9 patches have a Reviewed-by or Acked-by.

PatchKai HuangPaolo Bonzini
1/9R-b R-b
2/9R-b R-b
3/9R-b R-b
4/9R-b R-b
5/9R-b R-b
6/9R-b R-b
7/9R-b R-b
8/9R-b
9/9

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 0/9] KVM: x86: Clean up MSR_IA32_APICBASE_BASE code

Clean up code related to setting and getting MSR_IA32_APICBASE_BASE.

E.g. it's absurdly difficult to tease out that kvm_set_apic_base() exists purely to avoid an extra call to kvm_recalculate_apic_map() (which may or may not be worth the code, but whatever).

Simiarly, it's quite difficult to see that kvm_lapic_set_base() doesn't do anything useful if the incoming MSR value is the same as the current value.

v2:
- Collect reviews. [Kai, Paolo]
- Add a comment in kvm_lapic_reset() to explain its usage of the inner __kvm_apic_set_base() helper. [Paolo]
- Unpack "struct msr_data" before calling kvm_apic_set_base(), e.g. so that __set_sregs_common() doesn't half-fill a structure and rely on kvm_apic_set_base() to ignore "index". [Kai]
- Tack on a patch to short circuit all of kvm_apic_set_base() when the MSR isn't changing, to avoid the rare slow path of triggering an APIC map recalc due to some other task marking the map dirty.

v1: https://lore.kernel.org/all/[email protected]

Sean Christopherson (9):
KVM: x86: Short-circuit all kvm_lapic_set_base() if MSR value isn't
changing
KVM: x86: Drop superfluous kvm_lapic_set_base() call when setting APIC
state
KVM: x86: Get vcpu->arch.apic_base directly and drop

    kvm_get_apic_base()
  KVM: x86: Inline kvm_get_apic_mode() in lapic.h
  KVM: x86: Move kvm_set_apic_base() implementation to lapic.c (from
    x86.c)
  KVM: x86: Rename APIC base setters to better capture their
    relationship
  KVM: x86: Make kvm_recalculate_apic_map() local to lapic.c
  KVM: x86: Unpack msr_data structure prior to calling
    kvm_apic_set_base()

KVM: x86: Short-circuit all of kvm_apic_set_base() if MSR value is
unchanged

 arch/x86/kvm/lapic.c | 39 ++++++++++++++++++++++++++++++++++----
 arch/x86/kvm/lapic.h | 11 ++++++-----
 arch/x86/kvm/x86.c   | 45 +++++---------------------------------------
 3 files changed, 46 insertions(+), 49 deletions(-)

base-commit: e466901b947d529f7b091a3b00b19d2bdee206ee

Signature · 1 line
2.47.0.163.g1226f6d8fa-goog