Commit 64c7f8cf authored by Ben Goz's avatar Ben Goz Committed by Oded Gabbay
Browse files

amdkfd: Add device queue manager module 



The queue scheduler divides into two sections, one section is process bounded
and the other section is device bounded.
The device bounded section is handled by this module.
The DQM module handles queue setup, update and tear-down from the device side.
It also supports suspend/resume operation.

v3: Changed device_init, added the use of the new gart allocation functions an
Added documentation.

v4:

Fixed a race in DQM queue scheduler where dqm->lock must be held when accessing
dqm->queue_count and dqm->processes_count. This fixes runlist IB allocation
failures when DQM is under load.

Fixed race in DQM queue destruction where queues being destroyed must be
removed from qpd->queues_list prior to preemption, or concurrent queue
creation activity may reschedule them while their MQD is destroyed.

Fixed EOP queue size setting in CP_HPD_EOP_CONTROL, because the size is
specified as (log2(size_dwords)-1). The previous calculation assumed the
size was specified in bytes, which caused interference between EOP queues
when multiple MEC pipelines were active.

v5:

Move amdkfd from drm/radeon/ to drm/amd/
Change format of mqd structure to match latest KV firmware
Add support for AQL queues creation to enable working with open-source HSA
runtime
Remove unused unmap_queue function
Various fixes (Style, typos)

Signed-off-by: default avatarBen Goz <ben.goz@amd.com>
Signed-off-by: default avatarJay Cornwall <jay.cornwall@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@amd.com>
parent 45102048

drivers/gpu/drm/amd/amdkfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ amdkfd-y := kfd_module.o kfd_device.o kfd_chardev.o kfd_topology.o \ 
		kfd_pasid.o kfd_doorbell.o kfd_flat_memory.o \

		kfd_process.o kfd_queue.o kfd_mqd_manager.o \

		kfd_kernel_queue.o kfd_packet_manager.o \

		kfd_process_queue_manager.o

		kfd_process_queue_manager.o kfd_device_queue_manager.o



obj-$(CONFIG_HSA_AMD)	+= amdkfd.o

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

+28 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/pci.h>

#include <linux/slab.h>

#include "kfd_priv.h"

#include "kfd_device_queue_manager.h"



