svn commit: r356870 - stable/12/usr.sbin/bhyve

[John Baldwin]

Author: jhb
Date: Sat Jan 18 23:26:15 2020
New Revision: 356870
URL: https://svnweb.freebsd.org/changeset/base/356870

Log:
  MFC 355634: Emulate reads of the PCI command register for passthrough devices.
  
  VFs return zero for the memory enable bit even if it has been set by a
  prior write.  After r348779 this caused the annoying behavior that a
  guest OS would unintentionally disable memory decoding on a future
  read-modify-write operation on the command register.  Instead, return
  the shadow value of the command register for reads.  This ensures that
  the guest will only toggle the state of the memory enable bit when it
  specifically intends to do so.
  
  Sponsored by:	Chelsio Communications

Modified:
  stable/12/usr.sbin/bhyve/pci_passthru.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.sbin/bhyve/pci_passthru.c
==============================================================================
--- stable/12/usr.sbin/bhyve/pci_passthru.c	Sat Jan 18 22:58:32 2020	(r356869)
+++ stable/12/usr.sbin/bhyve/pci_passthru.c	Sat Jan 18 23:26:15 2020	(r356870)
@@ -806,6 +806,19 @@ passthru_cfgread(struct vmctx *ctx, int vcpu, struct p
 	}
 #endif
 
+	/*
+	 * Emulate the command register.  If a single read reads both the
+	 * command and status registers, read the status register from the
+	 * device's config space.
+	 */
+	if (coff == PCIR_COMMAND) {
+		if (bytes <= 2)
+			return (-1);
+		*rv = pci_get_cfgdata16(pi, PCIR_COMMAND) << 16 |
+		    read_config(&sc->psc_sel, PCIR_STATUS, 2);
+		return (0);
+	}
+
 	/* Everything else just read from the device's config space */
 	*rv = read_config(&sc->psc_sel, coff, bytes);