[PATCH v4 11/14] KVM/X86: hyperv: Use kvm_vcpu_map in synic_deliver_msg

[KarimAllah Ahmed]

Use kvm_vcpu_map in synic_deliver_msg since using kvm_vcpu_gpa_to_page()
and kmap() will only work for guest memory that has a "struct page".

Signed-off-by: KarimAllah Ahmed <karah...@amazon.de>
---
v1 -> v2:
- Update to match the new API return codes
---
 arch/x86/kvm/hyperv.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 63941ac..af6bd18 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -585,7 +585,7 @@ static int synic_deliver_msg(struct kvm_vcpu_hv_synic 
*synic, u32 sint,
                             struct hv_message *src_msg)
 {
        struct kvm_vcpu *vcpu = synic_to_vcpu(synic);
-       struct page *page;
+       struct kvm_host_map map;
        gpa_t gpa;
        struct hv_message *dst_msg;
        int r;
@@ -595,11 +595,11 @@ static int synic_deliver_msg(struct kvm_vcpu_hv_synic 
*synic, u32 sint,
                return -ENOENT;
 
        gpa = synic->msg_page & PAGE_MASK;
-       page = kvm_vcpu_gfn_to_page(vcpu, gpa >> PAGE_SHIFT);
-       if (is_error_page(page))
+
+       if (kvm_vcpu_map(vcpu, gpa_to_gfn(gpa), &map))
                return -EFAULT;
 
-       msg_page = kmap_atomic(page);
+       msg_page = map.hva;
        dst_msg = &msg_page->sint_message[sint];
        if (sync_cmpxchg(&dst_msg->header.message_type, HVMSG_NONE,
                         src_msg->header.message_type) != HVMSG_NONE) {
@@ -616,8 +616,8 @@ static int synic_deliver_msg(struct kvm_vcpu_hv_synic 
*synic, u32 sint,
                else if (r == 0)
                        r = -EFAULT;
        }
-       kunmap_atomic(msg_page);
-       kvm_release_page_dirty(page);
+
+       kvm_vcpu_unmap(&map);
        kvm_vcpu_mark_page_dirty(vcpu, gpa >> PAGE_SHIFT);
        return r;
 }
-- 
2.7.4