#define MQD_SIZE_ALIGNED 768
@@ -199,12 +200,34 @@ bool kgd2kfd_device_init(struct kfd_dev *kfd, 
	amd_iommu_set_invalidate_ctx_cb(kfd->pdev,

						iommu_pasid_shutdown_callback);



	kfd->dqm = device_queue_manager_init(kfd);

	if (!kfd->dqm) {

		dev_err(kfd_device,

			"Error initializing queue manager for device (%x:%x)\n",

			kfd->pdev->vendor, kfd->pdev->device);

		goto device_queue_manager_error;

	}



	if (kfd->dqm->start(kfd->dqm) != 0) {

		dev_err(kfd_device,

			"Error starting queuen manager for device (%x:%x)\n",

			kfd->pdev->vendor, kfd->pdev->device);

		goto dqm_start_error;

	}



	kfd->init_complete = true;

	dev_info(kfd_device, "added device (%x:%x)\n", kfd->pdev->vendor,

		 kfd->pdev->device);



	pr_debug("kfd: Starting kfd with the following scheduling policy %d\n",

		sched_policy);



	goto out;



dqm_start_error:

	device_queue_manager_uninit(kfd->dqm);

device_queue_manager_error:

	amd_iommu_free_device(kfd->pdev);

device_iommu_pasid_error:

	kfd_topology_remove_device(kfd);

kfd_topology_add_device_error:
@@ -219,6 +242,7 @@ out: 
void kgd2kfd_device_exit(struct kfd_dev *kfd)

{

	if (kfd->init_complete) {

		device_queue_manager_uninit(kfd->dqm);

		amd_iommu_free_device(kfd->pdev);

		kfd_topology_remove_device(kfd);

	}
@@ -230,9 +254,11 @@ void kgd2kfd_suspend(struct kfd_dev *kfd) 
{

	BUG_ON(kfd == NULL);



	if (kfd->init_complete)

	if (kfd->init_complete) {

		kfd->dqm->stop(kfd->dqm);

		amd_iommu_free_device(kfd->pdev);

	}

}



int kgd2kfd_resume(struct kfd_dev *kfd)

{
@@ -249,6 +275,7 @@ int kgd2kfd_resume(struct kfd_dev *kfd) 
			return -ENXIO;

		amd_iommu_set_invalidate_ctx_cb(kfd->pdev,

						iommu_pasid_shutdown_callback);

		kfd->dqm->start(kfd->dqm);

	}



	return 0;

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

0 → 100644
+1059 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h

+47 −2
Original line number Diff line number Diff line
@@ -42,6 +42,50 @@ struct device_process_node { 
	struct list_head list;

};



/**

 * struct device_queue_manager

 *

 * @create_queue: Queue creation routine.

 *

 * @destroy_queue: Queue destruction routine.

 *

 * @update_queue: Queue update routine.

 *

 * @get_mqd_manager: Returns the mqd manager according to the mqd type.

 *

 * @exeute_queues: Dispatches the queues list to the H/W.

 *

 * @register_process: This routine associates a specific process with device.

 *

 * @unregister_process: destroys the associations between process to device.

 *

 * @initialize: Initializes the pipelines and memory module for that device.

 *

 * @start: Initializes the resources/modules the the device needs for queues

 * execution. This function is called on device initialization and after the

 * system woke up after suspension.

 *

 * @stop: This routine stops execution of all the active queue running on the

 * H/W and basically this function called on system suspend.

 *

 * @uninitialize: Destroys all the device queue manager resources allocated in

 * initialize routine.

 *

 * @create_kernel_queue: Creates kernel queue. Used for debug queue.

 *

 * @destroy_kernel_queue: Destroys kernel queue. Used for debug queue.

 *

 * @set_cache_memory_policy: Sets memory policy (cached/ non cached) for the

 * memory apertures.

 *

 * This struct is a base class for the kfd queues scheduler in the

 * device level. The device base class should expose the basic operations

 * for queue creation and queue destruction. This base class hides the

 * scheduling mode of the driver and the specific implementation of the

 * concrete device. This class is the only class in the queues scheduler

 * that configures the H/W.

 */



struct device_queue_manager {

	int	(*create_queue)(struct device_queue_manager *dqm,

				struct queue *q,
@@ -52,8 +96,9 @@ struct device_queue_manager { 
				struct queue *q);

	int	(*update_queue)(struct device_queue_manager *dqm,

				struct queue *q);

	struct mqd_manager * (*get_mqd_manager)(

					struct device_queue_manager *dqm,



	struct mqd_manager * (*get_mqd_manager)

					(struct device_queue_manager *dqm,

					enum KFD_MQD_TYPE type);



	int	(*register_process)(struct device_queue_manager *dqm,

drivers/gpu/drm/amd/amdkfd/kfd_priv.h

+21 −0
Original line number Diff line number Diff line
@@ -454,6 +454,8 @@ void kfd_process_destroy_wq(void); 
struct kfd_process *kfd_create_process(const struct task_struct *);

struct kfd_process *kfd_get_process(const struct task_struct *);



struct kfd_process_device *kfd_bind_process_to_device(struct kfd_dev *dev,

							struct kfd_process *p);

void kfd_unbind_process_from_device(struct kfd_dev *dev, unsigned int pasid);

struct kfd_process_device *kfd_get_process_device_data(struct kfd_dev *dev,

							struct kfd_process *p,
@@ -509,6 +511,10 @@ void uninit_queue(struct queue *q); 
void print_queue_properties(struct queue_properties *q);

void print_queue(struct queue *q);



struct mqd_manager *mqd_manager_init(enum KFD_MQD_TYPE type,

					struct kfd_dev *dev);

struct device_queue_manager *device_queue_manager_init(struct kfd_dev *dev);

void device_queue_manager_uninit(struct device_queue_manager *dqm);

struct kernel_queue *kernel_queue_init(struct kfd_dev *dev,

					enum kfd_queue_type type);

void kernel_queue_uninit(struct kernel_queue *kq);
@@ -537,6 +543,8 @@ int pqm_update_queue(struct process_queue_manager *pqm, unsigned int qid, 


#define KFD_HIQ_TIMEOUT (500)



#define KFD_FENCE_COMPLETED (100)

#define KFD_FENCE_INIT   (10)

#define KFD_UNMAP_LATENCY (150)



struct packet_manager {
@@ -547,6 +555,19 @@ struct packet_manager { 
	struct kfd_mem_obj *ib_buffer_obj;

};



int pm_init(struct packet_manager *pm, struct device_queue_manager *dqm);

void pm_uninit(struct packet_manager *pm);

int pm_send_set_resources(struct packet_manager *pm,

				struct scheduling_resources *res);

int pm_send_runlist(struct packet_manager *pm, struct list_head *dqm_queues);

int pm_send_query_status(struct packet_manager *pm, uint64_t fence_address,

				uint32_t fence_value);



int pm_send_unmap_queue(struct packet_manager *pm, enum kfd_queue_type type,

			enum kfd_preempt_type_filter mode,

			uint32_t filter_param, bool reset,

			unsigned int sdma_engine);



void pm_release_ib(struct packet_manager *pm);



uint64_t kfd_get_number_elems(struct kfd_dev *kfd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE