PCI: Provide pci_free_irq_vectors() for CONFIG_PCI=n
PATCH 1/1 PCI: Provide pci_free_irq_vectors() for CONFIG_PCI=n
Commit 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled") fixed a build error by providing rust helpers when CONFIG_PCI_MSI=n. However the rust helpers rely on the pci_alloc_irq_vectors() function is defined, which is not true when CONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling of pci_alloc_irq_vectors() since it's empty when CONFIG_PCI_MSI=n anyway. However, since PCI irq APIs, such as pci_alloc_irq_vectors(), are already defined even when CONFIG_PCI=n, the more reasonable fix is to define pci_alloc_irq_vectors() when CONFIG_PCI=n and this aligns with the situations of other primitives as well.
---
I hit a build error without this:
../rust/helpers/pci.c:36:2: error: call to undeclared function 'pci_free_irq_vectors'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
36 | pci_free_irq_vectors(dev);
| ^
../rust/helpers/pci.c:36:2: note: did you mean 'pci_alloc_irq_vectors'?
../include/linux/pci.h:2208:1: note: 'pci_alloc_irq_vectors' declared here
2208 | pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs,
| ^1 error generated.
when ./tools/testing/kunit/kunit.py run --make_options LLVM=1 --arch arm64 --kconfig_add CONFIG_RUST=y rust_doctests_kernel
include/linux/pci.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/pci.h +4 -0
@@ -2210,6 +2210,10 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, {return -ENOSPC ; } + +static inline void pci_free_irq_vectors (struct pci_dev *dev) +{ +}#endif /* CONFIG_PCI */ /* Include architecture-dependent settings and functions */
Signature · 1 line
2.51.0
Quoted 12 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.
Quoted 2 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>
Bjorn, I assume you will pick this up? Otherwise I can pick it up as well, I will likely send a -fixes PR for -rc2 anyways.
Quoted 49 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>---
I hit a build error without this:
../rust/helpers/pci.c:36:2: error: call to undeclared function 'pci_free_irq_vectors'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]36 | pci_free_irq_vectors(dev); | ^ ../rust/helpers/pci.c:36:2: note: did you mean 'pci_alloc_irq_vectors'? ../include/linux/pci.h:2208:1: note: 'pci_alloc_irq_vectors' declared here 2208 | pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, | ^1 error generated.
when
./tools/testing/kunit/kunit.pyrun --make_options LLVM=1 --arch arm64 --kconfig_addCONFIG_RUST=yrust_doctests_kernelinclude/linux/pci.h | 4 ++++ 1 file changed, 4 insertions(+)include/linux/pci.h +4
-0@@ -2210,6 +2210,10 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, {return -ENOSPC ; } + +static inline void pci_free_irq_vectors (struct pci_dev *dev) +{ +}#endif /* CONFIG_PCI */ /* Include architecture-dependent settings and functions */ Signature · 1 line
2.51.0
Thanks for the fix. I ran into this when building next-20251217 for a machine without PCIe and was happy to find this on lore.
Drew
Quoted 13 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.
Quoted 3 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>---
Thanks very much!
Cheers,
-- David
Quoted 12 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.
Quoted 2 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>
Quoted 13 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.
Quoted 2 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>
Related: https://lore.kernel.org/rust-for-linux/[email protected]/
I guess it counts as a report, so we may want a Reported-by (Cc'ing Tomo).
Cheers,
Miguel
Quoted 14 lines · On Thu, 25 Dec 2025 10:10:04 +0100 Miguel Ojeda…
Quoted 13 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.
Quoted 6 lines
Quoted 2 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>Related: https://lore.kernel.org/rust-for-linux/[email protected]/
I guess it counts as a report, so we may want a Reported-by (Cc'ing Tomo).
Since pci.rs is only compiled when CONFIG_PCI is enabled. So it seems consistent to treat the PCI helpers the same way. That said, this approach is also fine by me: it's already inconsistent that pci_alloc_irq_vectors() has a stuf definition, while pci_free_irq_vectors does not.
Quoted 22 lines · FUJITA Tomonori
Quoted 19 lines · On Thu, 25 Dec 2025 10:10:04 +0100 Miguel Ojeda…
Quoted 13 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.Quoted 2 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>Related: https://lore.kernel.org/rust-for-linux/[email protected]/
Quoted 7 lines
Quoted 1 line
I guess it counts as a report, so we may want a Reported-by (Cc'ing Tomo).
Since
pci.rsis only compiled whenCONFIG_PCIis enabled. So it seems consistent to treat the PCI helpers the same way. That said, this approach is also fine by me: it's already inconsistent thatpci_alloc_irq_vectors()has a stuf definition, whilepci_free_irq_vectorsdoes not.
Yes, I think providing a stub pci_free_irq_vectors() is the way to go. If you are OK with it, I could send a v2 with your and Liang Jie's Reported-by. Alternatively, since you're the first one sending the fix, and I would have replied that with the suggestion if I didn't miss that, feel free to send a v2 (providing the stub pci_free_irq_vectors()) from you ;-)
Regards,
Boqun
Quoted 31 lines · On Thu, 25 Dec 2025 18:19:08 +0800 Boqun Feng <[email protected]> wrote:
Quoted 22 lines · FUJITA Tomonori
Quoted 19 lines · On Thu, 25 Dec 2025 10:10:04 +0100 Miguel Ojeda…
Quoted 13 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.Quoted 2 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>Related: https://lore.kernel.org/rust-for-linux/[email protected]/
Quoted 7 lines
Quoted 1 line
I guess it counts as a report, so we may want a Reported-by (Cc'ing Tomo).
Since
pci.rsis only compiled whenCONFIG_PCIis enabled. So it seems consistent to treat the PCI helpers the same way. That said, this approach is also fine by me: it's already inconsistent thatpci_alloc_irq_vectors()has a stuf definition, whilepci_free_irq_vectorsdoes not.
Quoted 3 lines
Yes, I think providing a stub
pci_free_irq_vectors()is the way to go. If you are OK with it, I could send a v2 with your and Liang Jie's Reported-by.
It works for me. Please go ahead.
Quoted 14 lines · Miguel Ojeda
Quoted 13 lines · Boqun Feng
Commit
473b9f331718("rust: pci: fix build failure whenCONFIG_PCI_MSIis disabled") fixed a build error by providing rust helpers whenCONFIG_PCI_MSI=n. However the rust helpers rely on thepci_alloc_irq_vectors()function is defined, which is not true whenCONFIG_PCI=n. There are multiple ways to fix this, e.g. a possible fix could be just remove the calling ofpci_alloc_irq_vectors()since it's empty whenCONFIG_PCI_MSI=nanyway. However, since PCI irq APIs, such aspci_alloc_irq_vectors(), are already defined even whenCONFIG_PCI=n, the more reasonable fix is to definepci_alloc_irq_vectors()whenCONFIG_PCI=nand this aligns with the situations of other primitives as well.
Quoted 5 lines
Quoted 2 lines
Fixes 473b9f331718 ("rust: pci: fix build failure when CONFIG_PCI_MSI is disabled")Signed-off-by Boqun Feng <[email protected]>Related: https://lore.kernel.org/rust-for-linux/[email protected]/
Thanks! I was missing that, and I should have replied Tomo's patch.
Quoted 2 lines
I guess it counts as a report, so we may want a Reported-by (Cc'ing Tomo).
Tomo, how do you feel about two fix approaches? I think providing dummy pci_free_irq_vectors() is better because it's easier and aligned with other pci_*() APIs.
Regards,
Boqun
Quoted 2 lines
Cheers,
Miguel