Commit a37d7847 authored by Lizhi Hou's avatar Lizhi Hou Committed by Mario Limonciello
Browse files

accel/amdxdna: Replace idr api with xarray 



Switch mailbox message id and hardware context id management over from
the idr api to the xarray api.

Signed-off-by: default avatarLizhi Hou <lizhi.hou@amd.com>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241213232933.1545388-3-lizhi.hou@amd.com
parent 273b5176

drivers/accel/amdxdna/TODO

+0 −1
Original line number Diff line number Diff line 
- Replace idr with xa

- Add import and export BO support

- Add debugfs support

- Add debug BO support

drivers/accel/amdxdna/aie2_ctx.c

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <drm/drm_syncobj.h>

#include <linux/hmm.h>

#include <linux/types.h>

#include <linux/xarray.h>

#include <trace/events/amdxdna.h>



#include "aie2_msg_priv.h"
@@ -90,11 +91,11 @@ void aie2_restart_ctx(struct amdxdna_client *client) 
{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_hwctx *hwctx;

	int next = 0;

	unsigned long hwctx_id;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	mutex_lock(&client->hwctx_lock);

	idr_for_each_entry_continue(&client->hwctx_idr, hwctx, next) {

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx) {

		if (hwctx->status != HWCTX_STAT_STOP)

			continue;

drivers/accel/amdxdna/aie2_message.c

+3 −2
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/errno.h>

#include <linux/pci.h>

#include <linux/types.h>

#include <linux/xarray.h>



#include "aie2_msg_priv.h"

#include "aie2_pci.h"
@@ -315,10 +316,10 @@ int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf, 
	struct amdxdna_dev *xdna = ndev->xdna;

	struct amdxdna_client *client;

	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;

	dma_addr_t dma_addr;

	u32 aie_bitmap = 0;

	u8 *buff_addr;

	int next = 0;

	int ret, idx;



	buff_addr = dma_alloc_noncoherent(xdna->ddev.dev, size, &dma_addr,
@@ -329,7 +330,7 @@ int aie2_query_status(struct amdxdna_dev_hdl *ndev, char __user *buf, 
	/* Go through each hardware context and mark the AIE columns that are active */

	list_for_each_entry(client, &xdna->client_list, node) {

		idx = srcu_read_lock(&client->hwctx_srcu);

		idr_for_each_entry_continue(&client->hwctx_idr, hwctx, next)

		amdxdna_for_each_hwctx(client, hwctx_id, hwctx)

			aie_bitmap |= amdxdna_hwctx_col_map(hwctx);

		srcu_read_unlock(&client->hwctx_srcu, idx);

	}

drivers/accel/amdxdna/aie2_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/iommu.h>

#include <linux/iopoll.h>

#include <linux/pci.h>

#include <linux/xarray.h>



#include "aie2_msg_priv.h"

#include "aie2_pci.h"
@@ -691,11 +692,11 @@ static int aie2_get_hwctx_status(struct amdxdna_client *client, 
	struct amdxdna_drm_query_hwctx *tmp;

	struct amdxdna_client *tmp_client;

	struct amdxdna_hwctx *hwctx;

	unsigned long hwctx_id;

	bool overflow = false;

	u32 req_bytes = 0;

	u32 hw_i = 0;

	int ret = 0;

	int next;

	int idx;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));
@@ -707,8 +708,7 @@ static int aie2_get_hwctx_status(struct amdxdna_client *client, 
	buf = u64_to_user_ptr(args->buffer);

	list_for_each_entry(tmp_client, &xdna->client_list, node) {

		idx = srcu_read_lock(&tmp_client->hwctx_srcu);

		next = 0;

		idr_for_each_entry_continue(&tmp_client->hwctx_idr, hwctx, next) {

		amdxdna_for_each_hwctx(tmp_client, hwctx_id, hwctx) {

			req_bytes += sizeof(*tmp);

			if (args->buffer_size < req_bytes) {

				/* Continue iterating to get the required size */

drivers/accel/amdxdna/amdxdna_ctx.c

+19 −28
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <drm/drm_gem_shmem_helper.h>

#include <drm/drm_print.h>

#include <drm/gpu_scheduler.h>

#include <linux/xarray.h>

#include <trace/events/amdxdna.h>



#include "amdxdna_ctx.h"
@@ -63,11 +64,11 @@ void amdxdna_hwctx_suspend(struct amdxdna_client *client) 
{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_hwctx *hwctx;

	int next = 0;

	unsigned long hwctx_id;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	mutex_lock(&client->hwctx_lock);

	idr_for_each_entry_continue(&client->hwctx_idr, hwctx, next)

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx)

		xdna->dev_info->ops->hwctx_suspend(hwctx);

	mutex_unlock(&client->hwctx_lock);

}
@@ -76,11 +77,11 @@ void amdxdna_hwctx_resume(struct amdxdna_client *client) 
{

	struct amdxdna_dev *xdna = client->xdna;

	struct amdxdna_hwctx *hwctx;

	int next = 0;

	unsigned long hwctx_id;



	drm_WARN_ON(&xdna->ddev, !mutex_is_locked(&xdna->dev_lock));

	mutex_lock(&client->hwctx_lock);

	idr_for_each_entry_continue(&client->hwctx_idr, hwctx, next)

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx)

		xdna->dev_info->ops->hwctx_resume(hwctx);

	mutex_unlock(&client->hwctx_lock);

}
@@ -149,13 +150,13 @@ int amdxdna_cmd_get_cu_idx(struct amdxdna_gem_obj *abo) 
void amdxdna_hwctx_remove_all(struct amdxdna_client *client)

{

	struct amdxdna_hwctx *hwctx;

	int next = 0;

	unsigned long hwctx_id;



	mutex_lock(&client->hwctx_lock);

	idr_for_each_entry_continue(&client->hwctx_idr, hwctx, next) {

	amdxdna_for_each_hwctx(client, hwctx_id, hwctx) {

		XDNA_DBG(client->xdna, "PID %d close HW context %d",

			 client->pid, hwctx->id);

		idr_remove(&client->hwctx_idr, hwctx->id);

		xa_erase(&client->hwctx_xa, hwctx->id);

		mutex_unlock(&client->hwctx_lock);

		amdxdna_hwctx_destroy_rcu(hwctx, &client->hwctx_srcu);

		mutex_lock(&client->hwctx_lock);
@@ -194,15 +195,13 @@ int amdxdna_drm_create_hwctx_ioctl(struct drm_device *dev, void *data, struct dr 
	hwctx->num_tiles = args->num_tiles;

	hwctx->mem_size = args->mem_size;

	hwctx->max_opc = args->max_opc;

	mutex_lock(&client->hwctx_lock);

	ret = idr_alloc_cyclic(&client->hwctx_idr, hwctx, 0, MAX_HWCTX_ID, GFP_KERNEL);

	ret = xa_alloc_cyclic(&client->hwctx_xa, &hwctx->id, hwctx,

			      XA_LIMIT(AMDXDNA_INVALID_CTX_HANDLE + 1, MAX_HWCTX_ID),

			      &client->next_hwctxid, GFP_KERNEL);

	if (ret < 0) {

		mutex_unlock(&client->hwctx_lock);

		XDNA_ERR(xdna, "Allocate hwctx ID failed, ret %d", ret);

		goto free_hwctx;

	}

	hwctx->id = ret;

	mutex_unlock(&client->hwctx_lock);



	hwctx->name = kasprintf(GFP_KERNEL, "hwctx.%d.%d", client->pid, hwctx->id);

	if (!hwctx->name) {
@@ -228,9 +227,7 @@ int amdxdna_drm_create_hwctx_ioctl(struct drm_device *dev, void *data, struct dr 
free_name:

	kfree(hwctx->name);

rm_id:

	mutex_lock(&client->hwctx_lock);

	idr_remove(&client->hwctx_idr, hwctx->id);

	mutex_unlock(&client->hwctx_lock);

	xa_erase(&client->hwctx_xa, hwctx->id);

free_hwctx:

	kfree(hwctx);

exit:
@@ -249,24 +246,18 @@ int amdxdna_drm_destroy_hwctx_ioctl(struct drm_device *dev, void *data, struct d 
	if (!drm_dev_enter(dev, &idx))

		return -ENODEV;



	/*

	 * Use hwctx_lock to achieve exclusion with other hwctx writers,

	 * SRCU to synchronize with exec/wait command ioctls.

	 *

	 * The pushed jobs are handled by DRM scheduler during destroy.

	 */

	mutex_lock(&client->hwctx_lock);

	hwctx = idr_find(&client->hwctx_idr, args->handle);

	hwctx = xa_erase(&client->hwctx_xa, args->handle);

	if (!hwctx) {

		mutex_unlock(&client->hwctx_lock);

		ret = -EINVAL;

		XDNA_DBG(xdna, "PID %d HW context %d not exist",

			 client->pid, args->handle);

		goto out;

	}

	idr_remove(&client->hwctx_idr, hwctx->id);

	mutex_unlock(&client->hwctx_lock);



	/*

	 * The pushed jobs are handled by DRM scheduler during destroy.

	 * SRCU to synchronize with exec command ioctls.

	 */

	amdxdna_hwctx_destroy_rcu(hwctx, &client->hwctx_srcu);



	XDNA_DBG(xdna, "PID %d destroyed HW context %d", client->pid, args->handle);
@@ -324,7 +315,7 @@ int amdxdna_drm_config_hwctx_ioctl(struct drm_device *dev, void *data, struct dr 


	mutex_lock(&xdna->dev_lock);

	idx = srcu_read_lock(&client->hwctx_srcu);

	hwctx = idr_find(&client->hwctx_idr, args->handle);

	hwctx = xa_load(&client->hwctx_xa, args->handle);

	if (!hwctx) {

		XDNA_DBG(xdna, "PID %d failed to get hwctx %d", client->pid, args->handle);

		ret = -EINVAL;
@@ -436,7 +427,7 @@ int amdxdna_cmd_submit(struct amdxdna_client *client, 
	}



	idx = srcu_read_lock(&client->hwctx_srcu);

	hwctx = idr_find(&client->hwctx_idr, hwctx_hdl);

	hwctx = xa_load(&client->hwctx_xa, hwctx_hdl);

	if (!hwctx) {

		XDNA_DBG(xdna, "PID %d failed to get hwctx %d",

			 client->pid, hwctx_hdl);