From mboxrd@z Thu Jan 1 00:00:00 1970 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 65291C4829D for ; Tue, 6 Feb 2024 23:36:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0FCE1112F68; Tue, 6 Feb 2024 23:36:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="BaEz0dom"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0C757112F68 for ; Tue, 6 Feb 2024 23:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707262614; x=1738798614; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0dAGG9PhRorwpMCAveHfpTrwYEasHUMJcmXBLXrkFw8=; b=BaEz0domUr1EyKZKcxWeDnZb/8WKsIsMf8ZZiHoFoXL3Vf5z3Ubk9lFg /nN4LMsuhPFPdyrUTzRkcc48NnlYpVnqD2L320ESih0Gt+okgsgwvi/ww sZV6+eJbg9MUHVbSQYkrpCcfd4neWEp2oEjYjrnHBF6MgLdgjPa9zI7dt BJWM8SsEKQk3fe7fZ228nzZ5lyEnL3m5EDleRcbxuHXt8BPBhclUyeQcM Sr8OMiOFiylO2lp+hZ6q4igv2yyOCxx16E9Sg3xAFsACrJ7yvhv3LuG28 ncKa7Ccx3PP3YK0+cNfDBtBd/mJ17wAcOgfJyLzwYpaLk6kNUIRt8EuWK A==; X-IronPort-AV: E=McAfee;i="6600,9927,10976"; a="776789" X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="776789" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 15:36:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="5793796" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 15:36:52 -0800 From: Matthew Brost To: Cc: , Matthew Brost Subject: [PATCH v3 06/22] drm/xe: Simplify VM bind IOCTL error handling and cleanup Date: Tue, 6 Feb 2024 15:37:13 -0800 Message-Id: <20240206233729.3173206-7-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240206233729.3173206-1-matthew.brost@intel.com> References: <20240206233729.3173206-1-matthew.brost@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Clean up everything in VM bind IOCTL in 1 path for both errors and non-errors. Also move VM bind IOCTL cleanup from ops (also used by non-IOCTL binds) to the VM bind IOCTL. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_vm.c | 60 +++++--------------------------- drivers/gpu/drm/xe/xe_vm_types.h | 5 --- 2 files changed, 9 insertions(+), 56 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index f59439500095..50c85da430c6 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -767,8 +767,7 @@ static void xe_vm_populate_dummy_rebind(struct xe_vm *vm, struct xe_vma *vma) } static struct dma_fence *ops_execute(struct xe_vm *vm, - struct xe_vma_ops *vops, - bool cleanup); + struct xe_vma_ops *vops); struct dma_fence *xe_vm_rebind(struct xe_vm *vm, bool rebind_worker) { @@ -792,7 +791,7 @@ struct dma_fence *xe_vm_rebind(struct xe_vm *vm, bool rebind_worker) trace_xe_vma_rebind_exec(vma); xe_vm_populate_dummy_rebind(vm, vma); - fence = ops_execute(vm, &vm->dummy_ops.vops, false); + fence = ops_execute(vm, &vm->dummy_ops.vops); if (IS_ERR(fence)) return fence; } @@ -2399,7 +2398,6 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct xe_exec_queue *q, if (!last_op) return 0; - last_op->ops = ops; if (last) { last_op->flags |= XE_VMA_OP_LAST; last_op->num_syncs = num_syncs; @@ -2569,25 +2567,6 @@ xe_vma_op_execute(struct xe_vm *vm, struct xe_vma_op *op) return fence; } -static void xe_vma_op_cleanup(struct xe_vm *vm, struct xe_vma_op *op) -{ - bool last = op->flags & XE_VMA_OP_LAST; - - if (last) { - while (op->num_syncs--) - xe_sync_entry_cleanup(&op->syncs[op->num_syncs]); - kfree(op->syncs); - if (op->q) - xe_exec_queue_put(op->q); - } - if (!list_empty(&op->link)) - list_del(&op->link); - if (op->ops) - drm_gpuva_ops_free(&vm->gpuvm, op->ops); - if (last) - xe_vm_put(vm); -} - static void xe_vma_op_unwind(struct xe_vm *vm, struct xe_vma_op *op, bool post_commit, bool prev_post_commit, bool next_post_commit) @@ -2664,8 +2643,6 @@ static void vm_bind_ioctl_ops_unwind(struct xe_vm *vm, op->flags & XE_VMA_OP_PREV_COMMITTED, op->flags & XE_VMA_OP_NEXT_COMMITTED); } - - drm_gpuva_ops_free(&vm->gpuvm, __ops); } } @@ -2745,8 +2722,7 @@ static int vm_bind_ioctl_ops_lock(struct drm_exec *exec, } static struct dma_fence *ops_execute(struct xe_vm *vm, - struct xe_vma_ops *vops, - bool cleanup) + struct xe_vma_ops *vops) { struct xe_vma_op *op, *next; struct dma_fence *fence = NULL; @@ -2761,8 +2737,6 @@ static struct dma_fence *ops_execute(struct xe_vm *vm, op->base.op, PTR_ERR(fence)); fence = ERR_PTR(-ENOSPC); } - if (cleanup) - xe_vma_op_cleanup(vm, op); } return fence; @@ -2784,7 +2758,7 @@ static int vm_bind_ioctl_ops_execute(struct xe_vm *vm, if (err) goto unlock; - fence = ops_execute(vm, vops, true); + fence = ops_execute(vm, vops); if (IS_ERR(fence)) { err = PTR_ERR(fence); /* FIXME: Killing VM rather than proper error handling */ @@ -3138,30 +3112,14 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) goto unwind_ops; } - xe_vm_get(vm); - if (q) - xe_exec_queue_get(q); - err = vm_bind_ioctl_ops_execute(vm, &vops); - up_write(&vm->lock); - - if (q) - xe_exec_queue_put(q); - xe_vm_put(vm); - - for (i = 0; bos && i < args->num_binds; ++i) - xe_bo_put(bos[i]); - - kfree(bos); - kfree(ops); - if (args->num_binds > 1) - kfree(bind_ops); - - return err; - unwind_ops: - vm_bind_ioctl_ops_unwind(vm, ops, args->num_binds); + if (err && err != -ENODATA) + vm_bind_ioctl_ops_unwind(vm, ops, args->num_binds); + for (i = args->num_binds - 1; i >= 0; --i) + if (ops[i]) + drm_gpuva_ops_free(&vm->gpuvm, ops[i]); free_syncs: if (err == -ENODATA) err = vm_bind_ioctl_signal_fences(vm, q, syncs, num_syncs); diff --git a/drivers/gpu/drm/xe/xe_vm_types.h b/drivers/gpu/drm/xe/xe_vm_types.h index 56665f946949..5020e0571108 100644 --- a/drivers/gpu/drm/xe/xe_vm_types.h +++ b/drivers/gpu/drm/xe/xe_vm_types.h @@ -171,11 +171,6 @@ enum xe_vma_op_flags { struct xe_vma_op { /** @base: GPUVA base operation */ struct drm_gpuva_op base; - /** - * @ops: GPUVA ops, when set call drm_gpuva_ops_free after this - * operations is processed - */ - struct drm_gpuva_ops *ops; /** @q: exec queue for this operation */ struct xe_exec_queue *q; /** -- 2.34.1