[PATCH] vfio/pci: Add test for BAR restore

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Alex Williamson <alex.williamson@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH] vfio/pci: Add test for BAR restore
Date	Thu, 24 Mar 2016 20:10:01 +0100
Message-ID	<rgiNP-7cM-1@gated-at.bofh.it> (permalink)
X-Original-To	alex.williamson@redhat.com
User-Agent	StGit/0.17.1-dirty
MIME-Version	1.0
Content-Type	text/plain; charset="utf-8"
Content-Transfer-Encoding	7bit
X-Scanned-By	MIMEDefang 2.68 on 10.5.11.26
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	48
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, kvm@vger.kernel.org
X-Original-Date	Thu, 24 Mar 2016 13:06:16 -0600
X-Original-Message-ID	<20160324190535.4148.62003.stgit@gimli.home>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1364400

Show key headers only | View raw

If a device is reset without the memory or i/o bits enabled in the
command register we may not detect it, potentially leaving the device
without valid BAR programming.  Add an additional test to check the
BARs on each write to the command register.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 drivers/vfio/pci/vfio_pci_config.c |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c
index c9bb229..b311078 100644
--- a/drivers/vfio/pci/vfio_pci_config.c
+++ b/drivers/vfio/pci/vfio_pci_config.c
@@ -522,6 +522,23 @@ static int vfio_basic_config_read(struct vfio_pci_device *vdev, int pos,
 	return count;
 }
 
+/* Test whether BARs match the value we think they should contain */
+static bool vfio_need_bar_restore(struct vfio_pci_device *vdev)
+{
+	int i = 0, pos = PCI_BASE_ADDRESS_0, ret;
+	u32 bar;
+
+	for (; pos <= PCI_BASE_ADDRESS_5; i++, pos += 4) {
+		if (vdev->rbar[i]) {
+			ret = pci_user_read_config_dword(vdev->pdev, pos, &bar);
+			if (ret || vdev->rbar[i] != bar)
+				return true;
+		}
+	}
+
+	return false;
+}
+
 static int vfio_basic_config_write(struct vfio_pci_device *vdev, int pos,
 				   int count, struct perm_bits *perm,
 				   int offset, __le32 val)
@@ -560,7 +577,8 @@ static int vfio_basic_config_write(struct vfio_pci_device *vdev, int pos,
 		 * SR-IOV devices will trigger this, but we catch them later
 		 */
 		if ((new_mem && virt_mem && !phys_mem) ||
-		    (new_io && virt_io && !phys_io))
+		    (new_io && virt_io && !phys_io) ||
+		    vfio_need_bar_restore(vdev))
 			vfio_bar_restore(vdev);
 	}

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] vfio/pci: Add test for BAR restore Alex Williamson <alex.williamson@redhat.com> - 2016-03-24 20:10 +0100

csiph-web