* [PATCH v2] KVM: vmx: fix build warnings in hv_enable_direct_tlbflush() on i386
@ 2019-09-25 13:30 Vitaly Kuznetsov
2019-09-25 13:31 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: Vitaly Kuznetsov @ 2019-09-25 13:30 UTC (permalink / raw)
To: kvm
Cc: linux-kernel, Paolo Bonzini, Radim Krčmář,
Sean Christopherson, Jim Mattson, Tianyu Lan
The following was reported on i386:
arch/x86/kvm/vmx/vmx.c: In function 'hv_enable_direct_tlbflush':
arch/x86/kvm/vmx/vmx.c:503:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
pr_debugs() in this function are more or less useless, let's just
remove them. evmcs->hv_vm_id can use 'unsigned long' instead of 'u64'.
Also, simplify the code a little bit.
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
arch/x86/kvm/vmx/vmx.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index a7c9922e3905..d5b978068209 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -495,23 +495,19 @@ static int hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu)
* Synthetic VM-Exit is not enabled in current code and so All
* evmcs in singe VM shares same assist page.
*/
- if (!*p_hv_pa_pg) {
+ if (!*p_hv_pa_pg)
*p_hv_pa_pg = kzalloc(PAGE_SIZE, GFP_KERNEL);
- if (!*p_hv_pa_pg)
- return -ENOMEM;
- pr_debug("KVM: Hyper-V: allocated PA_PG for %llx\n",
- (u64)&vcpu->kvm);
- }
+
+ if (!*p_hv_pa_pg)
+ return -ENOMEM;
evmcs = (struct hv_enlightened_vmcs *)to_vmx(vcpu)->loaded_vmcs->vmcs;
evmcs->partition_assist_page =
__pa(*p_hv_pa_pg);
- evmcs->hv_vm_id = (u64)vcpu->kvm;
+ evmcs->hv_vm_id = (unsigned long)vcpu->kvm;
evmcs->hv_enlightenments_control.nested_flush_hypercall = 1;
- pr_debug("KVM: Hyper-V: enabled DIRECT flush for %llx\n",
- (u64)vcpu->kvm);
return 0;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] KVM: vmx: fix build warnings in hv_enable_direct_tlbflush() on i386
2019-09-25 13:30 [PATCH v2] KVM: vmx: fix build warnings in hv_enable_direct_tlbflush() on i386 Vitaly Kuznetsov
@ 2019-09-25 13:31 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2019-09-25 13:31 UTC (permalink / raw)
To: Vitaly Kuznetsov, kvm
Cc: linux-kernel, Radim Krčmář,
Sean Christopherson, Jim Mattson, Tianyu Lan
On 25/09/19 15:30, Vitaly Kuznetsov wrote:
> The following was reported on i386:
>
> arch/x86/kvm/vmx/vmx.c: In function 'hv_enable_direct_tlbflush':
> arch/x86/kvm/vmx/vmx.c:503:10: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
>
> pr_debugs() in this function are more or less useless, let's just
> remove them. evmcs->hv_vm_id can use 'unsigned long' instead of 'u64'.
>
> Also, simplify the code a little bit.
>
> Reported-by: kbuild test robot <lkp@intel.com>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
> arch/x86/kvm/vmx/vmx.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> index a7c9922e3905..d5b978068209 100644
> --- a/arch/x86/kvm/vmx/vmx.c
> +++ b/arch/x86/kvm/vmx/vmx.c
> @@ -495,23 +495,19 @@ static int hv_enable_direct_tlbflush(struct kvm_vcpu *vcpu)
> * Synthetic VM-Exit is not enabled in current code and so All
> * evmcs in singe VM shares same assist page.
> */
> - if (!*p_hv_pa_pg) {
> + if (!*p_hv_pa_pg)
> *p_hv_pa_pg = kzalloc(PAGE_SIZE, GFP_KERNEL);
> - if (!*p_hv_pa_pg)
> - return -ENOMEM;
> - pr_debug("KVM: Hyper-V: allocated PA_PG for %llx\n",
> - (u64)&vcpu->kvm);
> - }
> +
> + if (!*p_hv_pa_pg)
> + return -ENOMEM;
>
> evmcs = (struct hv_enlightened_vmcs *)to_vmx(vcpu)->loaded_vmcs->vmcs;
>
> evmcs->partition_assist_page =
> __pa(*p_hv_pa_pg);
> - evmcs->hv_vm_id = (u64)vcpu->kvm;
> + evmcs->hv_vm_id = (unsigned long)vcpu->kvm;
> evmcs->hv_enlightenments_control.nested_flush_hypercall = 1;
>
> - pr_debug("KVM: Hyper-V: enabled DIRECT flush for %llx\n",
> - (u64)vcpu->kvm);
> return 0;
> }
>
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-25 13:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-25 13:30 [PATCH v2] KVM: vmx: fix build warnings in hv_enable_direct_tlbflush() on i386 Vitaly Kuznetsov
2019-09-25 13:31 ` Paolo Bonzini
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).