Commit 6027b1bf authored by Yong Zhao's avatar Yong Zhao Committed by Alex Deucher
Browse files

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. Meanwhile, change the pasid type from
unsigned int to uint16_t to be consistent throughout the code.

Signed-off-by: default avatarYong Zhao <Yong.Zhao@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d19eb6ac

drivers/gpu/drm/amd/amdkfd/kfd_chardev.c

+6 −6
Original line number Diff line number Diff line
@@ -282,7 +282,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);
@@ -332,7 +332,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);
@@ -378,7 +378,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);
@@ -855,7 +855,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;
@@ -913,7 +913,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
@@ -1905,7 +1905,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
Original line number Diff line number Diff line
@@ -786,7 +786,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;

			}
@@ -794,7 +794,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
Original line number Diff line number Diff line
@@ -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

+4 −4
Original line number Diff line number Diff line
@@ -580,7 +580,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
@@ -622,7 +622,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
@@ -668,7 +668,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 */
@@ -740,7 +740,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_events.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

		}

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE