[xen master] xen/x86: mem_sharing: Use copy_domain_page in __mem_sharing_unshare_page

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] xen/x86: mem_sharing: Use copy_domain_page in __mem_sharing_unshare_page

patchbot
commit e6cccc721c58c5e260331050b68bdbd1b36c226d
Author:     Julien Grall <[hidden email]>
AuthorDate: Thu Oct 5 18:42:16 2017 +0100
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Fri Oct 6 13:36:43 2017 +0100

    xen/x86: mem_sharing: Use copy_domain_page in __mem_sharing_unshare_page
   
    The function __mem_sharing_unshare_page contains an open-code version of
    copy_domain_page. Use the function to simplify a bit the code.
   
    At the same time replace _mfn(__page_to_mfn(...)) by page_to_mfn(...)
    given that the file given already provides a typesafe version of page_to_mfn.
   
    Signed-off-by: Julien Grall <[hidden email]>
    Reviewed-by: Andrew Cooper <[hidden email]>
    Acked-by: Tamas K Lengyel <[hidden email]>
---
 xen/arch/x86/mm/mem_sharing.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c
index b856028..6f4be95 100644
--- a/xen/arch/x86/mm/mem_sharing.c
+++ b/xen/arch/x86/mm/mem_sharing.c
@@ -1106,7 +1106,6 @@ int __mem_sharing_unshare_page(struct domain *d,
     p2m_type_t p2mt;
     mfn_t mfn;
     struct page_info *page, *old_page;
-    void *s, *t;
     int last_gfn;
     gfn_info_t *gfn_info = NULL;
   
@@ -1185,11 +1184,7 @@ int __mem_sharing_unshare_page(struct domain *d,
         return -ENOMEM;
     }
 
-    s = map_domain_page(_mfn(__page_to_mfn(old_page)));
-    t = map_domain_page(_mfn(__page_to_mfn(page)));
-    memcpy(t, s, PAGE_SIZE);
-    unmap_domain_page(s);
-    unmap_domain_page(t);
+    copy_domain_page(page_to_mfn(page), page_to_mfn(old_page));
 
     BUG_ON(set_shared_p2m_entry(d, gfn, page_to_mfn(page)));
     mem_sharing_gfn_destroy(old_page, d, gfn_info);
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog