From: "Michael S. Tsirkin" <mst@redhat.com>
To: Ben Widawsky <ben.widawsky@intel.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [PATCH RESEND] pci: Disallow improper BAR registration for type 1
Date: Wed, 14 Oct 2020 13:52:29 -0400 [thread overview]
Message-ID: <20201014135146-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20201014171853.71130-1-ben.widawsky@intel.com>
On Wed, Oct 14, 2020 at 10:18:53AM -0700, Ben Widawsky wrote:
> This patch informs future developers working on root complexes, root
> ports, or bridges that also wish to implement a BAR for those. PCI type
> 1 headers only support 2 base address registers. It is incorrect and
> difficult to figure out what is wrong with the device when this mistake
> is made. With this, it is immediate and obvious what has gone wrong.
>
> Signed-off-by: Ben Widawsky <ben.widawsky@intel.com>
How about an assert + a comment?
This is how we usually handle developer bugs. error_report is
for user errors and similar issues ...
> ---
> hw/pci/pci.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 3c8f10b461..55b0302c57 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -1141,6 +1141,7 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
> uint32_t addr; /* offset in pci config space */
> uint64_t wmask;
> pcibus_t size = memory_region_size(memory);
> + uint8_t hdr_type;
>
> assert(region_num >= 0);
> assert(region_num < PCI_NUM_REGIONS);
> @@ -1150,6 +1151,15 @@ void pci_register_bar(PCIDevice *pci_dev, int region_num,
> exit(1);
> }
>
> + hdr_type =
> + pci_dev->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTION;
> + if (hdr_type == PCI_HEADER_TYPE_BRIDGE && region_num > 1) {
> + error_report("ERROR: PCI Type 1 header only has 2 BARs "
> + "requested BAR=%d",
> + region_num);
> + exit(1);
> + }
> +
> r = &pci_dev->io_regions[region_num];
> r->addr = PCI_BAR_UNMAPPED;
> r->size = size;
> --
> 2.28.0
next prev parent reply other threads:[~2020-10-14 17:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-14 17:18 [PATCH RESEND] pci: Disallow improper BAR registration for type 1 Ben Widawsky
2020-10-14 17:52 ` Michael S. Tsirkin [this message]
2020-10-14 17:56 ` Ben Widawsky
2020-10-14 18:11 ` Philippe Mathieu-Daudé
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=20201014135146-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=ben.widawsky@intel.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).