Re: [PATCH] fixup! drm/amdkfd: CRIU export dmabuf handles for GTT BOs

[Alex Deucher]

No problem.  squashed in:
https://gitlab.freedesktop.org/agd5f/linux/-/commit/74041e46982cd627e7b52f9c3ed37d23a4973b5f

Alex


Alex

On Wed, Mar 9, 2022 at 4:23 PM Felix Kuehling  wrote:
>
> On 2022-03-09 16:20, David Yat Sin wrote:
> > Signed-off-by: David Yat Sin 
>
> Please add the commit description back. And let's wait for Alex to
> confirm that the fixup-method is OK. With that fixed, the patch is
>
> Reviewed-by: Felix Kuehling 
>
>
> > ---
> >   drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++
> >   include/uapi/linux/kfd_ioctl.h   | 2 ++
> >   2 files changed, 8 insertions(+)
> >
> > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c 
> > b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> > index e1e2362841f8..607f65ab39ac 100644
> > --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> > @@ -1767,7 +1767,10 @@ static int criu_checkpoint_bos(struct kfd_process *p,
> >   _bucket->dmabuf_fd);
> >   if (ret)
> >   goto exit;
> > + } else {
> > + bo_bucket->dmabuf_fd = KFD_INVALID_FD;
> >   }
> > +
> >   if (bo_bucket->alloc_flags & 
> > KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL)
> >   bo_bucket->offset = KFD_MMAP_TYPE_DOORBELL |
> >   KFD_MMAP_GPU_ID(pdd->dev->id);
> > @@ -2219,7 +,10 @@ static int criu_restore_bo(struct kfd_process *p,
> >   _bucket->dmabuf_fd);
> >   if (ret)
> >   return ret;
> > + } else {
> > + bo_bucket->dmabuf_fd = KFD_INVALID_FD;
> >   }
> > +
> >   return 0;
> >   }
> >
> > diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
> > index eb9ff85f8556..42975e940758 100644
> > --- a/include/uapi/linux/kfd_ioctl.h
> > +++ b/include/uapi/linux/kfd_ioctl.h
> > @@ -196,6 +196,8 @@ struct kfd_ioctl_dbg_wave_control_args {
> >   __u32 buf_size_in_bytes;/*including gpu_id and buf_size */
> >   };
> >
> > +#define KFD_INVALID_FD 0x
> > +
> >   /* Matching HSA_EVENTTYPE */
> >   #define KFD_IOC_EVENT_SIGNAL0
> >   #define KFD_IOC_EVENT_NODECHANGE1

Re: [PATCH] fixup! drm/amdkfd: CRIU export dmabuf handles for GTT BOs

[Felix Kuehling]

On 2022-03-09 16:20, David Yat Sin wrote:

Signed-off-by: David Yat Sin 


Please add the commit description back. And let's wait for Alex to 
confirm that the fixup-method is OK. With that fixed, the patch is


Reviewed-by: Felix Kuehling 



---
  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++
  include/uapi/linux/kfd_ioctl.h   | 2 ++
  2 files changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index e1e2362841f8..607f65ab39ac 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1767,7 +1767,10 @@ static int criu_checkpoint_bos(struct kfd_process *p,
_bucket->dmabuf_fd);
if (ret)
goto exit;
+   } else {
+   bo_bucket->dmabuf_fd = KFD_INVALID_FD;
}
+
if (bo_bucket->alloc_flags & 
KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL)
bo_bucket->offset = KFD_MMAP_TYPE_DOORBELL |
KFD_MMAP_GPU_ID(pdd->dev->id);
@@ -2219,7 +,10 @@ static int criu_restore_bo(struct kfd_process *p,
_bucket->dmabuf_fd);
if (ret)
return ret;
+   } else {
+   bo_bucket->dmabuf_fd = KFD_INVALID_FD;
}
+
return 0;
  }
  
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h

index eb9ff85f8556..42975e940758 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -196,6 +196,8 @@ struct kfd_ioctl_dbg_wave_control_args {
__u32 buf_size_in_bytes;/*including gpu_id and buf_size */
  };
  
+#define KFD_INVALID_FD 0x

+
  /* Matching HSA_EVENTTYPE */
  #define KFD_IOC_EVENT_SIGNAL  0
  #define KFD_IOC_EVENT_NODECHANGE  1

[PATCH] fixup! drm/amdkfd: CRIU export dmabuf handles for GTT BOs

[David Yat Sin]

Signed-off-by: David Yat Sin 
---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++
 include/uapi/linux/kfd_ioctl.h   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index e1e2362841f8..607f65ab39ac 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1767,7 +1767,10 @@ static int criu_checkpoint_bos(struct kfd_process *p,
_bucket->dmabuf_fd);
if (ret)
goto exit;
+   } else {
+   bo_bucket->dmabuf_fd = KFD_INVALID_FD;
}
+
if (bo_bucket->alloc_flags & 
KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL)
bo_bucket->offset = KFD_MMAP_TYPE_DOORBELL |
KFD_MMAP_GPU_ID(pdd->dev->id);
@@ -2219,7 +,10 @@ static int criu_restore_bo(struct kfd_process *p,
_bucket->dmabuf_fd);
if (ret)
return ret;
+   } else {
+   bo_bucket->dmabuf_fd = KFD_INVALID_FD;
}
+
return 0;
 }
 
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index eb9ff85f8556..42975e940758 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -196,6 +196,8 @@ struct kfd_ioctl_dbg_wave_control_args {
__u32 buf_size_in_bytes;/*including gpu_id and buf_size */
 };
 
+#define KFD_INVALID_FD 0x
+
 /* Matching HSA_EVENTTYPE */
 #define KFD_IOC_EVENT_SIGNAL   0
 #define KFD_IOC_EVENT_NODECHANGE   1
-- 
2.35.1