From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (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 8291F322B6D for ; Fri, 30 Jan 2026 14:24:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769783081; cv=none; b=kjePz8d3liHxhrIhedNfbIIO2lqewLeqHnrbY45ZPHho/U3xYNg09v721V/N9qR0Qsh5ishsl+hg3QY67Gf5k0ssJxexdl1UgRFbCyfYXUKU7Asr3hoP8X8IkPVcgnnIn0APGfwOzU0otFlPzu34LxWMNujbItfngPPjjviI8jA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769783081; c=relaxed/simple; bh=OocxZt4c/n9d8K9jPoS6cMKUoromwSnEs6v794Vpv6Q=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=qtBgWgR+6kvUKgwGy4S+qArKdkT/K5iyQXX2iSQeccXIbLrTO2Hg77puwwHoUQsck6sZcMErEhhOkFeY2vgFPLrrcCzeyTTXRBMtzTlhnRu+APFBIoAsWRltwNBb0OogOLck7bdCnBD8o/IXkUvxzbLldtWsgY8tpPCsb0ce4Dc= 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=xS+pAIDw; arc=none smtp.client-ip=209.85.128.73 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="xS+pAIDw" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4806a27aa31so21619625e9.2 for ; Fri, 30 Jan 2026 06:24:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769783078; x=1770387878; 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=wyrtNzxygY0xuisDnGfl0mQkqGyjjT25fNVtDfZ2la0=; b=xS+pAIDwK6J6RI2Q86sqRouiHl3+H5OoED1wMXAG/FZ1pk6gWlDbreLddU7P0YfumZ /cjzHhzkeOV5yR7XUm+rATWo7rrKdvz55hbC+gvtHOFtGKUoSMSVS/GJY1LXRCNOdSuH ofW8umS81g9sHw1VDXjvobuzfnUkdBBbm1xoVZU+6QTbw+0uuDx/Ceh5z2EFu0bHATLw q80rqZ0ttbhJC7HXNu5FoJAIrEFi7/5fRnysSwhoCLWS8vKuD1Wr5F9cOYoe19wnq54d uVqj9Wu2ejfyutK6Kk1e21sal1WxHv3WVfN1cdwNGGjR4U8rGbyf0MpCdu3lE+pA48k2 fX2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769783078; x=1770387878; 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=wyrtNzxygY0xuisDnGfl0mQkqGyjjT25fNVtDfZ2la0=; b=T98dqcVGuPXhB0bI+u+hEq2eN2vQrpv1T4oGNvh/TOnNK6OcZLtElmiGmoMkg8M6cU CRbGrLUk7rw4IIJQKE9WCPIDjKddzvXbb5uOddtTsiwcK2t7TEm2L/Zzt1XxG90gTdNT qqm3XYCxAsypObccldr1vUX6iqrXYtdvHikkLCH8gNzP5HoIF0D82eqoEk3CxYENY75/ GPTCOSgo9b+uRxpuLl52iHMI1C2rK9VuAbiXrPLbu0ke0M4ur1n1GqQIdqVL+ocu2H4d 6jy4xVLPfEkziuH+Kev0+HJmxB2hrq/+oz3zUI8qIdAEzRgkZAOp3EgRlX8VDCqZHmep HfNg== X-Forwarded-Encrypted: i=1; AJvYcCUuOnQaARqFjwvEsNxLeiKykK1uWNqFH1X0HNCOlgljIwrm4t/krAIQ+CX6GX55VzCgcZboGUIwpyniyiIMiQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yzs652Gt2Xwr3p2+zJr4KfJQfOt6XNE3WHpriQEu5tiQJc9VBHc 0iUqLs1gx6Lgcb4rY9FQOsnvNNYmWKa+RU1YMUEEgRQh2XDpJsoUmhW8bI3kXUTUJ0ZXMQXDuWz dfjj35xZidMbvnjYQ/A== X-Received: from wmi5.prod.google.com ([2002:a05:600c:205:b0:477:a43b:b532]) (user=aliceryhl job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4f16:b0:480:1d16:2538 with SMTP id 5b1f17b1804b1-482db493999mr45696685e9.23.1769783078083; Fri, 30 Jan 2026 06:24:38 -0800 (PST) Date: Fri, 30 Jan 2026 14:24:15 +0000 In-Reply-To: <20260130-gpuvm-rust-v4-0-8364d104ff40@google.com> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260130-gpuvm-rust-v4-0-8364d104ff40@google.com> X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=9806; i=aliceryhl@google.com; h=from:subject:message-id; bh=OocxZt4c/n9d8K9jPoS6cMKUoromwSnEs6v794Vpv6Q=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBpfL8TNpDBJAXz4MdOGdrah1kFDKuqNiYZ8JDv4 wOSBWdUsAyJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCaXy/EwAKCRAEWL7uWMY5 Rqn4D/9uCpt6PkFti3PDllr1YBzn1GDezaPhq6OfTs2nn/w/MF34t4O/isAOjNNTtWlHUOJlddK xKSSKTuSZH87IJ7G3kodJHZHxcTPYK4cbxylXVxbYynQDEo+qatfIrdX7ZMr0RJ4SEU3ylg9vC0 dRxoVCwZxIV7n4EWzUJU9+J9tn34y+AgiACY7a5KpwukIbMLmptbV18IR7vpUAhC78zmYILpKXK r4NdWP1YXZfF1pNZbnvm61LPEY8x6Peeumo5QJElfWcmjwAsCud6TkG7n6GslLXSFDmSsQ6qoDG 7+e2NG7pdV4ueQAc/ORi9Vmm4RvD7oeizk0My9Qi19uxoFiSGXzv3l2NaIAcE5axRL3Sxk/NyJz lFaNisYsxk10HxLQ79AfNWUnQhpy5mttheTTYEpfqVzj1vsUus6tfcZE+Ud+kedyWUXurVyK5DB cM3T3dCr3C2+yzcIwe/0DugPPONTRazWMgLr1nr/puZ0DqCtvYof6nAWpQkdl2Gv8+xih0D9lsh xJ7QN6NOgArGBQaKsjgtOt3Bd2bMiEcwEf2couvAHG3qakc+O2/9Dgjs3UorszFmM317ZfOPj6r fIxErZfYRlBAkC3I++e/k17Yx4ldwIYD1uogdjp0pd/I19vQ4dqAElVh9nvD2k6GAPsFZhYDa9n qGRIT7lw0MvFI1Q== X-Mailer: b4 0.14.2 Message-ID: <20260130-gpuvm-rust-v4-6-8364d104ff40@google.com> Subject: [PATCH v4 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" 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 Reviewed-by: Daniel Almeida Signed-off-by: Alice Ryhl --- rust/kernel/drm/gpuvm/mod.rs | 9 ++- rust/kernel/drm/gpuvm/sm_ops.rs | 157 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 160 insertions(+), 6 deletions(-) diff --git a/rust/kernel/drm/gpuvm/mod.rs b/rust/kernel/drm/gpuvm/mod.rs index fd4c662f84a4830515c2ddd18d5d503e4ee9fc8f..20e512842dfc6f2bd461cd3d22361ef8bff2f204 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>; + /// 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 3f345bce14a18ae88ce525629e3e5b76820e97a6..6ad741364b1856b3863b118a1d5581c54bb98ea9 100644 --- a/rust/kernel/drm/gpuvm/sm_ops.rs +++ b/rust/kernel/drm/gpuvm/sm_ops.rs @@ -8,6 +8,103 @@ struct SmData<'a, 'ctx, T: DriverGpuVm> { user_context: &'a mut T::SmContext<'ctx>, } +#[repr(C)] +struct SmMapData<'a, 'ctx, T: DriverGpuVm> { + sm_data: SmData<'a, 'ctx, T>, + vm_bo: GpuVmBoRegistered, +} + +/// 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 gem_offset: u64, + /// The GEM object to map. + pub vm_bo: GpuVmBoRegistered, + /// 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.gem_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 point. + vm_bo: &'op GpuVmBo, + // This ensures that 'op is invariant, so that `OpMap<'long, T>` does not + // coerce to `OpMap<'short, T>`. This ensures that the user can't return + // the wrong `OpMapped` value. + _invariant: PhantomData fn(&'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 = 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 = self.vm_bo().lock_gpuva(); + // SAFETY: The va is prepared for insertion, and we hold the GEM lock. + 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 completed. pub struct OpUnmap<'op, T: DriverGpuVm> { op: &'op bindings::drm_gpuva_op_unmap, @@ -211,6 +308,30 @@ pub struct OpRemapped<'op, T> { } 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 requested mapping. + #[inline] + pub fn sm_map(&mut self, req: OpMapRequest<'_, '_, T>) -> Result { + let gpuvm = self.as_raw(); + let raw_req = req.raw_request(); + let mut p = 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 and SmMapData since the + // first field of SmMapData is SmData. + to_result(unsafe { + bindings::drm_gpuvm_sm_map(gpuvm, (&raw mut p).cast(), &raw const raw_req) + }) + } + /// Remove any mappings in the given region. /// /// Internally calls [`DriverGpuVm::sm_step_unmap`] for ranges entirely contained within the @@ -224,19 +345,45 @@ pub fn sm_unmap(&mut self, addr: u64, length: u64, context: &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) }) } } 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 = unsafe { &mut *p.cast::>() }; + let op = 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 { .. }) => 0, + Err(err) => err.to_errno(), + } + } + + /// # Safety + /// Must be called from `sm_map` or `sm_unmap` with a pointer to `SmMapData` 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 `SmData`. let p = unsafe { &mut *p.cast::>() }; let op = OpUnmap { // SAFETY: sm_step_unmap is called with an unmap operation. @@ -250,12 +397,12 @@ impl GpuVm { } /// # 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 `SmMapData` 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 `SmData`. let p = unsafe { &mut *p.cast::>() }; let op = OpRemap { // SAFETY: sm_step_remap is called with a remap operation. -- 2.53.0.rc1.225.gd81095ad13-goog