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 A2DEE3AD50D; Mon, 27 Apr 2026 22:14:14 +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=1777328054; cv=none; b=uq09KvAQoe3c0q9VFakLWUh7qO3DopYDLnsHeH2OxPQHeQGP42X0wruRMehspKJJNp3QAs82kxuGKxX+T8mHKrLUW4uDhZ3fpMqpkWgd2BEVaAMDH3INVJSvTECjr3zU0dLkty3I1q8AZRlxT3fPXqV+YJgez+E3sUP1D/mrrag= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777328054; c=relaxed/simple; bh=XiapHwreBkWCEuUnKNcDw0jpNWgyfgymZLeXPuHxqy0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kn0u5Qqabc4u9CBHPB7Y+yx2nvBksLsBbJlgVT8xrw6ORLbJILMR0hznvFK1PnbdcpUYz6fXvGkeZGNZX3zWvLIu496sNuDvft9ibqdbULJfxIy5dx0dt9a7PRWzjjHXCfNOjNkEFxfQfUWs76HUnADWZtj7lSxk73GmaIYF0hs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e5a52eLG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="e5a52eLG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A906C2BCB6; Mon, 27 Apr 2026 22:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777328054; bh=XiapHwreBkWCEuUnKNcDw0jpNWgyfgymZLeXPuHxqy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e5a52eLGli+O/acn0H7GNgrRvd2gsA94IDJ2pALf9WnLRw6E3MYqHMbmR2XMKX8Im SzMhCHVZiY9d9ALBdRxcor0owOPvX0R9KtpwuOhy+o1bTQOCmS/vLXwLZzizJO+i4J v7gRIwkHzDIsbar07FDbu4IuSvnxpJTDrPp1spnf/XsKL76ECGGg7GKhB8GbYhjrQC 9KNa16Md94CMpWFalQN3aNSj682XSMCeLjyixpPWnCLaK/8N82y9M6KSzcQ8qBHfpm 6vV+m/9qa0lu7OJRQCD3UfwHNBM10wB676tBWV0CIcoSx/y6wXMmD7BNRR9e5cItKb 5jQiGFny0S3LQ== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, acourbot@nvidia.com, aliceryhl@google.com, david.m.ertman@intel.com, ira.weiny@intel.com, leon@kernel.org, viresh.kumar@linaro.org, m.wilczynski@samsung.com, ukleinek@kernel.org, bhelgaas@google.com, kwilczynski@kernel.org, abdiel.janulgue@gmail.com, robin.murphy@arm.com, markus.probst@posteo.de, ojeda@kernel.org, boqun@kernel.org, gary@garyguo.net, bjorn3_gh@protonmail.com, lossin@kernel.org, a.hindborg@kernel.org, tmgross@umich.edu Cc: driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org, linux-pwm@vger.kernel.org, linux-pci@vger.kernel.org, rust-for-linux@vger.kernel.org, Danilo Krummrich Subject: [PATCH 20/24] samples: rust: rust_driver_pci: use HRT lifetime for Bar Date: Tue, 28 Apr 2026 00:11:18 +0200 Message-ID: <20260427221155.2144848-21-dakr@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260427221155.2144848-1-dakr@kernel.org> References: <20260427221155.2144848-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: rust-for-linux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert the sample driver to SampleDriver<'a>, taking advantage of the lifetime-parameterized Driver trait. The driver struct holds &'a pci::Device directly instead of ARef, and pci::Bar<'a> directly instead of Devres. This removes PinnedDrop, pin_init_scope, and runtime revocation checks on BAR access. Signed-off-by: Danilo Krummrich --- samples/rust/rust_driver_pci.rs | 89 +++++++++++++++------------------ 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/samples/rust/rust_driver_pci.rs b/samples/rust/rust_driver_pci.rs index 38d639731229..7f763f43a38d 100644 --- a/samples/rust/rust_driver_pci.rs +++ b/samples/rust/rust_driver_pci.rs @@ -9,7 +9,6 @@ Bound, Core, // }, - devres::Devres, io::{ register, register::Array, @@ -17,8 +16,7 @@ }, num::Bounded, pci, - prelude::*, - sync::aref::ARef, // + prelude::*, // }; mod regs { @@ -45,7 +43,7 @@ mod regs { pub(super) const END: usize = 0x10; } -type Bar0 = pci::Bar<'static, { regs::END }>; +type Bar0<'a> = pci::Bar<'a, { regs::END }>; #[derive(Copy, Clone, Debug)] struct TestIndex(u8); @@ -66,26 +64,24 @@ impl TestIndex { const NO_EVENTFD: Self = Self(0); } -#[pin_data(PinnedDrop)] -struct SampleDriver { - pdev: ARef, - #[pin] - bar: Devres, +struct SampleDriver<'a> { + pdev: &'a pci::Device, + bar: Bar0<'a>, index: TestIndex, } kernel::pci_device_table!( PCI_TABLE, MODULE_PCI_TABLE, - >::IdInfo, + as pci::Driver<'_>>::IdInfo, [( pci::DeviceId::from_id(pci::Vendor::REDHAT, 0x5), TestIndex::NO_EVENTFD )] ); -impl SampleDriver { - fn testdev(index: &TestIndex, bar: &Bar0) -> Result { +impl SampleDriver<'_> { + fn testdev(index: &TestIndex, bar: &Bar0<'_>) -> Result { // Select the test. bar.write_reg(regs::TEST::zeroed().with_index(*index)); @@ -138,7 +134,7 @@ fn config_space(pdev: &pci::Device) { } } -impl<'a> pci::Driver<'a> for SampleDriver { +impl<'a> pci::Driver<'a> for SampleDriver<'a> { type IdInfo = TestIndex; const ID_TABLE: pci::IdTable = &PCI_TABLE; @@ -147,54 +143,47 @@ fn probe( pdev: &'a pci::Device, info: &'a Self::IdInfo, ) -> impl PinInit + 'a { - pin_init::pin_init_scope(move || { - let vendor = pdev.vendor_id(); - dev_dbg!( - pdev, - "Probe Rust PCI driver sample (PCI ID: {}, 0x{:x}).\n", - vendor, - pdev.device_id() - ); - - pdev.enable_device_mem()?; - pdev.set_master(); - - Ok(try_pin_init!(Self { - bar: pdev.iomap_region_sized::<{ regs::END }>(0, c"rust_driver_pci")? - .into_devres()?, - index: *info, - _: { - let bar = bar.access(pdev.as_ref())?; - - dev_info!( - pdev, - "pci-testdev data-match count: {}\n", - Self::testdev(info, bar)? - ); - Self::config_space(pdev); - }, - pdev: pdev.into(), - })) + let vendor = pdev.vendor_id(); + dev_dbg!( + pdev, + "Probe Rust PCI driver sample (PCI ID: {}, 0x{:x}).\n", + vendor, + pdev.device_id() + ); + + pdev.enable_device_mem()?; + pdev.set_master(); + + let bar = pdev.iomap_region_sized::<{ regs::END }>(0, c"rust_driver_pci")?; + + dev_info!( + pdev, + "pci-testdev data-match count: {}\n", + Self::testdev(info, &bar)? + ); + Self::config_space(pdev); + + Ok(Self { + pdev, + bar, + index: *info, }) } - fn unbind(pdev: &'a pci::Device, this: Pin<&'a Self>) { - if let Ok(bar) = this.bar.access(pdev.as_ref()) { - // Reset pci-testdev by writing a new test index. - bar.write_reg(regs::TEST::zeroed().with_index(this.index)); - } + fn unbind(_pdev: &'a pci::Device, this: Pin<&'a Self>) { + this.bar + .write_reg(regs::TEST::zeroed().with_index(this.index)); } } -#[pinned_drop] -impl PinnedDrop for SampleDriver { - fn drop(self: Pin<&mut Self>) { +impl Drop for SampleDriver<'_> { + fn drop(&mut self) { dev_dbg!(self.pdev, "Remove Rust PCI driver sample.\n"); } } kernel::module_pci_driver! { - type: SampleDriver, + type: SampleDriver<'_>, name: "rust_driver_pci", authors: ["Danilo Krummrich"], description: "Rust PCI driver", -- 2.54.0