[PATCH 4.4 188/193] KVM: nVMX: kmap() cant fail

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: David Hildenbrand 

commit 42cf014d38d8822cce63703a467e00f65d000952 upstream.

kmap() can't fail, therefore it will always return a valid pointer. Let's
just get rid of the unnecessary checks.

Signed-off-by: David Hildenbrand 
Signed-off-by: Paolo Bonzini 
[jwang: port to 4.4]
Signed-off-by: Jack Wang 
Signed-off-by: Greg Kroah-Hartman 
---
 arch/x86/kvm/vmx.c |9 -
 1 file changed, 9 deletions(-)

--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -4532,10 +4532,6 @@ static int vmx_complete_nested_posted_in
return 0;
 
vapic_page = kmap(vmx->nested.virtual_apic_page);
-   if (!vapic_page) {
-   WARN_ON(1);
-   return -ENOMEM;
-   }
__kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);
kunmap(vmx->nested.virtual_apic_page);
 
@@ -9238,11 +9234,6 @@ static inline bool nested_vmx_merge_msr_
return false;
}
msr_bitmap = (unsigned long *)kmap(page);
-   if (!msr_bitmap) {
-   nested_release_page_clean(page);
-   WARN_ON(1);
-   return false;
-   }
 
if (nested_cpu_has_virt_x2apic_mode(vmcs12)) {
if (nested_cpu_has_apic_reg_virt(vmcs12))

[PATCH 4.4 188/193] KVM: nVMX: kmap() cant fail

[Greg Kroah-Hartman]

4.4-stable review patch.  If anyone has any objections, please let me know.

--

From: David Hildenbrand 

commit 42cf014d38d8822cce63703a467e00f65d000952 upstream.

kmap() can't fail, therefore it will always return a valid pointer. Let's
just get rid of the unnecessary checks.

Signed-off-by: David Hildenbrand 
Signed-off-by: Paolo Bonzini 
[jwang: port to 4.4]
Signed-off-by: Jack Wang 
Signed-off-by: Greg Kroah-Hartman 
---
 arch/x86/kvm/vmx.c |9 -
 1 file changed, 9 deletions(-)

--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -4532,10 +4532,6 @@ static int vmx_complete_nested_posted_in
return 0;
 
vapic_page = kmap(vmx->nested.virtual_apic_page);
-   if (!vapic_page) {
-   WARN_ON(1);
-   return -ENOMEM;
-   }
__kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);
kunmap(vmx->nested.virtual_apic_page);
 
@@ -9238,11 +9234,6 @@ static inline bool nested_vmx_merge_msr_
return false;
}
msr_bitmap = (unsigned long *)kmap(page);
-   if (!msr_bitmap) {
-   nested_release_page_clean(page);
-   WARN_ON(1);
-   return false;
-   }
 
if (nested_cpu_has_virt_x2apic_mode(vmcs12)) {
if (nested_cpu_has_apic_reg_virt(vmcs12))