From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from SA9PR02CU001.outbound.protection.outlook.com (mail-southcentralusazon11013028.outbound.protection.outlook.com [40.93.196.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9B10B3BED5C; Mon, 9 Mar 2026 13:53:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.196.28 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773064443; cv=fail; b=kj/4WBPB02VqVDGV2OHl+Pl5fZUbAGcMrvJnTx7xYavuhkMXrJcD7flgPT3jBMBNZwjIx6oS9NUghQ24/6c+CKdd7tr4h6yVDtWAyeUYsWoo4g2zhBmLF5DFbzb+W42uqKVya1zzacndMnkyYTjqcKxdaqELCKMkmMMIfQW8MhE= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773064443; c=relaxed/simple; bh=4bf50krIqNIx4OWwDOyQ1uCbUMj60uO/bZjfr0fXzy0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=OgWoBxjj46MkDSf/o+XjiFXJe9NbY7z2XiomPrjDv5cfZ5cQFsXWX1hjnqNsvfiw7QxsuPuq39hRM0RoaVVMsEktoihgC1UREo1mWd/WjbwFYxFFdw4df89jKQr+ALXRe72zhuyCEj1jmCKYpPOAXPjlYNfyf1rw6wbxDy3MlIA= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=a1doJbRd; arc=fail smtp.client-ip=40.93.196.28 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="a1doJbRd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uiKFJp3eN2I/RWQ1JDE888A3DLTst8B0MhovQubGntOrvLnZ5gcwsiB1dtZsKCASYVtPzENf/Wl/W6tvK4ZlG5YemxgDadwmMy7b9FF/v4uCOCjTe7VVbaXWbiyeAy06gKBUzVsVN+abGvgCZeZhh8grhMWl1xoJjkWVw2Lk1X7LvPcrIiNIRbeh/oMsYk25UorlC23vEEAeC7uKTKVLxYQRp+7odV26aIrGQpIQf2ngd2S/XV2JP2vCbHiIPjbrlvbHNMuqiApJykE18P7vPSpGcx2jVeiTo+8PrTR905ogbpicjcIwt8lWSfmexCP0UODJNcQeKg5CoT1QOzHUIw== 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=h0nIsGcV9dxlqfdPUzTHlOY8qdGzV9ANjPtmJCb5MQM=; b=ZbW71A2RphGo5qi4Uvsn0y5AtQ31olWltcqh7mWRrMCan3aGZHbTwgFkjVeutvmhwRFOFaZ4ThXCCJ83wF8p1Q5ahPw2BmNL5wjTuHcBQn4YAO1JmfJ3mATkTap3X32Gl4Xydc3WRseLr3TB47Lu9WbC435AFaJGvK5C4oySI5MYEYD0NscYhCFu0PBHKHz0vVQLs8mANN6Lww9Wq+14MIAfNbBCNVu0zuxieRc4OjRtHa16vFJDZfmtv7LbjNAsUC9a20sxBora7RkpBFiIPElWYN2ti7L97BpTzu2LbWqO+WczCycUIWcypctGlTgTYrlQksRhk+lrJIGkbLBIgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h0nIsGcV9dxlqfdPUzTHlOY8qdGzV9ANjPtmJCb5MQM=; b=a1doJbRdxIWn/ccudVJByN2RlIR403VuNC7uCT2eyJD/NyezK86ovu5Ni5uttNothfnOfUCSDlnM0PSZyO4DunZVLoXK/B7wXFKbrxGPVi1ilpL8Ke7yFlLsUaDpUKFz532gXSXCa7+YPTeanYJiT15GJi1GOzCLEGGPvAjzKrbucjE2E5+1stkGVmsVDKHYI2YhB4uefpIBbBLnRV8Oko1MMHZkDu9yB+QQQq6mo5y7Ad+dg47A65SCtjZdxYtkdi/0z8pf0qlaz1vQ90rPa/la7hUQfSfaBL3RZP0Gf+Z38aYDDAa5Vga/OJSUDabp0XU1F3meBwYq/px9+M3zgg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from DS0PR12MB6486.namprd12.prod.outlook.com (2603:10b6:8:c5::21) by BY5PR12MB4082.namprd12.prod.outlook.com (2603:10b6:a03:212::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.11; Mon, 9 Mar 2026 13:53:51 +0000 Received: from DS0PR12MB6486.namprd12.prod.outlook.com ([fe80::88a9:f314:c95f:8b33]) by DS0PR12MB6486.namprd12.prod.outlook.com ([fe80::88a9:f314:c95f:8b33%4]) with mapi id 15.20.9700.009; Mon, 9 Mar 2026 13:53:51 +0000 From: Joel Fernandes To: linux-kernel@vger.kernel.org Cc: Miguel Ojeda , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Dave Airlie , Daniel Almeida , Koen Koning , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, rust-for-linux@vger.kernel.org, Nikola Djukic , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jonathan Corbet , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin , Huang Rui , Matthew Auld , Matthew Brost , Lucas De Marchi , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Helge Deller , Alex Gaynor , Boqun Feng , John Hubbard , Alistair Popple , Timur Tabi , Edwin Peer , Alexandre Courbot , Andrea Righi , Andy Ritger , Zhi Wang , Balbir Singh , Philipp Stanner , Elle Rhumsaa , alexeyi@nvidia.com, Eliot Courtney , joel@joelfernandes.org, linux-doc@vger.kernel.org, amd-gfx@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, linux-fbdev@vger.kernel.org, Joel Fernandes Subject: [PATCH v12.1 1/1] rust: gpu: Add GPU buddy allocator bindings Date: Mon, 9 Mar 2026 09:53:38 -0400 Message-Id: <20260309135338.3919996-2-joelagnelf@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260309135338.3919996-1-joelagnelf@nvidia.com> References: <20260308180407.3988286-1-joelagnelf@nvidia.com> <20260309135338.3919996-1-joelagnelf@nvidia.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: CY5PR19CA0025.namprd19.prod.outlook.com (2603:10b6:930:15::28) To DS0PR12MB6486.namprd12.prod.outlook.com (2603:10b6:8:c5::21) Precedence: bulk X-Mailing-List: linux-fbdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB6486:EE_|BY5PR12MB4082:EE_ X-MS-Office365-Filtering-Correlation-Id: 839e2a3a-6b83-47d5-42db-08de7de34b49 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|366016|1800799024; X-Microsoft-Antispam-Message-Info: gN2VzVY9qmA3atBO13cq9OrCM3aUsFm1mt1H0rQ6b4vvQYiFoIfiD3l6Tj0049gP9revLYf4t2gcKCNMjCo60ZfdfGXFKQ9hQD57WPnGmkZovwhFYxbPS/aveL1pLl5wYXh9tfpzxNOoCgflFSokY2gJM6nwVQrCxdj49splgm4zq9b7AAeNncdlzzhMUa4+nyRoORK7FweWbIlY5Uyzh+LQ467WA3Ba5EP6+F6m9lNjGRQG9oTTHeoH9lDiLPCOiofphQgoT2yfn3yoeljdeYHlevE1r2HPUMy4g0deZr9QWlmjw5/fet9z4150RPSM+RM2JGwiA3E1ARoHqUAelkQ1WU81wbhXooJBDRyhFYvOgLMHLRcKdlf/9aXu1U9ez6H8GkS6fHzoLbQLGv6qgtoSo0S4CKuQx3ziL+WrKM/yi3Nj5n85aX2vWC1kRwrVYgVT3Rj8FTN8fpEiGpC+iwI97tu8FouAC16F+wzFYDAk4henZ68ldW836NHKyAf6MknCTfGHlzfUPJZ4GC57IA0SOt83dVvakwn6y4Y36Yzvf7sUlI4jtrchTWYMwWt3iK95Yo9BzR3+VqiM0X5SiLb00lF4QNVT2AczeRyObS3VZgObs9pofuabe9i48R6YMVEmNKrIoZMVuhxSJFFSJaE1JAT0zaOhxu7doiBVw0mHrMAuHUsfqfCi0uuscMGStQ21kqnmSPH+9D60hiKMq1RUu48wt8bw1Mw8JFeZ8eg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB6486.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(366016)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5kGP4wt4EV10aWqYYeTb/S3nmHehQeiYZd/vxWJqBZSzrgUR46hbTSqoYCBo?= =?us-ascii?Q?c8dWATmdbqS2aT0IoyWJVQEsxjeh6+Y8XJ54oSbAOiTlt8ROMl29j5QGZxxY?= =?us-ascii?Q?qZLhW2ut+c4M+5wBuBbOSyJ/efgd5BiRB5LL31PEJiHO2CbvUoppqlXXEE7D?= =?us-ascii?Q?qJl56pMhiExaUsOXVDG/h8Od4zWGT4B9JZlO8daRNaJdt/UFAoka2LGVmNo5?= =?us-ascii?Q?zu+RprAMbn4EQzQ6YDwD/9RudKTrFCJLcnPdGGm0kLj/KEA9dtnaLGInT1hW?= =?us-ascii?Q?d6pwSCKt925EIGxUlNrJAxhHY4VG3ndB4eSouTIiKUeSfN0FV2xBf1rBVKHp?= =?us-ascii?Q?A+ClgDaQvPmXlGUtIjE949bhO7BCrvKxFu+zrpls5k0oRBEMqdnHahkMC4EF?= =?us-ascii?Q?dfzrqwa6f4MUQ/8ELngDATnn1JjvoG9V0yvtFstV3VJC5vWzPaLRbfBPUlUz?= =?us-ascii?Q?/AUdA0N+AlTuTPKJj/gXliPIO4TmRraV2D3FyGDsdccEi7UBvtIZakGsGXT8?= =?us-ascii?Q?3ruGPFq+SRsNJ3Q9L5YfZuRBcnVljkhgRzyYsgZBq3vmk4t/q9vAJfqMDNuq?= =?us-ascii?Q?z4SlA8hUX4BKYptxp2e7TG5jpd7VhNVsDf16OUUVE1LR3SmmUcIs0mGWt9NS?= =?us-ascii?Q?Tc51FAIdj/QASL2F8/LNkPP3Q2QuyyCpMgRl066VboYC+5yAAFUuwE9BwT1h?= =?us-ascii?Q?pGtwbH6IW8PXwWoDFHT8ykN9m8e7e44cDDbWuIja5G6av8CTLbZANwly+B19?= =?us-ascii?Q?HZe9ChMZFo+BZzXtplYnC1rb+fgcWCcN4pHVOvKkPDH/YZiIAKAwxNqhCadZ?= =?us-ascii?Q?tPr+JwWmk41uThF/7FsWd1PLDc+QI0zY2StB3YPGjvOVPTcjBkX8FNvMKUxT?= =?us-ascii?Q?bBKJizojQJqFO3/2HVQRdXhBkt2GsyrUyLaUp9iyS/atmvdTuJyCVTohTgRJ?= =?us-ascii?Q?69bFPQqn4vhupEVg30XQzFlwncBsHhNQfIsLRb+uVuESML9RRwixvTp8HARS?= =?us-ascii?Q?uwD7N2+bvvDHULGDUWz37cqmxYLFf2dqRLegm6PVa2GUGPmh3ePbBtkDtm4+?= =?us-ascii?Q?jSDjxsHezkjdDHZm2SWMl3fFrNtXtYtFCFDOj1nI+9j46af9HFd6X7v+ePTZ?= =?us-ascii?Q?F/MD0yGd0DX2uWsDYkiIEwr+B15CPo8opOtaQaK8ZX/go6bxvZcWWLtACzRR?= =?us-ascii?Q?7PaH1O1zI1M25waEnw7pI75Am54/Yxs2dS0CmnOUqo0knt4GrdjPGmZolf/z?= =?us-ascii?Q?EDMZIvXO6wF3TQyAUO+gsQOn7FAUbXIUv6tU/zsC+deSVcxYj4EOWR0hHRBk?= =?us-ascii?Q?5jUKfTnjdTRfuibYuw3FgNOtgZxMRFhqK3u9mIjiJfbDgog9fXyqcMN3j+Sz?= =?us-ascii?Q?dbEI3cjlzHjTfn9MHD93sHRFwi6K4mTVw7Ys0PowVQva1CQmAlwT32aVZg1z?= =?us-ascii?Q?9NlHqM3jMKPUSz5c7HVo8pqzxpv6c1XEz7FyF6JamanpZsTPWJjIUwIajY+a?= =?us-ascii?Q?cvJeynxiP1QloOyUFaKtGMrrC5Pn/mMQjEFB5TpMHqtVsdwMZN0svVpppiDJ?= =?us-ascii?Q?r70BP+L1UxjVQVKC0ll7aSlEhLGSXoRUeXUOAxuBH6xUkIsefMJhYw4axzUx?= =?us-ascii?Q?GLISYmaN82sCJ2T1zn94MyA8UZN7Y44L9kXKImW1s9+3qX910poiSHtLnQ4e?= =?us-ascii?Q?+sZathw3quVsAPofYiBxCqe/8pe6uUvV4ztt1LqQbHkXWUHjo0ieHvCkRnsi?= =?us-ascii?Q?xZe3uBRjAQ=3D=3D?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 839e2a3a-6b83-47d5-42db-08de7de34b49 X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB6486.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2026 13:53:51.1479 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hG6Ct7OhPvcIt3PjfE41G6ychB8e2SyzrhFQks2dXfKrZu6V8S0LJgKtgZUu+XgjjiXlhVvaRm3HFhXMrJ6OuA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4082 Add safe Rust abstractions over the Linux kernel's GPU buddy allocator for physical memory management. The GPU buddy allocator implements a binary buddy system useful for GPU physical memory allocation. nova-core will use it for physical memory allocation. Christian Koenig mentioned he'd like to step down from reviewer role for GPU buddy so updated accordingly. Arun/Matthew agree on the modified entry. Cc: Nikola Djukic Signed-off-by: Joel Fernandes --- MAINTAINERS | 6 +- rust/bindings/bindings_helper.h | 11 + rust/helpers/gpu.c | 23 ++ rust/helpers/helpers.c | 1 + rust/kernel/gpu/buddy.rs | 611 ++++++++++++++++++++++++++++++++ rust/kernel/gpu/mod.rs | 5 + rust/kernel/lib.rs | 2 + 7 files changed, 658 insertions(+), 1 deletion(-) create mode 100644 rust/helpers/gpu.c create mode 100644 rust/kernel/gpu/buddy.rs create mode 100644 rust/kernel/gpu/mod.rs diff --git a/MAINTAINERS b/MAINTAINERS index 4c66f8261ff2..b2600dd05fc2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -8513,7 +8513,9 @@ T: git https://gitlab.freedesktop.org/drm/rust/kernel.git F: drivers/gpu/drm/nova/ F: drivers/gpu/drm/tyr/ F: drivers/gpu/nova-core/ +F: rust/helpers/gpu.c F: rust/kernel/drm/ +F: rust/kernel/gpu/ DRM DRIVERS FOR ALLWINNER A10 M: Chen-Yu Tsai @@ -8926,7 +8928,7 @@ F: include/drm/ttm/ GPU BUDDY ALLOCATOR M: Matthew Auld M: Arun Pravin -R: Christian Koenig +R: Joel Fernandes L: dri-devel@lists.freedesktop.org S: Maintained T: git https://gitlab.freedesktop.org/drm/misc/kernel.git @@ -8935,6 +8937,8 @@ F: drivers/gpu/buddy.c F: drivers/gpu/tests/gpu_buddy_test.c F: include/linux/gpu_buddy.h F: include/drm/drm_buddy.h +F: rust/helpers/gpu.c +F: rust/kernel/gpu/ DRM AUTOMATED TESTING M: Helen Koike diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index 083cc44aa952..dbb765a9fdbd 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -146,6 +147,16 @@ const vm_flags_t RUST_CONST_HELPER_VM_MIXEDMAP = VM_MIXEDMAP; const vm_flags_t RUST_CONST_HELPER_VM_HUGEPAGE = VM_HUGEPAGE; const vm_flags_t RUST_CONST_HELPER_VM_NOHUGEPAGE = VM_NOHUGEPAGE; +#if IS_ENABLED(CONFIG_GPU_BUDDY) +const unsigned long RUST_CONST_HELPER_GPU_BUDDY_RANGE_ALLOCATION = GPU_BUDDY_RANGE_ALLOCATION; +const unsigned long RUST_CONST_HELPER_GPU_BUDDY_TOPDOWN_ALLOCATION = GPU_BUDDY_TOPDOWN_ALLOCATION; +const unsigned long RUST_CONST_HELPER_GPU_BUDDY_CONTIGUOUS_ALLOCATION = + GPU_BUDDY_CONTIGUOUS_ALLOCATION; +const unsigned long RUST_CONST_HELPER_GPU_BUDDY_CLEAR_ALLOCATION = GPU_BUDDY_CLEAR_ALLOCATION; +const unsigned long RUST_CONST_HELPER_GPU_BUDDY_CLEARED = GPU_BUDDY_CLEARED; +const unsigned long RUST_CONST_HELPER_GPU_BUDDY_TRIM_DISABLE = GPU_BUDDY_TRIM_DISABLE; +#endif + #if IS_ENABLED(CONFIG_ANDROID_BINDER_IPC_RUST) #include "../../drivers/android/binder/rust_binder.h" #include "../../drivers/android/binder/rust_binder_events.h" diff --git a/rust/helpers/gpu.c b/rust/helpers/gpu.c new file mode 100644 index 000000000000..38b1a4e6bef8 --- /dev/null +++ b/rust/helpers/gpu.c @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include + +#ifdef CONFIG_GPU_BUDDY + +__rust_helper u64 rust_helper_gpu_buddy_block_offset(const struct gpu_buddy_block *block) +{ + return gpu_buddy_block_offset(block); +} + +__rust_helper unsigned int rust_helper_gpu_buddy_block_order(struct gpu_buddy_block *block) +{ + return gpu_buddy_block_order(block); +} + +__rust_helper u64 rust_helper_gpu_buddy_block_size(struct gpu_buddy *mm, + struct gpu_buddy_block *block) +{ + return gpu_buddy_block_size(mm, block); +} + +#endif /* CONFIG_GPU_BUDDY */ diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c index 724fcb8240ac..a53929ce52a3 100644 --- a/rust/helpers/helpers.c +++ b/rust/helpers/helpers.c @@ -32,6 +32,7 @@ #include "err.c" #include "irq.c" #include "fs.c" +#include "gpu.c" #include "io.c" #include "jump_label.c" #include "kunit.c" diff --git a/rust/kernel/gpu/buddy.rs b/rust/kernel/gpu/buddy.rs new file mode 100644 index 000000000000..9027c9a7778f --- /dev/null +++ b/rust/kernel/gpu/buddy.rs @@ -0,0 +1,611 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! GPU buddy allocator bindings. +//! +//! C header: [`include/linux/gpu_buddy.h`](srctree/include/linux/gpu_buddy.h) +//! +//! This module provides Rust abstractions over the Linux kernel's GPU buddy +//! allocator, which implements a binary buddy memory allocator. +//! +//! The buddy allocator manages a contiguous address space and allocates blocks +//! in power-of-two sizes, useful for GPU physical memory management. +//! +//! # Examples +//! +//! Create a buddy allocator and perform a basic range allocation: +//! +//! ``` +//! use kernel::{ +//! gpu::buddy::{GpuBuddy, GpuBuddyAllocMode, GpuBuddyAllocFlags, GpuBuddyParams}, +//! prelude::*, +//! ptr::Alignment, +//! sizes::*, // +//! }; +//! +//! // Create a 1GB buddy allocator with 4KB minimum chunk size. +//! let buddy = GpuBuddy::new(GpuBuddyParams { +//! base_offset: 0, +//! physical_memory_size: SZ_1G as u64, +//! chunk_size: SZ_4K, +//! })?; +//! +//! assert_eq!(buddy.size(), SZ_1G as u64); +//! assert_eq!(buddy.chunk_size(), SZ_4K); +//! let initial_free = buddy.free_memory(); +//! +//! // Allocate 16MB, results in a single 16MB block at offset 0. +//! let allocated = KBox::pin_init( +//! buddy.alloc_blocks( +//! GpuBuddyAllocMode::Range { start: 0, end: 0 }, +//! SZ_16M, +//! Alignment::new::(), +//! GpuBuddyAllocFlags::default(), +//! ), +//! GFP_KERNEL, +//! )?; +//! assert_eq!(buddy.free_memory(), initial_free - SZ_16M as u64); +//! +//! let block = allocated.iter().next().expect("expected one block"); +//! assert_eq!(block.offset(), 0); +//! assert_eq!(block.order(), 12); // 2^12 pages = 16MB +//! assert_eq!(block.size(), SZ_16M); +//! +//! // Dropping the allocation returns the memory to the buddy allocator. +//! drop(allocated); +//! assert_eq!(buddy.free_memory(), initial_free); +//! # Ok::<(), Error>(()) +//! ``` +//! +//! Top-down allocation allocates from the highest addresses: +//! +//! ``` +//! # use kernel::{ +//! # gpu::buddy::{GpuBuddy, GpuBuddyAllocMode, GpuBuddyAllocFlags, GpuBuddyParams}, +//! # prelude::*, +//! # ptr::Alignment, +//! # sizes::*, // +//! # }; +//! # let buddy = GpuBuddy::new(GpuBuddyParams { +//! # base_offset: 0, +//! # physical_memory_size: SZ_1G as u64, +//! # chunk_size: SZ_4K, +//! # })?; +//! # let initial_free = buddy.free_memory(); +//! let topdown = KBox::pin_init( +//! buddy.alloc_blocks( +//! GpuBuddyAllocMode::TopDown, +//! SZ_16M, +//! Alignment::new::(), +//! GpuBuddyAllocFlags::default(), +//! ), +//! GFP_KERNEL, +//! )?; +//! assert_eq!(buddy.free_memory(), initial_free - SZ_16M as u64); +//! +//! let block = topdown.iter().next().expect("expected one block"); +//! assert_eq!(block.offset(), (SZ_1G - SZ_16M) as u64); +//! assert_eq!(block.order(), 12); +//! assert_eq!(block.size(), SZ_16M); +//! +//! // Dropping the allocation returns the memory to the buddy allocator. +//! drop(topdown); +//! assert_eq!(buddy.free_memory(), initial_free); +//! # Ok::<(), Error>(()) +//! ``` +//! +//! Non-contiguous allocation can fill fragmented memory by returning multiple +//! blocks: +//! +//! ``` +//! # use kernel::{ +//! # gpu::buddy::{ +//! # GpuBuddy, GpuBuddyAllocFlags, GpuBuddyAllocMode, GpuBuddyParams, +//! # }, +//! # prelude::*, +//! # ptr::Alignment, +//! # sizes::*, // +//! # }; +//! # let buddy = GpuBuddy::new(GpuBuddyParams { +//! # base_offset: 0, +//! # physical_memory_size: SZ_1G as u64, +//! # chunk_size: SZ_4K, +//! # })?; +//! # let initial_free = buddy.free_memory(); +//! // Create fragmentation by allocating 4MB blocks at [0,4M) and [8M,12M). +//! let frag1 = KBox::pin_init( +//! buddy.alloc_blocks( +//! GpuBuddyAllocMode::Range { start: 0, end: SZ_4M as u64 }, +//! SZ_4M, +//! Alignment::new::(), +//! GpuBuddyAllocFlags::default(), +//! ), +//! GFP_KERNEL, +//! )?; +//! assert_eq!(buddy.free_memory(), initial_free - SZ_4M as u64); +//! +//! let frag2 = KBox::pin_init( +//! buddy.alloc_blocks( +//! GpuBuddyAllocMode::Range { +//! start: SZ_8M as u64, +//! end: (SZ_8M + SZ_4M) as u64, +//! }, +//! SZ_4M, +//! Alignment::new::(), +//! GpuBuddyAllocFlags::default(), +//! ), +//! GFP_KERNEL, +//! )?; +//! assert_eq!(buddy.free_memory(), initial_free - SZ_8M as u64); +//! +//! // Allocate 8MB, this returns 2 blocks from the holes. +//! let fragmented = KBox::pin_init( +//! buddy.alloc_blocks( +//! GpuBuddyAllocMode::Range { start: 0, end: SZ_16M as u64 }, +//! SZ_8M, +//! Alignment::new::(), +//! GpuBuddyAllocFlags::default(), +//! ), +//! GFP_KERNEL, +//! )?; +//! assert_eq!(buddy.free_memory(), initial_free - SZ_16M as u64); +//! +//! let (mut count, mut total) = (0u32, 0usize); +//! for block in fragmented.iter() { +//! assert_eq!(block.size(), SZ_4M); +//! total += block.size(); +//! count += 1; +//! } +//! assert_eq!(total, SZ_8M); +//! assert_eq!(count, 2); +//! # Ok::<(), Error>(()) +//! ``` +//! +//! Contiguous allocation fails when only fragmented space is available: +//! +//! ``` +//! # use kernel::{ +//! # gpu::buddy::{ +//! # GpuBuddy, GpuBuddyAllocFlag, GpuBuddyAllocMode, GpuBuddyParams, +//! # }, +//! # prelude::*, +//! # ptr::Alignment, +//! # sizes::*, // +//! # }; +//! // Create a small 16MB buddy allocator with fragmented memory. +//! let small = GpuBuddy::new(GpuBuddyParams { +//! base_offset: 0, +//! physical_memory_size: SZ_16M as u64, +//! chunk_size: SZ_4K, +//! })?; +//! +//! let _hole1 = KBox::pin_init( +//! small.alloc_blocks( +//! GpuBuddyAllocMode::Range { start: 0, end: SZ_4M as u64 }, +//! SZ_4M, +//! Alignment::new::(), +//! GpuBuddyAllocFlags::default(), +//! ), +//! GFP_KERNEL, +//! )?; +//! +//! let _hole2 = KBox::pin_init( +//! small.alloc_blocks( +//! GpuBuddyAllocMode::Range { +//! start: SZ_8M as u64, +//! end: (SZ_8M + SZ_4M) as u64, +//! }, +//! SZ_4M, +//! Alignment::new::(), +//! GpuBuddyAllocFlags::default(), +//! ), +//! GFP_KERNEL, +//! )?; +//! +//! // 8MB contiguous should fail, only two non-contiguous 4MB holes exist. +//! let result = KBox::pin_init( +//! small.alloc_blocks( +//! GpuBuddyAllocMode::Simple, +//! SZ_8M, +//! Alignment::new::(), +//! GpuBuddyAllocFlag::Contiguous.into(), +//! ), +//! GFP_KERNEL, +//! ); +//! assert!(result.is_err()); +//! # Ok::<(), Error>(()) +//! ``` + +use crate::{ + bindings, + clist_create, + error::to_result, + interop::list::CListHead, + new_mutex, + prelude::*, + ptr::Alignment, + sync::{ + lock::mutex::MutexGuard, + Arc, + Mutex, // + }, + types::Opaque, // +}; + +/// Allocation mode for the GPU buddy allocator. +/// +/// The mode determines the primary allocation strategy. Modes are mutually +/// exclusive: an allocation is either simple, range-constrained, or top-down. +/// +/// Orthogonal modifier flags (e.g., contiguous, clear) are specified separately +/// via [`GpuBuddyAllocFlags`]. +#[derive(Copy, Clone, Debug, PartialEq, Eq)] +pub enum GpuBuddyAllocMode { + /// Simple allocation without constraints. + Simple, + /// Range-based allocation between `start` and `end` addresses. + Range { + /// Start of the allocation range. + start: u64, + /// End of the allocation range. + end: u64, + }, + /// Allocate from top of address space downward. + TopDown, +} + +impl GpuBuddyAllocMode { + // Returns the C flags corresponding to the allocation mode. + fn into_flags(self) -> usize { + match self { + Self::Simple => 0, + Self::Range { .. } => bindings::GPU_BUDDY_RANGE_ALLOCATION as usize, + Self::TopDown => bindings::GPU_BUDDY_TOPDOWN_ALLOCATION as usize, + } + } + + // Extracts the range start/end, defaulting to (0, 0) for non-range modes. + fn range(self) -> (u64, u64) { + match self { + Self::Range { start, end } => (start, end), + _ => (0, 0), + } + } +} + +crate::impl_flags!( + /// Modifier flags for GPU buddy allocation. + /// + /// These flags can be combined with any [`GpuBuddyAllocMode`] to control + /// additional allocation behavior. + #[derive(Clone, Copy, Default, PartialEq, Eq)] + pub struct GpuBuddyAllocFlags(u32); + + /// Individual modifier flag for GPU buddy allocation. + #[derive(Clone, Copy, PartialEq, Eq)] + pub enum GpuBuddyAllocFlag { + /// Allocate physically contiguous blocks. + Contiguous = bindings::GPU_BUDDY_CONTIGUOUS_ALLOCATION as u32, + + /// Request allocation from cleared (zeroed) memory. + Clear = bindings::GPU_BUDDY_CLEAR_ALLOCATION as u32, + + /// Disable trimming of partially used blocks. + TrimDisable = bindings::GPU_BUDDY_TRIM_DISABLE as u32, + } +); + +/// Parameters for creating a GPU buddy allocator. +pub struct GpuBuddyParams { + /// Base offset (in bytes) where the managed memory region starts. + /// Allocations will be offset by this value. + pub base_offset: u64, + /// Total physical memory size (in bytes) managed by the allocator. + pub physical_memory_size: u64, + /// Minimum allocation unit / chunk size (in bytes), must be >= 4KB. + pub chunk_size: usize, +} + +/// Inner structure holding the actual buddy allocator. +/// +/// # Synchronization +/// +/// The C `gpu_buddy` API requires synchronization (see `include/linux/gpu_buddy.h`). +/// [`GpuBuddyGuard`] ensures that the lock is held for all +/// allocator and free operations, preventing races between concurrent allocations +/// and the freeing that occurs when [`AllocatedBlocks`] is dropped. +/// +/// # Invariants +/// +/// The inner [`Opaque`] contains an initialized buddy allocator. +#[pin_data(PinnedDrop)] +struct GpuBuddyInner { + #[pin] + inner: Opaque, + + // TODO: Replace `Mutex<()>` with `Mutex>` once `Mutex::new()` + // accepts `impl PinInit`. + #[pin] + lock: Mutex<()>, + /// Cached creation parameters (do not change after init). + params: GpuBuddyParams, +} + +impl GpuBuddyInner { + /// Create a pin-initializer for the buddy allocator. + fn new(params: GpuBuddyParams) -> impl PinInit { + let size = params.physical_memory_size; + let chunk_size = params.chunk_size; + + // INVARIANT: `gpu_buddy_init` returns 0 on success, at which point the + // `gpu_buddy` structure is initialized and ready for use with all + // `gpu_buddy_*` APIs. `try_pin_init!` only completes if all fields succeed, + // so the invariant holds when construction finishes. + try_pin_init!(Self { + inner <- Opaque::try_ffi_init(|ptr| { + // SAFETY: `ptr` points to valid uninitialized memory from the pin-init + // infrastructure. `gpu_buddy_init` will initialize the structure. + to_result(unsafe { bindings::gpu_buddy_init(ptr, size, chunk_size as u64) }) + }), + lock <- new_mutex!(()), + params, + }) + } + + /// Lock the mutex and return a guard for accessing the allocator. + fn lock(&self) -> GpuBuddyGuard<'_> { + GpuBuddyGuard { + inner: self, + _guard: self.lock.lock(), + } + } +} + +#[pinned_drop] +impl PinnedDrop for GpuBuddyInner { + fn drop(self: Pin<&mut Self>) { + let guard = self.lock(); + + // SAFETY: Per the type invariant, `inner` contains an initialized + // allocator. `guard` provides exclusive access. + unsafe { + bindings::gpu_buddy_fini(guard.as_raw()); + } + } +} + +// SAFETY: GpuBuddyInner can be sent between threads. +unsafe impl Send for GpuBuddyInner {} + +// SAFETY: `GpuBuddyInner` is `Sync` because `GpuBuddyInner::lock` +// serializes all access to the C allocator, preventing data races. +unsafe impl Sync for GpuBuddyInner {} + +// Guard that proves the lock is held, enabling access to the allocator. +// The `_guard` holds the lock for the duration of this guard's lifetime. +struct GpuBuddyGuard<'a> { + inner: &'a GpuBuddyInner, + _guard: MutexGuard<'a, ()>, +} + +impl GpuBuddyGuard<'_> { + /// Get a raw pointer to the underlying C `gpu_buddy` structure. + fn as_raw(&self) -> *mut bindings::gpu_buddy { + self.inner.inner.get() + } +} + +/// GPU buddy allocator instance. +/// +/// This structure wraps the C `gpu_buddy` allocator using reference counting. +/// The allocator is automatically cleaned up when all references are dropped. +/// +/// Refer to the module-level documentation for usage examples. +pub struct GpuBuddy(Arc); + +impl GpuBuddy { + /// Create a new buddy allocator. + /// + /// Creates a buddy allocator that manages a contiguous address space of the given + /// size, with the specified minimum allocation unit (chunk_size must be at least 4KB). + pub fn new(params: GpuBuddyParams) -> Result { + Ok(Self(Arc::pin_init(GpuBuddyInner::new(params), GFP_KERNEL)?)) + } + + /// Get the base offset for allocations. + pub fn base_offset(&self) -> u64 { + self.0.params.base_offset + } + + /// Get the chunk size (minimum allocation unit). + pub fn chunk_size(&self) -> usize { + self.0.params.chunk_size + } + + /// Get the total managed size. + pub fn size(&self) -> u64 { + self.0.params.physical_memory_size + } + + /// Get the available (free) memory in bytes. + pub fn free_memory(&self) -> u64 { + let guard = self.0.lock(); + + // SAFETY: Per the type invariant, `inner` contains an initialized allocator. + // `guard` provides exclusive access. + unsafe { (*guard.as_raw()).avail } + } + + /// Allocate blocks from the buddy allocator. + /// + /// Returns a pin-initializer for [`AllocatedBlocks`]. + /// + /// Takes `&self` instead of `&mut self` because the internal [`Mutex`] provides + /// synchronization - no external `&mut` exclusivity needed. + pub fn alloc_blocks( + &self, + mode: GpuBuddyAllocMode, + size: usize, + min_block_size: Alignment, + flags: GpuBuddyAllocFlags, + ) -> impl PinInit { + let buddy_arc = Arc::clone(&self.0); + let (start, end) = mode.range(); + let mode_flags = mode.into_flags(); + let modifier_flags = u32::from(flags) as usize; + + // Create pin-initializer that initializes list and allocates blocks. + try_pin_init!(AllocatedBlocks { + buddy: buddy_arc, + list <- CListHead::new(), + _: { + // Lock while allocating to serialize with concurrent frees. + let guard = buddy.lock(); + + // SAFETY: Per the type invariant, `inner` contains an initialized + // allocator. `guard` provides exclusive access. + to_result(unsafe { + bindings::gpu_buddy_alloc_blocks( + guard.as_raw(), + start, + end, + size as u64, + min_block_size.as_usize() as u64, + list.as_raw(), + mode_flags | modifier_flags, + ) + })? + } + }) + } +} + +/// Allocated blocks from the buddy allocator with automatic cleanup. +/// +/// This structure owns a list of allocated blocks and ensures they are +/// automatically freed when dropped. Use `iter()` to iterate over all +/// allocated blocks. +/// +/// # Invariants +/// +/// - `list` is an initialized, valid list head containing allocated blocks. +#[pin_data(PinnedDrop)] +pub struct AllocatedBlocks { + #[pin] + list: CListHead, + buddy: Arc, +} + +impl AllocatedBlocks { + /// Check if the block list is empty. + pub fn is_empty(&self) -> bool { + // An empty list head points to itself. + !self.list.is_linked() + } + + /// Iterate over allocated blocks. + /// + /// Returns an iterator yielding [`AllocatedBlock`] values. Each [`AllocatedBlock`] + /// borrows `self` and is only valid for the duration of that borrow. + pub fn iter(&self) -> impl Iterator> + '_ { + // SAFETY: + // - Per the type invariant, `list` is an initialized sentinel `list_head` + // and is not concurrently modified (we hold a `&self` borrow). + // - The list contains `gpu_buddy_block` items linked via + // `__bindgen_anon_1.link`. + // - `Block` is `#[repr(transparent)]` over `gpu_buddy_block`. + let clist = clist_create!(unsafe { + self.list.as_raw(), + Block, + bindings::gpu_buddy_block, + __bindgen_anon_1.link + }); + + clist + .iter() + .map(|this| AllocatedBlock { this, blocks: self }) + } +} + +#[pinned_drop] +impl PinnedDrop for AllocatedBlocks { + fn drop(self: Pin<&mut Self>) { + let guard = self.buddy.lock(); + + // SAFETY: + // - list is valid per the type's invariants. + // - guard provides exclusive access to the allocator. + unsafe { + bindings::gpu_buddy_free_list(guard.as_raw(), self.list.as_raw(), 0); + } + } +} + +/// A GPU buddy block. +/// +/// Transparent wrapper over C `gpu_buddy_block` structure. This type is returned +/// as references during iteration over [`AllocatedBlocks`]. +/// +/// # Invariants +/// +/// The inner [`Opaque`] contains a valid, allocated `gpu_buddy_block`. +#[repr(transparent)] +struct Block(Opaque); + +impl Block { + /// Get a raw pointer to the underlying C block. + fn as_raw(&self) -> *mut bindings::gpu_buddy_block { + self.0.get() + } + + /// Get the block's raw offset in the buddy address space (without base offset). + fn offset(&self) -> u64 { + // SAFETY: `self.as_raw()` is valid per the type's invariants. + unsafe { bindings::gpu_buddy_block_offset(self.as_raw()) } + } + + /// Get the block order. + fn order(&self) -> u32 { + // SAFETY: `self.as_raw()` is valid per the type's invariants. + unsafe { bindings::gpu_buddy_block_order(self.as_raw()) } + } +} + +// SAFETY: `Block` is a wrapper around `gpu_buddy_block` which can be +// sent across threads safely. +unsafe impl Send for Block {} + +// SAFETY: `Block` is only accessed through shared references after +// allocation, and thus safe to access concurrently across threads. +unsafe impl Sync for Block {} + +/// A buddy block paired with its owning [`AllocatedBlocks`] context. +/// +/// Unlike a raw block, which only knows its offset within the buddy address +/// space, an [`AllocatedBlock`] also has access to the allocator's `base_offset` +/// and `chunk_size`, enabling it to compute absolute offsets and byte sizes. +/// +/// Returned by [`AllocatedBlocks::iter()`]. +pub struct AllocatedBlock<'a> { + this: &'a Block, + blocks: &'a AllocatedBlocks, +} + +impl AllocatedBlock<'_> { + /// Get the block's offset in the address space. + /// + /// Returns the absolute offset including the allocator's base offset. + /// This is the actual address to use for accessing the allocated memory. + pub fn offset(&self) -> u64 { + self.blocks.buddy.params.base_offset + self.this.offset() + } + + /// Get the block order (size = chunk_size << order). + pub fn order(&self) -> u32 { + self.this.order() + } + + /// Get the block's size in bytes. + pub fn size(&self) -> usize { + self.blocks.buddy.params.chunk_size << self.this.order() + } +} diff --git a/rust/kernel/gpu/mod.rs b/rust/kernel/gpu/mod.rs new file mode 100644 index 000000000000..8f25e6367edc --- /dev/null +++ b/rust/kernel/gpu/mod.rs @@ -0,0 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! GPU subsystem abstractions. + +pub mod buddy; diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index bb741f1e0dfd..63e3f656eb6c 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -98,6 +98,8 @@ pub mod firmware; pub mod fmt; pub mod fs; +#[cfg(CONFIG_GPU_BUDDY = "y")] +pub mod gpu; #[cfg(CONFIG_I2C = "y")] pub mod i2c; pub mod id_pool; -- 2.34.1