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 A8BF3C021B8 for ; Wed, 26 Feb 2025 15:34:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 76B1210E942; Wed, 26 Feb 2025 15:34:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="GsxPDrPC"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8593A10E943 for ; Wed, 26 Feb 2025 15:34:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1740584076; x=1772120076; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tCGUIxlIOT9JPp0Y76lTXNeEP1upEzziM5MiiY9NvUs=; b=GsxPDrPC6GM73nC9+/5q6cmIQGkG5DEZO0tfH7J5LoihYtaLIedrAYzB E8rroYKPfd3NXybvf4Vb6ECf7+WrrVH1qGRdqXltE9IKBp7+graJY2A4b +jFR1/gKx0xy6p46DUzapCGzEWpAGJ9b8djq+TbLkGlKULqusU8hSHUf8 mGHEvIvnL98sTQFQkb7ch5DOlUU9RDRmkxHoha48QoQ73c/QFk7gf+QzA ZaZmHPgofiblry41mGBl29c/U2pLelpBS6s1G0lftIPb75ximVic6C+ww UVPONFL9B5bDfL8zwbLlLCWz1qnPHtKTnrzb8AYQvi2KiDtz/y9ThOhva g==; X-CSE-ConnectionGUID: 6uglR5wMQ6SbhUhDhsQl0A== X-CSE-MsgGUID: ctgUEHZhR/KmzKd4ZxFAtA== X-IronPort-AV: E=McAfee;i="6700,10204,11357"; a="44260322" X-IronPort-AV: E=Sophos;i="6.13,317,1732608000"; d="scan'208";a="44260322" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Feb 2025 07:34:36 -0800 X-CSE-ConnectionGUID: ZJZHH9WRSUGZ4wUszV7fuA== X-CSE-MsgGUID: rLvXM2BtQNCybPA8jrV+zQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.13,317,1732608000"; d="scan'208";a="116917919" Received: from bergbenj-mobl1.ger.corp.intel.com (HELO fedora..) ([10.245.246.81]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Feb 2025 07:34:34 -0800 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= To: intel-xe@lists.freedesktop.org Cc: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Matthew Brost , stable@vger.kernel.org Subject: [PATCH 1/4] drm/xe/vm: Validate userptr during gpu vma prefetching Date: Wed, 26 Feb 2025 16:33:41 +0100 Message-ID: <20250226153344.58175-2-thomas.hellstrom@linux.intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250226153344.58175-1-thomas.hellstrom@linux.intel.com> References: <20250226153344.58175-1-thomas.hellstrom@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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" If a userptr vma subject to prefetching was already invalidated or invalidated during the prefetch operation, the operation would repeatedly return -EAGAIN which would typically cause an infinite loop. Validate the userptr to ensure this doesn't happen. Fixes: 5bd24e78829a ("drm/xe/vm: Subclass userptr vmas") Fixes: 617eebb9c480 ("drm/xe: Fix array of binds") Cc: Matthew Brost Cc: # v6.9+ Suggested-by: Matthew Brost Signed-off-by: Thomas Hellström --- drivers/gpu/drm/xe/xe_vm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 996000f2424e..4c1ca47667ad 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -2307,7 +2307,14 @@ static int vm_bind_ioctl_ops_parse(struct xe_vm *vm, struct drm_gpuva_ops *ops, } case DRM_GPUVA_OP_UNMAP: case DRM_GPUVA_OP_PREFETCH: - /* FIXME: Need to skip some prefetch ops */ + vma = gpuva_to_vma(op->base.prefetch.va); + + if (xe_vma_is_userptr(vma)) { + err = xe_vma_userptr_pin_pages(to_userptr_vma(vma)); + if (err) + return err; + } + xe_vma_ops_incr_pt_update_ops(vops, op->tile_mask); break; default: -- 2.48.1