From: Sean Christopherson <seanjc@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Zeng Guang <guang.zeng@intel.com>, Chao Gao <chao.gao@intel.com>,
Maxim Levitsky <mlevitsk@redhat.com>
Subject: [PATCH 07/11] KVM: x86: Make kvm_lapic_reg_{read,write}() static
Date: Fri, 4 Feb 2022 21:42:01 +0000 [thread overview]
Message-ID: <20220204214205.3306634-8-seanjc@google.com> (raw)
In-Reply-To: <20220204214205.3306634-1-seanjc@google.com>
Make the low level read/write lapic helpers static, any accesses to the
local APIC from vendor code or non-APIC code should be routed through
proper helpers.
No functional change intended.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/lapic.c | 8 +++-----
arch/x86/kvm/lapic.h | 3 ---
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 4f57b6f5ebd4..deac73ce2de5 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -1385,8 +1385,8 @@ static inline struct kvm_lapic *to_lapic(struct kvm_io_device *dev)
#define APIC_REGS_MASK(first, count) \
(APIC_REG_MASK(first) * ((1ull << (count)) - 1))
-int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,
- void *data)
+static int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,
+ void *data)
{
unsigned char alignment = offset & 0xf;
u32 result;
@@ -1442,7 +1442,6 @@ int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,
}
return 0;
}
-EXPORT_SYMBOL_GPL(kvm_lapic_reg_read);
static int apic_mmio_in_range(struct kvm_lapic *apic, gpa_t addr)
{
@@ -2003,7 +2002,7 @@ static void apic_manage_nmi_watchdog(struct kvm_lapic *apic, u32 lvt0_val)
}
}
-int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
+static int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
{
int ret = 0;
@@ -2151,7 +2150,6 @@ int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val)
return ret;
}
-EXPORT_SYMBOL_GPL(kvm_lapic_reg_write);
static int apic_mmio_write(struct kvm_vcpu *vcpu, struct kvm_io_device *this,
gpa_t address, int len, const void *data)
diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h
index 2b44e533fc8d..ab76896a8c3f 100644
--- a/arch/x86/kvm/lapic.h
+++ b/arch/x86/kvm/lapic.h
@@ -85,9 +85,6 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value);
u64 kvm_lapic_get_base(struct kvm_vcpu *vcpu);
void kvm_recalculate_apic_map(struct kvm *kvm);
void kvm_apic_set_version(struct kvm_vcpu *vcpu);
-int kvm_lapic_reg_write(struct kvm_lapic *apic, u32 reg, u32 val);
-int kvm_lapic_reg_read(struct kvm_lapic *apic, u32 offset, int len,
- void *data);
bool kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
int shorthand, unsigned int dest, int dest_mode);
int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);
--
2.35.0.263.gb82422642f-goog
next prev parent reply other threads:[~2022-02-04 21:42 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-04 21:41 [PATCH 00/11] KVM: x86: Prep work for VMX IPI virtualization Sean Christopherson
2022-02-04 21:41 ` [PATCH 01/11] Revert "svm: Add warning message for AVIC IPI invalid target" Sean Christopherson
2022-02-07 16:44 ` Paolo Bonzini
2022-02-04 21:41 ` [PATCH 02/11] KVM: VMX: Handle APIC-write offset wrangling in VMX code Sean Christopherson
2022-02-15 2:22 ` Chao Gao
2022-02-15 16:30 ` Sean Christopherson
2022-02-04 21:41 ` [PATCH 03/11] KVM: x86: Use "raw" APIC register read for handling APIC-write VM-Exit Sean Christopherson
2022-02-04 21:41 ` [PATCH 04/11] KVM: SVM: Use common kvm_apic_write_nodecode() for AVIC write traps Sean Christopherson
2022-02-04 23:14 ` kernel test robot
2022-02-07 16:16 ` Sean Christopherson
2022-02-04 21:41 ` [PATCH 05/11] KVM: SVM: Don't rewrite guest ICR on AVIC IPI virtualization failure Sean Christopherson
2022-02-04 21:42 ` [PATCH 06/11] KVM: x86: WARN if KVM emulates an IPI without clearing the BUSY flag Sean Christopherson
2022-02-04 21:42 ` Sean Christopherson [this message]
2022-02-04 21:42 ` [PATCH 08/11] KVM: x86: Add helpers to handle 64-bit APIC MSR read/writes Sean Christopherson
2022-02-04 21:42 ` [PATCH 09/11] KVM: x86: Treat x2APIC's ICR as a 64-bit register, not two 32-bit regs Sean Christopherson
2022-02-15 3:27 ` Chao Gao
2022-02-15 16:40 ` Sean Christopherson
2022-02-04 21:42 ` [PATCH 10/11] KVM: x86: Make kvm_lapic_set_reg() a "private" xAPIC helper Sean Christopherson
2022-02-04 21:42 ` [PATCH 11/11] KVM: selftests: Add test to verify KVM handles x2APIC ICR=>ICR2 dance Sean Christopherson
2022-02-24 14:58 ` [PATCH 00/11] KVM: x86: Prep work for VMX IPI virtualization Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220204214205.3306634-8-seanjc@google.com \
--to=seanjc@google.com \
--cc=chao.gao@intel.com \
--cc=guang.zeng@intel.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mlevitsk@redhat.com \
--cc=pbonzini@redhat.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®