From: Mateusz Polrola <mateuszx.potr...@intel.com>

If shared pages of buffer were already mapped on importer side, do
not map them again on next request to export fd.

Signed-off-by: Mateusz Polrola <mateuszx.potr...@intel.com>
Signed-off-by: Dongwon Kim <dongwon....@intel.com>
---
 drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c 
b/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c
index 90e0c65..af94359 100644
--- a/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c
+++ b/drivers/xen/hyper_dmabuf/hyper_dmabuf_ioctl.c
@@ -203,7 +203,7 @@ static int hyper_dmabuf_export_fd_ioctl(void *data)
 
        if (!data) {
                printk("user data is NULL\n");
-               return -1;
+               return -EINVAL;
        }
 
        export_fd_attr = (struct ioctl_hyper_dmabuf_export_fd *)data;
@@ -218,15 +218,17 @@ static int hyper_dmabuf_export_fd_ioctl(void *data)
                imported_sgt_info->last_len, imported_sgt_info->nents,
                
HYPER_DMABUF_ID_IMPORTER_GET_SDOMAIN_ID(imported_sgt_info->hyper_dmabuf_id));
 
-       imported_sgt_info->sgt = hyper_dmabuf_map_pages(imported_sgt_info->gref,
-                                               imported_sgt_info->frst_ofst,
-                                               imported_sgt_info->last_len,
-                                               imported_sgt_info->nents,
-                                               
HYPER_DMABUF_ID_IMPORTER_GET_SDOMAIN_ID(imported_sgt_info->hyper_dmabuf_id),
-                                               
&imported_sgt_info->shared_pages_info);
-
        if (!imported_sgt_info->sgt) {
-               return -1;
+               imported_sgt_info->sgt = 
hyper_dmabuf_map_pages(imported_sgt_info->gref,
+                                                       
imported_sgt_info->frst_ofst,
+                                                       
imported_sgt_info->last_len,
+                                                       
imported_sgt_info->nents,
+                                                       
HYPER_DMABUF_ID_IMPORTER_GET_SDOMAIN_ID(imported_sgt_info->hyper_dmabuf_id),
+                                                       
&imported_sgt_info->shared_pages_info);
+               if (!imported_sgt_info->sgt) {
+                       printk("Failed to create sgt\n");
+                       return -EINVAL;
+               }
        }
 
        export_fd_attr->fd = hyper_dmabuf_export_fd(imported_sgt_info, 
export_fd_attr->flags);
-- 
2.7.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to