HMM profiler interface
Subsystems (3)
v3 cover HMM profiler interface
This implements KFD profiling APIs to expose HMM migration and recoverable page fault profiling data. The ROCm profiler will shared link with application, to collect and expose the profiling data to application developers to tune the applications based on how the address range attributes affect the behavior and performance. Kernel perf and ftrace requires superuser permission to collect data, it is not suitable for ROCm profiler.
The profiling data is per process per device event uses the existing SMI (system management interface) event API. Each event log is one line of text with the event specific information.
User space usage example for rocm-smi lib and tools under review:
https://github.com/RadeonOpenCompute/rocm_smi_lib/pull/96
v3:
* Changes from Felix's review
v2:
* Keep existing events behaviour
* Use ktime_get_boottime_ns() as timestamp to correlate with other APIs
* Use compact message layout, stick with existing message convention
* Add unmap from GPU event
Philip Yang (8):
drm/amdkfd: Add KFD SMI event IDs and triggers drm/amdkfd: Correct SMI event read size drm/amdkfd: Enable per process SMI event drm/amdkfd: Add GPU recoverable fault SMI event drm/amdkfd: Add migration SMI event
drm/amdkfd: Add user queue eviction restore SMI event drm/amdkfd: Add unmap from GPU SMI event drm/amdkfd: Bump KFD API version for SMI profiling event
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 12 +- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 53 +++-- drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 15 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 188 ++++++++++++++++-- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 21 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 68 +++++-- drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 +- include/uapi/linux/kfd_ioctl.h | 41 +++- 13 files changed, 353 insertions(+), 64 deletions(-)
Signature · 1 line
2.17.1
PATCH v3 1/8 drm/amdkfd: Add KFD SMI event IDs and triggers
Define new system management interface event IDs for migration, GPU recoverable page fault, user queues eviction, restore and unmap from GPU events and corresponding event triggers, those will be implemented in the following patches.
--- include/uapi/linux/kfd_ioctl.h | 38 ++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
include/uapi/linux/kfd_ioctl.h +38 -0
@@ -460,9 +460,47 @@ enum kfd_smi_event {KFD_SMI_EVENT_THERMAL_THROTTLE =2 ,KFD_SMI_EVENT_GPU_PRE_RESET =3 ,KFD_SMI_EVENT_GPU_POST_RESET =4 , +KFD_SMI_EVENT_MIGRATE_START =5 , +KFD_SMI_EVENT_MIGRATE_END =6 , +KFD_SMI_EVENT_PAGE_FAULT_START =7 , +KFD_SMI_EVENT_PAGE_FAULT_END =8 , +KFD_SMI_EVENT_QUEUE_EVICTION =9 , +KFD_SMI_EVENT_QUEUE_RESTORE =10 , +KFD_SMI_EVENT_UNMAP_FROM_GPU =11 , + +/* +* max event number, as a flag bit to get events from all processes, +* this requires super user permission, otherwise will not be able to +* receive event from any process. Without this flag to receive events +* from same process. +*/ +KFD_SMI_EVENT_ALL_PROCESS =64 };#define KFD_SMI_EVENT_MASK_FROM_INDEX (i) (1ULL << ((i) - 1)) +#define KFD_SMI_EVENT_MSG_SIZE 96 + +enum KFD_MIGRATE_TRIGGERS { +KFD_MIGRATE_TRIGGER_PREFETCH =1 , +KFD_MIGRATE_TRIGGER_PAGEFAULT_GPU , +KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU , +KFD_MIGRATE_TRIGGER_TTM_EVICTION +}; + +enum KFD_QUEUE_EVICTION_TRIGGERS { +KFD_QUEUE_EVICTION_TRIGGER_SVM =1 , +KFD_QUEUE_EVICTION_TRIGGER_USERPTR , +KFD_QUEUE_EVICTION_TRIGGER_TTM , +KFD_QUEUE_EVICTION_TRIGGER_SUSPEND , +KFD_QUEUE_EVICTION_CRIU_CHECKPOINT , +KFD_QUEUE_EVICTION_CRIU_RESTORE +}; + +enum KFD_SVM_UNMAP_TRIGGERS { +KFD_SVM_UNMAP_TRIGGER_MMU_NOTIFY =1 , +KFD_SVM_UNMAP_TRIGGER_MMU_NOTIFY_MIGRATE , +KFD_SVM_UNMAP_TRIGGER_UNMAP_FROM_CPU +}; struct kfd_ioctl_smi_events_args { __u32 gpuid; /* to KFD */
Signature · 1 line
2.17.1
PATCH v3 2/8 drm/amdkfd: Correct SMI event read size
In reply to Philip Yangsizeof(buf) is 8 bytes because it is defined as unsigned char *buf, each SMI event read only copy max 8 bytes to user buffer. Correct this by using the buf allocate size.
Use KFD_SMI_EVENT_MSG_SIZE to define msg size, the same size will be used in user space to alloc the msg receive buffer.
--- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +6 -5
@@ -82,7 +82,8 @@ static ssize_t kfd_smi_ev_read(struct file *filep, char __user *user,struct kfd_smi_client *client = filep->private_data;unsigned char *buf; - buf =kmalloc_array (MAX_KFIFO_SIZE ,sizeof (*buf),GFP_KERNEL ); + size =min_t (size_t, size,MAX_KFIFO_SIZE ); + buf =kmalloc (size,GFP_KERNEL );if (!buf)return -ENOMEM ;
@@ -96,7 +97,7 @@ static ssize_t kfd_smi_ev_read(struct file *filep, char __user *user, ret = -EAGAIN ; goto ret_err; } - to_copy =min3 (size,sizeof (buf), to_copy); + to_copy =min (size, to_copy); ret =kfifo_out (&client->fifo, buf, to_copy);spin_unlock (&client->lock);if (ret <=0 ) {
@@ -183,7 +184,7 @@ void kfd_smi_event_update_gpu_reset(struct kfd_dev *dev, bool post_reset)* 1 byte event + 1 byte space + 8 bytes seq num + * 1 byte \n + 1 byte \0 = 12 */ -char fifo_in[12 ]; +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ];int len;unsigned int event;
@@ -215,7 +216,7 @@ void kfd_smi_event_update_thermal_throttling(struct kfd_dev *dev,* 1 byte : + 16 byte thermal_interupt_counter + 1 byte \n + * 1 byte \0 = 37 */ -char fifo_in[37 ]; +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ];int len;if (list_empty (&dev->smi_clients))
@@ -235,7 +236,7 @@ void kfd_smi_event_update_vmfault(struct kfd_dev *dev, uint16_t pasid)/* 1 byte event + 1 byte space + 25 bytes msg + 1 byte \n + * 1 byte \0 = 29 */ -char fifo_in[29 ]; +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ];int len;if (list_empty (&dev->smi_clients))
Signature · 1 line
2.17.1
PATCH v3 3/8 drm/amdkfd: Enable per process SMI event
In reply to Philip YangProcess receive event from same process by default. Add a flag to be able to receive event from all processes, this requires super user permission.
Event using pid 0 to send the event to all processes, to keep the default behavior of existing SMI events.
--- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 29 ++++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +22 -7
@@ -38,6 +38,8 @@ struct kfd_smi_client {uint64_t events;struct kfd_dev *dev;spinlock_t lock; +pid_t pid; +bool suser; };#define MAX_KFIFO_SIZE 1024
@@ -151,16 +153,27 @@ static int kfd_smi_ev_release(struct inode *inode, struct file *filep)return 0 ; } -static void add_event_to_kfifo (struct kfd_dev *dev,unsigned int smi_event, -char *event_msg,int len) +static bool kfd_smi_ev_enabled (pid_t pid,struct kfd_smi_client *client, +unsigned int event) +{ +uint64_t all =KFD_SMI_EVENT_MASK_FROM_INDEX (KFD_SMI_EVENT_ALL_PROCESS ); +uint64_t events =READ_ONCE (client->events); + +if (pid && client->pid != pid && !(client->suser && (events & all))) +return false; + +return events &KFD_SMI_EVENT_MASK_FROM_INDEX (event); +} + +static void add_event_to_kfifo (pid_t pid,struct kfd_dev *dev, +unsigned int smi_event,char *event_msg,int len) {struct kfd_smi_client *client;rcu_read_lock ();list_for_each_entry_rcu (client, &dev->smi_clients, list) { -if (!(READ_ONCE (client->events) & -KFD_SMI_EVENT_MASK_FROM_INDEX (smi_event))) +if (!kfd_smi_ev_enabled (pid, client, smi_event))continue ;spin_lock (&client->lock);if (kfifo_avail (&client->fifo) >= len) {
@@ -203,7 +216,7 @@ void kfd_smi_event_update_gpu_reset(struct kfd_dev *dev, bool post_reset) len =snprintf (fifo_in,sizeof (fifo_in),"%x %x\n" , event, dev->reset_seq_num); -add_event_to_kfifo (dev, event, fifo_in, len); +add_event_to_kfifo (0 , dev, event, fifo_in, len); } void kfd_smi_event_update_thermal_throttling(struct kfd_dev *dev,
@@ -226,7 +239,7 @@ void kfd_smi_event_update_thermal_throttling(struct kfd_dev *dev,KFD_SMI_EVENT_THERMAL_THROTTLE , throttle_bitmask, amdgpu_dpm_get_thermal_throttling_counter(dev->adev)); -add_event_to_kfifo (dev,KFD_SMI_EVENT_THERMAL_THROTTLE , fifo_in, len); +add_event_to_kfifo (0 , dev,KFD_SMI_EVENT_THERMAL_THROTTLE , fifo_in, len); }void kfd_smi_event_update_vmfault (struct kfd_dev *dev,uint16_t pasid)
@@ -251,7 +264,7 @@ void kfd_smi_event_update_vmfault(struct kfd_dev *dev, uint16_t pasid) len =snprintf (fifo_in,sizeof (fifo_in),"%x %x:%s\n" ,KFD_SMI_EVENT_VMFAULT , task_info.pid, task_info.task_name); -add_event_to_kfifo (dev,KFD_SMI_EVENT_VMFAULT , fifo_in, len); +add_event_to_kfifo (0 , dev,KFD_SMI_EVENT_VMFAULT , fifo_in, len); }int kfd_smi_event_open (struct kfd_dev *dev,uint32_t *fd)
@@ -283,6 +296,8 @@ int kfd_smi_event_open(struct kfd_dev *dev, uint32_t *fd)spin_lock_init (&client->lock); client->events =0 ; client->dev = dev; + client->pid = current->pid; + client->suser =capable (CAP_SYS_ADMIN );spin_lock (&dev->smi_lock);list_add_rcu (&client->list, &dev->smi_clients);
Signature · 1 line
2.17.1
PATCH v3 4/8 drm/amdkfd: Add GPU recoverable fault SMI event
In reply to Philip YangOutput timestamp when GPU recoverable fault starts and ends to recover the fault, if migration happened or only GPU page table is updated, fault address, if read or write fault.
--- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 36 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 6 +++- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 21 ++++++++---- drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 2 +- 4 files changed, 57 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +36 -0
@@ -267,6 +267,42 @@ void kfd_smi_event_update_vmfault(struct kfd_dev *dev, uint16_t pasid)add_event_to_kfifo (0 , dev,KFD_SMI_EVENT_VMFAULT , fifo_in, len); } +void kfd_smi_event_page_fault_start (struct kfd_dev *dev,pid_t pid, +unsigned long address,bool write_fault, +ktime_t ts) +{ +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ]; +int len; + +if (list_empty (&dev->smi_clients)) +return ; + + len =snprintf (fifo_in,sizeof (fifo_in),"%x %lld -%d @%lx(%x) %c\n" , +KFD_SMI_EVENT_PAGE_FAULT_START ,ktime_to_ns (ts), pid, + address, dev->id, write_fault ?'W' :'R' ); + +add_event_to_kfifo (pid, dev,KFD_SMI_EVENT_PAGE_FAULT_START , fifo_in, + len); +} + +void kfd_smi_event_page_fault_end (struct kfd_dev *dev,pid_t pid, +unsigned long address,bool migration) +{ +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ]; +int len; + +if (list_empty (&dev->smi_clients)) +return ; + + len =snprintf (fifo_in,sizeof (fifo_in), +"%x %lld -%d @%lx(%x) %c\n" , +KFD_SMI_EVENT_PAGE_FAULT_END ,ktime_get_boottime_ns (), + pid, address, dev->id, migration ?'M' :'U' ); + +add_event_to_kfifo (pid, dev,KFD_SMI_EVENT_PAGE_FAULT_END , fifo_in, + len); +} +int kfd_smi_event_open (struct kfd_dev *dev,uint32_t *fd) {struct kfd_smi_client *client;
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h +5 -1
@@ -29,5 +29,9 @@ void kfd_smi_event_update_vmfault(struct kfd_dev *dev, uint16_t pasid);void kfd_smi_event_update_thermal_throttling (struct kfd_dev *dev,uint64_t throttle_bitmask);void kfd_smi_event_update_gpu_reset (struct kfd_dev *dev,bool post_reset); - +void kfd_smi_event_page_fault_start (struct kfd_dev *dev,pid_t pid, +unsigned long address,bool write_fault, +ktime_t ts); +void kfd_smi_event_page_fault_end (struct kfd_dev *dev,pid_t pid, +unsigned long address,bool migration);#endif
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +15 -6
@@ -32,6 +32,7 @@#include "kfd_priv.h" #include "kfd_svm.h" #include "kfd_migrate.h" +#include "kfd_smi_events.h" #ifdef dev_fmt#undef dev_fmt
@@ -41,9 +42,9 @@#define AMDGPU_SVM_RANGE_RESTORE_DELAY_MS 1/* Long enough to ensure no retry fault comes after svm range is restored and -* page table is updated. +* page table is updated, 2ms is safe to let fault of same range go. */ -#define AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING 2000 +#define AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING (2UL * NSEC_PER_MSEC)struct criu_svm_metadata {struct list_head list;
@@ -1597,7 +1598,7 @@ static int svm_range_validate_and_map(struct mm_struct *mm,svm_range_unreserve_bos (&ctx);if (!r) - prange->validate_timestamp =ktime_to_us (ktime_get ()); + prange->validate_timestamp =ktime_get_boottime ();return r; }
@@ -2666,11 +2667,12 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid,struct svm_range_list *svms;struct svm_range *prange;struct kfd_process *p; -uint64_t timestamp; +ktime_t timestamp =ktime_get_boottime ();int32_t best_loc;int32_t gpuidx =MAX_GPU_INSTANCE ;bool write_locked = false;struct vm_area_struct *vma; +bool migration = false;int r =0 ;if (!KFD_IS_SVM_API_SUPPORTED (adev->kfd.dev)) {
@@ -2746,9 +2748,9 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid, goto out_unlock_range; } - timestamp =ktime_to_us (ktime_get ()) - prange->validate_timestamp;/* skip duplicate vm fault on different pages of same range */ -if (timestamp <AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING ) { +if (ktime_before (timestamp, +ktime_add_ns (prange->validate_timestamp,AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING ))) {pr_debug ("svms 0x%p [0x%lx %lx] already restored\n" , svms, prange->start, prange->last); r =0 ;
@@ -2784,7 +2786,11 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid, svms, prange->start, prange->last, best_loc, prange->actual_loc); +kfd_smi_event_page_fault_start (adev->kfd.dev, p->lead_thread->pid, addr, + write_fault, timestamp); +if (prange->actual_loc != best_loc) { + migration = true;if (best_loc) { r =svm_migrate_to_vram (prange, best_loc, mm);if (r) {
@@ -2813,6 +2819,9 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid,pr_debug ("failed %d to map svms 0x%p [0x%lx 0x%lx] to gpus\n" , r, svms, prange->start, prange->last); +kfd_smi_event_page_fault_end (adev->kfd.dev, p->lead_thread->pid, addr, + migration); + out_unlock_range:mutex_unlock (&prange->migrate_mutex); out_unlock_svms:
drivers/gpu/drm/amd/amdkfd/kfd_svm.h +1 -1
@@ -125,7 +125,7 @@ struct svm_range {uint32_t actual_loc;uint8_t granularity;atomic_t invalid; -uint64_t validate_timestamp; +ktime_t validate_timestamp;struct mmu_interval_notifier notifier;struct svm_work_list_item work_item;struct list_head deferred_list;
Signature · 1 line
2.17.1
PATCH v3 5/8 drm/amdkfd: Add migration SMI event
In reply to Philip YangFor migration start and end event, output timestamp when migration starts, ends, svm range address and size, GPU id of migration source and destination and svm range attributes,
Migration trigger could be prefetch, CPU or GPU page fault and TTM eviction.
--- drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 53 ++++++++++++++++----- drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 39 +++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 8 ++++ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 16 ++++--- 5 files changed, 100 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +40 -13
@@ -32,6 +32,7 @@#include "kfd_priv.h" #include "kfd_svm.h" #include "kfd_migrate.h" +#include "kfd_smi_events.h" #ifdef dev_fmt#undef dev_fmt
@@ -403,8 +404,9 @@ svm_migrate_copy_to_vram(struct amdgpu_device *adev, struct svm_range *prange,static long svm_migrate_vma_to_vram (struct amdgpu_device *adev,struct svm_range *prange,struct vm_area_struct *vma,uint64_t start, -uint64_t end) +uint64_t end,uint32_t trigger) { + struct kfd_process *p = container_of(prange->svms, struct kfd_process, svms);uint64_t npages = (end - start) >>PAGE_SHIFT ;struct kfd_process_device *pdd;struct dma_fence *mfence =NULL ;
@@ -432,6 +434,11 @@ svm_migrate_vma_to_vram(struct amdgpu_device *adev, struct svm_range *prange, migrate.dst = migrate.src + npages; scratch = (dma_addr_t *)(migrate.dst + npages); +kfd_smi_event_migration_start (adev->kfd.dev, p->lead_thread->pid, + start >>PAGE_SHIFT , end >>PAGE_SHIFT , +0 , adev->kfd.dev->id, prange->prefetch_loc, + prange->preferred_loc, trigger); + r =migrate_vma_setup (&migrate);if (r) { dev_err(adev->dev, "%s: vma setup fail %d range [0x%lx 0x%lx]\n",
@@ -460,6 +467,10 @@ svm_migrate_vma_to_vram(struct amdgpu_device *adev, struct svm_range *prange,svm_migrate_copy_done (adev, mfence);migrate_vma_finalize (&migrate); +kfd_smi_event_migration_end (adev->kfd.dev, p->lead_thread->pid, + start >>PAGE_SHIFT , end >>PAGE_SHIFT , +0 , adev->kfd.dev->id, trigger); +svm_range_dma_unmap (adev->dev, scratch,0 , npages);svm_range_free_dma_mappings (prange);
@@ -481,6 +492,7 @@ svm_migrate_vma_to_vram(struct amdgpu_device *adev, struct svm_range *prange,* @prange: range structure * @best_loc: the device to migrate to * @mm: the process mm structure +* @trigger: reason of migration * * Context: Process context, caller hold mmap read lock, svms lock, prange lock *
@@ -489,7 +501,7 @@ svm_migrate_vma_to_vram(struct amdgpu_device *adev, struct svm_range *prange,*/ static int svm_migrate_ram_to_vram (struct svm_range *prange,uint32_t best_loc, -struct mm_struct *mm) +struct mm_struct *mm,uint32_t trigger) {unsigned long addr, start, end;struct vm_area_struct *vma;
@@ -526,7 +538,7 @@ svm_migrate_ram_to_vram(struct svm_range *prange, uint32_t best_loc,break ; next =min (vma->vm_end, end); - r =svm_migrate_vma_to_vram (adev, prange, vma, addr, next); + r =svm_migrate_vma_to_vram (adev, prange, vma, addr, next, trigger);if (r <0 ) {pr_debug ("failed %ld to migrate\n" , r);break ;
@@ -642,8 +654,10 @@ svm_migrate_copy_to_ram(struct amdgpu_device *adev, struct svm_range *prange,static long svm_migrate_vma_to_ram (struct amdgpu_device *adev,struct svm_range *prange, -struct vm_area_struct *vma,uint64_t start,uint64_t end) +struct vm_area_struct *vma,uint64_t start,uint64_t end, +uint32_t trigger) { + struct kfd_process *p = container_of(prange->svms, struct kfd_process, svms);uint64_t npages = (end - start) >>PAGE_SHIFT ;unsigned long upages = npages;unsigned long cpages =0 ;
@@ -672,6 +686,11 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange, migrate.dst = migrate.src + npages; scratch = (dma_addr_t *)(migrate.dst + npages); +kfd_smi_event_migration_start (adev->kfd.dev, p->lead_thread->pid, + start >>PAGE_SHIFT , end >>PAGE_SHIFT , + adev->kfd.dev->id,0 , prange->prefetch_loc, + prange->preferred_loc, trigger); + r =migrate_vma_setup (&migrate);if (r) { dev_err(adev->dev, "%s: vma setup fail %d range [0x%lx 0x%lx]\n",
@@ -702,6 +721,11 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange,svm_migrate_copy_done (adev, mfence);migrate_vma_finalize (&migrate); + +kfd_smi_event_migration_end (adev->kfd.dev, p->lead_thread->pid, + start >>PAGE_SHIFT , end >>PAGE_SHIFT , + adev->kfd.dev->id,0 , trigger); +svm_range_dma_unmap (adev->dev, scratch,0 , npages); out_free:
@@ -721,13 +745,15 @@ svm_migrate_vma_to_ram(struct amdgpu_device *adev, struct svm_range *prange,* svm_migrate_vram_to_ram - migrate svm range from device to system * @prange: range structure * @mm: process mm, use current->mm if NULL +* @trigger: reason of migration * * Context: Process context, caller hold mmap read lock, svms lock, prange lock * * Return: * 0 - OK, otherwise error code */ -int svm_migrate_vram_to_ram (struct svm_range *prange,struct mm_struct *mm) +int svm_migrate_vram_to_ram (struct svm_range *prange,struct mm_struct *mm, +uint32_t trigger) {struct amdgpu_device *adev;struct vm_area_struct *vma;
@@ -765,7 +791,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm)break ; next =min (vma->vm_end, end); - r =svm_migrate_vma_to_ram (adev, prange, vma, addr, next); + r =svm_migrate_vma_to_ram (adev, prange, vma, addr, next, trigger);if (r <0 ) {pr_debug ("failed %ld to migrate\n" , r);break ;
@@ -788,6 +814,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm)* @prange: range structure * @best_loc: the device to migrate to * @mm: process mm, use current->mm if NULL +* @trigger: reason of migration * * Context: Process context, caller hold mmap read lock, svms lock, prange lock *
@@ -796,7 +823,7 @@ int svm_migrate_vram_to_ram(struct svm_range *prange, struct mm_struct *mm)*/ static int svm_migrate_vram_to_vram (struct svm_range *prange,uint32_t best_loc, -struct mm_struct *mm) +struct mm_struct *mm,uint32_t trigger) {int r, retries =3 ;
@@ -808,7 +835,7 @@ svm_migrate_vram_to_vram(struct svm_range *prange, uint32_t best_loc,pr_debug ("from gpu 0x%x to gpu 0x%x\n" , prange->actual_loc, best_loc);do { - r =svm_migrate_vram_to_ram (prange, mm); + r =svm_migrate_vram_to_ram (prange, mm, trigger);if (r)return r; }while (prange->actual_loc && --retries);
@@ -816,17 +843,17 @@ svm_migrate_vram_to_vram(struct svm_range *prange, uint32_t best_loc,if (prange->actual_loc)return -EDEADLK ; -return svm_migrate_ram_to_vram (prange, best_loc, mm); +return svm_migrate_ram_to_vram (prange, best_loc, mm, trigger); }int svm_migrate_to_vram (struct svm_range *prange,uint32_t best_loc, -struct mm_struct *mm) +struct mm_struct *mm,uint32_t trigger) {if (!prange->actual_loc) -return svm_migrate_ram_to_vram (prange, best_loc, mm); +return svm_migrate_ram_to_vram (prange, best_loc, mm, trigger);else -return svm_migrate_vram_to_vram (prange, best_loc, mm); +return svm_migrate_vram_to_vram (prange, best_loc, mm, trigger); }
@@ -895,7 +922,7 @@ static vm_fault_t svm_migrate_to_ram(struct vm_fault *vmf) goto out_unlock_prange; } - r =svm_migrate_vram_to_ram (prange, mm); + r =svm_migrate_vram_to_ram (prange, mm,KFD_MIGRATE_TRIGGER_PAGEFAULT_CPU );if (r)pr_debug ("failed %d migrate 0x%p [0x%lx 0x%lx] to ram\n" , r, prange, prange->start, prange->last);
drivers/gpu/drm/amd/amdkfd/kfd_migrate.h +3 -2
@@ -41,8 +41,9 @@ enum MIGRATION_COPY_DIR { };int svm_migrate_to_vram (struct svm_range *prange,uint32_t best_loc, -struct mm_struct *mm); -int svm_migrate_vram_to_ram (struct svm_range *prange,struct mm_struct *mm); +struct mm_struct *mm,uint32_t trigger); +int svm_migrate_vram_to_ram (struct svm_range *prange,struct mm_struct *mm, +uint32_t trigger);unsigned long svm_migrate_addr_to_pfn (struct amdgpu_device *adev,unsigned long addr);
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +39 -0
@@ -303,6 +303,45 @@ void kfd_smi_event_page_fault_end(struct kfd_dev *dev, pid_t pid, len); } +void kfd_smi_event_migration_start (struct kfd_dev *dev,pid_t pid, +unsigned long start,unsigned long end, +uint32_t from,uint32_t to, +uint32_t prefetch_loc,uint32_t preferred_loc, +uint32_t trigger) +{ +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ]; +int len; + +if (list_empty (&dev->smi_clients)) +return ; + + len =snprintf (fifo_in,sizeof (fifo_in), +"%x %lld -%d @%lx(%lx) %x->%x %x:%x %d\n" , +KFD_SMI_EVENT_MIGRATE_START ,ktime_get_boottime_ns (), + pid, start, end - start, from, to, prefetch_loc, + preferred_loc, trigger); + +add_event_to_kfifo (pid, dev,KFD_SMI_EVENT_MIGRATE_START , fifo_in, len); +} + +void kfd_smi_event_migration_end (struct kfd_dev *dev,pid_t pid, +unsigned long start,unsigned long end, +uint32_t from,uint32_t to,uint32_t trigger) +{ +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ]; +int len; + +if (list_empty (&dev->smi_clients)) +return ; + + len =snprintf (fifo_in,sizeof (fifo_in), +"%x %lld -%d @%lx(%lx) %x->%x %d\n" , +KFD_SMI_EVENT_MIGRATE_END ,ktime_get_boottime_ns (), + pid, start, end - start, from, to, trigger); + +add_event_to_kfifo (pid, dev,KFD_SMI_EVENT_MIGRATE_END , fifo_in, len); +} +int kfd_smi_event_open (struct kfd_dev *dev,uint32_t *fd) {struct kfd_smi_client *client;
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h +8 -0
@@ -34,4 +34,12 @@ void kfd_smi_event_page_fault_start(struct kfd_dev *dev, pid_t pid, ktime_t ts);void kfd_smi_event_page_fault_end (struct kfd_dev *dev,pid_t pid,unsigned long address,bool migration); +void kfd_smi_event_migration_start (struct kfd_dev *dev,pid_t pid, +unsigned long start,unsigned long end, +uint32_t from,uint32_t to, +uint32_t prefetch_loc,uint32_t preferred_loc, +uint32_t trigger); +void kfd_smi_event_migration_end (struct kfd_dev *dev,pid_t pid, +unsigned long start,unsigned long end, +uint32_t from,uint32_t to,uint32_t trigger);#endif
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +10 -6
@@ -2792,7 +2792,8 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid,if (prange->actual_loc != best_loc) { migration = true;if (best_loc) { - r =svm_migrate_to_vram (prange, best_loc, mm); + r =svm_migrate_to_vram (prange, best_loc, mm, +KFD_MIGRATE_TRIGGER_PAGEFAULT_GPU );if (r) {pr_debug ("svm_migrate_to_vram failed (%d) at %llx, falling back to system memory\n" , r, addr);
@@ -2800,12 +2801,14 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid,* VRAM failed */ if (prange->actual_loc) - r =svm_migrate_vram_to_ram (prange, mm); + r =svm_migrate_vram_to_ram (prange, mm, +KFD_MIGRATE_TRIGGER_PAGEFAULT_GPU );else r =0 ; } }else { - r =svm_migrate_vram_to_ram (prange, mm); + r =svm_migrate_vram_to_ram (prange, mm, +KFD_MIGRATE_TRIGGER_PAGEFAULT_GPU ); }if (r) { pr_debug("failed %d to migrate svms %p [0x%lx 0x%lx]\n",
@@ -3128,12 +3131,12 @@ svm_range_trigger_migration(struct mm_struct *mm, struct svm_range *prange,return 0 ;if (!best_loc) { - r =svm_migrate_vram_to_ram (prange, mm); + r =svm_migrate_vram_to_ram (prange, mm,KFD_MIGRATE_TRIGGER_PREFETCH ); *migrated = !r;return r; } - r =svm_migrate_to_vram (prange, best_loc, mm); + r =svm_migrate_to_vram (prange, best_loc, mm,KFD_MIGRATE_TRIGGER_PREFETCH ); *migrated = !r;return r;
@@ -3190,7 +3193,8 @@ static void svm_range_evict_svm_bo_worker(struct work_struct *work)mutex_lock (&prange->migrate_mutex);do {svm_migrate_vram_to_ram (prange, - svm_bo->eviction_fence->mm); + svm_bo->eviction_fence->mm, +KFD_MIGRATE_TRIGGER_TTM_EVICTION ); }while (prange->actual_loc && --retries);WARN (prange->actual_loc,"Migration failed during eviction" );
Signature · 1 line
2.17.1
PATCH v3 6/8 drm/amdkfd: Add user queue eviction restore SMI event
In reply to Philip YangOutput user queue eviction and restore event. User queue eviction may be triggered by svm or userptr MMU notifier, TTM eviction, device suspend and CRIU checkpoint and restore.
User queue restore may be rescheduled if eviction happens again while restore.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 12 ++-- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 15 ++++- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 55 +++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 4 ++ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 +- 9 files changed, 89 insertions(+), 15 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +1 -1
@@ -332,7 +332,7 @@ void amdgpu_amdkfd_release_notify(struct amdgpu_bo *bo) }#endif /* KGD2KFD callbacks */ -int kgd2kfd_quiesce_mm (struct mm_struct *mm); +int kgd2kfd_quiesce_mm (struct mm_struct *mm,uint32_t trigger);int kgd2kfd_resume_mm (struct mm_struct *mm);int kgd2kfd_schedule_evict_and_restore_process (struct mm_struct *mm,struct dma_fence *fence);
drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +8 -4
@@ -32,6 +32,7 @@#include "amdgpu_dma_buf.h" #include <uapi/linux/kfd_ioctl.h> #include "amdgpu_xgmi.h" +#include "kfd_smi_events.h" /* Userptr restore delay, just long enough to allow consecutive VM * changes to accumulate
@@ -2113,7 +2114,7 @@ int amdgpu_amdkfd_evict_userptr(struct kgd_mem *mem, evicted_bos =atomic_inc_return (&process_info->evicted_bos);if (evicted_bos ==1 ) {/* First eviction, stop the queues */ - r =kgd2kfd_quiesce_mm (mm); + r =kgd2kfd_quiesce_mm (mm,KFD_QUEUE_EVICTION_TRIGGER_USERPTR );if (r)pr_err ("Failed to quiesce KFD\n" ); schedule_delayed_work(&process_info->restore_userptr_work,
@@ -2387,13 +2388,16 @@ static void amdgpu_amdkfd_restore_userptr_worker(struct work_struct *work) unlock_out:mutex_unlock (&process_info->lock); -mmput (mm); -put_task_struct (usertask);/* If validation failed, reschedule another attempt */ -if (evicted_bos) +if (evicted_bos) {schedule_delayed_work (&process_info->restore_userptr_work,msecs_to_jiffies (AMDGPU_USERPTR_RESTORE_DELAY_MS )); + +kfd_smi_event_queue_restore_rescheduled (mm); + } +mmput (mm); +put_task_struct (usertask); }/** amdgpu_amdkfd_gpuvm_restore_process_bos - Restore all BOs for the given
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +2 -2
@@ -2404,7 +2404,7 @@ static int criu_restore(struct file *filep,* Set the process to evicted state to avoid running any new queues before all the memory * mappings are ready. */ - ret =kfd_process_evict_queues (p); + ret =kfd_process_evict_queues (p,KFD_QUEUE_EVICTION_CRIU_RESTORE );if (ret) goto exit_unlock;
@@ -2523,7 +2523,7 @@ static int criu_process_info(struct file *filep, goto err_unlock; } - ret =kfd_process_evict_queues (p); + ret =kfd_process_evict_queues (p,KFD_QUEUE_EVICTION_CRIU_CHECKPOINT );if (ret) goto err_unlock;
drivers/gpu/drm/amd/amdkfd/kfd_device.c +2 -2
@@ -785,7 +785,7 @@ void kgd2kfd_interrupt(struct kfd_dev *kfd, const void *ih_ring_entry)spin_unlock_irqrestore (&kfd->interrupt_lock, flags); } -int kgd2kfd_quiesce_mm (struct mm_struct *mm) +int kgd2kfd_quiesce_mm (struct mm_struct *mm,uint32_t trigger) {struct kfd_process *p;int r;
@@ -799,7 +799,7 @@ int kgd2kfd_quiesce_mm(struct mm_struct *mm)return -ESRCH ;WARN (debug_evictions,"Evicting pid %d" , p->lead_thread->pid); - r =kfd_process_evict_queues (p); + r =kfd_process_evict_queues (p, trigger);kfd_unref_process (p);return r;
drivers/gpu/drm/amd/amdkfd/kfd_priv.h +1 -1
@@ -933,7 +933,7 @@ static inline struct kfd_process_device *kfd_process_device_from_gpuidx( }void kfd_unref_process (struct kfd_process *p); -int kfd_process_evict_queues (struct kfd_process *p); +int kfd_process_evict_queues (struct kfd_process *p,uint32_t trigger);int kfd_process_restore_queues (struct kfd_process *p);void kfd_suspend_all_processes (void );int kfd_resume_all_processes (void );
drivers/gpu/drm/amd/amdkfd/kfd_process.c +12 -3
@@ -43,6 +43,7 @@ struct mm_struct;#include "kfd_device_queue_manager.h" #include "kfd_iommu.h" #include "kfd_svm.h" +#include "kfd_smi_events.h" /* * List of struct kfd_process (field kfd_process).
@@ -1710,7 +1711,7 @@ struct kfd_process *kfd_lookup_process_by_mm(const struct mm_struct *mm)* Eviction is reference-counted per process-device. This means multiple * evictions from different sources can be nested safely. */ -int kfd_process_evict_queues (struct kfd_process *p) +int kfd_process_evict_queues (struct kfd_process *p,uint32_t trigger) {int r =0 ;int i;
@@ -1719,6 +1720,9 @@ int kfd_process_evict_queues(struct kfd_process *p)for (i =0 ; i < p->n_pdds; i++) {struct kfd_process_device *pdd = p->pdds[i]; +kfd_smi_event_queue_eviction (pdd->dev, p->lead_thread->pid, + trigger); + r = pdd->dev->dqm->ops.evict_process_queues (pdd->dev->dqm, &pdd->qpd);/* evict return -EIO if HWS is hang or asic is resetting, in this case
@@ -1743,6 +1747,9 @@ int kfd_process_evict_queues(struct kfd_process *p)if (n_evicted ==0 )break ; + +kfd_smi_event_queue_restore (pdd->dev, p->lead_thread->pid); +if (pdd->dev->dqm->ops.restore_process_queues (pdd->dev->dqm, &pdd->qpd))pr_err ("Failed to restore queues\n" );
@@ -1762,6 +1769,8 @@ int kfd_process_restore_queues(struct kfd_process *p)for (i =0 ; i < p->n_pdds; i++) {struct kfd_process_device *pdd = p->pdds[i]; +kfd_smi_event_queue_restore (pdd->dev, p->lead_thread->pid); + r = pdd->dev->dqm->ops.restore_process_queues (pdd->dev->dqm, &pdd->qpd);if (r) {
@@ -1823,7 +1832,7 @@ static void evict_process_worker(struct work_struct *work)flush_delayed_work (&p->restore_work);pr_debug ("Started evicting pasid 0x%x\n" , p->pasid); - ret =kfd_process_evict_queues (p); + ret =kfd_process_evict_queues (p,KFD_QUEUE_EVICTION_TRIGGER_TTM );if (!ret) {dma_fence_signal (p->ef);dma_fence_put (p->ef);
@@ -1890,7 +1899,7 @@ void kfd_suspend_all_processes(void)cancel_delayed_work_sync (&p->eviction_work);cancel_delayed_work_sync (&p->restore_work); -if (kfd_process_evict_queues (p)) +if (kfd_process_evict_queues (p,KFD_QUEUE_EVICTION_TRIGGER_SUSPEND ))pr_err ("Failed to suspend process 0x%x\n" , p->pasid);dma_fence_signal (p->ef);dma_fence_put (p->ef);
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +55 -0
61 lines not on this page · raw message
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h +4 -0
@@ -42,4 +42,8 @@ void kfd_smi_event_migration_start(struct kfd_dev *dev, pid_t pid,void kfd_smi_event_migration_end (struct kfd_dev *dev,pid_t pid,unsigned long start,unsigned long end,uint32_t from,uint32_t to,uint32_t trigger); +void kfd_smi_event_queue_eviction (struct kfd_dev *dev,pid_t pid, +uint32_t trigger); +void kfd_smi_event_queue_restore (struct kfd_dev *dev,pid_t pid); +void kfd_smi_event_queue_restore_rescheduled (struct mm_struct *mm);#endif
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +4 -2
@@ -1706,14 +1706,16 @@ static void svm_range_restore_work(struct work_struct *work) out_reschedule:mutex_unlock (&svms->lock);mmap_write_unlock (mm); -mmput (mm);/* If validation failed, reschedule another attempt */ if (evicted_ranges) {pr_debug ("reschedule to restore svm range\n" );schedule_delayed_work (&svms->restore_work,msecs_to_jiffies (AMDGPU_SVM_RANGE_RESTORE_DELAY_MS )); + +kfd_smi_event_queue_restore_rescheduled (mm); } +mmput (mm); }/**
@@ -1769,7 +1771,7 @@ svm_range_evict(struct svm_range *prange, struct mm_struct *mm, prange->svms, prange->start, prange->last);/* First eviction, stop the queues */ - r =kgd2kfd_quiesce_mm (mm); + r =kgd2kfd_quiesce_mm (mm,KFD_QUEUE_EVICTION_TRIGGER_SVM );if (r)pr_debug ("failed to quiesce KFD\n" );
Signature · 1 line
2.17.1
PATCH v3 7/8 drm/amdkfd: Add unmap from GPU SMI event
In reply to Philip YangSVM range unmapped from GPUs when range is unmapped from CPU, or with xnack on from MMU notifier when range is evicted or migrated.
--- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 18 +++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 3 +++ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 25 +++++++++++++++------ 3 files changed, 39 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c +18 -0
@@ -397,6 +397,24 @@ void kfd_smi_event_queue_restore_rescheduled(struct mm_struct *mm)kfd_unref_process (p); } +void kfd_smi_event_unmap_from_gpu (struct kfd_dev *dev,pid_t pid, +unsigned long address,unsigned long last, +uint32_t trigger) +{ +char fifo_in[KFD_SMI_EVENT_MSG_SIZE ]; +int len; + +if (list_empty (&dev->smi_clients)) +return ; + + len =snprintf (fifo_in,sizeof (fifo_in),"%x %lld -%d @%lx(%lx) %x %d\n" , +KFD_SMI_EVENT_UNMAP_FROM_GPU ,ktime_get_boottime_ns (), + pid, address, last - address +1 , dev->id, trigger); + +add_event_to_kfifo (pid, dev,KFD_SMI_EVENT_UNMAP_FROM_GPU , fifo_in, + len); +} +int kfd_smi_event_open (struct kfd_dev *dev,uint32_t *fd) {struct kfd_smi_client *client;
drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h +3 -0
@@ -46,4 +46,7 @@ void kfd_smi_event_queue_eviction(struct kfd_dev *dev, pid_t pid, uint32_t trigger);void kfd_smi_event_queue_restore (struct kfd_dev *dev,pid_t pid);void kfd_smi_event_queue_restore_rescheduled (struct mm_struct *mm); +void kfd_smi_event_unmap_from_gpu (struct kfd_dev *dev,pid_t pid, +unsigned long address,unsigned long last, +uint32_t trigger);#endif
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +18 -7
@@ -1196,7 +1196,7 @@ svm_range_unmap_from_gpu(struct amdgpu_device *adev, struct amdgpu_vm *vm,static int svm_range_unmap_from_gpus (struct svm_range *prange,unsigned long start, -unsigned long last) +unsigned long last,uint32_t trigger) {DECLARE_BITMAP (bitmap,MAX_GPU_INSTANCE );struct kfd_process_device *pdd;
@@ -1217,6 +1217,9 @@ svm_range_unmap_from_gpus(struct svm_range *prange, unsigned long start,return -EINVAL ; } +kfd_smi_event_unmap_from_gpu (pdd->dev, p->lead_thread->pid, + start, last, trigger); + r =svm_range_unmap_from_gpu (pdd->dev->adev,drm_priv_to_vm (pdd->drm_priv), start, last, &fence);
@@ -1735,7 +1738,8 @@ static void svm_range_restore_work(struct work_struct *work)*/ static int svm_range_evict (struct svm_range *prange,struct mm_struct *mm, -unsigned long start,unsigned long last) +unsigned long start,unsigned long last, +enum mmu_notifier_event event) {struct svm_range_list *svms = prange->svms;struct svm_range *pchild;
@@ -1780,6 +1784,12 @@ svm_range_evict(struct svm_range *prange, struct mm_struct *mm, msecs_to_jiffies(AMDGPU_SVM_RANGE_RESTORE_DELAY_MS)); }else {unsigned long s, l; +uint32_t trigger; + +if (event ==MMU_NOTIFY_MIGRATE ) + trigger =KFD_SVM_UNMAP_TRIGGER_MMU_NOTIFY_MIGRATE ; +else + trigger =KFD_SVM_UNMAP_TRIGGER_MMU_NOTIFY ;pr_debug ("invalidate unmap svms 0x%p [0x%lx 0x%lx] from GPUs\n" , prange->svms, start, last);
@@ -1788,13 +1798,13 @@ svm_range_evict(struct svm_range *prange, struct mm_struct *mm, s =max (start, pchild->start); l =min (last, pchild->last);if (l >= s) -svm_range_unmap_from_gpus (pchild, s, l); +svm_range_unmap_from_gpus (pchild, s, l, trigger);mutex_unlock (&pchild->lock); } s =max (start, prange->start); l =min (last, prange->last);if (l >= s) -svm_range_unmap_from_gpus (prange, s, l); +svm_range_unmap_from_gpus (prange, s, l, trigger); }return r;
@@ -2207,6 +2217,7 @@ static void svm_range_unmap_from_cpu(struct mm_struct *mm, struct svm_range *prange, unsigned long start, unsigned long last) { + uint32_t trigger = KFD_SVM_UNMAP_TRIGGER_UNMAP_FROM_CPU;struct svm_range_list *svms;struct svm_range *pchild;struct kfd_process *p;
@@ -2234,14 +2245,14 @@ svm_range_unmap_from_cpu(struct mm_struct *mm, struct svm_range *prange, s =max (start, pchild->start); l =min (last, pchild->last);if (l >= s) -svm_range_unmap_from_gpus (pchild, s, l); +svm_range_unmap_from_gpus (pchild, s, l, trigger);svm_range_unmap_split (mm, prange, pchild, start, last);mutex_unlock (&pchild->lock); } s =max (start, prange->start); l =min (last, prange->last);if (l >= s) -svm_range_unmap_from_gpus (prange, s, l); +svm_range_unmap_from_gpus (prange, s, l, trigger);svm_range_unmap_split (mm, prange, prange, start, last);if (unmap_parent)
@@ -2306,7 +2317,7 @@ svm_range_cpu_invalidate_pagetables(struct mmu_interval_notifier *mni,svm_range_unmap_from_cpu (mni->mm, prange, start, last);break ;default : -svm_range_evict (prange, mni->mm, start, last); +svm_range_evict (prange, mni->mm, start, last, range->event);break ; }
Signature · 1 line
2.17.1
PATCH v3 8/8 drm/amdkfd: Bump KFD API version for SMI profiling event
In reply to Philip YangIndicate SMI profiling events available,
--- include/uapi/linux/kfd_ioctl.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/uapi/linux/kfd_ioctl.h +2 -1
@@ -33,9 +33,10 @@* - 1.5 - Add SVM API * - 1.6 - Query clear flags in SVM get_attr API * - 1.7 - Checkpoint Restore (CRIU) API +* - 1.8 - Add SMI profiler event log */ #define KFD_IOCTL_MAJOR_VERSION 1 -#define KFD_IOCTL_MINOR_VERSION 7 +#define KFD_IOCTL_MINOR_VERSION 8struct kfd_ioctl_get_version_args {__u32 major_version;/* from KFD */
Signature · 1 line
2.17.1