From: Akihiko Odaki <akihiko.odaki@daynix.com>
To: "Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Jason Wang" <jasowang@redhat.com>,
"Sriram Yagnaraman" <sriram.yagnaraman@ericsson.com>,
"Keith Busch" <kbusch@kernel.org>,
"Klaus Jensen" <its@irrelevant.dk>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org,
Yui Washizu <yui.washidu@gmail.com>,
Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: [PATCH v5 2/8] hw/pci: Fix SR-IOV VF number calculation
Date: Mon, 15 Jul 2024 14:19:08 +0900 [thread overview]
Message-ID: <20240715-sriov-v5-2-3f5539093ffc@daynix.com> (raw)
In-Reply-To: <20240715-sriov-v5-0-3f5539093ffc@daynix.com>
pci_config_get_bar_addr() had a division by vf_stride. vf_stride needs
to be non-zero when there are multiple VFs, but the specification does
not prohibit to make it zero when there is only one VF.
Do not perform the division for the first VF to avoid division by zero.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
hw/pci/pci.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 497a057b79f9..ae7137d70579 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1490,7 +1490,11 @@ static pcibus_t pci_config_get_bar_addr(PCIDevice *d, int reg,
pci_get_word(pf->config + sriov_cap + PCI_SRIOV_VF_OFFSET);
uint16_t vf_stride =
pci_get_word(pf->config + sriov_cap + PCI_SRIOV_VF_STRIDE);
- uint32_t vf_num = (d->devfn - (pf->devfn + vf_offset)) / vf_stride;
+ uint32_t vf_num = d->devfn - (pf->devfn + vf_offset);
+
+ if (vf_num) {
+ vf_num /= vf_stride;
+ }
if (type & PCI_BASE_ADDRESS_MEM_TYPE_64) {
new_addr = pci_get_quad(pf->config + bar);
--
2.45.2
next prev parent reply other threads:[~2024-07-15 5:20 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 5:19 [PATCH v5 0/8] virtio-net: add support for SR-IOV emulation Akihiko Odaki
2024-07-15 5:19 ` [PATCH v5 1/8] hw/pci: Do not add ROM BAR for SR-IOV VF Akihiko Odaki
2024-07-15 5:19 ` Akihiko Odaki [this message]
2024-07-15 5:19 ` [PATCH v5 3/8] pcie_sriov: Ensure PF and VF are mutually exclusive Akihiko Odaki
2024-07-15 5:19 ` [PATCH v5 4/8] pcie_sriov: Check PCI Express for SR-IOV PF Akihiko Odaki
2024-07-15 5:19 ` [PATCH v5 5/8] pcie_sriov: Allow user to create SR-IOV device Akihiko Odaki
2024-07-15 5:19 ` [PATCH v5 6/8] virtio-pci: Implement SR-IOV PF Akihiko Odaki
2024-07-15 5:19 ` [PATCH v5 7/8] virtio-net: Implement SR-IOV VF Akihiko Odaki
2024-07-15 5:19 ` [PATCH v5 8/8] docs: Document composable SR-IOV device Akihiko Odaki
2024-07-30 11:37 ` [PATCH v5 0/8] virtio-net: add support for SR-IOV emulation Michael S. Tsirkin
2024-07-30 12:26 ` Akihiko Odaki
2024-07-30 17:56 ` Michael S. Tsirkin
2024-07-31 8:58 ` Cédric Le Goater
2024-08-01 7:13 ` Akihiko Odaki
2024-08-01 7:51 ` Michael S. Tsirkin
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=20240715-sriov-v5-2-3f5539093ffc@daynix.com \
--to=akihiko.odaki@daynix.com \
--cc=alex.williamson@redhat.com \
--cc=berrange@redhat.com \
--cc=clg@redhat.com \
--cc=eduardo@habkost.net \
--cc=its@irrelevant.dk \
--cc=jasowang@redhat.com \
--cc=kbusch@kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sriram.yagnaraman@ericsson.com \
--cc=yui.washidu@gmail.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).