From nobody Mon Feb 9 05:53:19 2026 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.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 2671640B6ED for ; Wed, 21 Jan 2026 11:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768995129; cv=none; b=lEStL7IAO1fdBoMy1Xzv2jhQCMwaNcGGTlo7J/rXkcDk2uQtX8vsIHm/S0f0TPXPQGD+oV1Mh9eZub+SA/HPqQtsL+CMU8pBm3oQPEqQWc56x/qauM5PQtonGuFDPz1L90v51n9VacsjU5y5m7BegPD/MF+oKuy0VOB9FidP3B0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768995129; c=relaxed/simple; bh=puxOKvWZSmMilkgdnuRja+EvIpEfKakk94O5pIyZrME=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Gsx7wkFJrI1cH9xLALiT74cCuFAI48usHtgdWiWZdRlEo0jnKWynYbaBPTXRCU1D5aouWkRW19EHZW3x0X9MLqmWExzN1fRVqig8jyAmLJdDE6VZ1JQFIOYwa+aJO8R8+KZ258IgjZNc6KwtgsZGAdZV6nGIu3Gr0rC828zcJSk= 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=EtyxTym5; arc=none smtp.client-ip=209.85.128.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="EtyxTym5" Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4803e8b6007so11583045e9.0 for ; Wed, 21 Jan 2026 03:32:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1768995125; x=1769599925; 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=ADHnj9pTGTbd43O9T51NFX85JNRLR0rvNZITUD0GxdM=; b=EtyxTym5EhqKEAFYdNO+AqgmSuxzUVbY7O6IeacedicvavqwLIWz/ZcZnOKhJ5gzee 8kolfOLJFjKACLaFSjnP2oW/7OklWPgsTTnTPRgkYtapC8IrsJsr9g9ET9C1yDJppwsy 4P19g/TlhvsJnRpt3YOGWflEcMjBwt3JP5I33GimL790Ioc0YrVKm6tVOQdt7+gjGxpm CWjw/wTD+o4by67RuV38c71scaELQxL6+Nx2yzOW7CtpmtDDFN7NAnnDTouSVzHw57r6 lELoRTdG4vy1GUi/Wc0R7NQVr2AIlTc8xzbs9wjTEmXia/cPgUdT7NF08wbukuJRyvFb 6VFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768995125; x=1769599925; 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=ADHnj9pTGTbd43O9T51NFX85JNRLR0rvNZITUD0GxdM=; b=v9OLfOsAJJXC2+MzQbwZJxXWN2R8AmwlVYncarqfYpo4zz7xAqTZIYjXQfrUr57iTW 3p7K8SIXpDcLr6qsd6G4ZdWV9d4IgHpUHVufXG6aIsOgPQ1vb0jJ39ZDyvytBOSm6/k2 E4ZkwYBtqYHfToE20dJjt4rygP/jfyDpg1ri1qFzkBGUYjSqWJ8Ox4P2CO7sDM5tz+3f 0kg3gug6c69Rr4uhHZBk13Km2v5cpcaj50NnzRAnD+kvDe98WhX7UmfJ8KiTmI0Dxldz +2pj8NnCfpxCnqhRNHAdM1d0pqcfYrYNmV7weQJ9qd9DWw3MKHgbL74KAGuG7Dn5aQt2 mNPA== X-Forwarded-Encrypted: i=1; AJvYcCVR49RNUgGytKs/nC0Twykofsg1H8BoV9lPuyN0vJXT32gCeOGC9G+3vnS/q50jvgCfUT0Dd6qGy2v4pjI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy675ibx++z9aTWC5eewCEt1eRBYA1rRSy56xfLl5x69Ty9CzsX 6k3pdkYOQnquqD7Myr7yWrqM0TnC6SpMBKeE0DRq9pJ89HL0tGWPyokqKnPEvzuMb/G0gsnlWXm jqz54yuoY7aUJL5+hOQ== X-Received: from wmbhb6.prod.google.com ([2002:a05:600c:8686:b0:475:dadb:c8f2]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1d14:b0:477:73cc:82c2 with SMTP id 5b1f17b1804b1-4803e7a4051mr69580645e9.9.1768995125342; Wed, 21 Jan 2026 03:32:05 -0800 (PST) Date: Wed, 21 Jan 2026 11:31:22 +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=9517; i=aliceryhl@google.com; h=from:subject:message-id; bh=puxOKvWZSmMilkgdnuRja+EvIpEfKakk94O5pIyZrME=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBpcLkezgTn6a3N4qhkQEjM7d2JXqI0C+4VoWJDj kUFK5DuqY6JAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCaXC5HgAKCRAEWL7uWMY5 RlLXD/9c5Be8fBOxYmcDNrxEJd5yQFMEUqjllsfSNRz1dvTepH1SiaSzi7glFTAdjp5An2S5to8 WhLUFtBdx0mZ/+NCKYDrUemcCJAQlKU/PQqnxyxUt6enja6LaLEJFM4iQ48jnmy6g4DrWyYjT8W WggqmFpNwL6y9QUQd8oRaTWTbUJ1m8Ij1yZxX945p87X1qTDvHOKy93sX5F2hVwtbbEpvUhkI6y ZOVUfZd1siQc2Qmlp26VbdZiGOtEqHWIzCl7zY/Fm/7mhMbh1WfQSfOO7LirdOQy9RbKwJpCvWB YdZLjD2FlvFbt3niguznRhBm3X+/xNIBki3nyOumowMvKCv3M9w6zYPjzphkbOKFQOzPDLN9kUT xXo+6eyPa7IWdPSyFCyBenLiPaHTaBBXaZc1K/NLOTn4xvQBMEibtH832F05Oq8WsH7GuMF/lCt Q9fgNg4bEtONTzB8XZncoG1Es2DolQQgoDsc8TlwMHuXs3x6cKwITDBYrSk++P9N5dCCbcRYZhZ /9kYoeiK2TNx24QP4O98/OrqEK6dcqrEjajqu5UAmGoTuXeSKc1JbfDXCr42ttyGhpa+ORAj+sa w0wQQfG2ZrvyVhWXSUD7l6PwFreHEK1it3mwvOqYvgvgek6no/VjxXnw0LJVOunmhCdBj+OBKT9 6dJQszz7C6VtFrA== X-Mailer: b4 0.14.2 Message-ID: <20260121-gpuvm-rust-v3-6-dd95c04aec35@google.com> Subject: [PATCH v3 6/6] rust: gpuvm: add GpuVmCore::sm_map() 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 Finally also add the operation for creating new mappings. Mapping operations need extra data in the context since they involve a vm_bo coming from the outside. Co-developed-by: Asahi Lina Signed-off-by: Asahi Lina Signed-off-by: Alice Ryhl Reviewed-by: Daniel Almeida --- rust/kernel/drm/gpuvm/mod.rs | 9 ++- rust/kernel/drm/gpuvm/sm_ops.rs | 154 ++++++++++++++++++++++++++++++++++++= ++-- 2 files changed, 157 insertions(+), 6 deletions(-) diff --git a/rust/kernel/drm/gpuvm/mod.rs b/rust/kernel/drm/gpuvm/mod.rs index 165a25666ccc3d62e59b73483d4eedff044423e9..557c0d629eec912a97fc4ef1849= 5d5bf0807db0a 100644 --- a/rust/kernel/drm/gpuvm/mod.rs +++ b/rust/kernel/drm/gpuvm/mod.rs @@ -93,7 +93,7 @@ const fn vtable() -> &'static bindings::drm_gpuvm_ops { vm_bo_alloc: GpuVmBo::::ALLOC_FN, vm_bo_free: GpuVmBo::::FREE_FN, vm_bo_validate: None, - sm_step_map: None, + sm_step_map: Some(Self::sm_step_map), sm_step_unmap: Some(Self::sm_step_unmap), sm_step_remap: Some(Self::sm_step_remap), } @@ -248,6 +248,13 @@ pub trait DriverGpuVm: Sized { /// The private data passed to callbacks. type SmContext<'ctx>; =20 + /// Indicates that a new mapping should be created. + fn sm_step_map<'op, 'ctx>( + &mut self, + op: OpMap<'op, Self>, + context: &mut Self::SmContext<'ctx>, + ) -> Result, Error>; + /// Indicates that an existing mapping should be removed. fn sm_step_unmap<'op, 'ctx>( &mut self, diff --git a/rust/kernel/drm/gpuvm/sm_ops.rs b/rust/kernel/drm/gpuvm/sm_ops= .rs index 3c29d10d63f0b0a1976c714a86d486948ba81a15..5f3c5d3918147a6962e5658443c= 343835baa10b8 100644 --- a/rust/kernel/drm/gpuvm/sm_ops.rs +++ b/rust/kernel/drm/gpuvm/sm_ops.rs @@ -8,6 +8,100 @@ struct SmData<'a, 'ctx, T: DriverGpuVm> { user_context: &'a mut T::SmContext<'ctx>, } =20 +#[repr(C)] +struct SmMapData<'a, 'ctx, T: DriverGpuVm> { + sm_data: SmData<'a, 'ctx, T>, + vm_bo: GpuVmBoResident, +} + +/// The argument for [`GpuVmCore::sm_map`]. +pub struct OpMapRequest<'a, 'ctx, T: DriverGpuVm> { + /// Address in GPU virtual address space. + pub addr: u64, + /// Length of mapping to create. + pub range: u64, + /// Offset in GEM object. + pub offset: u64, + /// The GEM object to map. + pub vm_bo: GpuVmBoResident, + /// The user-provided context type. + pub context: &'a mut T::SmContext<'ctx>, +} + +impl<'a, 'ctx, T: DriverGpuVm> OpMapRequest<'a, 'ctx, T> { + fn raw_request(&self) -> bindings::drm_gpuvm_map_req { + bindings::drm_gpuvm_map_req { + map: bindings::drm_gpuva_op_map { + va: bindings::drm_gpuva_op_map__bindgen_ty_1 { + addr: self.addr, + range: self.range, + }, + gem: bindings::drm_gpuva_op_map__bindgen_ty_2 { + offset: self.offset, + obj: self.vm_bo.obj().as_raw(), + }, + }, + } + } +} + +/// Represents an `sm_step_map` operation that has not yet been completed. +pub struct OpMap<'op, T: DriverGpuVm> { + op: &'op bindings::drm_gpuva_op_map, + // Since these abstractions are designed for immediate mode, the VM BO= needs to be + // pre-allocated, so we always have it available when we reach this po= int. + vm_bo: &'op GpuVmBo, + _invariant: PhantomData<*mut &'op mut T>, +} + +impl<'op, T: DriverGpuVm> OpMap<'op, T> { + /// The base address of the new mapping. + pub fn addr(&self) -> u64 { + self.op.va.addr + } + + /// The length of the new mapping. + pub fn length(&self) -> u64 { + self.op.va.range + } + + /// The offset within the [`drm_gem_object`](crate::gem::Object). + pub fn gem_offset(&self) -> u64 { + self.op.gem.offset + } + + /// The [`drm_gem_object`](crate::gem::Object) to map. + pub fn obj(&self) -> &T::Object { + // SAFETY: The `obj` pointer is guaranteed to be valid. + unsafe { ::from_raw(self.op.gem.obj) } + } + + /// The [`GpuVmBo`] that the new VA will be associated with. + pub fn vm_bo(&self) -> &GpuVmBo { + self.vm_bo + } + + /// Use the pre-allocated VA to carry out this map operation. + pub fn insert(self, va: GpuVaAlloc, va_data: impl PinInit) -> OpMapped<'op, T> { + let va =3D va.prepare(va_data); + // SAFETY: By the type invariants we may access the interval tree. + unsafe { bindings::drm_gpuva_map(self.vm_bo.gpuvm().as_raw(), va, = self.op) }; + + let _gpuva_guard =3D self.vm_bo().lock_gpuva(); + // SAFETY: The va is prepared for insertion, and we hold the GEM l= ock. + unsafe { bindings::drm_gpuva_link(va, self.vm_bo.as_raw()) }; + + OpMapped { + _invariant: self._invariant, + } + } +} + +/// Represents a completed [`OpMap`] operation. +pub struct OpMapped<'op, T> { + _invariant: PhantomData<*mut &'op mut T>, +} + /// Represents an `sm_step_unmap` operation that has not yet been complete= d. pub struct OpUnmap<'op, T: DriverGpuVm> { op: &'op bindings::drm_gpuva_op_unmap, @@ -205,6 +299,30 @@ pub struct OpRemapped<'op, T> { } =20 impl GpuVmCore { + /// Create a mapping, removing or remapping anything that overlaps. + /// + /// Internally calls the [`DriverGpuVm`] callbacks similar to [`Self::= sm_unmap`], except that + /// the [`DriverGpuVm::sm_step_map`] is called once to create the requ= ested mapping. + #[inline] + pub fn sm_map(&mut self, req: OpMapRequest<'_, '_, T>) -> Result { + let gpuvm =3D self.as_raw(); + let raw_req =3D req.raw_request(); + let mut p =3D SmMapData { + sm_data: SmData { + gpuvm: self, + user_context: req.context, + }, + vm_bo: req.vm_bo, + }; + // SAFETY: + // * raw_request() creates a valid request. + // * The private data is valid to be interpreted as both SmData an= d SmMapData since the + // first field of SmMapData is SmData. + to_result(unsafe { + bindings::drm_gpuvm_sm_map(gpuvm, (&raw mut p).cast(), &raw co= nst raw_req) + }) + } + /// Remove any mappings in the given region. /// /// Internally calls [`DriverGpuVm::sm_step_unmap`] for ranges entirel= y contained within the @@ -218,19 +336,45 @@ pub fn sm_unmap(&mut self, addr: u64, length: u64, co= ntext: &mut T::SmContext<'_ }; // SAFETY: // * raw_request() creates a valid request. - // * The private data is valid to be interpreted as SmData. + // * The private data is a valid SmData. to_result(unsafe { bindings::drm_gpuvm_sm_unmap(gpuvm, (&raw mut p= ).cast(), addr, length) }) } } =20 impl GpuVm { /// # Safety - /// Must be called from `sm_unmap` with a pointer to `SmData`. + /// Must be called from `sm_map` with a pointer to `SmMapData`. + pub(super) unsafe extern "C" fn sm_step_map( + op: *mut bindings::drm_gpuva_op, + p: *mut c_void, + ) -> c_int { + // SAFETY: If we reach `sm_step_map` then we were called from `sm_= map` which always passes + // an `SmMapData` as private data. + let p =3D unsafe { &mut *p.cast::>() }; + let op =3D OpMap { + // SAFETY: sm_step_map is called with a map operation. + op: unsafe { &(*op).__bindgen_anon_1.map }, + vm_bo: &p.vm_bo, + _invariant: PhantomData, + }; + match p + .sm_data + .gpuvm + .data() + .sm_step_map(op, p.sm_data.user_context) + { + Ok(OpMapped { .. }) =3D> 0, + Err(err) =3D> err.to_errno(), + } + } + + /// # Safety + /// Must be called from `sm_map` or `sm_unmap` with a pointer to `SmMa= pData` or `SmData`. pub(super) unsafe extern "C" fn sm_step_unmap( op: *mut bindings::drm_gpuva_op, p: *mut c_void, ) -> c_int { - // SAFETY: The caller provides a pointer to `SmData`. + // SAFETY: The caller provides a pointer that can be treated as `S= mData`. let p =3D unsafe { &mut *p.cast::>() }; let op =3D OpUnmap { // SAFETY: sm_step_unmap is called with an unmap operation. @@ -244,12 +388,12 @@ impl GpuVm { } =20 /// # Safety - /// Must be called from `sm_unmap` with a pointer to `SmData`. + /// Must be called from `sm_map` or `sm_unmap` with a pointer to `SmMa= pData` or `SmData`. pub(super) unsafe extern "C" fn sm_step_remap( op: *mut bindings::drm_gpuva_op, p: *mut c_void, ) -> c_int { - // SAFETY: The caller provides a pointer to `SmData`. + // SAFETY: The caller provides a pointer that can be treated as `S= mData`. let p =3D unsafe { &mut *p.cast::>() }; let op =3D OpRemap { // SAFETY: sm_step_remap is called with a remap operation. --=20 2.52.0.457.g6b5491de43-goog