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 792D9C7619A for ; Tue, 21 Mar 2023 16:12:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5AEF810E7D9; Tue, 21 Mar 2023 16:12:38 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id E143710E7D9 for ; Tue, 21 Mar 2023 16:12:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679415155; x=1710951155; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=4DXY5e3HEDvTwVDmSF2/C642FgEMMQCFpZ1Og8hU2T0=; b=P0/QHHc88FHhzyLDNti8l2hI7AZVJPGAdtEI4jnSDRecewrm9FZMJbHL AXxo1YcqXb3PLYS50gE/oJh76Wq+fht7Lj4PZQVbOoPUCIBl0Oh3dnaon RVEuKiemdaLtJXMg8AKYiu8R2GyPfSMeXKXizuCvSScEQhd0tOhoN6KVh L5CUO+2uHxb6LrAXrvbH1ET8DhOBD/HEfLQWXRNELy9gF+9c5f03SARJj Lg4c+qYnb61YLDOTPer2mQnW4MZ8VEBQ/qeD0hNdgAFKbNH4ZngeC1WnL UYd61pttAaRES2MOHEDqwkr7PuaAABvq8hstGo2NHETetU1tse/E1B+4A w==; X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="336488864" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="336488864" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2023 09:08:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10656"; a="683934556" X-IronPort-AV: E=Sophos;i="5.98,279,1673942400"; d="scan'208";a="683934556" Received: from lstrano-desk.jf.intel.com ([10.24.89.184]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2023 09:08:13 -0700 From: Matthew Brost To: Date: Tue, 21 Mar 2023 09:08:15 -0700 Message-Id: <20230321160815.673423-1-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH] drm/xe: Decrement fault mode counts in xe_vm_close_and_put 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" Rather waiting for the VM to be destroyed (all refs to VM go to zero), drop the fault mode counts when the VM is closed in xe_vm_close_and_put. This avoids a window where user space can create a faulting VM, close it, and a subsequent creation of a non-faulting VM fails. v2 (Lucas): Drop VLK reference in commit message Suggested-by: Niranjana Vishwanathapura Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_vm.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 68ab51f84bed..ab036a51d17e 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -1349,6 +1349,13 @@ void xe_vm_close_and_put(struct xe_vm *vm) XE_WARN_ON(!list_empty(&vm->extobj.list)); up_write(&vm->lock); + mutex_lock(&xe->usm.lock); + if (vm->flags & XE_VM_FLAG_FAULT_MODE) + xe->usm.num_vm_in_fault_mode--; + else if (!(vm->flags & XE_VM_FLAG_MIGRATION)) + xe->usm.num_vm_in_non_fault_mode--; + mutex_unlock(&xe->usm.lock); + xe_vm_put(vm); } @@ -1393,18 +1400,10 @@ static void vm_destroy_work_func(struct work_struct *w) drm_gpuva_manager_destroy(&vm->mgr); - mutex_lock(&xe->usm.lock); - if (vm->flags & XE_VM_FLAG_FAULT_MODE) - xe->usm.num_vm_in_fault_mode--; - else if (!(vm->flags & XE_VM_FLAG_MIGRATION)) - xe->usm.num_vm_in_non_fault_mode--; - mutex_unlock(&xe->usm.lock); - trace_xe_vm_free(vm); dma_fence_put(vm->rebind_fence); dma_resv_fini(&vm->resv); kfree(vm); - } void xe_vm_free(struct kref *ref) -- 2.34.1