Skip to contentSkip to conversation

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

PATCH In review David Yat Sin 3 participants 3 messages Mar 9, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

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

---
 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++++++
 include/uapi/linux/kfd_ioctl.h           | 2 ++
 2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +6 -0
index e1e2362841f8..607f65ab39ac 100644
@@ -1767,7 +1767,10 @@ static int criu_checkpoint_bos(struct kfd_process *p,
 						&bo_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 +2222,10 @@ static int criu_restore_bo(struct kfd_process *p,
 					    &bo_bucket->dmabuf_fd);
 		if (ret)
 			return ret;
+	} else {
+		bo_bucket->dmabuf_fd = KFD_INVALID_FD;
 	}
+
 	return 0;
 }
 
include/uapi/linux/kfd_ioctl.h +2 -0
index eb9ff85f8556..42975e940758 100644
@@ -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     0xffffffff
+
 /* Matching HSA_EVENTTYPE */
 #define KFD_IOC_EVENT_SIGNAL			0
 #define KFD_IOC_EVENT_NODECHANGE		1
Signature · 1 line
2.35.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 1 line · 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

Quoted 44 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++++++
  include/uapi/linux/kfd_ioctl.h           | 2 ++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +6 -0
index e1e2362841f8..607f65ab39ac 100644
@@ -1767,7 +1767,10 @@ static int criu_checkpoint_bos(struct kfd_process *p,
  						&bo_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 +2222,10 @@ static int criu_restore_bo(struct kfd_process *p,
  					    &bo_bucket->dmabuf_fd);
  		if (ret)
  			return ret;
+	} else {
+		bo_bucket->dmabuf_fd = KFD_INVALID_FD;
  	}
+
  	return 0;
  }
 
include/uapi/linux/kfd_ioctl.h +2 -0
index eb9ff85f8556..42975e940758 100644
@@ -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     0xffffffff
+
  /* Matching HSA_EVENTTYPE */
  #define KFD_IOC_EVENT_SIGNAL			0
  #define KFD_IOC_EVENT_NODECHANGE		1
#2 lore raw

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

Alex

Alex

Quoted 54 lines · Felix Kuehling
Quoted 1 line · 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

Quoted 44 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++++++
  include/uapi/linux/kfd_ioctl.h           | 2 ++
  2 files changed, 8 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +6 -0
index e1e2362841f8..607f65ab39ac 100644
@@ -1767,7 +1767,10 @@ static int criu_checkpoint_bos(struct kfd_process *p,
                                              &bo_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 +2222,10 @@ static int criu_restore_bo(struct kfd_process *p,
                                          &bo_bucket->dmabuf_fd);
              if (ret)
                      return ret;
+     } else {
+             bo_bucket->dmabuf_fd = KFD_INVALID_FD;
      }
+
      return 0;
  }
 
include/uapi/linux/kfd_ioctl.h +2 -0
index eb9ff85f8556..42975e940758 100644
@@ -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     0xffffffff
+
  /* Matching HSA_EVENTTYPE */
  #define KFD_IOC_EVENT_SIGNAL                        0
  #define KFD_IOC_EVENT_NODECHANGE            1