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 F3DFBC2BA15 for ; Thu, 13 Jun 2024 04:14:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83B1110E163; Thu, 13 Jun 2024 04:14:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Ba5lJIjA"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5501C10E96D for ; Thu, 13 Jun 2024 04:13: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=1718252034; x=1749788034; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=pp2jropjliGxu/84YyHAWbc6T+m/C7qg/JYsmP8A20k=; b=Ba5lJIjAZ0aTKJVUYArGzh2zK54ME2am/7KMlme3f8laFcb39Kds/dom 1t0BahqrLz+lXDqZSiNIgJlW37rBCHd5aK95zkG3rP5h7u1AdmTlfQbLa ObzSYWXCKR++dIl1jiyOCCJCz0KFpqQHYonxuI+49o+pDowGVUWWwxVq1 vT0GHA78In0lu9+ksMspdPuiGbg4wTJrOqZ3w+vgGaohSgw6pAAVGR0oL JiNZJidv2Ckc8JdSvRJGyfKQvM7eWLP2rqpHQkXCS9n4ZkpQRYyG12wht zUScY6Q0l3mvxKJDcYR04S42EmJV72RuBtfUea1Ewz90MPpf9zB2iBEXd w==; X-CSE-ConnectionGUID: sRNFfGdnSk2+BgO/kWk6Aw== X-CSE-MsgGUID: W/4MV9bqTVeIf3wc5HvDrg== X-IronPort-AV: E=McAfee;i="6700,10204,11101"; a="14847993" X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="14847993" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2024 21:13:49 -0700 X-CSE-ConnectionGUID: ABdLQ3X0RJyMv5hx9PxsTQ== X-CSE-MsgGUID: 7a4lcZiAQSOnwOXadc3kAQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,234,1712646000"; d="scan'208";a="40476368" Received: from szeng-desk.jf.intel.com ([10.165.21.149]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jun 2024 21:13:48 -0700 From: Oak Zeng To: intel-xe@lists.freedesktop.org Subject: [CI 40/42] drm/xe/svm: Determine a vma is backed by device memory Date: Thu, 13 Jun 2024 00:24:27 -0400 Message-Id: <20240613042429.637281-40-oak.zeng@intel.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20240613042429.637281-1-oak.zeng@intel.com> References: <20240613042429.637281-1-oak.zeng@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" With system allocator, a userptr can now be back by device memory also. Introduce a helper function xe_vma_is_devmem to determine whether a range of vma is backed by device memory. Cc: Thomas Hellström Cc: Matthew Brost Cc: Brian Welty Cc: Himal Prasad Ghimiray Signed-off-by: Oak Zeng --- drivers/gpu/drm/xe/xe_pt.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_pt.c b/drivers/gpu/drm/xe/xe_pt.c index 91b61fa80acb..691ede2faec5 100644 --- a/drivers/gpu/drm/xe/xe_pt.c +++ b/drivers/gpu/drm/xe/xe_pt.c @@ -3,6 +3,7 @@ * Copyright © 2022 Intel Corporation */ +#include #include "xe_pt.h" #include "regs/xe_gtt_defs.h" @@ -578,6 +579,28 @@ static const struct xe_pt_walk_ops xe_pt_stage_bind_ops = { .pt_entry = xe_pt_stage_bind_entry, }; +static bool xe_vma_is_devmem(struct xe_vma *vma, u64 start) +{ + if (xe_vma_is_userptr(vma)) { + struct xe_userptr_vma *uvma = to_userptr_vma(vma); + struct drm_hmmptr *hmmptr = &uvma->userptr.hmmptr; + u64 offset = start - xe_vma_start(vma); + u64 page_idx = offset >> PAGE_SHIFT; + u64 hmm_pfn = hmmptr->pfn[page_idx]; + struct page *page = hmm_pfn_to_page(hmm_pfn); + + /** + * FIXME: Assume there is no mixture system memory and device + * memory placement in the [start, end) range of vma. We might + * need to relook at this in the future. + */ + return is_device_private_page(page); + } else { + struct xe_bo *bo = xe_vma_bo(vma); + return bo && (xe_bo_is_vram(bo) || xe_bo_is_stolen_devmem(bo)); + } +} + /** * xe_pt_stage_bind() - Build a disconnected page-table tree for a given address * range. @@ -604,8 +627,7 @@ xe_pt_stage_bind(struct xe_tile *tile, struct xe_vma *vma, u64 start, u64 end, { struct xe_device *xe = tile_to_xe(tile); struct xe_bo *bo = xe_vma_bo(vma); - bool is_devmem = !xe_vma_is_userptr(vma) && bo && - (xe_bo_is_vram(bo) || xe_bo_is_stolen_devmem(bo)); + bool is_devmem = xe_vma_is_devmem(vma, start); struct xe_res_cursor curs; struct xe_pt_stage_bind_walk xe_walk = { .base = { -- 2.26.3