Commit b7ed87ff authored by Maciej Falkowski's avatar Maciej Falkowski Committed by Jacek Lawrynowicz
Browse files

accel/ivpu: Abort jobs of faulty context 



Abort all jobs that belong to contexts generating MMU faults in order
to avoid flooding host with MMU IRQs.

Jobs are cancelled with:
  - SSID_RELEASE command when OS scheduling is enabled
  - DESTROY_CMDQ command when HW scheduling is enabled

Signed-off-by: default avatarMaciej Falkowski <maciej.falkowski@intel.com>
Co-developed-by: default avatarWachowski, Karol <karol.wachowski@intel.com>
Signed-off-by: default avatarWachowski, Karol <karol.wachowski@intel.com>
Reviewed-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Signed-off-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240611120433.1012423-3-jacek.lawrynowicz@linux.intel.com
parent d9dfc4ea

drivers/accel/ivpu/ivpu_drv.c

+23 −0
Original line number Diff line number Diff line
@@ -446,6 +446,26 @@ static const struct drm_driver driver = { 
	.minor = DRM_IVPU_DRIVER_MINOR,

};



static void ivpu_context_abort_invalid(struct ivpu_device *vdev)

{

	struct ivpu_file_priv *file_priv;

	unsigned long ctx_id;



	mutex_lock(&vdev->context_list_lock);



	xa_for_each(&vdev->context_xa, ctx_id, file_priv) {

		if (!file_priv->has_mmu_faults || file_priv->aborted)

			continue;



		mutex_lock(&file_priv->lock);

		ivpu_context_abort_locked(file_priv);

		file_priv->aborted = true;

		mutex_unlock(&file_priv->lock);

	}



	mutex_unlock(&vdev->context_list_lock);

}



static irqreturn_t ivpu_irq_thread_handler(int irq, void *arg)

{

	struct ivpu_device *vdev = arg;
@@ -459,6 +479,9 @@ static irqreturn_t ivpu_irq_thread_handler(int irq, void *arg) 
		case IVPU_HW_IRQ_SRC_IPC:

			ivpu_ipc_irq_thread_handler(vdev);

			break;

		case IVPU_HW_IRQ_SRC_MMU_EVTQ:

			ivpu_context_abort_invalid(vdev);

			break;

		default:

			ivpu_err_ratelimited(vdev, "Unknown IRQ source: %u\n", irq_src);

			break;

drivers/accel/ivpu/ivpu_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ struct ivpu_file_priv { 
	struct ivpu_bo *ms_info_bo;

	bool has_mmu_faults;

	bool bound;

	bool aborted;

};



extern int ivpu_dbg_mask;

drivers/accel/ivpu/ivpu_hw.h

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#define IVPU_HW_IRQ_FIFO_LENGTH 1024



#define IVPU_HW_IRQ_SRC_IPC 1

#define IVPU_HW_IRQ_SRC_MMU_EVTQ 2



struct ivpu_addr_range {

	resource_size_t start;

drivers/accel/ivpu/ivpu_ipc.c

+1 −2
Original line number Diff line number Diff line
@@ -210,8 +210,7 @@ void ivpu_ipc_consumer_del(struct ivpu_device *vdev, struct ivpu_ipc_consumer *c 
	ivpu_ipc_tx_release(vdev, cons->tx_vpu_addr);

}



static int

ivpu_ipc_send(struct ivpu_device *vdev, struct ivpu_ipc_consumer *cons, struct vpu_jsm_msg *req)

int ivpu_ipc_send(struct ivpu_device *vdev, struct ivpu_ipc_consumer *cons, struct vpu_jsm_msg *req)

{

	struct ivpu_ipc_info *ipc = vdev->ipc;

	int ret;

drivers/accel/ivpu/ivpu_ipc.h

+3 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2020-2023 Intel Corporation

 * Copyright (C) 2020-2024 Intel Corporation

 */



#ifndef __IVPU_IPC_H__
@@ -96,6 +96,8 @@ void ivpu_ipc_consumer_add(struct ivpu_device *vdev, struct ivpu_ipc_consumer *c 
			   u32 channel, ivpu_ipc_rx_callback_t callback);

void ivpu_ipc_consumer_del(struct ivpu_device *vdev, struct ivpu_ipc_consumer *cons);



int ivpu_ipc_send(struct ivpu_device *vdev, struct ivpu_ipc_consumer *cons,

		  struct vpu_jsm_msg *req);

int ivpu_ipc_receive(struct ivpu_device *vdev, struct ivpu_ipc_consumer *cons,

		     struct ivpu_ipc_hdr *ipc_buf, struct vpu_jsm_msg *jsm_msg,

		     unsigned long timeout_ms);