linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Danilo Krummrich" <dakr@kernel.org>
To: "John Hubbard" <jhubbard@nvidia.com>
Cc: "Alexandre Courbot" <acourbot@nvidia.com>,
	"Joel Fernandes" <joelagnelf@nvidia.com>,
	"Timur Tabi" <ttabi@nvidia.com>,
	"Alistair Popple" <apopple@nvidia.com>,
	"David Airlie" <airlied@gmail.com>,
	"Simona Vetter" <simona@ffwll.ch>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Krzysztof Wilczyński" <kwilczynski@kernel.org>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"Alex Gaynor" <alex.gaynor@gmail.com>,
	"Boqun Feng" <boqun.feng@gmail.com>,
	"Gary Guo" <gary@garyguo.net>,
	"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
	"Benno Lossin" <lossin@kernel.org>,
	"Andreas Hindborg" <a.hindborg@kernel.org>,
	"Alice Ryhl" <aliceryhl@google.com>,
	"Trevor Gross" <tmgross@umich.edu>,
	nouveau@lists.freedesktop.org, linux-pci@vger.kernel.org,
	rust-for-linux@vger.kernel.org,
	LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] gpu: nova-core: avoid probing non-display/compute PCI functions
Date: Thu, 14 Aug 2025 01:50:14 +0200	[thread overview]
Message-ID: <DC1PB630413R.33T95R794VWMC@kernel.org> (raw)
In-Reply-To: <20250813232859.224316-1-jhubbard@nvidia.com>

On Thu Aug 14, 2025 at 1:28 AM CEST, John Hubbard wrote:
> NovaCore 0000:c1:00.0: GPU instance built
> NovaCore 0000:c1:00.1: Probe Nova Core GPU driver.
> NovaCore 0000:c1:00.1: enabling device (0000 -> 0002)
> NovaCore 0000:c1:00.1: probe with driver NovaCore failed with error -22
> ...
> Bad IO access at port 0x0 ()
> WARNING: CPU: 26 PID: 748 at lib/iomap.c:45 pci_iounmap+0x3f/0x50
> ...
> <kernel::devres::Devres<kernel::pci::Bar<16777216>>>::devres_callback+0x2c/0x70 [nova_core]
> devres_release_all+0xa8/0xf0
> really_probe+0x30f/0x420
> __driver_probe_device+0x77/0xf0
> driver_probe_device+0x22/0x1b0
> __driver_attach+0x118/0x250
> bus_for_each_dev+0x105/0x130
> bus_add_driver+0x163/0x2a0
> driver_register+0x5d/0xf0
> init_module+0x6d/0x1000 [nova_core]
> do_one_initcall+0xde/0x380
> do_init_module+0x60/0x250
>
> ...and then:
> BUG: kernel NULL pointer dereference, address: 0000000000000538
> RIP: 0010:pci_release_region+0x10/0x60
> ...
> <kernel::devres::Devres<kernel::pci::Bar<16777216>>>::devres_callback+0x36/0x70 [nova_core]
> devres_release_all+0xa8/0xf0
> really_probe+0x30f/0x420
> __driver_probe_device+0x77/0xf0
> driver_probe_device+0x22/0x1b0
> __driver_attach+0x118/0x250
> bus_for_each_dev+0x105/0x130
> bus_add_driver+0x163/0x2a0
> driver_register+0x5d/0xf0
> init_module+0x6d/0x1000 [nova_core]
> do_one_initcall+0xde/0x380
> do_init_module+0x60/0x250

This is caused by a bug in Devres, which I already fixed in [1].

With the patch in [1] nova-core should gracefully fail probing for the
non-supported device classes as expected.

However, I think we still want to filter by PCI class, so the patch is fine in
general. :)

Few comments below.

[1] https://lore.kernel.org/lkml/20250812130928.11075-1-dakr@kernel.org/
>
> Signed-off-by: John Hubbard <jhubbard@nvidia.com>
> ---
>  drivers/gpu/nova-core/driver.rs | 13 +++++++++++++
>  rust/kernel/pci.rs              |  6 ++++++
>  2 files changed, 19 insertions(+)
>
> diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs
> index 274989ea1fb4..4e0e6f5338e9 100644
> --- a/drivers/gpu/nova-core/driver.rs
> +++ b/drivers/gpu/nova-core/driver.rs
> @@ -31,6 +31,19 @@ impl pci::Driver for NovaCore {
>      fn probe(pdev: &pci::Device<Core>, _info: &Self::IdInfo) -> Result<Pin<KBox<Self>>> {
>          dev_dbg!(pdev.as_ref(), "Probe Nova Core GPU driver.\n");
>  
> +        let class_code = pdev.class();
> +
> +        if class_code != bindings::PCI_CLASS_DISPLAY_VGA
> +            && class_code != bindings::PCI_CLASS_DISPLAY_3D

I think it would be nice if we could provide a Rust enum for PCI classes, such
that this could be pci::Class::DISPLAY_VGA instead.

Of course the same is true for PCI (sub)vendor, (sub)device IDs.

> +        {
> +            dev_dbg!(
> +                pdev.as_ref(),
> +                "Skipping non-display NVIDIA device with class 0x{:04x}\n",
> +                class_code
> +            );
> +            return Err(kernel::error::code::ENODEV);

With the prelude included you should be able to use ENODEV directly.

> +        }
> +
>          pdev.enable_device_mem()?;
>          pdev.set_master();
>  
> diff --git a/rust/kernel/pci.rs b/rust/kernel/pci.rs

Please split the PCI part up into a separate patch.

> index 887ee611b553..b6416fe7bdfd 100644
> --- a/rust/kernel/pci.rs
> +++ b/rust/kernel/pci.rs
> @@ -399,6 +399,12 @@ pub fn device_id(&self) -> u16 {
>          unsafe { (*self.as_raw()).device }
>      }
>  
> +    /// Returns the PCI class code (class and subclass).
> +    pub fn class(&self) -> u32 {
> +        // SAFETY: `self.as_raw` is a valid pointer to a `struct pci_dev`.
> +        unsafe { (*self.as_raw()).class >> 8 }
> +    }
> +
>      /// Returns the size of the given PCI bar resource.
>      pub fn resource_len(&self, bar: u32) -> Result<bindings::resource_size_t> {
>          if !Bar::index_is_valid(bar) {
>
> base-commit: dfc0f6373094dd88e1eaf76c44f2ff01b65db851
> -- 
> 2.50.1


  reply	other threads:[~2025-08-13 23:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-13 23:28 [PATCH] gpu: nova-core: avoid probing non-display/compute PCI functions John Hubbard
2025-08-13 23:50 ` Danilo Krummrich [this message]
2025-08-14  0:02   ` John Hubbard

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=DC1PB630413R.33T95R794VWMC@kernel.org \
    --to=dakr@kernel.org \
    --cc=a.hindborg@kernel.org \
    --cc=acourbot@nvidia.com \
    --cc=airlied@gmail.com \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=apopple@nvidia.com \
    --cc=bhelgaas@google.com \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=gary@garyguo.net \
    --cc=jhubbard@nvidia.com \
    --cc=joelagnelf@nvidia.com \
    --cc=kwilczynski@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lossin@kernel.org \
    --cc=nouveau@lists.freedesktop.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=simona@ffwll.ch \
    --cc=tmgross@umich.edu \
    --cc=ttabi@nvidia.com \
    /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;
as well as URLs for NNTP newsgroup(s).