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 EF691C43458 for ; Tue, 30 Jun 2026 10:22:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A959310EC26; Tue, 30 Jun 2026 10:22:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.b="mRPmNbkw"; dkim-atps=neutral Received: from BN8PR05CU002.outbound.protection.outlook.com (mail-eastus2azon11011000.outbound.protection.outlook.com [52.101.57.0]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6EE0E10EC05; Tue, 30 Jun 2026 10:22:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IyBgtePXBO+KMcaFBlYE6potiICcdFyu6KECeSicAaOCrfbRzuUsgxCnCZC8zdHCvDQu92/AkR+LN9jjcdBfXeIndN2KklklwS7tw0vlfU4zSFgvg05kdRanVV9fbHy25L0IF6kddMtyO7VGrs4WUh4SbA+I0Q32QM+GpZlYfo/1slyaLAbToL73SzqnHrvXtInpSQh8N13BK2TsdjJYpeKUb4lEt+AvFHgCirDwVRP2UPTWqD+2iA87IRsS6J6FOA2ogV8l7uPxON0gS3lTeXO5Ca9mcM+KtqTyWjd9iimOviQDMMwE8fVhI+niOzzgp1132oalHZC5CRnj1+iC6Q== 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=bK7aAXEkGnqmuyCbMeNtv/GhFAG0gy1UZCY4LbK6qo0=; b=k1iBzL55toalIcO7sFaZ00tZuS5ah+0+6ijLnCEKVq15hdWMXrPg+mWaDiEy5QAsoFx+GK4VjqsyO26fia8XEnTk1El2oU90RLWuRDeAN6eskYsZc7lIDwEL0qw+6+LoidmenvKhLsNr17QTlIinRBazKvDw2qj4makl1oiMPxV3qGd2Zl5IZV8kxGHVYLjrzEp/P3TSYnPBg6lgGHlStGFB/choR4cAXq39+6Ck9bGM4Klc2nw3Wix27tNAfpGzFqGKLXTG/TG2AiX+uGYLtODqdUdOQzy+pQfqomfAit3SRt7yR9dKDycLSSMsX4D/QJSY8QWbGrCiSw7D4YHnNg== 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=bK7aAXEkGnqmuyCbMeNtv/GhFAG0gy1UZCY4LbK6qo0=; b=mRPmNbkwBfi2Q0fd63Xenc3Cg8YKiDQDrAZUdAwM344lMGGutZ5Hp3jhWyGRmUDXGrN+vVFNsvBTvoKtbCAyZjF948O9yQWMe9Yy/0Lw1S61CcAHZHpAxusFpBhefXRmSdMd5MUbNFHg8gDsBJur+asdbMK3Nl10rK2W0AKXeCw= Received: from MN2PR01CA0057.prod.exchangelabs.com (2603:10b6:208:23f::26) by DM4PR12MB6592.namprd12.prod.outlook.com (2603:10b6:8:8a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.139.20; Tue, 30 Jun 2026 10:22:05 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:23f:cafe::e) by MN2PR01CA0057.outlook.office365.com (2603:10b6:208:23f::26) 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 10:22:04 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) 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 10:22:04 +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 05:22:00 -0500 From: Honglei Huang To: , , , , , CC: , , , , , , , , , , Subject: [PATCH v10 5/5] drm/gpusvm: let the drm_gpusvm core context purely MM level Date: Tue, 30 Jun 2026 18:21:27 +0800 Message-ID: <20260630102127.392396-6-honghuan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260630102127.392396-1-honghuan@amd.com> References: <20260630102127.392396-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: BN3PEPF0000B074:EE_|DM4PR12MB6592:EE_ X-MS-Office365-Filtering-Correlation-Id: e241a187-8275-4671-12f8-08ded6916eac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700016|376014|23010399003|1800799024|22082099003|18002099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: +kpA6q8Bc/bW/6uBrZS+5FcIDDhYj3ATjoMRBTKbmefE3zK41biGSPqhAlJlcTbgHnNEhKopnVa0346ITAuWmEUQu8IIi8jY5Ha1AGvloNemCYFdr2YWHbAYsBigvYOYqd4tEspvJN0XjoRndmR54H5tlEtjJi4H2ZSTXjddI7KccHN+4aGLm8M98kYCUMy/ZVIoKBNfKe3qn/e3lO960/LscI23jQlMOCW2Vyx6XwiIW1M49vGFPPGOq++8vJo9SS0zYWzWmzhOBRutMM7jptoBuh+OP3Rc8tJcivTxjBtC5rzWWanuY6MnZLY88CYin3KIN5lJ7aDDGczEu074e2AIio9mdPCV1w9B9Dc8SxLDWKW2hpwiKpSmu8GnxO4tWErVDGTbXE+Qu1pufnfg8DZfHYvQPYNqhK3JY66Yg+duMCVacBEqXOYVywBO3pZj7ir39Lb065/m5KCSw07dsgkTuENGJatgK9UieQWt0lEZhNxWRylPS1IvTaYOMiHt3afGK+0H3ckIzrz7UTJF9HHp1vQgOFCTC1o7ijWO2RSvJnGBKBlHNDg8YEs06L53/zqKncbo+gvY+rlPPI1ZArXWLjfw4k8LHHV19IjNw5a/QtCi3rxOP7vhPmhctnMDItvEwrhmrjlxf0k3O4wmincgDhmMC4qPMfSpfbWPdb2BvBQ0ajEi69F/EwnE0AlZH7ic0WMgR83M/xS2rjmUmA== 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)(82310400026)(36860700016)(376014)(23010399003)(1800799024)(22082099003)(18002099003)(56012099006)(11063799006); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: IwyaN6C3EOPF9cdq+wYmkpbnVLnGSLmxawyIZZLvyc9rr2dnNlmrZu/Qs7J1OGGEfwscBIK+9oaVJMaoz7w98BsFVBi6XwS4TFbU6GL/B3biWq5tuVRAR14akvhMNTQ7rPwXPLZQ9Bk95lLguo7CF1RFAL+EuV3YCpCow5r2SdKqF3yCUuPLG894Drn6ENB1JIsK6X9AxL17i7MJg++sPNsSxTdnqkO/tgJrMogOS/KrY2pv1hm0GViWx8hP4E0KaW6Im3I66B+316P4LuDlz+mn+cpmvkUBbqvmtPW7SQjcmvz3hK39k0QYlX609g3PMwds8ljZF0PYXajD0OwjESv0bBI44WrCUz0/KNKD91bKyWapf/G/R0CTqL+heRxVdVr1FfAohZrtHoV5dbtWI1BWjP5PjmZOw6RP7EEwCcIDK9Saqbbl9bDJ0dbWAO36 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2026 10:22:04.8135 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e241a187-8275-4671-12f8-08ded6916eac 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6592 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" The core mechanism of drm_gpusvm is HMM, which is fundamentally an MM side subsystem. A drm_device, enters the picture on the device side at DMA mapping / GPU bind. So move struct drm_device from struct drm_gpusvm in drm_gpusvm. Let drm_gpusvm keep its core neutral and leave device side decisions to the driver. Make drm_gpusvm a pure MM level object. - Move the drm_device from struct drm_gpusvm. drm_device now stored in drm_gpusvm_pages. - Drop the drm parameter from drm_gpusvm_init() - Update the xe call sites in xe_svm_init() and other callers. drm_device does not disappear from the framework, it is relocated onto each drm_gpusvm_pages where DMA actually happens. Suggested-by: Matthew Brost Reviewed-by: Matthew Brost Signed-off-by: Honglei Huang --- drivers/gpu/drm/drm_gpusvm.c | 8 ++++---- drivers/gpu/drm/xe/xe_svm.c | 4 ++-- drivers/gpu/drm/xe/xe_svm.h | 2 +- include/drm/drm_gpusvm.h | 4 +--- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_gpusvm.c b/drivers/gpu/drm/drm_gpusvm.c index e0fd0b2fcc5..fcfe635bc19 100644 --- a/drivers/gpu/drm/drm_gpusvm.c +++ b/drivers/gpu/drm/drm_gpusvm.c @@ -439,7 +439,6 @@ static const struct mmu_interval_notifier_ops drm_gpusvm_notifier_ops = { * drm_gpusvm_init() - Initialize the GPU SVM. * @gpusvm: Pointer to the GPU SVM structure. * @name: Name of the GPU SVM. - * @drm: Pointer to the DRM device structure. * @mm: Pointer to the mm_struct for the address space. * @mm_start: Start address of GPU SVM. * @mm_range: Range of the GPU SVM. @@ -453,7 +452,9 @@ static const struct mmu_interval_notifier_ops drm_gpusvm_notifier_ops = { * This function initializes the GPU SVM. * * Note: If only using the simple drm_gpusvm_pages API (get/unmap/free), - * then only @gpusvm, @name, and @drm are expected. However, the same base + * then only @gpusvm and @name are expected. The @drm drm_device for dma + * mappings is bound per-pages via drm_gpusvm_init_pages() before the first + * drm_gpusvm_get_pages() call. However, the same base * @gpusvm can also be used with both modes together in which case the full * setup is needed, where the core drm_gpusvm_pages API will simply never use * the other fields. @@ -461,7 +462,7 @@ static const struct mmu_interval_notifier_ops drm_gpusvm_notifier_ops = { * Return: 0 on success, a negative error code on failure. */ int drm_gpusvm_init(struct drm_gpusvm *gpusvm, - const char *name, struct drm_device *drm, + const char *name, struct mm_struct *mm, unsigned long mm_start, unsigned long mm_range, unsigned long notifier_size, @@ -479,7 +480,6 @@ int drm_gpusvm_init(struct drm_gpusvm *gpusvm, } gpusvm->name = name; - gpusvm->drm = drm; gpusvm->mm = mm; gpusvm->mm_start = mm_start; gpusvm->mm_range = mm_range; diff --git a/drivers/gpu/drm/xe/xe_svm.c b/drivers/gpu/drm/xe/xe_svm.c index 74545dc4169..589459125e8 100644 --- a/drivers/gpu/drm/xe/xe_svm.c +++ b/drivers/gpu/drm/xe/xe_svm.c @@ -911,7 +911,7 @@ int xe_svm_init(struct xe_vm *vm) return err; } - err = drm_gpusvm_init(&vm->svm.gpusvm, "Xe SVM", &vm->xe->drm, + err = drm_gpusvm_init(&vm->svm.gpusvm, "Xe SVM", current->mm, 0, vm->size, xe_modparam.svm_notifier_size * SZ_1M, &gpusvm_ops, fault_chunk_sizes, @@ -925,7 +925,7 @@ int xe_svm_init(struct xe_vm *vm) } } else { err = drm_gpusvm_init(&vm->svm.gpusvm, "Xe SVM (simple)", - &vm->xe->drm, NULL, 0, 0, 0, NULL, + NULL, 0, 0, 0, NULL, NULL, 0); } diff --git a/drivers/gpu/drm/xe/xe_svm.h b/drivers/gpu/drm/xe/xe_svm.h index c8f4a7ba0f4..a921556d346 100644 --- a/drivers/gpu/drm/xe/xe_svm.h +++ b/drivers/gpu/drm/xe/xe_svm.h @@ -235,7 +235,7 @@ static inline int xe_svm_init(struct xe_vm *vm) { #if IS_ENABLED(CONFIG_DRM_GPUSVM) - return drm_gpusvm_init(&vm->svm.gpusvm, "Xe SVM (simple)", &vm->xe->drm, + return drm_gpusvm_init(&vm->svm.gpusvm, "Xe SVM (simple)", NULL, 0, 0, 0, NULL, NULL, 0); #else return 0; diff --git a/include/drm/drm_gpusvm.h b/include/drm/drm_gpusvm.h index 2862104aa1b..b7d987bf76a 100644 --- a/include/drm/drm_gpusvm.h +++ b/include/drm/drm_gpusvm.h @@ -195,7 +195,6 @@ struct drm_gpusvm_range { * struct drm_gpusvm - GPU SVM structure * * @name: Name of the GPU SVM - * @drm: Pointer to the DRM device structure * @mm: Pointer to the mm_struct for the address space * @mm_start: Start address of GPU SVM * @mm_range: Range of the GPU SVM @@ -219,7 +218,6 @@ struct drm_gpusvm_range { */ struct drm_gpusvm { const char *name; - struct drm_device *drm; struct mm_struct *mm; unsigned long mm_start; unsigned long mm_range; @@ -271,7 +269,7 @@ struct drm_gpusvm_ctx { }; int drm_gpusvm_init(struct drm_gpusvm *gpusvm, - const char *name, struct drm_device *drm, + const char *name, struct mm_struct *mm, unsigned long mm_start, unsigned long mm_range, unsigned long notifier_size, -- 2.34.1