From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 9F815433E63; Thu, 30 Jul 2026 17:05:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785431151; cv=none; b=FrVzXxKrMXVljZqmtWW7Vw8ck2Zfk4WgrGRCBkuAAjpOQ/RoaXiYr0eLBKgR2DqYBaluZQwWtFapmI1Uh4hO32NDUsrFTjuGSO8QfMymePXjORvVizTDSrKPNImu6oOP2NXvpKl85v4LfPuICicV1XF6yHUDlNvp1v/O2Y2yJ1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785431151; c=relaxed/simple; bh=kYVkz61WE+2pny9snlklEeo0ASdH0aL0mIPndo2QTJk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=m/RzeLZOsATRT4NtA+PcbbJv1MinIZxFggrcpTt4h5Mr+O5swvLMr88HUs8ZgQgDEvQROIgmMHgudzJknl5h+6qFLsFzJO5Of6l7EXEg2qKcwlf5OJAQZcrCTkBEcf5H6e/Vn8QzzXL16+5yx5sdUNZKC1AhPzaVpwkCvJqoIsM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=SBOTLx19; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="SBOTLx19" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3A1F0C4AF15; Thu, 30 Jul 2026 17:05:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux.dev; s=korg; t=1785431151; bh=kYVkz61WE+2pny9snlklEeo0ASdH0aL0mIPndo2QTJk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SBOTLx19r8SYWlKgI8bHEEGAGvKzWVXQ3514W7pkDzPqi3h8Bjkec+7x33ONlbucu 95okEdFHIH5WhdpduJuXmYUG6w6Y/Ij0EesDf5YdZ5hkvyf5WQcZPQ1+QjlBntWDBl S9wZ6kXd8g1uIVEhJbbSwjFvOFMD+lQQvJ9QkOkw= Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 28ADDC5516F; Thu, 30 Jul 2026 17:05:51 +0000 (UTC) From: Alvin Sun Date: Fri, 31 Jul 2026 01:05:46 +0800 Subject: [PATCH v2 8/9] drm/tyr: add gpuvas debugfs file Precedence: bulk X-Mailing-List: driver-core@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260731-tyr-debugfs-v2-v2-8-aea19eccb996@linux.dev> References: <20260731-tyr-debugfs-v2-v2-0-aea19eccb996@linux.dev> In-Reply-To: <20260731-tyr-debugfs-v2-v2-0-aea19eccb996@linux.dev> To: Miguel Ojeda , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Greg Kroah-Hartman , "Rafael J. Wysocki" , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Alexander Viro , Christian Brauner , Jan Kara , Matthew Brost , =?utf-8?q?Thomas_Hellstr=C3=B6m?= , =?utf-8?q?Ma=C3=ADra_Canal?= , Melissa Wen , Wambui Karuga , Eric Anholt , Ben Gamari , rust-for-linux@vger.kernel.org, driver-core@lists.linux.dev, dri-devel@lists.freedesktop.org, Alvin Sun X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785431148; l=6199; i=alvin.sun@linux.dev; s=20260317; h=from:subject:message-id; bh=kYVkz61WE+2pny9snlklEeo0ASdH0aL0mIPndo2QTJk=; b=SAW5hfriiBKwOoYyYKHdMATWNLMBel1xSMH9cZA+Z/ZeMFDLTI8ZbQ8poI+EoOQzN4Rp+spMd hIpGd4fkWeVBvhVYcRsVFfs6IGaQnNqomaJx9+Rt/+3e0lCiJsuJU75 X-Developer-Key: i=alvin.sun@linux.dev; a=ed25519; pk=CHcwQp8GSoj25V/L1ZWNSQjWp9eSIb0s9LKr0Nm3WuE= X-Endpoint-Received: by B4 Relay for alvin.sun@linux.dev/20260317 with auth_id=684 Add a gpuvas debugfs file listing all GPU VAs for the Tyr DRM driver. Collects VMs into a shared list during firmware init and renders them via dump_gpuva_info on read. Signed-off-by: Alvin Sun --- drivers/gpu/drm/tyr/debugfs.rs | 65 ++++++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/tyr/driver.rs | 16 +++++++++++ drivers/gpu/drm/tyr/fw.rs | 8 ++++++ drivers/gpu/drm/tyr/tyr.rs | 1 + drivers/gpu/drm/tyr/vm.rs | 5 ++++ 5 files changed, 95 insertions(+) diff --git a/drivers/gpu/drm/tyr/debugfs.rs b/drivers/gpu/drm/tyr/debugfs.rs new file mode 100644 index 0000000000000..d381b1901bd08 --- /dev/null +++ b/drivers/gpu/drm/tyr/debugfs.rs @@ -0,0 +1,65 @@ +// SPDX-License-Identifier: GPL-2.0 or MIT + +//! Debugfs support for the Tyr DRM driver. + +use kernel::{ + alloc::KVec, + drm, + new_mutex, + prelude::*, + seq_file, + sync::{ + Arc, + Mutex, // + }, // +}; + +use crate::{ + driver::TyrDrmDriver, + vm::Vm, // +}; + +/// Registry of VMs for debugfs access. +#[pin_data] +pub(crate) struct VmRegistry<'drm> { + #[pin] + vms: Mutex>>>, +} + +impl<'drm> VmRegistry<'drm> { + pub(crate) fn new() -> impl PinInit { + pin_init!(Self { vms <- new_mutex!(KVec::new()) }) + } + + pub(crate) fn register(&self, vm: Arc>) -> Result { + Ok(self.vms.lock().push(vm, GFP_KERNEL)?) + } + + fn for_each(&self, mut f: impl FnMut(&Vm<'drm>) -> Result) -> Result { + for vm in self.vms.lock().iter() { + f(vm)?; + } + Ok(()) + } +} + +/// Debugfs data associated with a device. +/// +/// Each field corresponds to a debugfs file. +pub(crate) struct DebugfsData<'drm> { + pub(crate) gpuvas: Pin>>, +} + +/// `DrmSeqShow` implementation for the `gpuvas` debugfs file. +pub(crate) struct GpuvasShow; + +impl drm::debugfs::DrmSeqShow for GpuvasShow { + fn show(guard: &drm::RegistrationGuard<'_, TyrDrmDriver>, m: &seq_file::SeqFile) -> Result { + guard.registration_data_with(|reg_data| { + reg_data + .debugfs_data + .gpuvas + .for_each(|vm| vm.dump_gpuva_info(m)) + }) + } +} diff --git a/drivers/gpu/drm/tyr/driver.rs b/drivers/gpu/drm/tyr/driver.rs index a6694400be659..6af3e464994b4 100644 --- a/drivers/gpu/drm/tyr/driver.rs +++ b/drivers/gpu/drm/tyr/driver.rs @@ -7,6 +7,7 @@ Clk, OptionalClk, // }, + debugfs::ScopedDir, device::{ Bound, Core, @@ -45,6 +46,11 @@ }; use crate::{ + debugfs::{ + DebugfsData, + GpuvasShow, + VmRegistry, // + }, file::TyrDrmFileData, fw::{ irq::{ @@ -86,6 +92,8 @@ pub(crate) struct TyrDrmRegistrationData<'drm> { /// Firmware sections. pub(crate) fw: Arc>, + pub(crate) debugfs_data: DebugfsData<'drm>, + #[pin] clks: Mutex, @@ -167,11 +175,14 @@ fn probe<'bound>( let mmu = Mmu::new(pdev.as_ref(), iomem.as_arc_borrow(), &gpu_info)?; + let vms = KBox::pin_init(VmRegistry::new(), GFP_KERNEL)?; + let firmware = Firmware::new( pdev.as_ref(), iomem.clone(), &unreg_dev, mmu.as_arc_borrow(), + &vms, &gpu_info, )?; @@ -194,6 +205,7 @@ fn probe<'bound>( let reg_data = pin_init!(TyrDrmRegistrationData { pdev, fw: firmware, + debugfs_data: DebugfsData { gpuvas: vms }, clks <- new_mutex!(Clocks { core: core_clk, stacks: stacks_clk, @@ -248,6 +260,10 @@ impl drm::Driver for TyrDrmDriver { kernel::declare_drm_ioctls! { (PANTHOR_DEV_QUERY, drm_panthor_dev_query, ioctl::RENDER_ALLOW, TyrDrmFileData::dev_query), } + + fn debugfs_init<'a>(dev: &'a drm::Device, dir: &ScopedDir<'a, 'static>) { + dir.seq_file::(c"gpuvas", dev); + } } struct Clocks { diff --git a/drivers/gpu/drm/tyr/fw.rs b/drivers/gpu/drm/tyr/fw.rs index 65ac18b92b4f2..3f45767e93853 100644 --- a/drivers/gpu/drm/tyr/fw.rs +++ b/drivers/gpu/drm/tyr/fw.rs @@ -47,6 +47,7 @@ }; use crate::{ + debugfs::VmRegistry, driver::{ IoMem, TyrDrmDevice, // @@ -251,6 +252,7 @@ pub(crate) fn new( iomem: Arc>, ddev: &TyrDrmDevice, mmu: ArcBorrow<'_, Mmu<'drm>>, + gpuvas: &VmRegistry<'drm>, gpu_info: &GpuInfo, ) -> Result>> { let vm = Vm::new(dev, ddev, mmu, gpu_info)?; @@ -300,6 +302,12 @@ pub(crate) fn new( )?) })(); + if result.is_ok() { + if let Err(e) = gpuvas.register(vm.clone()) { + dev_warn!(dev, "failed to register VM: {e:?}\n"); + } + } + if result.is_err() { vm.kill(); } diff --git a/drivers/gpu/drm/tyr/tyr.rs b/drivers/gpu/drm/tyr/tyr.rs index e7ec450bdc9c0..6eb13c15d1657 100644 --- a/drivers/gpu/drm/tyr/tyr.rs +++ b/drivers/gpu/drm/tyr/tyr.rs @@ -7,6 +7,7 @@ use crate::driver::TyrPlatformDriver; +mod debugfs; mod driver; mod file; mod fw; diff --git a/drivers/gpu/drm/tyr/vm.rs b/drivers/gpu/drm/tyr/vm.rs index 74c3d6c8efc49..927d4605b1e8d 100644 --- a/drivers/gpu/drm/tyr/vm.rs +++ b/drivers/gpu/drm/tyr/vm.rs @@ -401,6 +401,11 @@ pub(crate) fn activate(&self) -> Result { }) } + /// Dumps GPU VA space info into a seq_file. + pub(crate) fn dump_gpuva_info(&self, m: &kernel::seq_file::SeqFile) -> Result { + self.gpuvm_unique.lock().dump_gpuva_info(m) + } + /// Deactivate the VM by evicting it from its address space slot. fn deactivate(&self) -> Result { self.mmu.deactivate_vm(&self.as_data).inspect_err(|e| { -- 2.43.0