From: Zhao Liu <zhao1.liu@intel.com>
To: Paolo Bonzini <pbonzini@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
Eduardo Habkost <eduardo@habkost.net>,
"Michael S . Tsirkin" <mst@redhat.com>,
Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,
Marcelo Tosatti <mtosatti@redhat.com>
Cc: Xiaoyao Li <xiaoyao.li@intel.com>,
Pankaj Gupta <pankaj.gupta@amd.com>,
Zide Chen <zide.chen@intel.com>,
qemu-devel@nongnu.org, kvm@vger.kernel.org,
Zhao Liu <zhao1.liu@intel.com>
Subject: [PATCH v4 9/9] target/i386/kvm: Replace ARRAY_SIZE(msr_handlers) with KVM_MSR_FILTER_MAX_RANGES
Date: Wed, 17 Jul 2024 00:10:15 +0800 [thread overview]
Message-ID: <20240716161015.263031-10-zhao1.liu@intel.com> (raw)
In-Reply-To: <20240716161015.263031-1-zhao1.liu@intel.com>
kvm_install_msr_filters() uses KVM_MSR_FILTER_MAX_RANGES as the bound
when traversing msr_handlers[], while other places still compute the
size by ARRAY_SIZE(msr_handlers).
In fact, msr_handlers[] is an array with the fixed size
KVM_MSR_FILTER_MAX_RANGES, so there is no difference between the two
ways.
For the code consistency and to avoid additional computational overhead,
use KVM_MSR_FILTER_MAX_RANGES instead of ARRAY_SIZE(msr_handlers).
Suggested-by: Zide Chen <zide.chen@intel.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
---
v4: new commit.
---
target/i386/kvm/kvm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index d47476e96813..43b2ea63d584 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -5314,7 +5314,7 @@ int kvm_filter_msr(KVMState *s, uint32_t msr, QEMURDMSRHandler *rdmsr,
{
int i, ret;
- for (i = 0; i < ARRAY_SIZE(msr_handlers); i++) {
+ for (i = 0; i < KVM_MSR_FILTER_MAX_RANGES; i++) {
if (!msr_handlers[i].msr) {
msr_handlers[i] = (KVMMSRHandlers) {
.msr = msr,
@@ -5340,7 +5340,7 @@ static int kvm_handle_rdmsr(X86CPU *cpu, struct kvm_run *run)
int i;
bool r;
- for (i = 0; i < ARRAY_SIZE(msr_handlers); i++) {
+ for (i = 0; i < KVM_MSR_FILTER_MAX_RANGES; i++) {
KVMMSRHandlers *handler = &msr_handlers[i];
if (run->msr.index == handler->msr) {
if (handler->rdmsr) {
@@ -5360,7 +5360,7 @@ static int kvm_handle_wrmsr(X86CPU *cpu, struct kvm_run *run)
int i;
bool r;
- for (i = 0; i < ARRAY_SIZE(msr_handlers); i++) {
+ for (i = 0; i < KVM_MSR_FILTER_MAX_RANGES; i++) {
KVMMSRHandlers *handler = &msr_handlers[i];
if (run->msr.index == handler->msr) {
if (handler->wrmsr) {
--
2.34.1
next prev parent reply other threads:[~2024-07-16 15:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-16 16:10 [PATCH v4 0/9] target/i386: Misc cleanup on KVM PV defs, outdated comments and error handling Zhao Liu
2024-07-16 16:10 ` [PATCH v4 1/9] target/i386/kvm: Add feature bit definitions for KVM CPUID Zhao Liu
2024-07-18 21:06 ` Chen, Zide
2024-07-16 16:10 ` [PATCH v4 2/9] target/i386/kvm: Remove local MSR_KVM_WALL_CLOCK and MSR_KVM_SYSTEM_TIME definitions Zhao Liu
2024-07-18 21:07 ` Chen, Zide
2024-07-16 16:10 ` [PATCH v4 3/9] target/i386/kvm: Only save/load kvmclock MSRs when kvmclock enabled Zhao Liu
2024-07-18 21:10 ` Chen, Zide
2024-07-16 16:10 ` [PATCH v4 4/9] target/i386/kvm: Save/load MSRs of kvmclock2 (KVM_FEATURE_CLOCKSOURCE2) Zhao Liu
2024-07-18 21:10 ` Chen, Zide
2024-07-16 16:10 ` [PATCH v4 5/9] target/i386/kvm: Drop workaround for KVM_X86_DISABLE_EXITS_HTL typo Zhao Liu
2024-07-18 21:10 ` Chen, Zide
2024-07-16 16:10 ` [PATCH v4 6/9] target/i386/confidential-guest: Fix comment of x86_confidential_guest_kvm_type() Zhao Liu
2024-07-16 16:10 ` [PATCH v4 7/9] target/i386/kvm: Clean up return values of MSR filter related functions Zhao Liu
2024-07-18 21:10 ` Chen, Zide
2024-07-16 16:10 ` [PATCH v4 8/9] target/i386/kvm: Clean up error handling in kvm_arch_init() Zhao Liu
2024-07-18 21:10 ` Chen, Zide
2024-07-16 16:10 ` Zhao Liu [this message]
2024-07-18 21:11 ` [PATCH v4 9/9] target/i386/kvm: Replace ARRAY_SIZE(msr_handlers) with KVM_MSR_FILTER_MAX_RANGES Chen, Zide
2024-09-04 13:46 ` [PATCH v4 0/9] target/i386: Misc cleanup on KVM PV defs, outdated comments and error handling Zhao Liu
2024-09-04 14:40 ` 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=20240716161015.263031-10-zhao1.liu@intel.com \
--to=zhao1.liu@intel.com \
--cc=eduardo@habkost.net \
--cc=kvm@vger.kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pankaj.gupta@amd.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=xiaoyao.li@intel.com \
--cc=zide.chen@intel.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;
as well as URLs for NNTP newsgroup(s).