From: Bjorn Helgaas <helgaas@kernel.org>
To: Andrew Murray <andrew.murray@arm.com>
Cc: Denis Efremov <efremov@linux.com>,
linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
linux-s390@vger.kernel.org, Sebastian Ott <sebott@linux.ibm.com>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>
Subject: Re: [PATCH v3 06/26] s390/pci: Use PCI_STD_NUM_BARS
Date: Mon, 30 Sep 2019 14:47:24 -0500 [thread overview]
Message-ID: <20190930194724.GA188464@google.com> (raw)
In-Reply-To: <20190918085805.GY9720@e119886-lin.cambridge.arm.com>
On Wed, Sep 18, 2019 at 09:58:06AM +0100, Andrew Murray wrote:
> On Mon, Sep 16, 2019 at 11:41:38PM +0300, Denis Efremov wrote:
> > Remove local definition PCI_BAR_COUNT for the number of PCI BARs and use
> > global one PCI_STD_NUM_BARS instead.
> >
> > Acked-by: Sebastian Ott <sebott@linux.ibm.com>
> > Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
> > Signed-off-by: Denis Efremov <efremov@linux.com>
> > ---
> > arch/s390/include/asm/pci.h | 5 +----
> > arch/s390/include/asm/pci_clp.h | 6 +++---
> > arch/s390/pci/pci.c | 16 ++++++++--------
> > arch/s390/pci/pci_clp.c | 6 +++---
> > 4 files changed, 15 insertions(+), 18 deletions(-)
> >
> > diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
> > index a2399eff84ca..3a06c264ea53 100644
> > --- a/arch/s390/include/asm/pci.h
> > +++ b/arch/s390/include/asm/pci.h
> > @@ -2,9 +2,6 @@
> > #ifndef __ASM_S390_PCI_H
> > #define __ASM_S390_PCI_H
> >
> > -/* must be set before including pci_clp.h */
> > -#define PCI_BAR_COUNT 6
> > -
> > #include <linux/pci.h>
> > #include <linux/mutex.h>
> > #include <linux/iommu.h>
> > @@ -138,7 +135,7 @@ struct zpci_dev {
> >
> > char res_name[16];
> > bool mio_capable;
> > - struct zpci_bar_struct bars[PCI_BAR_COUNT];
> > + struct zpci_bar_struct bars[PCI_STD_NUM_BARS];
> >
> > u64 start_dma; /* Start of available DMA addresses */
> > u64 end_dma; /* End of available DMA addresses */
> > diff --git a/arch/s390/include/asm/pci_clp.h b/arch/s390/include/asm/pci_clp.h
> > index 50359172cc48..bd2cb4ea7d93 100644
> > --- a/arch/s390/include/asm/pci_clp.h
> > +++ b/arch/s390/include/asm/pci_clp.h
> > @@ -77,7 +77,7 @@ struct mio_info {
> > struct {
> > u64 wb;
> > u64 wt;
> > - } addr[PCI_BAR_COUNT];
> > + } addr[PCI_STD_NUM_BARS];
> > u32 reserved[6];
> > } __packed;
> >
> > @@ -98,9 +98,9 @@ struct clp_rsp_query_pci {
> > u16 util_str_avail : 1; /* utility string available? */
> > u16 pfgid : 8; /* pci function group id */
> > u32 fid; /* pci function id */
> > - u8 bar_size[PCI_BAR_COUNT];
> > + u8 bar_size[PCI_STD_NUM_BARS];
> > u16 pchid;
> > - __le32 bar[PCI_BAR_COUNT];
> > + __le32 bar[PCI_STD_NUM_BARS];
> > u8 pfip[CLP_PFIP_NR_SEGMENTS]; /* pci function internal path */
> > u32 : 16;
> > u8 fmb_len;
> > diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
> > index b0e3b9a0e488..aca372c8e34f 100644
> > --- a/arch/s390/pci/pci.c
> > +++ b/arch/s390/pci/pci.c
> > @@ -43,7 +43,7 @@ static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);
> > static DEFINE_SPINLOCK(zpci_domain_lock);
> >
> > #define ZPCI_IOMAP_ENTRIES \
> > - min(((unsigned long) ZPCI_NR_DEVICES * PCI_BAR_COUNT / 2), \
> > + min(((unsigned long) ZPCI_NR_DEVICES * PCI_STD_NUM_BARS / 2), \
> > ZPCI_IOMAP_MAX_ENTRIES)
> >
> > static DEFINE_SPINLOCK(zpci_iomap_lock);
> > @@ -294,7 +294,7 @@ static void __iomem *pci_iomap_range_mio(struct pci_dev *pdev, int bar,
> > void __iomem *pci_iomap_range(struct pci_dev *pdev, int bar,
> > unsigned long offset, unsigned long max)
> > {
> > - if (!pci_resource_len(pdev, bar) || bar >= PCI_BAR_COUNT)
> > + if (bar >= PCI_STD_NUM_BARS || !pci_resource_len(pdev, bar))
> > return NULL;
> >
> > if (static_branch_likely(&have_mio))
> > @@ -324,7 +324,7 @@ static void __iomem *pci_iomap_wc_range_mio(struct pci_dev *pdev, int bar,
> > void __iomem *pci_iomap_wc_range(struct pci_dev *pdev, int bar,
> > unsigned long offset, unsigned long max)
> > {
> > - if (!pci_resource_len(pdev, bar) || bar >= PCI_BAR_COUNT)
> > + if (bar >= PCI_STD_NUM_BARS || !pci_resource_len(pdev, bar))
> > return NULL;
>
> This looks like a latent bug fix here. If 'bar' is out of range we return
> NULL instead accessing an invalid item of an array. Should this not be
> a separate patch and tagged as stable?
Sharp eyes! I didn't think of this as accessing an invalid item, but
indeed it does (if 'bar' is out of range). But I doubt it's worth the
hassle of a separate patch, since we return failure anyway.
next prev parent reply other threads:[~2019-09-30 21:06 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190916204158.6889-1-efremov@linux.com>
2019-09-16 20:41 ` [PATCH v3 02/26] PCI: hv: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 21:19 ` Haiyang Zhang
2019-09-26 22:05 ` Bjorn Helgaas
2019-09-27 12:43 ` Bjorn Helgaas
2019-09-27 23:40 ` [PATCH RESEND v3 00/26] Add definition for the number of standard PCI BARs Denis Efremov
2019-09-30 19:58 ` Bjorn Helgaas
2019-09-27 23:43 ` [PATCH RESEND v3 01/26] PCI: Add define " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 03/26] PCI: dwc: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-17 8:36 ` Gustavo Pimentel
2019-09-16 20:41 ` [PATCH v3 04/26] PCI: endpoint: " Denis Efremov
2019-09-18 9:19 ` Andrew Murray
2019-09-18 14:20 ` Denis Efremov
2019-09-16 20:41 ` [PATCH v3 05/26] misc: pci_endpoint_test: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 06/26] s390/pci: " Denis Efremov
2019-09-18 8:58 ` Andrew Murray
2019-09-18 14:26 ` Denis Efremov
2019-09-19 8:00 ` Andrew Murray
2019-09-30 19:47 ` Bjorn Helgaas [this message]
2019-09-16 20:41 ` [PATCH v3 07/26] x86/PCI: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 08/26] alpha/PCI: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 09/26] ia64: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 10/26] stmmac: pci: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 11/26] net: dwc-xlgmac: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 12/26] ixgb: use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 13/26] e1000: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-18 9:05 ` Andrew Murray
2019-09-16 20:41 ` [PATCH v3 14/26] rapidio/tsi721: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 15/26] efifb: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 16/26] fbmem: use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 17/26] vfio_pci: Loop using PCI_STD_NUM_BARS Denis Efremov
2019-09-18 9:17 ` Andrew Murray
2019-09-18 14:31 ` Denis Efremov
2019-09-19 8:00 ` Andrew Murray
2019-09-16 20:41 ` [PATCH v3 18/26] scsi: pm80xx: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-17 9:06 ` Jinpu Wang
2019-09-24 2:22 ` Martin K. Petersen
2019-09-24 9:44 ` Denis Efremov
2019-09-26 2:29 ` Bjorn Helgaas
2019-09-26 22:51 ` Martin K. Petersen
2019-09-16 20:41 ` [PATCH v3 19/26] ata: sata_nv: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 20/26] staging: gasket: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 21/26] serial: 8250_pci: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 22/26] pata_atp867x: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 23/26] memstick: use PCI_STD_NUM_BARS Denis Efremov
2019-09-20 7:42 ` Ulf Hansson
2019-09-20 8:05 ` Denis Efremov
2019-09-16 20:41 ` [PATCH v3 24/26] USB: core: Use PCI_STD_NUM_BARS Denis Efremov
2019-09-16 20:41 ` [PATCH v3 25/26] usb: pci-quirks: " Denis Efremov
2019-09-16 20:41 ` [PATCH v3 26/26] devres: use PCI_STD_NUM_BARS Denis Efremov
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=20190930194724.GA188464@google.com \
--to=helgaas@kernel.org \
--cc=andrew.murray@arm.com \
--cc=efremov@linux.com \
--cc=gerald.schaefer@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=sebott@linux.ibm.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).