drm/amdkfd: Use hex print format for pasid
Subsystems (3)
PATCH 1/1 drm/amdkfd: Use hex print format for pasid
Since KFD pasid starts from 0x8000 (32768 in decimal), it is better perceived as a hex number.
Change-Id I565fe39f69e782749a697f18545775354c7a89f8
Signed-off-by Yong Zhao <[email protected]>
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 12 +++++------ drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 4 ++-- drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 8 ++++---- .../drm/amd/amdkfd/kfd_device_queue_manager.c | 12 +++++------ drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 8 ++++---- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 12 +++++------ drivers/gpu/drm/amd/amdkfd/kfd_iommu.c | 6 +++--- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 20 +++++++++---------- .../amd/amdkfd/kfd_process_queue_manager.c | 6 +++--- 9 files changed, 44 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +6 -6
@@ -301,7 +301,7 @@ static int kfd_ioctl_create_queue(struct file *filep, struct kfd_process *p, goto err_bind_process; } -pr_debug ("Creating queue for PASID %d on gpu 0x%x\n" , +pr_debug ("Creating queue for PASID 0x%x on gpu 0x%x\n" , p->pasid, dev->id);
@@ -351,7 +351,7 @@ static int kfd_ioctl_destroy_queue(struct file *filp, struct kfd_process *p,int retval;struct kfd_ioctl_destroy_queue_args *args = data; -pr_debug ("Destroying queue id %d for pasid %d\n" , +pr_debug ("Destroying queue id %d for pasid 0x%x\n" , args->queue_id, p->pasid);
@@ -397,7 +397,7 @@ static int kfd_ioctl_update_queue(struct file *filp, struct kfd_process *p, properties.queue_percent = args->queue_percentage; properties.priority = args->queue_priority; -pr_debug ("Updating queue id %d for pasid %d\n" , +pr_debug ("Updating queue id %d for pasid 0x%x\n" , args->queue_id, p->pasid);mutex_lock (&p->mutex);
@@ -854,7 +854,7 @@ static int kfd_ioctl_get_process_apertures(struct file *filp,struct kfd_process_device_apertures *pAperture;struct kfd_process_device *pdd; -dev_dbg (kfd_device,"get apertures for PASID %d" , p->pasid); +dev_dbg (kfd_device,"get apertures for PASID 0x%x" , p->pasid); args->num_of_nodes =0 ;
@@ -912,7 +912,7 @@ static int kfd_ioctl_get_process_apertures_new(struct file *filp,uint32_t nodes =0 ;int ret; -dev_dbg (kfd_device,"get apertures for PASID %d" , p->pasid); +dev_dbg (kfd_device,"get apertures for PASID 0x%x" , p->pasid);if (args->num_of_nodes ==0 ) {/* Return number of nodes, so that user space can alloacate
@@ -3063,7 +3063,7 @@ static int kfd_mmio_mmap(struct kfd_dev *dev, struct kfd_process *process, vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); -pr_debug ("Process %d mapping mmio page\n" +pr_debug ("pasid 0x%x mapping mmio page\n" " target user address == 0x%08llX\n" " physical address == 0x%08llX\n" " vm_flags == 0x%04lX\n"
drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c +2 -2
@@ -800,7 +800,7 @@ int dbgdev_wave_reset_wavefronts(struct kfd_dev *dev, struct kfd_process *p) (dev->kgd, vmid)) {if (dev->kfd2kgd->get_atc_vmid_pasid_mapping_pasid (dev->kgd, vmid) == p->pasid) { -pr_debug ("Killing wave fronts of vmid %d and pasid %d\n" , +pr_debug ("Killing wave fronts of vmid %d and pasid 0x%x\n" , vmid, p->pasid);break ; }
@@ -808,7 +808,7 @@ int dbgdev_wave_reset_wavefronts(struct kfd_dev *dev, struct kfd_process *p) }if (vmid > last_vmid_to_scan) { -pr_err ("Didn't find vmid for pasid %d\n" , p->pasid); +pr_err ("Didn't find vmid for pasid 0x%x\n" , p->pasid);return -EFAULT ; }
drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c +4 -4
@@ -96,7 +96,7 @@ bool kfd_dbgmgr_create(struct kfd_dbgmgr **ppmgr, struct kfd_dev *pdev)long kfd_dbgmgr_register (struct kfd_dbgmgr *pmgr,struct kfd_process *p) {if (pmgr->pasid !=0 ) { -pr_debug ("H/W debugger is already active using pasid %d\n" , +pr_debug ("H/W debugger is already active using pasid 0x%x\n" , pmgr->pasid);return -EBUSY ; }
@@ -117,7 +117,7 @@ long kfd_dbgmgr_unregister(struct kfd_dbgmgr *pmgr, struct kfd_process *p) {/* Is the requests coming from the already registered process? */ if (pmgr->pasid != p->pasid) { -pr_debug ("H/W debugger is not registered by calling pasid %d\n" , +pr_debug ("H/W debugger is not registered by calling pasid 0x%x\n" , p->pasid);return -EINVAL ; }
@@ -134,7 +134,7 @@ long kfd_dbgmgr_wave_control(struct kfd_dbgmgr *pmgr, {/* Is the requests coming from the already registered process? */ if (pmgr->pasid != wac_info->process->pasid) { -pr_debug ("H/W debugger support was not registered for requester pasid %d\n" , +pr_debug ("H/W debugger support was not registered for requester pasid 0x%x\n" , wac_info->process->pasid);return -EINVAL ; }
@@ -147,7 +147,7 @@ long kfd_dbgmgr_address_watch(struct kfd_dbgmgr *pmgr, {/* Is the requests coming from the already registered process? */ if (pmgr->pasid != adw_info->process->pasid) { -pr_debug ("H/W debugger support was not registered for requester pasid %d\n" , +pr_debug ("H/W debugger support was not registered for requester pasid 0x%x\n" , adw_info->process->pasid);return -EINVAL ; }
drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +6 -6
@@ -630,7 +630,7 @@ static int suspend_single_queue(struct device_queue_manager *dqm, {int retval =0 ; -pr_debug ("Suspending PASID %u queue [%i]\n" , +pr_debug ("Suspending PASID 0x%x queue [%i]\n" , pdd->process->pasid, q->properties.queue_id);
@@ -667,7 +667,7 @@ static int resume_single_queue(struct device_queue_manager *dqm,/* Retrieve PD base */ pd_base =amdgpu_amdkfd_gpuvm_get_process_page_dir (pdd->vm); -pr_debug ("Restoring from suspend PASID %u queue [%i]\n" , +pr_debug ("Restoring from suspend PASID 0x%x queue [%i]\n" , pdd->process->pasid, q->properties.queue_id);
@@ -697,7 +697,7 @@ static int evict_process_queues_nocpsch(struct device_queue_manager *dqm, goto out; pdd =qpd_to_pdd (qpd); -pr_info_ratelimited ("Evicting PASID %u queues\n" , +pr_info_ratelimited ("Evicting PASID 0x%x queues\n" , pdd->process->pasid);/* Mark all queues as evicted. Deactivate all active queues on
@@ -743,7 +743,7 @@ static int evict_process_queues_cpsch(struct device_queue_manager *dqm, goto out; pdd =qpd_to_pdd (qpd); -pr_info_ratelimited ("Evicting PASID %u queues\n" , +pr_info_ratelimited ("Evicting PASID 0x%x queues\n" , pdd->process->pasid);/* Mark all queues as evicted. Deactivate all active queues on
@@ -794,7 +794,7 @@ static int restore_process_queues_nocpsch(struct device_queue_manager *dqm, goto out; } -pr_info_ratelimited ("Restoring PASID %u queues\n" , +pr_info_ratelimited ("Restoring PASID 0x%x queues\n" , pdd->process->pasid);/* Update PD Base in QPD */
@@ -870,7 +870,7 @@ static int restore_process_queues_cpsch(struct device_queue_manager *dqm, goto out; } -pr_info_ratelimited ("Restoring PASID %u queues\n" , +pr_info_ratelimited ("Restoring PASID 0x%x queues\n" , pdd->process->pasid);/* Update PD Base in QPD */
drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c +4 -4
@@ -158,7 +158,7 @@ static vm_fault_t kfd_doorbell_vm_fault(struct vm_fault *vmf)if (!pdd)return VM_FAULT_SIGBUS ; -pr_debug ("Process %d doorbell vm page fault\n" , pdd->process->pasid); +pr_debug ("pasid 0x%x doorbell vm page fault\n" , pdd->process->pasid);kfd_process_remap_doorbells_locked (pdd->process);
@@ -220,12 +220,12 @@ int kfd_doorbell_remap(struct kfd_process_device *pdd) vma = pdd->qpd.doorbell_vma; size =kfd_doorbell_process_slice (pdd->dev); -pr_debug ("Process %d remap doorbell 0x%lx\n" , process->pasid, +pr_debug ("pasid 0x%x remap doorbell 0x%lx\n" , process->pasid, vma->vm_start); ret =vm_iomap_memory (vma, address, size);if (ret) -pr_err ("Process %d failed to remap doorbell 0x%lx\n" , +pr_err ("pasid 0x%x failed to remap doorbell 0x%lx\n" , process->pasid, vma->vm_start); out_unlock:
@@ -257,7 +257,7 @@ int kfd_doorbell_mmap(struct kfd_dev *dev, struct kfd_process *process, vma->vm_page_prot =pgprot_noncached (vma->vm_page_prot); -pr_debug ("Process %d mapping doorbell page\n" +pr_debug ("pasid 0x%x mapping doorbell page\n" " target user address == 0x%08llX\n" " physical address == 0x%08llX\n" " vm_flags == 0x%04lX\n"
drivers/gpu/drm/amd/amdkfd/kfd_events.c +6 -6
@@ -852,8 +852,8 @@ static void lookup_events_by_type_and_signal(struct kfd_process *p,if (type ==KFD_EVENT_TYPE_MEMORY ) {dev_warn (kfd_device, -"Sending SIGSEGV to HSA Process with PID %d " , - p->lead_thread->pid); +"Sending SIGSEGV to process %d (pasid 0x%x)" , + p->lead_thread->pid, p->pasid);send_sig (SIGSEGV , p->lead_thread,0 ); }
@@ -861,13 +861,13 @@ static void lookup_events_by_type_and_signal(struct kfd_process *p,if (send_signal) {if (send_sigterm) {dev_warn (kfd_device, -"Sending SIGTERM to HSA Process with PID %d " , - p->lead_thread->pid); +"Sending SIGTERM to process %d (pasid 0x%x)" , + p->lead_thread->pid, p->pasid);send_sig (SIGTERM , p->lead_thread,0 ); }else {dev_err (kfd_device, -"HSA Process (PID %d) got unhandled exception" , - p->lead_thread->pid); +"Process %d (pasid 0x%x) got unhandled exception" , + p->lead_thread->pid, p->pasid); } } }
drivers/gpu/drm/amd/amdkfd/kfd_iommu.c +3 -3
@@ -160,7 +160,7 @@ static void iommu_pasid_shutdown_callback(struct pci_dev *pdev, int pasid)if (!p)return ; -pr_debug ("Unbinding process %d from IOMMU\n" , pasid); +pr_debug ("Unbinding process 0x%x from IOMMU\n" , pasid);mutex_lock (kfd_get_dbgmgr_mutex ());
@@ -194,7 +194,7 @@ static int iommu_invalid_ppr_cb(struct pci_dev *pdev, int pasid,struct kfd_dev *dev; dev_warn_ratelimited(kfd_device, - "Invalid PPR device %x:%x.%x pasid %d address 0x%lX flags 0x%X", + "Invalid PPR device %x:%x.%x pasid 0x%x address 0x%lX flags 0x%X", PCI_BUS_NUM(pdev->devfn), PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
@@ -235,7 +235,7 @@ static int kfd_bind_processes_to_device(struct kfd_dev *kfd) err =amd_iommu_bind_pasid (kfd->pdev, p->pasid, p->lead_thread);if (err <0 ) { -pr_err ("Unexpected pasid %d binding failure\n" , +pr_err ("Unexpected pasid 0x%x binding failure\n" , p->pasid);mutex_unlock (&p->mutex);break ;
drivers/gpu/drm/amd/amdkfd/kfd_process.c +10 -10
@@ -447,7 +447,7 @@ static void kfd_process_destroy_pdds(struct kfd_process *p)list_for_each_entry_safe (pdd, temp, &p->per_device_data, per_device_list) { -pr_debug ("Releasing pdd (topology id %d) for process (pasid %d)\n" , +pr_debug ("Releasing pdd (topology id %d) for process (pasid 0x%x)\n" , pdd->dev->id, p->pasid);if (pdd->drm_file) {
@@ -1280,7 +1280,7 @@ static void evict_process_worker(struct work_struct *work) p->last_evict_timestamp =get_jiffies_64 (); -pr_info ("Started evicting pasid %d\n" , p->pasid); +pr_info ("Started evicting pasid 0x%x\n" , p->pasid); ret =kfd_process_evict_queues (p);if (!ret) {dma_fence_signal (p->ef);
@@ -1293,9 +1293,9 @@ static void evict_process_worker(struct work_struct *work)pr_debug ("Process %d queues idle, doorbell unmapped\n" , p->pasid); -pr_info ("Finished evicting pasid %d\n" , p->pasid); +pr_info ("Finished evicting pasid 0x%x\n" , p->pasid); }else -pr_err ("Failed to evict queues of pasid %d\n" , p->pasid); +pr_err ("Failed to evict queues of pasid 0x%x\n" , p->pasid);trace_kfd_evict_process_worker_end (p, ret ?"Failed" :"Success" ); }
@@ -1312,7 +1312,7 @@ static void restore_process_worker(struct work_struct *work)*/ p = container_of(dwork, struct kfd_process, restore_work);trace_kfd_restore_process_worker_start (p); -pr_info ("Started restoring pasid %d\n" , p->pasid); +pr_info ("Started restoring pasid 0x%x\n" , p->pasid);/* Setting last_restore_timestamp before successful restoration. * Otherwise this would have to be set by KGD (restore_process_bos)
@@ -1328,7 +1328,7 @@ static void restore_process_worker(struct work_struct *work) ret =amdgpu_amdkfd_gpuvm_restore_process_bos (p->kgd_process_info, &p->ef);if (ret) { -pr_info ("Failed to restore BOs of pasid %d, retry after %d ms\n" , +pr_info ("Failed to restore BOs of pasid 0x%x, retry after %d ms\n" , p->pasid,PROCESS_BACK_OFF_TIME_MS ); ret = queue_delayed_work(kfd_restore_wq, &p->restore_work,
@@ -1343,9 +1343,9 @@ static void restore_process_worker(struct work_struct *work) ret =kfd_process_restore_queues (p);trace_kfd_restore_process_worker_end (p, ret ?"Failed" :"Success" );if (!ret) -pr_info ("Finished restoring pasid %d\n" , p->pasid); +pr_info ("Finished restoring pasid 0x%x\n" , p->pasid);else -pr_err ("Failed to restore queues of pasid %d\n" , p->pasid); +pr_err ("Failed to restore queues of pasid 0x%x\n" , p->pasid); }void kfd_suspend_all_processes (void )
@@ -1359,7 +1359,7 @@ void kfd_suspend_all_processes(void)cancel_delayed_work_sync (&p->restore_work);if (kfd_process_evict_queues (p)) -pr_err ("Failed to suspend process %d\n" , p->pasid); +pr_err ("Failed to suspend process 0x%x\n" , p->pasid);dma_fence_signal (p->ef);dma_fence_put (p->ef); p->ef =NULL ;
@@ -1442,7 +1442,7 @@ int kfd_debugfs_mqds_by_process(struct seq_file *m, void *data)int idx =srcu_read_lock (&kfd_processes_srcu);hash_for_each_rcu (kfd_processes_table, temp, p, kfd_processes) { -seq_printf (m,"Process %d PASID %d:\n" , +seq_printf (m,"Process %d PASID 0x%x:\n" , p->lead_thread->tgid, p->pasid);mutex_lock (&p->mutex);
drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c +3 -3
@@ -53,7 +53,7 @@ static int find_available_queue_slot(struct process_queue_manager *pqm,pr_debug ("The new slot id %lu\n" , found);if (found >=KFD_MAX_NUM_OF_QUEUES_PER_PROCESS ) { -pr_info ("Cannot open more queues for process with pasid %d\n" , +pr_info ("Cannot open more queues for process with pasid 0x%x\n" , pqm->process->pasid);return -ENOMEM ; }
@@ -298,7 +298,7 @@ int pqm_create_queue(struct process_queue_manager *pqm, }if (retval !=0 ) { -pr_err ("Pasid %d DQM create queue %d failed. ret %d\n" , +pr_err ("Pasid 0x%x DQM create queue %d failed. ret %d\n" , pqm->process->pasid, type, retval); goto err_create_queue; }
@@ -378,7 +378,7 @@ int pqm_destroy_queue(struct process_queue_manager *pqm, unsigned int qid) dqm = pqn->q->device->dqm; retval = dqm->ops.destroy_queue (dqm, &pdd->qpd, pqn->q);if (retval) { -pr_err ("Pasid %d destroy queue %d failed, ret %d\n" , +pr_err ("Pasid 0x%x destroy queue %d failed, ret %d\n" , pqm->process->pasid, pqn->q->properties.queue_id, retval);if (retval != -ETIME )
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx