From: Zhi Wang <zhiw@nvidia.com>
To: <dakr@kernel.org>, <acourbot@nvidia.com>, <kvm@vger.kernel.org>,
<rust-for-linux@vger.kernel.org>, <nova-gpu@lists.linux.dev>,
<linux-pci@vger.kernel.org>
Cc: alex@shazbot.org, jgg@nvidia.com, yishaih@nvidia.com,
skolothumtho@nvidia.com, kevin.tian@intel.com, airlied@gmail.com,
simona@ffwll.ch, ojeda@kernel.org, alex.gaynor@gmail.com,
boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com,
lossin@kernel.org, a.hindborg@kernel.org, aliceryhl@google.com,
tmgross@umich.edu, jhubbard@nvidia.com, ecourtney@nvidia.com,
cjia@nvidia.com, smitra@nvidia.com, kjaju@nvidia.com,
alkumar@nvidia.com, ankita@nvidia.com, aniketa@nvidia.com,
kwankhede@nvidia.com, targupta@nvidia.com,
linux-kernel@vger.kernel.org, zhiwang@kernel.org,
"Zhi Wang" <zhiw@nvidia.com>, "Boqun Feng" <boqun@kernel.org>,
"Daniel Almeida" <daniel.almeida@collabora.com>,
"Tamir Duberstein" <tamird@kernel.org>,
"Onur Özkan" <work@onurozkan.dev>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Bjorn Helgaas" <bhelgaas@google.com>,
"Krzysztof Wilczyński" <kwilczynski@kernel.org>,
dri-devel@lists.freedesktop.org,
"Peter Colberg" <peter@colberg.org>,
"Simon Song" <xinmengs@nvidia.com>
Subject: [PATCH 6/7] gpu: nova-core: publish typed SR-IOV PF APIs
Date: Wed, 30 Sep 2026 13:57:48 +0300 [thread overview]
Message-ID: <9babc6d915ed154e90b25de79b02bb74cd1fa971.1790764573.git.zhiw@nvidia.com> (raw)
In-Reply-To: <cover.1790764573.git.zhiw@nvidia.com>
Register NovaCoreVfApi as typed SR-IOV PF data once the GPU is initialized.
Enable and disable VFs through sriov_configure(). The Rust PCI adapter
removes VFs before dropping PF driver data. Declare the registration
before the GPU so its borrowed services remain valid through VF teardown.
Expose a VF-side handle that borrows these services for each operation.
Return an owned instance on open and close it on drop while the VF
remains bound.
Signed-off-by: Zhi Wang <zhiw@nvidia.com>
---
drivers/gpu/nova-core/driver.rs | 47 +++++++++++++++
drivers/gpu/nova-core/nova_core.rs | 2 +
drivers/gpu/nova-core/vgpu/vgpu_api.rs | 82 +++++++++++++++++++++++++-
3 files changed, 130 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs
index dc6febeee656..99beab189879 100644
--- a/drivers/gpu/nova-core/driver.rs
+++ b/drivers/gpu/nova-core/driver.rs
@@ -35,6 +35,12 @@
}, //
};
+#[cfg(CONFIG_PCI_IOV)]
+use kernel::types::ForLt;
+
+#[cfg(CONFIG_PCI_IOV)]
+use crate::vgpu::vgpu_api::NovaCoreVfApi;
+
/// Counter for generating unique auxiliary device IDs.
static AUXILIARY_ID_COUNTER: Atomic<u32> = Atomic::new(0);
@@ -42,6 +48,10 @@
pub(crate) struct NovaCore<'bound> {
/// Firmware-control registration.
_fwctl: fwctl::Registration<'bound, NovaCoreFwCtl>,
+ #[cfg(CONFIG_PCI_IOV)]
+ #[allow(clippy::type_complexity)]
+ #[pin]
+ _vf_registration: pci::VfRegistration<'bound, ForLt!(NovaCoreVfApi<'_>)>,
#[pin]
pub(crate) gpu: Gpu<'bound>,
bar: pci::Bar<'bound, BAR0_SIZE>,
@@ -114,6 +124,11 @@ fn probe<'bound>(
pin_init::pin_init_scope(move || {
dev_dbg!(pdev, "Probe Nova Core GPU driver.\n");
+ #[cfg(CONFIG_PCI_IOV)]
+ if pdev.is_virtfn() {
+ return Err(ENODEV);
+ }
+
pdev.enable_device_mem()?;
pdev.set_master();
@@ -144,6 +159,18 @@ fn probe<'bound>(
// Run optional GPU selftests.
#[cfg(CONFIG_NOVA_CORE_SELFTESTS)]
_: { gpu.run_selftests(pdev) },
+ #[cfg(CONFIG_PCI_IOV)]
+ _vf_registration <- {
+ // SAFETY: `gpu` is initialized at its pinned address and
+ // outlives the registration and its borrowed API data.
+ let gpu = unsafe { &(*this.as_ptr()).gpu };
+ let api = NovaCoreVfApi::new(gpu, pdev);
+ // SAFETY: Probe has exclusive access to the registration
+ // slot and no VFs are enabled before successful probe. The
+ // registration keeps PF services available until VF removal
+ // completes and is dropped before its borrowed GPU resources.
+ unsafe { pci::VfRegistration::new(pdev, Ok(api)) }
+ },
_reg: auxiliary::Registration::new(
pdev.as_ref(),
c"nova-drm",
@@ -176,4 +203,24 @@ fn probe<'bound>(
}))
})
}
+
+ #[cfg(CONFIG_PCI_IOV)]
+ fn sriov_enable<'bound, 'callback>(
+ _dev: &'bound pci::Device<Core<'_>>,
+ _this: Pin<&Self::Data<'bound>>,
+ token: pci::SriovEnable<'callback>,
+ ) -> Result<pci::SriovEnabled<'callback>> {
+ let num_vfs = token.num_vfs();
+ token.enable(num_vfs)
+ }
+
+ #[cfg(CONFIG_PCI_IOV)]
+ fn sriov_disable<'bound>(
+ _dev: &'bound pci::Device<Core<'_>>,
+ _this: Pin<&Self::Data<'bound>>,
+ token: pci::SriovDisable<'_>,
+ ) -> Result {
+ token.disable();
+ Ok(())
+ }
}
diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nova_core.rs
index 619f32c79415..ee511bdf3544 100644
--- a/drivers/gpu/nova-core/nova_core.rs
+++ b/drivers/gpu/nova-core/nova_core.rs
@@ -33,6 +33,8 @@
#[cfg(CONFIG_PCI_IOV)]
pub use vgpu::vgpu_api::{
NovaCoreVfApi,
+ NovaCoreVfApiHandle,
+ VgpuInstance,
VgpuTypeInfo, //
};
diff --git a/drivers/gpu/nova-core/vgpu/vgpu_api.rs b/drivers/gpu/nova-core/vgpu/vgpu_api.rs
index f9f3e527bdc0..a440108d2c26 100644
--- a/drivers/gpu/nova-core/vgpu/vgpu_api.rs
+++ b/drivers/gpu/nova-core/vgpu/vgpu_api.rs
@@ -11,6 +11,9 @@
prelude::*, //
};
+#[cfg(CONFIG_PCI_IOV)]
+use kernel::types::ForLt;
+
use crate::{
driver::Bar0,
gpu::Gpu,
@@ -61,7 +64,6 @@ pub struct NovaCoreVfApi<'gpu> {
}
impl<'gpu> NovaCoreVfApi<'gpu> {
- #[expect(dead_code)]
pub(crate) fn new(gpu: &'gpu Gpu<'gpu>, pdev: &'gpu pci::Device<device::Bound>) -> Self {
Self {
pdev,
@@ -84,6 +86,20 @@ fn gfid(&self, gfid: u32) -> Result<Gfid> {
}
impl NovaCoreVfApi<'_> {
+ /// Obtains the enabled PF services for a bound VF.
+ #[cfg(CONFIG_PCI_IOV)]
+ pub fn handle(vf: &pci::Device<device::Bound>) -> Result<NovaCoreVfApiHandle<'_>> {
+ let handle = NovaCoreVfApiHandle { vf };
+ handle.with(|api| {
+ if api.is_available() {
+ Ok(())
+ } else {
+ Err(ENODEV)
+ }
+ })?;
+ Ok(handle)
+ }
+
/// Creates and boots an instance for a one-based VF ID.
///
/// `sbdf` encodes the VF address as `(segment << 16) | (bus << 8) | devfn`.
@@ -156,3 +172,67 @@ pub fn reset_instance(&self, gfid: u32) -> Result {
Ok(())
}
}
+
+/// Access to PF services for the lifetime of a VF driver binding.
+///
+/// The PF's registration keeps these services available until VF removal
+/// completes and is dropped before the GPU resources they borrow.
+#[cfg(CONFIG_PCI_IOV)]
+pub struct NovaCoreVfApiHandle<'vf> {
+ vf: &'vf pci::Device<device::Bound>,
+}
+
+#[cfg(CONFIG_PCI_IOV)]
+impl<'vf> NovaCoreVfApiHandle<'vf> {
+ /// Borrows the typed PF services for a single operation.
+ fn with<R>(
+ &self,
+ f: impl for<'borrow, 'data> FnOnce(Pin<&'borrow NovaCoreVfApi<'data>>) -> Result<R>,
+ ) -> Result<R> {
+ self.vf
+ .vf_registration_data_with::<ForLt!(NovaCoreVfApi<'_>), _>(f)?
+ }
+
+ /// Creates and boots an instance that closes when dropped.
+ ///
+ /// The arguments have the same meaning as in [`NovaCoreVfApi::open_instance`].
+ pub fn open(&self, gfid: u32, dbdf: u32, vm_pid: u32) -> Result<VgpuInstance<'vf>> {
+ let type_info = self.with(|api| api.open_instance(gfid, dbdf, vm_pid))?;
+ Ok(VgpuInstance {
+ api: Self { vf: self.vf },
+ gfid,
+ type_info,
+ })
+ }
+
+ /// Resets an active instance and scrubs its guest VRAM.
+ pub fn reset(&self, gfid: u32) -> Result {
+ self.with(|api| api.reset_instance(gfid))
+ }
+}
+
+/// An active instance whose teardown runs while its VF driver remains bound.
+///
+/// Dropping this guard may sleep while firmware teardown completes.
+#[cfg(CONFIG_PCI_IOV)]
+pub struct VgpuInstance<'vf> {
+ api: NovaCoreVfApiHandle<'vf>,
+ gfid: u32,
+ type_info: VgpuTypeInfo,
+}
+
+#[cfg(CONFIG_PCI_IOV)]
+impl VgpuInstance<'_> {
+ /// Returns the assigned PCI IDs and BAR1 aperture size.
+ #[inline]
+ pub fn type_info(&self) -> &VgpuTypeInfo {
+ &self.type_info
+ }
+}
+
+#[cfg(CONFIG_PCI_IOV)]
+impl Drop for VgpuInstance<'_> {
+ fn drop(&mut self) {
+ let _ = self.api.with(|api| api.close_instance(self.gfid));
+ }
+}
--
2.53.0
next prev parent reply other threads:[~2026-09-30 10:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 10:57 [PATCH 0/7] Rust VFIO PCI support and NVIDIA vGPU driver Zhi Wang
2026-09-30 10:57 ` [PATCH 1/7] rust: pci: add VFIO override device IDs Zhi Wang
2026-09-30 10:57 ` [PATCH 2/7] rust: pci: expose the VF index within its PF Zhi Wang
2026-09-30 15:48 ` Danilo Krummrich
2026-09-30 10:57 ` [PATCH 3/7] rust: pci: allow drivers to manage DMA ownership Zhi Wang
2026-09-30 10:57 ` [PATCH 4/7] rust: vfio: add PCI variant driver abstractions Zhi Wang
2026-09-30 10:57 ` [PATCH 5/7] rust: vfio: separate common device handling from PCI Zhi Wang
2026-09-30 10:57 ` Zhi Wang [this message]
2026-09-30 10:57 ` [PATCH 7/7] vfio/nvidia-vgpu: add the Rust VFIO variant driver Zhi Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9babc6d915ed154e90b25de79b02bb74cd1fa971.1790764573.git.zhiw@nvidia.com \
--to=zhiw@nvidia.com \
--cc=a.hindborg@kernel.org \
--cc=acourbot@nvidia.com \
--cc=airlied@gmail.com \
--cc=alex.gaynor@gmail.com \
--cc=alex@shazbot.org \
--cc=aliceryhl@google.com \
--cc=alkumar@nvidia.com \
--cc=aniketa@nvidia.com \
--cc=ankita@nvidia.com \
--cc=bhelgaas@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=boqun@kernel.org \
--cc=cjia@nvidia.com \
--cc=dakr@kernel.org \
--cc=daniel.almeida@collabora.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=ecourtney@nvidia.com \
--cc=gary@garyguo.net \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=jhubbard@nvidia.com \
--cc=kevin.tian@intel.com \
--cc=kjaju@nvidia.com \
--cc=kvm@vger.kernel.org \
--cc=kwankhede@nvidia.com \
--cc=kwilczynski@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lossin@kernel.org \
--cc=nova-gpu@lists.linux.dev \
--cc=ojeda@kernel.org \
--cc=peter@colberg.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=simona@ffwll.ch \
--cc=skolothumtho@nvidia.com \
--cc=smitra@nvidia.com \
--cc=tamird@kernel.org \
--cc=targupta@nvidia.com \
--cc=tmgross@umich.edu \
--cc=work@onurozkan.dev \
--cc=xinmengs@nvidia.com \
--cc=yishaih@nvidia.com \
--cc=zhiwang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®