* [PATCH] KVM: apic: remove unused function apic_lvt_vector()
@ 2020-02-13 2:37 linmiaohe
2020-02-13 19:14 ` Krish Sadhukhan
0 siblings, 1 reply; 5+ messages in thread
From: linmiaohe @ 2020-02-13 2:37 UTC (permalink / raw)
To: pbonzini, rkrcmar, sean.j.christopherson, vkuznets, wanpengli,
jmattson, joro, tglx, mingo, bp, hpa
Cc: linmiaohe, kvm, linux-kernel, x86
From: Miaohe Lin <linmiaohe@huawei.com>
The function apic_lvt_vector() is unused now, remove it.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
arch/x86/kvm/lapic.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index eafc631d305c..0b563c280784 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -294,11 +294,6 @@ static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
return !(kvm_lapic_get_reg(apic, lvt_type) & APIC_LVT_MASKED);
}
-static inline int apic_lvt_vector(struct kvm_lapic *apic, int lvt_type)
-{
- return kvm_lapic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK;
-}
-
static inline int apic_lvtt_oneshot(struct kvm_lapic *apic)
{
return apic->lapic_timer.timer_mode == APIC_LVT_TIMER_ONESHOT;
--
2.19.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] KVM: apic: remove unused function apic_lvt_vector()
2020-02-13 2:37 [PATCH] KVM: apic: remove unused function apic_lvt_vector() linmiaohe
@ 2020-02-13 19:14 ` Krish Sadhukhan
2020-02-17 17:02 ` Vitaly Kuznetsov
0 siblings, 1 reply; 5+ messages in thread
From: Krish Sadhukhan @ 2020-02-13 19:14 UTC (permalink / raw)
To: linmiaohe, pbonzini, rkrcmar, sean.j.christopherson, vkuznets,
wanpengli, jmattson, joro, tglx, mingo, bp, hpa
Cc: kvm, linux-kernel, x86
On 2/12/20 6:37 PM, linmiaohe wrote:
> From: Miaohe Lin <linmiaohe@huawei.com>
>
> The function apic_lvt_vector() is unused now, remove it.
>
> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
> ---
> arch/x86/kvm/lapic.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index eafc631d305c..0b563c280784 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -294,11 +294,6 @@ static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
> return !(kvm_lapic_get_reg(apic, lvt_type) & APIC_LVT_MASKED);
> }
>
> -static inline int apic_lvt_vector(struct kvm_lapic *apic, int lvt_type)
> -{
> - return kvm_lapic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK;
> -}
> -
> static inline int apic_lvtt_oneshot(struct kvm_lapic *apic)
> {
> return apic->lapic_timer.timer_mode == APIC_LVT_TIMER_ONESHOT;
There is one place, lapic_timer_int_injected(), where this function be
used :
struct kvm_lapic *apic = vcpu->arch.apic;
- u32 reg = kvm_lapic_get_reg(apic, APIC_LVTT);
if (kvm_apic_hw_enabled(apic)) {
- int vec = reg & APIC_VECTOR_MASK;
+ int vec = apic_lvt_vector(APIC_LVTT);
void *bitmap = apic->regs + APIC_ISR;
But since that's the only place I can find, we probably don't need a
separate function.
Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] KVM: apic: remove unused function apic_lvt_vector()
2020-02-13 19:14 ` Krish Sadhukhan
@ 2020-02-17 17:02 ` Vitaly Kuznetsov
2020-02-17 17:13 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Vitaly Kuznetsov @ 2020-02-17 17:02 UTC (permalink / raw)
To: Krish Sadhukhan, linmiaohe
Cc: kvm, linux-kernel, x86, pbonzini, rkrcmar, sean.j.christopherson,
wanpengli, jmattson, joro, tglx, mingo, bp, hpa
Krish Sadhukhan <krish.sadhukhan@oracle.com> writes:
> On 2/12/20 6:37 PM, linmiaohe wrote:
>> From: Miaohe Lin <linmiaohe@huawei.com>
>>
>> The function apic_lvt_vector() is unused now, remove it.
>>
>> Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
>> ---
>> arch/x86/kvm/lapic.c | 5 -----
>> 1 file changed, 5 deletions(-)
>>
>> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
>> index eafc631d305c..0b563c280784 100644
>> --- a/arch/x86/kvm/lapic.c
>> +++ b/arch/x86/kvm/lapic.c
>> @@ -294,11 +294,6 @@ static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
>> return !(kvm_lapic_get_reg(apic, lvt_type) & APIC_LVT_MASKED);
>> }
>>
>> -static inline int apic_lvt_vector(struct kvm_lapic *apic, int lvt_type)
>> -{
>> - return kvm_lapic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK;
>> -}
>> -
>> static inline int apic_lvtt_oneshot(struct kvm_lapic *apic)
>> {
>> return apic->lapic_timer.timer_mode == APIC_LVT_TIMER_ONESHOT;
>
> There is one place, lapic_timer_int_injected(), where this function be
> used :
>
> struct kvm_lapic *apic = vcpu->arch.apic;
> - u32 reg = kvm_lapic_get_reg(apic, APIC_LVTT);
>
> if (kvm_apic_hw_enabled(apic)) {
>
> - int vec = reg & APIC_VECTOR_MASK;
>
> + int vec = apic_lvt_vector(APIC_LVTT);
> void *bitmap = apic->regs + APIC_ISR;
>
>
> But since that's the only place I can find, we probably don't need a
> separate function.
>
I like the alternative suggestion more than the original patch)
Also, apic_lvt_enabled() is only used once with APIC_LVTT as the second
argument so I'd suggest we also do:
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index afcd30d44cbb..d85463ff4a6f 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -289,14 +289,14 @@ static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u32 id)
recalculate_apic_map(apic->vcpu->kvm);
}
-static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
+static inline int apic_lvtt_enabled(struct kvm_lapic *apic)
{
- return !(kvm_lapic_get_reg(apic, lvt_type) & APIC_LVT_MASKED);
+ return !(kvm_lapic_get_reg(apic, APIC_LVTT) & APIC_LVT_MASKED);
}
-static inline int apic_lvt_vector(struct kvm_lapic *apic, int lvt_type)
+static inline int apic_lvtt_vector(struct kvm_lapic *apic)
{
- return kvm_lapic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK;
+ return kvm_lapic_get_reg(apic, APIC_LVTT) & APIC_VECTOR_MASK;
}
in addition to the above.
--
Vitaly
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] KVM: apic: remove unused function apic_lvt_vector()
2020-02-17 17:02 ` Vitaly Kuznetsov
@ 2020-02-17 17:13 ` Paolo Bonzini
0 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2020-02-17 17:13 UTC (permalink / raw)
To: Vitaly Kuznetsov, Krish Sadhukhan, linmiaohe
Cc: kvm, linux-kernel, x86, rkrcmar, sean.j.christopherson, wanpengli,
jmattson, joro, tglx, mingo, bp, hpa
On 17/02/20 18:02, Vitaly Kuznetsov wrote:
>
> Also, apic_lvt_enabled() is only used once with APIC_LVTT as the second
> argument so I'd suggest we also do:
>
> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
> index afcd30d44cbb..d85463ff4a6f 100644
> --- a/arch/x86/kvm/lapic.c
> +++ b/arch/x86/kvm/lapic.c
> @@ -289,14 +289,14 @@ static inline void kvm_apic_set_x2apic_id(struct kvm_lapic *apic, u32 id)
> recalculate_apic_map(apic->vcpu->kvm);
> }
>
> -static inline int apic_lvt_enabled(struct kvm_lapic *apic, int lvt_type)
> +static inline int apic_lvtt_enabled(struct kvm_lapic *apic)
> {
> - return !(kvm_lapic_get_reg(apic, lvt_type) & APIC_LVT_MASKED);
> + return !(kvm_lapic_get_reg(apic, APIC_LVTT) & APIC_LVT_MASKED);
> }
>
> -static inline int apic_lvt_vector(struct kvm_lapic *apic, int lvt_type)
> +static inline int apic_lvtt_vector(struct kvm_lapic *apic)
> {
> - return kvm_lapic_get_reg(apic, lvt_type) & APIC_VECTOR_MASK;
> + return kvm_lapic_get_reg(apic, APIC_LVTT) & APIC_VECTOR_MASK;
> }
>
> in addition to the above.
>
> -- Vitaly
Sounds good.
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] KVM: apic: remove unused function apic_lvt_vector()
@ 2020-02-18 1:56 linmiaohe
0 siblings, 0 replies; 5+ messages in thread
From: linmiaohe @ 2020-02-18 1:56 UTC (permalink / raw)
To: Paolo Bonzini, Vitaly Kuznetsov, Krish Sadhukhan
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org,
rkrcmar@redhat.com, sean.j.christopherson@intel.com,
wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, hpa@zytor.com
Paolo Bonzini <pbonzini@redhat.com> wrote:
>On 17/02/20 18:02, Vitaly Kuznetsov wrote:
>>
>> Also, apic_lvt_enabled() is only used once with APIC_LVTT as the
>> second argument so I'd suggest we also do:
>>
>> diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index
>>
>> in addition to the above.
>>
>> -- Vitaly
>
>Sounds good.
>
Will do. Thanks all of you.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-18 1:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-13 2:37 [PATCH] KVM: apic: remove unused function apic_lvt_vector() linmiaohe
2020-02-13 19:14 ` Krish Sadhukhan
2020-02-17 17:02 ` Vitaly Kuznetsov
2020-02-17 17:13 ` Paolo Bonzini
-- strict thread matches above, loose matches on Subject: below --
2020-02-18 1:56 linmiaohe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox