From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795367639; b=K2M/TvuuTBTCUmkOWKRaOcwBs5lMS/cO0lHYSztjMk9aCeA6mr3trjI4FyVHCUUEnnmi Ssf4yNg5A+ewzKO45ZA3i1HrHz4diURhWPS18e2AM3OF57H8ygEHhiLgqIkQhrEAbjrFt 799+Efag4C8mJ+CTqylYedxjTuiWkv8idnZhOMhc2nMxHwv+hT9cntrtRKC2850eMWnUt lw0m7F2C5stM1hef4g82xZDumrfEOsSPOzPfCSCxl+YCCrdCEoZI8WtnLN7QMDUz/qx3f jvNhuFr1uMZ6g6BNHu76qqxKFtt99QxVzSVgScg+ydxMD2kshUKgbNzCZlbDANc0XRg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795367639; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Transfer-Encoding; bh=yUNaSCM1KvdhOrAYcb8mGrRXSwHXAOI/5jdKnnBOGBY=; b=Iuh4xIPwVOiN4QfuXXc6A7HpQQ9zAPU7CKuhoCrg73yGq78ZKMfdYZO2aH3w9BQCPXkT M5QRw2ykpKLEarzOeTRDxmXJ0c71umKhItuOtnSOK6/oZ/7l8AncBPEWii9bS6/FLkU8y uy/Llopvsdi9t6+6iKsLBL7uFiIBrlZ7F/+k5yqYtkh9zdd1A0qy6wnovFQ5rE9DXb5Rj XjDO4SXTroNppe9pIKP6fSQfRN75vhJrGen9SbUM8MXPy/qFHxeswo7NVCrrDWjJAeE9e 37l8mhI3E4Rmvq0BaKRYX4QyEpQheVmPmMqIu9NZr323PFOt0vB7rbem1siiWOU19ZA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=b9cCKlxk; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACDD5606A320; Sun, 22 Nov 2026 17:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=b9cCKlxk Received: by smtp.kernel.org (Postfix) with ESMTPSA id 780411F000C0; Sun, 22 Nov 2026 17:13:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1795367638; bh=yUNaSCM1KvdhOrAYcb8mGrRXSwHXAOI/5jdKnnBOGBY=; h=From:To:Cc:Subject:Date; b=b9cCKlxkFFIzVTRL/IzW5cvjhaDaOgffWKN5AHbUNzUEArNWBJ6p/pJvFw6YawdtM iOkc7Ai3ZNJVwP3xfdDGGU6lFCOP5s5Lxn20TFITaByeH1JQdS+l/PxNFHwB0q8mwp G8cwOCzxwPq3Iif5GMg6xHCcztlvEBQWP3ERPztlERm4jpeEHVzIojwUY1qh/elJl6 xsPEiKTpceD6RrP6dXOAUerny7zWQ8DB5a33Yh0ReQJt+gN8wajf/J1rFPzHPg/Fe+ lqOjDziVku78jMyoBLT8j0ICOn27UaBODDeOoRq7rYAFGpOzb02dnZU4+5lZ9jm7sI qvLf2M6oDBPUg== From: Danilo Krummrich To: dakr@kernel.org, acourbot@nvidia.com Cc: nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] gpu: nova-core: use Init for firmware initialization Date: Sun, 22 Nov 2026 18:13:50 +0100 Message-ID: <20261122171353.963020-1-dakr@kernel.org> X-Mailer: git-send-email 2.56.1 X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Now that SGTable no longer requires pinning, move Radix3 and GspFirmware from PinInit to Init. In an x86-64 build, GspFirmware is 312 bytes, including its 216-byte Radix3. This is reasonable for the stack, but returning it by value increases boot()'s local stack reservation from 432 to 1040 bytes. On TU102 for instance, the nested hal.boot() call reserves another 1128 bytes for locals. Thus, keep the KBox allocation and in-place initialization. Signed-off-by: Danilo Krummrich --- Changes in v2: - Convert to impl Init to not increase the overall stack usage. --- drivers/gpu/nova-core/firmware/gsp.rs | 8 ++- drivers/gpu/nova-core/firmware/radix3.rs | 67 +++++++++++------------- drivers/gpu/nova-core/gsp/boot.rs | 3 +- 3 files changed, 36 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/nova-core/firmware/gsp.rs b/drivers/gpu/nova-core/firmware/gsp.rs index 341a8b19aa38..1cf17d0fb36b 100644 --- a/drivers/gpu/nova-core/firmware/gsp.rs +++ b/drivers/gpu/nova-core/firmware/gsp.rs @@ -25,10 +25,8 @@ }; /// The GSP firmware image, its signatures, and the GSP bootloader. -#[pin_data] pub(crate) struct GspFirmware<'a> { /// The firmware image and the radix3 table that maps it. - #[pin] radix3: Radix3<'a>, /// Device-mapped GSP signatures matching the GPU's [`Chipset`]. pub(crate) signatures: Coherent<'a, [u8]>, @@ -42,8 +40,8 @@ impl<'a> GspFirmware<'a> { pub(crate) fn new( dev: &'a device::Device, chipset: Chipset, - ) -> impl PinInit + 'a { - pin_init::pin_init_scope(move || { + ) -> impl Init + 'a { + pin_init::init_scope(move || { let firmware = request_tlv(dev, chipset, "gsp")?; let tlv = Tlv::new(firmware.data())?; dev_dbg!(dev, "loaded gsp firmware v{}\n", tlv.get_string(b"VERS")?); @@ -58,7 +56,7 @@ pub(crate) fn new( let signatures = Coherent::from_slice(dev, tlv.get_bytes(b"SIGN")?, GFP_KERNEL)?; - Ok(try_pin_init!(Self { + Ok(try_init!(Self { radix3 <- Radix3::new(dev, fw_vvec), signatures, bootloader: { diff --git a/drivers/gpu/nova-core/firmware/radix3.rs b/drivers/gpu/nova-core/firmware/radix3.rs index a3e43fc8ec86..b17d1363e48f 100644 --- a/drivers/gpu/nova-core/firmware/radix3.rs +++ b/drivers/gpu/nova-core/firmware/radix3.rs @@ -32,7 +32,6 @@ }; /// A radix3 page table and the data it maps. -#[pin_data] pub(crate) struct Radix3<'a> { /// The mapped data. data: SGTable>>, @@ -51,41 +50,37 @@ impl<'a> Radix3<'a> { pub(crate) fn new( dev: &'a device::Device, data: VVec, - ) -> impl PinInit + 'a { - let size = data.len(); - - pin_init::pin_init_scope(move || { - Ok(try_pin_init!(Self { - data: SGTable::new(dev, data, DataDirection::ToDevice, GFP_KERNEL)?, - level2: { - let l2 = build_lvl(data)?; - SGTable::new(dev, l2, DataDirection::ToDevice, GFP_KERNEL)? - }, - level1: { - let l1 = build_lvl(level2)?; - SGTable::new(dev, l1, DataDirection::ToDevice, GFP_KERNEL)? - }, - level0: { - // Allocate the level 0 page table as a device-visible DMA object, and map the - // level 1 page table onto it. - - // Fill level 1 page entry. - let level1_entry = level1.iter().next().ok_or(EINVAL)?; - let level1_entry_addr = level1_entry.dma_address(); - - // Create level 0 page table data and fill its first entry with the level 1 - // table. - let mut level0 = CoherentBox::<'_, [u64]>::zeroed_slice( - dev, - GSP_PAGE_SIZE / size_of::(), - GFP_KERNEL, - )?; - level0[0] = level1_entry_addr.to_le(); - - level0.into() - }, - size, - })) + ) -> impl Init + 'a { + try_init!(Self { + size: data.len(), + data: SGTable::new(dev, data, DataDirection::ToDevice, GFP_KERNEL)?, + level2: { + let l2 = build_lvl(data)?; + SGTable::new(dev, l2, DataDirection::ToDevice, GFP_KERNEL)? + }, + level1: { + let l1 = build_lvl(level2)?; + SGTable::new(dev, l1, DataDirection::ToDevice, GFP_KERNEL)? + }, + level0: { + // Allocate the level 0 page table as a device-visible DMA object, and map the + // level 1 page table onto it. + + // Fill level 1 page entry. + let level1_entry = level1.iter().next().ok_or(EINVAL)?; + let level1_entry_addr = level1_entry.dma_address(); + + // Create level 0 page table data and fill its first entry with the level 1 + // table. + let mut level0 = CoherentBox::<'_, [u64]>::zeroed_slice( + dev, + GSP_PAGE_SIZE / size_of::(), + GFP_KERNEL, + )?; + level0[0] = level1_entry_addr.to_le(); + + level0.into() + }, }) } diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/boot.rs index 4fb1b69ac9d5..defe1f331918 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -40,7 +40,8 @@ pub(crate) fn boot( let dev = pdev.as_ref(); let hal = super::hal::gsp_hal(chipset); - let gsp_fw = KBox::pin_init(GspFirmware::new(dev, chipset), GFP_KERNEL)?; + // Initialize the firmware in place to limit stack usage during boot. + let gsp_fw = KBox::init(GspFirmware::new(dev, chipset), GFP_KERNEL)?; self.cmdq .send_command_no_wait(commands::SetSystemInfo::new(pdev, chipset))?; base-commit: 0504beeb95d1be229d7cce00a12033468f5ac50b -- 2.56.1