From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f43.google.com (mail-pz2-f43.google.com [74.125.228.43]) (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 1BFB33EAC74 for ; Wed, 23 Sep 2026 04:56:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790139398; cv=none; b=A5lo9X2731iej6iKtmZGbzJdtYxTU/ixB6CBOdDSG8hunWAccl0JPyxzWLnofB00GpYbTejOpgCKzhnC7tt/T/laTMSr9jnVjf5MeClSRjur145tP2YZfFsORSX9DaLruVVWkNn0HVtWE7AYA8pfp8/gL6r/KU+2OUWDog1ONp0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790139398; c=relaxed/simple; bh=YjdBU19SgV1Y9vfg0l5EHp63mWHtXanPinn5rOw6LQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YJiowIsdj8vcmlH1VjtF3kcvXUFBqJmgAUCTvtuJiuKHV+uqSdLZszsJm0heSCdbB7cq/Pvfdy4ofDK6GkMNijUhFWqSGERrpipar6c17iWgELA/KkvAoqsb4q/vGs7tcVCNDWP65T67bSYjnYKtScYTbVYLF8tC43/kbhEHSu0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=g8avxg1T; arc=none smtp.client-ip=74.125.228.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="g8avxg1T" Received: by mail-pz2-f43.google.com with SMTP id d2e1a72fcca58-85469f20513so335856b3a.0 for ; Tue, 22 Sep 2026 21:56:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790139380; x=1790744180; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=mwJzYusT65HvhnYbkq7feitpnxm95NlY/pIrZm1wqZA=; b=g8avxg1TauBjQEK29OGxTV+xu1G31YTVnthVY+pm4XCi0cS97sxWTkVbFqkevoGa72 mEwJysizPsDtYNOh/1Y7lzj2+kIyy4vI5XM870Nc01KLd9dfqPWuM5BdVkzamMWme6pp HtMX+bxCb4Txtb+Fe2GeO0Ur9irTpulSbZfzaCrvXh9s1fQAcSo0RLr1M73QDP8QOWgi AsT8frZUcplF5i3b3B8rxHnpIGaFib7P4HIGzUzg3KV1gJeGrYYoAYoILHHKVuuRK+ng b2QJs4F8Xicj0p1ZY6nS6S7U/jkYOREH4XdzNYsb/gg1m0WNS5YkSl6L/dL6yZhvKvxZ v98A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790139380; x=1790744180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=mwJzYusT65HvhnYbkq7feitpnxm95NlY/pIrZm1wqZA=; b=KKV+LEG1/sR4DEE3ICQVIXN1Ntay6HZK6r4WJqWIrCK+9F4f1xwOCtrcRVn4W7+aMK EGM/a9YCX6JRkdjcpWy4ZXyP3QTKw3taMnuI0qjdoz9vvwq0stW1yij8orzr1/6bhCsO bxkVVd/7RKyOJUL3DMiXMMESs8DHTPTpqwjjGyfe8L6aUTHyZXjANn8gPhCFw7q2Y2/J jBlAzv46jl2FrwmUKWXdUMBL0Uq1OizSllHboe8q5YD5HGfxlomTLJIPf2kQhMEmJ5qa edKZBfaR01ueIF3eqbACLlfWHKkkggBkhDUUoNW9eeMz937DR5ZW1DIog4V8hm91YiEF jKgA== X-Forwarded-Encrypted: i=1; AKwUvBxvApNGAvVacAyRArB3P4W0HJMulAj9TpbHtPW35F04IVxOu90c+YIwGL7CbpJcWbWS4h6EqbR5QQ==@lists.linux.dev X-Gm-Message-State: AFuF++kgGQS6mCchJwHjz0ELGZKLfVfjXDZxn4hkrxC+TeGIfVveEDQm zAtRHh3rnylYCiVMSykDQ59fzFR4mEciRuqIxdZ/gLhW/8jVa6De/Eqm X-Gm-Gg: AYBFou22lUAgFDyESFMbbI8wohEbQLcxOmpYv/A7jWtUxWeUoaY3GuOSFlk2ZokpIr/ nvIkSlSRjhYfgEGBIBObWWupIsm3rixebXVR+DgphSuNS/b6ifiWYimwlRCEBxRGb/wO2T2OUml WdiVHW5eKPGCO+0+h0tXu42QdKuDX9Ui7l5tmdBmbau3ZO4nPTePd1uAmOWP90EBHSp9QN9Kf10 9eBu56fmkTAC0AiEDYrNQafD2D+qyfU3rKBvTkfhAHuhrn/AoOdr9TBZU/fmhAL6OMho+Zaplt5 +zh3ksYk/TMzXUMMPlQtMkQg212/1m2WGWEeJn52KrY/nG08DfHrq7UifKiI9KWoRGiN+zqZ52w 3s7v3AMjNJBRm5UsXZ/rxx/ZvBN1/Z5OzrCyOxS6aVKODzBhCvZw2MdonJlvoVvDJaechYj1qSz C1TDq8X5qsVqwOpoto6PzG+os8eL/mkCxh2lnvdnOAxff2zlW4yUVTLs6mh8Q7dhu+k17mEubq4 cAPeg== X-Received: by 2002:a05:6a00:928c:b0:87b:3bcc:bce2 with SMTP id d2e1a72fcca58-87d1c9b8d83mr1483524b3a.33.1790139378874; Tue, 22 Sep 2026 21:56:18 -0700 (PDT) Received: from localhost ([95.190.82.222]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-87d1cec2d34sm664129b3a.14.2026.09.22.21.56.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Sep 2026 21:56:18 -0700 (PDT) From: Vladislav Zaharov To: dakr@kernel.org, jhubbard@nvidia.com Cc: acourbot@nvidia.com, aliceryhl@google.com, ttabi@nvidia.com, gary@garyguo.net, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Vladislav Zaharov Subject: [PATCH v5 2/3] gpu: nova-core: gsp: retain the GSP-RM log buffers after unbind Date: Wed, 23 Sep 2026 11:55:50 +0700 Message-ID: <20260923045551.229259-3-vladazaharova2018@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923045551.229259-1-vladazaharova2018@gmail.com> References: <20260923045551.229259-1-vladazaharova2018@gmail.com> Precedence: bulk X-Mailing-List: nova-gpu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The GSP-RM log buffers are exposed through debugfs, but the Scope that owns them lives in Gsp, inside GspResources, inside the Gpu built by probe(). They are DMA allocations of the device and cannot outlive it, so the entries go away as soon as the GPU is unbound - and, more to the point, as soon as probe() fails, which is exactly when the log of a GSP that did not come up is the thing one wants to read. Add a gsp_keep_logs module parameter. When it is set, dropping the log buffers copies whatever the GSP wrote into memory owned by the module and exposes the copies until the module is unloaded. A buffer whose "put" pointer is still zero was never written to and is skipped. The GSP has normally been stopped by the time the buffers are dropped, but a boot that timed out can leave it still appending, so a DMA read barrier orders the read of the "put" pointer before the copy. The copies belong to the module data next to the debugfs root, and live in a "retained" directory created during module init rather than on first use, which keeps the teardown path of a device from having to create anything. Keeping them out of the directory used by bound GPUs also means a device coming back does not find its debugfs name taken by its own history; nouveau, which recreates the entries under the name of the GPU that just went away, has that problem. While at it, move the log buffer code out of gsp.rs into gsp/logbuffer.rs. Assisted-by: LLM Signed-off-by: Vladislav Zaharov --- drivers/gpu/nova-core/gsp.rs | 92 ++------- drivers/gpu/nova-core/gsp/logbuffer.rs | 247 +++++++++++++++++++++++++ drivers/gpu/nova-core/nova_core.rs | 29 ++- 3 files changed, 294 insertions(+), 74 deletions(-) create mode 100644 drivers/gpu/nova-core/gsp/logbuffer.rs diff --git a/drivers/gpu/nova-core/gsp.rs b/drivers/gpu/nova-core/gsp.rs index 01ed4adffe93..72752c6bd6c0 100644 --- a/drivers/gpu/nova-core/gsp.rs +++ b/drivers/gpu/nova-core/gsp.rs @@ -12,11 +12,7 @@ CoherentView, DmaAddress, // }, - io::{ - io_project, - io_write, - Io, // - }, + io::io_write, pci, prelude::*, // }; @@ -24,9 +20,13 @@ pub(crate) mod cmdq; pub(crate) mod commands; mod fw; +mod logbuffer; mod regs; mod sequencer; +use logbuffer::LogBuffers; +pub(crate) use logbuffer::RetainedLogs; + pub(crate) use fw::{ GspFmcBootParams, GspFwWprMeta, @@ -77,10 +77,6 @@ pub(crate) fn dev(&self) -> &'gpu device::Device { } } -/// Number of GSP pages to use in a RM log buffer. -const RM_LOG_BUFFER_NUM_PAGES: usize = 0x10; -const LOG_BUFFER_SIZE: usize = RM_LOG_BUFFER_NUM_PAGES * GSP_PAGE_SIZE; - /// Array of page table entries, as understood by the GSP bootloader. #[repr(C)] #[derive(FromBytes, IntoBytes)] @@ -101,49 +97,6 @@ fn init(view: CoherentView<'_, Self>, start: DmaAddress) -> Result<()> { } } -/// The logging buffers are byte queues that contain encoded printf-like -/// messages from GSP-RM. They need to be decoded by a special application -/// that can parse the buffers. -/// -/// The 'loginit' buffer contains logs from early GSP-RM init and -/// exception dumps. The 'logrm' buffer contains the subsequent logs. Both are -/// written to directly by GSP-RM and can be any multiple of GSP_PAGE_SIZE. -/// -/// The physical address map for the log buffer is stored in the buffer -/// itself, starting with offset 1. Offset 0 contains the "put" pointer (pp). -/// Initially, pp is equal to 0. If the buffer has valid logging data in it, -/// then pp points to index into the buffer where the next logging entry will -/// be written. Therefore, the logging data is valid if: -/// 1 <= pp < sizeof(buffer)/sizeof(u64) -struct LogBuffer<'a>(Coherent<'a, [u8; LOG_BUFFER_SIZE]>); - -impl<'a> LogBuffer<'a> { - /// Creates a new `LogBuffer` mapped on `dev`. - fn new(dev: &'a device::Device) -> Result { - let obj = Self(Coherent::zeroed(dev, GFP_KERNEL)?); - - let start_addr = obj.0.dma_address(); - - let pte_view = io_project!( - obj.0, - [build: size_of::()..][build: ..RM_LOG_BUFFER_NUM_PAGES * size_of::()] - ) - .try_cast::>()?; - PteArray::init(pte_view, start_addr)?; - - Ok(obj) - } -} - -struct LogBuffers<'a> { - /// Init log buffer. - loginit: LogBuffer<'a>, - /// Interrupts log buffer. - logintr: LogBuffer<'a>, - /// RM log buffer. - logrm: LogBuffer<'a>, -} - /// GSP runtime data. #[pin_data] pub(crate) struct Gsp<'gsp> { @@ -168,9 +121,7 @@ pub(crate) fn new( pin_init::pin_init_scope(move || { let dev = pdev.as_ref(); - let loginit = LogBuffer::new(dev)?; - let logintr = LogBuffer::new(dev)?; - let logrm = LogBuffer::new(dev)?; + let log_buffers = LogBuffers::new(dev)?; // Initialise the logging structures. The OpenRM equivalents are in: // _kgspInitLibosLoggingStructures (allocates memory for buffers) @@ -185,28 +136,23 @@ pub(crate) fn new( GFP_KERNEL, )?; - libos.init_at(0, LibosMemoryRegionInitArgument::new("LOGINIT", &loginit.0))?; - libos.init_at(1, LibosMemoryRegionInitArgument::new("LOGINTR", &logintr.0))?; - libos.init_at(2, LibosMemoryRegionInitArgument::new("LOGRM", &logrm.0))?; + libos.init_at( + 0, + LibosMemoryRegionInitArgument::new("LOGINIT", &log_buffers.loginit.0), + )?; + libos.init_at( + 1, + LibosMemoryRegionInitArgument::new("LOGINTR", &log_buffers.logintr.0), + )?; + libos.init_at( + 2, + LibosMemoryRegionInitArgument::new("LOGRM", &log_buffers.logrm.0), + )?; libos.init_at(3, LibosMemoryRegionInitArgument::new("RMARGS", rmargs))?; libos.into() }, - logs <- { - let log_buffers = LogBuffers { - loginit, - logintr, - logrm, - }; - - let log_parent: &debugfs::Dir = crate::debugfs_data(dev).root(); - - log_parent.scope(log_buffers, dev.name(), |logs, dir| { - dir.read_binary_file(c"loginit", &logs.loginit.0); - dir.read_binary_file(c"logintr", &logs.logintr.0); - dir.read_binary_file(c"logrm", &logs.logrm.0); - }) - }, + logs <- log_buffers.scope(), })) }) } diff --git a/drivers/gpu/nova-core/gsp/logbuffer.rs b/drivers/gpu/nova-core/gsp/logbuffer.rs new file mode 100644 index 000000000000..b1f912fb3fae --- /dev/null +++ b/drivers/gpu/nova-core/gsp/logbuffer.rs @@ -0,0 +1,247 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! GSP-RM log buffers, and the debugfs entries exposing them. + +use core::convert::Infallible; + +use kernel::{ + debugfs, + device, + dma::Coherent, + io::{ + io_project, + Io, // + }, + prelude::*, + str::CString, + sync::barrier::{ + dma_mb, + Read, // + }, // +}; + +use crate::gsp::{ + PteArray, + GSP_PAGE_SIZE, // +}; + +/// Number of GSP pages to use in a RM log buffer. +const RM_LOG_BUFFER_NUM_PAGES: usize = 0x10; +const LOG_BUFFER_SIZE: usize = RM_LOG_BUFFER_NUM_PAGES * GSP_PAGE_SIZE; + +/// The logging buffers are byte queues that contain encoded printf-like +/// messages from GSP-RM. They need to be decoded by a special application +/// that can parse the buffers. +/// +/// The 'loginit' buffer contains logs from early GSP-RM init and +/// exception dumps. The 'logrm' buffer contains the subsequent logs. Both are +/// written to directly by GSP-RM and can be any multiple of GSP_PAGE_SIZE. +/// +/// The physical address map for the log buffer is stored in the buffer +/// itself, starting with offset 1. Offset 0 contains the "put" pointer (pp). +/// Initially, pp is equal to 0. If the buffer has valid logging data in it, +/// then pp points to index into the buffer where the next logging entry will +/// be written. Therefore, the logging data is valid if: +/// 1 <= pp < sizeof(buffer)/sizeof(u64) +pub(super) struct LogBuffer<'a>(pub(super) Coherent<'a, [u8; LOG_BUFFER_SIZE]>); + +impl<'a> LogBuffer<'a> { + /// Creates a new `LogBuffer` mapped on `dev`. + fn new(dev: &'a device::Device) -> Result { + let obj = Self(Coherent::zeroed(dev, GFP_KERNEL)?); + + let start_addr = obj.0.dma_address(); + + let pte_view = io_project!( + obj.0, + [build: size_of::()..][build: ..RM_LOG_BUFFER_NUM_PAGES * size_of::()] + ) + .try_cast::>()?; + PteArray::init(pte_view, start_addr)?; + + Ok(obj) + } + + /// Copies the contents of this buffer into memory that does not belong to the device. + /// + /// A buffer the GSP never wrote to yields an empty vector, as it holds nothing worth keeping. + fn snapshot(&self) -> Result> { + // Offset 0 holds the "put" pointer, which the GSP advances as it appends entries. It is + // still zero if nothing was ever logged, which is all that is tested here: a buffer that + // was written to is copied whole, and making sense of "put" is left to the decoder. + let put = io_project!(self.0, [build: ..size_of::()]).try_cast::()?; + if put.read_val() == 0 { + return Ok(VVec::new()); + } + + // ORDERING: LOAD->LOAD ordering needed to order the "put" read before the data read. The + // GSP has normally been stopped by the time this runs, but a boot that timed out can leave + // it still appending. + dma_mb(Read); + + let mut snapshot = VVec::zeroed(LOG_BUFFER_SIZE, GFP_KERNEL)?; + io_project!(self.0, [build: ..]).copy_to_slice(&mut snapshot); + + Ok(snapshot) + } +} + +/// The log buffers of a GPU, for as long as it is bound to the driver. +pub(super) struct LogBuffers<'a> { + /// Device the buffers belong to. Also names their debugfs directory. + dev: &'a device::Device, + /// Init log buffer. + pub(super) loginit: LogBuffer<'a>, + /// Interrupts log buffer. + pub(super) logintr: LogBuffer<'a>, + /// RM log buffer. + pub(super) logrm: LogBuffer<'a>, +} + +impl<'a> LogBuffers<'a> { + /// Allocates the three log buffers of `dev`. + pub(super) fn new(dev: &'a device::Device) -> Result { + Ok(Self { + dev, + loginit: LogBuffer::new(dev)?, + logintr: LogBuffer::new(dev)?, + logrm: LogBuffer::new(dev)?, + }) + } + + /// Creates an initializer exposing these buffers under a directory named after their device. + pub(super) fn scope(self) -> impl PinInit, Infallible> + 'a { + let dev = self.dev; + + let log_parent: &debugfs::Dir = crate::debugfs_data(dev).root(); + + log_parent.scope(self, dev.name(), |logs, dir| { + dir.read_binary_file(c"loginit", &logs.loginit.0); + dir.read_binary_file(c"logintr", &logs.logintr.0); + dir.read_binary_file(c"logrm", &logs.logrm.0); + }) + } + + /// Preserves whatever the GSP logged, so it can still be read once the GPU is gone. + /// + /// The buffers are DMA allocations of the device and cannot outlive it, so their contents are + /// copied into memory owned by the module and exposed through fresh debugfs entries. Those + /// live until the module is unloaded. + /// + /// Does nothing if `gsp_keep_logs` was not set when the module was loaded, as there is then + /// no directory to put the copies in. + fn retain(&self) -> Result { + let data = crate::debugfs_data(self.dev); + + // The directory is taken here and the lock dropped again right away: what follows + // allocates 64 KiB three times, and no other device should have to wait for that. + let Some(dir) = data.retained_logs().lock().dir.clone() else { + return Ok(()); + }; + + let logs = RetainedLogBuffers { + name: CString::try_from_fmt(fmt!("{}", self.dev.name()))?, + loginit: self.loginit.snapshot()?, + logintr: self.logintr.snapshot()?, + logrm: self.logrm.snapshot()?, + }; + + // Nothing was ever logged, so there is nothing to keep. A copy from an earlier run of + // this device is deliberately left alone: logs from a run that failed are worth more + // than the silence of one that did not. A run that did log something does replace it, + // even where what it replaces came from a run that failed: nothing here can tell the two + // apart, and keeping the older copy would mean never seeing anything newer. + if logs.loginit.is_empty() && logs.logintr.is_empty() && logs.logrm.is_empty() { + return Ok(()); + } + + // Make every allocation of our own that can fail before the previous copy of this device + // is dropped, so that none of them failing can leave it with no logs at all. + let scope = KBox::>::new_uninit(GFP_KERNEL)?; + + let mut retained = data.retained_logs().lock(); + + retained.gpus.reserve(1, GFP_KERNEL)?; + + // An earlier run of the same device may have left a copy behind, and its directory + // carries the name about to be used again, so it has to go first. Nothing below can + // fail, so the replacement is guaranteed to take its place. + retained.gpus.retain(|gpu| *gpu.name != *logs.name); + + let scope = scope.write_pin_init(dir.scope(logs, self.dev.name(), |logs, dir| { + if !logs.loginit.is_empty() { + dir.read_binary_file(c"loginit", &logs.loginit); + } + if !logs.logintr.is_empty() { + dir.read_binary_file(c"logintr", &logs.logintr); + } + if !logs.logrm.is_empty() { + dir.read_binary_file(c"logrm", &logs.logrm); + } + }))?; + + retained.gpus.push(scope, GFP_KERNEL)?; + + dev_dbg!(self.dev, "GSP-RM log buffers retained\n"); + + Ok(()) + } +} + +impl Drop for LogBuffers<'_> { + fn drop(&mut self) { + if let Err(e) = self.retain() { + dev_warn!(self.dev, "failed to retain GSP-RM log buffers: {:?}\n", e); + } + } +} + +/// Copies of the log buffers of a GPU that is no longer around. +struct RetainedLogBuffers { + /// Name of the device the buffers came from, which also names their directory. + /// + /// A copy rather than a reference to the device, so that a GPU that is gone does not stay + /// allocated for as long as its logs are kept. + name: CString, + /// Contents of the init log buffer, empty if it was never written to. + loginit: VVec, + /// Contents of the interrupts log buffer, empty if it was never written to. + logintr: VVec, + /// Contents of the RM log buffer, empty if it was never written to. + logrm: VVec, +} + +/// Log buffers of GPUs that are gone, and the debugfs entries exposing them. +/// +/// The copies live under a `retained` directory of their own instead of next to the entries of +/// the GPUs that are actually bound, so that a device coming back does not find its name taken. +pub(crate) struct RetainedLogs { + /// One entry per GPU. + /// + /// Declared before `dir`, as the copies live below it. + gpus: KVec>>>, + /// Parent directory of all copies. `None` unless retaining was asked for. + dir: Option, +} + +impl RetainedLogs { + /// Creates an empty set of retained log buffers, retaining disabled. + pub(crate) const fn new() -> Self { + Self { + gpus: KVec::new(), + dir: None, + } + } + + /// Creates the directory the copies will live in, enabling retaining. + /// + /// Does nothing without `CONFIG_DEBUG_FS`, where a [`debugfs::Dir`] is a zero-sized type and + /// the copies could never be read back. + pub(crate) fn enable(&mut self, parent: &debugfs::Dir) { + if !cfg!(CONFIG_DEBUG_FS) { + return; + } + + self.dir = Some(parent.subdir(c"retained")); + } +} diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nova_core.rs index 08509f64770e..14509d764d0b 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -8,6 +8,7 @@ driver::Registration, pci, prelude::*, + sync::Mutex, InPlaceModule, // }; @@ -46,6 +47,11 @@ /// Reached from a device through [`debugfs_data()`]. #[pin_data] pub(crate) struct DebugfsData { + /// Copies of the log buffers of GPUs that are gone. + /// + /// Declared before `root`, as the copies live below it. + #[pin] + retained_logs: Mutex, /// Root directory of the driver in debugfs. root: debugfs::Dir, } @@ -53,8 +59,18 @@ pub(crate) struct DebugfsData { impl DebugfsData { /// Creates the shared data. fn new() -> impl PinInit { + let root = debugfs::Dir::new(c"nova-core"); + + // Deciding here, rather than when the first GPU goes away, keeps the teardown path of a + // device from having to create anything. + let mut retained_logs = gsp::RetainedLogs::new(); + if module_parameters::gsp_keep_logs.value() { + retained_logs.enable(&root); + } + pin_init!(Self { - root: debugfs::Dir::new(c"nova-core"), + retained_logs <- kernel::new_mutex!(retained_logs), + root, }) } @@ -62,6 +78,11 @@ fn new() -> impl PinInit { pub(crate) fn root(&self) -> &debugfs::Dir { &self.root } + + /// Returns the copies of the log buffers of GPUs that are gone. + pub(crate) fn retained_logs(&self) -> &Mutex { + &self.retained_logs + } } /// Returns the data the module shares with its devices. @@ -110,6 +131,12 @@ fn init(module: &'static kernel::ThisModule) -> impl PinInit { description: "Nova Core GPU driver", license: "GPL v2", firmware: [], + params: { + gsp_keep_logs: bool { + default: false, + description: "Keep the GSP-RM log buffers in debugfs after their GPU is gone", + }, + }, } kernel::module_firmware!(firmware::ModInfoBuilder); -- 2.55.0