From: Akihiko Odaki <akihiko.odaki@daynix.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>,
"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>,
"Sriram Yagnaraman" <sriram.yagnaraman@est.tech>,
"Jason Wang" <jasowang@redhat.com>,
"Keith Busch" <kbusch@kernel.org>,
"Klaus Jensen" <its@irrelevant.dk>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org,
Akihiko Odaki <akihiko.odaki@daynix.com>
Subject: [PATCH v7 04/16] pcie_sriov: Do not reset NumVFs after disabling VFs
Date: Sat, 24 Feb 2024 18:24:36 +0900 [thread overview]
Message-ID: <20240224-reuse-v7-4-29c14bcb952e@daynix.com> (raw)
In-Reply-To: <20240224-reuse-v7-0-29c14bcb952e@daynix.com>
The spec does not NumVFs is reset after disabling VFs except when
resetting the PF. Clearing it is guest visible and out of spec, even
though Linux doesn't rely on this value being preserved, so we never
noticed.
Fixes: 7c0fa8dff811 ("pcie: Add support for Single Root I/O Virtualization (SR/IOV)")
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
hw/pci/pcie_sriov.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/pci/pcie_sriov.c b/hw/pci/pcie_sriov.c
index 51b66d1bb342..e9b23221d713 100644
--- a/hw/pci/pcie_sriov.c
+++ b/hw/pci/pcie_sriov.c
@@ -215,7 +215,6 @@ static void unregister_vfs(PCIDevice *dev)
g_free(dev->exp.sriov_pf.vf);
dev->exp.sriov_pf.vf = NULL;
dev->exp.sriov_pf.num_vfs = 0;
- pci_set_word(dev->config + dev->exp.sriov_cap + PCI_SRIOV_NUM_VF, 0);
}
void pcie_sriov_config_write(PCIDevice *dev, uint32_t address,
@@ -260,6 +259,8 @@ void pcie_sriov_pf_reset(PCIDevice *dev)
pci_set_word(dev->config + sriov_cap + PCI_SRIOV_CTRL, 0);
unregister_vfs(dev);
+ pci_set_word(dev->config + sriov_cap + PCI_SRIOV_NUM_VF, 0);
+
/*
* Default is to use 4K pages, software can modify it
* to any of the supported bits
--
2.43.2
next prev parent reply other threads:[~2024-02-24 9:26 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-24 9:24 [PATCH v7 00/16] hw/pci: SR-IOV related fixes and improvements Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 01/16] hw/nvme: Use pcie_sriov_num_vfs() Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 02/16] pcie_sriov: Validate NumVFs Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 03/16] pcie_sriov: Reset SR-IOV extended capability Akihiko Odaki
2024-02-24 9:24 ` Akihiko Odaki [this message]
2024-02-24 9:24 ` [PATCH v7 05/16] hw/pci: Always call pcie_sriov_pf_reset() Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 06/16] hw/pci: Rename has_power to enabled Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 07/16] pcie_sriov: Do not manually unrealize Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 08/16] pcie_sriov: Reuse SR-IOV VF device instances Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 09/16] pcie_sriov: Release VFs failed to realize Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 10/16] pcie_sriov: Remove num_vfs from PCIESriovPF Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 11/16] pcie_sriov: Register VFs after migration Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 12/16] hw/pci: Replace -1 with UINT32_MAX for romsize Akihiko Odaki
2024-02-28 9:17 ` Markus Armbruster
2024-02-24 9:24 ` [PATCH v7 13/16] hw/pci: Use UINT32_MAX as a default value for rombar Akihiko Odaki
2024-02-24 9:24 ` [PATCH v7 14/16] hw/pci: Determine if rombar is explicitly enabled Akihiko Odaki
2024-02-28 9:24 ` Markus Armbruster
2024-02-24 9:24 ` [PATCH v7 15/16] vfio: Avoid inspecting option QDict for rombar Akihiko Odaki
2024-02-28 9:25 ` Markus Armbruster
2024-02-24 9:24 ` [PATCH v7 16/16] hw/qdev: Remove opts member Akihiko Odaki
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=20240224-reuse-v7-4-29c14bcb952e@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=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sriram.yagnaraman@est.tech \
/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).