From nobody Sun Feb 8 09:10:31 2026 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13D7B3BC4CA for ; Wed, 21 Jan 2026 11:32:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768995124; cv=none; b=WY6SKFP4T6Kfdmd0je/n+lKsBUO3MY/OrUUmv8XTnm9rSqql53VZi2wy1sq/IF3QSd8VtRA433nhCCNhwTobDEnzFs0Sv9O2tcOFWCjYVljSwZgaL+K4ex0SAOQbe6ZdMsxjJZtskqzKWY6a+a6cc+vxaxl+IlaVCtZQqcECnC0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768995124; c=relaxed/simple; bh=eaJbZT8B2Xja2kdiGi1Ws869kj8AJxUSIKK3G5I4Mvs=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=UwP3sxirKzeeFRLbYJe3jVliMNDoc5EqOmYa9iih1RKeJqeBRO8Muc6OefXD+44gDROg2IZpGMdfWj8tAVXmGVkgd51pKPvzpmADT5s+ygHutflxf+PnKmzwVZjK8PGPv/gLPCmZ4DU4jjCpcLA/52hbFycaOZoQDJ0RfZSTBv8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=P57C4fTe; arc=none smtp.client-ip=209.85.221.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="P57C4fTe" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-432db1a9589so4243118f8f.0 for ; Wed, 21 Jan 2026 03:32:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768995120; x=1769599920; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=LdNXhntJkj2eNG88xbizt69UmEV/pDIxWww84BjGwBY=; b=P57C4fTeTd99SG84pHdsOuV9WvjKcmRPFL4OZVwOS0jq9VMEN9kvlDLpC38QkFdbTd Z+ljPPPHz8ISoEYd2ydAbUeBblW3zUVclzYNuFYXCAjYtCd3gwtnTS4ojZ+6xbCPEsXX ildL3S4s+2vFn0/WWiPOluPRPz09/yjh5jvy9RWYXH9vAsHrZ1jqB4CnAkCktPGC+rpb oXGp8GgmqG8VSuEq8K4B5wEbW7+IvTTCZsBsKD6lkgXknTiEXMf4oys0EVnluxa8tX6B SIxO1EuFcUO6uvv5pjr3uHX6U2giQaNHuSsWyxeFrRitNhwr2wqO/Q6Sskaph5J1h3/b GRHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768995120; x=1769599920; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LdNXhntJkj2eNG88xbizt69UmEV/pDIxWww84BjGwBY=; b=Vs1X53KRPgXEH+Kqq97hOxegfS8LBu9PvJsEbqru3bYuHl8xlMjNu1QpR4JlljWTpU mnKq8a04xVgXQV+iNJSO7HZz4CDbSNNM67rXjYwZ5DcB57FqgJHKcqBgqvmg1TGBJwQ1 YyffTNsCNF2h8xC0IAtW931HbIskk+7LPa7VZ19G7v+H5BTpuQl1X5c7V6Ge3OZCbSxf DCmK3HxNF06QZ5jdg55VEh0CjAg4PPzMxZUXcHKDGEHaLWLv0xx6Nar/sbgAVCzOQ3pL AtDTO/uK4uR2FPMC8tkyRhnEx7350OhTbSuKYrL9DWR4wWQBwLexWELY5H8ySJkCK09Q CRuA== X-Forwarded-Encrypted: i=1; AJvYcCX9mlqWHF0ekMLCAwOnSJCXcVbiQBKsh4GRuE9MfxVQXYzSR/vS51p1ylTyzkv457lijb77XTgzANRS1WE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx1OwrU2w3dMQIWyww78NKsvvQEndAMCj0ATg3LXAzrjBXHKJx0 VTEJRWWzoGUiMVE3HhpUWl/23m/a3EBh0TNu+cU9vKquAQzpH8zJ/vQ92/XPbAQrGUmhDWWylEH zu0rVdO4+EtzRpTjKgg== X-Received: from wrbex1.prod.google.com ([2002:a05:6000:2481:b0:432:88c5:9eae]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a5d:4a92:0:b0:435:94dc:8c78 with SMTP id ffacd0b85a97d-43594dc8d0emr6022606f8f.40.1768995119989; Wed, 21 Jan 2026 03:31:59 -0800 (PST) Date: Wed, 21 Jan 2026 11:31:20 +0000 In-Reply-To: <20260121-gpuvm-rust-v3-0-dd95c04aec35@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260121-gpuvm-rust-v3-0-dd95c04aec35@google.com> X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=6712; i=aliceryhl@google.com; h=from:subject:message-id; bh=eaJbZT8B2Xja2kdiGi1Ws869kj8AJxUSIKK3G5I4Mvs=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBpcLke0bv1AU0YLFOT8myV74XrcFtjRhhP+57oB ChfIUqWAWqJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCaXC5HgAKCRAEWL7uWMY5 RhWED/wJPKLEvMvMMtru2PUKQVwm4UuBejGc+CN4McSACM9zZJwCKrd/n9DghJpF6mqL5LOw5/B wqCtvPBTrKSrFM+FeZcXYTHxP7EGoIP10vS2n16clXWUf6d4SDVDcH9Jn3vnIg0dTpDXOqh1H6B uKTJVQ8bFavjXWZCY3MfbCUc/+O5L4GH5FbURaSS50AxMjNdYmMv5X0nfo3uestPY5s+i7m+69/ BAiINrxfezJkRNptUzFarzZS1gWhq619MBF3lfTvVhYcXuHwvuGXJPFXVY3EvEv+URxQvSghqtE V3gAZEN8mExr12z3mG+WbVQOinRQfpRfiQDFb4u3bv9RdDvjz0mmmYlTAM3MF3ZCEfqF0QR0rnL 4zXnejcVgHSe1f/GqJQrGAtMzleRokvwkD/dhOLE2qxE8easwlCYdbm6BDIAwU9XgYZBmPvh9po Bqs6LFioU1HVyvbDx+aDFo49y0mEZ58GZ4RRueCCul3tA/CIyRghS3m/85tEmNQZv1Fv2DTRrIf IDm7LGruBN/rOw3uZ2UcTTFAPY6GznEzKKlSmUNiUWihc9a8ZMMyf4XEKqM27Gsn4sedzvoaMxQ /zb8EFdpmFeqZaNAeaIm1OnP/NOFCJJSKMzqvAVCZL5bc8jOMsPDc+8ZKh3NZIEm7XsEnFRK/ll /vv3cmCcK72U+jA== X-Mailer: b4 0.14.2 Message-ID: <20260121-gpuvm-rust-v3-4-dd95c04aec35@google.com> Subject: [PATCH v3 4/6] rust: gpuvm: add GpuVa struct From: Alice Ryhl To: Danilo Krummrich , Daniel Almeida Cc: Boris Brezillon , Janne Grunau , Matthew Brost , "=?utf-8?q?Thomas_Hellstr=C3=B6m?=" , Lyude Paul , Asahi Lina , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alice Ryhl Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This struct will be used to keep track of individual mapped ranges in the GPU's virtual memory. Co-developed-by: Asahi Lina Signed-off-by: Asahi Lina Co-developed-by: Daniel Almeida Signed-off-by: Daniel Almeida Signed-off-by: Alice Ryhl Reviewed-by: Daniel Almeida --- rust/kernel/drm/gpuvm/mod.rs | 17 ++++- rust/kernel/drm/gpuvm/va.rs | 149 +++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 164 insertions(+), 2 deletions(-) diff --git a/rust/kernel/drm/gpuvm/mod.rs b/rust/kernel/drm/gpuvm/mod.rs index cb576a7ffa07bc108704e008b7f87de52a837930..2179ddd717d8728bbe231bd94ea= 7b5d1e2652543 100644 --- a/rust/kernel/drm/gpuvm/mod.rs +++ b/rust/kernel/drm/gpuvm/mod.rs @@ -11,7 +11,10 @@ //! C header: [`include/drm/drm_gpuvm.h`](srctree/include/drm/drm_gpuvm.h) =20 use kernel::{ - alloc::AllocError, + alloc::{ + AllocError, + Flags as AllocFlags, // + }, bindings, drm, drm::gem::IntoGEMObject, @@ -25,9 +28,13 @@ =20 use core::{ cell::UnsafeCell, - mem::ManuallyDrop, + mem::{ + ManuallyDrop, + MaybeUninit, // + }, ops::{ Deref, + DerefMut, Range, // }, ptr::{ @@ -36,6 +43,9 @@ }, // }; =20 +mod va; +pub use self::va::*; + mod vm_bo; pub use self::vm_bo::*; =20 @@ -224,6 +234,9 @@ pub trait DriverGpuVm: Sized { /// The kind of GEM object stored in this GPUVM. type Object: IntoGEMObject; =20 + /// Data stored with each `struct drm_gpuva`. + type VaData; + /// Data stored with each `struct drm_gpuvm_bo`. type VmBoData; } diff --git a/rust/kernel/drm/gpuvm/va.rs b/rust/kernel/drm/gpuvm/va.rs new file mode 100644 index 0000000000000000000000000000000000000000..c96796a6b2c8c7c4b5475324562= 968ca0f07fd09 --- /dev/null +++ b/rust/kernel/drm/gpuvm/va.rs @@ -0,0 +1,149 @@ +// SPDX-License-Identifier: GPL-2.0 OR MIT + +#![expect(dead_code)] +use super::*; + +/// Represents that a range of a GEM object is mapped in this [`GpuVm`] in= stance. +/// +/// Does not assume that GEM lock is held. +/// +/// # Invariants +/// +/// This is a valid `drm_gpuva` that is resident in the [`GpuVm`] instance. +#[repr(C)] +#[pin_data] +pub struct GpuVa { + #[pin] + inner: Opaque, + #[pin] + data: T::VaData, +} + +impl GpuVa { + /// Access this [`GpuVa`] from a raw pointer. + /// + /// # Safety + /// + /// For the duration of `'a`, the pointer must reference a valid `drm_= gpuva` associated with a + /// [`GpuVm`]. + #[inline] + pub unsafe fn from_raw<'a>(ptr: *mut bindings::drm_gpuva) -> &'a Self { + // SAFETY: `drm_gpuva` is first field and `repr(C)`. + unsafe { &*ptr.cast() } + } + + /// Returns a raw pointer to underlying C value. + #[inline] + pub fn as_raw(&self) -> *mut bindings::drm_gpuva { + self.inner.get() + } + + /// Returns the address of this mapping in the GPU virtual address spa= ce. + #[inline] + pub fn addr(&self) -> u64 { + // SAFETY: The `va.addr` field of `drm_gpuva` is immutable. + unsafe { (*self.as_raw()).va.addr } + } + + /// Returns the length of this mapping. + #[inline] + pub fn length(&self) -> u64 { + // SAFETY: The `va.range` field of `drm_gpuva` is immutable. + unsafe { (*self.as_raw()).va.range } + } + + /// Returns `addr..addr+length`. + #[inline] + pub fn range(&self) -> Range { + let addr =3D self.addr(); + addr..addr + self.length() + } + + /// Returns the offset within the GEM object. + #[inline] + pub fn gem_offset(&self) -> u64 { + // SAFETY: The `gem.offset` field of `drm_gpuva` is immutable. + unsafe { (*self.as_raw()).gem.offset } + } + + /// Returns the GEM object. + #[inline] + pub fn obj(&self) -> &T::Object { + // SAFETY: The `gem.offset` field of `drm_gpuva` is immutable. + unsafe { ::from_raw((*self.as_raw()).g= em.obj) } + } + + /// Returns the underlying [`GpuVmBo`] object that backs this [`GpuVa`= ]. + #[inline] + pub fn vm_bo(&self) -> &GpuVmBo { + // SAFETY: The `vm_bo` field has been set and is immutable for the= duration in which this + // `drm_gpuva` is resident in the VM. + unsafe { GpuVmBo::from_raw((*self.as_raw()).vm_bo) } + } +} + +/// A pre-allocated [`GpuVa`] object. +/// +/// # Invariants +/// +/// The memory is zeroed. +pub struct GpuVaAlloc(KBox>>); + +impl GpuVaAlloc { + /// Pre-allocate a [`GpuVa`] object. + pub fn new(flags: AllocFlags) -> Result, AllocError> { + // INVARIANTS: Memory allocated with __GFP_ZERO. + Ok(GpuVaAlloc(KBox::new_uninit(flags | __GFP_ZERO)?)) + } + + /// Prepare this `drm_gpuva` for insertion into the GPUVM. + pub(super) fn prepare(mut self, va_data: impl PinInit) -> *= mut bindings::drm_gpuva { + let va_ptr =3D MaybeUninit::as_mut_ptr(&mut self.0); + // SAFETY: The `data` field is pinned. + let Ok(()) =3D unsafe { va_data.__pinned_init(&raw mut (*va_ptr).d= ata) }; + KBox::into_raw(self.0).cast() + } +} + +/// A [`GpuVa`] object that has been removed. +/// +/// # Invariants +/// +/// The `drm_gpuva` is not resident in the [`GpuVm`]. +pub struct GpuVaRemoved(KBox>); + +impl GpuVaRemoved { + /// Convert a raw pointer into a [`GpuVaRemoved`]. + /// + /// # Safety + /// + /// Must have been removed from a [`GpuVm`]. + pub(super) unsafe fn from_raw(ptr: *mut bindings::drm_gpuva) -> Self { + // SAFETY: Since it has been removed we can take ownership of allo= cation. + GpuVaRemoved(unsafe { KBox::from_raw(ptr.cast()) }) + } + + /// Take ownership of the VA data. + pub fn into_inner(self) -> T::VaData + where + T::VaData: Unpin, + { + KBox::into_inner(self.0).data + } +} + +impl Deref for GpuVaRemoved { + type Target =3D T::VaData; + fn deref(&self) -> &T::VaData { + &self.0.data + } +} + +impl DerefMut for GpuVaRemoved +where + T::VaData: Unpin, +{ + fn deref_mut(&mut self) -> &mut T::VaData { + &mut self.0.data + } +} --=20 2.52.0.457.g6b5491de43-goog