Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 15BFBE77197 for ; Thu, 9 Jan 2025 08:28:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 74A4B10ED1E; Thu, 9 Jan 2025 08:28:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Uo1QzzUJ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4732310ED1E for ; Thu, 9 Jan 2025 08:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1736411285; x=1767947285; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=8ZkAi/DCSXD/TyGlVo6OEfhV1998lCbLwLWxqh0T8KI=; b=Uo1QzzUJ7t2iilrtmtWMzQHLgtU9NLt7cOQRxzLh0uzSoNuocj4a5j8V jYvpi+Keu59qRYYbFvtLYUS//bL41PxV5ZIY/wYW24CadbjcMuRt6N6Rs /qe0W9SOE4ezfE9b7+choO215kiFl4iJ9dlAW21y21EYOBAfu+jucCQAB JEzyLfrzBRWIgdpgQzN8Nlt0fmxOOj+Fl9jgmaOwxpTIhmkA/Vdv8Q+mh UmapnBsywRKACLomrG1WjhWoXCbHWbUaPEi2HxIT0c+8ygnyRKBZMizjl ipnONyMKvMgGwrYpB2b2yZb2iFr//dlxUfkpscUJUnKLRv0it2hhrt2e2 Q==; X-CSE-ConnectionGUID: 7iNRERh0QKqVPjjcbbSDIA== X-CSE-MsgGUID: F90PDVr0TyKQsEVaSm5vSA== X-IronPort-AV: E=McAfee;i="6700,10204,11309"; a="62037812" X-IronPort-AV: E=Sophos;i="6.12,300,1728975600"; d="scan'208";a="62037812" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2025 00:28:05 -0800 X-CSE-ConnectionGUID: L09pq00MTGW0WNAZJKTDhQ== X-CSE-MsgGUID: yHQ2atYYSoKUquSNeN7JuQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="134232191" Received: from mgorski-mobl1.ger.corp.intel.com (HELO [10.245.84.116]) ([10.245.84.116]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2025 00:28:03 -0800 Message-ID: Date: Thu, 9 Jan 2025 09:28:01 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 09/14] accel/ivpu: Set command queue management capability based on HWS To: Maciej Falkowski , dri-devel@lists.freedesktop.org Cc: oded.gabbay@gmail.com, quic_jhugo@quicinc.com, Karol Wachowski References: <20250107173238.381120-1-maciej.falkowski@linux.intel.com> <20250107173238.381120-10-maciej.falkowski@linux.intel.com> Content-Language: en-US From: Jacek Lawrynowicz Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 In-Reply-To: <20250107173238.381120-10-maciej.falkowski@linux.intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Reviewed-by: Jacek Lawrynowicz On 1/7/2025 6:32 PM, Maciej Falkowski wrote: > From: Karol Wachowski > > Control explicit command queue management capability bit based on > scheduling mode. Capability will be available only when hardware > scheduling mode is set. > > There is no point of allowing user space to create and destroy command > queues with OS schedling mode because FW does not support all required > functionalities for correct command queue management with OS scheduling. > > Return -ENODEV from command queue create/destroy/submit IOCTLs. > > Remove is_valid field from struct ivpu_job_cmdq > > Signed-off-by: Karol Wachowski > Signed-off-by: Maciej Falkowski > --- > drivers/accel/ivpu/ivpu_drv.c | 19 +++++++------------ > drivers/accel/ivpu/ivpu_drv.h | 1 + > drivers/accel/ivpu/ivpu_job.c | 24 +++++++++++------------- > drivers/accel/ivpu/ivpu_job.h | 1 - > 4 files changed, 19 insertions(+), 26 deletions(-) > > diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c > index 9b0d99873fb3..6a80d626d609 100644 > --- a/drivers/accel/ivpu/ivpu_drv.c > +++ b/drivers/accel/ivpu/ivpu_drv.c > @@ -127,23 +127,18 @@ void ivpu_file_priv_put(struct ivpu_file_priv **link) > kref_put(&file_priv->ref, file_priv_release); > } > > -static int ivpu_get_capabilities(struct ivpu_device *vdev, struct drm_ivpu_param *args) > +bool ivpu_is_capable(struct ivpu_device *vdev, u32 capability) > { > - switch (args->index) { > + switch (capability) { > case DRM_IVPU_CAP_METRIC_STREAMER: > - args->value = 1; > - break; > + return true; > case DRM_IVPU_CAP_DMA_MEMORY_RANGE: > - args->value = 1; > - break; > + return true; > case DRM_IVPU_CAP_MANAGE_CMDQ: > - args->value = 1; > - break; > + return vdev->fw->sched_mode == VPU_SCHEDULING_MODE_HW; > default: > - return -EINVAL; > + return false; > } > - > - return 0; > } > > static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_file *file) > @@ -203,7 +198,7 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_f > args->value = vdev->hw->sku; > break; > case DRM_IVPU_PARAM_CAPABILITIES: > - ret = ivpu_get_capabilities(vdev, args); > + args->value = ivpu_is_capable(vdev, args->index); > break; > default: > ret = -EINVAL; > diff --git a/drivers/accel/ivpu/ivpu_drv.h b/drivers/accel/ivpu/ivpu_drv.h > index b57d878f2fcd..d53902b34070 100644 > --- a/drivers/accel/ivpu/ivpu_drv.h > +++ b/drivers/accel/ivpu/ivpu_drv.h > @@ -213,6 +213,7 @@ void ivpu_file_priv_put(struct ivpu_file_priv **link); > int ivpu_boot(struct ivpu_device *vdev); > int ivpu_shutdown(struct ivpu_device *vdev); > void ivpu_prepare_for_reset(struct ivpu_device *vdev); > +bool ivpu_is_capable(struct ivpu_device *vdev, u32 capability); > > static inline u8 ivpu_revision(struct ivpu_device *vdev) > { > diff --git a/drivers/accel/ivpu/ivpu_job.c b/drivers/accel/ivpu/ivpu_job.c > index c55de9736d84..37ea92eb4b25 100644 > --- a/drivers/accel/ivpu/ivpu_job.c > +++ b/drivers/accel/ivpu/ivpu_job.c > @@ -123,7 +123,6 @@ static struct ivpu_cmdq *ivpu_cmdq_create(struct ivpu_file_priv *file_priv, u8 p > > cmdq->priority = priority; > cmdq->is_legacy = is_legacy; > - cmdq->is_valid = true; > > ret = xa_alloc_cyclic(&file_priv->cmdq_xa, &cmdq->id, cmdq, file_priv->cmdq_limit, > &file_priv->cmdq_id_next, GFP_KERNEL); > @@ -307,7 +306,7 @@ static struct ivpu_cmdq *ivpu_cmdq_acquire(struct ivpu_file_priv *file_priv, u32 > lockdep_assert_held(&file_priv->lock); > > cmdq = xa_load(&file_priv->cmdq_xa, cmdq_id); > - if (!cmdq || !cmdq->is_valid) { > + if (!cmdq) { > ivpu_warn_ratelimited(vdev, "Failed to find command queue with ID: %u\n", cmdq_id); > return NULL; > } > @@ -832,6 +831,9 @@ int ivpu_cmdq_submit_ioctl(struct drm_device *dev, void *data, struct drm_file * > struct ivpu_file_priv *file_priv = file->driver_priv; > struct drm_ivpu_cmdq_submit *args = data; > > + if (!ivpu_is_capable(file_priv->vdev, DRM_IVPU_CAP_MANAGE_CMDQ)) > + return -ENODEV; > + > if (args->cmdq_id < IVPU_CMDQ_MIN_ID || args->cmdq_id > IVPU_CMDQ_MAX_ID) > return -EINVAL; > > @@ -857,6 +859,9 @@ int ivpu_cmdq_create_ioctl(struct drm_device *dev, void *data, struct drm_file * > struct drm_ivpu_cmdq_create *args = data; > struct ivpu_cmdq *cmdq; > > + if (!ivpu_is_capable(file_priv->vdev, DRM_IVPU_CAP_MANAGE_CMDQ)) > + return -ENODEV; > + > if (args->priority > DRM_IVPU_JOB_PRIORITY_REALTIME) > return -EINVAL; > > @@ -880,24 +885,17 @@ int ivpu_cmdq_destroy_ioctl(struct drm_device *dev, void *data, struct drm_file > u32 cmdq_id; > int ret = 0; > > + if (!ivpu_is_capable(vdev, DRM_IVPU_CAP_MANAGE_CMDQ)) > + return -ENODEV; > + > mutex_lock(&file_priv->lock); > > cmdq = xa_load(&file_priv->cmdq_xa, args->cmdq_id); > - if (!cmdq || !cmdq->is_valid || cmdq->is_legacy) { > + if (!cmdq || cmdq->is_legacy) { > ret = -ENOENT; > goto unlock; > } > > - /* > - * There is no way to stop executing jobs per command queue > - * in OS scheduling mode, mark command queue as invalid instead > - * and it will be freed together with context release. > - */ > - if (vdev->fw->sched_mode == VPU_SCHEDULING_MODE_OS) { > - cmdq->is_valid = false; > - goto unlock; > - } > - > cmdq_id = cmdq->id; > ivpu_cmdq_destroy(file_priv, cmdq); > ivpu_cmdq_abort_all_jobs(vdev, file_priv->ctx.id, cmdq_id); > diff --git a/drivers/accel/ivpu/ivpu_job.h b/drivers/accel/ivpu/ivpu_job.h > index ff77ee1fcee2..2e301c2eea7b 100644 > --- a/drivers/accel/ivpu/ivpu_job.h > +++ b/drivers/accel/ivpu/ivpu_job.h > @@ -31,7 +31,6 @@ struct ivpu_cmdq { > u32 id; > u32 db_id; > u8 priority; > - bool is_valid; > bool is_legacy; > }; >