From: Jinrong Liang <ljr.kernel@gmail.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Xianting Tian <xianting.tian@linux.alibaba.com>,
Jim Mattson <jmattson@google.com>,
Sean Christopherson <seanjc@google.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Joerg Roedel <joro@8bytes.org>,
kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 17/19] KVM: x86: Remove unused "vcpu" of kvm_scale_tsc()
Date: Tue, 25 Jan 2022 17:59:07 +0800 [thread overview]
Message-ID: <20220125095909.38122-18-cloudliang@tencent.com> (raw)
In-Reply-To: <20220125095909.38122-1-cloudliang@tencent.com>
From: Jinrong Liang <cloudliang@tencent.com>
The "struct kvm_vcpu *vcpu" parameter of kvm_scale_tsc() is not used,
so remove it. No functional change intended.
Signed-off-by: Jinrong Liang <cloudliang@tencent.com>
---
arch/x86/include/asm/kvm_host.h | 2 +-
arch/x86/kvm/x86.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 682ad02a4e58..ebd5a1e8db77 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1871,7 +1871,7 @@ static inline bool kvm_is_supported_user_return_msr(u32 msr)
return kvm_find_user_return_msr(msr) >= 0;
}
-u64 kvm_scale_tsc(struct kvm_vcpu *vcpu, u64 tsc, u64 ratio);
+u64 kvm_scale_tsc(u64 tsc, u64 ratio);
u64 kvm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc);
u64 kvm_calc_nested_tsc_offset(u64 l1_offset, u64 l2_offset, u64 l2_multiplier);
u64 kvm_calc_nested_tsc_multiplier(u64 l1_multiplier, u64 l2_multiplier);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 22b73b918884..4e438e009ba9 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -2397,7 +2397,7 @@ static inline u64 __scale_tsc(u64 ratio, u64 tsc)
return mul_u64_u64_shr(tsc, ratio, kvm_tsc_scaling_ratio_frac_bits);
}
-u64 kvm_scale_tsc(struct kvm_vcpu *vcpu, u64 tsc, u64 ratio)
+u64 kvm_scale_tsc(u64 tsc, u64 ratio)
{
u64 _tsc = tsc;
@@ -2412,7 +2412,7 @@ static u64 kvm_compute_l1_tsc_offset(struct kvm_vcpu *vcpu, u64 target_tsc)
{
u64 tsc;
- tsc = kvm_scale_tsc(vcpu, rdtsc(), vcpu->arch.l1_tsc_scaling_ratio);
+ tsc = kvm_scale_tsc(rdtsc(), vcpu->arch.l1_tsc_scaling_ratio);
return target_tsc - tsc;
}
@@ -2420,7 +2420,7 @@ static u64 kvm_compute_l1_tsc_offset(struct kvm_vcpu *vcpu, u64 target_tsc)
u64 kvm_read_l1_tsc(struct kvm_vcpu *vcpu, u64 host_tsc)
{
return vcpu->arch.l1_tsc_offset +
- kvm_scale_tsc(vcpu, host_tsc, vcpu->arch.l1_tsc_scaling_ratio);
+ kvm_scale_tsc(host_tsc, vcpu->arch.l1_tsc_scaling_ratio);
}
EXPORT_SYMBOL_GPL(kvm_read_l1_tsc);
@@ -2623,7 +2623,7 @@ static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment)
{
if (vcpu->arch.l1_tsc_scaling_ratio != kvm_default_tsc_scaling_ratio)
WARN_ON(adjustment < 0);
- adjustment = kvm_scale_tsc(vcpu, (u64) adjustment,
+ adjustment = kvm_scale_tsc((u64) adjustment,
vcpu->arch.l1_tsc_scaling_ratio);
adjust_tsc_offset_guest(vcpu, adjustment);
}
@@ -3043,7 +3043,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
/* With all the info we got, fill in the values */
if (kvm_has_tsc_control)
- tgt_tsc_khz = kvm_scale_tsc(v, tgt_tsc_khz,
+ tgt_tsc_khz = kvm_scale_tsc(tgt_tsc_khz,
v->arch.l1_tsc_scaling_ratio);
if (unlikely(vcpu->hw_tsc_khz != tgt_tsc_khz)) {
@@ -3854,7 +3854,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
ratio = vcpu->arch.tsc_scaling_ratio;
}
- msr_info->data = kvm_scale_tsc(vcpu, rdtsc(), ratio) + offset;
+ msr_info->data = kvm_scale_tsc(rdtsc(), ratio) + offset;
break;
}
case MSR_MTRRcap:
@@ -5067,7 +5067,7 @@ static int kvm_arch_tsc_set_attr(struct kvm_vcpu *vcpu,
kvm->arch.last_tsc_khz == vcpu->arch.virtual_tsc_khz &&
kvm->arch.last_tsc_offset == offset);
- tsc = kvm_scale_tsc(vcpu, rdtsc(), vcpu->arch.l1_tsc_scaling_ratio) + offset;
+ tsc = kvm_scale_tsc(rdtsc(), vcpu->arch.l1_tsc_scaling_ratio) + offset;
ns = get_kvmclock_base_ns();
__kvm_synchronize_tsc(vcpu, offset, tsc, ns, matched);
--
2.33.1
next prev parent reply other threads:[~2022-01-25 10:12 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 9:58 [PATCH 00/19] KVM: x86: Bulk removal of unused function parameters Jinrong Liang
2022-01-25 9:58 ` [PATCH 01/19] KVM: x86/mmu: Remove unused "kvm" of kvm_mmu_unlink_parents() Jinrong Liang
2022-01-25 9:58 ` [PATCH 02/19] KVM: x86/mmu: Remove unused "kvm" of __rmap_write_protect() Jinrong Liang
2022-01-25 9:58 ` [PATCH 03/19] KVM: x86/mmu: Remove unused "vcpu" of reset_{tdp,ept}_shadow_zero_bits_mask() Jinrong Liang
2022-01-25 9:58 ` [PATCH 04/19] KVM: x86/tdp_mmu: Remove unused "kvm" of kvm_tdp_mmu_get_root() Jinrong Liang
2022-01-25 9:58 ` [PATCH 05/19] KVM: x86/mmu_audit: Remove unused "level" of audit_spte_after_sync() Jinrong Liang
2022-01-25 9:58 ` [PATCH 06/19] KVM: x86/svm: Remove unused "vcpu" of svm_check_exit_valid() Jinrong Liang
2022-01-25 9:58 ` [PATCH 07/19] KVM: x86/svm: Remove unused "vcpu" of nested_svm_check_tlb_ctl() Jinrong Liang
2022-01-25 16:02 ` Paolo Bonzini
2022-01-25 9:58 ` [PATCH 08/19] KVM: x86: Remove unused "vcpu" of kvm_after_interrupt() Jinrong Liang
2022-01-25 9:58 ` [PATCH 09/19] KVM: x86/svm: Remove unused "svm" of sev_es_prepare_guest_switch() Jinrong Liang
2022-01-25 16:29 ` Paolo Bonzini
2022-01-25 9:59 ` [PATCH 10/19] KVM: x86/sev: Remove unused "kvm" of sev_unbind_asid() Jinrong Liang
2022-01-25 9:59 ` [PATCH 11/19] KVM: x86/svm: Remove unused "vector" of sev_vcpu_deliver_sipi_vector() Jinrong Liang
2022-01-25 16:16 ` Paolo Bonzini
2022-01-25 9:59 ` [PATCH 12/19] KVM: x86/i8259: Remove unused "addr" of elcr_ioport_{read,write}() Jinrong Liang
2022-01-25 9:59 ` [PATCH 13/19] KVM: x86/ioapic: Remove unused "addr" and "length" of ioapic_read_indirect() Jinrong Liang
2022-01-25 9:59 ` [PATCH 14/19] KVM: x86/emulate: Remove unused "ctxt" of setup_syscalls_segments() Jinrong Liang
2022-01-25 9:59 ` [PATCH 15/19] KVM: x86/emulate: Remove unused "ctxt" of task_switch_{16, 32}() Jinrong Liang
2022-01-25 16:29 ` Paolo Bonzini
2022-01-25 9:59 ` [PATCH 16/19] KVM: x86: Remove unused "vcpu" of kvm_arch_tsc_has_attr() Jinrong Liang
2022-01-25 16:31 ` Paolo Bonzini
2022-01-25 9:59 ` Jinrong Liang [this message]
2022-01-25 9:59 ` [PATCH 18/19] KVM: Remove unused "kvm" of kvm_make_vcpu_request() Jinrong Liang
2022-01-25 9:59 ` [PATCH 19/19] KVM: Remove unused "flags" of kvm_pv_kick_cpu_op() Jinrong Liang
2022-01-25 16:32 ` [PATCH 00/19] KVM: x86: Bulk removal of unused function parameters 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=20220125095909.38122-18-cloudliang@tencent.com \
--to=ljr.kernel@gmail.com \
--cc=jmattson@google.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=xianting.tian@linux.alibaba.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
Powered by JetHome