Add pci_dev_for_each_resource() helper and update users
Subsystems (16)
v8 cover Add pci_dev_for_each_resource() helper and update users
Provide two new helper macros to iterate over PCI device resources and convert users.
Looking at it, refactor existing pci_bus_for_each_resource() and convert users accordingly.
Note, the amount of lines grew due to the documentation update.
Changelog v8:
- fixed issue with pci_bus_for_each_resource() macro (LKP)
- due to above added a new patch to document how it works
- moved the last patch to be #2 (Philippe)
- added tags (Philippe)
Changelog v7:
- made both macros to share same name (Bjorn)
- split out the pci_resource_n() conversion (Bjorn)
Changelog v6:
- dropped unused variable in PPC code (LKP)
Changelog v5:
- renamed loop variable to minimize the clash (Keith)
- addressed smatch warning (Dan)
- addressed 0-day bot findings (LKP)
Changelog v4:
- rebased on top of v6.3-rc1
- added tag (Krzysztof)
Changelog v3:
- rebased on top of v2 by Mika, see above
- added tag to pcmcia patch (Dominik)
Changelog v2:
- refactor to have two macros
- refactor existing pci_bus_for_each_resource() in the same way and convert users
Andy Shevchenko (6):
kernel.h: Split out COUNT_ARGS() and CONCATENATE()
PCI: Introduce pci_resource_n()
PCI: Document pci_bus_for_each_resource() to avoid confusion
PCI: Allow pci_bus_for_each_resource() to take less arguments
EISA: Convert to use less arguments in pci_bus_for_each_resource()
pcmcia: Convert to use less arguments in pci_bus_for_each_resource()
Mika Westerberg (1):
PCI: Introduce pci_dev_for_each_resource()
.clang-format | 1 + arch/alpha/kernel/pci.c | 5 +- arch/arm/kernel/bios32.c | 16 +++-- arch/arm/mach-dove/pcie.c | 10 ++-- arch/arm/mach-mv78xx0/pcie.c | 10 ++-- arch/arm/mach-orion5x/pci.c | 10 ++-- arch/mips/pci/ops-bcm63xx.c | 8 +-- arch/mips/pci/pci-legacy.c | 3 +- arch/powerpc/kernel/pci-common.c | 21 +++---- arch/powerpc/platforms/4xx/pci.c | 8 +-- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 +- arch/powerpc/platforms/pseries/pci.c | 16 ++--- arch/sh/drivers/pci/pcie-sh7786.c | 10 ++-- arch/sparc/kernel/leon_pci.c | 5 +- arch/sparc/kernel/pci.c | 10 ++-- arch/sparc/kernel/pcic.c | 5 +- drivers/eisa/pci_eisa.c | 4 +- drivers/pci/bus.c | 7 +-- drivers/pci/hotplug/shpchp_sysfs.c | 8 +-- drivers/pci/pci.c | 3 +- drivers/pci/probe.c | 2 +- drivers/pci/remove.c | 5 +- drivers/pci/setup-bus.c | 37 +++++------- drivers/pci/setup-res.c | 4 +- drivers/pci/vgaarb.c | 17 ++---- drivers/pci/xen-pcifront.c | 4 +- drivers/pcmcia/rsrc_nonstatic.c | 9 +-- drivers/pcmcia/yenta_socket.c | 3 +- drivers/pnp/quirks.c | 29 ++++----- include/linux/args.h | 13 ++++ include/linux/kernel.h | 8 +-- include/linux/pci.h | 72 +++++++++++++++++++---- 32 files changed, 190 insertions(+), 178 deletions(-) create mode 100644 include/linux/args.h
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v8 1/7 kernel.h: Split out COUNT_ARGS() and CONCATENATE()
kernel.h is being used as a dump for all kinds of stuff for a long time. The COUNT_ARGS() and CONCATENATE() macros may be used in some places without need of the full kernel.h dependency train with it.
Here is the attempt on cleaning it up by splitting out these macros().
--- include/linux/args.h | 13 +++++++++++++ include/linux/kernel.h | 8 +------- 2 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 include/linux/args.h
include/linux/args.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_ARGS_H +#define _LINUX_ARGS_H + +/* This counts to 12. Any more, it will return 13th argument. */ +#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n +#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) + +#define __CONCAT (a, b) a ## b +#define CONCATENATE (a, b) __CONCAT(a, b) + +#endif /* _LINUX_ARGS_H */
include/linux/kernel.h +1 -7
@@ -13,6 +13,7 @@#include <linux/stdarg.h> #include <linux/align.h> +#include <linux/args.h> #include <linux/limits.h> #include <linux/linkage.h> #include <linux/stddef.h>
@@ -457,13 +458,6 @@ ftrace_vprintk(const char *fmt, va_list ap)static inline void ftrace_dump (enum ftrace_dump_mode oops_dump_mode) { }#endif /* CONFIG_TRACING */ -/* This counts to 12. Any more, it will return 13th argument. */ -#define __COUNT_ARGS(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _n, X...) _n -#define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) - -#define __CONCAT (a, b) a ## b -#define CONCATENATE (a, b) __CONCAT(a, b) -/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */ #ifdef CONFIG_FTRACE_MCOUNT_RECORD # define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v8 2/7 PCI: Introduce pci_resource_n()
In reply to Andy ShevchenkoIntroduce pci_resource_n() and replace open-coded implementations of it in pci.h.
--- include/linux/pci.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
include/linux/pci.h +7 -8
@@ -1995,14 +1995,13 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma);* These helpers provide future and backwards compatibility * for accessing popular PCI BAR info */ -#define pci_resource_start (dev, bar) ((dev)->resource[(bar)].start) -#define pci_resource_end (dev, bar) ((dev)->resource[(bar)].end) -#define pci_resource_flags (dev, bar) ((dev)->resource[(bar)].flags) -#define pci_resource_len (dev,bar) \ - ((pci_resource_end((dev), (bar)) == 0) ? 0 : \ - \ - (pci_resource_end((dev), (bar)) - \ - pci_resource_start((dev), (bar)) + 1)) +#define pci_resource_n (dev, bar) (&(dev)->resource[(bar)]) +#define pci_resource_start (dev, bar) (pci_resource_n(dev, bar)->start) +#define pci_resource_end (dev, bar) (pci_resource_n(dev, bar)->end) +#define pci_resource_flags (dev, bar) (pci_resource_n(dev, bar)->flags) +#define pci_resource_len (dev,bar) \ + (pci_resource_end((dev), (bar)) ? \ + resource_size(pci_resource_n((dev), (bar))) : 0)/* * Similar to the helpers above, these manipulate per-pci_dev
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v8 3/7 PCI: Introduce pci_dev_for_each_resource()
In reply to Andy ShevchenkoFrom: Mika Westerberg <[email protected]>
Instead of open-coding it everywhere introduce a tiny helper that can be used to iterate over each resource of a PCI device, and convert the most obvious users into it.
While at it drop doubled empty line before pdev_sort_resources().
No functional changes intended.
--- .clang-format | 1 + arch/alpha/kernel/pci.c | 5 ++-- arch/arm/kernel/bios32.c | 16 ++++++------- arch/arm/mach-dove/pcie.c | 10 ++++---- arch/arm/mach-mv78xx0/pcie.c | 10 ++++---- arch/arm/mach-orion5x/pci.c | 10 ++++---- arch/mips/pci/ops-bcm63xx.c | 8 +++---- arch/mips/pci/pci-legacy.c | 3 +-- arch/powerpc/kernel/pci-common.c | 21 ++++++++-------- arch/powerpc/platforms/4xx/pci.c | 8 +++---- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 ++-- arch/powerpc/platforms/pseries/pci.c | 16 ++++++------- arch/sh/drivers/pci/pcie-sh7786.c | 10 ++++---- arch/sparc/kernel/leon_pci.c | 5 ++-- arch/sparc/kernel/pci.c | 10 ++++---- arch/sparc/kernel/pcic.c | 5 ++-- drivers/pci/remove.c | 5 ++-- drivers/pci/setup-bus.c | 27 ++++++++------------- drivers/pci/setup-res.c | 4 +--- drivers/pci/vgaarb.c | 17 ++++--------- drivers/pci/xen-pcifront.c | 4 +--- drivers/pnp/quirks.c | 29 ++++++++--------------- include/linux/pci.h | 15 ++++++++++++ 23 files changed, 112 insertions(+), 132 deletions(-)
.clang-format +1 -0
@@ -520,6 +520,7 @@ ForEachMacros: - 'of_property_for_each_string' - 'of_property_for_each_u32' - 'pci_bus_for_each_resource' + - 'pci_dev_for_each_resource' - 'pci_doe_for_each_off' - 'pcl_for_each_chunk' - 'pcl_for_each_segment'
arch/alpha/kernel/pci.c +2 -3
@@ -288,11 +288,10 @@ pcibios_claim_one_bus(struct pci_bus *b)struct pci_bus *child_bus;list_for_each_entry (dev, &b->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (r->parent || !r->start || !r->flags)continue ; if (pci_has_flag(PCI_PROBE_ONLY) ||
arch/arm/kernel/bios32.c +7 -9
@@ -142,15 +142,15 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_WINBOND2, PCI_DEVICE_ID_WINBOND2_89C940F,*/ static void pci_fixup_dec21285 (struct pci_dev *dev) { -int i; -if (dev->devfn ==0 ) { +struct resource *r; + dev->class &=0xff ; dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { - dev->resource[i].start =0 ; - dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r) { + r->start =0 ; + r->end =0 ; + r->flags =0 ; } } }
@@ -162,13 +162,11 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_DEC_21285, pci_fixup_dstatic void pci_fixup_ide_bases (struct pci_dev *dev) {struct resource *r; -int i;if ((dev->class >>8 ) !=PCI_CLASS_STORAGE_IDE )return ; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { - r = dev->resource + i; +pci_dev_for_each_resource (dev, r) {if ((r->start & ~0x80 ) ==0x374 ) { r->start |=2 ; r->end = r->start;
arch/arm/mach-dove/pcie.c +5 -5
@@ -142,14 +142,14 @@ static struct pci_ops pcie_ops = {static void rc_pci_fixup (struct pci_dev *dev) {if (dev->bus->parent ==NULL && dev->devfn ==0 ) { -int i; +struct resource *r; dev->class &=0xff ; dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ; -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { - dev->resource[i].start =0 ; - dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r) { + r->start =0 ; + r->end =0 ; + r->flags =0 ; } } }
arch/arm/mach-mv78xx0/pcie.c +5 -5
@@ -186,14 +186,14 @@ static struct pci_ops pcie_ops = {static void rc_pci_fixup (struct pci_dev *dev) {if (dev->bus->parent ==NULL && dev->devfn ==0 ) { -int i; +struct resource *r; dev->class &=0xff ; dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ; -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { - dev->resource[i].start =0 ; - dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r) { + r->start =0 ; + r->end =0 ; + r->flags =0 ; } } }
arch/arm/mach-orion5x/pci.c +5 -5
@@ -522,14 +522,14 @@ static int __init pci_setup(struct pci_sys_data *sys)static void rc_pci_fixup (struct pci_dev *dev) {if (dev->bus->parent ==NULL && dev->devfn ==0 ) { -int i; +struct resource *r; dev->class &=0xff ; dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ; -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { - dev->resource[i].start =0 ; - dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r) { + r->start =0 ; + r->end =0 ; + r->flags =0 ; } } }
arch/mips/pci/ops-bcm63xx.c +4 -4
@@ -413,18 +413,18 @@ struct pci_ops bcm63xx_cb_ops = {static void bcm63xx_fixup (struct pci_dev *dev) {static int io_window =-1 ; -int i, found, new_io_window; +int found, new_io_window; +struct resource *r;u32 val;/* look for any io resource */ found =0 ; -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { -if (pci_resource_flags (dev, i) &IORESOURCE_IO ) { +pci_dev_for_each_resource (dev, r) { +if (resource_type (r) ==IORESOURCE_IO ) { found =1 ;break ; } } -if (!found)return ;
arch/mips/pci/pci-legacy.c +1 -2
@@ -249,12 +249,11 @@ static int pcibios_enable_resources(struct pci_dev *dev, int mask)pci_read_config_word (dev,PCI_COMMAND , &cmd); old_cmd = cmd; -for (idx =0 ; idx <PCI_NUM_RESOURCES ; idx++) { +pci_dev_for_each_resource (dev, r, idx) {/* Only set up the requested stuff */ if (!(mask & (1 <<idx)))continue ; - r = &dev->resource[idx];if (!(r->flags & (IORESOURCE_IO |IORESOURCE_MEM )))continue ; if ((idx == PCI_ROM_RESOURCE) &&
arch/powerpc/kernel/pci-common.c +11 -10
@@ -880,6 +880,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)static void pcibios_fixup_resources (struct pci_dev *dev) {struct pci_controller *hose =pci_bus_to_host (dev->bus); +struct resource *res;int i;if (!hose) {
@@ -891,9 +892,9 @@ static void pcibios_fixup_resources(struct pci_dev *dev)if (dev->is_virtfn)return ; -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { -struct resource *res = dev->resource + i; +pci_dev_for_each_resource (dev, res, i) {struct pci_bus_region reg; +if (!res->flags)continue ;
@@ -1452,11 +1453,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus)struct pci_bus *child_bus;list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (r->parent || !r->start || !r->flags)continue ;
@@ -1705,19 +1705,20 @@ EXPORT_SYMBOL_GPL(pcibios_scan_phb);static void fixup_hide_host_resource_fsl (struct pci_dev *dev) { -int i, class = dev->class >>8 ; +int class = dev->class >>8 ;/* When configured as agent, programming interface = 1 */ int prog_if = dev->class &0xf ; +struct resource *r;if ((class ==PCI_CLASS_PROCESSOR_POWERPC || class ==PCI_CLASS_BRIDGE_OTHER ) && (dev->hdr_type ==PCI_HEADER_TYPE_NORMAL ) && (prog_if ==0 ) && (dev->bus->parent ==NULL )) { -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { - dev->resource[i].start =0 ; - dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r) { + r->start =0 ; + r->end =0 ; + r->flags =0 ; } } }
arch/powerpc/platforms/4xx/pci.c +4 -4
@@ -57,7 +57,7 @@ static inline int ppc440spe_revA(void)static void fixup_ppc4xx_pci_bridge (struct pci_dev *dev) {struct pci_controller *hose; -int i; +struct resource *r;if (dev->devfn !=0 || dev->bus->self !=NULL )return ;
@@ -79,9 +79,9 @@ static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev)/* Hide the PCI host BARs from the kernel as their content doesn't * fit well in the resource management */ -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { - dev->resource[i].start = dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r) { + r->start = r->end =0 ; + r->flags =0 ; } printk(KERN_INFO "PCI: Hiding 4xx host bridge resources %s\n",
arch/powerpc/platforms/52xx/mpc52xx_pci.c +2 -3
@@ -327,14 +327,13 @@ mpc52xx_pci_setup(struct pci_controller *hose,static void mpc52xx_pci_fixup_resources (struct pci_dev *dev) { -int i; +struct resource *res;pr_debug ("%s() %.4x:%.4x\n" , __func__, dev->vendor, dev->device);/* We don't rely on boot loader for PCI and resets all devices */ -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { -struct resource *res = &dev->resource[i]; +pci_dev_for_each_resource (dev, res) {if (res->end > res->start) {/* Only valid resources */ res->end -= res->start; res->start =0 ;
arch/powerpc/platforms/pseries/pci.c +8 -8
@@ -240,7 +240,7 @@ void __init pSeries_final_fixup(void)*/ static void fixup_winbond_82c105 (struct pci_dev * dev) { -int i; +struct resource *r;unsigned int reg;if (!machine_is (pseries))
@@ -251,14 +251,14 @@ static void fixup_winbond_82c105(struct pci_dev* dev)/* Enable LEGIRQ to use INTC instead of ISA interrupts */ pci_write_config_dword (dev,0x40 , reg | (1 <<11 )); -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; ++i) { +pci_dev_for_each_resource (dev, r) {/* zap the 2nd function of the winbond chip */ -if (dev->resource[i].flags &IORESOURCE_IO - && dev->bus->number ==0 && dev->devfn ==0x81 ) - dev->resource[i].flags &= ~IORESOURCE_IO ; -if (dev->resource[i].start ==0 && dev->resource[i].end) { - dev->resource[i].flags =0 ; - dev->resource[i].end =0 ; +if (dev->bus->number ==0 && dev->devfn ==0x81 && + r->flags &IORESOURCE_IO ) + r->flags &= ~IORESOURCE_IO ; +if (r->start ==0 && r->end) { + r->flags =0 ; + r->end =0 ; } } }
arch/sh/drivers/pci/pcie-sh7786.c +5 -5
@@ -140,12 +140,12 @@ static void sh7786_pci_fixup(struct pci_dev *dev)* Prevent enumeration of root complex resources. */ if (pci_is_root_bus (dev->bus) && dev->devfn ==0 ) { -int i; +struct resource *r; -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { - dev->resource[i].start =0 ; - dev->resource[i].end =0 ; - dev->resource[i].flags =0 ; +pci_dev_for_each_resource (dev, r) { + r->start =0 ; + r->end =0 ; + r->flags =0 ; } } }
arch/sparc/kernel/leon_pci.c +2 -3
@@ -62,15 +62,14 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info)int pcibios_enable_device (struct pci_dev *dev,int mask) { +struct resource *res;u16 cmd, oldcmd;int i;pci_read_config_word (dev,PCI_COMMAND , &cmd); oldcmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = &dev->resource[i]; - +pci_dev_for_each_resource (dev, res, i) {/* Only set up the requested stuff */ if (!(mask & (1 <<i)))continue ;
arch/sparc/kernel/pci.c +4 -6
@@ -663,11 +663,10 @@ static void pci_claim_bus_resources(struct pci_bus *bus)struct pci_dev *dev;list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (r->parent || !r->start || !r->flags)continue ;
@@ -724,15 +723,14 @@ struct pci_bus *pci_scan_one_pbm(struct pci_pbm_info *pbm,int pcibios_enable_device (struct pci_dev *dev,int mask) { +struct resource *res;u16 cmd, oldcmd;int i;pci_read_config_word (dev,PCI_COMMAND , &cmd); oldcmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = &dev->resource[i]; - +pci_dev_for_each_resource (dev, res, i) {/* Only set up the requested stuff */ if (!(mask & (1 <<i)))continue ;
arch/sparc/kernel/pcic.c +2 -3
@@ -643,15 +643,14 @@ void pcibios_fixup_bus(struct pci_bus *bus)int pcibios_enable_device (struct pci_dev *dev,int mask) { +struct resource *res;u16 cmd, oldcmd;int i;pci_read_config_word (dev,PCI_COMMAND , &cmd); oldcmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = &dev->resource[i]; - +pci_dev_for_each_resource (dev, res, i) {/* Only set up the requested stuff */ if (!(mask & (1 <<i)))continue ;
drivers/pci/remove.c +2 -3
@@ -5,10 +5,9 @@static void pci_free_resources (struct pci_dev *dev) { -int i; +struct resource *res; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = dev->resource + i; +pci_dev_for_each_resource (dev, res) {if (res->parent)release_resource (res); }
drivers/pci/setup-bus.c +10 -17
@@ -124,20 +124,17 @@ static resource_size_t get_res_add_align(struct list_head *head,return dev_res ? dev_res->min_align :0 ; } -/* Sort resources by alignment */ static void pdev_sort_resources (struct pci_dev *dev,struct list_head *head) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r; +pci_dev_for_each_resource (dev, r, i) {struct pci_dev_resource *dev_res, *tmp;resource_size_t r_align;struct list_head *n; - r = &dev->resource[i]; -if (r->flags &IORESOURCE_PCI_FIXED )continue ;
@@ -895,10 +892,9 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, min_align =window_alignment (bus,IORESOURCE_IO );list_for_each_entry (dev, &bus->devices, bus_list) { -int i; +struct resource *r; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; +pci_dev_for_each_resource (dev, r) {unsigned long r_size;if (r->parent || !(r->flags &IORESOURCE_IO ))
@@ -1014,10 +1010,10 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, size =0 ;list_for_each_entry (dev, &bus->devices, bus_list) { +struct resource *r;int i; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *r = &dev->resource[i]; +pci_dev_for_each_resource (dev, r, i) {resource_size_t r_size; if (r->parent || (r->flags & IORESOURCE_PCI_FIXED) ||
@@ -1358,11 +1354,10 @@ static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r)*/ static void pdev_assign_fixed_resources (struct pci_dev *dev) { -int i; +struct resource *r; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { +pci_dev_for_each_resource (dev, r) {struct pci_bus *b; -struct resource *r = &dev->resource[i];if (r->parent || !(r->flags &IORESOURCE_PCI_FIXED ) || !(r->flags & (IORESOURCE_IO |IORESOURCE_MEM )))
@@ -1795,11 +1790,9 @@ static void remove_dev_resources(struct pci_dev *dev, struct resource *io,struct resource *mmio, struct resource *mmio_pref) { - int i; - -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { -struct resource *res = &dev->resource[i]; + struct resource *res; +pci_dev_for_each_resource (dev, res) {if (resource_type (res) ==IORESOURCE_IO ) {remove_dev_resource (io, dev, res); }else if (resource_type (res) ==IORESOURCE_MEM ) {
drivers/pci/setup-res.c +1 -3
@@ -484,12 +484,10 @@ int pci_enable_resources(struct pci_dev *dev, int mask)pci_read_config_word (dev,PCI_COMMAND , &cmd); old_cmd = cmd; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { +pci_dev_for_each_resource (dev, r, i) {if (!(mask & (1 << i)))continue ; - r = &dev->resource[i]; -if (!(r->flags & (IORESOURCE_IO |IORESOURCE_MEM )))continue ; if ((i == PCI_ROM_RESOURCE) &&
drivers/pci/vgaarb.c +5 -12
@@ -548,10 +548,8 @@ static bool vga_is_firmware_default(struct pci_dev *pdev)#if defined(CONFIG_X86 ) || defined(CONFIG_IA64 )u64 base = screen_info.lfb_base;u64 size = screen_info.lfb_size; +struct resource *r;u64 limit; -resource_size_t start, end; -unsigned long flags; -int i;/* Select the device owning the boot framebuffer if there is one */
@@ -561,19 +559,14 @@ static bool vga_is_firmware_default(struct pci_dev *pdev) limit = base + size;/* Does firmware framebuffer belong to us? */ -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { - flags =pci_resource_flags (pdev, i); - -if ((flags &IORESOURCE_MEM ) ==0 ) +pci_dev_for_each_resource (pdev, r) { +if (resource_type (r) !=IORESOURCE_MEM )continue ; - start =pci_resource_start (pdev, i); - end =pci_resource_end (pdev, i); - -if (!start || !end) +if (!r->start || !r->end)continue ; -if (base < start || limit >= end) +if (base < r->start || limit >= r->end)continue ;return true;
drivers/pci/xen-pcifront.c +1 -3
@@ -390,9 +390,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)int i;struct resource *r; -for (i =0 ; i <PCI_NUM_RESOURCES ; i++) { - r = &dev->resource[i]; - +pci_dev_for_each_resource (dev, r, i) {if (!r->parent && r->start && r->flags) {dev_info (&pdev->xdev->dev,"claiming resource %s/%d\n" ,pci_name (dev), i);
drivers/pnp/quirks.c +10 -19
@@ -229,8 +229,7 @@ static void quirk_ad1815_mpu_resources(struct pnp_dev *dev)static void quirk_system_pci_resources (struct pnp_dev *dev) {struct pci_dev *pdev =NULL ; -struct resource *res; -resource_size_t pnp_start, pnp_end, pci_start, pci_end; +struct resource *res, *r;int i, j;/*
@@ -243,32 +242,26 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)* so they won't be claimed by the PNP system driver. */ for_each_pci_dev (pdev) { -for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { -unsigned long flags, type; +pci_dev_for_each_resource (pdev, r, i) { +unsigned long type =resource_type (r); - flags =pci_resource_flags (pdev, i); - type = flags & (IORESOURCE_IO |IORESOURCE_MEM ); -if (!type ||pci_resource_len (pdev, i) ==0 ) +if (!(type ==IORESOURCE_IO || type ==IORESOURCE_MEM ) || +resource_size (r) ==0 )continue ; -if (flags &IORESOURCE_UNSET ) +if (r->flags &IORESOURCE_UNSET )continue ; - pci_start =pci_resource_start (pdev, i); - pci_end =pci_resource_end (pdev, i);for (j =0 ; (res =pnp_get_resource (dev, type, j)); j++) {if (res->start ==0 && res->end ==0 )continue ; - pnp_start = res->start; - pnp_end = res->end; -/* * If the PNP region doesn't overlap the PCI * region at all, there's no problem. */ -if (pnp_end < pci_start || pnp_start > pci_end) +if (!resource_overlaps (res, r))continue ;/*
@@ -278,8 +271,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)* PNP device describes a bridge with PCI * behind it. */ -if (pnp_start <= pci_start && - pnp_end >= pci_end) +if (res->start <= r->start && res->end >= r->end)continue ;/*
@@ -288,9 +280,8 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)* driver from requesting its resources. */ dev_warn (&dev->dev, -"disabling %pR because it overlaps " -"%s BAR %d %pR\n" , res, -pci_name (pdev), i, &pdev->resource[i]); +"disabling %pR because it overlaps %s BAR %d %pR\n" , + res,pci_name (pdev), i, r); res->flags |=IORESOURCE_DISABLED ; } }
include/linux/pci.h +15 -0
@@ -26,6 +26,7 @@#include <linux/mod_devicetable.h> +#include <linux/args.h> #include <linux/types.h> #include <linux/init.h> #include <linux/ioport.h>
@@ -2003,6 +2004,20 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma); (pci_resource_end ((dev), (bar)) ? \ resource_size(pci_resource_n((dev), (bar))) : 0) +#define __pci_dev_for_each_res0 (dev, res, ...) \ + for (unsigned int __b = 0; \ + res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ + __b++) + +#define __pci_dev_for_each_res1 (dev, res, __b) \ + for (__b = 0; \ + res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ + __b++) + +#define pci_dev_for_each_resource (dev, res, ...) \ + CONCATENATE(__pci_dev_for_each_res, COUNT_ARGS(__VA_ARGS__)) \ + (dev, res, __VA_ARGS__) +/* * Similar to the helpers above, these manipulate per-pci_dev * driver-specific data. They are really just a wrapper around
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v8 4/7 PCI: Document pci_bus_for_each_resource() to avoid confusion
In reply to Andy ShevchenkoThere might be a confusion with the implementation of the pci_bus_for_each_resources() due to side effect of Logical OR. Document entire macro and explain how it works and why the conditional needs to be like that.
--- include/linux/pci.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
include/linux/pci.h +20 -0
@@ -1446,6 +1446,26 @@ int devm_request_pci_bus_resources(struct device *dev,/* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset (struct pci_dev *dev); +/** +* pci_bus_for_each_resource - iterate over PCI bus resources +* @bus: the PCI bus +* @res: a varible to keep a pointer to the current resource +* @i: a variable to keep the index of the current resource +* +* Iterate over PCI bus resources. The first part is to go over PCI bus +* resource array, which has at most the %PCI_BRIDGE_RESOURCE_NUM entries. +* After that continue with the separate list of the additional resources, +* if not empty. That's why the Logical OR is being used. +* +* Possible usage: +* +* struct pci_bus *bus = ...; +* struct resource *res; +* unsigned int i; +* +* pci_bus_for_each_resource(bus, res, i) +* pr_info("PCI bus resource[%u]: %pR\n", i, res); +*/ #define pci_bus_for_each_resource (bus, res, i) \ for (i = 0; \ (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v8 5/7 PCI: Allow pci_bus_for_each_resource() to take less arguments
In reply to Andy ShevchenkoRefactor pci_bus_for_each_resource() in the same way as it's done in pci_dev_for_each_resource() case. This will allow to hide iterator inside the loop, where it's not used otherwise.
No functional changes intended.
--- drivers/pci/bus.c | 7 +++---- drivers/pci/hotplug/shpchp_sysfs.c | 8 ++++---- drivers/pci/pci.c | 3 +-- drivers/pci/probe.c | 2 +- drivers/pci/setup-bus.c | 10 ++++------ include/linux/pci.h | 24 +++++++++++++++++++----- 6 files changed, 32 insertions(+), 22 deletions(-)
drivers/pci/bus.c +3 -4
@@ -182,13 +182,13 @@ static int pci_bus_alloc_from_region(struct pci_bus *bus, struct resource *res,void *alignf_data, struct pci_bus_region *region) { - int i, ret; struct resource *r, avail;resource_size_t max; +int ret; type_mask |=IORESOURCE_TYPE_BITS ; -pci_bus_for_each_resource (bus, r, i) { +pci_bus_for_each_resource (bus, r) {resource_size_t min_used = min;if (!r)
@@ -289,9 +289,8 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx)struct resource *res = &dev->resource[idx];struct resource orig_res = *res;struct resource *r; -int i; -pci_bus_for_each_resource (bus, r, i) { +pci_bus_for_each_resource (bus, r) {resource_size_t start, end;if (!r)
drivers/pci/hotplug/shpchp_sysfs.c +4 -4
@@ -24,16 +24,16 @@static ssize_t show_ctrl (struct device *dev,struct device_attribute *attr,char *buf) {struct pci_dev *pdev; -int index, busnr;struct resource *res;struct pci_bus *bus;size_t len =0 ; +int busnr; pdev =to_pci_dev (dev); bus = pdev->subordinate; len +=sysfs_emit_at (buf, len,"Free resources: memory\n" ); -pci_bus_for_each_resource (bus, res, index) { +pci_bus_for_each_resource (bus, res) {if (res && (res->flags &IORESOURCE_MEM ) && !(res->flags &IORESOURCE_PREFETCH )) { len += sysfs_emit_at(buf, len,
@@ -43,7 +43,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char } } len +=sysfs_emit_at (buf, len,"Free resources: prefetchable memory\n" ); -pci_bus_for_each_resource (bus, res, index) { +pci_bus_for_each_resource (bus, res) {if (res && (res->flags &IORESOURCE_MEM ) && (res->flags &IORESOURCE_PREFETCH )) { len += sysfs_emit_at(buf, len,
@@ -53,7 +53,7 @@ static ssize_t show_ctrl(struct device *dev, struct device_attribute *attr, char } } len +=sysfs_emit_at (buf, len,"Free resources: IO\n" ); -pci_bus_for_each_resource (bus, res, index) { +pci_bus_for_each_resource (bus, res) {if (res && (res->flags &IORESOURCE_IO )) { len += sysfs_emit_at(buf, len, "start = %8.8llx, length = %8.8llx\n",
drivers/pci/pci.c +1 -2
@@ -779,9 +779,8 @@ struct resource *pci_find_parent_resource(const struct pci_dev *dev, {const struct pci_bus *bus = dev->bus;struct resource *r; -int i; -pci_bus_for_each_resource (bus, r, i) { +pci_bus_for_each_resource (bus, r) {if (!r)continue ;if (resource_contains (r, res)) {
drivers/pci/probe.c +1 -1
@@ -533,7 +533,7 @@ void pci_read_bridge_bases(struct pci_bus *child)pci_read_bridge_mmio_pref (child);if (dev->transparent) { -pci_bus_for_each_resource (child->parent, res, i) { +pci_bus_for_each_resource (child->parent, res) {if (res && res->flags) {pci_bus_add_resource (child, res,PCI_SUBTRACTIVE_DECODE );
drivers/pci/setup-bus.c +4 -6
@@ -770,9 +770,8 @@ static struct resource *find_bus_resource_of_type(struct pci_bus *bus, unsigned long type) {struct resource *r, *r_assigned =NULL ; -int i; -pci_bus_for_each_resource (bus, r, i) { +pci_bus_for_each_resource (bus, r) {if (r == &ioport_resource || r == &iomem_resource)continue ;if (r && (r->flags & type_mask) == type && !r->parent)
@@ -1204,7 +1203,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) additional_mmio_pref_size =0 ;struct resource *pref;struct pci_host_bridge *host; -int hdr_type, i, ret; +int hdr_type, ret;list_for_each_entry (dev, &bus->devices, bus_list) {struct pci_bus *b = dev->subordinate;
@@ -1228,7 +1227,7 @@ void __pci_bus_size_bridges(struct pci_bus *bus, struct list_head *realloc_head) host =to_pci_host_bridge (bus->bridge);if (!host->size_windows)return ; -pci_bus_for_each_resource (bus, pref, i) +pci_bus_for_each_resource (bus, pref)if (pref && (pref->flags &IORESOURCE_PREFETCH ))break ; hdr_type =-1 ;/* Intentionally invalid - not a PCI device. */
@@ -1333,12 +1332,11 @@ EXPORT_SYMBOL(pci_bus_size_bridges);static void assign_fixed_resource_on_bus (struct pci_bus *b,struct resource *r) { -int i;struct resource *parent_r;unsigned long mask =IORESOURCE_IO |IORESOURCE_MEM |IORESOURCE_PREFETCH ; -pci_bus_for_each_resource (b, parent_r, i) { +pci_bus_for_each_resource (b, parent_r) {if (!parent_r)continue ;
include/linux/pci.h +19 -5
@@ -1446,11 +1446,21 @@ int devm_request_pci_bus_resources(struct device *dev,/* Temporary until new and working PCI SBR API in place */ int pci_bridge_secondary_bus_reset (struct pci_dev *dev); +#define __pci_bus_for_each_res0 (bus, res, ...) \ + for (unsigned int __b = 0; \ + (res = pci_bus_resource_n(bus, __b)) || __b < PCI_BRIDGE_RESOURCE_NUM; \ + __b++) + +#define __pci_bus_for_each_res1 (bus, res, __b) \ + for (__b = 0; \ + (res = pci_bus_resource_n(bus, __b)) || __b < PCI_BRIDGE_RESOURCE_NUM; \ + __b++) +/** * pci_bus_for_each_resource - iterate over PCI bus resources * @bus: the PCI bus * @res: a varible to keep a pointer to the current resource -* @i: a variable to keep the index of the current resource +* @...: an optional variable to keep the index of the current resource * * Iterate over PCI bus resources. The first part is to go over PCI bus * resource array, which has at most the %PCI_BRIDGE_RESOURCE_NUM entries.
@@ -1463,13 +1473,17 @@ int pci_bridge_secondary_bus_reset(struct pci_dev *dev);* struct resource *res; * unsigned int i; * +* // With an additional index variable * pci_bus_for_each_resource(bus, res, i) * pr_info("PCI bus resource[%u]: %pR\n", i, res); +* +* // Without index +* pci_bus_for_each_resource(bus, res) +* _do_something_(res); */ -#define pci_bus_for_each_resource (bus, res, i) \ - for (i = 0; \ - (res = pci_bus_resource_n(bus, i)) || i < PCI_BRIDGE_RESOURCE_NUM; \ - i++) +#define pci_bus_for_each_resource (bus, res, ...) \ + CONCATENATE(__pci_bus_for_each_res, COUNT_ARGS(__VA_ARGS__)) \ + (bus, res, __VA_ARGS__) int __must_check pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, resource_size_t size,
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v8 6/7 EISA: Convert to use less arguments in pci_bus_for_each_resource()
In reply to Andy ShevchenkoThe pci_bus_for_each_resource() can hide the iterator loop since it may be not used otherwise. With this, we may drop that iterator variable definition.
--- drivers/eisa/pci_eisa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/eisa/pci_eisa.c +2 -2
@@ -20,8 +20,8 @@ static struct eisa_root_device pci_eisa_root;static int __init pci_eisa_init (struct pci_dev *pdev) { -int rc, i;struct resource *res, *bus_res =NULL ; +int rc;if ((rc =pci_enable_device (pdev))) {dev_err (&pdev->dev,"Could not enable device\n" );
@@ -38,7 +38,7 @@ static int __init pci_eisa_init(struct pci_dev *pdev)* eisa_root_register() can only deal with a single io port resource, * so we use the first valid io port resource. */ -pci_bus_for_each_resource (pdev->bus, res, i) +pci_bus_for_each_resource (pdev->bus, res)if (res && (res->flags &IORESOURCE_IO )) { bus_res = res;break ;
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH v8 7/7 pcmcia: Convert to use less arguments in pci_bus_for_each_resource()
In reply to Andy ShevchenkoThe pci_bus_for_each_resource() can hide the iterator loop since it may be not used otherwise. With this, we may drop that iterator variable definition.
--- drivers/pcmcia/rsrc_nonstatic.c | 9 +++------ drivers/pcmcia/yenta_socket.c | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/pcmcia/rsrc_nonstatic.c +3 -6
@@ -934,7 +934,7 @@ static int adjust_io(struct pcmcia_socket *s, unsigned int action, unsigned longstatic int nonstatic_autoadd_resources (struct pcmcia_socket *s) {struct resource *res; -int i, done =0 ; +int done =0 ;if (!s->cb_dev || !s->cb_dev->bus)return -ENODEV ;
@@ -960,12 +960,9 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)*/ if (s->cb_dev->bus->number ==0 )return -EINVAL ; - -for (i =0 ; i <PCI_BRIDGE_RESOURCE_NUM ; i++) { - res = s->cb_dev->bus->resource[i]; -#else -pci_bus_for_each_resource (s->cb_dev->bus, res, i) {#endif + +pci_bus_for_each_resource (s->cb_dev->bus, res) {if (!res)continue ;
drivers/pcmcia/yenta_socket.c +1 -2
@@ -673,9 +673,8 @@ static int yenta_search_res(struct yenta_socket *socket, struct resource *res, u32 min) {struct resource *root; -int i; -pci_bus_for_each_resource (socket->dev->bus, root, i) { +pci_bus_for_each_resource (socket->dev->bus, root) {if (!root)continue ;
Signature · 1 line
2.40.0.1.gaa8946217a0b
Quoted 8 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Looking at it, refactor existing
pci_bus_for_each_resource()and convert users accordingly.Note, the amount of lines grew due to the documentation update.
Quoted 8 lines
Changelog v8:
- fixed issue withpci_bus_for_each_resource()macro (LKP)
- due to above added a new patch to document how it works
- moved the last patch to be #2 (Philippe)
- added tags (Philippe)Changelog v7:
- made both macros to share same name (Bjorn)
I didn't actually request the same name for both; I would have had no idea how to even do that :)
v6 had:
pci_dev_for_each_resource_p(dev, res)
pci_dev_for_each_resource(dev, res, i)
and I suggested:
pci_dev_for_each_resource(dev, res)
pci_dev_for_each_resource_idx(dev, res, i)
because that pattern is used elsewhere. But you figured out how to do it, and having one name is even better, so thanks for that extra work!
Quoted 60 lines
- split out the
pci_resource_n()conversion (Bjorn)Changelog v6:
- dropped unused variable in PPC code (LKP)Changelog v5:
- renamed loop variable to minimize the clash (Keith)
- addressed smatch warning (Dan)
- addressed 0-day bot findings (LKP)Changelog v4:
- rebased on top of v6.3-rc1
- added tag (Krzysztof)Changelog v3:
- rebased on top of v2 by Mika, see above
- added tag to pcmcia patch (Dominik)Changelog v2:
- refactor to have two macros
- refactor existingpci_bus_for_each_resource()in the same way and convert usersAndy Shevchenko (6):
kernel.h: Split outCOUNT_ARGS()andCONCATENATE()
PCI: Introducepci_resource_n()
PCI: Documentpci_bus_for_each_resource()to avoid confusion
PCI: Allowpci_bus_for_each_resource()to take less arguments
EISA: Convert to use less arguments inpci_bus_for_each_resource()
pcmcia: Convert to use less arguments inpci_bus_for_each_resource()Mika Westerberg (1):
PCI: Introducepci_dev_for_each_resource().clang-format | 1 + arch/alpha/kernel/pci.c | 5 +- arch/arm/kernel/bios32.c | 16 +++-- arch/arm/mach-dove/pcie.c | 10 ++-- arch/arm/mach-mv78xx0/pcie.c | 10 ++-- arch/arm/mach-orion5x/pci.c | 10 ++-- arch/mips/pci/ops-bcm63xx.c | 8 +-- arch/mips/pci/pci-legacy.c | 3 +- arch/powerpc/kernel/pci-common.c | 21 +++---- arch/powerpc/platforms/4xx/pci.c | 8 +-- arch/powerpc/platforms/52xx/mpc52xx_pci.c | 5 +- arch/powerpc/platforms/pseries/pci.c | 16 ++--- arch/sh/drivers/pci/pcie-sh7786.c | 10 ++-- arch/sparc/kernel/leon_pci.c | 5 +- arch/sparc/kernel/pci.c | 10 ++-- arch/sparc/kernel/pcic.c | 5 +- drivers/eisa/pci_eisa.c | 4 +- drivers/pci/bus.c | 7 +-- drivers/pci/hotplug/shpchp_sysfs.c | 8 +-- drivers/pci/pci.c | 3 +- drivers/pci/probe.c | 2 +- drivers/pci/remove.c | 5 +- drivers/pci/setup-bus.c | 37 +++++------- drivers/pci/setup-res.c | 4 +- drivers/pci/vgaarb.c | 17 ++---- drivers/pci/xen-pcifront.c | 4 +-
Quoted 8 lines
drivers/pcmcia/rsrc_nonstatic.c | 9 +-- drivers/pcmcia/yenta_socket.c | 3 +- drivers/pnp/quirks.c | 29 ++++----- include/linux/args.h | 13 ++++ include/linux/kernel.h | 8 +-- include/linux/pci.h | 72 +++++++++++++++++++---- 32 files changed, 190 insertions(+), 178 deletions(-) create mode 100644 include/linux/args.h
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
I omitted
[1/7] kernel.h: Split out COUNT_ARGS() and CONCATENATE()"
only because it's not essential to this series and has only a trivial one-line impact on include/linux/pci.h.
Bjorn
Quoted 26 lines · Bjorn Helgaas
Quoted 8 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Looking at it, refactor existing
pci_bus_for_each_resource()and convert users accordingly.Note, the amount of lines grew due to the documentation update.
Quoted 8 lines
Changelog v8:
- fixed issue withpci_bus_for_each_resource()macro (LKP)
- due to above added a new patch to document how it works
- moved the last patch to be #2 (Philippe)
- added tags (Philippe)Changelog v7:
- made both macros to share same name (Bjorn)I didn't actually request the same name for both; I would have had no idea how to even do that :)
v6 had:
pci_dev_for_each_resource_p(dev, res)
pci_dev_for_each_resource(dev, res, i)
Quoted 6 lines
and I suggested:
pci_dev_for_each_resource(dev, res)
pci_dev_for_each_resource_idx(dev, res, i)because that pattern is used elsewhere.
Ah, sorry I misinterpreted your suggestion (I thought that at the end of the day you wanted the macro to be less intrusive, so we change less code, that's why I interpreted it the way described in the Changelog).
Quoted 2 lines
But you figured out how to do
it, and having one name is even better, so thanks for that extra work!
You are welcome!
Quoted 30 lines
Quoted 30 lines
- split out the
pci_resource_n()conversion (Bjorn)Changelog v6:
- dropped unused variable in PPC code (LKP)Changelog v5:
- renamed loop variable to minimize the clash (Keith)
- addressed smatch warning (Dan)
- addressed 0-day bot findings (LKP)Changelog v4:
- rebased on top of v6.3-rc1
- added tag (Krzysztof)Changelog v3:
- rebased on top of v2 by Mika, see above
- added tag to pcmcia patch (Dominik)Changelog v2:
- refactor to have two macros
- refactor existingpci_bus_for_each_resource()in the same way and convert usersAndy Shevchenko (6):
kernel.h: Split outCOUNT_ARGS()andCONCATENATE()
PCI: Introducepci_resource_n()
PCI: Documentpci_bus_for_each_resource()to avoid confusion
PCI: Allowpci_bus_for_each_resource()to take less arguments
EISA: Convert to use less arguments inpci_bus_for_each_resource()
pcmcia: Convert to use less arguments inpci_bus_for_each_resource()
...
Quoted 1 line
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
Btw, can you actually drop patch 7, please?
After I have updated the documentation I have realised that why the first chunk is invalid. It needs mode careful check and rework.
Quoted 6 lines
I omitted
[1/7]
kernel.h: Split outCOUNT_ARGS()andCONCATENATE()"only because it's not essential to this series and has only a trivial one-line impact on
include/linux/pci.h.
I'm not sure I understood what exactly "essentiality" means to you, but I included that because it makes the split which can be used later by others and not including kernel.h in the header is the objective I want to achieve. Without this patch the achievement is going to be deferred. Yet, this, as you have noticed, allows to compile and use the macros in the rest of the patches.
P.S. Thank you for the review and application of the rest!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v8 7/7] pcmcia: Convert to use less arguments in pci_bus_for_each_resource()
In reply to Andy ShevchenkoOn Thu, Mar 30, 2023 at 07:24:34PM +0300, Andy Shevchenko wrote:
...
Quoted 4 lines
drivers/pcmcia/rsrc_nonstatic.c +0
-0@@ -960,12 +960,9 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)*/ if (s->cb_dev->bus->number ==0 )return -EINVAL ;
drivers/pcmcia/rsrc_nonstatic.c static int nonstatic_autoadd_resources(struct pcmcia_socket *s) · line 967
Quoted 10 lines
drivers/pcmcia/rsrc_nonstatic.c +2
-5- -for (i =0 ; i <PCI_BRIDGE_RESOURCE_NUM ; i++) { - res = s->cb_dev->bus->resource[i]; -#else -pci_bus_for_each_resource (s->cb_dev->bus, res, i) {#endif + +pci_bus_for_each_resource (s->cb_dev->bus, res) {if (!res)continue ;
As pointed out in the reply to Bjorn's email this hunk needs to be revisited, since I wrote the documentation for the above call I have started understanding the deal behind this special treatment for X86 case.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v8 5/7] PCI: Allow pci_bus_for_each_resource() to take less arguments
In reply to Andy ShevchenkoQuoted 5 lines · Andy Shevchenko
Refactor
pci_bus_for_each_resource()in the same way as it's done inpci_dev_for_each_resource()case. This will allow to hide iterator inside the loop, where it's not used otherwise.No functional changes intended.
Bjorn, this has wrong author in your tree:
Or did I misinterpret something?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v8 5/7] PCI: Allow pci_bus_for_each_resource() to take less arguments
Quoted 10 lines · Andy Shevchenko
Quoted 5 lines · Andy Shevchenko
Refactor
pci_bus_for_each_resource()in the same way as it's done inpci_dev_for_each_resource()case. This will allow to hide iterator inside the loop, where it's not used otherwise.No functional changes intended.
Bjorn, this has wrong author in your tree:
I botched it, sorry, should be fixed now.
Bjorn
Quoted 11 lines · Andy Shevchenko
Quoted 8 lines · Bjorn Helgaas
Quoted 5 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Looking at it, refactor existing
pci_bus_for_each_resource()and convert users accordingly.Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
Btw, can you actually drop patch 7, please?
Done.
Quoted 7 lines
Quoted 6 lines
I omitted
[1/7]
kernel.h: Split outCOUNT_ARGS()andCONCATENATE()"only because it's not essential to this series and has only a trivial one-line impact on
include/linux/pci.h.
Quoted 6 lines
I'm not sure I understood what exactly "essentiality" means to you, but I included that because it makes the split which can be used later by others and not including
kernel.hin the header is the objective I want to achieve. Without this patch the achievement is going to be deferred. Yet, this, as you have noticed, allows to compile and use the macros in the rest of the patches.
I haven't followed the kernel.h splitting, and I try to avoid incidental changes outside of the files I maintain, so I just wanted to keep this series purely PCI and avoid any possible objections to a new include file or discussion about how it should be done.
Quoted 3 lines · Bjorn Helgaas
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Bjorn Helgaas
On Thu, Mar 30, 2023 at 07:24:27PM +0300, Andy Shevchenko wrote:
...
Quoted 14 lines
Quoted 7 lines
Quoted 6 lines
I omitted
[1/7]
kernel.h: Split outCOUNT_ARGS()andCONCATENATE()"only because it's not essential to this series and has only a trivial one-line impact on
include/linux/pci.h.Quoted 6 lines
I'm not sure I understood what exactly "essentiality" means to you, but I included that because it makes the split which can be used later by others and not including
kernel.hin the header is the objective I want to achieve. Without this patch the achievement is going to be deferred. Yet, this, as you have noticed, allows to compile and use the macros in the rest of the patches.
Quoted 4 lines
I haven't followed the
kernel.hsplitting, and I try to avoid incidental changes outside of the files I maintain, so I just wanted to keep this series purely PCI and avoid any possible objections to a new include file or discussion about how it should be done.
Okay, fair enough :-) Thank you for elaboration, I will send the new version of patch 7 separately.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 5 lines · Bjorn Helgaas
Quoted 2 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
This is 09cc90063240 ("PCI: Introduce pci_dev_for_each_resource()") upstream now.
Coverity complains about each use, sample below from drivers/pci/vgaarb.c. I didn't investigate at all, so it might be a false positive; just FYI.
1. Condition screen_info.capabilities & (2U /* 1 << 1 */), taking true branch.
556 if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
557 base |= (u64)screen_info.ext_lfb_base << 32;
558
559 limit = base + size;
560
561 /* Does firmware framebuffer belong to us? */
2. Condition __b < PCI_NUM_RESOURCES, taking true branch.
3. Condition (r = &pdev->resource[__b]) , (__b < PCI_NUM_RESOURCES), taking true branch.
6. Condition __b < PCI_NUM_RESOURCES, taking true branch.
7. cond_at_most: Checking __b < PCI_NUM_RESOURCES implies that __b may be up to 16 on the true branch.
8. Condition (r = &pdev->resource[__b]) , (__b < PCI_NUM_RESOURCES), taking true branch.
11. incr: Incrementing __b. The value of __b may now be up to 17.
12. alias: Assigning: r = &pdev->resource[__b]. r may now point to as high as element 17 of pdev->resource (which consists of 17 64-byte elements).
13. Condition __b < PCI_NUM_RESOURCES, taking true branch.
14. Condition (r = &pdev->resource[__b]) , (__b < PCI_NUM_RESOURCES), taking true branch.
562 pci_dev_for_each_resource(pdev, r) {
4. Condition resource_type(r) != 512, taking true branch.
9. Condition resource_type(r) != 512, taking true branch.
CID 1529911 (#1 of 1): Out-of-bounds read (OVERRUN)
15. overrun-local: Overrunning array of 1088 bytes at byte offset 1088 by dereferencing pointer r. [show details]
563 if (resource_type(r) != IORESOURCE_MEM)
5. Continuing loop.
10. Continuing loop.
564 continue;
Quoted 11 lines · Bjorn Helgaas
Quoted 5 lines · Bjorn Helgaas
Quoted 2 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
This is
09cc90063240("PCI: Introducepci_dev_for_each_resource()") upstream now.Coverity complains about each use,
It needs more clarification here. Use of reduced variant of the macro or all of them? If the former one, then I can speculate that Coverity (famous for false positives) simply doesn't understand for (type var; var ...) code.
Quoted 30 lines
sample below from
drivers/pci/vgaarb.c. I didn't investigate at all, so it might be a false positive; just FYI.1. Condition screen_info.capabilities & (2U /* 1 << 1 */), taking true branch.
556 if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE)
557 base |= (u64)screen_info.ext_lfb_base << 32;
558
559 limit = base + size;
560
561 /* Does firmware framebuffer belong to us? */
2. Condition__b<PCI_NUM_RESOURCES, taking true branch.
3. Condition (r = &pdev->resource[__b]) , (__b<PCI_NUM_RESOURCES), taking true branch.
6. Condition__b<PCI_NUM_RESOURCES, taking true branch.
7.cond_at_most: Checking__b<PCI_NUM_RESOURCESimplies that__bmay be up to 16 on the true branch.
8. Condition (r = &pdev->resource[__b]) , (__b<PCI_NUM_RESOURCES), taking true branch.
11. incr: Incrementing__b. The value of__bmay now be up to 17.
12. alias: Assigning: r = &pdev->resource[__b]. r may now point to as high as element 17 ofpdev->resource(which consists of 17 64-byte elements).
13. Condition__b<PCI_NUM_RESOURCES, taking true branch.
14. Condition (r = &pdev->resource[__b]) , (__b<PCI_NUM_RESOURCES), taking true branch.
562pci_dev_for_each_resource(pdev, r){
4. Conditionresource_type(r)!= 512, taking true branch.
9. Conditionresource_type(r)!= 512, taking true branch.CID 1529911 (#1 of 1): Out-of-bounds read (OVERRUN)
15. overrun-local: Overrunning array of 1088 bytes at byte offset 1088 by dereferencing pointer r. [show details]
563 if (resource_type(r)!=IORESOURCE_MEM)
5. Continuing loop.
10. Continuing loop.
564 continue;
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Bjorn Helgaas
Quoted 5 lines · Bjorn Helgaas
Quoted 2 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
This is
09cc90063240("PCI: Introducepci_dev_for_each_resource()") upstream now.
Quoted 6 lines
Quoted 1 line
Coverity complains about each use,
It needs more clarification here. Use of reduced variant of the macro or all of them? If the former one, then I can speculate that Coverity (famous for false positives) simply doesn't understand
for (type var; var ...)code.
True, Coverity finds false positives. It flagged every use in drivers/pci and drivers/pnp. It didn't mention the arch/alpha, arm, mips, powerpc, sh, or sparc uses, but I think it just didn't look at those.
It flagged both:
pbus_size_io pci_dev_for_each_resource(dev, r)
pbus_size_mem pci_dev_for_each_resource(dev, r, i)
Here's a spreadsheet with a few more details (unfortunately I don't know how to make it dump the actual line numbers or analysis like I pasted below, so "pci_dev_for_each_resource" doesn't appear). These are mostly in the "Drivers-PCI" component.
https://docs.google.com/spreadsheets/d/1ohOJwxqXXoDUA0gwopgk-z-6ArLvhN7AZn4mIlDkHhQ/edit?usp=sharing
These particular reports are in the "High Impact Outstanding" tab.
Quoted 36 lines
Quoted 30 lines
sample below from
drivers/pci/vgaarb.c. I didn't investigate at all, so it might be a false positive; just FYI.1. Condition screen_info.capabilities & (2U /* 1 << 1 */), taking true branch.
556 if (screen_info.capabilities &VIDEO_CAPABILITY_64BIT_BASE)
557 base |= (u64)screen_info.ext_lfb_base << 32;
558
559 limit = base + size;
560
561 /* Does firmware framebuffer belong to us? */
2. Condition__b<PCI_NUM_RESOURCES, taking true branch.
3. Condition (r = &pdev->resource[__b]) , (__b<PCI_NUM_RESOURCES), taking true branch.
6. Condition__b<PCI_NUM_RESOURCES, taking true branch.
7.cond_at_most: Checking__b<PCI_NUM_RESOURCESimplies that__bmay be up to 16 on the true branch.
8. Condition (r = &pdev->resource[__b]) , (__b<PCI_NUM_RESOURCES), taking true branch.
11. incr: Incrementing__b. The value of__bmay now be up to 17.
12. alias: Assigning: r = &pdev->resource[__b]. r may now point to as high as element 17 ofpdev->resource(which consists of 17 64-byte elements).
13. Condition__b<PCI_NUM_RESOURCES, taking true branch.
14. Condition (r = &pdev->resource[__b]) , (__b<PCI_NUM_RESOURCES), taking true branch.
562pci_dev_for_each_resource(pdev, r){
4. Conditionresource_type(r)!= 512, taking true branch.
9. Conditionresource_type(r)!= 512, taking true branch.CID 1529911 (#1 of 1): Out-of-bounds read (OVERRUN)
15. overrun-local: Overrunning array of 1088 bytes at byte offset 1088 by dereferencing pointer r. [show details]
563 if (resource_type(r)!=IORESOURCE_MEM)
5. Continuing loop.
10. Continuing loop.
564 continue;Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 29 lines · Bjorn Helgaas
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Bjorn Helgaas
Quoted 5 lines · Bjorn Helgaas
Quoted 2 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
This is
09cc90063240("PCI: Introducepci_dev_for_each_resource()") upstream now.Quoted 6 lines
Quoted 1 line
Coverity complains about each use,
It needs more clarification here. Use of reduced variant of the macro or all of them? If the former one, then I can speculate that Coverity (famous for false positives) simply doesn't understand
for (type var; var ...)code.True, Coverity finds false positives. It flagged every use in
drivers/pcianddrivers/pnp. It didn't mention thearch/alpha, arm, mips, powerpc, sh, or sparc uses, but I think it just didn't look at those.It flagged both:
pbus_size_iopci_dev_for_each_resource(dev, r)
pbus_size_mempci_dev_for_each_resource(dev, r, i)
Quoted 8 lines
Here's a spreadsheet with a few more details (unfortunately I don't know how to make it dump the actual line numbers or analysis like I pasted below, so "
pci_dev_for_each_resource" doesn't appear). These are mostly in the "Drivers-PCI" component.https://docs.google.com/spreadsheets/d/1ohOJwxqXXoDUA0gwopgk-z-6ArLvhN7AZn4mIlDkHhQ/edit?usp=sharing
These particular reports are in the "High Impact Outstanding" tab.
Where are we at? Are we going to ignore this because some Coverity reports are false positives?
Bjorn
Hi,
Quoted 35 lines · Bjorn Helgaas
Quoted 34 lines · Bjorn Helgaas
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Bjorn Helgaas
Quoted 5 lines · Bjorn Helgaas
Quoted 2 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
This is
09cc90063240("PCI: Introducepci_dev_for_each_resource()") upstream now.Quoted 6 lines
Quoted 1 line
Coverity complains about each use,
It needs more clarification here. Use of reduced variant of the macro or all of them? If the former one, then I can speculate that Coverity (famous for false positives) simply doesn't understand
for (type var; var ...)code.True, Coverity finds false positives. It flagged every use in
drivers/pcianddrivers/pnp. It didn't mention thearch/alpha, arm, mips, powerpc, sh, or sparc uses, but I think it just didn't look at those.It flagged both:
pbus_size_iopci_dev_for_each_resource(dev, r)
pbus_size_mempci_dev_for_each_resource(dev, r, i)Here's a spreadsheet with a few more details (unfortunately I don't know how to make it dump the actual line numbers or analysis like I pasted below, so "
pci_dev_for_each_resource" doesn't appear). These are mostly in the "Drivers-PCI" component.
Quoted 6 lines
Quoted 3 lines
https://docs.google.com/spreadsheets/d/1ohOJwxqXXoDUA0gwopgk-z-6ArLvhN7AZn4mIlDkHhQ/edit?usp=sharing
These particular reports are in the "High Impact Outstanding" tab.
Where are we at? Are we going to ignore this because some Coverity reports are false positives?
Looking at the code I understand where coverity is coming from:
#define __pci_dev_for_each_res0(dev, res, ...) \
for (unsigned int __b = 0; \
res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \
__b++) res will be assigned before __b is checked for being less thanPCI_NUM_RESOURCES, making it point to behind the array at the end of the last loop iteration.
Rewriting the test expression as
__b < PCI_NUM_RESOURCES && (res = pci_resource_n(dev, __b));
should avoid the (coverity) warning by making use of lazy evaluation.
It probably makes the code slightly less performant as res will now be checked for being not NULL (which will always be true), but I doubt it will be significant (or in any hot paths).
Regards,
Jonas
Quoted 15 lines · Jonas Gorski
...
Looking at the code I understand where coverity is coming from:
#define __pci_dev_for_each_res0(dev, res, ...) \ for (unsigned int __b = 0; \ res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ __b++)res will be assigned before
__bis checked for being less thanPCI_NUM_RESOURCES, making it point to behind the array at the end of the last loop iteration.Rewriting the test expression as
Quoted 7 lines
__b<PCI_NUM_RESOURCES&& (res =pci_resource_n(dev, __b));should avoid the (coverity) warning by making use of lazy evaluation.
It probably makes the code slightly less performant as res will now be checked for being not NULL (which will always be true), but I doubt it will be significant (or in any hot paths).
Thanks a lot for looking into this! I think you're right, and I think the rewritten expression is more logical as well. Do you want to post a patch for it?
Bjorn
Quoted 21 lines · Bjorn Helgaas
Quoted 19 lines · Jonas Gorski
...
Looking at the code I understand where coverity is coming from:
#define __pci_dev_for_each_res0(dev, res, ...) \ for (unsigned int __b = 0; \ res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ __b++)res will be assigned before
__bis checked for being less thanPCI_NUM_RESOURCES, making it point to behind the array at the end of the last loop iteration.Rewriting the test expression as
__b<PCI_NUM_RESOURCES&& (res =pci_resource_n(dev, __b));should avoid the (coverity) warning by making use of lazy evaluation.
Quoted 7 lines
Quoted 3 lines
It probably makes the code slightly less performant as res will now be checked for being not NULL (which will always be true), but I doubt it will be significant (or in any hot paths).
Thanks a lot for looking into this! I think you're right, and I think the rewritten expression is more logical as well. Do you want to post a patch for it?
Not sure when I'll come around to, so I have no strong feeling here. So feel free to just borrow my suggestion, especially since I won't be able to test it (don't have a kernel tree ready I can build and boot).
Also looking more closely at the Coverity output, I think it might not handle the comma operator well in the loop condition:
Quoted 4 lines
11. incr: Incrementing
__b. The value of__bmay now be up to 17.
12. alias: Assigning: r = &pdev->resource[__b]. r may now point to as high as element 17 ofpdev->resource(which consists of 17 64-byte elements).
13. Condition__b<PCI_NUM_RESOURCES, taking true branch.
14. Condition (r = &pdev->resource[__b]) , (__b<PCI_NUM_RESOURCES), taking true branch.
13 If __b is 17 ( = PCI_NUM_RESOURCES) we wouldn't taking the true branch, but somehow Coverity thinks that we do. No idea if it is worth reporting to Coverity.
The changed condition statement should hopefully silence the warning though.
Regards
Jonas
Quoted 45 lines · Jonas Gorski
Quoted 35 lines · Bjorn Helgaas
Quoted 34 lines · Bjorn Helgaas
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Bjorn Helgaas
Quoted 5 lines · Bjorn Helgaas
Quoted 2 lines · Andy Shevchenko
Provide two new helper macros to iterate over PCI device resources and convert users.
Applied 2-7 to pci/resource for v6.4, thanks, I really like this!
This is
09cc90063240("PCI: Introducepci_dev_for_each_resource()") upstream now.Quoted 6 lines
Quoted 1 line
Coverity complains about each use,
It needs more clarification here. Use of reduced variant of the macro or all of them? If the former one, then I can speculate that Coverity (famous for false positives) simply doesn't understand
for (type var; var ...)code.True, Coverity finds false positives. It flagged every use in
drivers/pcianddrivers/pnp. It didn't mention thearch/alpha, arm, mips, powerpc, sh, or sparc uses, but I think it just didn't look at those.It flagged both:
pbus_size_iopci_dev_for_each_resource(dev, r)
pbus_size_mempci_dev_for_each_resource(dev, r, i)Here's a spreadsheet with a few more details (unfortunately I don't know how to make it dump the actual line numbers or analysis like I pasted below, so "
pci_dev_for_each_resource" doesn't appear). These are mostly in the "Drivers-PCI" component.Quoted 6 lines
Quoted 3 lines
https://docs.google.com/spreadsheets/d/1ohOJwxqXXoDUA0gwopgk-z-6ArLvhN7AZn4mIlDkHhQ/edit?usp=sharing
These particular reports are in the "High Impact Outstanding" tab.
Where are we at? Are we going to ignore this because some Coverity reports are false positives?
Looking at the code I understand where coverity is coming from:
Quoted 8 lines
#define __pci_dev_for_each_res0(dev, res, ...) \ for (unsigned int __b = 0; \ res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ __b++)res will be assigned before
__bis checked for being less thanPCI_NUM_RESOURCES, making it point to behind the array at the end of the last loop iteration.
Which is fine and you stumbled over the same mistake I made, that's why the documentation has been added to describe why the heck this macro is written the way it's written.
Coverity sucks.
Quoted 5 lines
Rewriting the test expression as
__b<PCI_NUM_RESOURCES&& (res =pci_resource_n(dev, __b));should avoid the (coverity) warning by making use of lazy evaluation.
Obviously NAK.
Quoted 3 lines
It probably makes the code slightly less performant as res will now be checked for being not NULL (which will always be true), but I doubt it will be significant (or in any hot paths).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 3 lines · Andy Shevchenko
Quoted 2 lines · Jonas Gorski
Quoted 1 line · Bjorn Helgaas
On Fri, May 12, 2023 at 02:48:51PM -0500, Bjorn Helgaas wrote:
...
Quoted 20 lines
Quoted 5 lines
Quoted 2 lines
Where are we at? Are we going to ignore this because some Coverity reports are false positives?
Looking at the code I understand where coverity is coming from:
Quoted 8 lines
#define __pci_dev_for_each_res0(dev, res, ...) \ for (unsigned int __b = 0; \ res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ __b++)res will be assigned before
__bis checked for being less thanPCI_NUM_RESOURCES, making it point to behind the array at the end of the last loop iteration.Which is fine and you stumbled over the same mistake I made, that's why the documentation has been added to describe why the heck this macro is written the way it's written.
Coverity sucks.
Quoted 11 lines
Quoted 5 lines
Rewriting the test expression as
__b<PCI_NUM_RESOURCES&& (res =pci_resource_n(dev, __b));should avoid the (coverity) warning by making use of lazy evaluation.
Obviously NAK.
Quoted 3 lines
It probably makes the code slightly less performant as res will now be checked for being not NULL (which will always be true), but I doubt it will be significant (or in any hot paths).
Oh my god, I mistakenly read this as bus macro, sorry for my rant, it's simply wrong.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 1 line · Bjorn Helgaas
On Wed, May 31, 2023 at 08:48:35PM +0200, Jonas Gorski wrote:
...
Quoted 17 lines
Quoted 17 lines
Looking at the code I understand where coverity is coming from:
#define __pci_dev_for_each_res0(dev, res, ...) \ for (unsigned int __b = 0; \ res = pci_resource_n(dev, __b), __b < PCI_NUM_RESOURCES; \ __b++)res will be assigned before
__bis checked for being less thanPCI_NUM_RESOURCES, making it point to behind the array at the end of the last loop iteration.Rewriting the test expression as
__b<PCI_NUM_RESOURCES&& (res =pci_resource_n(dev, __b));should avoid the (coverity) warning by making use of lazy evaluation.
Quoted 7 lines
Quoted 3 lines
It probably makes the code slightly less performant as res will now be checked for being not NULL (which will always be true), but I doubt it will be significant (or in any hot paths).
Thanks a lot for looking into this! I think you're right, and I think the rewritten expression is more logical as well. Do you want to post a patch for it?
Gimme some time, I was on a long leave and now it's a pile to handle.
Signature · 2 lines
With Best Regards, Andy Shevchenko