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 2CD87C43638 for ; Tue, 30 Jun 2026 08:34:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DB31710E196; Tue, 30 Jun 2026 08:34:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="c9lZjxkp"; dkim-atps=neutral Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012067.outbound.protection.outlook.com [40.107.209.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id A98A810E196; Tue, 30 Jun 2026 08:34:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nQ3wBcDPNZMbj0ZLfr7YPwS5EPzP2bmxzlYCO8uJWhDWlar+6ocIFf7T6fSlDSyB06J7VQ1mrjiZTu/nmReDxhLK3L4Am6RzgJ4COz6AJ+RAMZYpha0txhSoGOZE1xWOAUpk1nsd5jSwVYxwPhHpMAR2K02Pcull1MRmzeuQK9yGRNjpvFLQ+I7VjqTRfxL5KC3gYffDdYa29uO/rGC+TTK00vXyj6+dzJFFaPjwbMS7cec7I9VgSvyzEhlo64/IK/sTQDNIcfrfbB0U3ycnwzRiE3UOcXSvU9SzrNdfbeLqsytaRt+K+QDFg2e5ovFj10XrhOJo3NVsX24tPNNMtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7xBkJZ9akLca8b/RLfE7UCpyqgJhT7kmLBPcOkUq6ak=; b=TCePcgNguV/OlfOetZ1FEM7gvvZUgrimBIw6Zm9olmia9Mf3xEiLaQJo8OW5kEiFf+T7BzxPuupPeMV9FMirqVBiSuUc788iqPsdvmIutxD2gSQnVgjOp5eUFRrnhIsWOOJUWmBN+ju/CcCmLd0ulYcYHdKlk7gMSA7G4SXjxBTK58iA2y+AoJaNomlaI3ht7P2bOysKp0XfOAgEUoHp5xZKKpI3nbB1O73zcB2pFGOAckHkJrzCIsh5LBldcCpO7UV2dglZEUlcgRmhnTBs0RdR7qByqOpqCii7Qi0W7K+HbwzTyLyQY+RBy++E2WIZ8rVcYd8DwbKMuFDwW+7TWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=ffwll.ch smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7xBkJZ9akLca8b/RLfE7UCpyqgJhT7kmLBPcOkUq6ak=; b=c9lZjxkpxsx9kOD+ELIThg3TiQgeIZgkA1JqIjTFHf+2EKy+t1/w8u2JHDk/8t4Yfa5sA7NrgPU6NH453GGBvLHH+pW+ULRaDswlTrhePGx+7cr53/VzpQIPtxg7yjT0gv/Ej7KO5x3vK+p6vNT6HPsJp2g4td6XkbLneMNnBRM= Received: from DM6PR03CA0076.namprd03.prod.outlook.com (2603:10b6:5:333::9) by MW4PR12MB6779.namprd12.prod.outlook.com (2603:10b6:303:20f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.8; Tue, 30 Jun 2026 08:33:56 +0000 Received: from DS1PEPF00017098.namprd05.prod.outlook.com (2603:10b6:5:333:cafe::49) by DM6PR03CA0076.outlook.office365.com (2603:10b6:5:333::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.159.19 via Frontend Transport; Tue, 30 Jun 2026 08:33:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by DS1PEPF00017098.mail.protection.outlook.com (10.167.18.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.181.6 via Frontend Transport; Tue, 30 Jun 2026 08:33:56 +0000 Received: from honglei-remote.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.41; Tue, 30 Jun 2026 03:33:52 -0500 From: Honglei Huang To: , , , , , CC: , , , , , , , , , , Subject: [PATCH v9 2/5] drm/gpusvm: embed struct drm_device into drm_gpusvm_pages Date: Tue, 30 Jun 2026 16:33:04 +0800 Message-ID: <20260630083307.381909-3-honghuan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260630083307.381909-1-honghuan@amd.com> References: <20260630083307.381909-1-honghuan@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: satlexmb07.amd.com (10.181.42.216) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017098:EE_|MW4PR12MB6779:EE_ X-MS-Office365-Filtering-Correlation-Id: 7c1af01e-7f79-4e31-d9d3-08ded682535e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700016|376014|82310400026|1800799024|23010399003|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: EmHefMsWMjT4UBFhKcKN0C8crZCRJ+6YAUa1ov7T/agizwG9E4sKgvH4+De1R0k2RIUWEpSS/Oed7dWwCJd4OBExYdVw5p6KHNkmV9pxyubDUjCBFcGuQFvOc4bMwqIK7FytYBHPu6PdAEOqkU91cEn1qwsojUSvYCM8OUaG/X89lV1ETLfri9tCEZuvno5KkIWzgpUXSe0zC0fMRxMbC6EHWQGbLSpWi4pD8NA5rxUSYfn9d3IlOxlNLmc1C4legm6mAMVE3beKHe48Pr88/7jqZaRWKYfdGnFPdLHL8m82z9vOHw5q7BmrVVbQkz1zFlGV6SXUc4nC6JBYi97dSQk4iTzM15JWfkl5Nne5KuZoq17KinCApQHS2FXWwFvVNdGWJnMp5Ro08w1wsuNmhcZKsC7u/LmIn6gSkoetI9KaiP/z7R4ECA0CRRlS40TJw4mzI3riOqU6YPR0TdpoUrsrAKst1D/BkdgSrIvMQbbKhEMTwM+ovUvsWnvDUtO/nrXyUEitutzRaFI0z8Lo4GXd3R52c2KQ1Q+tApfYD6P7rPsZvLL1TG9LKPz21hY9/qdpf2CKSk8wPZrb+b2MPQgO5rS3NOhkrTCQbMjTjoA3xrA8bu0GQ4wp8hanaxmka/+26ghVjr+a2/kb4fFbGRFGQuSFhDoXMiEqUoE+eQLSz6RvPq45RUUpYmuxL+I0FLksninNAKYDc2udADbzog== X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:satlexmb07.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(36860700016)(376014)(82310400026)(1800799024)(23010399003)(56012099006)(11063799006)(22082099003)(18002099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NtJ3frmBhjTedjnW4JQ6rJZ5arX27g8U9sHshqKL5Ahu6Jo4V17zu6kFD+w6YZr2en3iuTlPKKYE1/vMmlcAoYQCpizZgHatGhZzUOHVwMFYbac3vL9UdFyskTemZBL8wqGA+BJf8tGcxc9Eg6bJlftK7zR3OwZ/OYPCt7FulbzmNa3ZiHHYh9FFFN9tUxZ8ZO6U9v1+D//SawdMszlWNpe51Ghu3AuUaDd+fXaYp3W0k5Py+FlxtGDHlkG35JN6vJRzGsmSOjFI+Q62suW4LeX0+XlPHjgtsWm/JYRO4EcUmzXdoop0uMmqMz0AffNA9ipbuBFCSBIsVXmKRrnkTsu//JZwlJiLs51G6V8TIPQ0y1DMOOoZk3iRs4JzJSEP+CrVp54rqYKMmcfG6LWE6f4B2yn6fsy11DtbGJWMjJWMf+pp/2etg8ABBv768skv X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2026 08:33:56.5428 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c1af01e-7f79-4e31-d9d3-08ded682535e X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017098.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6779 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" drm_gpusvm_pages is the layer that actually represents physical pages/mappings it owns the dma_addr array, the dma_iova_state... With the previous patch, so drm_gpusvm_pages is now strictly about physical pages and their DMA view. Since now the drm_gpusvm_pages instance is inherently bound to one specific drm_device, make that ownership explicit by giving drm_gpusvm_pages its own drm_device handle, and drive all DMA through it instead of through the gpusvm: - Add drm to struct drm_gpusvm_pages and route all DMA in drm_gpusvm_get_pages() / __drm_gpusvm_unmap_pages() through svm_pages->drm instead of gpusvm->drm. - Bind svm_pages->drm where the pages object is initialised (drm_gpusvm_range_alloc() and the xe userptr setup) and require it to be set on entry to drm_gpusvm_get_pages(); the dma device is immutable for the lifetime of the pages instance. A later patch introduces drm_gpusvm_init_pages() to centralise this. Suggested-by: Matthew Brost Reviewed-by: Matthew Brost Signed-off-by: Honglei Huang --- drivers/gpu/drm/drm_gpusvm.c | 30 ++++++++++++++++++++---------- drivers/gpu/drm/xe/xe_userptr.c | 2 ++ include/drm/drm_gpusvm.h | 2 ++ 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_gpusvm.c b/drivers/gpu/drm/drm_gpusvm.c index abdfdaaf5e2..604554e40f6 100644 --- a/drivers/gpu/drm/drm_gpusvm.c +++ b/drivers/gpu/drm/drm_gpusvm.c @@ -641,6 +641,7 @@ drm_gpusvm_range_alloc(struct drm_gpusvm *gpusvm, range->itree.last = ALIGN(fault_addr + 1, chunk_size) - 1; INIT_LIST_HEAD(&range->entry); range->pages.notifier_seq = LONG_MAX; + range->pages.drm = gpusvm->drm; range->flags.migrate_devmem = migrate_devmem ? 1 : 0; return range; @@ -1135,11 +1136,16 @@ static void __drm_gpusvm_unmap_pages(struct drm_gpusvm *gpusvm, unsigned long npages) { struct drm_pagemap *dpagemap = svm_pages->dpagemap; - struct device *dev = gpusvm->drm->dev; + struct device *dev; unsigned long i, j; lockdep_assert_held(&gpusvm->notifier_lock); + if (!svm_pages->drm) + return; + + dev = svm_pages->drm->dev; + if (svm_pages->flags.has_dma_mapping) { struct drm_gpusvm_pages_flags flags = { .__flags = svm_pages->flags.__flags, @@ -1421,6 +1427,9 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm, DMA_BIDIRECTIONAL; struct dma_iova_state *state = &svm_pages->state; + if (!svm_pages->drm) + return -EINVAL; + retry: if (time_after(jiffies, timeout)) return -EBUSY; @@ -1520,7 +1529,7 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm, pagemap = page_pgmap(page); dpagemap = drm_pagemap_page_to_dpagemap(page); - if (drm_WARN_ON(gpusvm->drm, !dpagemap)) { + if (drm_WARN_ON(svm_pages->drm, !dpagemap)) { /* * Raced. This is not supposed to happen * since hmm_range_fault() should've migrated @@ -1532,10 +1541,10 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm, } svm_pages->dma_addr[j] = dpagemap->ops->device_map(dpagemap, - gpusvm->drm->dev, + svm_pages->drm->dev, page, order, dma_dir); - if (dma_mapping_error(gpusvm->drm->dev, + if (dma_mapping_error(svm_pages->drm->dev, svm_pages->dma_addr[j].addr)) { err = -EFAULT; goto err_unmap; @@ -1555,11 +1564,11 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm, } if (!i) - dma_iova_try_alloc(gpusvm->drm->dev, state, + dma_iova_try_alloc(svm_pages->drm->dev, state, 0, npages * PAGE_SIZE); if (dma_use_iova(state)) { - err = dma_iova_link(gpusvm->drm->dev, state, + err = dma_iova_link(svm_pages->drm->dev, state, hmm_pfn_to_phys(pfns[i]), svm_pages->state_offset, PAGE_SIZE << order, @@ -1570,11 +1579,11 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm, addr = state->addr + svm_pages->state_offset; svm_pages->state_offset += PAGE_SIZE << order; } else { - addr = dma_map_page(gpusvm->drm->dev, + addr = dma_map_page(svm_pages->drm->dev, page, 0, PAGE_SIZE << order, dma_dir); - if (dma_mapping_error(gpusvm->drm->dev, addr)) { + if (dma_mapping_error(svm_pages->drm->dev, addr)) { err = -EFAULT; goto err_unmap; } @@ -1590,7 +1599,7 @@ int drm_gpusvm_get_pages(struct drm_gpusvm *gpusvm, } if (dma_use_iova(state)) { - err = dma_iova_sync(gpusvm->drm->dev, state, 0, + err = dma_iova_sync(svm_pages->drm->dev, state, 0, svm_pages->state_offset); if (err) goto err_unmap; @@ -1640,7 +1649,8 @@ int drm_gpusvm_range_get_pages(struct drm_gpusvm *gpusvm, struct drm_gpusvm_range *range, const struct drm_gpusvm_ctx *ctx) { - return drm_gpusvm_get_pages(gpusvm, &range->pages, gpusvm->mm, + return drm_gpusvm_get_pages(gpusvm, &range->pages, + gpusvm->mm, &range->notifier->notifier, drm_gpusvm_range_start(range), drm_gpusvm_range_end(range), ctx); diff --git a/drivers/gpu/drm/xe/xe_userptr.c b/drivers/gpu/drm/xe/xe_userptr.c index 6f71bc66b14..9df98bcd3ca 100644 --- a/drivers/gpu/drm/xe/xe_userptr.c +++ b/drivers/gpu/drm/xe/xe_userptr.c @@ -390,6 +390,7 @@ int xe_userptr_setup(struct xe_userptr_vma *uvma, unsigned long start, unsigned long range) { struct xe_userptr *userptr = &uvma->userptr; + struct xe_vm *vm = xe_vma_vm(&uvma->vma); int err; INIT_LIST_HEAD(&userptr->invalidate_link); @@ -402,6 +403,7 @@ int xe_userptr_setup(struct xe_userptr_vma *uvma, unsigned long start, return err; userptr->pages.notifier_seq = LONG_MAX; + userptr->pages.drm = &vm->xe->drm; return 0; } diff --git a/include/drm/drm_gpusvm.h b/include/drm/drm_gpusvm.h index 251a7266a73..842353afb27 100644 --- a/include/drm/drm_gpusvm.h +++ b/include/drm/drm_gpusvm.h @@ -129,6 +129,7 @@ struct drm_gpusvm_pages_flags { /** * struct drm_gpusvm_pages - Structure representing a GPU SVM mapped pages * + * @drm: The DRM device that owns the dma mappings * @dma_addr: Device address array * @dpagemap: The struct drm_pagemap of the device pages we're dma-mapping. * Note this is assuming only one drm_pagemap per range is allowed. @@ -138,6 +139,7 @@ struct drm_gpusvm_pages_flags { * @flags: Flags for the range; see &struct drm_gpusvm_pages_flags */ struct drm_gpusvm_pages { + struct drm_device *drm; struct drm_pagemap_addr *dma_addr; struct drm_pagemap *dpagemap; struct dma_iova_state state; -- 2.34.1